From 023195a06599c7d9ac8844736b2576d42990083f Mon Sep 17 00:00:00 2001
From: Thomas Coratger <thomas.coratger@gmail.com>
Date: Wed, 31 Dec 2025 18:58:09 +0100
Subject: [PATCH 1/2] state: rm useless StateLookup

---
 src/lean_spec/subspecs/containers/state/__init__.py | 2 --
 src/lean_spec/subspecs/containers/state/types.py    | 5 +----
 src/lean_spec/subspecs/forkchoice/store.py          | 3 +--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/lean_spec/subspecs/containers/state/__init__.py b/src/lean_spec/subspecs/containers/state/__init__.py
index 4bda075e..ac17c457 100644
--- a/src/lean_spec/subspecs/containers/state/__init__.py
+++ b/src/lean_spec/subspecs/containers/state/__init__.py
@@ -6,7 +6,6 @@
     JustificationRoots,
     JustificationValidators,
     JustifiedSlots,
-    StateLookup,
     Validators,
 )
 
@@ -16,6 +15,5 @@
     "JustificationValidators",
     "JustifiedSlots",
     "State",
-    "StateLookup",
     "Validators",
 ]
diff --git a/src/lean_spec/subspecs/containers/state/types.py b/src/lean_spec/subspecs/containers/state/types.py
index 33122848..d4fd7441 100644
--- a/src/lean_spec/subspecs/containers/state/types.py
+++ b/src/lean_spec/subspecs/containers/state/types.py
@@ -11,10 +11,7 @@
 from ..validator import Validator
 
 if TYPE_CHECKING:
-    from .state import State
-
-StateLookup = dict[Bytes32, "State"]
-"""Mapping from state root to State objects."""
+    pass
 
 
 class HistoricalBlockHashes(SSZList[Bytes32]):
diff --git a/src/lean_spec/subspecs/forkchoice/store.py b/src/lean_spec/subspecs/forkchoice/store.py
index c0a93e88..3f6934a8 100644
--- a/src/lean_spec/subspecs/forkchoice/store.py
+++ b/src/lean_spec/subspecs/forkchoice/store.py
@@ -33,7 +33,6 @@
 )
 from lean_spec.subspecs.containers.block import BlockLookup
 from lean_spec.subspecs.containers.slot import Slot
-from lean_spec.subspecs.containers.state import StateLookup
 from lean_spec.subspecs.ssz.hash import hash_tree_root
 from lean_spec.subspecs.xmss.aggregation import (
     AggregatedSignatureProof,
@@ -116,7 +115,7 @@ class Store(Container):
     Every block that might participate in fork choice must appear here.
     """
 
-    states: StateLookup = {}
+    states: dict[Bytes32, State] = {}
     """
     Mapping from state root to State objects.
 

From cf8909ee1243bd0be951f2b448bd29303ed977a4 Mon Sep 17 00:00:00 2001
From: Thomas Coratger <thomas.coratger@gmail.com>
Date: Wed, 31 Dec 2025 18:59:46 +0100
Subject: [PATCH 2/2] cleanup

---
 src/lean_spec/subspecs/containers/state/types.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/lean_spec/subspecs/containers/state/types.py b/src/lean_spec/subspecs/containers/state/types.py
index d4fd7441..3bdf406d 100644
--- a/src/lean_spec/subspecs/containers/state/types.py
+++ b/src/lean_spec/subspecs/containers/state/types.py
@@ -2,17 +2,12 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from lean_spec.subspecs.chain.config import DEVNET_CONFIG
 from lean_spec.types import Bytes32, SSZList
 from lean_spec.types.bitfields import BaseBitlist
 
 from ..validator import Validator
 
-if TYPE_CHECKING:
-    pass
-
 
 class HistoricalBlockHashes(SSZList[Bytes32]):
     """List of historical block root hashes up to historical_roots_limit."""