Propose with both attestation pools

Author: hwwhww

eth2/beacon/tools/builder/proposer.py

@@ -82,6 +82,9 @@ def create_block_on_state(
         parent_block=parent_block, block_params=FromBlockParams(slot=slot)
     )
 
+    # MAX_ATTESTATIONS
+    attestations = attestations[: config.MAX_ATTESTATIONS]
+
     # TODO: Add more operations
     randao_reveal = _generate_randao_reveal(privkey, slot, state, config)
     eth1_data = state.eth1_data

tests/components/eth2/beacon/test_validator.py

@@ -84,7 +84,7 @@ async def get_validator(event_loop, event_bus, indices, num_validators=None) ->
     unaggregated_attestation_pool = set()
     aggregated_attestation_pool = set()
 
-    def get_ready_attestations_fn(slot):
+    def get_ready_attestations_fn(slot, is_aggregated):
         return tuple(unaggregated_attestation_pool)
 
     def get_aggregatable_attestations_fn(slot, committee_index):
@@ -458,7 +458,7 @@ async def test_validator_include_ready_attestations(event_loop, event_bus, monke
 
     # Mock `get_ready_attestations_fn` so it returns the attestation alice
     # attested to.
-    def get_ready_attestations_fn(slot):
+    def get_ready_attestations_fn(slot, is_aggregated):
         return attestations
     monkeypatch.setattr(alice, 'get_ready_attestations', get_ready_attestations_fn)
 

tests/libp2p/bcc/test_receive_server.py

@@ -439,21 +439,29 @@ def mock_get_head_state():
     state.slot = (
         attesting_slot + MINIMAL_SERENITY_CONFIG.MIN_ATTESTATION_INCLUSION_DELAY - 1
     )
-    ready_attestations = receive_server.get_ready_attestations(state.slot)
+    ready_attestations = receive_server.get_ready_attestations(
+        state.slot, is_aggregated=False
+    )
     assert len(ready_attestations) == 0
 
     state.slot = (
         attesting_slot + MINIMAL_SERENITY_CONFIG.MIN_ATTESTATION_INCLUSION_DELAY
     )
-    ready_attestations = receive_server.get_ready_attestations(state.slot)
+    ready_attestations = receive_server.get_ready_attestations(
+        state.slot, is_aggregated=False
+    )
     assert set([a1, a2]) == set(ready_attestations)
 
     state.slot = (
         attesting_slot + MINIMAL_SERENITY_CONFIG.MIN_ATTESTATION_INCLUSION_DELAY + 1
     )
-    ready_attestations = receive_server.get_ready_attestations(state.slot)
+    ready_attestations = receive_server.get_ready_attestations(
+        state.slot, is_aggregated=False
+    )
     assert set([a1, a2, a3]) == set(ready_attestations)
 
     state.slot = attesting_slot + MINIMAL_SERENITY_CONFIG.SLOTS_PER_EPOCH + 1
-    ready_attestations = receive_server.get_ready_attestations(state.slot)
+    ready_attestations = receive_server.get_ready_attestations(
+        state.slot, is_aggregated=False
+    )
     assert set([a3]) == set(ready_attestations)

trinity/components/eth2/beacon/validator.py

@@ -5,7 +5,6 @@
     Callable,
     Dict,
     Iterable,
-    Sequence,
     Set,
     Tuple,
 )
@@ -86,8 +85,8 @@
 from trinity.protocol.bcc_libp2p.configs import ATTESTATION_SUBNET_COUNT
 
 
-GetReadyAttestationsFn = Callable[[Slot], Sequence[Attestation]]
-GetAggregatableAttestationsFn = Callable[[Slot, CommitteeIndex], Sequence[Attestation]]
+GetReadyAttestationsFn = Callable[[Slot, bool], Tuple[Attestation, ...]]
+GetAggregatableAttestationsFn = Callable[[Slot, CommitteeIndex], Tuple[Attestation, ...]]
 ImportAttestationFn = Callable[[Attestation, bool], None]
 
 
@@ -263,7 +262,11 @@ async def propose_block(self,
         """
         Propose a block and broadcast it.
         """
-        ready_attestations = self.get_ready_attestations(slot)
+        # TODO(hwwhww): Check if need to aggregate and if they are overlapping.
+        aggregated_attestations = self.get_ready_attestations(slot, True)
+        unaggregated_attestations = self.get_ready_attestations(slot, False)
+        ready_attestations = aggregated_attestations + unaggregated_attestations
+
         block = create_block_on_state(
             state=state,
             config=state_machine.config,

trinity/protocol/bcc_libp2p/servers.py

@@ -366,12 +366,20 @@ def _is_block_seen(self, block: BaseBeaconBlock) -> bool:
     # Exposed APIs for Validator
     #
     @to_tuple
-    def get_ready_attestations(self, current_slot: Slot) -> Iterable[Attestation]:
+    def get_ready_attestations(
+        self, current_slot: Slot, is_aggregated: bool
+    ) -> Iterable[Attestation]:
         """
         Get the attestations that are ready to be included in ``current_slot`` block.
         """
         config = self.chain.get_state_machine().config
-        return self.unaggregated_attestation_pool.get_valid_attestation_by_current_slot(
+
+        if is_aggregated:
+            attestation_pool = self.aggregated_attestation_pool
+        else:
+            attestation_pool = self.unaggregated_attestation_pool
+
+        return attestation_pool.get_valid_attestation_by_current_slot(
             current_slot,
             config,
         )

trinity/protocol/bcc_libp2p/topic_validators.py

@@ -87,7 +87,7 @@ def beacon_attestation_validator(msg_forwarder: ID, msg: rpc_pb2.Message) -> boo
         state_machine = chain.get_state_machine()
 
         try:
-            validate_beacon_block(chain, attestation)
+            validate_voting_beacon_block(chain, attestation)
             validate_attestation_signature(
                 state,
                 attestation,
@@ -125,7 +125,7 @@ def committee_index_beacon_attestation_validator(
         try:
             validate_subnet_id(attestation, subnet_id)
             validate_is_unaggregated(attestation)
-            validate_beacon_block(chain, attestation)
+            validate_voting_beacon_block(chain, attestation)
             validate_attestation_propagation_slot_range(
                 state,
                 attestation,
@@ -163,7 +163,7 @@ def beacon_aggregate_and_proof_validator(msg_forwarder: ID, msg: rpc_pb2.Message
         attestation = aggregate_and_proof.aggregate
 
         try:
-            validate_beacon_block(chain, attestation)
+            validate_voting_beacon_block(chain, attestation)
             run_validate_aggregate_and_proof(
                 state,
                 aggregate_and_proof,
@@ -229,7 +229,7 @@ def validate_is_unaggregated(attestation: Attestation) -> None:
         return False
 
 
-def validate_beacon_block(chain: BaseBeaconChain, attestation: Attestation) -> None:
+def validate_voting_beacon_block(chain: BaseBeaconChain, attestation: Attestation) -> None:
     # Check that beacon blocks attested to by the attestation are validated
     try:
         chain.get_block_by_root(attestation.data.beacon_block_root)