Sync constants

Author: hwwhww

eth/beacon/helpers.py

@@ -77,20 +77,20 @@ def get_block_hash(
         recent_block_hashes: Sequence[Hash32],
         current_block_slot_number: int,
         slot: int,
-        cycle_length: int) -> Hash32:
+        epoch_length: int) -> Hash32:
     """
     Return the blockhash from ``ActiveState.recent_block_hashes`` by
     ``current_block_slot_number``.
     """
-    if len(recent_block_hashes) != cycle_length * 2:
+    if len(recent_block_hashes) != epoch_length * 2:
         raise ValueError(
-            "Length of recent_block_hashes != cycle_length * 2"
+            "Length of recent_block_hashes != epoch_length * 2"
             "\texpected: %s, found: %s" % (
-                cycle_length * 2, len(recent_block_hashes)
+                epoch_length * 2, len(recent_block_hashes)
             )
         )
 
-    slot_relative_position = current_block_slot_number - cycle_length * 2
+    slot_relative_position = current_block_slot_number - epoch_length * 2
     return _get_element_from_recent_list(
         recent_block_hashes,
         slot,
@@ -104,7 +104,7 @@ def get_hashes_from_recent_block_hashes(
         current_block_slot_number: int,
         from_slot: int,
         to_slot: int,
-        cycle_length: int) -> Iterable[Hash32]:
+        epoch_length: int) -> Iterable[Hash32]:
     """
     Returns the block hashes between ``from_slot`` and ``to_slot``.
     """
@@ -113,24 +113,24 @@ def get_hashes_from_recent_block_hashes(
             recent_block_hashes,
             current_block_slot_number,
             slot,
-            cycle_length,
+            epoch_length,
         )
 
 
 @to_tuple
 def get_hashes_to_sign(recent_block_hashes: Sequence[Hash32],
                        block: 'BaseBeaconBlock',
-                       cycle_length: int) -> Iterable[Hash32]:
+                       epoch_length: int) -> Iterable[Hash32]:
     """
     Given the head block to attest to, collect the list of hashes to be
     signed in the attestation.
     """
     yield from get_hashes_from_recent_block_hashes(
         recent_block_hashes,
         block.slot_number,
-        from_slot=block.slot_number - cycle_length + 1,
+        from_slot=block.slot_number - epoch_length + 1,
         to_slot=block.slot_number - 1,
-        cycle_length=cycle_length,
+        epoch_length=epoch_length,
     )
     yield block.hash
 
@@ -139,17 +139,17 @@ def get_hashes_to_sign(recent_block_hashes: Sequence[Hash32],
 def get_signed_parent_hashes(recent_block_hashes: Sequence[Hash32],
                              block: 'BaseBeaconBlock',
                              attestation: 'AttestationRecord',
-                             cycle_length: int) -> Iterable[Hash32]:
+                             epoch_length: int) -> Iterable[Hash32]:
     """
     Given an attestation and the block they were included in,
     the list of hashes that were included in the signature.
     """
     yield from get_hashes_from_recent_block_hashes(
         recent_block_hashes,
         block.slot_number,
-        from_slot=attestation.slot - cycle_length + 1,
+        from_slot=attestation.slot - epoch_length + 1,
         to_slot=attestation.slot - len(attestation.oblique_parent_hashes),
-        cycle_length=cycle_length,
+        epoch_length=epoch_length,
     )
     yield from attestation.oblique_parent_hashes
 
@@ -173,19 +173,19 @@ def get_new_recent_block_hashes(old_block_hashes: Sequence[Hash32],
 def get_shards_and_committees_for_slot(
         crystallized_state: 'CrystallizedState',
         slot: int,
-        cycle_length: int) -> Iterable[ShardCommittee]:
+        epoch_length: int) -> Iterable[ShardCommittee]:
     """
     FIXME
     """
