Refactor the Environment dataclass

.github/workflows/test.yaml

@@ -41,7 +41,7 @@ jobs:
 
       - name: Run Tox (CPython)
         if: "${{ !startsWith(matrix.py, 'pypy') }}"
-        run: tox -e static,optimized,py3
+        run: tox -e static,py3
 
       - name: Run Tox (PyPy)
         if: "${{ startsWith(matrix.py, 'pypy') }}"

setup.cfg

@@ -104,6 +104,12 @@ packages =
     ethereum/cancun/vm
     ethereum/cancun/vm/instructions
     ethereum/cancun/vm/precompiled_contracts
+    ethereum/prague
+    ethereum/prague/utils
+    ethereum/prague/vm
+    ethereum/prague/vm/instructions
+    ethereum/prague/vm/precompiled_contracts
+    ethereum/prague/vm/precompiled_contracts/bls12_381
 
 
 package_dir =
@@ -114,7 +120,7 @@ install_requires =
     pycryptodome>=3,<4
     coincurve>=20,<21
     typing_extensions>=4
-    eth2spec @ git+https://github.com/ethereum/consensus-specs.git@d08a91cad5a8657e57750b7cfe3ac2178b3d9c0c
+    py_ecc @ git+https://github.com/petertdavies/py_ecc.git@127184f4c57b1812da959586d0fe8f43bb1a2389
 
 [options.package_data]
 ethereum =

src/ethereum/arrow_glacier/fork.py

@@ -16,6 +16,7 @@
 from typing import List, Optional, Set, Tuple, Union
 
 from ethereum.base_types import Bytes0
+from ethereum.crypto import InvalidSignature
 from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.ethash import dataset_size, generate_cache, hashimoto_light
