Merge pull request #968 from SamWilsn/markdown

Markdown & RLP

setup.cfg

@@ -162,7 +162,7 @@ test =
 lint =
     types-setuptools>=68.1.0.1,<69
     isort==5.13.2
-    mypy==1.5.1
+    mypy==1.10.0
     black==23.12.0
     flake8==6.1.0
     flake8-bugbear==23.12.2

src/ethereum/arrow_glacier/fork.py

@@ -335,7 +335,7 @@ def generate_header_hash_for_pow(header: Header) -> Hash32:
     hash : `Hash32`
         The PoW valid rlp hash of the passed in header.
     """
-    header_data_without_pow_artefacts = [
+    header_data_without_pow_artefacts = (
         header.parent_hash,
         header.ommers_hash,
         header.coinbase,
@@ -350,7 +350,7 @@ def generate_header_hash_for_pow(header: Header) -> Hash32:
         header.timestamp,
         header.extra_data,
         header.base_fee_per_gas,
-    ]
+    )
 
     return rlp.rlp_hash(header_data_without_pow_artefacts)
 

src/ethereum/arrow_glacier/trie.py

@@ -26,7 +26,6 @@
     Sequence,
     TypeVar,
     Union,
-    cast,
 )
 
 from ethereum.crypto.hash import keccak256
@@ -78,7 +77,7 @@ class LeafNode:
     """Leaf node in the Merkle Trie"""
 
     rest_of_key: Bytes
-    value: rlp.RLP
+    value: rlp.Extended
 
 
 @slotted_freezable
@@ -87,22 +86,22 @@ class ExtensionNode:
     """Extension node in the Merkle Trie"""
 
     key_segment: Bytes
-    subnode: rlp.RLP
+    subnode: rlp.Extended
 
 
 @slotted_freezable
 @dataclass
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.RLP]
-    value: rlp.RLP
+    subnodes: List[rlp.Extended]
+    value: rlp.Extended
 
 
 InternalNode = Union[LeafNode, ExtensionNode, BranchNode]
 
 
-def encode_internal_node(node: Optional[InternalNode]) -> rlp.RLP:
+def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
     """
     Encodes a Merkle Trie node into its RLP form. The RLP will then be
     serialized into a `Bytes` and hashed unless it is less that 32 bytes
@@ -121,7 +120,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.RLP:
     encoded : `rlp.RLP`
         The node encoded as RLP.
     """
-    unencoded: rlp.RLP
+    unencoded: rlp.Extended
     if node is None:
         unencoded = b""
     elif isinstance(node, LeafNode):
@@ -156,7 +155,7 @@ def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
         assert storage_root is not None
         return encode_account(node, storage_root)
     elif isinstance(node, (LegacyTransaction, Receipt, U256)):
-        return rlp.encode(cast(rlp.RLP, node))
+        return rlp.encode(node)
     elif isinstance(node, Bytes):
         return node
     else:

src/ethereum/base_types.py

@@ -652,6 +652,18 @@ def to_be_bytes(self) -> "Bytes":
 
     # TODO: Implement neg, pos, abs ...
 
+    @classmethod
+    def from_be_bytes(cls: Type[T], buffer: "Bytes") -> T:
+        """
+        Converts a sequence of bytes into a fixed sized unsigned integer
+        from its big endian representation.
+        """
+        max_length = (7 + cls.MAX_VALUE.bit_length()) // 8
+        if len(buffer) > max_length:
+            raise ValueError()
+
+        return cls(int.from_bytes(buffer, "big"))
+
 
 class U256(FixedUint):
     """
@@ -665,17 +677,6 @@ class U256(FixedUint):
 
     __slots__ = ()
 
-    @classmethod
-    def from_be_bytes(cls: Type, buffer: "Bytes") -> "U256":
-        """
-        Converts a sequence of bytes into a fixed sized unsigned integer
-        from its big endian representation.
-        """
-        if len(buffer) > 32:
-            raise ValueError()
-
-        return cls(int.from_bytes(buffer, "big"))
-
     @classmethod
     def from_signed(cls: Type, value: int) -> "U256":
         """

src/ethereum/berlin/fork.py

@@ -259,7 +259,7 @@ def generate_header_hash_for_pow(header: Header) -> Hash32:
     hash : `Hash32`
         The PoW valid rlp hash of the passed in header.
     """
-    header_data_without_pow_artefacts = [
+    header_data_without_pow_artefacts = (
         header.parent_hash,
         header.ommers_hash,
         header.coinbase,
@@ -273,7 +273,7 @@ def generate_header_hash_for_pow(header: Header) -> Hash32:
         header.gas_used,
         header.timestamp,
         header.extra_data,
-    ]
+    )
 
     return rlp.rlp_hash(header_data_without_pow_artefacts)
 

src/ethereum/berlin/trie.py

@@ -26,7 +26,6 @@
     Sequence,
     TypeVar,
     Union,
-    cast,
 )
 
 from ethereum.crypto.hash import keccak256
@@ -78,7 +77,7 @@ class LeafNode:
     """Leaf node in the Merkle Trie"""
 
     rest_of_key: Bytes
-    value: rlp.RLP
+    value: rlp.Extended
 
 
 @slotted_freezable
@@ -87,22 +86,22 @@ class ExtensionNode:
     """Extension node in the Merkle Trie"""
 
     key_segment: Bytes
-    subnode: rlp.RLP
+    subnode: rlp.Extended
 
 
 @slotted_freezable
 @dataclass
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.RLP]
-    value: rlp.RLP
+    subnodes: List[rlp.Extended]
+    value: rlp.Extended
 
 
 InternalNode = Union[LeafNode, ExtensionNode, BranchNode]
 
 
-def encode_internal_node(node: Optional[InternalNode]) -> rlp.RLP:
+def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
     """
     Encodes a Merkle Trie node into its RLP form. The RLP will then be
     serialized into a `Bytes` and hashed unless it is less that 32 bytes
@@ -121,7 +120,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.RLP:
     encoded : `rlp.RLP`
         The node encoded as RLP.
     """
-    unencoded: rlp.RLP
+    unencoded: rlp.Extended
     if node is None:
         unencoded = b""
     elif isinstance(node, LeafNode):
@@ -156,7 +155,7 @@ def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
         assert storage_root is not None
         return encode_account(node, storage_root)
     elif isinstance(node, (LegacyTransaction, Receipt, U256)):
-        return rlp.encode(cast(rlp.RLP, node))
+        return rlp.encode(node)
     elif isinstance(node, Bytes):
         return node
     else:

src/ethereum/byzantium/fork.py

@@ -253,7 +253,7 @@ def generate_header_hash_for_pow(header: Header) -> Hash32:
     hash : `Hash32`
         The PoW valid rlp hash of the passed in header.
     """
-    header_data_without_pow_artefacts = [
+    header_data_without_pow_artefacts = (
         header.parent_hash,
         header.ommers_hash,
         header.coinbase,
@@ -267,7 +267,7 @@ def generate_header_hash_for_pow(header: Header) -> Hash32:
         header.gas_used,
         header.timestamp,
         header.extra_data,
-    ]
+    )
 
     return rlp.rlp_hash(header_data_without_pow_artefacts)
 

src/ethereum/byzantium/trie.py

@@ -26,7 +26,6 @@
     Sequence,
     TypeVar,
     Union,
-    cast,
 )
 
 from ethereum.crypto.hash import keccak256
@@ -78,7 +77,7 @@ class LeafNode:
     """Leaf node in the Merkle Trie"""
 
     rest_of_key: Bytes
-    value: rlp.RLP
+    value: rlp.Extended
 
 
 @slotted_freezable
@@ -87,22 +86,22 @@ class ExtensionNode:
     """Extension node in the Merkle Trie"""
 
     key_segment: Bytes
-    subnode: rlp.RLP
+    subnode: rlp.Extended
 
 
 @slotted_freezable
 @dataclass
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.RLP]
-    value: rlp.RLP
+    subnodes: List[rlp.Extended]
+    value: rlp.Extended
 
 
 InternalNode = Union[LeafNode, ExtensionNode, BranchNode]
 
 
-def encode_internal_node(node: Optional[InternalNode]) -> rlp.RLP:
+def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
     """
     Encodes a Merkle Trie node into its RLP form. The RLP will then be
     serialized into a `Bytes` and hashed unless it is less that 32 bytes
@@ -121,7 +120,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.RLP:
     encoded : `rlp.RLP`
         The node encoded as RLP.
     """
-    unencoded: rlp.RLP
+    unencoded: rlp.Extended
     if node is None:
         unencoded = b""
     elif isinstance(node, LeafNode):
@@ -156,7 +155,7 @@ def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
         assert storage_root is not None
         return encode_account(node, storage_root)
     elif isinstance(node, (Transaction, Receipt, U256)):
-        return rlp.encode(cast(rlp.RLP, node))
+        return rlp.encode(node)
     elif isinstance(node, Bytes):
         return node
     else:

src/ethereum/cancun/trie.py

@@ -26,7 +26,6 @@
     Sequence,
     TypeVar,
     Union,
-    cast,
 )
 
 from ethereum.crypto.hash import keccak256
@@ -81,7 +80,7 @@ class LeafNode:
     """Leaf node in the Merkle Trie"""
 
     rest_of_key: Bytes
-    value: rlp.RLP
+    value: rlp.Extended
 
 
 @slotted_freezable
@@ -90,22 +89,22 @@ class ExtensionNode:
     """Extension node in the Merkle Trie"""
 
     key_segment: Bytes
-    subnode: rlp.RLP
+    subnode: rlp.Extended
 
 
 @slotted_freezable
 @dataclass
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.RLP]
-    value: rlp.RLP
+    subnodes: List[rlp.Extended]
+    value: rlp.Extended
 
 
 InternalNode = Union[LeafNode, ExtensionNode, BranchNode]
 
 
-def encode_internal_node(node: Optional[InternalNode]) -> rlp.RLP:
+def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
     """
     Encodes a Merkle Trie node into its RLP form. The RLP will then be
     serialized into a `Bytes` and hashed unless it is less that 32 bytes
@@ -121,10 +120,10 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.RLP:
 
     Returns
     -------
-    encoded : `rlp.RLP`
+    encoded : `rlp.Extended`
         The node encoded as RLP.
     """
-    unencoded: rlp.RLP
+    unencoded: rlp.Extended
     if node is None:
         unencoded = b""
     elif isinstance(node, LeafNode):
@@ -159,7 +158,7 @@ def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
         assert storage_root is not None
         return encode_account(node, storage_root)
     elif isinstance(node, (LegacyTransaction, Receipt, Withdrawal, U256)):
-        return rlp.encode(cast(rlp.RLP, node))
+        return rlp.encode(node)
     elif isinstance(node, Bytes):
         return node
     else:

src/ethereum/constantinople/fork.py

@@ -253,7 +253,7 @@ def generate_header_hash_for_pow(header: Header) -> Hash32:
     hash : `Hash32`
         The PoW valid rlp hash of the passed in header.
     """
-    header_data_without_pow_artefacts = [
+    header_data_without_pow_artefacts = (
         header.parent_hash,
         header.ommers_hash,
         header.coinbase,
@@ -267,7 +267,7 @@ def generate_header_hash_for_pow(header: Header) -> Hash32:
         header.gas_used,
         header.timestamp,
         header.extra_data,
-    ]
+    )
 
     return rlp.rlp_hash(header_data_without_pow_artefacts)