From fd02cd2adceecbb966b76d91cb889b4ea05a214f Mon Sep 17 00:00:00 2001 From: Paul Harris Date: Wed, 18 Jan 2023 16:19:14 +1000 Subject: [PATCH] Introduce Deneb to remove EIP-4844 references Consensus-spec references may need to be fixed once deneb is renamed in that project. related to https://github.com/ethereum/consensus-specs/issues/3207 --- apis/beacon/blocks/blinded_block.yaml | 4 +-- apis/beacon/blocks/blinded_blocks.yaml | 2 +- apis/beacon/blocks/block.v2.yaml | 4 +-- apis/beacon/blocks/blocks.yaml | 2 +- apis/debug/state.v2.yaml | 4 +-- apis/validator/blinded_block.yaml | 4 +-- apis/validator/block.v2.yaml | 4 +-- beacon-node-oapi.yaml | 22 +++++++------- types/{eip4844 => deneb}/block.yaml | 30 +++++++++---------- .../block_and_blobs_sidecar.yaml | 10 +++---- .../{eip4844 => deneb}/execution_payload.yaml | 10 +++---- types/{eip4844 => deneb}/state.yaml | 6 ++-- 12 files changed, 51 insertions(+), 51 deletions(-) rename types/{eip4844 => deneb}/block.yaml (64%) rename types/{eip4844 => deneb}/block_and_blobs_sidecar.yaml (77%) rename types/{eip4844 => deneb}/execution_payload.yaml (82%) rename types/{eip4844 => deneb}/state.yaml (94%) diff --git a/apis/beacon/blocks/blinded_block.yaml b/apis/beacon/blocks/blinded_block.yaml index 7b321476..1bdfae9f 100644 --- a/apis/beacon/blocks/blinded_block.yaml +++ b/apis/beacon/blocks/blinded_block.yaml @@ -25,7 +25,7 @@ get: properties: version: type: string - enum: [phase0, altair, bellatrix, capella, eip4844] + enum: [phase0, altair, bellatrix, capella, deneb] example: "phase0" execution_optimistic: $ref: "../../../beacon-node-oapi.yaml#/components/schemas/ExecutionOptimistic" @@ -37,7 +37,7 @@ get: - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Altair.SignedBeaconBlock" - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.SignedBlindedBeaconBlock" - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Capella.SignedBlindedBeaconBlock" - - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/EIP4844.SignedBlindedBeaconBlock" + - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Deneb.SignedBlindedBeaconBlock" application/octet-stream: schema: description: "SSZ serialized block bytes. Use Accept header to choose this response type" diff --git a/apis/beacon/blocks/blinded_blocks.yaml b/apis/beacon/blocks/blinded_blocks.yaml index 7636f0a3..75253448 100644 --- a/apis/beacon/blocks/blinded_blocks.yaml +++ b/apis/beacon/blocks/blinded_blocks.yaml @@ -32,7 +32,7 @@ post: - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Altair.SignedBeaconBlock" - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.SignedBlindedBeaconBlock" - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Capella.SignedBlindedBeaconBlock" - - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/EIP4844.SignedBlindedBeaconBlock" + - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Deneb.SignedBlindedBeaconBlock" application/octet-stream: schema: description: "SSZ serialized block bytes. Use content type header to indicate that SSZ data is contained in the request body." diff --git a/apis/beacon/blocks/block.v2.yaml b/apis/beacon/blocks/block.v2.yaml index a0d03478..a6aec89d 100644 --- a/apis/beacon/blocks/block.v2.yaml +++ b/apis/beacon/blocks/block.v2.yaml @@ -25,7 +25,7 @@ get: properties: version: type: string - enum: [phase0, altair, bellatrix, capella, eip4844] + enum: [phase0, altair, bellatrix, capella, deneb] example: "phase0" execution_optimistic: $ref: "../../../beacon-node-oapi.yaml#/components/schemas/ExecutionOptimistic" @@ -37,7 +37,7 @@ get: - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Altair.SignedBeaconBlock" - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.SignedBeaconBlock" - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Capella.SignedBeaconBlock" - - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/EIP4844.SignedBeaconBlock" + - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Deneb.SignedBeaconBlock" application/octet-stream: schema: diff --git a/apis/beacon/blocks/blocks.yaml b/apis/beacon/blocks/blocks.yaml index dc84fa94..a7cd3b96 100644 --- a/apis/beacon/blocks/blocks.yaml +++ b/apis/beacon/blocks/blocks.yaml @@ -30,7 +30,7 @@ post: - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Altair.SignedBeaconBlock" - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.SignedBeaconBlock" - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Capella.SignedBeaconBlock" - - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/EIP4844.SignedBeaconBlock" + - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Deneb.SignedBeaconBlock" application/octet-stream: schema: description: "SSZ serialized block bytes. Use content type header to indicate that SSZ data is contained in the request body." diff --git a/apis/debug/state.v2.yaml b/apis/debug/state.v2.yaml index ecfad36e..8fd2058b 100644 --- a/apis/debug/state.v2.yaml +++ b/apis/debug/state.v2.yaml @@ -25,7 +25,7 @@ get: properties: version: type: string - enum: [ phase0, altair, bellatrix, capella, eip4844 ] + enum: [ phase0, altair, bellatrix, capella, deneb ] example: "phase0" execution_optimistic: $ref: "../../beacon-node-oapi.yaml#/components/schemas/ExecutionOptimistic" @@ -37,7 +37,7 @@ get: - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Altair.BeaconState" - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.BeaconState" - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Capella.BeaconState" - - $ref: "../../beacon-node-oapi.yaml#/components/schemas/EIP4844.BeaconState" + - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Deneb.BeaconState" application/octet-stream: schema: description: "SSZ serialized state bytes. Use Accept header to choose this response type" diff --git a/apis/validator/blinded_block.yaml b/apis/validator/blinded_block.yaml index d846e499..d879919e 100644 --- a/apis/validator/blinded_block.yaml +++ b/apis/validator/blinded_block.yaml @@ -54,7 +54,7 @@ get: properties: version: type: string - enum: [ phase0, altair, bellatrix, capella, eip4844 ] + enum: [ phase0, altair, bellatrix, capella, deneb ] example: "bellatrix" data: oneOf: @@ -62,7 +62,7 @@ get: - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Altair.BeaconBlock" - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.BlindedBeaconBlock" - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Capella.BlindedBeaconBlock" - - $ref: "../../beacon-node-oapi.yaml#/components/schemas/EIP4844.BlindedBeaconBlock" + - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Deneb.BlindedBeaconBlock" application/octet-stream: schema: description: "SSZ serialized block bytes. Use Accept header to choose this response type, version string is sent in header `Eth-Consensus-Version`." diff --git a/apis/validator/block.v2.yaml b/apis/validator/block.v2.yaml index 91bf14a8..ce30e427 100644 --- a/apis/validator/block.v2.yaml +++ b/apis/validator/block.v2.yaml @@ -51,7 +51,7 @@ get: properties: version: type: string - enum: [ phase0, altair, bellatrix, capella, eip4844 ] + enum: [ phase0, altair, bellatrix, capella, deneb ] example: "phase0" data: oneOf: @@ -59,7 +59,7 @@ get: - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Altair.BeaconBlock" - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.BeaconBlock" - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Capella.BeaconBlock" - - $ref: "../../beacon-node-oapi.yaml#/components/schemas/EIP4844.BeaconBlock" + - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Deneb.BeaconBlock" application/octet-stream: schema: description: "SSZ serialized block bytes. Use Accept header to choose this response type, version string is sent in header `Eth-Consensus-Version`." diff --git a/beacon-node-oapi.yaml b/beacon-node-oapi.yaml index 6854fa42..20851c02 100644 --- a/beacon-node-oapi.yaml +++ b/beacon-node-oapi.yaml @@ -311,7 +311,7 @@ components: Bellatrix.SignedBlindedBeaconBlock: $ref: './types/bellatrix/block.yaml#/Bellatrix/SignedBlindedBeaconBlock' ConsensusVersion: - enum: [phase0, altair, bellatrix, capella, eip4844] + enum: [phase0, altair, bellatrix, capella, deneb] example: "phase0" SignedValidatorRegistration: $ref: './types/registration.yaml#/SignedValidatorRegistration' @@ -325,16 +325,16 @@ components: $ref: './types/capella/block.yaml#/Capella/BlindedBeaconBlock' Capella.SignedBlindedBeaconBlock: $ref: './types/capella/block.yaml#/Capella/SignedBlindedBeaconBlock' - EIP4844.BeaconState: - $ref: './types/eip4844/state.yaml#/EIP4844/BeaconState' - EIP4844.BeaconBlock: - $ref: './types/eip4844/block.yaml#/EIP4844/BeaconBlock' - EIP4844.SignedBeaconBlock: - $ref: './types/eip4844/block.yaml#/EIP4844/SignedBeaconBlock' - EIP4844.BlindedBeaconBlock: - $ref: './types/eip4844/block.yaml#/EIP4844/BlindedBeaconBlock' - EIP4844.SignedBlindedBeaconBlock: - $ref: './types/eip4844/block.yaml#/EIP4844/SignedBlindedBeaconBlock' + Deneb.BeaconState: + $ref: './types/deneb/state.yaml#/Deneb/BeaconState' + Deneb.BeaconBlock: + $ref: './types/deneb/block.yaml#/Deneb/BeaconBlock' + Deneb.SignedBeaconBlock: + $ref: './types/deneb/block.yaml#/Deneb/SignedBeaconBlock' + Deneb.BlindedBeaconBlock: + $ref: './types/deneb/block.yaml#/Deneb/BlindedBeaconBlock' + Deneb.SignedBlindedBeaconBlock: + $ref: './types/deneb/block.yaml#/Deneb/SignedBlindedBeaconBlock' Node: $ref: './types/fork_choice.yaml#/Node' ExtraData: diff --git a/types/eip4844/block.yaml b/types/deneb/block.yaml similarity index 64% rename from types/eip4844/block.yaml rename to types/deneb/block.yaml index e6d1c33d..68adab3c 100644 --- a/types/eip4844/block.yaml +++ b/types/deneb/block.yaml @@ -1,8 +1,8 @@ -EIP4844: +Deneb: BeaconBlockBodyCommon: # An abstract object to collect the common fields between the BeaconBlockBody and the BlindedBeaconBlockBody objects type: object - description: "The [`BeaconBlockBody`](https://github.com/ethereum/consensus-specs/blob/master/specs/eip4844/beacon-chain.md#beaconblockbody) object from the CL EIP-4844 spec." + description: "The [`BeaconBlockBody`](https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#beaconblockbody) object from the CL Deneb spec." properties: randao_reveal: allOf: @@ -45,53 +45,53 @@ EIP4844: BeaconBlockBody: allOf: - - $ref: '#/EIP4844/BeaconBlockBodyCommon' + - $ref: '#/Deneb/BeaconBlockBodyCommon' - type: object properties: execution_payload: - $ref: './execution_payload.yaml#/EIP4844/ExecutionPayload' + $ref: './execution_payload.yaml#/Deneb/ExecutionPayload' BeaconBlock: - description: "The [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/EIP4844/beacon-chain.md#beaconblock) object from the CL EIP-4844 spec." + description: "The [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/Deneb/beacon-chain.md#beaconblock) object from the CL Deneb spec." allOf: - $ref: '../altair/block.yaml#/Altair/BeaconBlockCommon' - type: object properties: body: - $ref: '#/EIP4844/BeaconBlockBody' + $ref: '#/Deneb/BeaconBlockBody' SignedBeaconBlock: type: object - description: "The [`SignedBeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/eip4844/beacon-chain.md#signedbeaconblock) object envelope from the CL EIP-4844 spec." + description: "The [`SignedBeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#signedbeaconblock) object envelope from the CL Deneb spec." properties: message: - $ref: "#/EIP4844/BeaconBlock" + $ref: "#/Deneb/BeaconBlock" signature: $ref: "../primitive.yaml#/Signature" BlindedBeaconBlockBody: - description: "A variant of the [`BeaconBlockBody`](https://github.com/ethereum/consensus-specs/blob/master/specs/eip4844/beacon-chain.md#beaconblockbody) object from the CL EIP-4844 spec, which contains a transactions root rather than a full transactions list." + description: "A variant of the [`BeaconBlockBody`](https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#beaconblockbody) object from the CL Deneb spec, which contains a transactions root rather than a full transactions list." allOf: - - $ref: '#/EIP4844/BeaconBlockBodyCommon' + - $ref: '#/Deneb/BeaconBlockBodyCommon' - type: object properties: execution_payload_header: - $ref: './execution_payload.yaml#/EIP4844/ExecutionPayloadHeader' + $ref: './execution_payload.yaml#/Deneb/ExecutionPayloadHeader' BlindedBeaconBlock: - description: "A variant of the the [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/eip4844/beacon-chain.md#beaconblock) object from the CL EIP-4844 spec, which contains a `BlindedBeaconBlockBody` rather than a `BeaconBlockBody`." + description: "A variant of the the [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#beaconblock) object from the CL Deneb spec, which contains a `BlindedBeaconBlockBody` rather than a `BeaconBlockBody`." allOf: - $ref: '../altair/block.yaml#/Altair/BeaconBlockCommon' - type: object properties: body: - $ref: '#/EIP4844/BlindedBeaconBlockBody' + $ref: '#/Deneb/BlindedBeaconBlockBody' SignedBlindedBeaconBlock: type: object - description: "A variant of the the the [`SignedBeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/eip4844/beacon-chain.md#signedbeaconblock) object envelope from the CL EIP-4844 spec, which contains a `BlindedBeaconBlock` rather than a `BeaconBlock`." + description: "A variant of the the the [`SignedBeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#signedbeaconblock) object envelope from the CL Deneb spec, which contains a `BlindedBeaconBlock` rather than a `BeaconBlock`." properties: message: - $ref: "#/EIP4844/BlindedBeaconBlock" + $ref: "#/Deneb/BlindedBeaconBlock" signature: $ref: "../primitive.yaml#/Signature" diff --git a/types/eip4844/block_and_blobs_sidecar.yaml b/types/deneb/block_and_blobs_sidecar.yaml similarity index 77% rename from types/eip4844/block_and_blobs_sidecar.yaml rename to types/deneb/block_and_blobs_sidecar.yaml index b65d24d2..8cce35f1 100644 --- a/types/eip4844/block_and_blobs_sidecar.yaml +++ b/types/deneb/block_and_blobs_sidecar.yaml @@ -1,7 +1,7 @@ -EIP4844: +Deneb: BlobsSidecar: type: object - description: "The `BlobsSidecar` object from the EIP-4844 CL spec." + description: "The `BlobsSidecar` object from the Deneb CL spec." properties: beacon_block_root: $ref: "../primitive.yaml#/Root" @@ -12,9 +12,9 @@ EIP4844: maxItems: 4 minItems: 0 items: - $ref: "#/EIP4844/Blob" + $ref: "#/Deneb/Blob" kzg_aggregated_proof: - $ref: "#/EIP4844/KZGProof" + $ref: "#/Deneb/KZGProof" KZGProof: type: string @@ -26,4 +26,4 @@ EIP4844: type: string format: hex pattern: "^0x[a-fA-F0-9]{262144}$" - description: "A blob is `FIELD_ELEMENTS_PER_BLOB * size_of(BLSFieldElement) = 4096 * 32 = 131072` bytes (`DATA`) representing a SSZ-encoded Blob as defined in EIP-4844" + description: "A blob is `FIELD_ELEMENTS_PER_BLOB * size_of(BLSFieldElement) = 4096 * 32 = 131072` bytes (`DATA`) representing a SSZ-encoded Blob as defined in Deneb" diff --git a/types/eip4844/execution_payload.yaml b/types/deneb/execution_payload.yaml similarity index 82% rename from types/eip4844/execution_payload.yaml rename to types/deneb/execution_payload.yaml index 8489d14c..ed2b771b 100644 --- a/types/eip4844/execution_payload.yaml +++ b/types/deneb/execution_payload.yaml @@ -1,8 +1,8 @@ -EIP4844: +Deneb: ExecutionPayloadCommon: # An abstract object to collect the common fields between the ExecutionPayload and the ExecutionPayloadHeader objects. type: object - description: "The [`ExecutionPayload`](https://github.com/ethereum/consensus-specs/blob/master/specs/eip4844/beacon-chain.md#executionpayload) object from the CL EIP-4844 spec." + description: "The [`ExecutionPayload`](https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#executionpayload) object from the CL Deneb spec." properties: parent_hash: $ref: '../primitive.yaml#/Root' @@ -36,7 +36,7 @@ EIP4844: ExecutionPayload: allOf: - - $ref: '#/EIP4844/ExecutionPayloadCommon' + - $ref: '#/Deneb/ExecutionPayloadCommon' - type: object properties: transactions: @@ -45,9 +45,9 @@ EIP4844: $ref: '../capella/withdrawals.yaml#/Capella/Withdrawals' ExecutionPayloadHeader: - description: "The [`ExecutionPayloadHeader`](https://github.com/ethereum/consensus-specs/blob/master/specs/eip4844/beacon-chain.md#executionpayloadheader) object from the CL EIP-4844 spec." + description: "The [`ExecutionPayloadHeader`](https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#executionpayloadheader) object from the CL Deneb spec." allOf: - - $ref: '#/EIP4844/ExecutionPayloadCommon' + - $ref: '#/Deneb/ExecutionPayloadCommon' - type: object properties: transactions_root: diff --git a/types/eip4844/state.yaml b/types/deneb/state.yaml similarity index 94% rename from types/eip4844/state.yaml rename to types/deneb/state.yaml index 67d263f3..23135172 100644 --- a/types/eip4844/state.yaml +++ b/types/deneb/state.yaml @@ -1,7 +1,7 @@ -EIP4844: +Deneb: BeaconState: type: object - description: "The [`BeaconState`](https://github.com/ethereum/consensus-specs/blob/master/specs/eip4844/beacon-chain.md#beaconstate) object from the Eth2.0 EIP-4844 spec." + description: "The [`BeaconState`](https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#beaconstate) object from the Eth2.0 Deneb spec." properties: genesis_time: $ref: "../primitive.yaml#/Uint64" @@ -81,7 +81,7 @@ EIP4844: next_sync_committee: $ref: '../altair/sync_committee.yaml#/Altair/SyncCommittee' latest_execution_payload_header: - $ref: './execution_payload.yaml#/EIP4844/ExecutionPayloadHeader' + $ref: './execution_payload.yaml#/Deneb/ExecutionPayloadHeader' next_withdrawal_index: $ref: "../primitive.yaml#/Uint64" next_withdrawal_validator_index: