aggregate all block signatures as naive list [devnet-1]

src/lean_spec/subspecs/containers/__init__.py

@@ -1,19 +1,37 @@
 """The container types for the Lean consensus specification."""
 
-from .block import Block, BlockBody, BlockHeader, SignedBlock
+from .block import (
+    Block,
+    BlockBody,
+    BlockHeader,
+    BlockWithAttestation,
+    SignedBlockWithAttestation,
+)
 from .checkpoint import Checkpoint
 from .config import Config
 from .state import State
-from .vote import SignedVote, Vote
+from .validator import Validator
+from .vote import (
+    AggreagtedAttestations,
+    Attestation,
+    AttestationData,
+    SignedAggreagtedAttestations,
+    SignedAttestation,
+)
 
 __all__ = [
     "Block",
+    "BlockWithAttestation",
     "BlockBody",
     "BlockHeader",
     "Checkpoint",
     "Config",
-    "SignedBlock",
-    "SignedVote",
+    "SignedBlockWithAttestation",
+    "Validator",
+    "AttestationData",
+    "Attestation",
+    "SignedAttestation",
+    "SignedAggreagtedAttestations",
+    "AggreagtedAttestations",
     "State",
-    "Vote",
 ]

src/lean_spec/subspecs/containers/block/__init__.py

@@ -1,12 +1,20 @@
 """Block containers and related types for the Lean Ethereum consensus specification."""
 
-from .block import Block, BlockBody, BlockHeader, SignedBlock
-from .types import Attestations
+from .block import (
+    Block,
+    BlockBody,
+    BlockHeader,
+    BlockWithAttestation,
+    SignedBlockWithAttestation,
+)
+from .types import Attestations, BlockSignatures
 
 __all__ = [
     "Block",
     "BlockBody",
     "BlockHeader",
-    "SignedBlock",
+    "BlockWithAttestation",
+    "SignedBlockWithAttestation",
     "Attestations",
+    "BlockSignatures",
 ]

src/lean_spec/subspecs/containers/block/block.py

@@ -4,17 +4,18 @@
 from lean_spec.types import Bytes32, Uint64
 from lean_spec.types.container import Container
 
-from .types import Attestations
+from ..vote import Attestation
+from .types import Attestations, BlockSignatures
 
 
 class BlockBody(Container):
     """The body of a block, containing payload data."""
 
     attestations: Attestations
-    """
-    A list of votes included in the block.
+    """Plain validator attestations carried in the block body.
 
-    Note: This will eventually be replaced by aggregated attestations.
+    Individual signatures live in the aggregated block signature list, so
+    these entries contain only vote data without per-attestation signatures.
     """
 
 
@@ -56,14 +57,29 @@ class Block(Container):
     """The block's payload."""
 
 
-class SignedBlock(Container):
-    """A container for a block and the proposer's signature."""
+class BlockWithAttestation(Container):
+    """Bundle containing a block and the proposer's attestation."""
 
-    message: Block
-    """The block being signed."""
+    block: Block
+    """The proposed block message."""
 
-    signature: Bytes32
-    """
-    The proposer's signature of the block message.
-    Note: Bytes32 is a placeholder; the actual signature is much larger.
+    proposer_attestation: Attestation
+    """The proposer's vote corresponding to this block."""
+
+
+class SignedBlockWithAttestation(Container):
+    """Envelope carrying a block, proposer vote, and aggregated signatures."""
+
+    message: BlockWithAttestation
+    """The block plus proposer vote being signed."""
+
+    signature: BlockSignatures
+    """Aggregated signature payload for the block.
+
+    Signatures remain in attestation order followed by the proposer signature
+    over entire message. For devnet 1, however the proposer signature is just
+    over message.proposer_attestation since lean VM is not yet there to establish
+    validity/mergability of the signature for its packaging into the future blocks.
+
+    Eventually this field will be replaced by a single zk-aggregated signature.
     """

src/lean_spec/subspecs/containers/block/types.py

@@ -1,13 +1,20 @@
 """Block-specific SSZ types for the Lean Ethereum consensus specification."""
 
-from lean_spec.types import SSZList
+from lean_spec.types import Bytes4000, SSZList
 
 from ...chain.config import VALIDATOR_REGISTRY_LIMIT
-from ..vote import SignedVote
+from ..vote import Attestation
 
 
 class Attestations(SSZList):
-    """List of signed votes (attestations) included in a block."""
+    """List of validator attestations included in a block."""
 
-    ELEMENT_TYPE = SignedVote
+    ELEMENT_TYPE = Attestation
+    LIMIT = int(VALIDATOR_REGISTRY_LIMIT)
+
+
+class BlockSignatures(SSZList):
+    """Aggregated signature list included alongside the block."""
+
+    ELEMENT_TYPE = Bytes4000
     LIMIT = int(VALIDATOR_REGISTRY_LIMIT)

src/lean_spec/subspecs/containers/checkpoint.py

@@ -1,5 +1,7 @@
 """Checkpoint Container."""
 
+from typing import Self
+
 from lean_spec.subspecs.containers.slot import Slot
 from lean_spec.types import Bytes32
 from lean_spec.types.container import Container
@@ -13,3 +15,8 @@ class Checkpoint(Container):
 
     slot: Slot
     """The slot number of the checkpoint's block."""
+
+    @classmethod
+    def default(cls) -> Self:
+        """Return a default checkpoint."""
+        return cls(root=Bytes32.zero(), slot=Slot(0))

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

@@ -6,6 +6,7 @@
     JustificationRoots,
     JustificationValidators,
     JustifiedSlots,
+    Validators,
 )
 
 __all__ = [
@@ -14,4 +15,5 @@
     "JustificationRoots",
     "JustificationValidators",
     "JustifiedSlots",
+    "Validators",
 ]

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

@@ -13,17 +13,17 @@
     is_proposer,
 )
 
-from ..block import Block, BlockBody, BlockHeader, SignedBlock
+from ..block import Block, BlockBody, BlockHeader
 from ..block.types import Attestations
 from ..checkpoint import Checkpoint
 from ..config import Config
 from ..slot import Slot
-from ..vote import Vote
 from .types import (
     HistoricalBlockHashes,
     JustificationRoots,
     JustificationValidators,
     JustifiedSlots,
+    Validators,
 )
 
 
@@ -55,6 +55,9 @@ class State(Container):
     justified_slots: JustifiedSlots
     """A bitfield indicating which historical slots were justified."""
 
+    validators: Validators
+    """Registry of validators tracked by the state."""
+
     # Justification tracking (flattened for SSZ compatibility)
     justifications_roots: JustificationRoots
     """Roots of justified blocks."""
@@ -99,10 +102,11 @@ def generate_genesis(cls, genesis_time: Uint64, num_validators: Uint64) -> "Stat
             config=genesis_config,
             slot=Slot(0),
             latest_block_header=genesis_header,
-            latest_justified=Checkpoint(root=Bytes32.zero(), slot=Slot(0)),
-            latest_finalized=Checkpoint(root=Bytes32.zero(), slot=Slot(0)),
+            latest_justified=Checkpoint.default(),
+            latest_finalized=Checkpoint.default(),
             historical_block_hashes=HistoricalBlockHashes(data=[]),
             justified_slots=JustifiedSlots(data=[]),
+            validators=Validators(data=[]),
             justifications_roots=JustificationRoots(data=[]),
             justifications_validators=JustificationValidators(data=[]),
         )
@@ -429,8 +433,8 @@ def process_attestations(
         latest_finalized = self.latest_finalized
 
         # Process each attestation in the block.
-        for signed_vote in attestations:
-            vote: Vote = signed_vote.data
+        for attestation in attestations:
+            vote = attestation.data
             source = vote.source
             target = vote.target
 
@@ -484,9 +488,9 @@ def process_attestations(
             }
         )
 
-    def state_transition(self, signed_block: SignedBlock, valid_signatures: bool = True) -> "State":
+    def state_transition(self, block: Block, valid_signatures: bool = True) -> "State":
         """
-        Apply the complete state transition function for a signed block.
+        Apply the complete state transition function for a block.
 
         This method represents the full state transition function:
         1. Validate signatures if required
@@ -496,8 +500,8 @@ def state_transition(self, signed_block: SignedBlock, valid_signatures: bool = T
 
         Parameters
         ----------
-        signed_block : SignedBlock
-            The signed block to apply to the state.
+        block : Block
+            The block to apply to the state.
         valid_signatures : bool, optional
             Whether to validate block signatures. Defaults to True.
 
@@ -515,8 +519,6 @@ def state_transition(self, signed_block: SignedBlock, valid_signatures: bool = T
         if not valid_signatures:
             raise AssertionError("Block signatures must be valid")
 
-        block = signed_block.message
-
         # First, process any intermediate slots.
         state = self.process_slots(block.slot)
 

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

@@ -4,6 +4,8 @@
 from lean_spec.types import Bytes32, SSZList
 from lean_spec.types.bitfields import BaseBitlist
 
+from ..validator import Validator
+
 
 class HistoricalBlockHashes(SSZList):
     """List of historical block root hashes up to historical_roots_limit."""
@@ -32,3 +34,10 @@ class JustificationValidators(BaseBitlist):
         DEVNET_CONFIG.historical_roots_limit.as_int()
         * DEVNET_CONFIG.validator_registry_limit.as_int()
     )
+
+
+class Validators(SSZList):
+    """Validator registry tracked in the state."""
+
+    ELEMENT_TYPE = Validator
+    LIMIT = DEVNET_CONFIG.validator_registry_limit.as_int()

src/lean_spec/subspecs/containers/validator.py

@@ -0,0 +1,10 @@
+"""Validator container for the Lean Ethereum consensus specification."""
+
+from lean_spec.types import Bytes52, Container
+
+
+class Validator(Container):
+    """Represents a validator's static metadata."""
+
+    pubkey: Bytes52
+    """XMSS one-time signature public key."""

src/lean_spec/subspecs/containers/vote/__init__.py

@@ -0,0 +1,20 @@
+"""Vote container and related types for the Lean consensus specification."""
+
+from .types import AggregatedSignatures, AggregationBits
+from .vote import (
+    AggreagtedAttestations,
+    Attestation,
+    AttestationData,
+    SignedAggreagtedAttestations,
+    SignedAttestation,
+)
+
+__all__ = [
+    "AttestationData",
+    "Attestation",
+    "SignedAttestation",
+    "SignedAggreagtedAttestations",
+    "AggreagtedAttestations",
+    "AggregatedSignatures",
+    "AggregationBits",
+]

src/lean_spec/subspecs/containers/vote/types.py

@@ -0,0 +1,19 @@
+"""Vote-specific SSZ types for the Lean Ethereum consensus specification."""
+
+from lean_spec.types import Bytes4000, SSZList
+from lean_spec.types.bitfields import BaseBitlist
+
+from ...chain.config import VALIDATOR_REGISTRY_LIMIT
+
+
+class AggregationBits(BaseBitlist):
+    """Bitlist representing validator participation in an attestation."""
+
+    LIMIT = int(VALIDATOR_REGISTRY_LIMIT)
+
+
+class AggregatedSignatures(SSZList):
+    """Naive list of validator signatures used for aggregation placeholders."""
+
+    ELEMENT_TYPE = Bytes4000
+    LIMIT = int(VALIDATOR_REGISTRY_LIMIT)