diff --git a/src/ethereum/arrow_glacier/fork.py b/src/ethereum/arrow_glacier/fork.py index efd0a4696a..6d5d95f0d8 100644 --- a/src/ethereum/arrow_glacier/fork.py +++ b/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) diff --git a/src/ethereum/berlin/fork.py b/src/ethereum/berlin/fork.py index 46376e11d0..c29616612b 100644 --- a/src/ethereum/berlin/fork.py +++ b/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) diff --git a/src/ethereum/byzantium/fork.py b/src/ethereum/byzantium/fork.py index f21323cda2..16864c73db 100644 --- a/src/ethereum/byzantium/fork.py +++ b/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) diff --git a/src/ethereum/cancun/fork.py b/src/ethereum/cancun/fork.py index b0fb55ec47..2c55051bc4 100644 --- a/src/ethereum/cancun/fork.py +++ b/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) diff --git a/src/ethereum/constantinople/fork.py b/src/ethereum/constantinople/fork.py index 1eafe4360e..51336b2e5b 100644 --- a/src/ethereum/constantinople/fork.py +++ b/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) diff --git a/src/ethereum/dao_fork/fork.py b/src/ethereum/dao_fork/fork.py index 1835a2525f..077ed28b2c 100644 --- a/src/ethereum/dao_fork/fork.py +++ b/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) diff --git a/src/ethereum/frontier/fork.py b/src/ethereum/frontier/fork.py index 46749732f4..9732c530be 100644 --- a/src/ethereum/frontier/fork.py +++ b/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) diff --git a/src/ethereum/gray_glacier/fork.py b/src/ethereum/gray_glacier/fork.py index a43116185b..d2cebebe36 100644 --- a/src/ethereum/gray_glacier/fork.py +++ b/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) diff --git a/src/ethereum/homestead/fork.py b/src/ethereum/homestead/fork.py index 1419c87b6d..fa4dbb3428 100644 --- a/src/ethereum/homestead/fork.py +++ b/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) diff --git a/src/ethereum/istanbul/fork.py b/src/ethereum/istanbul/fork.py index 3d0b7859a2..cdb32e3586 100644 --- a/src/ethereum/istanbul/fork.py +++ b/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) diff --git a/src/ethereum/london/fork.py b/src/ethereum/london/fork.py index 52087e0907..f5f27a2261 100644 --- a/src/ethereum/london/fork.py +++ b/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) diff --git a/src/ethereum/muir_glacier/fork.py b/src/ethereum/muir_glacier/fork.py index 4f93ff7216..d79b39d846 100644 --- a/src/ethereum/muir_glacier/fork.py +++ b/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) diff --git a/src/ethereum/paris/fork.py b/src/ethereum/paris/fork.py index fbee3a9eb0..6c05c9f1cb 100644 --- a/src/ethereum/paris/fork.py +++ b/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) diff --git a/src/ethereum/shanghai/fork.py b/src/ethereum/shanghai/fork.py index 86925fb6b9..e0832de9e2 100644 --- a/src/ethereum/shanghai/fork.py +++ b/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) diff --git a/src/ethereum/spurious_dragon/fork.py b/src/ethereum/spurious_dragon/fork.py index cb4d0b0702..87d27361b6 100644 --- a/src/ethereum/spurious_dragon/fork.py +++ b/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) diff --git a/src/ethereum/tangerine_whistle/fork.py b/src/ethereum/tangerine_whistle/fork.py index 1419c87b6d..fa4dbb3428 100644 --- a/src/ethereum/tangerine_whistle/fork.py +++ b/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)