Switch to ethereum rlp

setup.cfg

@@ -116,6 +116,7 @@ install_requires =
     typing_extensions>=4
     py_ecc @ git+https://github.com/petertdavies/py_ecc.git@127184f4c57b1812da959586d0fe8f43bb1a2389
     ethereum-types>=0.2.1,<0.3
+    ethereum-rlp>=0.1.1,<0.2
 
 [options.package_data]
 ethereum =

src/ethereum/arrow_glacier/fork.py

@@ -15,14 +15,14 @@
 from dataclasses import dataclass
 from typing import List, Optional, Set, Tuple, Union
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.ethash import dataset_size, generate_cache, hashimoto_light
 from ethereum.exceptions import InvalidBlock, InvalidSenderError
 
-from .. import rlp
 from . import vm
 from .blocks import Block, Header, Log, Receipt
 from .bloom import logs_bloom
@@ -351,7 +351,7 @@ def generate_header_hash_for_pow(header: Header) -> Hash32:
         header.base_fee_per_gas,
     )
 
-    return rlp.rlp_hash(header_data_without_pow_artefacts)
+    return keccak256(rlp.encode(header_data_without_pow_artefacts))
 
 
 def validate_proof_of_work(header: Header) -> None:
@@ -650,8 +650,8 @@ def validate_ommers(
     chain :
         History and current state.
     """
-    block_hash = rlp.rlp_hash(block_header)
-    if rlp.rlp_hash(ommers) != block_header.ommers_hash:
+    block_hash = keccak256(rlp.encode(block_header))
+    if keccak256(rlp.encode(ommers)) != block_header.ommers_hash:
         raise InvalidBlock
 
     if len(ommers) == 0:
@@ -669,18 +669,19 @@ def validate_ommers(
     if len(ommers) > 2:
         raise InvalidBlock
 
-    ommers_hashes = [rlp.rlp_hash(ommer) for ommer in ommers]
+    ommers_hashes = [keccak256(rlp.encode(ommer)) for ommer in ommers]
     if len(ommers_hashes) != len(set(ommers_hashes)):
         raise InvalidBlock
 
     recent_canonical_blocks = chain.blocks[-(MAX_OMMER_DEPTH + Uint(1)) :]
     recent_canonical_block_hashes = {
-        rlp.rlp_hash(block.header) for block in recent_canonical_blocks
+        keccak256(rlp.encode(block.header))
+        for block in recent_canonical_blocks
     }
     recent_ommers_hashes: Set[Hash32] = set()
     for block in recent_canonical_blocks:
         recent_ommers_hashes = recent_ommers_hashes.union(
-            {rlp.rlp_hash(ommer) for ommer in block.ommers}
+            {keccak256(rlp.encode(ommer)) for ommer in block.ommers}
         )
 
     for ommer_index, ommer in enumerate(ommers):

src/ethereum/arrow_glacier/fork_types.py

@@ -14,11 +14,11 @@
 
 from dataclasses import dataclass
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes20, Bytes256
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from .. import rlp
 from ..crypto.hash import Hash32, keccak256
 
 Address = Bytes20

src/ethereum/arrow_glacier/transactions.py

@@ -6,6 +6,7 @@
 from dataclasses import dataclass
 from typing import Tuple, Union
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U64, U256, Uint
@@ -14,7 +15,6 @@
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.exceptions import InvalidSignatureError
 
-from .. import rlp
 from .exceptions import TransactionTypeError
 from .fork_types import Address
 

src/ethereum/arrow_glacier/trie.py

@@ -28,6 +28,7 @@
     Union,
 )
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
@@ -36,7 +37,6 @@
 from ethereum.london import trie as previous_trie
 from ethereum.utils.hexadecimal import hex_to_bytes
 
-from .. import rlp
 from .blocks import Receipt
 from .fork_types import Account, Address, Root, encode_account
 from .transactions import LegacyTransaction

src/ethereum/arrow_glacier/utils/address.py

@@ -14,13 +14,13 @@
 """
 from typing import Union
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes32
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import keccak256
 from ethereum.utils.byte import left_pad_zero_bytes
 
-from ... import rlp
 from ..fork_types import Address
 
 

src/ethereum/berlin/fork.py

@@ -15,14 +15,14 @@
 from dataclasses import dataclass
 from typing import List, Optional, Set, Tuple, Union
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.ethash import dataset_size, generate_cache, hashimoto_light
 from ethereum.exceptions import InvalidBlock, InvalidSenderError
 
-from .. import rlp
 from . import vm
 from .blocks import Block, Header, Log, Receipt
 from .bloom import logs_bloom
@@ -274,7 +274,7 @@ def generate_header_hash_for_pow(header: Header) -> Hash32:
         header.extra_data,
     )
 
