review fixes

Author: souradeep-das

src/ethereum_spec_tools/evm_tools/t8n/env.py

@@ -372,6 +372,15 @@ def read_randao(self, data: Any, t8n: "T8N") -> None:
                 left_pad_zero_bytes(hex_to_bytes(current_random), 32)
             )
 
+    def _to_canonical_withdrawal(self, raw, fork):
+        """Convert raw withdrawal to canonical format."""
+        return fork.Withdrawal(
+            index=U64(raw.index),
+            validator_index=U64(raw.validator_index),
+            address=raw.address,
+            amount=U256(raw.amount),
+        )
+
     def read_withdrawals_pydantic(self, data: Any, t8n: "T8N") -> None:
         """
         Read the withdrawals from the data.
@@ -387,7 +396,10 @@ def to_canonical_withdrawal(raw):
                         address=raw.address,
                         amount=U256(raw.amount),
                     )
-                self.withdrawals = tuple(to_canonical_withdrawal(wd) for wd in raw_withdrawals)
+                self.withdrawals = tuple(
+                    self._to_canonical_withdrawal(wd, t8n.fork)
+                    for wd in raw_withdrawals
+                )
             else:
                 self.withdrawals = ()
 

src/ethereum_spec_tools/evm_tools/t8n/t8n_types.py

@@ -328,47 +328,49 @@ def sign_transaction(self, json_tx: Any) -> None:
             json_tx["y_parity"] = json_tx["v"]
 
 
-def convert_pydantic_tx_to_canonical(tx, fork):
-    """
-    Convert a Pydantic Transaction to the canonical transaction class for the given fork.
-    """
-
-    def convert_access_list(access_list):
-        if not access_list:
-            return []
-        AccessCls = getattr(fork, "Access", None)
-        return [
-            AccessCls(
-                account=entry.address,
-                slots=tuple(entry.storage_keys),
+def _convert_access_list(access_list, fork):
+    if not access_list:
+        return []
+    AccessCls = getattr(fork, "Access", None)
+    return [
+        AccessCls(
+            account=entry.address,
+            slots=tuple(entry.storage_keys),
+        )
+        for entry in access_list
+    ]
+
+
+def _convert_authorizations(auth_list, fork):
+    if not auth_list:
+        return []
+    AuthorizationCls = getattr(fork, "Authorization", None)
+    result = []
+    for entry in auth_list:
+        d = entry.model_dump()
+        result.append(
+            AuthorizationCls(
+                chain_id=U256(d.get("chain_id", 0)),
+                address=d["address"],
+                nonce=U64(d.get("nonce", 0)),
+                y_parity=U8(d.get("v", d.get("y_parity", 0))),
+                r=U256(d["r"]),
+                s=U256(d["s"]),
             )
-            for entry in access_list
-        ]
+        )
+    return result
 
-    def convert_authorizations(auth_list):
-        if not auth_list:
-            return []
-        AuthorizationCls = getattr(fork, "Authorization", None)
-        result = []
-        for entry in auth_list:
-            d = entry.model_dump()
-            result.append(
-                AuthorizationCls(
-                    chain_id=U256(d.get("chain_id", 0)),
-                    address=d["address"],
-                    nonce=U64(d.get("nonce", 0)),
-                    y_parity=U8(d.get("v", d.get("y_parity", 0))),
-                    r=U256(d["r"]),
-                    s=U256(d["s"]),
-                )
-            )
-        return result
 
-    def to_bytes20(val):
-        if val is None:
-            return Bytes0()
-        return Bytes20(val)
+def _to_bytes20(val):
+    if val is None:
+        return Bytes0()
+    return Bytes20(val)
 
+
+def convert_pydantic_tx_to_canonical(tx, fork):
+    """
+    Convert a Pydantic Transaction to the canonical transaction class for the given fork.
+    """
     tx_type = tx.ty or 0
 
     # SetCodeTransaction (Type 4)
@@ -379,11 +381,14 @@ def to_bytes20(val):
             max_priority_fee_per_gas=Uint(tx.max_priority_fee_per_gas or 0),
             max_fee_per_gas=Uint(tx.max_fee_per_gas or 0),
             gas=Uint(tx.gas_limit),
-            to=to_bytes20(tx.to),
+            to=_to_bytes20(tx.to),
             value=U256(tx.value),
             data=tx.data,
-            access_list=convert_access_list(tx.access_list),
-            authorizations=convert_authorizations(tx.authorization_list or []),
+            access_list=_convert_access_list(tx.access_list, fork),
+            authorizations=_convert_authorizations(
+                tx.authorization_list or [],
+                fork,
+            ),
             y_parity=U256(tx.v),
             r=U256(tx.r),
             s=U256(tx.s),
@@ -397,10 +402,10 @@ def to_bytes20(val):
             max_priority_fee_per_gas=Uint(tx.max_priority_fee_per_gas or 0),
             max_fee_per_gas=Uint(tx.max_fee_per_gas or 0),
             gas=Uint(tx.gas_limit),
-            to=to_bytes20(tx.to),
+            to=_to_bytes20(tx.to),
             value=U256(tx.value),
             data=tx.data,
-            access_list=convert_access_list(tx.access_list),
+            access_list=_convert_access_list(tx.access_list, fork),
             max_fee_per_blob_gas=Uint(tx.max_fee_per_blob_gas or 0),
             blob_versioned_hashes=tx.blob_versioned_hashes or (),
             y_parity=U256(tx.v),
@@ -416,10 +421,10 @@ def to_bytes20(val):
             max_priority_fee_per_gas=Uint(tx.max_priority_fee_per_gas or 0),
             max_fee_per_gas=Uint(tx.max_fee_per_gas or 0),
             gas=Uint(tx.gas_limit),
-            to=to_bytes20(tx.to),
+            to=_to_bytes20(tx.to),
             value=U256(tx.value),
             data=tx.data,
-            access_list=convert_access_list(tx.access_list),
+            access_list=_convert_access_list(tx.access_list, fork),
             y_parity=U256(tx.v),
             r=U256(tx.r),
             s=U256(tx.s),
@@ -432,10 +437,10 @@ def to_bytes20(val):
             nonce=U256(tx.nonce),
             gas_price=Uint(tx.gas_price or 0),
             gas=Uint(tx.gas_limit),
-            to=to_bytes20(tx.to),
+            to=_to_bytes20(tx.to),
             value=U256(tx.value),
             data=tx.data,
-            access_list=convert_access_list(tx.access_list),
+            access_list=_convert_access_list(tx.access_list, fork),
             y_parity=U256(tx.v),
             r=U256(tx.r),
             s=U256(tx.s),
@@ -451,7 +456,7 @@ def to_bytes20(val):
             nonce=U256(tx.nonce),
             gas_price=Uint(tx.gas_price or 0),
             gas=Uint(tx.gas_limit),
-            to=to_bytes20(tx.to),
+            to=_to_bytes20(tx.to),
             value=U256(tx.value),
             data=tx.data,
             v=U256(tx.v),