diff --git a/beacon-node-oapi.yaml b/beacon-node-oapi.yaml index b30df420..c1b0f3a1 100644 --- a/beacon-node-oapi.yaml +++ b/beacon-node-oapi.yaml @@ -449,6 +449,8 @@ components: $ref: "./types/gloas/execution_payload_bid.yaml#/Gloas/ExecutionPayloadBid" Gloas.SignedExecutionPayloadBid: $ref: "./types/gloas/execution_payload_bid.yaml#/Gloas/SignedExecutionPayloadBid" + Gloas.ExecutionPayload: + $ref: "./types/gloas/execution_payload.yaml#/Gloas/ExecutionPayload" Gloas.ExecutionPayloadEnvelope: $ref: "./types/gloas/execution_payload_envelope.yaml#/Gloas/ExecutionPayloadEnvelope" Gloas.SignedExecutionPayloadEnvelope: diff --git a/types/gloas/block.yaml b/types/gloas/block.yaml index f869bc7e..d9456e99 100644 --- a/types/gloas/block.yaml +++ b/types/gloas/block.yaml @@ -1,8 +1,8 @@ Gloas: BeaconBlockBody: type: object - description: "The [`BeaconBlockBody`](https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.2/specs/gloas/beacon-chain.md#beaconblockbody) object from the CL Gloas spec." - required: [randao_reveal, eth1_data, graffiti, proposer_slashings, attester_slashings, attestations, deposits, voluntary_exits, sync_aggregate, bls_to_execution_changes, signed_execution_payload_bid, payload_attestations] + description: "The [`BeaconBlockBody`](https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.8/specs/gloas/beacon-chain.md#beaconblockbody) object from the CL Gloas spec." + required: [randao_reveal, eth1_data, graffiti, proposer_slashings, attester_slashings, attestations, deposits, voluntary_exits, sync_aggregate, bls_to_execution_changes, signed_execution_payload_bid, payload_attestations, parent_execution_requests] properties: randao_reveal: $ref: "../primitive.yaml#/Signature" @@ -46,6 +46,8 @@ Gloas: $ref: "./payload_attestation.yaml#/Gloas/PayloadAttestation" minItems: 0 maxItems: 4 + parent_execution_requests: + $ref: "../electra/execution_requests.yaml#/Electra/ExecutionRequests" BeaconBlock: description: "The [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/v1.5.0/specs/phase0/beacon-chain.md#beaconblock) object from the CL Gloas spec." diff --git a/types/gloas/execution_payload.yaml b/types/gloas/execution_payload.yaml new file mode 100644 index 00000000..fef40dc5 --- /dev/null +++ b/types/gloas/execution_payload.yaml @@ -0,0 +1,15 @@ +Gloas: + ExecutionPayload: + description: "The [`ExecutionPayload`](https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.8/specs/gloas/beacon-chain.md#executionpayload) object from the CL Gloas spec." + allOf: + - $ref: "../deneb/execution_payload.yaml#/Deneb/ExecutionPayload" + - type: object + required: [block_access_list, slot_number] + properties: + block_access_list: + type: string + format: hex + description: "RLP encoded `BlockAccessList` as defined in [EIP-7928]" + pattern: "^0x[a-fA-F0-9]{0,2147483648}$" + slot_number: + $ref: "../primitive.yaml#/Uint64" diff --git a/types/gloas/execution_payload_bid.yaml b/types/gloas/execution_payload_bid.yaml index e8818060..6f73e6a0 100644 --- a/types/gloas/execution_payload_bid.yaml +++ b/types/gloas/execution_payload_bid.yaml @@ -1,17 +1,17 @@ Gloas: ExecutionPayloadBid: type: object - description: "The [`ExecutionPayloadBid`](https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.2/specs/gloas/beacon-chain.md#executionpayloadbid) object from the CL Gloas spec." - required: [parent_block_hash, parent_block_root, block_hash, prev_randao, fee_recipient, gas_limit, builder_index, slot, value, execution_payment, blob_kzg_commitments] + description: "The [`ExecutionPayloadBid`](https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.8/specs/gloas/beacon-chain.md#executionpayloadbid) object from the CL Gloas spec." + required: [parent_block_hash, parent_block_root, block_hash, prev_randao, fee_recipient, gas_limit, builder_index, slot, value, execution_payment, blob_kzg_commitments, execution_requests_root] properties: parent_block_hash: - $ref: "../primitive.yaml#/Root" + $ref: "../primitive.yaml#/Hash32" parent_block_root: $ref: "../primitive.yaml#/Root" block_hash: - $ref: "../primitive.yaml#/Root" + $ref: "../primitive.yaml#/Hash32" prev_randao: - $ref: "../primitive.yaml#/Root" + $ref: "../primitive.yaml#/Bytes32" fee_recipient: $ref: "../primitive.yaml#/ExecutionAddress" gas_limit: @@ -28,10 +28,12 @@ Gloas: type: array items: $ref: '../primitive.yaml#/KZGCommitment' + execution_requests_root: + $ref: "../primitive.yaml#/Root" SignedExecutionPayloadBid: type: object - description: "The [`SignedExecutionPayloadBid`](https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.2/specs/gloas/beacon-chain.md#signedexecutionpayloadbid) object from the CL Gloas spec." + description: "The [`SignedExecutionPayloadBid`](https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.8/specs/gloas/beacon-chain.md#signedexecutionpayloadbid) object from the CL Gloas spec." required: [message, signature] properties: message: diff --git a/types/gloas/execution_payload_envelope.yaml b/types/gloas/execution_payload_envelope.yaml index 9e5f6d8e..9a16f6a3 100644 --- a/types/gloas/execution_payload_envelope.yaml +++ b/types/gloas/execution_payload_envelope.yaml @@ -1,11 +1,11 @@ Gloas: ExecutionPayloadEnvelope: type: object - description: "The [`ExecutionPayloadEnvelope`](https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.7/specs/gloas/beacon-chain.md#executionpayloadenvelope) object from the CL Gloas spec." + description: "The [`ExecutionPayloadEnvelope`](https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.8/specs/gloas/beacon-chain.md#executionpayloadenvelope) object from the CL Gloas spec." required: [payload, execution_requests, builder_index, beacon_block_root, parent_beacon_block_root] properties: payload: - $ref: "../deneb/execution_payload.yaml#/Deneb/ExecutionPayload" + $ref: "./execution_payload.yaml#/Gloas/ExecutionPayload" execution_requests: $ref: "../electra/execution_requests.yaml#/Electra/ExecutionRequests" builder_index: @@ -20,7 +20,7 @@ Gloas: SignedExecutionPayloadEnvelope: type: object - description: "The [`SignedExecutionPayloadEnvelope`](https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.7/specs/gloas/beacon-chain.md#signedexecutionpayloadenvelope) object from the CL Gloas spec." + description: "The [`SignedExecutionPayloadEnvelope`](https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.8/specs/gloas/beacon-chain.md#signedexecutionpayloadenvelope) object from the CL Gloas spec." required: [message, signature] properties: message: diff --git a/types/primitive.yaml b/types/primitive.yaml index 66bf0faa..988beeef 100644 --- a/types/primitive.yaml +++ b/types/primitive.yaml @@ -66,6 +66,12 @@ Root: example: "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2" pattern: "^0x[a-fA-F0-9]{64}$" +Hash32: + type: string + format: hex + example: "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2" + pattern: "^0x[a-fA-F0-9]{64}$" + Bytes32: type: string format: hex diff --git a/wordlist.txt b/wordlist.txt index 6d758d1e..b2ab8513 100644 --- a/wordlist.txt +++ b/wordlist.txt @@ -45,3 +45,4 @@ ptc PtcDuty produceBlockV stateful +RLP