move attestation validation to forks/serenity/validation.py. change naming to reflect fork name

Author: djrtwo

eth/beacon/state_machines/base.py

@@ -12,6 +12,7 @@
 )
 
 from eth.beacon.db.chain import BaseBeaconChainDB
+from eth.beacon.types.attestations import Attestation
 from eth.beacon.types.blocks import BaseBeaconBlock
 from eth.beacon.types.states import BeaconState
 
@@ -63,6 +64,15 @@ def state_transition(self) -> BaseStateTransition:
     def import_block(self, block: BaseBeaconBlock) -> Tuple[BeaconState, BaseBeaconBlock]:
         pass
 
+    #
+    # State transition
+    #
+    @abstractmethod
+    def validate_attestation(self,
+                             attestation: Attestation,
+                             is_validating_signatures: bool=True) -> None:
+        raise NotImplementedError
+
 
 class BeaconStateMachine(BaseBeaconStateMachine):
     def __init__(self,

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

@@ -1,15 +1,17 @@
 from typing import Type  # noqa: F401
 
+from eth.beacon.types.attestations import Attestation
 from eth.beacon.types.blocks import BaseBeaconBlock  # noqa: F401
 from eth.beacon.types.states import BeaconState  # noqa: F401
 
 from eth.beacon.state_machines.base import BeaconStateMachine
 from eth.beacon.state_machines.state_transitions import BaseStateTransition  # noqa: F401
 
+from .configs import SERENITY_CONFIG
 from .blocks import SerenityBeaconBlock
 from .states import SerenityBeaconState
 from .state_transitions import SerenityStateTransition
-from .configs import SERENITY_CONFIG
+from .validation import validate_serenity_attestation
 
 
 class SerenityStateMachine(BeaconStateMachine):
@@ -21,3 +23,14 @@ class SerenityStateMachine(BeaconStateMachine):
     state_class = SerenityBeaconState  # type: Type[BeaconState]
     state_transition_class = SerenityStateTransition  # type: Type[BaseStateTransition]
     config = SERENITY_CONFIG
+
+    def validate_attestation(self,
+                             attestation: Attestation,
+                             is_validating_signatures: bool=True) -> None:
+        validate_serenity_attestation(
+            self,
+            attestation,
+            self.config.EPOCH_LENGTH,
+            self.config.MIN_ATTESTATION_INCLUSION_DELAY,
+            is_validating_signatures,
+        )

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

@@ -18,10 +18,10 @@
     get_block_root,
     get_domain,
 )
