Merge branch 'master' into nflaig/fix-debug-forkchoice

ethereum · Oct 14, 2024 · ac5abb4 · ac5abb4
2 parents 5aad670 + 02d595d
commit ac5abb4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git 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`."

diff --git 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
@@ -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