From eb7ed2fbe05304b14352c194481aae8ac6aed850 Mon Sep 17 00:00:00 2001 From: Nico Flaig Date: Tue, 8 Oct 2024 16:31:54 +0100 Subject: [PATCH 1/3] Update blinded block to contain execution requests instead of root --- types/electra/block.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/types/electra/block.yaml b/types/electra/block.yaml index db460fd3..4cdcdd7f 100644 --- a/types/electra/block.yaml +++ b/types/electra/block.yaml @@ -80,12 +80,12 @@ Electra: allOf: - $ref: "#/Electra/BeaconBlockBodyCommon" - type: object - required: [execution_payload_header, execution_requests_root] + required: [execution_payload_header, execution_requests] properties: execution_payload_header: $ref: "../deneb/execution_payload.yaml#/Deneb/ExecutionPayloadHeader" - execution_requests_root: - $ref: "../primitive.yaml#/Root" + execution_requests: + $ref: "./execution_requests.yaml#/Electra/ExecutionRequests" BlindedBeaconBlock: description: "A variant of the [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/phase0/beacon-chain.md#beaconblock) object from the CL Electra spec, which contains a `BlindedBeaconBlockBody` rather than a `BeaconBlockBody`." From 02d595daf39943430f54aa978f88a5c50d957e64 Mon Sep 17 00:00:00 2001 From: NC <17676176+ensi321@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:09:16 -0700 Subject: [PATCH 2/3] Rename `PendingBalanceDeposit` to `PendingDeposit` (#478) * Rename to pending deposit * Update properties to match CL spec * Update types/electra/deposit.yaml --------- Co-authored-by: Nico Flaig Co-authored-by: Alex Stokes --- types/electra/deposit.yaml | 20 ++++++++++++++------ types/electra/state.yaml | 6 +++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/types/electra/deposit.yaml b/types/electra/deposit.yaml index e124df7c..b8605712 100644 --- a/types/electra/deposit.yaml +++ b/types/electra/deposit.yaml @@ -19,14 +19,22 @@ Electra: $ref: "../primitive.yaml#/Uint64" description: "The index of the deposit request." - PendingBalanceDeposit: + PendingDeposit: type: object - description: "The [`PendingBalanceDeposit`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#pendingbalancedeposit) object from the CL Electra spec." - required: [index, amount] + description: "The [`PendingDeposit`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.8/specs/electra/beacon-chain.md#pendingdeposit) object from the CL Electra spec." + required: [pubkey, withdrawal_credentials, amount, signature, slot] properties: - index: - $ref: "../primitive.yaml#/Uint64" - description: "Index of validator in validator registry." + pubkey: + $ref: "../primitive.yaml#/Pubkey" + description: "BLS public key of validator." + withdrawal_credentials: + $ref: "../primitive.yaml#/Root" + description: "The withdrawal credentials." amount: $ref: "../primitive.yaml#/Gwei" description: "The value to be deposited (gwei)." + signature: + $ref: "../primitive.yaml#/Signature" + slot: + $ref: "../primitive.yaml#/Uint64" + description: "The slot at which the deposit request was processed." diff --git a/types/electra/state.yaml b/types/electra/state.yaml index 7798a372..09243519 100644 --- a/types/electra/state.yaml +++ b/types/electra/state.yaml @@ -2,7 +2,7 @@ Electra: BeaconState: type: object description: "The [`BeaconState`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#beaconstate) object from the CL Electra spec." - required: [genesis_time, genesis_validators_root, slot, fork, latest_block_header, block_roots, state_roots, historical_roots, eth1_data, eth1_data_votes, eth1_deposit_index, validators, balances, randao_mixes, slashings, previous_epoch_participation, current_epoch_participation, justification_bits, previous_justified_checkpoint, current_justified_checkpoint, finalized_checkpoint, inactivity_scores, current_sync_committee, next_sync_committee, latest_execution_payload_header, next_withdrawal_index, next_withdrawal_validator_index, historical_summaries, deposit_requests_start_index, deposit_balance_to_consume, exit_balance_to_consume, earliest_exit_epoch, consolidation_balance_to_consume, earliest_consolidation_epoch, pending_balance_deposits, pending_partial_withdrawals, pending_consolidations] + required: [genesis_time, genesis_validators_root, slot, fork, latest_block_header, block_roots, state_roots, historical_roots, eth1_data, eth1_data_votes, eth1_deposit_index, validators, balances, randao_mixes, slashings, previous_epoch_participation, current_epoch_participation, justification_bits, previous_justified_checkpoint, current_justified_checkpoint, finalized_checkpoint, inactivity_scores, current_sync_committee, next_sync_committee, latest_execution_payload_header, next_withdrawal_index, next_withdrawal_validator_index, historical_summaries, deposit_requests_start_index, deposit_balance_to_consume, exit_balance_to_consume, earliest_exit_epoch, consolidation_balance_to_consume, earliest_consolidation_epoch, pending_deposits, pending_partial_withdrawals, pending_consolidations] properties: genesis_time: $ref: "../primitive.yaml#/Uint64" @@ -104,10 +104,10 @@ Electra: $ref: "../primitive.yaml#/Gwei" earliest_consolidation_epoch: $ref: "../primitive.yaml#/Uint64" - pending_balance_deposits: + pending_deposits: type: array items: - $ref: "./deposit.yaml#/Electra/PendingBalanceDeposit" + $ref: "./deposit.yaml#/Electra/PendingDeposit" maxItems: 134217728 pending_partial_withdrawals: type: array From 2e7c4aabcf60f5ae6d414866c268aff350a70e81 Mon Sep 17 00:00:00 2001 From: Nico Flaig Date: Tue, 15 Oct 2024 04:51:16 +0100 Subject: [PATCH 3/3] Make nodes required in debug fork choice endpoint (#474) --- apis/debug/fork_choice.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apis/debug/fork_choice.yaml b/apis/debug/fork_choice.yaml index eeb53e90..e7b4d9e3 100644 --- a/apis/debug/fork_choice.yaml +++ b/apis/debug/fork_choice.yaml @@ -13,7 +13,7 @@ get: title: GetForkChoiceResponse type: object description: "Debugging context of fork choice" - required: [justified_checkpoint, finalized_checkpoint] + required: [justified_checkpoint, finalized_checkpoint, fork_choice_nodes] properties: justified_checkpoint: $ref: '../../beacon-node-oapi.yaml#/components/schemas/Checkpoint' @@ -28,4 +28,4 @@ get: extra_data: $ref: "../../beacon-node-oapi.yaml#/components/schemas/ExtraData" "500": - $ref: "../../beacon-node-oapi.yaml#/components/responses/InternalError" \ No newline at end of file + $ref: "../../beacon-node-oapi.yaml#/components/responses/InternalError"