jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

engine-primitives: make engine-tree independent of beacon-consensus crate (#12560)

Browse Source
This commit is contained in:
Thomas Coratger
2024-11-15 09:56:46 +01:00
committed by GitHub
parent 93ec6d48fe
commit 44964ac171
27 changed files with 101 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/engine/util/Cargo.toml
View File

@ -17,7 +17,6 @@ reth-errors.workspace = true
reth-fs-util.workspace = true
reth-rpc-types-compat.workspace = true
reth-engine-primitives.workspace = true
reth-beacon-consensus.workspace = true
reth-payload-validator.workspace = true
reth-evm.workspace = true
reth-revm.workspace = true
@ -51,8 +50,7 @@ tracing.workspace = true
[features]
optimism = [
"reth-beacon-consensus/optimism",
"reth-primitives/optimism",
"reth-provider/optimism",
"revm-primitives/optimism"
"reth-primitives/optimism",
"reth-provider/optimism",
"revm-primitives/optimism",
]

3
crates/engine/util/src/engine_store.rs
View File

@ -2,8 +2,7 @@
use alloy_rpc_types_engine::{ExecutionPayload, ExecutionPayloadSidecar, ForkchoiceState};
use futures::{Stream, StreamExt};
use reth_beacon_consensus::BeaconEngineMessage;
use reth_engine_primitives::EngineTypes;
use reth_engine_primitives::{BeaconEngineMessage, EngineTypes};
use reth_fs_util as fs;
use serde::{Deserialize, Serialize};
use std::{

3
crates/engine/util/src/lib.rs
View File

@ -1,8 +1,7 @@
//! Collection of various stream utilities for consensus engine.
use futures::Stream;
use reth_beacon_consensus::BeaconEngineMessage;
use reth_engine_primitives::EngineTypes;
use reth_engine_primitives::{BeaconEngineMessage, EngineTypes};
use reth_payload_validator::ExecutionPayloadValidator;
use std::path::PathBuf;
use tokio_util::either::Either;

6
crates/engine/util/src/reorg.rs
View File

@ -7,8 +7,10 @@ use alloy_rpc_types_engine::{
};
use futures::{stream::FuturesUnordered, Stream, StreamExt, TryFutureExt};
use itertools::Either;
use reth_beacon_consensus::{BeaconEngineMessage, BeaconOnNewPayloadError, OnForkChoiceUpdated};
use reth_engine_primitives::{EngineApiMessageVersion, EngineTypes};
use reth_engine_primitives::{
BeaconEngineMessage, BeaconOnNewPayloadError, EngineApiMessageVersion, EngineTypes,
OnForkChoiceUpdated,
};
use reth_errors::{BlockExecutionError, BlockValidationError, RethError, RethResult};
use reth_ethereum_forks::EthereumHardforks;
use reth_evm::{

3
crates/engine/util/src/skip_fcu.rs
View File

@ -1,8 +1,7 @@
//! Stream wrapper that skips specified number of FCUs.
use futures::{Stream, StreamExt};
use reth_beacon_consensus::{BeaconEngineMessage, OnForkChoiceUpdated};
use reth_engine_primitives::EngineTypes;
use reth_engine_primitives::{BeaconEngineMessage, EngineTypes, OnForkChoiceUpdated};
use std::{
pin::Pin,
task::{ready, Context, Poll},

3
crates/engine/util/src/skip_new_payload.rs
View File

@ -2,8 +2,7 @@
use alloy_rpc_types_engine::{PayloadStatus, PayloadStatusEnum};
use futures::{Stream, StreamExt};
use reth_beacon_consensus::BeaconEngineMessage;
use reth_engine_primitives::EngineTypes;
use reth_engine_primitives::{BeaconEngineMessage, EngineTypes};
use std::{
pin::Pin,
task::{ready, Context, Poll},