Add BlockProposal NamedTuple

Author: hwwhww

eth/beacon/block_proposal.py

@@ -0,0 +1,23 @@
+from typing import (
+    NamedTuple,
+    Tuple,
+    TYPE_CHECKING,
+)
+
+from eth.constants import (
+    Hash32,
+)
+
+if TYPE_CHECKING:
+    from eth.beacon.types.blocks import AttestationRecord  # noqa: F401
+    from eth.beacon.types.blocks import BaseBeaconBlock  # noqa: F401
+
+
+BlockProposal = NamedTuple(
+    'BlockProposal',
+    (
+        ('block', 'BaseBeaconBlock'),
+        ('shard_id', int),
+        ('shard_block_hash', Tuple[Hash32]),
+    )
+)

eth/beacon/state_machines/base.py

@@ -31,6 +31,7 @@
     Configurable,
 )
 
+from eth.beacon.block_proposal import BlockProposal
 from eth.beacon.db.chain import BaseBeaconChainDB
 from eth.beacon.helpers import (
     create_signing_message,
@@ -379,9 +380,7 @@ def propose_block(
         self,
         crystallized_state: CrystallizedState,
         active_state: ActiveState,
-        block: BaseBeaconBlock,
-        shard_id: int,
-        shard_block_hash: Hash32,
+        block_proposal: 'BlockProposal',
         chaindb: BaseBeaconChainDB,
         config: BeaconConfig,
         private_key: int
@@ -392,7 +391,7 @@ def propose_block(
         block, post_crystallized_state, post_active_state = self.process_block(
             crystallized_state,
             active_state,
-            block,
+            block_proposal.block,
             chaindb,
             config,
         )
@@ -402,13 +401,16 @@ def propose_block(
             crystallized_state_root=post_crystallized_state.hash,
             active_state_root=post_active_state.hash,
         )
+        block_proposal = BlockProposal(
+            block=post_block,
+            shard_id=block_proposal.shard_id,
+            shard_block_hash=block_proposal.shard_block_hash,
+        )
 
         proposer_attestation = self.attest_proposed_block(
             post_crystallized_state,
             post_active_state,
-            post_block,
-            shard_id,
-            shard_block_hash,
+            block_proposal,
             chaindb,
             config.CYCLE_LENGTH,
             private_key,
@@ -424,9 +426,7 @@ def _update_the_states(self,
     def attest_proposed_block(self,
                               post_crystallized_state: CrystallizedState,
                               post_active_state: ActiveState,
-                              block: BaseBeaconBlock,
-                              shard_id: int,
-                              shard_block_hash: Hash32,
+                              block_proposal: 'BlockProposal',
                               chaindb: BaseBeaconChainDB,
                               cycle_length: int,
                               private_key: int) -> 'AttestationRecord':
@@ -436,7 +436,7 @@ def attest_proposed_block(self,
         The proposer broadcasts their attestation with the proposed block.
         """
         block_committees_info = get_block_committees_info(
-            block,
+            block_proposal.block,
             post_crystallized_state,
             cycle_length,
         )
@@ -453,14 +453,14 @@ def attest_proposed_block(self,
         # Get signing message and sign it
         parent_hashes = get_hashes_to_sign(
             post_active_state.recent_block_hashes,
-            block,
+            block_proposal.block,
             cycle_length,
         )
         message = create_signing_message(
-            block.slot_number,
+            block_proposal.block.slot_number,
             parent_hashes,
-            shard_id,
-            shard_block_hash,
+            block_proposal.shard_id,
+            block_proposal.shard_block_hash,
             justified_slot,
         )
         sigs = [
@@ -472,10 +472,10 @@ def attest_proposed_block(self,
         aggregate_sig = bls.aggregate_sigs(sigs)
 
         return self.get_attestation_record_class()(
-            slot=block.slot_number,
-            shard_id=shard_id,
+            slot=block_proposal.block.slot_number,
+            shard_id=block_proposal.shard_id,
             oblique_parent_hashes=(),
-            shard_block_hash=shard_block_hash,
+            shard_block_hash=block_proposal.shard_block_hash,
             attester_bitfield=attester_bitfield,
             justified_slot=justified_slot,
             justified_block_hash=justified_block_hash,

tests/beacon/state_machines/test_proposer.py

@@ -4,6 +4,7 @@
     ZERO_HASH32,
 )
 
+from eth.beacon.block_proposal import BlockProposal
 from eth.beacon.helpers import (
     get_block_committees_info,
     get_new_recent_block_hashes,
@@ -46,14 +47,17 @@ def test_propose_block_and_validate_attestation(fixture_sm_class,
     )
     # public_key = sm.crystallized_state.validators[block_committees_info.proposer_index].pubkey
     private_key = privkeys[block_committees_info.proposer_index]
+    block_proposal = BlockProposal(
+        block=block_1_shell,
+        shard_id=block_committees_info.proposer_shard_id,
+        shard_block_hash=ZERO_HASH32,
+    )
 
     (block_1, post_crystallized_state, post_active_state, proposer_attestation) = (
         sm.propose_block(
             crystallized_state=sm.crystallized_state,
             active_state=sm.active_state,
-            block=block_1_shell,
-            shard_id=block_committees_info.proposer_shard_id,
-            shard_block_hash=ZERO_HASH32,
+            block_proposal=block_proposal,
             chaindb=sm.chaindb,
             config=sm.config,
             private_key=private_key,