refactor: move from remerkleable to ethereum_types and py-ssz

Author: unnawut

pyproject.toml

@@ -19,8 +19,10 @@ classifiers = [
 ]
 requires-python = ">=3.12"
 dependencies = [
+    "ethereum-types<=0.2.4,<0.3",
     "pydantic>=2.9.2,<3",
     "remerkleable>=0.1.28,<0.2",
+    "ssz>=0.5.2,<0.6",
     "typing-extensions>=4.4",
 ]
 

src/lean_spec/subspecs/pqdevnet-0/block.py

@@ -8,19 +8,20 @@
 """
 
 from dataclasses import dataclass
-from remerkleable.basic import uint64
-from remerkleable.byte_arrays import Bytes32
-from remerkleable.complex import List
 from pydantic import BaseModel, ConfigDict
 
+from ethereum_types.bytes import Bytes32
+from ethereum_types.numeric import U64
+from ssz.sedes.list import List
+
 from preset import VALIDATOR_REGISTRY_LIMIT
 from vote import Vote
 
 @dataclass
 class Block(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
-    slot: uint64
+    slot: U64
     parent: Bytes32
     votes: List[Vote, VALIDATOR_REGISTRY_LIMIT]
     # Diverged from 3SF-mini.py: Removed Optional from `state_root`

src/lean_spec/subspecs/pqdevnet-0/state.py

@@ -8,12 +8,13 @@
 """
 
 from dataclasses import dataclass
-from remerkleable.basic import uint64
-from remerkleable.bitfields import Bitlist
-from remerkleable.byte_arrays import Bytes32
-from remerkleable.complex import List
 from pydantic import BaseModel, ConfigDict
 
+from ethereum_types.bytes import Bytes32
+from ethereum_types.numeric import U64
+from ssz.sedes.bitlist import Bitlist
+from ssz.sedes.list import List
+
 from preset import MAX_HISTORICAL_BLOCK_HASHES, VALIDATOR_REGISTRY_LIMIT
 
 @dataclass
@@ -22,19 +23,19 @@ class State(BaseModel):
 
     # Diverged from 3SF-mini.py:
     #   - Removed `config: Config` from the state
-    #   - Using uint64 instead of native int for all fields
-    #   - Using Bytes32 instead of native str for all fields
+    #   - Using `U64` instead of native int for all fields
+    #   - Using `Bytes32` instead of native str for all fields
 
     latest_justified_hash: Bytes32
-    latest_justified_slot: uint64
+    latest_justified_slot: U64
 
     latest_finalized_hash: Bytes32
-    latest_finalized_slot: uint64
+    latest_finalized_slot: U64
 
     historical_block_hashes: List[Bytes32, MAX_HISTORICAL_BLOCK_HASHES]
     justified_slots: List[bool, MAX_HISTORICAL_BLOCK_HASHES]
 
     # Diverged from 3SF-mini.py:
     #   - Flattened `justifications: Dict[str, List[bool]]` for SSZ compatibility
     justifications_roots: List[Bytes32, MAX_HISTORICAL_BLOCK_HASHES]
-    justifications_validators: Bitlist[MAX_HISTORICAL_BLOCK_HASHES * VALIDATOR_REGISTRY_LIMIT]
+    justifications_validators: Bitlist(MAX_HISTORICAL_BLOCK_HASHES * VALIDATOR_REGISTRY_LIMIT)

src/lean_spec/subspecs/pqdevnet-0/vote.py

@@ -5,23 +5,24 @@
 """
 
 from dataclasses import dataclass
-from remerkleable.basic import uint64
-from remerkleable.byte_arrays import Bytes32
 from pydantic import BaseModel, ConfigDict
 
+from ethereum_types.bytes import Bytes32
+from ethereum_types.numeric import U64
+
 @dataclass
 class Vote(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
     # Diverged from 3SF-mini.py:
-    #   - Using `uint64` instead of native `int` for all fields
+    #   - Using `U64` instead of native `int` for all fields
     #   - Using `Bytes32` instead of native `str` for all fields
 
-    validator_id: uint64
-    slot: uint64
+    validator_id: U64
+    slot: U64
     head: Bytes32
-    head_slot: uint64
+    head_slot: U64
     target: Bytes32
-    target_slot: uint64
+    target_slot: U64
     source: Bytes32
-    source_slot: uint64
+    source_slot: U64