validate_transaction now raises InvalidTransaction

src/ethereum/arrow_glacier/fork.py

@@ -24,6 +24,7 @@
 from ethereum.exceptions import (
     EthereumException,
     InvalidBlock,
+    InvalidTransaction,
     InvalidSenderError,
 )
 
@@ -780,7 +781,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/berlin/fork.py

@@ -24,6 +24,7 @@
 from ethereum.exceptions import (
     EthereumException,
     InvalidBlock,
+    InvalidTransaction,
     InvalidSenderError,
 )
 
@@ -674,7 +675,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/byzantium/fork.py

@@ -24,6 +24,7 @@
 from ethereum.exceptions import (
     EthereumException,
     InvalidBlock,
+    InvalidTransaction,
     InvalidSenderError,
 )
 
@@ -664,7 +665,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/cancun/fork.py

@@ -23,6 +23,7 @@
 from ethereum.exceptions import (
     EthereumException,
     InvalidBlock,
+    InvalidTransaction,
     InvalidSenderError,
 )
 
@@ -728,7 +729,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/constantinople/fork.py

@@ -24,6 +24,7 @@
 from ethereum.exceptions import (
     EthereumException,
     InvalidBlock,
+    InvalidTransaction,
     InvalidSenderError,
 )
 
@@ -664,7 +665,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/dao_fork/fork.py

@@ -23,7 +23,7 @@
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.ethash import dataset_size, generate_cache, hashimoto_light
-from ethereum.exceptions import InvalidBlock, InvalidSenderError
+from ethereum.exceptions import InvalidBlock, InvalidSenderError, InvalidTransaction
 
 from . import FORK_CRITERIA, vm
 from .blocks import Block, Header, Log, Receipt
@@ -666,7 +666,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/frontier/fork.py

@@ -21,7 +21,7 @@
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.ethash import dataset_size, generate_cache, hashimoto_light
-from ethereum.exceptions import InvalidBlock, InvalidSenderError
+from ethereum.exceptions import InvalidBlock, InvalidSenderError, InvalidTransaction
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt
@@ -648,7 +648,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/gray_glacier/fork.py

@@ -24,6 +24,7 @@
 from ethereum.exceptions import (
     EthereumException,
     InvalidBlock,
+    InvalidTransaction,
     InvalidSenderError,
 )
 
@@ -780,7 +781,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/homestead/fork.py

@@ -21,7 +21,7 @@
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.ethash import dataset_size, generate_cache, hashimoto_light
-from ethereum.exceptions import InvalidBlock, InvalidSenderError
+from ethereum.exceptions import InvalidBlock, InvalidSenderError, InvalidTransaction
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt
@@ -648,7 +648,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/istanbul/fork.py

@@ -24,6 +24,7 @@
 from ethereum.exceptions import (
     EthereumException,
     InvalidBlock,
+    InvalidTransaction,
     InvalidSenderError,
 )
 
@@ -665,7 +666,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/london/fork.py

@@ -24,6 +24,7 @@
 from ethereum.exceptions import (
     EthereumException,
     InvalidBlock,
+    InvalidTransaction,
     InvalidSenderError,
 )
 
@@ -786,7 +787,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/muir_glacier/fork.py

@@ -24,6 +24,7 @@
 from ethereum.exceptions import (
     EthereumException,
     InvalidBlock,
+    InvalidTransaction,
     InvalidSenderError,
 )
 
@@ -665,7 +666,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/paris/fork.py

@@ -23,6 +23,7 @@
 from ethereum.exceptions import (
     EthereumException,
     InvalidBlock,
+    InvalidTransaction,
     InvalidSenderError,
 )
 
@@ -570,7 +571,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/shanghai/fork.py

@@ -23,6 +23,7 @@
 from ethereum.exceptions import (
     EthereumException,
     InvalidBlock,
+    InvalidTransaction,
     InvalidSenderError,
 )
 
@@ -592,7 +593,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/spurious_dragon/fork.py

@@ -21,7 +21,7 @@
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.ethash import dataset_size, generate_cache, hashimoto_light
-from ethereum.exceptions import InvalidBlock, InvalidSenderError
+from ethereum.exceptions import InvalidBlock, InvalidSenderError, InvalidTransaction
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt
@@ -656,7 +656,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)

src/ethereum/tangerine_whistle/fork.py

@@ -21,7 +21,7 @@
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.ethash import dataset_size, generate_cache, hashimoto_light
-from ethereum.exceptions import InvalidBlock, InvalidSenderError
+from ethereum.exceptions import InvalidBlock, InvalidSenderError, InvalidTransaction
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt
@@ -648,7 +648,7 @@ def process_transaction(
         Logs generated during execution.
     """
     if not validate_transaction(tx):
-        raise InvalidBlock
+        raise InvalidTransaction
 
     sender = env.origin
     sender_account = get_account(env.state, sender)