Merge pull request #2021 from carver/london-tests

Run London fork tests

Author: carver

.circleci/config.yml

@@ -82,6 +82,12 @@ jobs:
       - image: circleci/python:3.6
         environment:
           TOXENV: py36-native-blockchain-istanbul
+  py36-native-blockchain-london:
+    <<: *common
+    docker:
+      - image: circleci/python:3.6
+        environment:
+          TOXENV: py36-native-blockchain-london
   py36-native-blockchain-petersburg:
     <<: *common
     docker:
@@ -247,6 +253,7 @@ workflows:
       - py36-native-blockchain-frontier
       - py36-native-blockchain-homestead
       - py36-native-blockchain-istanbul
+      - py36-native-blockchain-london
       - py36-native-blockchain-petersburg
       - py36-native-blockchain-tangerine_whistle
       - py36-native-blockchain-spurious_dragon

docs/guides/quickstart.rst

@@ -8,8 +8,8 @@ This guide teaches how to use Py-EVM as a library. For contributors, please chec
 :doc:`Contributing Guide </contributing>` which explains how to set everything up for development.
 
 
-Installing on Ubuntu
---------------------
+Installing Python on Ubuntu
+---------------------------
 
 Py-EVM requires Python 3.6 as well as some tools to compile its dependencies. On Ubuntu, the
 ``python3.6-dev`` package contains everything we need. Run the following command to install it.
@@ -25,30 +25,19 @@ we need to install the ``python3-pip`` package through the following command.
 
   apt-get install python3-pip
 
-.. note::
-  .. include:: /fragments/virtualenv_explainer.rst
-
-Then, we need make to sure you have the latest version of ``pip`` so that all dependencies can be installed correctly:
-
-.. code:: sh
-
-  pip3 install -U pip
 
-Finally, we can install the ``py-evm`` package via pip.
-
-.. code:: sh
-
-  pip3 install -U py-evm
-
-Installing on macOS
--------------------
+Installing Python on macOS
+--------------------------
 
 First, install Python 3 with brew:
 
 .. code:: sh
 
   brew install python3
 
+Installing py-evm
+-----------------
+
 .. note::
   .. include:: /fragments/virtualenv_explainer.rst
 

docs/guides/understanding_the_mining_process.rst

@@ -380,4 +380,4 @@ zero value transfer transaction.
   ... )
 
   >>> chain.mine_block(mix_hash=mix_hash, nonce=nonce)
-  <ByzantiumBlock(#Block #1-0x41f6..2913)>
+  <ByzantiumBlock(#Block #1-0xe372..385c)>

eth/_utils/headers.py

@@ -105,9 +105,12 @@ def compute_gas_limit_bounds(previous_limit: int) -> Tuple[int, int]:
     Compute the boundaries for the block gas limit based on the parent block.
     """
     boundary_range = previous_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
-    upper_bound = min(GAS_LIMIT_MAXIMUM, previous_limit + boundary_range)
-    lower_bound = max(GAS_LIMIT_MINIMUM, previous_limit - boundary_range)
-    return lower_bound, upper_bound
+
+    # the boundary range is the exclusive limit, therefore the inclusive bounds are
+    # (boundary_range - 1) and (boundary_range + 1) for upper and lower bounds, respectively
+    upper_bound_inclusive = min(GAS_LIMIT_MAXIMUM, previous_limit + boundary_range - 1)
+    lower_bound_inclusive = max(GAS_LIMIT_MINIMUM, previous_limit - boundary_range + 1)
+    return lower_bound_inclusive, upper_bound_inclusive
 
 
 def compute_gas_limit(parent_header: BlockHeaderAPI, genesis_gas_limit: int) -> int:
@@ -152,12 +155,14 @@ def compute_gas_limit(parent_header: BlockHeaderAPI, genesis_gas_limit: int) ->
 
     gas_limit = max(
         GAS_LIMIT_MINIMUM,
-        parent_header.gas_limit - decay + usage_increase
+        # + 1 because the decay is an exclusive limit we have to remain inside of
+        (parent_header.gas_limit - decay + 1) + usage_increase
     )
 
     if gas_limit < GAS_LIMIT_MINIMUM:
         return GAS_LIMIT_MINIMUM
     elif gas_limit < genesis_gas_limit:
-        return parent_header.gas_limit + decay
+        # - 1 because the decay is an exclusive limit we have to remain inside of
+        return parent_header.gas_limit + decay - 1
     else:
         return gas_limit

eth/_utils/rlp.py

@@ -106,6 +106,6 @@ def validate_rlp_equal(obj_a: BaseBlock,
 
 
 validate_imported_block_unchanged = validate_rlp_equal(
-    obj_a_name="block",
-    obj_b_name="imported block",
+    obj_a_name="locally executed block",
+    obj_b_name="proposed block",
 )

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/vm/base.py

@@ -669,6 +669,13 @@ def validate_uncle(cls,
                 f"the limit ({uncle.gas_limit})"
             )
 
+        uncle_parent_gas_limit = uncle_parent.gas_limit
+        if not hasattr(uncle_parent, 'base_fee_per_gas') and hasattr(uncle, 'base_fee_per_gas'):
+            # if Berlin -> London transition, double the parent limit for validation
+            uncle_parent_gas_limit *= 2
+
+        validate_gas_limit(uncle.gas_limit, uncle_parent_gas_limit)
+
     #
     # State
     #

eth/vm/logic/system.py

@@ -163,10 +163,15 @@ def __call__(self, computation: ComputationAPI) -> None:
             computation.stack_push_int(0)
             computation.return_data = b''
             if insufficient_funds:
-                err_msg = f"Insufficient Funds: {storage_address_balance} < {stack_data.endowment}"
+                self.logger.debug2(
+                    "%s failure: %s",
+                    self.mnemonic,
+                    f"Insufficient Funds: {storage_address_balance} < {stack_data.endowment}"
+                )
             elif stack_too_deep:
-                err_msg = "Stack limit reached"
-            self.logger.debug2("%s failure: %s", self.mnemonic, err_msg,)
+                self.logger.debug2("%s failure: %s", self.mnemonic, "Stack limit reached")
+            else:
+                raise RuntimeError("Invariant: error must be insufficient funds or stack too deep")
             return
 
         call_data = computation.memory_read_bytes(
@@ -183,11 +188,12 @@ def __call__(self, computation: ComputationAPI) -> None:
         is_collision = computation.state.has_code_or_nonce(contract_address)
 
         if is_collision:
+            computation.stack_push_int(0)
+            computation.return_data = b''
             self.logger.debug2(
                 "Address collision while creating contract: %s",
                 encode_hex(contract_address),
             )
-            computation.stack_push_int(0)
             return
 
         child_msg = computation.prepare_child_message(

newsfragments/2017.feature.rst

@@ -0,0 +1 @@
+Pass all London tests from the ethereum/tests repo

newsfragments/2021.bugfix.rst

@@ -0,0 +1,2 @@
+- Make header gas limit more restrictive. Was too permissive by one gas. Tightened the bounds.
+- Validate uncle gas limits are within bounds. This was previously not validated at all.