handle test edge cases

This commit handles a couple of edge cases 1. There are some error messages in the test fixtures that could raise RLPDecodingError or InvalidBlock depending on the context. For example TR_TypeNotSupported. If we try to include a typed transaction in Istanbul, it causes an RLPDecodingError. However, if we include a type 2 transaction in Berlin, it won't raise a RLPDecodingError since type1 and type2 are indistinguishable while decoding the rlp. In this case, it raises an InvalidBlock Exception. Therefore we stop making a distinction between these cases in the context of testing. 2. The test HighGasPrice raises a ValueError. We just raise a InvalidBlock from it.
ethereum · Jun 27, 2023 · a6c94f3 · a6c94f3
1 parent f210ac4
commit a6c94f3
Show file tree

Hide file tree

Showing 16 changed files with 98 additions and 61 deletions.
diff --git a/src/ethereum/arrow_glacier/fork.py b/src/ethereum/arrow_glacier/fork.py
@@ -426,6 +426,7 @@ def check_transaction(
 
     if isinstance(tx, FeeMarketTransaction):
         ensure(tx.max_fee_per_gas >= tx.max_priority_fee_per_gas, InvalidBlock)
+        ensure(tx.max_fee_per_gas >= base_fee_per_gas, InvalidBlock)
 
         priority_fee_per_gas = min(
             tx.max_priority_fee_per_gas,
@@ -762,10 +763,13 @@ def process_transaction(
     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
+    try:
+        if isinstance(tx, FeeMarketTransaction):
+            gas_fee = tx.gas * tx.max_fee_per_gas
+        else:
+            gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
 
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)

diff --git a/src/ethereum/berlin/fork.py b/src/ethereum/berlin/fork.py
@@ -659,7 +659,10 @@ def process_transaction(
 
     sender = env.origin
     sender_account = get_account(env.state, sender)
-    gas_fee = tx.gas * tx.gas_price
+    try:
+        gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
     ensure(sender_account.code == bytearray(), InvalidBlock)

diff --git a/src/ethereum/byzantium/fork.py b/src/ethereum/byzantium/fork.py
@@ -647,7 +647,10 @@ def process_transaction(
 
     sender = env.origin
     sender_account = get_account(env.state, sender)
-    gas_fee = tx.gas * tx.gas_price
+    try:
+        gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
     ensure(sender_account.code == bytearray(), InvalidBlock)

diff --git a/src/ethereum/constantinople/fork.py b/src/ethereum/constantinople/fork.py
@@ -647,7 +647,10 @@ def process_transaction(
 
     sender = env.origin
     sender_account = get_account(env.state, sender)
-    gas_fee = tx.gas * tx.gas_price
+    try:
+        gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
     ensure(sender_account.code == bytearray(), InvalidBlock)

diff --git a/src/ethereum/dao_fork/fork.py b/src/ethereum/dao_fork/fork.py
@@ -652,7 +652,10 @@ def process_transaction(
 
     sender = env.origin
     sender_account = get_account(env.state, sender)
-    gas_fee = tx.gas * tx.gas_price
+    try:
+        gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
     ensure(sender_account.code == bytearray(), InvalidBlock)

diff --git a/src/ethereum/frontier/fork.py b/src/ethereum/frontier/fork.py
@@ -633,7 +633,10 @@ def process_transaction(
 
     sender = env.origin
     sender_account = get_account(env.state, sender)
-    gas_fee = tx.gas * tx.gas_price
+    try:
+        gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
     ensure(sender_account.code == bytearray(), InvalidBlock)

diff --git a/src/ethereum/gray_glacier/fork.py b/src/ethereum/gray_glacier/fork.py
@@ -426,6 +426,7 @@ def check_transaction(
 
     if isinstance(tx, FeeMarketTransaction):
         ensure(tx.max_fee_per_gas >= tx.max_priority_fee_per_gas, InvalidBlock)
+        ensure(tx.max_fee_per_gas >= base_fee_per_gas, InvalidBlock)
 
         priority_fee_per_gas = min(
             tx.max_priority_fee_per_gas,
@@ -762,10 +763,13 @@ def process_transaction(
     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
+    try:
+        if isinstance(tx, FeeMarketTransaction):
+            gas_fee = tx.gas * tx.max_fee_per_gas
+        else:
+            gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
 
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)

diff --git a/src/ethereum/homestead/fork.py b/src/ethereum/homestead/fork.py
@@ -635,7 +635,10 @@ def process_transaction(
 
     sender = env.origin
     sender_account = get_account(env.state, sender)
-    gas_fee = tx.gas * tx.gas_price
+    try:
+        gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
     ensure(sender_account.code == bytearray(), InvalidBlock)

diff --git a/src/ethereum/istanbul/fork.py b/src/ethereum/istanbul/fork.py
@@ -648,7 +648,10 @@ def process_transaction(
 
     sender = env.origin
     sender_account = get_account(env.state, sender)
-    gas_fee = tx.gas * tx.gas_price
+    try:
+        gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
     ensure(sender_account.code == bytearray(), InvalidBlock)

diff --git a/src/ethereum/london/fork.py b/src/ethereum/london/fork.py
@@ -434,6 +434,7 @@ def check_transaction(
 
     if isinstance(tx, FeeMarketTransaction):
         ensure(tx.max_fee_per_gas >= tx.max_priority_fee_per_gas, InvalidBlock)
+        ensure(tx.max_fee_per_gas >= base_fee_per_gas, InvalidBlock)
 
         priority_fee_per_gas = min(
             tx.max_priority_fee_per_gas,
@@ -770,10 +771,13 @@ def process_transaction(
     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
+    try:
+        if isinstance(tx, FeeMarketTransaction):
+            gas_fee = tx.gas * tx.max_fee_per_gas
+        else:
+            gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
 
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)

diff --git a/src/ethereum/muir_glacier/fork.py b/src/ethereum/muir_glacier/fork.py
@@ -648,7 +648,10 @@ def process_transaction(
 
     sender = env.origin
     sender_account = get_account(env.state, sender)
-    gas_fee = tx.gas * tx.gas_price
+    try:
+        gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
     ensure(sender_account.code == bytearray(), InvalidBlock)

diff --git a/src/ethereum/paris/fork.py b/src/ethereum/paris/fork.py
@@ -338,6 +338,7 @@ def check_transaction(
 
     if isinstance(tx, FeeMarketTransaction):
         ensure(tx.max_fee_per_gas >= tx.max_priority_fee_per_gas, InvalidBlock)
+        ensure(tx.max_fee_per_gas >= base_fee_per_gas, InvalidBlock)
 
         priority_fee_per_gas = min(
             tx.max_priority_fee_per_gas,
@@ -550,10 +551,13 @@ def process_transaction(
     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
+    try:
+        if isinstance(tx, FeeMarketTransaction):
+            gas_fee = tx.gas * tx.max_fee_per_gas
+        else:
+            gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
 
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)

diff --git a/src/ethereum/shanghai/fork.py b/src/ethereum/shanghai/fork.py
@@ -344,6 +344,7 @@ def check_transaction(
 
     if isinstance(tx, FeeMarketTransaction):
         ensure(tx.max_fee_per_gas >= tx.max_priority_fee_per_gas, InvalidBlock)
+        ensure(tx.max_fee_per_gas >= base_fee_per_gas, InvalidBlock)
 
         priority_fee_per_gas = min(
             tx.max_priority_fee_per_gas,
@@ -571,10 +572,13 @@ def process_transaction(
     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
+    try:
+        if isinstance(tx, FeeMarketTransaction):
+            gas_fee = tx.gas * tx.max_fee_per_gas
+        else:
+            gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
 
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)

diff --git a/src/ethereum/spurious_dragon/fork.py b/src/ethereum/spurious_dragon/fork.py
@@ -643,7 +643,10 @@ def process_transaction(
 
     sender = env.origin
     sender_account = get_account(env.state, sender)
-    gas_fee = tx.gas * tx.gas_price
+    try:
+        gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
     ensure(sender_account.code == bytearray(), InvalidBlock)

diff --git a/src/ethereum/tangerine_whistle/fork.py b/src/ethereum/tangerine_whistle/fork.py
@@ -635,7 +635,10 @@ def process_transaction(
 
     sender = env.origin
     sender_account = get_account(env.state, sender)
-    gas_fee = tx.gas * tx.gas_price
+    try:
+        gas_fee = tx.gas * tx.gas_price
+    except ValueError as e:
+        raise InvalidBlock from e
     ensure(sender_account.nonce == tx.nonce, InvalidBlock)
     ensure(sender_account.balance >= gas_fee + tx.value, InvalidBlock)
     ensure(sender_account.code == bytearray(), InvalidBlock)

diff --git a/tests/helpers/load_state_tests.py b/tests/helpers/load_state_tests.py
@@ -10,18 +10,10 @@
 
 from ethereum import rlp
 from ethereum.base_types import U64
-from ethereum.exceptions import InvalidBlock, RLPDecodingError
+from ethereum.exceptions import InvalidBlock
 from ethereum.utils.hexadecimal import hex_to_bytes
 from ethereum_spec_tools.evm_tools.fixture_loader import Load
 
-RLP_DECODING_EXCEPTIONS = (
-    "RLP_VALUESIZE_MORE_AVAILABLEINPUTLENGTH",
-    "RLP_ExpectedAsList",
-    "INPUT_UNMARSHAL_SIZE_ERROR",
-    "RLP_BODY_UNMARSHAL_ERROR",
-    "INPUT_UNMARSHAL_ERROR",
-)
-
 
 class NoTestsFound(Exception):
     """
@@ -70,36 +62,21 @@ def run_blockchain_st_test(test_case: Dict, load: Load) -> None:
         chain_id=U64(json_data["genesisBlockHeader"].get("chainId", 1)),
     )
 
+    mock_pow = json_data["sealEngine"] == "NoProof" and not load.proof_of_stake
+
     for json_block in json_data["blocks"]:
         block_exception = None
         for key, value in json_block.items():
             if key.startswith("expectException"):
                 block_exception = value
                 break
 
-        if block_exception in RLP_DECODING_EXCEPTIONS:
-            with pytest.raises(RLPDecodingError):
-                load.json_to_block(json_block)
-            return
-        else:
-            (
-                block,
-                block_header_hash,
-                block_rlp,
-            ) = load.json_to_block(json_block)
-
-        assert rlp.rlp_hash(block.header) == block_header_hash
-        assert rlp.encode(cast(rlp.RLP, block)) == block_rlp
-
-        mock_pow = (
-            json_data["sealEngine"] == "NoProof" and not load.proof_of_stake
-        )
-        if block_exception is None:
-            add_block_to_chain(chain, block, load, mock_pow)
-        else:
+        if block_exception:
             with pytest.raises(InvalidBlock):
-                add_block_to_chain(chain, block, load, mock_pow)
+                add_block_to_chain(chain, json_block, load, mock_pow)
             return
+        else:
+            add_block_to_chain(chain, json_block, load, mock_pow)
 
     last_block_hash = hex_to_bytes(json_data["lastblockhash"])
     assert rlp.rlp_hash(chain.blocks[-1].header) == last_block_hash
@@ -111,8 +88,18 @@ def run_blockchain_st_test(test_case: Dict, load: Load) -> None:
 
 
 def add_block_to_chain(
-    chain: Any, block: Any, load: Load, mock_pow: bool
+    chain: Any, json_block: Any, load: Load, mock_pow: bool
 ) -> None:
+
+    (
+        block,
+        block_header_hash,
+        block_rlp,
+    ) = load.json_to_block(json_block)
+
+    assert rlp.rlp_hash(block.header) == block_header_hash
+    assert rlp.encode(cast(rlp.RLP, block)) == block_rlp
+
     if not mock_pow:
         load.state_transition(chain, block)
     else: