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

Apply suggestions by @ppopth

This commit is contained in:
Mikhail Kalinin 2024-10-03 18:49:08 +04:00
parent a04e4c3b88
commit beb2718182
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
specs/electra/beacon-chain.md
View File

@ -653,6 +653,8 @@ def queue_excess_active_balance(state: BeaconState, index: ValidatorIndex) -> No
excess_balance = balance - MIN_ACTIVATION_BALANCE excess_balance = balance - MIN_ACTIVATION_BALANCE
state.balances[index] = MIN_ACTIVATION_BALANCE state.balances[index] = MIN_ACTIVATION_BALANCE
validator = state.validators[index] validator = state.validators[index]
# Use bls.G2_POINT_AT_INFINITY as a signature field placeholder
# and GENESIS_SLOT to distinguish from a pending deposit request
state.pending_deposits.append(PendingDeposit( state.pending_deposits.append(PendingDeposit(
pubkey=validator.pubkey, pubkey=validator.pubkey,
withdrawal_credentials=validator.withdrawal_credentials, withdrawal_credentials=validator.withdrawal_credentials,
@ -1274,23 +1276,21 @@ def process_attestation(state: BeaconState, attestation: Attestation) -> None:
```python ```python
def get_validator_from_deposit(pubkey: BLSPubkey, withdrawal_credentials: Bytes32, amount: uint64) -> Validator: def get_validator_from_deposit(pubkey: BLSPubkey, withdrawal_credentials: Bytes32, amount: uint64) -> Validator:
if is_compounding_withdrawal_credential(withdrawal_credentials): validator = Validator(
max_effective_balance = MAX_EFFECTIVE_BALANCE_ELECTRA
else:
max_effective_balance = MIN_ACTIVATION_BALANCE
# [Modified in Electra:EIP7251]
effective_balance = min(amount - amount % EFFECTIVE_BALANCE_INCREMENT, max_effective_balance)
return Validator(
pubkey=pubkey, pubkey=pubkey,
withdrawal_credentials=withdrawal_credentials, withdrawal_credentials=withdrawal_credentials,
activation_eligibility_epoch=FAR_FUTURE_EPOCH, activation_eligibility_epoch=FAR_FUTURE_EPOCH,
activation_epoch=FAR_FUTURE_EPOCH, activation_epoch=FAR_FUTURE_EPOCH,
exit_epoch=FAR_FUTURE_EPOCH, exit_epoch=FAR_FUTURE_EPOCH,
withdrawable_epoch=FAR_FUTURE_EPOCH, withdrawable_epoch=FAR_FUTURE_EPOCH,
effective_balance=effective_balance, effective_balance=Gwei(0),
) )
# [Modified in Electra:EIP7251]
max_effective_balance = get_max_effective_balance(validator)
validator.effective_balance = min(amount - amount % EFFECTIVE_BALANCE_INCREMENT, max_effective_balance)
return validator
``` ```
###### Modified `add_validator_to_registry` ###### Modified `add_validator_to_registry`
@ -1332,7 +1332,7 @@ def apply_deposit(state: BeaconState,
withdrawal_credentials=withdrawal_credentials, withdrawal_credentials=withdrawal_credentials,
amount=amount, amount=amount,
signature=signature, signature=signature,
slot=GENESIS_SLOT, slot=GENESIS_SLOT, # Use GENESIS_SLOT to distinguish from a pending deposit request
)) ))
else: else:
# Increase balance by deposit amount # Increase balance by deposit amount
@ -1342,7 +1342,7 @@ def apply_deposit(state: BeaconState,
withdrawal_credentials=withdrawal_credentials, withdrawal_credentials=withdrawal_credentials,
amount=amount, amount=amount,
signature=signature, signature=signature,
slot=GENESIS_SLOT slot=GENESIS_SLOT # Use GENESIS_SLOT to distinguish from a pending deposit request
)) ))
``` ```

2
specs/electra/fork.md
View File

@ -157,6 +157,8 @@ def upgrade_to_electra(pre: deneb.BeaconState) -> BeaconState:
validator = post.validators[index] validator = post.validators[index]
validator.effective_balance = 0 validator.effective_balance = 0
validator.activation_eligibility_epoch = FAR_FUTURE_EPOCH validator.activation_eligibility_epoch = FAR_FUTURE_EPOCH
# Use bls.G2_POINT_AT_INFINITY as a signature field placeholder
# and GENESIS_SLOT to distinguish from a pending deposit request
post.pending_deposits.append(PendingDeposit( post.pending_deposits.append(PendingDeposit(
pubkey=validator.pubkey, pubkey=validator.pubkey,
withdrawal_credentials=validator.withdrawal_credentials, withdrawal_credentials=validator.withdrawal_credentials,