status-im
/
eth2.0-specs
mirror of https://github.com/status-im/eth2.0-specs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #297 from terenc3t/patch-17 

Forgot to multiple GWEI_PER_ETH
This commit is contained in:
Danny Ryan 2018-12-12 11:31:55 -06:00 committed by GitHub
parent 2a87cee15f 3b0fe25c14
commit d3faa3c1ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
specs/core/0_beacon-chain.md
View File

@ -955,7 +955,7 @@ def get_effective_balance(validator: ValidatorRecord) -> int:
""" """
Returns the effective balance (also known as "balance at stake") for the ``validator``. Returns the effective balance (also known as "balance at stake") for the ``validator``.
""" """
return min(validator.balance, MAX_DEPOSIT) return min(validator.balance, MAX_DEPOSIT * GWEI_PER_ETH)
``` ```
#### `get_new_validator_registry_delta_chain_tip` #### `get_new_validator_registry_delta_chain_tip`
@ -1118,7 +1118,7 @@ def on_startup(initial_validator_deposits: List[Deposit],
withdrawal_credentials=deposit.deposit_data.deposit_parameters.withdrawal_credentials, withdrawal_credentials=deposit.deposit_data.deposit_parameters.withdrawal_credentials,
randao_commitment=deposit.deposit_data.deposit_parameters.randao_commitment randao_commitment=deposit.deposit_data.deposit_parameters.randao_commitment
) )
if state.validator_registry[index].balance >= MAX_DEPOSIT: if state.validator_registry[index].balance >= MAX_DEPOSIT * GWEI_PER_ETH:
update_validator_status(state, index, ACTIVE) update_validator_status(state, index, ACTIVE)
# set initial committee shuffling # set initial committee shuffling
@ -1625,7 +1625,7 @@ def update_validator_registry(state: BeaconState) -> None:
# Activate validators within the allowable balance churn # Activate validators within the allowable balance churn
balance_churn = 0 balance_churn = 0
for index, validator in enumerate(state.validator_registry): for index, validator in enumerate(state.validator_registry):
if validator.status == PENDING_ACTIVATION and validator.balance >= MAX_DEPOSIT: if validator.status == PENDING_ACTIVATION and validator.balance >= MAX_DEPOSIT * GWEI_PER_ETH:
# Check the balance churn would be within the allowance # Check the balance churn would be within the allowance
balance_churn += get_effective_balance(validator) balance_churn += get_effective_balance(validator)
if balance_churn > max_balance_churn: if balance_churn > max_balance_churn: