tweak blockchain test validation and fix gas_limit check

- We have an 'expectException' flag we can reference for validating should_be_good_block for blockchain tests. These changes tweak blockchain test validation to use this flag since some block fixtures for tests have both good and bad blocks in them now.
- If the gas limit is AT 1/1024th of the parent gas limit, this is also unacceptable. These changes add equal-to signs when comparing the gas limit to the parent. This passes currently-failing ethereum tests >= London.

Author: fselmo

eth/tools/_utils/normalization.py

@@ -567,6 +567,8 @@ def normalize_block(block: Dict[str, Any]) -> Dict[str, Any]:
             for transaction
             in block['transactions']
         ]
+    if 'expectException' in block:
+        normalized_block['expectException'] = block['expectException']
     return normalized_block
 
 

eth/validation.py

@@ -230,11 +230,11 @@ def validate_vm_configuration(vm_configuration: Tuple[Tuple[int, Type[VirtualMac
 
 def validate_gas_limit(gas_limit: int, parent_gas_limit: int) -> None:
     low_bound, high_bound = compute_gas_limit_bounds(parent_gas_limit)
-    if gas_limit < low_bound:
+    if gas_limit <= low_bound:
         raise ValidationError(
             f"The gas limit {gas_limit} is too low. It must be at least {low_bound}"
         )
-    elif gas_limit > high_bound:
+    elif gas_limit >= high_bound:
         raise ValidationError(
             f"The gas limit {gas_limit} is too high. It must be at most {high_bound}"
         )

tests/json-fixtures/blockchain/test_blockchain.py

@@ -371,6 +371,11 @@ def assert_imported_genesis_header_unchanged(genesis_fields, genesis_header):
             )
 
 
+EXPECTED_BAD_BLOCK_EXCEPTIONS = (
+    TypeError, rlp.DecodingError, rlp.DeserializationError, ValidationError, AssertionError,
+)
+
+
 def test_blockchain_fixtures(fixture_data, fixture):
     try:
         chain = new_chain_from_fixture(fixture)
@@ -403,7 +408,7 @@ def test_blockchain_fixtures(fixture_data, fixture):
     # 4 - check that all previous blocks were valid
 
     for block_fixture in fixture['blocks']:
-        should_be_good_block = 'blockHeader' in block_fixture
+        should_be_good_block = 'expectException' not in block_fixture
 
         if 'rlp_error' in block_fixture:
             assert not should_be_good_block
@@ -420,7 +425,7 @@ def test_blockchain_fixtures(fixture_data, fixture):
         else:
             try:
                 apply_fixture_block_to_chain(block_fixture, chain)
-            except (TypeError, rlp.DecodingError, rlp.DeserializationError, ValidationError):
+            except EXPECTED_BAD_BLOCK_EXCEPTIONS:
                 # failure is expected on this bad block
                 pass
             else: