block: rename message to block in SignedBlock (#465)

Author: tcoratger

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

@@ -263,7 +263,7 @@ def make_fixture(self) -> Self:
                         )
 
                         # Store the filled block for serialization.
-                        block = signed_block.message
+                        block = signed_block.block
                         step._filled_block = block
 
                         # Register labeled blocks for fork building.
@@ -449,7 +449,7 @@ def _build_block_from_spec(
 
         # Assemble the signed block.
         return SignedBlock(
-            message=final_block,
+            block=final_block,
             signature=BlockSignatures(
                 attestation_signatures=attestation_signatures_blob,
                 proposer_signature=proposer_signature,

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

@@ -286,7 +286,7 @@ def _build_block_from_spec(
             proposer_signature = create_dummy_signature()
 
         return SignedBlock(
-            message=final_block,
+            block=final_block,
             signature=BlockSignatures(
                 attestation_signatures=attestation_signatures,
                 proposer_signature=proposer_signature,

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

@@ -89,7 +89,7 @@ class BlockSignatures(Container):
 class SignedBlock(Container):
     """Envelope carrying a block and its aggregated signatures."""
 
-    message: Block
+    block: Block
     """The block being signed."""
 
     signature: BlockSignatures
@@ -116,9 +116,9 @@ def verify_signatures(
         Raises:
             AssertionError: On verification failure.
         """
-        block = self.message
+        block = self.block
         signatures = self.signature
-        aggregated_attestations = block.body.attestations
+        aggregated_attestations = self.block.body.attestations
         attestation_signatures = signatures.attestation_signatures
 
         # Each attestation in the body must have a corresponding signature entry.

src/lean_spec/subspecs/forkchoice/store.py

@@ -481,7 +481,7 @@ def on_block(
         Raises:
             AssertionError: If parent block/state not found in store.
         """
-        block = signed_block.message
+        block = signed_block.block
         block_root = hash_tree_root(block)
 
         # Skip duplicate blocks (idempotent operation)

src/lean_spec/subspecs/networking/service/service.py

@@ -212,7 +212,7 @@ async def publish_block(self, block: SignedBlock) -> None:
         compressed = compress(ssz_bytes)
 
         await self.event_source.publish(topic.to_topic_id(), compressed)
-        logger.debug("Published block at slot %s", block.message.slot)
+        logger.debug("Published block at slot %s", block.block.slot)
 
     async def publish_attestation(
         self, attestation: SignedAttestation, subnet_id: SubnetId

src/lean_spec/subspecs/sync/block_cache.py

@@ -186,7 +186,7 @@ def add(
         Returns:
             The PendingBlock wrapper, either newly created or existing.
         """
-        block_inner = block.message
+        block_inner = block.block
         root = hash_tree_root(block_inner)
 
         # Deduplication: if we already have this block, return the existing entry.

src/lean_spec/subspecs/sync/head_sync.py

@@ -161,7 +161,7 @@ async def on_gossip_block(
             Tuple of (result describing what happened, updated store).
             The store is unchanged if the block was cached.
         """
-        block_inner = block.message
+        block_inner = block.block
         block_root = hash_tree_root(block_inner)
         parent_root = block_inner.parent_root
         slot = block_inner.slot
@@ -234,8 +234,8 @@ async def _process_block_with_descendants(
         Returns:
             Result and updated store.
         """
-        block_root = hash_tree_root(block.message)
-        slot = block.message.slot
+        block_root = hash_tree_root(block.block)
+        slot = block.block.slot
         self._processing.add(block_root)
 
         try:
@@ -366,7 +366,7 @@ async def _cache_and_backfill(
         Returns:
             Result indicating the block was cached, and unchanged store.
         """
-        block_inner = block.message
+        block_inner = block.block
         parent_root = block_inner.parent_root
 
         # Add to cache.

src/lean_spec/subspecs/sync/service.py

@@ -272,7 +272,7 @@ def _process_block_wrapper(
         # This is write-through: data is persisted synchronously after processing.
         # The database call is optional - nodes can run without persistence.
         if self.database is not None:
-            self._persist_block(new_store, block.message)
+            self._persist_block(new_store, block.block)
 
         return new_store
 
@@ -423,7 +423,7 @@ async def on_gossip_block(
         logger.info(
             "Block received from peer %s slot=%s (state=%s)",
             peer_id,
-            block.message.slot,
+            block.block.slot,
             self._state.name,
         )
 
@@ -445,8 +445,8 @@ async def on_gossip_block(
         #
         # A block may be cached instead of processed if its parent is unknown.
         if result.processed:
-            slot = block.message.slot
-            block_root = hash_tree_root(block.message)
+            slot = block.block.slot
+            block_root = hash_tree_root(block.block)
             logger.info(
                 "Block processed slot=%s root=%s from peer %s",
                 slot,

src/lean_spec/subspecs/validator/service.py

@@ -405,7 +405,7 @@ def _sign_block(
         )
 
         return SignedBlock(
-            message=block,
+            block=block,
             signature=signature,
         )
 

tests/consensus/devnet/ssz/test_consensus_containers.py

@@ -297,7 +297,7 @@ def test_signed_block_minimal(ssz: SSZTestFiller) -> None:
     )
     ssz(
         type_name="SignedBlock",
-        value=SignedBlock(message=block, signature=signature),
+        value=SignedBlock(block=block, signature=signature),
     )