fix: Number -> HexNumber for BAL types

- This becomes an issue when JSON-serializing the BAL object and then
  re-filling from the fixture. We should use `HexNumber` for any Number
  fields as this correctly serializes to JSON as hex representation.

Author: fselmo

src/ethereum_test_types/block_access_list/__init__.py

@@ -17,7 +17,6 @@
     CamelModel,
     EthereumTestRootModel,
     HexNumber,
-    Number,
     RLPSerializable,
     StorageKey,
 )
@@ -41,16 +40,22 @@ def composed(bal: BlockAccessList) -> BlockAccessList:
 class BalNonceChange(CamelModel, RLPSerializable):
     """Represents a nonce change in the block access list."""
 
-    tx_index: Number = Field(..., description="Transaction index where the change occurred")
-    post_nonce: Number = Field(..., description="Nonce value after the transaction")
+    tx_index: HexNumber = Field(
+        HexNumber(1),
+        description="Transaction index where the change occurred",
+    )
+    post_nonce: HexNumber = Field(..., description="Nonce value after the transaction")
 
     rlp_fields: ClassVar[List[str]] = ["tx_index", "post_nonce"]
 
 
 class BalBalanceChange(CamelModel, RLPSerializable):
     """Represents a balance change in the block access list."""
 
-    tx_index: Number = Field(..., description="Transaction index where the change occurred")
+    tx_index: HexNumber = Field(
+        HexNumber(1),
+        description="Transaction index where the change occurred",
+    )
     post_balance: HexNumber = Field(..., description="Balance after the transaction")
 
     rlp_fields: ClassVar[List[str]] = ["tx_index", "post_balance"]
@@ -59,7 +64,10 @@ class BalBalanceChange(CamelModel, RLPSerializable):
 class BalCodeChange(CamelModel, RLPSerializable):
     """Represents a code change in the block access list."""
 
-    tx_index: Number = Field(..., description="Transaction index where the change occurred")
+    tx_index: HexNumber = Field(
+        HexNumber(1),
+        description="Transaction index where the change occurred",
+    )
     new_code: Bytes = Field(..., description="New code bytes")
 
     rlp_fields: ClassVar[List[str]] = ["tx_index", "new_code"]
@@ -68,7 +76,10 @@ class BalCodeChange(CamelModel, RLPSerializable):
 class BalStorageChange(CamelModel, RLPSerializable):
     """Represents a change to a specific storage slot."""
 
-    tx_index: Number = Field(..., description="Transaction index where the change occurred")
+    tx_index: HexNumber = Field(
+        HexNumber(1),
+        description="Transaction index where the change occurred",
+    )
     post_value: StorageKey = Field(..., description="Value after the transaction")
 
     rlp_fields: ClassVar[List[str]] = ["tx_index", "post_value"]

src/ethereum_test_types/block_access_list/modifiers.py

@@ -8,7 +8,7 @@
 
 from typing import Callable, List
 
-from ethereum_test_base_types import Address, Number
+from ethereum_test_base_types import Address, HexNumber
 
 from .. import BalCodeChange
 from . import (
@@ -244,36 +244,36 @@ def transform(bal: BlockAccessList) -> BlockAccessList:
             if new_account.nonce_changes:
                 for nonce_change in new_account.nonce_changes:
                     if nonce_change.tx_index == tx1:
-                        nonce_change.tx_index = Number(tx2)
+                        nonce_change.tx_index = HexNumber(tx2)
                     elif nonce_change.tx_index == tx2:
-                        nonce_change.tx_index = Number(tx1)
+                        nonce_change.tx_index = HexNumber(tx1)
 
             # Swap in balance changes
             if new_account.balance_changes:
                 for balance_change in new_account.balance_changes:
                     if balance_change.tx_index == tx1:
-                        balance_change.tx_index = Number(tx2)
+                        balance_change.tx_index = HexNumber(tx2)
                     elif balance_change.tx_index == tx2:
-                        balance_change.tx_index = Number(tx1)
+                        balance_change.tx_index = HexNumber(tx1)
 
             # Swap in storage changes (nested structure)
             if new_account.storage_changes:
                 for storage_slot in new_account.storage_changes:
                     for storage_change in storage_slot.slot_changes:
                         if storage_change.tx_index == tx1:
-                            storage_change.tx_index = Number(tx2)
+                            storage_change.tx_index = HexNumber(tx2)
                         elif storage_change.tx_index == tx2:
-                            storage_change.tx_index = Number(tx1)
+                            storage_change.tx_index = HexNumber(tx1)
 
             # Note: storage_reads is just a list of StorageKey, no tx_index to swap
 
             # Swap in code changes
             if new_account.code_changes:
                 for code_change in new_account.code_changes:
                     if code_change.tx_index == tx1:
-                        code_change.tx_index = Number(tx2)
+                        code_change.tx_index = HexNumber(tx2)
                     elif code_change.tx_index == tx2:
-                        code_change.tx_index = Number(tx1)
+                        code_change.tx_index = HexNumber(tx1)
 
             new_root.append(new_account)