Merge pull request #633 from NIC619/add_attestation_logic_in_validator_plugin

Add attestation handling to validator and receive server

Author: NIC619

eth2/beacon/tools/builder/validator.py

@@ -507,7 +507,6 @@ def create_mock_signed_attestations_at_slot(
     for crosslink_committee in crosslink_committees_at_slot:
         committee, shard = crosslink_committee
 
-        num_voted_attesters = int(len(committee) * voted_attesters_ratio)
         previous_crosslink = state.latest_crosslinks[shard]
 
         attestation_data = AttestationData(
@@ -533,6 +532,78 @@ def create_mock_signed_attestations_at_slot(
         )
 
 
+def create_signed_attestation_at_slot(
+        state: BeaconState,
+        config: Eth2Config,
+        state_machine: BaseBeaconStateMachine,
+        attestation_slot: Slot,
+        beacon_block_root: Hash32,
+        validator_privkeys: Dict[ValidatorIndex, int],
+        committee: Tuple[ValidatorIndex, ...],
+        shard: Shard) -> Attestation:
+    """
+    Create the attestations of the given ``attestation_slot`` slot with ``validator_privkeys``.
+    """
+    state_transition = state_machine.state_transition
+    state = state_transition.apply_state_transition_without_block(
+        state,
+        attestation_slot,
+    )
+
+    # Get `target_root`
+    target_root = _get_target_root(state, config, beacon_block_root)
+
+    previous_crosslink = state.latest_crosslinks[shard]
+
+    attestation_data = AttestationData(
+        slot=attestation_slot,
+        beacon_block_root=beacon_block_root,
+        source_epoch=state.current_justified_epoch,
+        source_root=state.current_justified_root,
+        target_root=target_root,
+        shard=shard,
+        previous_crosslink=previous_crosslink,
+        crosslink_data_root=ZERO_HASH32,
+    )
+
+    message_hash = AttestationDataAndCustodyBit(
+        data=attestation_data,
+        custody_bit=False
+    ).root
+
+    signatures = [
+        sign_transaction(
+            message_hash=message_hash,
+            privkey=privkey,
+            fork=state.fork,
+            slot=attestation_data.slot,
+            signature_domain=SignatureDomain.DOMAIN_ATTESTATION,
+            slots_per_epoch=config.SLOTS_PER_EPOCH,
+        )
+        for _, privkey in validator_privkeys.items()
+    ]
+
+    voting_committee_indices = [
+        CommitteeIndex(committee.index(validator_index))
+        for validator_index in validator_privkeys
+    ]
+    # aggregate signatures and construct participant bitfield
+    aggregation_bitfield, aggregate_signature = aggregate_votes(
+        bitfield=get_empty_bitfield(len(committee)),
+        sigs=(),
+        voting_sigs=signatures,
+        voting_committee_indices=voting_committee_indices,
+    )
+
+    # create attestation from attestation_data, particpipant_bitfield, and signature
+    return Attestation(
+        aggregation_bitfield=aggregation_bitfield,
+        data=attestation_data,
+        custody_bitfield=Bitfield(get_empty_bitfield(len(aggregation_bitfield))),
+        aggregate_signature=aggregate_signature,
+    )
+
+
 #
 # VoluntaryExit
 #

tests/core/p2p-proto/bcc/test_commands.py

@@ -148,7 +148,9 @@ async def test_send_no_attestations(request, event_loop):
 
     message = await msg_buffer.msg_queue.get()
     assert isinstance(message.command, Attestations)
-    assert message.payload == ()
+    assert message.payload == {
+        "encoded_attestations": (),
+    }
 
 
 @pytest.mark.asyncio
@@ -174,7 +176,7 @@ async def test_send_single_attestation(request, event_loop):
 
     message = await msg_buffer.msg_queue.get()
     assert isinstance(message.command, Attestations)
-    assert message.payload == (ssz.encode(attestation),)
+    assert message.payload["encoded_attestations"] == (ssz.encode(attestation),)
 
 
 @pytest.mark.asyncio
@@ -202,4 +204,5 @@ async def test_send_multiple_attestations(request, event_loop):
 
     message = await msg_buffer.msg_queue.get()
     assert isinstance(message.command, Attestations)
-    assert message.payload == tuple(ssz.encode(attestation) for attestation in attestations)
+    assert message.payload["encoded_attestations"] == tuple(
+        ssz.encode(attestation) for attestation in attestations)

tests/plugins/eth2/beacon/test_receive_server.py

@@ -17,24 +17,29 @@
     MsgBuffer,
 )
 
+from eth.constants import (
+    ZERO_HASH32,
+)
 from eth.exceptions import (
     BlockNotFound,
 )
 
+from eth2.beacon.typing import (
+    FromBlockParams,
+)
 from eth2.beacon.chains.testnet import TestnetChain
+from eth2.beacon.types.attestations import Attestation
+from eth2.beacon.types.attestation_data import AttestationData
 from eth2.beacon.types.blocks import (
     BaseBeaconBlock,
 )
-from eth2.beacon.typing import (
-    FromBlockParams,
-)
+from eth2.beacon.types.crosslinks import Crosslink
 from eth2.beacon.state_machines.forks.serenity.blocks import (
     SerenityBeaconBlock,
 )
 from eth2.beacon.state_machines.forks.xiao_long_bao.configs import (
     XIAO_LONG_BAO_CONFIG,
 )
-
 from trinity.protocol.bcc.peer import (
     BCCPeer,
 )
@@ -469,3 +474,44 @@ async def test_bcc_receive_server_with_request_server(request, event_loop):
     assert bob_recv_server._is_block_root_in_db(blocks[0].signing_root)
     assert bob_recv_server._is_block_root_in_db(blocks[1].signing_root)
     assert bob_recv_server._is_block_root_in_db(blocks[2].signing_root)
+
+
+@pytest.mark.asyncio
+async def test_bcc_receive_server_handle_attestations_checks(request, event_loop, monkeypatch):
+    alice, _, bob_recv_server, bob_msg_queue = await get_peer_and_receive_server(
+        request,
+        event_loop,
+    )
+    attestation = Attestation(
+        aggregation_bitfield=b'\x12' * 16,
+        data=AttestationData(
+            slot=XIAO_LONG_BAO_CONFIG.GENESIS_SLOT + 1,
+            beacon_block_root=ZERO_HASH32,
+            source_epoch=XIAO_LONG_BAO_CONFIG.GENESIS_EPOCH,
+            source_root=ZERO_HASH32,
+            target_root=ZERO_HASH32,
+            shard=0,
+            previous_crosslink=Crosslink(
+                epoch=XIAO_LONG_BAO_CONFIG.GENESIS_EPOCH,
+                crosslink_data_root=ZERO_HASH32,
+            ),
+            crosslink_data_root=ZERO_HASH32,
+        ),
+        custody_bitfield=b'\x34' * 16,
+        aggregate_signature=b'\x56' * 96,
+    )
+
+    def _validate_attestations(attestations):
+        return tuple(attestations)
+
+    monkeypatch.setattr(
+        bob_recv_server,
+        '_validate_attestations',
+        _validate_attestations,
+    )
+
+    alice.sub_proto.send_attestation_records([attestation])
+    msg = await bob_msg_queue.get()
+    assert len(msg['encoded_attestations']) == 1
+    decoded_attestation = ssz.decode(msg['encoded_attestations'][0], Attestation)
+    assert decoded_attestation == attestation