feat: init aggregate all block signatures as naive list

Signed-off-by: Chen Kai <281165273grape@gmail.com>

Author: GrapeBaBa

src/lean_spec/subspecs/containers/__init__.py

@@ -4,7 +4,15 @@
 from .checkpoint import Checkpoint
 from .config import Config
 from .state import State
-from .vote import SignedVote, Vote
+from .validator import Validator
+from .vote import (
+    Attestation,
+    AttestationData,
+    ProposerAttestationData,
+    SignedAttestation,
+    SignedValidatorAttestation,
+    ValidatorAttestation,
+)
 
 __all__ = [
     "Block",
@@ -13,7 +21,12 @@
     "Checkpoint",
     "Config",
     "SignedBlock",
-    "SignedVote",
+    "Validator",
+    "AttestationData",
+    "ValidatorAttestation",
+    "SignedValidatorAttestation",
+    "SignedAttestation",
+    "ProposerAttestationData",
+    "Attestation",
     "State",
-    "Vote",
 ]

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

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

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

@@ -1,21 +1,29 @@
-"""Block Containers for the Lean Ethereum consensus specification."""
+"""Block containers for the Lean Ethereum consensus specification."""
 
 from lean_spec.subspecs.containers.slot import Slot
 from lean_spec.types import Bytes32, Uint64
 from lean_spec.types.container import Container
 
-from .types import Attestations
+from ..checkpoint import Checkpoint
+from ..vote.vote import ProposerAttestationData
+from .types import Attestations, BlockSignatures
+
+_DEFAULT_PROPOSER_ATTESTATION = ProposerAttestationData(
+    target=Checkpoint(root=Bytes32.zero(), slot=Slot(0)),
+    source=Checkpoint(root=Bytes32.zero(), slot=Slot(0)),
+)
 
 
 class BlockBody(Container):
     """The body of a block, containing payload data."""
 
     attestations: Attestations
-    """
-    A list of votes included in the block.
+    """Validator attestations included in the block."""
 
-    Note: This will eventually be replaced by aggregated attestations.
-    """
+    proposer_attestation: ProposerAttestationData = (
+        _DEFAULT_PROPOSER_ATTESTATION
+    )
+    """The proposer sourced attestation kept separate from the list."""
 
 
 class BlockHeader(Container):
@@ -57,13 +65,10 @@ class Block(Container):
 
 
 class SignedBlock(Container):
-    """A container for a block and the proposer's signature."""
+    """A container for a block and its aggregated signatures."""
 
     message: Block
     """The block being signed."""
 
-    signature: Bytes32
-    """
-    The proposer's signature of the block message.
-    Note: Bytes32 is a placeholder; the actual signature is much larger.
-    """
+    signature: BlockSignatures
+    """Naive list of signatures aggregated for the block."""

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.vote import ValidatorAttestation
 
 
 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 = ValidatorAttestation
+    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/state/__init__.py

@@ -1,11 +1,12 @@
-"""State container and related types for the Lean Ethereum consensus specification."""
+"""State container and related types for the Lean consensus specification."""
 
 from .state import State
 from .types import (
     HistoricalBlockHashes,
     JustificationRoots,
     JustificationValidators,
     JustifiedSlots,
+    Validators,
 )
 
 __all__ = [
@@ -14,4 +15,5 @@
     "JustificationRoots",
     "JustificationValidators",
     "JustifiedSlots",
+    "Validators",
 ]