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

Merge remote-tracking branch 'origin/unstable' into gloas-envelope-processing

Browse Source
This commit is contained in:
Michael Sproul
2026-01-19 12:05:38 +11:00
parent 488ce8b1ac 58b153cac5
commit 2985ede062
145 changed files with 1414 additions and 1701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/execution_layer/src/engine_api/json_structures.rs
View File

@@ -5,11 +5,9 @@ use ssz::{Decode, TryFromIter};
use ssz_types::{FixedVector, VariableList, typenum::Unsigned};
use strum::EnumString;
use superstruct::superstruct;
use types::beacon_block_body::KzgCommitments;
use types::blob_sidecar::BlobsList;
use types::execution_requests::{
ConsolidationRequests, DepositRequests, RequestType, WithdrawalRequests,
};
use types::data::BlobsList;
use types::execution::{ConsolidationRequests, DepositRequests, RequestType, WithdrawalRequests};
use types::kzg_ext::KzgCommitments;
use types::{Blob, KzgProof};
#[derive(Debug, PartialEq, Serialize, Deserialize)]

2
beacon_node/execution_layer/src/engines.rs
View File

@@ -15,7 +15,7 @@ use tokio::sync::{Mutex, RwLock, watch};
use tokio_stream::wrappers::WatchStream;
use tracing::{debug, error, info, warn};
use types::ExecutionBlockHash;
use types::non_zero_usize::new_non_zero_usize;
use types::new_non_zero_usize;
/// The number of payload IDs that will be stored for each `Engine`.
///

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

@@ -18,7 +18,7 @@ pub use engine_api::{http, http::HttpJsonRpc, http::deposit_methods};
use engines::{Engine, EngineError};
pub use engines::{EngineState, ForkchoiceState};
use eth2::types::{BlobsBundle, FullPayloadContents};
use eth2::types::{ForkVersionedResponse, builder_bid::SignedBuilderBid};
use eth2::types::{ForkVersionedResponse, builder::SignedBuilderBid};
use fixed_bytes::UintExtended;
use fork_choice::ForkchoiceUpdateParameters;
use logging::crit;
@@ -45,10 +45,10 @@ use tokio::{
use tokio_stream::wrappers::WatchStream;
use tracing::{Instrument, debug, debug_span, error, info, instrument, warn};
use tree_hash::TreeHash;
use types::beacon_block_body::KzgCommitments;
use types::builder_bid::BuilderBid;
use types::non_zero_usize::new_non_zero_usize;
use types::payload::BlockProductionVersion;
use types::builder::BuilderBid;
use types::execution::BlockProductionVersion;
use types::kzg_ext::KzgCommitments;
use types::new_non_zero_usize;
use types::{
AbstractExecPayload, BlobsList, ExecutionPayloadDeneb, ExecutionRequests, KzgProofs,
SignedBlindedBeaconBlock,

2
beacon_node/execution_layer/src/payload_cache.rs
View File

@@ -3,7 +3,7 @@ use lru::LruCache;
use parking_lot::Mutex;
use std::num::NonZeroUsize;
use tree_hash::TreeHash;
use types::non_zero_usize::new_non_zero_usize;
use types::new_non_zero_usize;
use types::{EthSpec, Hash256};
pub const DEFAULT_PAYLOAD_CACHE_SIZE: NonZeroUsize = new_non_zero_usize(10);

2
beacon_node/execution_layer/src/test_utils/mock_builder.rs
View File

@@ -29,7 +29,7 @@ use tokio_stream::StreamExt;
use tracing::{debug, error, info, warn};
use tree_hash::TreeHash;
use types::ExecutionBlockHash;
use types::builder_bid::{
use types::builder::{
BuilderBid, BuilderBidBellatrix, BuilderBidCapella, BuilderBidDeneb, BuilderBidElectra,
BuilderBidFulu, SignedBuilderBid,
};

2
beacon_node/execution_layer/src/test_utils/mod.rs
View File

@@ -754,7 +754,7 @@ pub fn serve<E: EthSpec>(
info!(
listen_address = listening_socket.to_string(),
"Metrics HTTP server started"
"Mock execution client started"
);
Ok((listening_socket, server))