-
Notifications
You must be signed in to change notification settings - Fork 200
Add Electra block and state objects from CL spec #469
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
eedb4d3
Add Electra block and state objects from CL spec
nflaig d7b4c5d
Fix references to beacon block in CL spec
nflaig e45482f
Merge branch 'master' into nflaig/electra-spec-objects
nflaig 2c26258
Move requests out of execution_payload into beacon_block.body
nflaig File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| Electra: | ||
| 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/v1.5.0-alpha.5/specs/electra/beacon-chain.md#beaconblockbody) object from the CL Electra spec." | ||
| required: [randao_reveal, eth1_data, graffiti, proposer_slashings, attester_slashings, attestations, deposits, voluntary_exits, sync_aggregate, bls_to_execution_changes, blob_kzg_commitments] | ||
| properties: | ||
| randao_reveal: | ||
| allOf: | ||
| - $ref: "../primitive.yaml#/Signature" | ||
| - description: "The RANDAO reveal value provided by the validator." | ||
| eth1_data: | ||
| $ref: "../eth1.yaml#/Eth1Data" | ||
| graffiti: | ||
| $ref: "../primitive.yaml#/Graffiti" | ||
| proposer_slashings: | ||
| type: array | ||
| items: | ||
| $ref: "../proposer_slashing.yaml#/ProposerSlashing" | ||
| attester_slashings: | ||
| type: array | ||
| items: | ||
| $ref: "./attester_slashing.yaml#/Electra/AttesterSlashing" | ||
| attestations: | ||
| type: array | ||
| items: | ||
| $ref: "./attestation.yaml#/Electra/Attestation" | ||
| deposits: | ||
| type: array | ||
| items: | ||
| $ref: "../deposit.yaml#/Deposit" | ||
| voluntary_exits: | ||
| type: array | ||
| items: | ||
| $ref: "../voluntary_exit.yaml#/SignedVoluntaryExit" | ||
| sync_aggregate: | ||
| $ref: "../altair/sync_aggregate.yaml#/Altair/SyncAggregate" | ||
| bls_to_execution_changes: | ||
| type: array | ||
| items: | ||
| $ref: "../bls_to_execution_change.yaml#/SignedBLSToExecutionChange" | ||
| blob_kzg_commitments: | ||
| type: array | ||
| items: | ||
| $ref: "../primitive.yaml#/KZGCommitment" | ||
|
|
||
| BeaconBlockBody: | ||
| allOf: | ||
| - $ref: "#/Electra/BeaconBlockBodyCommon" | ||
| - type: object | ||
| required: [execution_payload] | ||
| properties: | ||
| execution_payload: | ||
| $ref: "./execution_payload.yaml#/Electra/ExecutionPayload" | ||
|
|
||
| BeaconBlock: | ||
| description: "The [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#beaconblock) object from the CL Electra spec." | ||
nflaig marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| allOf: | ||
| - $ref: "../altair/block.yaml#/Altair/BeaconBlockCommon" | ||
| - type: object | ||
| required: [body] | ||
| properties: | ||
| body: | ||
| $ref: "#/Electra/BeaconBlockBody" | ||
|
|
||
| SignedBeaconBlock: | ||
| type: object | ||
| description: "The [`SignedBeaconBlock`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#signedbeaconblock) object envelope from the CL Electra spec." | ||
| required: [message, signature] | ||
| properties: | ||
| message: | ||
| $ref: "#/Electra/BeaconBlock" | ||
| signature: | ||
| $ref: "../primitive.yaml#/Signature" | ||
|
|
||
| BlindedBeaconBlockBody: | ||
| description: "A variant of the [`BeaconBlockBody`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#beaconblockbody) object from the CL Electra spec, which contains a transactions root rather than a full transactions list." | ||
| allOf: | ||
| - $ref: "#/Electra/BeaconBlockBodyCommon" | ||
| - type: object | ||
| required: [execution_payload_header] | ||
| properties: | ||
| execution_payload_header: | ||
| $ref: "./execution_payload.yaml#/Electra/ExecutionPayloadHeader" | ||
|
|
||
| BlindedBeaconBlock: | ||
| description: "A variant of the [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#beaconblock) object from the CL Electra spec, which contains a `BlindedBeaconBlockBody` rather than a `BeaconBlockBody`." | ||
| allOf: | ||
| - $ref: "../altair/block.yaml#/Altair/BeaconBlockCommon" | ||
| - type: object | ||
| required: [body] | ||
| properties: | ||
| body: | ||
| $ref: "#/Electra/BlindedBeaconBlockBody" | ||
|
|
||
| SignedBlindedBeaconBlock: | ||
| type: object | ||
| description: "A variant of the [`SignedBeaconBlock`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#signedbeaconblock) object envelope from the CL Electra spec, which contains a `BlindedBeaconBlock` rather than a `BeaconBlock`." | ||
| required: [message, signature] | ||
| properties: | ||
| message: | ||
| $ref: "#/Electra/BlindedBeaconBlock" | ||
| signature: | ||
| $ref: "../primitive.yaml#/Signature" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| Electra: | ||
| BlockContents: | ||
| type: object | ||
| description: "The required object for block production according to the Electra CL spec." | ||
| required: [block, kzg_proofs, blobs] | ||
| properties: | ||
| block: | ||
| $ref: "./block.yaml#/Electra/BeaconBlock" | ||
| kzg_proofs: | ||
| $ref: "../deneb/block_contents.yaml#/Deneb/KZGProofs" | ||
| blobs: | ||
| $ref: "../deneb/block_contents.yaml#/Deneb/Blobs" | ||
|
|
||
| SignedBlockContents: | ||
| type: object | ||
| description: "The required signed components of block production according to the Electra CL spec." | ||
| required: [signed_block, kzg_proofs, blobs] | ||
| properties: | ||
| signed_block: | ||
| $ref: "./block.yaml#/Electra/SignedBeaconBlock" | ||
| kzg_proofs: | ||
| $ref: "../deneb/block_contents.yaml#/Deneb/KZGProofs" | ||
| blobs: | ||
| $ref: "../deneb/block_contents.yaml#/Deneb/Blobs" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| Electra: | ||
| ConsolidationRequest: | ||
| type: object | ||
| description: "The [`ConsolidationRequest`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#consolidationrequest) object from the CL Electra spec." | ||
| required: [source_address, source_pubkey, target_pubkey] | ||
| properties: | ||
| source_address: | ||
| $ref: "../primitive.yaml#/ExecutionAddress" | ||
| description: "Execution address which sent the request." | ||
| source_pubkey: | ||
| $ref: "../primitive.yaml#/Pubkey" | ||
| description: "BLS public key of validator to consolidate from." | ||
| target_pubkey: | ||
| $ref: "../primitive.yaml#/Pubkey" | ||
| description: "BLS public key of validator to consolidate to." | ||
|
|
||
| PendingConsolidation: | ||
| type: object | ||
| description: "The [`PendingConsolidation`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#pendingconsolidation) object from the CL Electra spec." | ||
| required: [source_index, target_index] | ||
| properties: | ||
| source_index: | ||
| $ref: "../primitive.yaml#/Uint64" | ||
| description: "Index of validator to consolidate from." | ||
| target_index: | ||
| $ref: "../primitive.yaml#/Uint64" | ||
| description: "Index of validator to consolidate to." |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| Electra: | ||
| DepositRequest: | ||
| type: object | ||
| description: "The [`DepositRequest`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#depositrequest) object from the CL Electra spec." | ||
| required: [pubkey, withdrawal_credentials, amount, signature, index] | ||
| properties: | ||
| 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" | ||
| index: | ||
| $ref: "../primitive.yaml#/Uint64" | ||
| description: "The index of the deposit request." | ||
|
|
||
| PendingBalanceDeposit: | ||
| 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] | ||
| properties: | ||
| index: | ||
| $ref: "../primitive.yaml#/Uint64" | ||
| description: "Index of validator in validator registry." | ||
| amount: | ||
| $ref: "../primitive.yaml#/Gwei" | ||
| description: "The value to be deposited (gwei)." |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.