Removed eth.beacon.config and added v1 namespace in DB schema

Author: hwwhww

eth/beacon/config.py

@@ -53,24 +53,24 @@ def make_canonical_head_hash_lookup_key() -> bytes:
 
     @staticmethod
     def make_block_slot_to_hash_lookup_key(slot: int) -> bytes:
-        slot_to_hash_key = b'beacon:block-slot-to-hash:%d' % slot
+        slot_to_hash_key = b'v1:beacon:block-slot-to-hash:%d' % slot
         return slot_to_hash_key
 
     @staticmethod
     def make_block_hash_to_score_lookup_key(block_hash: Hash32) -> bytes:
-        return b'beacon:block-hash-to-score:%s' % block_hash
+        return b'v1:beacon:block-hash-to-score:%s' % block_hash
 
     #
     # States
     #
     @staticmethod
     def make_slot_to_crystallized_state_lookup_key(slot: int) -> bytes:
-        return b'beacon:slot-to-crystallized-state:%d' % slot
+        return b'v1:beacon:slot-to-crystallized-state:%d' % slot
 
     @staticmethod
     def make_crystallized_to_active_state_root_lookup_key(state_root: Hash32) -> bytes:
-        return b'beacon:crystallized-root-to-active-state-root:%s' % state_root
+        return b'v1:beacon:crystallized-root-to-active-state-root:%s' % state_root
 
     @staticmethod
     def make_deletable_state_roots_lookup_key() -> bytes:
-        return b'beacon:make-deletable-state-roots'
+        return b'v1:beacon:make-deletable-state-roots'

eth/beacon/db/schema.py

@@ -10,7 +10,6 @@
 from eth.constants import (
     ZERO_HASH32,
 )
-from eth.beacon.config import BeaconConfig  # noqa: F401
 from eth.beacon.types.active_states import ActiveState
 from eth.beacon.types.blocks import BaseBeaconBlock
 from eth.beacon.types.crosslink_records import CrosslinkRecord
@@ -23,8 +22,8 @@
     from eth.beacon.types.validator_records import ValidatorRecord  # noqa: F401
 
 
-def get_genesis_active_state(beacon_config: 'BeaconConfig') -> ActiveState:
-    recent_block_hashes = [ZERO_HASH32] * beacon_config.cycle_length * 2
+def get_genesis_active_state(cycle_length: int) -> ActiveState:
+    recent_block_hashes = [ZERO_HASH32] * cycle_length * 2
 
     return ActiveState(
         pending_attestations=[],
@@ -35,17 +34,21 @@ def get_genesis_active_state(beacon_config: 'BeaconConfig') -> ActiveState:
 def get_genesis_crystallized_state(
         validators: List['ValidatorRecord'],
         init_shuffling_seed: Hash32,
-        beacon_config: 'BeaconConfig') -> CrystallizedState:
+        cycle_length: int,
+        min_committee_size: int,
+        shard_count: int) -> CrystallizedState:
 
     current_dynasty = 1
     crosslinking_start_shard = 0
 
     shard_and_committee_for_slots = get_new_shuffling(
-        init_shuffling_seed,
-        validators,
-        current_dynasty,
-        crosslinking_start_shard,
-        beacon_config=beacon_config,
+        seed=init_shuffling_seed,
+        validators=validators,
+        dynasty=current_dynasty,
+        crosslinking_start_shard=crosslinking_start_shard,
+        cycle_length=cycle_length,
+        min_committee_size=min_committee_size,
+        shard_count=shard_count,
     )
     # concatenate with itself to span 2*CYCLE_LENGTH
     shard_and_committee_for_slots = shard_and_committee_for_slots + shard_and_committee_for_slots
@@ -64,7 +67,7 @@ def get_genesis_crystallized_state(
                 slot=0,
                 hash=ZERO_HASH32,
             )
-            for _ in range(beacon_config.shard_count)
+            for _ in range(shard_count)
         ],
         dynasty_seed=init_shuffling_seed,
         dynasty_start=0,

eth/beacon/genesis_helpers.py

@@ -20,7 +20,6 @@
 from eth.utils.blake import (
     blake,
 )
-from eth.beacon.config import BeaconConfig  # noqa: F401
 from eth.beacon.types.shard_and_committees import (
     ShardAndCommittee,
 )
