gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 04:37:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-05-09 19:37:49 +03:00
parent 03453a92d6
commit f5e4a66d89
2 changed files with 82 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
beacon_node/execution_layer/src/lib.rs
View File

@@ -44,7 +44,6 @@ use tokio::{
use tokio_stream::wrappers::WatchStream;
use tracing::{Instrument, debug, debug_span, error, info, instrument, warn};
use tree_hash::TreeHash;
use types::ExecutionPayloadGloas;
use types::ExecutionPayloadHeze;
use types::builder::BuilderBid;
use types::execution::BlockProductionVersion;
@@ -210,7 +209,7 @@ pub enum BlockProposalContentsType<E: EthSpec> {
}
pub struct BlockProposalContentsGloas<E: EthSpec> {
pub payload: ExecutionPayloadGloas<E>,
pub payload: ExecutionPayload<E>,
pub payload_value: Uint256,
pub blob_kzg_commitments: KzgCommitments<E>,
pub blobs_and_proofs: (BlobsList<E>, KzgProofs<E>),
@@ -221,7 +220,20 @@ pub struct BlockProposalContentsGloas<E: EthSpec> {
impl<E: EthSpec> From<GetPayloadResponseGloas<E>> for BlockProposalContentsGloas<E> {
fn from(response: GetPayloadResponseGloas<E>) -> Self {
Self {
payload: response.execution_payload,
payload: ExecutionPayload::Gloas(response.execution_payload),
payload_value: response.block_value,
blob_kzg_commitments: response.blobs_bundle.commitments,
blobs_and_proofs: (response.blobs_bundle.blobs, response.blobs_bundle.proofs),
execution_requests: response.requests,
should_override_builder: response.should_override_builder,
}
}
}
impl<E: EthSpec> From<GetPayloadResponseHeze<E>> for BlockProposalContentsGloas<E> {
fn from(response: GetPayloadResponseHeze<E>) -> Self {
Self {
payload: ExecutionPayload::Heze(response.execution_payload),
payload_value: response.block_value,
blob_kzg_commitments: response.blobs_bundle.commitments,
blobs_and_proofs: (response.blobs_bundle.blobs, response.blobs_bundle.proofs),
@@ -951,7 +963,7 @@ impl<E: EthSpec> ExecutionLayer<E> {
// convert via BlockProposalContentsHeze then into Gloas.
let heze: BlockProposalContentsHeze<E> = resp.into();
BlockProposalContentsGloas {
payload: ExecutionPayloadGloas {
payload: ExecutionPayload::Heze(ExecutionPayloadHeze {
parent_hash: heze.payload.parent_hash,
fee_recipient: heze.payload.fee_recipient,
state_root: heze.payload.state_root,
@@ -971,7 +983,7 @@ impl<E: EthSpec> ExecutionLayer<E> {
excess_blob_gas: heze.payload.excess_blob_gas,
block_access_list: heze.payload.block_access_list,
slot_number: heze.payload.slot_number,
},
}),
payload_value: heze.payload_value,
blob_kzg_commitments: heze.blob_kzg_commitments,
blobs_and_proofs: heze.blobs_and_proofs,