-    if len(crystallized_state.shard_committee_for_slots) != cycle_length * 2:
+    if len(crystallized_state.shard_committee_for_slots) != epoch_length * 2:
         raise ValueError(
-            "Length of shard_committee_for_slots != cycle_length * 2"
+            "Length of shard_committee_for_slots != epoch_length * 2"
             "\texpected: %s, found: %s" % (
-                cycle_length * 2, len(crystallized_state.shard_committee_for_slots)
+                epoch_length * 2, len(crystallized_state.shard_committee_for_slots)
             )
         )
 
-    slot_relative_position = crystallized_state.last_state_recalc - cycle_length
+    slot_relative_position = crystallized_state.last_state_recalc - epoch_length
 
     yield from _get_element_from_recent_list(
         crystallized_state.shard_committee_for_slots,
@@ -197,7 +197,7 @@ def get_shards_and_committees_for_slot(
 @to_tuple
 def get_attestation_indices(crystallized_state: 'CrystallizedState',
                             attestation: 'AttestationRecord',
-                            cycle_length: int) -> Iterable[int]:
+                            epoch_length: int) -> Iterable[int]:
     """
     FIXME
     Return committee of the given attestation.
@@ -207,7 +207,7 @@ def get_attestation_indices(crystallized_state: 'CrystallizedState',
     shards_and_committees_for_slot = get_shards_and_committees_for_slot(
         crystallized_state,
         attestation.slot,
-        cycle_length,
+        epoch_length,
     )
 
     for shard_committee in shards_and_committees_for_slot:
@@ -248,7 +248,7 @@ def get_new_shuffling(*,
                       seed: Hash32,
                       validators: Sequence['ValidatorRecord'],
                       crosslinking_start_shard: int,
-                      cycle_length: int,
+                      epoch_length: int,
                       target_committee_size: int,
                       shard_count: int) -> Iterable[Iterable[ShardCommittee]]:
     """
@@ -297,14 +297,14 @@ def get_new_shuffling(*,
     active_validators_size = len(active_validators)
     committees_per_slot = clamp(
         1,
-        shard_count // cycle_length,
-        active_validators_size // cycle_length // target_committee_size,
+        shard_count // epoch_length,
+        active_validators_size // epoch_length // target_committee_size,
     )
     # Shuffle with seed
     shuffled_active_validator_indices = shuffle(active_validators, seed)
 
     # Split the shuffled list into epoch_length pieces
-    validators_per_slot = split(shuffled_active_validator_indices, cycle_length)
+    validators_per_slot = split(shuffled_active_validator_indices, epoch_length)
     for index, slot_indices in enumerate(validators_per_slot):
         # Split the shuffled list into committees_per_slot pieces
         shard_indices = split(slot_indices, committees_per_slot)
@@ -321,11 +321,11 @@ def get_new_shuffling(*,
 #
 def get_block_committees_info(parent_block: 'BaseBeaconBlock',
                               crystallized_state: 'CrystallizedState',
-                              cycle_length: int) -> BlockCommitteesInfo:
+                              epoch_length: int) -> BlockCommitteesInfo:
     shards_and_committees = get_shards_and_committees_for_slot(
         crystallized_state,
         parent_block.slot_number,
-        cycle_length,
+        epoch_length,
     )
     """
     FIXME

eth/beacon/state_machines/configs.py

@@ -10,30 +10,36 @@
 BeaconConfig = NamedTuple(
     'BeaconConfig',
     (
-        ('SHARD_COUNT', int),  # shards
-        ('DEPOSIT_SIZE', int),  # ETH
-        ('MIN_TOPUP_SIZE', int),  # ETH
-        ('MIN_ONLINE_DEPOSIT_SIZE', int),  # ETH
+        # Misc
+        ('SHARD_COUNT', int),
+        ('TARGET_COMMITTEE_SIZE', int),
+        ('MAX_ATTESTATIONS_PER_BLOCK', int),
+        ('MIN_BALANCE', int),
+        ('MAX_BALANCE_CHURN_QUOTIENT', int),
+        ('GWEI_PER_ETH', int),
+        ('BEACON_CHAIN_SHARD_NUMBER', int),
+        ('BLS_WITHDRAWAL_CREDENTIALS', bytes),
+        # Deposit contract
         ('DEPOSIT_CONTRACT_ADDRESS', Address),
-        ('DEPOSITS_FOR_CHAIN_START', int),  # deposits
-        ('TARGET_COMMITTEE_SIZE', int),  # validators
-        ('SLOT_DURATION', int),  # seconds
-        ('CYCLE_LENGTH', int),  # slots
-        ('MIN_VALIDATOR_SET_CHANGE_INTERVAL', int),  # slots
-        ('SHARD_PERSISTENT_COMMITTEE_CHANGE_PERIOD', int),  # slots
-        ('MIN_ATTESTATION_INCLUSION_DELAY', int),  # slots
-        ('SQRT_E_DROP_TIME', int),  # slots
-        ('WITHDRAWALS_PER_CYCLE', int),  # validators
-        ('MIN_WITHDRAWAL_PERIOD', int),  # slots
-        ('DELETION_PERIOD', int),  # slots
-        ('COLLECTIVE_PENALTY_CALCULATION_PERIOD', int),  # slots
-        ('POW_RECEIPT_ROOT_VOTING_PERIOD', int),  # slots
-        ('SLASHING_WHISTLEBLOWER_REWARD_DENOMINATOR', int),
-        ('BASE_REWARD_QUOTIENT', int),
-        ('INCLUDER_REWARD_SHARE_QUOTIENT', int),
-        ('MAX_VALIDATOR_CHURN_QUOTIENT', int),
-        ('POW_CONTRACT_MERKLE_TREE_DEPTH', int),
-        ('MAX_ATTESTATION_COUNT', int),
+        ('DEPOSIT_CONTRACT_TREE_DEPTH', int),
+        ('MIN_DEPOSIT', int),
+        ('MAX_DEPOSIT', int),
+        # Initial values
         ('INITIAL_FORK_VERSION', int),
+        ('INITIAL_SLOT_NUMBER', int),
+        # Time parameters
+        ('SLOT_DURATION', int),
+        ('MIN_ATTESTATION_INCLUSION_DELAY', int),
+        ('EPOCH_LENGTH', int),
+        ('MIN_VALIDATOR_REGISTRY_CHANGE_INTERVAL', int),
+        ('POW_RECEIPT_ROOT_VOTING_PERIOD', int),
+        ('SHARD_PERSISTENT_COMMITTEE_CHANGE_PERIOD', int),
+        ('COLLECTIVE_PENALTY_CALCULATION_PERIOD', int),
+        ('ZERO_BALANCE_VALIDATOR_TTL', int),
+        # Reward and penalty quotients
+        ('BASE_REWARD_QUOTIENT', int),
+        ('WHISTLEBLOWER_REWARD_QUOTIENT', int),
+        ('INCLUDER_REWARD_QUOTIENT', int),
+        ('INACTIVITY_PENALTY_QUOTIENT', int),
     )
 )

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

@@ -5,29 +5,35 @@
 
 
 SERENITY_CONFIG = BeaconConfig(
-    SHARD_COUNT=2**10,  # = 1,024 shards
-    DEPOSIT_SIZE=2**5,  # = 32 ETH
-    MIN_TOPUP_SIZE=1,  # 1 ETH
-    MIN_ONLINE_DEPOSIT_SIZE=2**4,  # = 16 ETH
-    DEPOSIT_CONTRACT_ADDRESS=ZERO_ADDRESS,  # TODO: TBD
-    DEPOSITS_FOR_CHAIN_START=2**14,  # = 16,384 deposits
-    TARGET_COMMITTEE_SIZE=2**8,  # = 256 validators
-    SLOT_DURATION=6,  # seconds
-    CYCLE_LENGTH=2**6,  # = 64 slots
-    MIN_VALIDATOR_SET_CHANGE_INTERVAL=2**8,  # = 256 slots
-    SHARD_PERSISTENT_COMMITTEE_CHANGE_PERIOD=2**17,  # = 131,072 slots
-    MIN_ATTESTATION_INCLUSION_DELAY=2**2,  # = 4 slots
-    SQRT_E_DROP_TIME=2**11,  # = 2,048 cycles
-    WITHDRAWALS_PER_CYCLE=2**2,  # = 4 validators
-    MIN_WITHDRAWAL_PERIOD=2**13,  # = 8,192 slots
-    DELETION_PERIOD=2**22,  # = 4,194,304 slots
-    COLLECTIVE_PENALTY_CALCULATION_PERIOD=2**20,  # = 1,048,576 slots
-    POW_RECEIPT_ROOT_VOTING_PERIOD=2**10,  # = 1024
-    SLASHING_WHISTLEBLOWER_REWARD_DENOMINATOR=2**9,  # = 512
-    BASE_REWARD_QUOTIENT=2**11,  # = 2,048
-    INCLUDER_REWARD_SHARE_QUOTIENT=2**3,  # = 8
-    MAX_VALIDATOR_CHURN_QUOTIENT=2**5,  # = 32
-    POW_CONTRACT_MERKLE_TREE_DEPTH=2**5,  # =32
-    MAX_ATTESTATION_COUNT=2**7,  # 128
+    # Misc
+    SHARD_COUNT=2**1,  # (= 1,024) shards
+    TARGET_COMMITTEE_SIZE=2**8,  # (= 256) validators
+    MAX_ATTESTATIONS_PER_BLOCK=2**7,  # (= 128) attestations
+    MIN_BALANCE=2**4,  # (= 16) ETH
+    MAX_BALANCE_CHURN_QUOTIENT=2**5,  # (= 32)
+    GWEI_PER_ETH=10**9,  # Gwei/ETH
+    BEACON_CHAIN_SHARD_NUMBER=2**64 - 1,
+    BLS_WITHDRAWAL_CREDENTIALS=b'\x00',
+    # Deposit contract
+    DEPOSIT_CONTRACT_ADDRESS=ZERO_ADDRESS,  # TBD
+    DEPOSIT_CONTRACT_TREE_DEPTH=2**5,  # (= 32)
+    MIN_DEPOSIT=2**0,  # (= 1) ETH
+    MAX_DEPOSIT=2**5,  # (= 32) ETH
+    # Initial values
     INITIAL_FORK_VERSION=0,
+    INITIAL_SLOT_NUMBER=0,
+    # Time parameters
+    SLOT_DURATION=6,  # seconds
+    MIN_ATTESTATION_INCLUSION_DELAY=2**2,  # (= 4) slots
+    EPOCH_LENGTH=2**6,  # (= 64) slots
+    MIN_VALIDATOR_REGISTRY_CHANGE_INTERVAL=2**8,  # (= 256) slots
+    POW_RECEIPT_ROOT_VOTING_PERIOD=2**10,  # (= 1,024) slots
+    SHARD_PERSISTENT_COMMITTEE_CHANGE_PERIOD=2**17,  # (= 131,072) slots
+    COLLECTIVE_PENALTY_CALCULATION_PERIOD=2**20,  # (= 1,048,576) slots
+    ZERO_BALANCE_VALIDATOR_TTL=2**22,  # (= 4,194,304) slots
+    # Reward and penalty quotients
+    BASE_REWARD_QUOTIENT=2**11,  # (= 2,048)
+    WHISTLEBLOWER_REWARD_QUOTIENT=2**9,  # (= 512)
+    INCLUDER_REWARD_QUOTIENT=2**3,  # (= 8)
+    INACTIVITY_PENALTY_QUOTIENT=2**34,  # (= 131,072)
 )

eth/beacon/types/deposit_parameters_records.py

@@ -7,7 +7,6 @@
 )
 import rlp
 from rlp.sedes import (
-    binary,
     CountableList,
 )