-    return rlp.rlp_hash(header_data_without_pow_artefacts)
+    return keccak256(rlp.encode(header_data_without_pow_artefacts))
 
 
 def validate_proof_of_work(header: Header) -> None:
@@ -544,8 +544,8 @@ def validate_ommers(
     chain :
         History and current state.
     """
-    block_hash = rlp.rlp_hash(block_header)
-    if rlp.rlp_hash(ommers) != block_header.ommers_hash:
+    block_hash = keccak256(rlp.encode(block_header))
+    if keccak256(rlp.encode(ommers)) != block_header.ommers_hash:
         raise InvalidBlock
 
     if len(ommers) == 0:
@@ -563,18 +563,19 @@ def validate_ommers(
     if len(ommers) > 2:
         raise InvalidBlock
 
-    ommers_hashes = [rlp.rlp_hash(ommer) for ommer in ommers]
+    ommers_hashes = [keccak256(rlp.encode(ommer)) for ommer in ommers]
     if len(ommers_hashes) != len(set(ommers_hashes)):
         raise InvalidBlock
 
     recent_canonical_blocks = chain.blocks[-(MAX_OMMER_DEPTH + Uint(1)) :]
     recent_canonical_block_hashes = {
-        rlp.rlp_hash(block.header) for block in recent_canonical_blocks
+        keccak256(rlp.encode(block.header))
+        for block in recent_canonical_blocks
     }
     recent_ommers_hashes: Set[Hash32] = set()
     for block in recent_canonical_blocks:
         recent_ommers_hashes = recent_ommers_hashes.union(
-            {rlp.rlp_hash(ommer) for ommer in block.ommers}
+            {keccak256(rlp.encode(ommer)) for ommer in block.ommers}
         )
 
     for ommer_index, ommer in enumerate(ommers):

src/ethereum/berlin/fork_types.py

@@ -14,11 +14,11 @@
 
 from dataclasses import dataclass
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes20, Bytes256
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from .. import rlp
 from ..crypto.hash import Hash32, keccak256
 
 Address = Bytes20

src/ethereum/berlin/transactions.py

@@ -6,6 +6,7 @@
 from dataclasses import dataclass
 from typing import Tuple, Union
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U64, U256, Uint
@@ -14,7 +15,6 @@
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.exceptions import InvalidSignatureError
 
-from .. import rlp
 from .exceptions import TransactionTypeError
 from .fork_types import Address
 

src/ethereum/berlin/trie.py

@@ -28,6 +28,7 @@
     Union,
 )
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
@@ -36,7 +37,6 @@
 from ethereum.muir_glacier import trie as previous_trie
 from ethereum.utils.hexadecimal import hex_to_bytes
 
-from .. import rlp
 from .blocks import Receipt
 from .fork_types import Account, Address, Root, encode_account
 from .transactions import LegacyTransaction

src/ethereum/berlin/utils/address.py

@@ -14,13 +14,13 @@
 """
 from typing import Union
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes32
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import keccak256
 from ethereum.utils.byte import left_pad_zero_bytes
 
-from ... import rlp
 from ..fork_types import Address
 
 

src/ethereum/byzantium/fork.py

@@ -15,14 +15,14 @@
 from dataclasses import dataclass
 from typing import List, Optional, Set, Tuple
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.ethash import dataset_size, generate_cache, hashimoto_light
 from ethereum.exceptions import InvalidBlock, InvalidSenderError
 
-from .. import rlp
 from . import vm
 from .blocks import Block, Header, Log, Receipt
 from .bloom import logs_bloom
@@ -270,7 +270,7 @@ def generate_header_hash_for_pow(header: Header) -> Hash32:
         header.extra_data,
     )
 
