Refactor includability check in forks

src/ethereum/arrow_glacier/fork.py

@@ -391,6 +391,7 @@ def validate_proof_of_work(header: Header) -> None:
 
 
 def check_transaction(
+    env: vm.Environment,
     tx: Transaction,
     base_fee_per_gas: Uint,
     gas_available: Uint,
@@ -401,6 +402,8 @@ def check_transaction(
 
     Parameters
     ----------
+    env :
+        Environment for the Ethereum Virtual Machine.
     tx :
         The transaction.
     base_fee_per_gas :
@@ -422,6 +425,18 @@ def check_transaction(
     InvalidBlock :
         If the transaction is not includable.
     """
+    sender = env.origin
+    sender_account = get_account(env.state, sender)
+
+    if isinstance(tx, FeeMarketTransaction):
+        gas_fee = tx.gas * tx.max_fee_per_gas
+    else:
+        gas_fee = tx.gas * tx.gas_price
+
+    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
+    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
+    ensure(sender_account.code == bytearray(), InvalidBlock)
+
     ensure(tx.gas <= gas_available, InvalidBlock)
     sender_address = recover_sender(chain_id, tx)
 
@@ -783,15 +798,6 @@ def process_transaction(
     sender = env.origin
     sender_account = get_account(env.state, sender)
 
-    if isinstance(tx, FeeMarketTransaction):
-        max_gas_fee = tx.gas * tx.max_fee_per_gas
-    else:
-        max_gas_fee = tx.gas * tx.gas_price
-
-    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
-    ensure(sender_account.balance >= max_gas_fee + tx.value, InvalidBlock)
-    ensure(sender_account.code == bytearray(), InvalidBlock)
-
     effective_gas_fee = tx.gas * env.gas_price
 
     gas = tx.gas - calculate_intrinsic_cost(tx)

src/ethereum/berlin/fork.py

@@ -314,6 +314,7 @@ def validate_proof_of_work(header: Header) -> None:
 
 
 def check_transaction(
+    env: vm.Environment,
     tx: Transaction,
     gas_available: Uint,
     chain_id: U64,
@@ -323,6 +324,8 @@ def check_transaction(
 
     Parameters
     ----------
+    env :
+        Environment for the Ethereum Virtual Machine.
     tx :
         The transaction.
     gas_available :
@@ -340,6 +343,13 @@ def check_transaction(
     InvalidBlock :
         If the transaction is not includable.
     """
+    sender = env.origin
+    sender_account = get_account(env.state, sender)
+    gas_fee = tx.gas * tx.gas_price
+    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
+    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
+    ensure(sender_account.code == bytearray(), InvalidBlock)
+
     ensure(tx.gas <= gas_available, InvalidBlock)
     sender_address = recover_sender(chain_id, tx)
 
@@ -680,9 +690,6 @@ def process_transaction(
     sender = env.origin
     sender_account = get_account(env.state, sender)
     gas_fee = tx.gas * tx.gas_price
-    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
-    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
-    ensure(sender_account.code == bytearray(), InvalidBlock)
 
     gas = tx.gas - calculate_intrinsic_cost(tx)
     increment_nonce(env.state, sender)

src/ethereum/byzantium/fork.py

@@ -308,6 +308,7 @@ def validate_proof_of_work(header: Header) -> None:
 
 
 def check_transaction(
+    env: vm.Environment,
     tx: Transaction,
     gas_available: Uint,
     chain_id: U64,
@@ -317,6 +318,8 @@ def check_transaction(
 
     Parameters
     ----------
+    env :
+        Environment for the Ethereum Virtual Machine.
     tx :
         The transaction.
     gas_available :
@@ -334,6 +337,13 @@ def check_transaction(
     InvalidBlock :
         If the transaction is not includable.
     """
+    sender = env.origin
+    sender_account = get_account(env.state, sender)
+    gas_fee = tx.gas * tx.gas_price
+    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
+    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
+    ensure(sender_account.code == bytearray(), InvalidBlock)
+
     ensure(tx.gas <= gas_available, InvalidBlock)
     sender_address = recover_sender(chain_id, tx)
 
@@ -668,9 +678,6 @@ def process_transaction(
     sender = env.origin
     sender_account = get_account(env.state, sender)
     gas_fee = tx.gas * tx.gas_price
-    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
-    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
-    ensure(sender_account.code == bytearray(), InvalidBlock)
 
     gas = tx.gas - calculate_intrinsic_cost(tx)
     increment_nonce(env.state, sender)

src/ethereum/constantinople/fork.py

@@ -308,6 +308,7 @@ def validate_proof_of_work(header: Header) -> None:
 
 
 def check_transaction(
+    env: vm.Environment,
     tx: Transaction,
     gas_available: Uint,
     chain_id: U64,
@@ -317,6 +318,8 @@ def check_transaction(
 
     Parameters
     ----------
+    env :
+        Environment for the Ethereum Virtual Machine.
     tx :
         The transaction.
     gas_available :
@@ -334,6 +337,14 @@ def check_transaction(
     InvalidBlock :
         If the transaction is not includable.
     """
+    sender = env.origin
+    sender_account = get_account(env.state, sender)
+    gas_fee = tx.gas * tx.gas_price
+
+    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
+    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
+    ensure(sender_account.code == bytearray(), InvalidBlock)
+
     ensure(tx.gas <= gas_available, InvalidBlock)
     sender_address = recover_sender(chain_id, tx)
 
@@ -668,9 +679,6 @@ def process_transaction(
     sender = env.origin
     sender_account = get_account(env.state, sender)
     gas_fee = tx.gas * tx.gas_price
-    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
-    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
-    ensure(sender_account.code == bytearray(), InvalidBlock)
 
     gas = tx.gas - calculate_intrinsic_cost(tx)
     increment_nonce(env.state, sender)

src/ethereum/dao_fork/fork.py

@@ -319,6 +319,7 @@ def validate_proof_of_work(header: Header) -> None:
 
 
 def check_transaction(
+    env: vm.Environment,
     tx: Transaction,
     gas_available: Uint,
 ) -> Address:
@@ -327,6 +328,8 @@ def check_transaction(
 
     Parameters
     ----------
+    env :
+        Environment for the Ethereum Virtual Machine.
     tx :
         The transaction.
     gas_available :
@@ -342,6 +345,13 @@ def check_transaction(
     InvalidBlock :
         If the transaction is not includable.
     """
+    sender = env.origin
+    sender_account = get_account(env.state, sender)
+    gas_fee = tx.gas * tx.gas_price
+    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
+    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
+    ensure(sender_account.code == bytearray(), InvalidBlock)
+
     ensure(tx.gas <= gas_available, InvalidBlock)
     sender_address = recover_sender(tx)
 
@@ -673,9 +683,6 @@ def process_transaction(
     sender = env.origin
     sender_account = get_account(env.state, sender)
     gas_fee = tx.gas * tx.gas_price
-    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
-    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
-    ensure(sender_account.code == bytearray(), InvalidBlock)
 
     gas = tx.gas - calculate_intrinsic_cost(tx)
     increment_nonce(env.state, sender)

src/ethereum/frontier/fork.py

@@ -300,6 +300,7 @@ def validate_proof_of_work(header: Header) -> None:
 
 
 def check_transaction(
+    env: vm.Environment,
     tx: Transaction,
     gas_available: Uint,
 ) -> Address:
@@ -308,6 +309,8 @@ def check_transaction(
 
     Parameters
     ----------
+    env :
+        Environment for the Ethereum Virtual Machine.
     tx :
         The transaction.
     gas_available :
@@ -323,6 +326,13 @@ def check_transaction(
     InvalidBlock :
         If the transaction is not includable.
     """
+    sender = env.origin
+    sender_account = get_account(env.state, sender)
+    gas_fee = tx.gas * tx.gas_price
+    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
+    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
+    ensure(sender_account.code == bytearray(), InvalidBlock)
+
     ensure(tx.gas <= gas_available, InvalidBlock)
     sender_address = recover_sender(tx)
 
@@ -654,9 +664,6 @@ def process_transaction(
     sender = env.origin
     sender_account = get_account(env.state, sender)
     gas_fee = tx.gas * tx.gas_price
-    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
-    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
-    ensure(sender_account.code == bytearray(), InvalidBlock)
 
     gas = tx.gas - calculate_intrinsic_cost(tx)
     increment_nonce(env.state, sender)

src/ethereum/gray_glacier/fork.py

@@ -391,6 +391,7 @@ def validate_proof_of_work(header: Header) -> None:
 
 
 def check_transaction(
+    env: vm.Environment,
     tx: Transaction,
     base_fee_per_gas: Uint,
     gas_available: Uint,
@@ -401,6 +402,8 @@ def check_transaction(
 
     Parameters
     ----------
+    env :
+        Environment for the Ethereum Virtual Machine.
     tx :
         The transaction.
     base_fee_per_gas :
@@ -422,6 +425,18 @@ def check_transaction(
     InvalidBlock :
         If the transaction is not includable.
     """
+    sender = env.origin
+    sender_account = get_account(env.state, sender)
+
+    if isinstance(tx, FeeMarketTransaction):
+        gas_fee = tx.gas * tx.max_fee_per_gas
+    else:
+        gas_fee = tx.gas * tx.gas_price
+
+    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
+    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
+    ensure(sender_account.code == bytearray(), InvalidBlock)
+
     ensure(tx.gas <= gas_available, InvalidBlock)
     sender_address = recover_sender(chain_id, tx)
 
@@ -783,15 +798,6 @@ def process_transaction(
     sender = env.origin
     sender_account = get_account(env.state, sender)
 
-    if isinstance(tx, FeeMarketTransaction):
-        max_gas_fee = tx.gas * tx.max_fee_per_gas
-    else:
-        max_gas_fee = tx.gas * tx.gas_price
-
-    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
-    ensure(sender_account.balance >= max_gas_fee + tx.value, InvalidBlock)
-    ensure(sender_account.code == bytearray(), InvalidBlock)
-
     effective_gas_fee = tx.gas * env.gas_price
 
     gas = tx.gas - calculate_intrinsic_cost(tx)

src/ethereum/homestead/fork.py

@@ -302,6 +302,7 @@ def validate_proof_of_work(header: Header) -> None:
 
 
 def check_transaction(
+    env: vm.Environment,
     tx: Transaction,
     gas_available: Uint,
 ) -> Address:
@@ -310,6 +311,8 @@ def check_transaction(
 
     Parameters
     ----------
+    env :
+        Environment for the Ethereum Virtual Machine.
     tx :
         The transaction.
     gas_available :
@@ -325,6 +328,13 @@ def check_transaction(
     InvalidBlock :
         If the transaction is not includable.
     """
+    sender = env.origin
+    sender_account = get_account(env.state, sender)
+    gas_fee = tx.gas * tx.gas_price
+    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
+    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
+    ensure(sender_account.code == bytearray(), InvalidBlock)
+
     ensure(tx.gas <= gas_available, InvalidBlock)
     sender_address = recover_sender(tx)
 
@@ -656,9 +666,6 @@ def process_transaction(
     sender = env.origin
     sender_account = get_account(env.state, sender)
     gas_fee = tx.gas * tx.gas_price
-    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
-    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
-    ensure(sender_account.code == bytearray(), InvalidBlock)
 
     gas = tx.gas - calculate_intrinsic_cost(tx)
     increment_nonce(env.state, sender)

src/ethereum/istanbul/fork.py

@@ -308,6 +308,7 @@ def validate_proof_of_work(header: Header) -> None:
 
 
 def check_transaction(
+    env: vm.Environment,
     tx: Transaction,
     gas_available: Uint,
     chain_id: U64,
@@ -317,6 +318,8 @@ def check_transaction(
 
     Parameters
     ----------
+    env :
+        Environment for the Ethereum Virtual Machine.
     tx :
         The transaction.
     gas_available :
@@ -334,6 +337,13 @@ def check_transaction(
     InvalidBlock :
         If the transaction is not includable.
     """
+    sender = env.origin
+    sender_account = get_account(env.state, sender)
+    gas_fee = tx.gas * tx.gas_price
+    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
+    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
+    ensure(sender_account.code == bytearray(), InvalidBlock)
+
     ensure(tx.gas <= gas_available, InvalidBlock)
     sender_address = recover_sender(chain_id, tx)
 
@@ -669,9 +679,6 @@ def process_transaction(
     sender = env.origin
     sender_account = get_account(env.state, sender)
     gas_fee = tx.gas * tx.gas_price
-    ensure(sender_account.nonce == tx.nonce, InvalidBlock)
-    ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
-    ensure(sender_account.code == bytearray(), InvalidBlock)
 
     gas = tx.gas - calculate_intrinsic_cost(tx)
     increment_nonce(env.state, sender)