@@ -268,11 +267,14 @@ def _get_shards_and_committees_for_shard_indices(
 
 
 @to_tuple
-def get_new_shuffling(seed: Hash32,
+def get_new_shuffling(*,
+                      seed: Hash32,
                       validators: Sequence['ValidatorRecord'],
                       dynasty: int,
                       crosslinking_start_shard: int,
-                      beacon_config: BeaconConfig) -> Iterable[Iterable[ShardAndCommittee]]:
+                      cycle_length: int,
+                      min_committee_size: int,
+                      shard_count: int) -> Iterable[Iterable[ShardAndCommittee]]:
     """
     Returns shuffled ``shard_and_committee_for_slots`` (``[[ShardAndCommittee]]``) of
     the given active ``validators``.
@@ -317,10 +319,6 @@ def get_new_shuffling(seed: Hash32,
 
     NOTE: The spec might be updated to output an array rather than an array of arrays.
     """
-    cycle_length = beacon_config.cycle_length
-    min_committee_size = beacon_config.min_committee_size
-    shard_count = beacon_config.shard_count
-
     active_validators = get_active_validator_indices(dynasty, validators)
     active_validators_size = len(active_validators)
 
@@ -353,11 +351,11 @@ def get_new_shuffling(seed: Hash32,
 #
 def get_proposer_position(parent_block: 'BaseBeaconBlock',
                           crystallized_state: 'CrystallizedState',
-                          beacon_config: BeaconConfig) -> Tuple[int, int]:
+                          cycle_length: int) -> Tuple[int, int]:
     shards_and_committees = get_shards_and_committees_for_slot(
         crystallized_state,
         parent_block.slot_number,
-        beacon_config.cycle_length,
+        cycle_length,
     )
     """
     Returns the proposer index in committee and the ``shard_id``.

eth/beacon/helpers.py

@@ -165,10 +165,9 @@ def active_state(self) -> ActiveState:
             )
             blocks = blocks[::-1]
 
-            self._active_state = self.get_active_state_class().from_old_active_and_blocks(
+            self._active_state = self.get_active_state_class().from_old_active_state_and_blocks(
                 old_active_state,
                 blocks,
-                self.config.CYCLE_LENGTH * 2,
             )
 
         return self._active_state

eth/beacon/state_machines/base.py

@@ -9,7 +9,6 @@
         ('DEFAULT_END_DYNASTY', int),
         ('DEPOSIT_SIZE', int),
         ('CYCLE_LENGTH', int),
-        ('MAX_VALIDATOR_COUNT', int),
         ('MIN_COMMITTEE_SIZE', int),
         ('MIN_DYNASTY_LENGTH', int),
         ('SHARD_COUNT', int),

eth/beacon/state_machines/configs.py

@@ -10,7 +10,7 @@
 from .active_states import SerenityActiveState
 from .blocks import SerenityBeaconBlock
 from .crystallized_states import SerenityCrystallizedState
-from .configs import SENERITY_CONFIG
+from .configs import SERENITY_CONFIG
 
 
 class SerenityBeaconStateMachine(BeaconStateMachine):
@@ -21,4 +21,4 @@ class SerenityBeaconStateMachine(BeaconStateMachine):
     block_class = SerenityBeaconBlock  # type: Type[BaseBeaconBlock]
     crystallized_state_class = SerenityCrystallizedState  # type: Type[CrystallizedState]
     active_state_class = SerenityActiveState  # type: Type[ActiveState]
-    config = SENERITY_CONFIG
+    config = SERENITY_CONFIG

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

@@ -1,12 +1,23 @@
+
+from typing import (
+    Sequence,
+    TYPE_CHECKING,
+)
+
 from eth.beacon.types.active_states import ActiveState
 from eth.beacon.helpers import (
     get_new_recent_block_hashes,
 )
 
+if TYPE_CHECKING:
+    from eth.beacon.types.blocks import BaseBeaconBlock
+
 
 class SerenityActiveState(ActiveState):
     @classmethod
-    def from_old_active_and_blocks(cls, old_active_state, blocks, recent_block_hashes_length):
+    def from_old_active_state_and_blocks(cls,
+                                         old_active_state: ActiveState,
+                                         blocks: Sequence['BaseBlock']):
         recent_block_hashes = old_active_state.recent_block_hashes
         pending_attestations = old_active_state.pending_attestations
 

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

@@ -3,12 +3,11 @@
 from eth.beacon.state_machines.configs import BeaconConfig
 
 
-SENERITY_CONFIG = BeaconConfig(
+SERENITY_CONFIG = BeaconConfig(
     BASE_REWARD_QUOTIENT=2**15,
     DEFAULT_END_DYNASTY=9999999999999999999,
     DEPOSIT_SIZE=32 * denoms.ether,  # WEI
     CYCLE_LENGTH=64,  # slots
-    MAX_VALIDATOR_COUNT=2**22,  # validators
     MIN_COMMITTEE_SIZE=128,  # validators
     MIN_DYNASTY_LENGTH=256,  # slots
     SHARD_COUNT=1024,  # shards