-from eth.utils import (
+from eth._utils import (
     bls
 )
-from eth.beacon.utils.hash import (
+from eth.beacon._utils.hash import (
     hash_eth2,
 )
 from eth.beacon.types.states import BeaconState  # noqa: F401
@@ -32,60 +32,60 @@
 #
 # Attestation validation
 #
-def validate_attestation(state: BeaconState,
-                         attestation: Attestation,
-                         epoch_length: int,
-                         min_attestation_inclusion_delay: int,
-                         is_validating_signatures: bool=True) -> None:
+def validate_serenity_attestation(state: BeaconState,
+                                  attestation: Attestation,
+                                  epoch_length: int,
+                                  min_attestation_inclusion_delay: int,
+                                  is_validating_signatures: bool=True) -> None:
     """
     Validate the given ``attestation``.
     Raise ``ValidationError`` if it's invalid.
     """
 
-    validate_attestation_slot(
-        attestation_data=attestation.data,
-        current_slot=state.slot,
-        epoch_length=epoch_length,
-        min_attestation_inclusion_delay=min_attestation_inclusion_delay,
+    validate_serenity_attestation_slot(
+        attestation.data,
+        state.slot,
+        epoch_length,
+        min_attestation_inclusion_delay,
     )
 
-    validate_attestation_justified_slot(
-        attestation_data=attestation.data,
-        current_slot=state.slot,
-        previous_justified_slot=state.previous_justified_slot,
-        justified_slot=state.justified_slot,
-        epoch_length=epoch_length,
+    validate_serenity_attestation_justified_slot(
+        attestation.data,
+        state.slot,
+        state.previous_justified_slot,
+        state.justified_slot,
+        epoch_length,
     )
 
-    validate_attestation_justified_block_root(
-        attestation_data=attestation.data,
+    validate_serenity_attestation_justified_block_root(
+        attestation.data,
         justified_block_root=get_block_root(
             state.latest_block_roots,
             current_slot=state.slot,
             slot=attestation.data.justified_slot,
         ),
     )
 
-    validate_attestation_latest_crosslink_root(
-        attestation_data=attestation.data,
+    validate_serenity_attestation_latest_crosslink_root(
+        attestation.data,
         latest_crosslink_shard_block_root=(
             state.latest_crosslinks[attestation.data.shard].shard_block_root
         ),
     )
 
-    validate_attestation_shard_block_root(attestation_data=attestation.data)
+    validate_serenity_attestation_shard_block_root(attestation.data)
 
     if is_validating_signatures:
-        validate_attestation_aggregate_signature(
+        validate_serenity_attestation_aggregate_signature(
             state,
             attestation,
         )
 
 
-def validate_attestation_slot(attestation_data: AttestationData,
-                              current_slot: int,
-                              epoch_length: int,
-                              min_attestation_inclusion_delay: int) -> None:
+def validate_serenity_attestation_slot(attestation_data: AttestationData,
+                                       current_slot: int,
+                                       epoch_length: int,
+                                       min_attestation_inclusion_delay: int) -> None:
     """
     Validate ``slot`` field of ``attestation_data``.
     Raise ``ValidationError`` if it's invalid.
@@ -114,11 +114,11 @@ def validate_attestation_slot(attestation_data: AttestationData,
         )
 
 
-def validate_attestation_justified_slot(attestation_data: AttestationData,
-                                        current_slot: int,
-                                        previous_justified_slot: int,
-                                        justified_slot: int,
-                                        epoch_length: int) -> None:
+def validate_serenity_attestation_justified_slot(attestation_data: AttestationData,
+                                                 current_slot: int,
+                                                 previous_justified_slot: int,
+                                                 justified_slot: int,
+                                                 epoch_length: int) -> None:
     """
     Validate ``justified_slot`` field of ``attestation_data``.
     Raise ``ValidationError`` if it's invalid.
@@ -141,8 +141,8 @@ def validate_attestation_justified_slot(attestation_data: AttestationData,
             )
 
 
-def validate_attestation_justified_block_root(attestation_data: AttestationData,
-                                              justified_block_root: Hash32) -> None:
+def validate_serenity_attestation_justified_block_root(attestation_data: AttestationData,
+                                                       justified_block_root: Hash32) -> None:
     """
     Validate ``justified_block_root`` field of ``attestation_data``.
     Raise ``ValidationError`` if it's invalid.
@@ -160,8 +160,8 @@ def validate_attestation_justified_block_root(attestation_data: AttestationData,
         )
 
 
-def validate_attestation_latest_crosslink_root(attestation_data: AttestationData,
-                                               latest_crosslink_shard_block_root: Hash32) -> None:
+def validate_serenity_attestation_latest_crosslink_root(attestation_data: AttestationData,
+                                                        latest_crosslink_shard_block_root: Hash32) -> None:
     """
     Validate that either the ``latest_crosslink_root`` or ``shard_block_root``
     field of ``attestation_data`` is the provided ``latest_crosslink_shard_block_root``.
@@ -184,7 +184,7 @@ def validate_attestation_latest_crosslink_root(attestation_data: AttestationData
         )
 
 
-def validate_attestation_shard_block_root(attestation_data: AttestationData) -> None:
+def validate_serenity_attestation_shard_block_root(attestation_data: AttestationData) -> None:
     """
     Validate ``shard_block_root`` field of `attestation_data`.
     Raise ``ValidationError`` if it's invalid.
@@ -203,9 +203,9 @@ def validate_attestation_shard_block_root(attestation_data: AttestationData) ->
         )
 
 
-def validate_attestation_aggregate_signature(state: BeaconState,
-                                             attestation: Attestation,
-                                             epoch_length: int) -> None:
+def validate_serenity_attestation_aggregate_signature(state: BeaconState,
+                                                      attestation: Attestation,
+                                                      epoch_length: int) -> None:
     """
     Validate ``aggregate_signature`` field of ``attestation``.
     Raise ``ValidationError`` if it's invalid.