@@ -417,6 +418,7 @@ def check_transaction(
     """
     if tx.gas > gas_available:
         raise InvalidBlock
+
     sender_address = recover_sender(chain_id, tx)
 
     if isinstance(tx, FeeMarketTransaction):
@@ -958,26 +960,29 @@ def recover_sender(chain_id: U64, tx: Transaction) -> Address:
     if 0 >= s or s > SECP256K1N // 2:
         raise InvalidBlock
 
-    if isinstance(tx, LegacyTransaction):
-        v = tx.v
-        if v == 27 or v == 28:
+    try:
+        if isinstance(tx, LegacyTransaction):
+            v = tx.v
+            if v == 27 or v == 28:
+                public_key = secp256k1_recover(
+                    r, s, v - 27, signing_hash_pre155(tx)
+                )
+            else:
+                if v != 35 + chain_id * 2 and v != 36 + chain_id * 2:
+                    raise InvalidBlock
+                public_key = secp256k1_recover(
+                    r, s, v - 35 - chain_id * 2, signing_hash_155(tx, chain_id)
+                )
+        elif isinstance(tx, AccessListTransaction):
             public_key = secp256k1_recover(
-                r, s, v - 27, signing_hash_pre155(tx)
+                r, s, tx.y_parity, signing_hash_2930(tx)
             )
-        else:
-            if v != 35 + chain_id * 2 and v != 36 + chain_id * 2:
-                raise InvalidBlock
+        elif isinstance(tx, FeeMarketTransaction):
             public_key = secp256k1_recover(
-                r, s, v - 35 - chain_id * 2, signing_hash_155(tx, chain_id)
+                r, s, tx.y_parity, signing_hash_1559(tx)
             )
-    elif isinstance(tx, AccessListTransaction):
-        public_key = secp256k1_recover(
-            r, s, tx.y_parity, signing_hash_2930(tx)
-        )
-    elif isinstance(tx, FeeMarketTransaction):
-        public_key = secp256k1_recover(
-            r, s, tx.y_parity, signing_hash_1559(tx)
-        )
+    except InvalidSignature as e:
+        raise InvalidBlock from e
 
     return Address(keccak256(public_key)[12:32])
 

src/ethereum/arrow_glacier/state.py

@@ -362,13 +362,32 @@ def account_has_code_or_nonce(state: State, address: Address) -> bool:
     Returns
     -------
     has_code_or_nonce : `bool`
-        True if if an account has non zero nonce or non empty code,
+        True if the account has non zero nonce or non empty code,
         False otherwise.
     """
     account = get_account(state, address)
     return account.nonce != Uint(0) or account.code != b""
 
 
+def account_has_storage(state: State, address: Address) -> bool:
+    """
+    Checks if an account has storage.
+
+    Parameters
+    ----------
+    state:
+        The state
+    address:
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : `bool`
+        True if the account has storage, False otherwise.
+    """
+    return address in state._storage_tries
+
+
 def is_account_empty(state: State, address: Address) -> bool:
     """
     Checks if an account has zero nonce, empty code and zero balance.

src/ethereum/arrow_glacier/vm/instructions/system.py

@@ -18,6 +18,7 @@
 from ...state import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
+    account_has_storage,
     get_account,
     increment_nonce,
     is_account_alive,
@@ -88,7 +89,9 @@ def generic_create(
         push(evm.stack, U256(0))
         return
 
-    if account_has_code_or_nonce(evm.env.state, contract_address):
+    if account_has_code_or_nonce(
+        evm.env.state, contract_address
+    ) or account_has_storage(evm.env.state, contract_address):
         increment_nonce(evm.env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return

src/ethereum/arrow_glacier/vm/interpreter.py

@@ -31,6 +31,7 @@
 from ..state import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
+    account_has_storage,
     begin_transaction,
     commit_transaction,
     destroy_storage,
@@ -107,7 +108,7 @@ def process_message_call(
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
             env.state, message.current_target
-        )
+        ) or account_has_storage(env.state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 Uint(0), U256(0), tuple(), set(), set(), AddressCollision()

src/ethereum/arrow_glacier/vm/precompiled_contracts/ecrecover.py

@@ -12,6 +12,7 @@
 Implementation of the ECRECOVER precompiled contract.
 """
 from ethereum.base_types import U256
+from ethereum.crypto import InvalidSignature
 from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.utils.byte import left_pad_zero_bytes
@@ -52,7 +53,7 @@ def ecrecover(evm: Evm) -> None:
 
     try:
         public_key = secp256k1_recover(r, s, v - 27, message_hash)
-    except ValueError:
+    except InvalidSignature:
         # unable to extract public key
         return
 

src/ethereum/base_types.py

@@ -710,6 +710,41 @@ def to_signed(self) -> int:
 U256.MAX_VALUE = int.__new__(U256, (2**256) - 1)
 
 
+class U8(FixedUint):
+    """
+    Unsigned positive integer, which can represent `0` to `2 ** 8 - 1`,
+    inclusive.
+    """
+
+    MAX_VALUE: ClassVar["U8"]
+    """
+    Largest value that can be represented by this integer type.
+    """
+
+    __slots__ = ()
+
+    @classmethod
+    def from_le_bytes(cls: Type, buffer: "Bytes1") -> "U8":
+        """
+        Converts a sequence of bytes into an arbitrarily sized unsigned integer
+        from its little endian representation.
+        """
+        if len(buffer) > 1:
+            raise ValueError()
+
+        return cls(int.from_bytes(buffer, "little"))
+
+    def to_le_bytes(self) -> "Bytes1":
+        """
+        Converts this fixed sized unsigned integer into its little endian
+        representation, with exactly 1 byte.
+        """
+        return Bytes1(self.to_bytes(1, "little"))
+
+
+U8.MAX_VALUE = int.__new__(U8, (2**8) - 1)
+
+
 class U32(FixedUint):
     """
     Unsigned positive integer, which can represent `0` to `2 ** 32 - 1`,
@@ -848,6 +883,17 @@ class Bytes0(FixedBytes):
     """
 
 
+class Bytes1(FixedBytes):
+    """
+    Byte array of exactly a single byte.
+    """
+
+    LENGTH = 1
+    """
+    Number of bytes in each instance of this class.
+    """
+
+
 class Bytes4(FixedBytes):
     """
     Byte array of exactly four elements.
@@ -911,6 +957,17 @@ class Bytes64(FixedBytes):
     """
 
 
+class Bytes96(FixedBytes):
+    """
+    Byte array of exactly 96 elements.
+    """
+
+    LENGTH = 96
+    """
+    Number of bytes in each instance of this class.
+    """
+
+
 class Bytes256(FixedBytes):
     """
     Byte array of exactly 256 elements.

src/ethereum/berlin/fork.py

@@ -16,6 +16,7 @@
 from typing import List, Optional, Set, Tuple, Union
 
 from ethereum.base_types import Bytes0
+from ethereum.crypto import InvalidSignature
 from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.ethash import dataset_size, generate_cache, hashimoto_light
@@ -335,6 +336,7 @@ def check_transaction(
     """
     if tx.gas > gas_available:
         raise InvalidBlock
+
     sender_address = recover_sender(chain_id, tx)
 
     return sender_address
@@ -839,22 +841,25 @@ def recover_sender(chain_id: U64, tx: Transaction) -> Address:
     if 0 >= s or s > SECP256K1N // 2:
         raise InvalidBlock
 
-    if isinstance(tx, LegacyTransaction):
-        v = tx.v
-        if v == 27 or v == 28:
+    try:
+        if isinstance(tx, LegacyTransaction):
+            v = tx.v
+            if v == 27 or v == 28:
+                public_key = secp256k1_recover(
+                    r, s, v - 27, signing_hash_pre155(tx)
+                )
+            else:
+                if v != 35 + chain_id * 2 and v != 36 + chain_id * 2:
+                    raise InvalidBlock
+                public_key = secp256k1_recover(
+                    r, s, v - 35 - chain_id * 2, signing_hash_155(tx, chain_id)
+                )
+        elif isinstance(tx, AccessListTransaction):
             public_key = secp256k1_recover(
-                r, s, v - 27, signing_hash_pre155(tx)
+                r, s, tx.y_parity, signing_hash_2930(tx)
             )
-        else:
-            if v != 35 + chain_id * 2 and v != 36 + chain_id * 2:
-                raise InvalidBlock
-            public_key = secp256k1_recover(
-                r, s, v - 35 - chain_id * 2, signing_hash_155(tx, chain_id)
-            )
-    elif isinstance(tx, AccessListTransaction):
-        public_key = secp256k1_recover(
-            r, s, tx.y_parity, signing_hash_2930(tx)
-        )
+    except InvalidSignature as e:
+        raise InvalidBlock from e
 
     return Address(keccak256(public_key)[12:32])
 

src/ethereum/berlin/state.py

@@ -362,13 +362,32 @@ def account_has_code_or_nonce(state: State, address: Address) -> bool:
     Returns
     -------
     has_code_or_nonce : `bool`
-        True if if an account has non zero nonce or non empty code,
+        True if the account has non zero nonce or non empty code,
         False otherwise.
     """
     account = get_account(state, address)
     return account.nonce != Uint(0) or account.code != b""
 
 
+def account_has_storage(state: State, address: Address) -> bool:
+    """
+    Checks if an account has storage.
+
+    Parameters
+    ----------
+    state:
+        The state
+    address:
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : `bool`
+        True if the account has storage, False otherwise.
+    """
+    return address in state._storage_tries
+
+
 def is_account_empty(state: State, address: Address) -> bool:
     """
     Checks if an account has zero nonce, empty code and zero balance.

src/ethereum/berlin/vm/instructions/system.py

@@ -18,6 +18,7 @@
 from ...state import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
+    account_has_storage,
     get_account,
     increment_nonce,
     is_account_alive,
@@ -89,7 +90,9 @@ def generic_create(
         push(evm.stack, U256(0))
         return
 
-    if account_has_code_or_nonce(evm.env.state, contract_address):
+    if account_has_code_or_nonce(
+        evm.env.state, contract_address
+    ) or account_has_storage(evm.env.state, contract_address):
         increment_nonce(evm.env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return

src/ethereum/berlin/vm/interpreter.py

@@ -31,6 +31,7 @@
 from ..state import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
+    account_has_storage,
     begin_transaction,
     commit_transaction,
     destroy_storage,
@@ -106,7 +107,7 @@ def process_message_call(
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
             env.state, message.current_target
-        )
+        ) or account_has_storage(env.state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 Uint(0), U256(0), tuple(), set(), set(), AddressCollision()