status-im/eth2.0-specs
2
0
Fork 0
mirror of https://github.com/status-im/eth2.0-specs.git synced 2025-01-22 08:29:23 +00:00
Code Issues Projects Releases Wiki Activity

simplify name of helper get_validator_max_effective_balance

Browse Source
This commit is contained in:
Alex Stokes 2024-08-30 16:16:44 -06:00
parent 2b4d94ab08
commit 6938dcc2fa
No known key found for this signature in database
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@
- [Modified `is_partially_withdrawable_validator`](#modified-is_partially_withdrawable_validator) - [Modified `is_partially_withdrawable_validator`](#modified-is_partially_withdrawable_validator)
- [Misc](#misc-1) - [Misc](#misc-1)
- [New `get_committee_indices`](#new-get_committee_indices) - [New `get_committee_indices`](#new-get_committee_indices)
- [New `get_validator_max_effective_balance`](#new-get_validator_max_effective_balance) - [New `get_max_effective_balance`](#new-get_max_effective_balance)
- [Beacon state accessors](#beacon-state-accessors) - [Beacon state accessors](#beacon-state-accessors)
- [New `get_balance_churn_limit`](#new-get_balance_churn_limit) - [New `get_balance_churn_limit`](#new-get_balance_churn_limit)
- [New `get_activation_exit_churn_limit`](#new-get_activation_exit_churn_limit) - [New `get_activation_exit_churn_limit`](#new-get_activation_exit_churn_limit)
@ -512,14 +512,14 @@ def is_fully_withdrawable_validator(validator: Validator, balance: Gwei, epoch:
#### Modified `is_partially_withdrawable_validator` #### Modified `is_partially_withdrawable_validator`
*Note*: The function `is_partially_withdrawable_validator` is modified to use `get_validator_max_effective_balance` instead of `MAX_EFFECTIVE_BALANCE` and `has_execution_withdrawal_credential` instead of `has_eth1_withdrawal_credential`. *Note*: The function `is_partially_withdrawable_validator` is modified to use `get_max_effective_balance` instead of `MAX_EFFECTIVE_BALANCE` and `has_execution_withdrawal_credential` instead of `has_eth1_withdrawal_credential`.
```python ```python
def is_partially_withdrawable_validator(validator: Validator, balance: Gwei) -> bool: def is_partially_withdrawable_validator(validator: Validator, balance: Gwei) -> bool:
""" """
Check if ``validator`` is partially withdrawable. Check if ``validator`` is partially withdrawable.
""" """
max_effective_balance = get_validator_max_effective_balance(validator) max_effective_balance = get_max_effective_balance(validator)
has_max_effective_balance = validator.effective_balance == max_effective_balance # [Modified in Electra:EIP7251] has_max_effective_balance = validator.effective_balance == max_effective_balance # [Modified in Electra:EIP7251]
has_excess_balance = balance > max_effective_balance # [Modified in Electra:EIP7251] has_excess_balance = balance > max_effective_balance # [Modified in Electra:EIP7251]
return ( return (
@ -538,10 +538,10 @@ def get_committee_indices(committee_bits: Bitvector) -> Sequence[CommitteeIndex]
return [CommitteeIndex(index) for index, bit in enumerate(committee_bits) if bit] return [CommitteeIndex(index) for index, bit in enumerate(committee_bits) if bit]
``` ```
#### New `get_validator_max_effective_balance` #### New `get_max_effective_balance`
```python ```python
def get_validator_max_effective_balance(validator: Validator) -> Gwei: def get_max_effective_balance(validator: Validator) -> Gwei:
""" """
Get max effective balance for ``validator``. Get max effective balance for ``validator``.
""" """
@ -588,7 +588,7 @@ def get_consolidation_churn_limit(state: BeaconState) -> Gwei:
```python ```python
def get_active_balance(state: BeaconState, validator_index: ValidatorIndex) -> Gwei: def get_active_balance(state: BeaconState, validator_index: ValidatorIndex) -> Gwei:
max_effective_balance = get_validator_max_effective_balance(state.validators[validator_index]) max_effective_balance = get_max_effective_balance(state.validators[validator_index])
return min(state.balances[validator_index], max_effective_balance) return min(state.balances[validator_index], max_effective_balance)
``` ```
@ -875,7 +875,7 @@ def process_pending_balance_deposits(state: BeaconState) -> None:
if processed_amount + deposit.amount > available_for_processing: if processed_amount + deposit.amount > available_for_processing:
break break
# Deposit fits in the churn, process it. Increase balance and consume churn. # Deposit fits in the churn, process it. Increase balance and consume churn.
else: else:
increase_balance(state, deposit.index, deposit.amount) increase_balance(state, deposit.index, deposit.amount)
processed_amount += deposit.amount processed_amount += deposit.amount
# Regardless of how the deposit was handled, we move on in the queue. # Regardless of how the deposit was handled, we move on in the queue.
@ -1005,7 +1005,7 @@ def get_expected_withdrawals(state: BeaconState) -> Tuple[Sequence[Withdrawal],
index=withdrawal_index, index=withdrawal_index,
validator_index=validator_index, validator_index=validator_index,
address=ExecutionAddress(validator.withdrawal_credentials[12:]), address=ExecutionAddress(validator.withdrawal_credentials[12:]),
amount=balance - get_validator_max_effective_balance(validator), # [Modified in Electra:EIP7251] amount=balance - get_max_effective_balance(validator), # [Modified in Electra:EIP7251]
)) ))
withdrawal_index += WithdrawalIndex(1) withdrawal_index += WithdrawalIndex(1)
if len(withdrawals) == MAX_WITHDRAWALS_PER_PAYLOAD: if len(withdrawals) == MAX_WITHDRAWALS_PER_PAYLOAD:
@ -1495,7 +1495,7 @@ def initialize_beacon_state_from_eth1(eth1_block_hash: Hash32,
balance = state.balances[index] balance = state.balances[index]
# [Modified in Electra:EIP7251] # [Modified in Electra:EIP7251]
validator.effective_balance = min( validator.effective_balance = min(
balance - balance % EFFECTIVE_BALANCE_INCREMENT, get_validator_max_effective_balance(validator)) balance - balance % EFFECTIVE_BALANCE_INCREMENT, get_max_effective_balance(validator))
if validator.effective_balance >= MIN_ACTIVATION_BALANCE: if validator.effective_balance >= MIN_ACTIVATION_BALANCE:
validator.activation_eligibility_epoch = GENESIS_EPOCH validator.activation_eligibility_epoch = GENESIS_EPOCH
validator.activation_epoch = GENESIS_EPOCH validator.activation_epoch = GENESIS_EPOCH