Reorg validate_proposer_signature

Author: hwwhww

eth/beacon/state_machines/forks/serenity/state_transitions.py

@@ -11,6 +11,9 @@
 from .operations import (
     process_attestations,
 )
+from .validation import (
+    validate_serenity_proposer_signature,
+)
 
 
 class SerenityStateTransition(BaseStateTransition):
@@ -40,7 +43,15 @@ def per_slot_transition(self,
 
     def per_block_transition(self, state: BeaconState, block: BaseBeaconBlock) -> BeaconState:
         # TODO
+        validate_serenity_proposer_signature(
+            state,
+            block,
+            beacon_chain_shard_number=self.config.BEACON_CHAIN_SHARD_NUMBER,
+            epoch_length=self.config.EPOCH_LENGTH,
+        )
+
         state = process_attestations(state, block, self.config)
+
         return state
 
     def per_epoch_transition(self, state: BeaconState) -> BeaconState:

eth/beacon/state_machines/forks/serenity/validation.py

@@ -21,12 +21,49 @@
 )
 from eth.beacon.helpers import (
     get_attestation_participants,
+    get_beacon_proposer_index,
     get_block_root,
     get_domain,
 )
+from eth.beacon.types.blocks import BaseBeaconBlock  # noqa: F401
 from eth.beacon.types.states import BeaconState  # noqa: F401
 from eth.beacon.types.attestations import Attestation  # noqa: F401
 from eth.beacon.types.attestation_data import AttestationData  # noqa: F401
+from eth.beacon.types.proposal_signed_data import ProposalSignedData
+from eth.beacon.typing import (
+    ShardNumber,
+)
+
+
+#
+# Proposer signature validation
+#
+def validate_serenity_proposer_signature(state: BeaconState,
+                                         block: BaseBeaconBlock,
+                                         beacon_chain_shard_number: ShardNumber,
+                                         epoch_length: int) -> None:
+    block_without_signature_root = block.block_without_signature_root
+
+    # TODO: Replace this root with tree hash root
+    proposal_root = ProposalSignedData(
+        state.slot,
+        beacon_chain_shard_number,
+        block_without_signature_root
+    ).root
+
+    # Get the public key of proposer
+    beacon_proposer_index = get_beacon_proposer_index(state, state.slot, epoch_length)
+    proposer_pubkey = state.validator_registry[beacon_proposer_index].pubkey
+
+    is_valid_signature = bls.verify(
+        pubkey=proposer_pubkey,
+        message=proposal_root,
+        signature=block.signature,
+        domain=get_domain(state.fork_data, state.slot, SignatureDomain.DOMAIN_PROPOSAL)
+    )
+
+    if not is_valid_signature:
+        raise ValidationError("Invalid Proposer Signature on block")
 
 
 #

eth/beacon/state_machines/validation.py

@@ -1,17 +1,74 @@
+import pytest
+
+
+from eth._utils import bls as bls
 from eth.beacon.db.chain import BeaconChainDB
-from eth.beacon.types.blocks import BaseBeaconBlock
-from eth.beacon.types.states import BeaconState
+from eth.beacon.enums import (
+    SignatureDomain,
+)
+from eth.beacon.helpers import (
+    get_beacon_proposer_index,
+)
+from eth.beacon.state_machines.forks.serenity.blocks import (
+    SerenityBeaconBlock,
+)
+from eth.beacon.types.proposal_signed_data import ProposalSignedData
 
 
-def test_demo(base_db, sample_beacon_block_params, sample_beacon_state_params, fixture_sm_class):
+@pytest.mark.parametrize(
+    (
+        'num_validators,'
+        'epoch_length,'
+        'min_attestation_inclusion_delay,'
+        'target_committee_size,'
+        'shard_count'
+    ),
+    [
+        (10, 2, 1, 2, 2)
+    ]
+)
+def test_demo(base_db,
+              sample_beacon_block_params,
+              genesis_state,
+              fixture_sm_class,
+              config,
+              privkeys,
+              pubkeys):
     chaindb = BeaconChainDB(base_db)
-    state = BeaconState(**sample_beacon_state_params)
-    block = BaseBeaconBlock(**sample_beacon_block_params).copy(
-        slot=state.slot + 2,
+    state = genesis_state
+    block = SerenityBeaconBlock(**sample_beacon_block_params).copy(
+        slot=state.slot + 1,
+    )
+
+    # Sign block
+    beacon_proposer_index = get_beacon_proposer_index(
+        state.copy(
+            slot=state.slot + 1,
+        ),
+        block.slot,
+        config.EPOCH_LENGTH,
+    )
+    index_in_privkeys = pubkeys.index(
+        state.validator_registry[beacon_proposer_index].pubkey
+    )
+    beacon_proposer_privkey = privkeys[index_in_privkeys]
+    empty_signature_block_root = block.block_without_signature_root
+    proposal_root = ProposalSignedData(
+        block.slot,
+        config.BEACON_CHAIN_SHARD_NUMBER,
+        empty_signature_block_root,
+    ).root
+    block = block.copy(
+        signature=bls.sign(
+            message=proposal_root,
+            privkey=beacon_proposer_privkey,
+            domain=SignatureDomain.DOMAIN_PROPOSAL,
+        ),
     )
 
+    # Get state machine instance
     sm = fixture_sm_class(chaindb, block, state)
-    result_state, result_block = sm.import_block(block)
+    result_state, _ = sm.import_block(block)
 
     assert state.slot == 0
     assert result_state.slot == block.slot

tests/beacon/state_machines/test_demo.py

@@ -4,21 +4,20 @@
     ValidationError,
 )
 
+from eth._utils import bls
+
 from eth.beacon.enums import (
     SignatureDomain,
 )
-
-from eth.beacon.state_machines.validation import (
-    validate_proposer_signature,
-)
-
 from eth.beacon.types.blocks import BaseBeaconBlock
 from eth.beacon.types.proposal_signed_data import (
     ProposalSignedData,
 )
 from eth.beacon.types.states import BeaconState
 
-from eth._utils import bls
+from eth.beacon.state_machines.forks.serenity.validation import (
+    validate_serenity_proposer_signature,
+)
 
 from tests.beacon.helpers import mock_validator_record
 from tests.beacon.test_helpers import (
@@ -38,7 +37,7 @@
         (123, 123, False),
     )
 )
-def test_validate_proposer_signature(
+def test_validate_serenity_proposer_signature(
         proposer_privkey,
         proposer_pubkey,
         is_valid_signature,
@@ -78,15 +77,15 @@ def test_validate_proposer_signature(
     )
 
     if is_valid_signature:
-        validate_proposer_signature(
+        validate_serenity_proposer_signature(
             state,
             proposed_block,
             beacon_chain_shard_number,
             epoch_length,
         )
     else:
         with pytest.raises(ValidationError):
-            validate_proposer_signature(
+            validate_serenity_proposer_signature(
                 state,
                 proposed_block,
                 beacon_chain_shard_number,