github/consensus-specs
1
1
Fork 0
mirror of https://github.com/ethereum/consensus-specs.git synced 2026-02-01 15:14:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'withdrawals-push' of github.com:ethereum/eth2.0-specs into withdrawals-push

Browse Source
This commit is contained in:
Danny Ryan
2022-03-22 08:10:53 -06:00
parent 9a8ff4f3ab 03f9503de0
commit 43ce98b541
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
specs/capella/beacon-chain.md
View File

@@ -195,7 +195,7 @@ def is_fully_withdrawable_validator(validator: Validator, epoch: Epoch) -> bool:
"""
Check if ``validator`` is fully withdrawable.
"""
is_eth1_withdrawal_prefix = validator.withdrawal_credentials[0:1] == ETH1_ADDRESS_WITHDRAWAL_PREFIX
is_eth1_withdrawal_prefix = validator.withdrawal_credentials[:1] == ETH1_ADDRESS_WITHDRAWAL_PREFIX
return is_eth1_withdrawal_prefix and validator.withdrawable_epoch <= epoch < validator.fully_withdrawn_epoch
```
@@ -256,10 +256,10 @@ def process_withdrawals(state: BeaconState, payload: ExecutionPayload) -> None:
dequeued_withdrawals = state.withdrawals_queue[:num_withdrawals]
assert len(dequeued_withdrawals) == len(payload.withdrawals)
for dequeued_receipt, withdrawal in zip(dequeued_withdrawals, payload.withdrawals):
assert dequeued_receipt == withdrawal
for dequeued_withdrawal, withdrawal in zip(dequeued_withdrawals, payload.withdrawals):
assert dequeued_withdrawal == withdrawal
# Remove dequeued receipts from state
# Remove dequeued withdrawals from state
state.withdrawals_queue = state.withdrawals_queue[num_withdrawals:]
```

4
specs/capella/fork-choice.md
View File

@@ -34,7 +34,7 @@ def notify_forkchoice_updated(self: ExecutionEngine,
head_block_hash: Hash32,
safe_block_hash: Hash32,
finalized_block_hash: Hash32,
payload_attributes: Optional[PayloadAttributes]) -> Optional[PayloadId]:
payload_attributes: Optional[PayloadAttributes]) -> Optional[PayloadId]: # new in Capella
...
```
@@ -50,5 +50,5 @@ class PayloadAttributes(object):
timestamp: uint64
prev_randao: Bytes32
suggested_fee_recipient: ExecutionAddress
withdrawals: Sequence[Withdrawal]
withdrawals: Sequence[Withdrawal] # new in Capella
```