validator: rm validator index alias (#217)

* validator: rm validator index

* trigger ci

Author: tcoratger

packages/testing/src/consensus_testing/keys.py

@@ -34,7 +34,7 @@
 from lean_spec.subspecs.ssz.hash import hash_tree_root
 from lean_spec.subspecs.xmss.containers import PublicKey, SecretKey, Signature
 from lean_spec.subspecs.xmss.interface import TEST_SIGNATURE_SCHEME, GeneralizedXmssScheme
-from lean_spec.types import Uint64, ValidatorIndex
+from lean_spec.types import Uint64
 
 if TYPE_CHECKING:
     from collections.abc import Mapping
@@ -87,7 +87,7 @@ def with_secret(self, secret: SecretKey) -> KeyPair:
 
 
 @cache
-def load_keys() -> dict[ValidatorIndex, KeyPair]:
+def load_keys() -> dict[Uint64, KeyPair]:
     """
     Load pre-generated keys from disk (cached after first call).
 
@@ -102,7 +102,7 @@ def load_keys() -> dict[ValidatorIndex, KeyPair]:
             f"Keys not found: {KEYS_FILE}\nRun: python -m consensus_testing.keys"
         )
     data = json.loads(KEYS_FILE.read_text())
-    return {ValidatorIndex(i): KeyPair.from_dict(kp) for i, kp in enumerate(data)}
+    return {Uint64(i): KeyPair.from_dict(kp) for i, kp in enumerate(data)}
 
 
 class XmssKeyManager:
@@ -119,8 +119,8 @@ class XmssKeyManager:
 
     Examples:
         >>> mgr = XmssKeyManager()
-        >>> mgr[ValidatorIndex(0)]  # Get key pair
-        >>> mgr.get_public_key(ValidatorIndex(1))  # Get public key only
+        >>> mgr[Uint64(0)]  # Get key pair
+        >>> mgr.get_public_key(Uint64(1))  # Get public key only
         >>> mgr.sign_attestation(attestation)  # Sign with auto-advancement
     """
 
@@ -132,38 +132,38 @@ def __init__(
         """Initialize the manager with optional custom configuration."""
         self.max_slot = max_slot or DEFAULT_MAX_SLOT
         self.scheme = scheme
-        self._state: dict[ValidatorIndex, KeyPair] = {}
+        self._state: dict[Uint64, KeyPair] = {}
 
     @property
-    def keys(self) -> dict[ValidatorIndex, KeyPair]:
+    def keys(self) -> dict[Uint64, KeyPair]:
         """Lazy access to immutable base keys."""
         return load_keys()
 
-    def __getitem__(self, idx: ValidatorIndex) -> KeyPair:
+    def __getitem__(self, idx: Uint64) -> KeyPair:
         """Get key pair, returning advanced state if available."""
         if idx in self._state:
             return self._state[idx]
         if idx not in self.keys:
             raise KeyError(f"Validator {idx} not found (max: {len(self.keys) - 1})")
         return self.keys[idx]
 
-    def __contains__(self, idx: ValidatorIndex) -> bool:
+    def __contains__(self, idx: Uint64) -> bool:
         """Check if validator index exists."""
         return idx in self.keys
 
     def __len__(self) -> int:
         """Number of available validators."""
         return len(self.keys)
 
-    def __iter__(self) -> Iterator[ValidatorIndex]:
+    def __iter__(self) -> Iterator[Uint64]:
         """Iterate over validator indices."""
         return iter(self.keys)
 
-    def get_public_key(self, idx: ValidatorIndex) -> PublicKey:
+    def get_public_key(self, idx: Uint64) -> PublicKey:
         """Get a validator's public key."""
         return self[idx].public
 
-    def get_all_public_keys(self) -> dict[ValidatorIndex, PublicKey]:
+    def get_all_public_keys(self) -> dict[Uint64, PublicKey]:
         """Get all public keys (from base keys, not advanced state)."""
         return {idx: kp.public for idx, kp in self.keys.items()}
 

packages/testing/src/consensus_testing/test_fixtures/fork_choice.py

@@ -31,7 +31,7 @@
 from lean_spec.subspecs.xmss.containers import Signature
 from lean_spec.subspecs.xmss.interface import TEST_SIGNATURE_SCHEME
 from lean_spec.subspecs.xmss.types import HashDigestList, HashTreeOpening, Randomness
-from lean_spec.types import Bytes32, Uint64, ValidatorIndex
+from lean_spec.types import Bytes32, Uint64
 
 from ..keys import XmssKeyManager
 from ..test_types import (
@@ -194,9 +194,7 @@ def make_fixture(self) -> ForkChoiceTest:
 
         # Update validator pubkeys to match key_manager's generated keys
         updated_validators = [
-            validator.model_copy(
-                update={"pubkey": key_manager[ValidatorIndex(i)].public.encode_bytes()}
-            )
+            validator.model_copy(update={"pubkey": key_manager[Uint64(i)].public.encode_bytes()})
             for i, validator in enumerate(self.anchor_state.validators)
         ]
 
@@ -318,7 +316,7 @@ def _build_block_from_spec(
         # Determine proposer
         if spec.proposer_index is None:
             validator_count = store.states[store.head].validators.count
-            proposer_index = ValidatorIndex(int(spec.slot) % int(validator_count))
+            proposer_index = Uint64(int(spec.slot) % int(validator_count))
         else:
             proposer_index = spec.proposer_index
 
@@ -459,23 +457,16 @@ def _build_signed_attestation_from_spec(
         # Derive source from state's latest justified checkpoint
         source_checkpoint = state.latest_justified
 
-        # Convert validator_id to Uint64 if needed
-        validator_id = (
-            spec.validator_id
-            if isinstance(spec.validator_id, Uint64)
-            else Uint64(int(spec.validator_id))
-        )
-
-        # Create attestation data
-        attestation_data = AttestationData(
-            slot=spec.slot,
-            head=head_checkpoint,
-            target=target_checkpoint,
-            source=source_checkpoint,
-        )
-
         # Create attestation
-        attestation = Attestation(validator_id=validator_id, data=attestation_data)
+        attestation = Attestation(
+            validator_id=spec.validator_id,
+            data=AttestationData(
+                slot=spec.slot,
+                head=head_checkpoint,
+                target=target_checkpoint,
+                source=source_checkpoint,
+            ),
+        )
 
         # Create signed attestation
         return SignedAttestation(

packages/testing/src/consensus_testing/test_fixtures/state_transition.py

@@ -8,7 +8,7 @@
 from lean_spec.subspecs.containers.block.types import Attestations
 from lean_spec.subspecs.containers.state.state import State
 from lean_spec.subspecs.ssz.hash import hash_tree_root
-from lean_spec.types import Bytes32, ValidatorIndex
+from lean_spec.types import Bytes32, Uint64
 
 from ..test_types import BlockSpec, StateExpectation
 from .base import BaseConsensusFixture
@@ -202,7 +202,7 @@ def _build_block_from_spec(self, spec: BlockSpec, state: State) -> tuple[Block,
         if spec.proposer_index is not None:
             proposer_index = spec.proposer_index
         else:
-            proposer_index = ValidatorIndex(int(spec.slot) % int(state.validators.count))
+            proposer_index = Uint64(int(spec.slot) % int(state.validators.count))
 
         # Use provided parent_root or compute it
         if spec.parent_root is not None:

packages/testing/src/consensus_testing/test_types/block_spec.py

@@ -5,7 +5,7 @@
 from lean_spec.subspecs.containers.attestation import SignedAttestation
 from lean_spec.subspecs.containers.block import BlockBody
 from lean_spec.subspecs.containers.slot import Slot
-from lean_spec.types import Bytes32, CamelModel, ValidatorIndex
+from lean_spec.types import Bytes32, CamelModel, Uint64
 
 from .signed_attestation_spec import SignedAttestationSpec
 
@@ -22,14 +22,14 @@ class BlockSpec(CamelModel):
 
     Usage:
     - Simple: BlockSpec(slot=Slot(1)) - framework computes everything
-    - Custom: BlockSpec(slot=Slot(1), proposer_index=ValidatorIndex(5)) - override specific fields
+    - Custom: BlockSpec(slot=Slot(1), proposer_index=Uint64(5)) - override specific fields
     - Invalid: BlockSpec(slot=Slot(1), state_root=Bytes32.zero()) - test invalid blocks
     """
 
     slot: Slot
     """The slot for this block (required)."""
 
-    proposer_index: ValidatorIndex | None = None
+    proposer_index: Uint64 | None = None
     """
     The proposer index for this block.
 

packages/testing/src/consensus_testing/test_types/genesis.py

@@ -4,7 +4,7 @@
 
 from lean_spec.subspecs.containers.state import State, Validators
 from lean_spec.subspecs.containers.validator import Validator
-from lean_spec.types import Bytes52, Uint64, ValidatorIndex
+from lean_spec.types import Bytes52, Uint64
 
 
 def generate_pre_state(**kwargs: Any) -> State:
@@ -25,7 +25,7 @@ def generate_pre_state(**kwargs: Any) -> State:
     # TODO: Set an appropriate default here for test fixtures
     if "validators" not in kwargs:
         validators = Validators(
-            data=[Validator(pubkey=Bytes52.zero(), index=ValidatorIndex(i)) for i in range(4)]
+            data=[Validator(pubkey=Bytes52.zero(), index=Uint64(i)) for i in range(4)]
         )
     else:
         validators = kwargs["validators"]

packages/testing/src/consensus_testing/test_types/signed_attestation_spec.py

@@ -2,7 +2,7 @@
 
 from lean_spec.subspecs.containers.slot import Slot
 from lean_spec.subspecs.xmss.containers import Signature
-from lean_spec.types import CamelModel, Uint64, ValidatorIndex
+from lean_spec.types import CamelModel, Uint64
 
 
 class SignedAttestationSpec(CamelModel):
@@ -13,7 +13,7 @@ class SignedAttestationSpec(CamelModel):
     Head and source are automatically derived from target.
     """
 
-    validator_id: ValidatorIndex | Uint64
+    validator_id: Uint64
     """The index of the validator making the attestation (required)."""
 
     slot: Slot

packages/testing/src/consensus_testing/test_types/store_checks.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING, Literal
 
 from lean_spec.subspecs.containers.slot import Slot
-from lean_spec.types import Bytes32, CamelModel, Uint64, ValidatorIndex
+from lean_spec.types import Bytes32, CamelModel, Uint64
 
 if TYPE_CHECKING:
     from lean_spec.subspecs.containers import SignedAttestation
@@ -19,7 +19,7 @@ class AttestationCheck(CamelModel):
     Used to validate attestation content beyond just counting.
     """
 
-    validator: ValidatorIndex
+    validator: Uint64
     """Which validator's attestation to check."""
 
     attestation_slot: Slot | None = None

src/lean_spec/subspecs/containers/state/state.py

@@ -13,7 +13,6 @@
     Bytes32,
     Container,
     Uint64,
-    ValidatorIndex,
     is_proposer,
 )
 
@@ -94,7 +93,7 @@ def generate_genesis(cls, genesis_time: Uint64, validators: Validators) -> "Stat
         # Build the genesis block header for the state.
         genesis_header = BlockHeader(
             slot=Slot(0),
-            proposer_index=ValidatorIndex(0),
+            proposer_index=Uint64(0),
             parent_root=Bytes32.zero(),
             state_root=Bytes32.zero(),
             body_root=hash_tree_root(BlockBody(attestations=Attestations(data=[]))),

src/lean_spec/subspecs/containers/validator.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from lean_spec.types import Bytes52, Container, ValidatorIndex
+from lean_spec.types import Bytes52, Container, Uint64
 
 from ..xmss.containers import PublicKey
 from ..xmss.interface import TEST_SIGNATURE_SCHEME, GeneralizedXmssScheme
@@ -15,7 +15,7 @@ class Validator(Container):
     pubkey: Bytes52
     """XMSS one-time signature public key."""
 
-    index: ValidatorIndex = ValidatorIndex(0)
+    index: Uint64 = Uint64(0)
     """Validator index in the registry."""
 
     def get_pubkey(self, scheme: GeneralizedXmssScheme = TEST_SIGNATURE_SCHEME) -> PublicKey:

src/lean_spec/subspecs/forkchoice/store.py

@@ -40,7 +40,6 @@
     ZERO_HASH,
     Bytes32,
     Uint64,
-    ValidatorIndex,
     is_proposer,
 )
 from lean_spec.types.container import Container
@@ -122,15 +121,15 @@ class Store(Container):
     `Store`'s latest justified and latest finalized checkpoints.
     """
 
-    latest_known_attestations: Dict[ValidatorIndex, SignedAttestation] = {}
+    latest_known_attestations: Dict[Uint64, SignedAttestation] = {}
     """
     Latest signed attestations by validator that have been processed.
 
     - These attestations are "known" and contribute to fork choice weights.
     - Keyed by validator index to enforce one attestation per validator.
     """
 
-    latest_new_attestations: Dict[ValidatorIndex, SignedAttestation] = {}
+    latest_new_attestations: Dict[Uint64, SignedAttestation] = {}
     """
     Latest signed attestations by validator that are pending processing.
 
@@ -297,7 +296,7 @@ def on_attestation(
         self.validate_attestation(signed_attestation)
 
         # Extract the validator index that produced this attestation.
-        validator_id = ValidatorIndex(signed_attestation.message.validator_id)
+        validator_id = Uint64(signed_attestation.message.validator_id)
 
         # Extract the attestation's slot:
         # - used to decide if this attestation is "newer" than a previous one.
@@ -504,7 +503,7 @@ def on_block(self, signed_block_with_attestation: SignedBlockWithAttestation) ->
     def _compute_lmd_ghost_head(
         self,
         start_root: Bytes32,
-        attestations: Dict[ValidatorIndex, SignedAttestation],
+        attestations: Dict[Uint64, SignedAttestation],
         min_score: int = 0,
     ) -> Bytes32:
         """
@@ -915,7 +914,7 @@ def produce_attestation_data(self, slot: Slot) -> AttestationData:
     def produce_block_with_signatures(
         self,
         slot: Slot,
-        validator_index: ValidatorIndex,
+        validator_index: Uint64,
     ) -> tuple["Store", Block, list[Signature]]:
         """
         Produce a block and attestation signatures for the target slot.