-    return rlp.rlp_hash(header_data_without_pow_artefacts)
+    return keccak256(rlp.encode(header_data_without_pow_artefacts))
 
 
 def validate_proof_of_work(header: Header) -> None:
@@ -534,8 +534,8 @@ def validate_ommers(
     chain :
         History and current state.
     """
-    block_hash = rlp.rlp_hash(block_header)
-    if rlp.rlp_hash(ommers) != block_header.ommers_hash:
+    block_hash = keccak256(rlp.encode(block_header))
+    if keccak256(rlp.encode(ommers)) != block_header.ommers_hash:
         raise InvalidBlock
 
     if len(ommers) == 0:
@@ -553,18 +553,19 @@ def validate_ommers(
     if len(ommers) > 2:
         raise InvalidBlock
 
-    ommers_hashes = [rlp.rlp_hash(ommer) for ommer in ommers]
+    ommers_hashes = [keccak256(rlp.encode(ommer)) for ommer in ommers]
     if len(ommers_hashes) != len(set(ommers_hashes)):
         raise InvalidBlock
 
     recent_canonical_blocks = chain.blocks[-(MAX_OMMER_DEPTH + Uint(1)) :]
     recent_canonical_block_hashes = {
-        rlp.rlp_hash(block.header) for block in recent_canonical_blocks
+        keccak256(rlp.encode(block.header))
+        for block in recent_canonical_blocks
     }
     recent_ommers_hashes: Set[Hash32] = set()
     for block in recent_canonical_blocks:
         recent_ommers_hashes = recent_ommers_hashes.union(
-            {rlp.rlp_hash(ommer) for ommer in block.ommers}
+            {keccak256(rlp.encode(ommer)) for ommer in block.ommers}
         )
 
     for ommer_index, ommer in enumerate(ommers):

src/ethereum/byzantium/fork_types.py

@@ -14,11 +14,11 @@
 
 from dataclasses import dataclass
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes20, Bytes256
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from .. import rlp
 from ..crypto.hash import Hash32, keccak256
 
 Address = Bytes20

src/ethereum/byzantium/transactions.py

@@ -6,6 +6,7 @@
 from dataclasses import dataclass
 from typing import Union
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U64, U256, Uint
@@ -14,7 +15,6 @@
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.exceptions import InvalidSignatureError
 
-from .. import rlp
 from .fork_types import Address
 
 TX_BASE_COST = 21000

src/ethereum/byzantium/trie.py

@@ -28,6 +28,7 @@
     Union,
 )
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
@@ -36,7 +37,6 @@
 from ethereum.spurious_dragon import trie as previous_trie
 from ethereum.utils.hexadecimal import hex_to_bytes
 
-from .. import rlp
 from .blocks import Receipt
 from .fork_types import Account, Address, Root, encode_account
 from .transactions import Transaction

src/ethereum/byzantium/utils/address.py

@@ -14,12 +14,12 @@
 """
 from typing import Union
 
+from ethereum_rlp import rlp
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import keccak256
 from ethereum.utils.byte import left_pad_zero_bytes
 
-from ... import rlp
 from ..fork_types import Address
 
 

src/ethereum/cancun/fork.py

@@ -15,13 +15,13 @@
 from dataclasses import dataclass
 from typing import List, Optional, Tuple, Union
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.exceptions import InvalidBlock, InvalidSenderError
 
-from .. import rlp
 from . import vm
 from .blocks import Block, Header, Log, Receipt, Withdrawal
 from .bloom import logs_bloom

src/ethereum/cancun/fork_types.py

@@ -14,11 +14,11 @@
 
 from dataclasses import dataclass
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes20, Bytes256
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from .. import rlp
 from ..crypto.hash import Hash32, keccak256
 
 Address = Bytes20