Merge pull request #2018 from fselmo/eip-3554-and-eip-3541

EIP-3554 and EIP-3541

Author: carver

eth/exceptions.py

@@ -195,3 +195,11 @@ class OutOfBoundsRead(VMError):
     boundaries of the buffer (such as with RETURNDATACOPY)
     """
     pass
+
+
+class ReservedBytesInCode(VMError):
+    """
+    Raised when bytes for the code to be deployed are reserved
+    for a particular reason.
+    """
+    pass

eth/vm/forks/frontier/constants.py

@@ -1,24 +1,2 @@
-from eth_typing import (
-    Address
-)
-
-CREATE_CONTRACT_ADDRESS = Address(b'')
-
-
-#
-# Difficulty
-#
 FRONTIER_DIFFICULTY_ADJUSTMENT_CUTOFF = 13
-
-
-#
-# Stack Limit
-#
-STACK_DEPTH_LIMIT = 1024
-
-
-#
-# Gas Costs and Refunds
-#
 REFUND_SELFDESTRUCT = 24000
-GAS_CODEDEPOSIT = 200

eth/vm/forks/homestead/constants.py

@@ -2,9 +2,3 @@
 # Difficulty
 #
 HOMESTEAD_DIFFICULTY_ADJUSTMENT_CUTOFF = 10
-
-
-#
-# Gas Costs and Refunds
-#
-GAS_CODEDEPOSIT = 200

eth/vm/forks/london/computation.py

@@ -1,8 +1,10 @@
+from eth.exceptions import ReservedBytesInCode
 from eth.vm.forks.berlin.computation import (
     BerlinComputation,
 )
 
 from .opcodes import LONDON_OPCODES
+from ..london.constants import EIP3541_RESERVED_STARTING_BYTE
 
 
 class LondonComputation(BerlinComputation):
@@ -11,3 +13,10 @@ class LondonComputation(BerlinComputation):
     Inherits from :class:`~eth.vm.forks.berlin.BerlinComputation`
     """
     opcodes = LONDON_OPCODES
+
+    @classmethod
+    def validate_new_contract_code(cls, contract_code: bytes) -> None:
+        if contract_code[:1] == EIP3541_RESERVED_STARTING_BYTE:
+            raise ReservedBytesInCode(
+                "Contract code begins with EIP3541 reserved byte '0xEF'."
+            )

eth/vm/forks/london/constants.py

@@ -11,3 +11,5 @@
 BASE_FEE_MAX_CHANGE_DENOMINATOR = 8
 INITIAL_BASE_FEE = 1000000000
 ELASTICITY_MULTIPLIER = 2
+
+EIP3541_RESERVED_STARTING_BYTE = b'\xef'

eth/vm/forks/london/headers.py

@@ -22,9 +22,12 @@
 from eth.constants import GENESIS_GAS_LIMIT
 from eth.rlp.headers import BlockHeader
 from eth.vm.forks.berlin.headers import (
-    compute_berlin_difficulty,
     configure_header,
 )
+from eth.vm.forks.muir_glacier.headers import (
+    compute_difficulty,
+)
+
 
 from .blocks import LondonBlockHeader
 from .constants import (
@@ -121,7 +124,7 @@ def create_header_from_parent(difficulty_fn: Callable[[BlockHeaderAPI, int], int
     return new_header
 
 
-compute_london_difficulty = compute_berlin_difficulty
+compute_london_difficulty = compute_difficulty(9700000)
 
 create_london_header_from_parent = create_header_from_parent(
     compute_london_difficulty

eth/vm/forks/spurious_dragon/computation.py

@@ -1,4 +1,5 @@
 from eth_hash.auto import keccak
+
 from eth_utils import (
     encode_hex,
 )
@@ -12,12 +13,13 @@
 )
 from eth.exceptions import (
     OutOfGas,
+    VMError,
 )
 from eth.vm.forks.homestead.computation import (
     HomesteadComputation,
 )
 
-from .constants import EIP170_CODE_SIZE_LIMIT
+from ..spurious_dragon.constants import EIP170_CODE_SIZE_LIMIT
 from .opcodes import SPURIOUS_DRAGON_OPCODES
 
 
@@ -68,6 +70,12 @@ def apply_create_message(
                     computation.error = err
                     state.revert(snapshot)
                 else:
+                    try:
+                        cls.validate_new_contract_code(contract_code)
+                    except VMError as err:
+                        state.revert(snapshot)
+                        raise err
+
                     if cls.logger:
                         cls.logger.debug2(
                             "SETTING CODE: %s -> length: %s | hash: %s",
@@ -81,3 +89,8 @@ def apply_create_message(
             else:
                 state.commit(snapshot)
             return computation
+
+    @classmethod
+    def validate_new_contract_code(cls, contract_code: bytes) -> None:
+        # helps facilitate EIP-3541 validation in LondonComputation
+        pass

eth/vm/forks/spurious_dragon/constants.py

@@ -1,9 +1,3 @@
-#
-# Gas Costs and Refunds
-#
-GAS_CODEDEPOSIT = 200
-
-
 # https://github.com/ethereum/EIPs/issues/160
 GAS_EXP_EIP160 = 10
 GAS_EXPBYTE_EIP160 = 50

newsfragments/2018.feature.rst

@@ -0,0 +1,3 @@
+Implement `EIP-3554 <https://eips.ethereum.org/EIPS/eip-3554>`_ for London support.
+
+Implement `EIP-3541 <https://eips.ethereum.org/EIPS/eip-3541>`_ for London support.

tests/core/vm/conftest.py

@@ -0,0 +1,33 @@
+import pytest
+from eth_utils import to_canonical_address
+
+from eth.vm.transaction_context import BaseTransactionContext
+
+
+@pytest.fixture
+def normalized_address_a():
+    return "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"
+
+
+@pytest.fixture
+def normalized_address_b():
+    return "0xcd1722f3947def4cf144679da39c4c32bdc35681"
+
+
+@pytest.fixture
+def canonical_address_a(normalized_address_a):
+    return to_canonical_address(normalized_address_a)
+
+
+@pytest.fixture
+def canonical_address_b(normalized_address_b):
+    return to_canonical_address(normalized_address_b)
+
+
+@pytest.fixture
+def transaction_context(canonical_address_b):
+    tx_context = BaseTransactionContext(
+        gas_price=1,
+        origin=canonical_address_b,
+    )
+    return tx_context