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

chore: rm beacon consensus deps everywhere (#13722)

Browse Source
This commit is contained in:
Matthias Seitz
2025-01-08 12:49:54 +01:00
committed by GitHub
parent 856479bfcf
commit baf92e33fb
18 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Cargo.lock generated
View File

@ -6400,7 +6400,6 @@ dependencies = [
"eyre", "eyre",
"futures", "futures",
"reth-basic-payload-builder", "reth-basic-payload-builder",
"reth-beacon-consensus",
"reth-chainspec", "reth-chainspec",
"reth-cli", "reth-cli",
"reth-cli-commands", "reth-cli-commands",
@ -7204,7 +7203,6 @@ dependencies = [
"eyre", "eyre",
"futures-util", "futures-util",
"op-alloy-rpc-types-engine", "op-alloy-rpc-types-engine",
"reth-beacon-consensus",
"reth-chainspec", "reth-chainspec",
"reth-consensus", "reth-consensus",
"reth-engine-primitives", "reth-engine-primitives",
@ -7251,11 +7249,11 @@ version = "1.1.5"
dependencies = [ dependencies = [
"futures", "futures",
"pin-project", "pin-project",
"reth-beacon-consensus",
"reth-chainspec", "reth-chainspec",
"reth-consensus", "reth-consensus",
"reth-engine-primitives", "reth-engine-primitives",
"reth-engine-tree", "reth-engine-tree",
"reth-ethereum-consensus",
"reth-ethereum-engine-primitives", "reth-ethereum-engine-primitives",
"reth-evm", "reth-evm",
"reth-evm-ethereum", "reth-evm-ethereum",
@ -8043,7 +8041,6 @@ dependencies = [
"futures", "futures",
"jsonrpsee", "jsonrpsee",
"rayon", "rayon",
"reth-beacon-consensus",
"reth-chain-state", "reth-chain-state",
"reth-chainspec", "reth-chainspec",
"reth-cli-util", "reth-cli-util",
@ -8203,7 +8200,6 @@ dependencies = [
"futures", "futures",
"humantime", "humantime",
"pin-project", "pin-project",
"reth-beacon-consensus",
"reth-engine-primitives", "reth-engine-primitives",
"reth-network-api", "reth-network-api",
"reth-primitives-traits", "reth-primitives-traits",
@ -8398,7 +8394,6 @@ dependencies = [
"op-alloy-rpc-types-engine", "op-alloy-rpc-types-engine",
"parking_lot", "parking_lot",
"reth-basic-payload-builder", "reth-basic-payload-builder",
"reth-beacon-consensus",
"reth-chainspec", "reth-chainspec",
"reth-consensus", "reth-consensus",
"reth-db", "reth-db",

1
bin/reth/Cargo.toml
View File

@ -31,7 +31,6 @@ reth-stages.workspace = true
reth-execution-types.workspace = true reth-execution-types.workspace = true
reth-errors.workspace = true reth-errors.workspace = true
reth-transaction-pool.workspace = true reth-transaction-pool.workspace = true
reth-beacon-consensus.workspace = true
reth-cli-runner.workspace = true reth-cli-runner.workspace = true
reth-cli-commands.workspace = true reth-cli-commands.workspace = true
reth-cli-util.workspace = true reth-cli-util.workspace = true

3
bin/reth/src/commands/debug_cmd/build_block.rs
View File

@ -12,7 +12,6 @@ use eyre::Context;
use reth_basic_payload_builder::{ use reth_basic_payload_builder::{
BuildArguments, BuildOutcome, Cancelled, PayloadBuilder, PayloadConfig, BuildArguments, BuildOutcome, Cancelled, PayloadBuilder, PayloadConfig,
}; };
use reth_beacon_consensus::EthBeaconConsensus;
use reth_chainspec::ChainSpec; use reth_chainspec::ChainSpec;
use reth_cli::chainspec::ChainSpecParser; use reth_cli::chainspec::ChainSpecParser;
use reth_cli_commands::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs}; use reth_cli_commands::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs};
@ -24,7 +23,7 @@ use reth_evm::execute::{BlockExecutorProvider, Executor};
use reth_execution_types::ExecutionOutcome; use reth_execution_types::ExecutionOutcome;
use reth_fs_util as fs; use reth_fs_util as fs;
use reth_node_api::{BlockTy, EngineApiMessageVersion, PayloadBuilderAttributes}; use reth_node_api::{BlockTy, EngineApiMessageVersion, PayloadBuilderAttributes};
use reth_node_ethereum::{EthEvmConfig, EthExecutorProvider}; use reth_node_ethereum::{consensus::EthBeaconConsensus, EthEvmConfig, EthExecutorProvider};
use reth_primitives::{ use reth_primitives::{
BlockExt, EthPrimitives, SealedBlockFor, SealedBlockWithSenders, SealedHeader, Transaction, BlockExt, EthPrimitives, SealedBlockFor, SealedBlockWithSenders, SealedHeader, Transaction,
TransactionSigned, TransactionSigned,

3
bin/reth/src/commands/debug_cmd/execution.rs
View File

@ -5,7 +5,6 @@ use alloy_eips::BlockHashOrNumber;
use alloy_primitives::{BlockNumber, B256}; use alloy_primitives::{BlockNumber, B256};
use clap::Parser; use clap::Parser;
use futures::StreamExt; use futures::StreamExt;
use reth_beacon_consensus::EthBeaconConsensus;
use reth_chainspec::ChainSpec; use reth_chainspec::ChainSpec;
use reth_cli::chainspec::ChainSpecParser; use reth_cli::chainspec::ChainSpecParser;
use reth_cli_commands::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs}; use reth_cli_commands::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs};
@ -24,7 +23,7 @@ use reth_network::{BlockDownloaderProvider, NetworkHandle};
use reth_network_api::NetworkInfo; use reth_network_api::NetworkInfo;
use reth_network_p2p::{headers::client::HeadersClient, EthBlockClient}; use reth_network_p2p::{headers::client::HeadersClient, EthBlockClient};
use reth_node_api::NodeTypesWithDBAdapter; use reth_node_api::NodeTypesWithDBAdapter;
use reth_node_ethereum::EthExecutorProvider; use reth_node_ethereum::{consensus::EthBeaconConsensus, EthExecutorProvider};
use reth_node_events::node::NodeEvent; use reth_node_events::node::NodeEvent;
use reth_primitives::EthPrimitives; use reth_primitives::EthPrimitives;
use reth_provider::{ use reth_provider::{

3
bin/reth/src/commands/debug_cmd/in_memory_merkle.rs
View File

@ -7,7 +7,6 @@ use crate::{
use alloy_eips::BlockHashOrNumber; use alloy_eips::BlockHashOrNumber;
use backon::{ConstantBuilder, Retryable}; use backon::{ConstantBuilder, Retryable};
use clap::Parser; use clap::Parser;
use reth_beacon_consensus::EthBeaconConsensus;
use reth_chainspec::ChainSpec; use reth_chainspec::ChainSpec;
use reth_cli::chainspec::ChainSpecParser; use reth_cli::chainspec::ChainSpecParser;
use reth_cli_commands::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs}; use reth_cli_commands::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs};
@ -20,7 +19,7 @@ use reth_execution_types::ExecutionOutcome;
use reth_network::{BlockDownloaderProvider, NetworkHandle}; use reth_network::{BlockDownloaderProvider, NetworkHandle};
use reth_network_api::NetworkInfo; use reth_network_api::NetworkInfo;
use reth_node_api::{BlockTy, NodePrimitives}; use reth_node_api::{BlockTy, NodePrimitives};
use reth_node_ethereum::EthExecutorProvider; use reth_node_ethereum::{consensus::EthBeaconConsensus, EthExecutorProvider};
use reth_primitives::{BlockExt, EthPrimitives}; use reth_primitives::{BlockExt, EthPrimitives};
use reth_provider::{ use reth_provider::{
providers::ProviderNodeTypes, AccountExtReader, ChainSpecProvider, DatabaseProviderFactory, providers::ProviderNodeTypes, AccountExtReader, ChainSpecProvider, DatabaseProviderFactory,

3
bin/reth/src/commands/debug_cmd/merkle.rs
View File

@ -3,7 +3,6 @@ use crate::{args::NetworkArgs, utils::get_single_header};
use alloy_eips::BlockHashOrNumber; use alloy_eips::BlockHashOrNumber;
use backon::{ConstantBuilder, Retryable}; use backon::{ConstantBuilder, Retryable};
use clap::Parser; use clap::Parser;
use reth_beacon_consensus::EthBeaconConsensus;
use reth_chainspec::ChainSpec; use reth_chainspec::ChainSpec;
use reth_cli::chainspec::ChainSpecParser; use reth_cli::chainspec::ChainSpecParser;
use reth_cli_commands::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs}; use reth_cli_commands::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs};
@ -18,7 +17,7 @@ use reth_network::{BlockDownloaderProvider, NetworkHandle};
use reth_network_api::NetworkInfo; use reth_network_api::NetworkInfo;
use reth_network_p2p::full_block::FullBlockClient; use reth_network_p2p::full_block::FullBlockClient;
use reth_node_api::{BlockTy, NodePrimitives}; use reth_node_api::{BlockTy, NodePrimitives};
use reth_node_ethereum::EthExecutorProvider; use reth_node_ethereum::{consensus::EthBeaconConsensus, EthExecutorProvider};
use reth_primitives::EthPrimitives; use reth_primitives::EthPrimitives;
use reth_provider::{ use reth_provider::{
providers::ProviderNodeTypes, BlockNumReader, BlockWriter, ChainSpecProvider, providers::ProviderNodeTypes, BlockNumReader, BlockWriter, ChainSpecProvider,

4
bin/reth/src/lib.rs
View File

@ -103,9 +103,9 @@ pub mod primitives {
pub use reth_primitives::*; pub use reth_primitives::*;
} }
/// Re-exported from `reth_beacon_consensus`. /// Re-exported from `reth_ethereum_consensus`.
pub mod beacon_consensus { pub mod beacon_consensus {
pub use reth_beacon_consensus::*; pub use reth_node_ethereum::consensus::*;
} }
/// Re-exported from `reth_consensus`. /// Re-exported from `reth_consensus`.

1
crates/engine/local/Cargo.toml
View File

@ -10,7 +10,6 @@ exclude.workspace = true
[dependencies] [dependencies]
# reth # reth
reth-beacon-consensus.workspace = true
reth-chainspec.workspace = true reth-chainspec.workspace = true
reth-consensus.workspace = true reth-consensus.workspace = true
reth-engine-primitives.workspace = true reth-engine-primitives.workspace = true

8
crates/engine/local/src/service.rs
View File

@ -16,10 +16,9 @@ use std::{
use crate::miner::{LocalMiner, MiningMode}; use crate::miner::{LocalMiner, MiningMode};
use futures_util::{Stream, StreamExt}; use futures_util::{Stream, StreamExt};
use reth_beacon_consensus::{BeaconConsensusEngineEvent, EngineNodeTypes};
use reth_chainspec::EthChainSpec; use reth_chainspec::EthChainSpec;
use reth_consensus::{ConsensusError, FullConsensus}; use reth_consensus::{ConsensusError, FullConsensus};
use reth_engine_primitives::{BeaconEngineMessage, EngineValidator}; use reth_engine_primitives::{BeaconConsensusEngineEvent, BeaconEngineMessage, EngineValidator};
use reth_engine_service::service::EngineMessageStream; use reth_engine_service::service::EngineMessageStream;
use reth_engine_tree::{ use reth_engine_tree::{
chain::{ChainEvent, HandlerEvent}, chain::{ChainEvent, HandlerEvent},
@ -34,7 +33,10 @@ use reth_evm::execute::BlockExecutorProvider;
use reth_node_types::BlockTy; use reth_node_types::BlockTy;
use reth_payload_builder::PayloadBuilderHandle; use reth_payload_builder::PayloadBuilderHandle;
use reth_payload_primitives::{PayloadAttributesBuilder, PayloadTypes}; use reth_payload_primitives::{PayloadAttributesBuilder, PayloadTypes};
use reth_provider::{providers::BlockchainProvider2, ChainSpecProvider, ProviderFactory}; use reth_provider::{
providers::{BlockchainProvider2, EngineNodeTypes},
ChainSpecProvider, ProviderFactory,
};
use reth_prune::PrunerWithFactory; use reth_prune::PrunerWithFactory;
use reth_stages_api::MetricEventsSender; use reth_stages_api::MetricEventsSender;
use tokio::sync::mpsc::UnboundedSender; use tokio::sync::mpsc::UnboundedSender;

2
crates/engine/service/Cargo.toml
View File

@ -12,7 +12,6 @@ workspace = true
[dependencies] [dependencies]
# reth # reth
reth-beacon-consensus.workspace = true
reth-consensus.workspace = true reth-consensus.workspace = true
reth-engine-tree.workspace = true reth-engine-tree.workspace = true
reth-evm.workspace = true reth-evm.workspace = true
@ -36,6 +35,7 @@ thiserror.workspace = true
[dev-dependencies] [dev-dependencies]
reth-engine-tree = { workspace = true, features = ["test-utils"] } reth-engine-tree = { workspace = true, features = ["test-utils"] }
reth-ethereum-consensus.workspace = true
reth-ethereum-engine-primitives.workspace = true reth-ethereum-engine-primitives.workspace = true
reth-evm-ethereum.workspace = true reth-evm-ethereum.workspace = true
reth-exex-types.workspace = true reth-exex-types.workspace = true

10
crates/engine/service/src/service.rs
View File

@ -1,9 +1,8 @@
use futures::{Stream, StreamExt}; use futures::{Stream, StreamExt};
use pin_project::pin_project; use pin_project::pin_project;
use reth_beacon_consensus::{BeaconConsensusEngineEvent, EngineNodeTypes};
use reth_chainspec::EthChainSpec; use reth_chainspec::EthChainSpec;
use reth_consensus::{ConsensusError, FullConsensus}; use reth_consensus::{ConsensusError, FullConsensus};
use reth_engine_primitives::{BeaconEngineMessage, EngineValidator}; use reth_engine_primitives::{BeaconConsensusEngineEvent, BeaconEngineMessage, EngineValidator};
use reth_engine_tree::{ use reth_engine_tree::{
backfill::PipelineSync, backfill::PipelineSync,
download::BasicBlockDownloader, download::BasicBlockDownloader,
@ -20,7 +19,10 @@ use reth_network_p2p::BlockClient;
use reth_node_types::{BlockTy, BodyTy, HeaderTy, NodeTypes, NodeTypesWithEngine}; use reth_node_types::{BlockTy, BodyTy, HeaderTy, NodeTypes, NodeTypesWithEngine};
use reth_payload_builder::PayloadBuilderHandle; use reth_payload_builder::PayloadBuilderHandle;
use reth_primitives::EthPrimitives; use reth_primitives::EthPrimitives;
use reth_provider::{providers::BlockchainProvider2, ProviderFactory}; use reth_provider::{
providers::{BlockchainProvider2, EngineNodeTypes},
ProviderFactory,
};
use reth_prune::PrunerWithFactory; use reth_prune::PrunerWithFactory;
use reth_stages_api::{MetricEventsSender, Pipeline}; use reth_stages_api::{MetricEventsSender, Pipeline};
use reth_tasks::TaskSpawner; use reth_tasks::TaskSpawner;
@ -150,10 +152,10 @@ pub struct EngineServiceError {}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use reth_beacon_consensus::EthBeaconConsensus;
use reth_chainspec::{ChainSpecBuilder, MAINNET}; use reth_chainspec::{ChainSpecBuilder, MAINNET};
use reth_engine_primitives::BeaconEngineMessage; use reth_engine_primitives::BeaconEngineMessage;
use reth_engine_tree::{test_utils::TestPipelineBuilder, tree::NoopInvalidBlockHook}; use reth_engine_tree::{test_utils::TestPipelineBuilder, tree::NoopInvalidBlockHook};
use reth_ethereum_consensus::EthBeaconConsensus;
use reth_ethereum_engine_primitives::{EthEngineTypes, EthereumEngineValidator}; use reth_ethereum_engine_primitives::{EthEngineTypes, EthereumEngineValidator};
use reth_evm_ethereum::execute::EthExecutorProvider; use reth_evm_ethereum::execute::EthExecutorProvider;
use reth_exex_types::FinishedExExHeight; use reth_exex_types::FinishedExExHeight;

1
crates/ethereum/node/src/lib.rs
View File

@ -21,6 +21,7 @@ pub use evm::{
BasicBlockExecutorProvider, EthEvmConfig, EthExecutionStrategyFactory, EthExecutorProvider, BasicBlockExecutorProvider, EthEvmConfig, EthExecutionStrategyFactory, EthExecutorProvider,
}; };
pub use reth_ethereum_consensus as consensus;
pub mod node; pub mod node;
pub use node::EthereumNode; pub use node::EthereumNode;

1
crates/node/builder/Cargo.toml
View File

@ -13,7 +13,6 @@ workspace = true
[dependencies] [dependencies]
## reth ## reth
reth-beacon-consensus.workspace = true
reth-chain-state.workspace = true reth-chain-state.workspace = true
reth-chainspec.workspace = true reth-chainspec.workspace = true
reth-cli-util.workspace = true reth-cli-util.workspace = true

5
crates/node/builder/src/launch/engine.rs
View File

@ -2,7 +2,6 @@
use alloy_consensus::BlockHeader; use alloy_consensus::BlockHeader;
use futures::{future::Either, stream, stream_select, StreamExt}; use futures::{future::Either, stream, stream_select, StreamExt};
use reth_beacon_consensus::BeaconConsensusEngineHandle;
use reth_chainspec::EthChainSpec; use reth_chainspec::EthChainSpec;
use reth_consensus_debug_client::{DebugConsensusClient, EtherscanBlockProvider}; use reth_consensus_debug_client::{DebugConsensusClient, EtherscanBlockProvider};
use reth_db_api::{ use reth_db_api::{
@ -20,8 +19,8 @@ use reth_exex::ExExManagerHandle;
use reth_network::{NetworkSyncUpdater, SyncState}; use reth_network::{NetworkSyncUpdater, SyncState};
use reth_network_api::BlockDownloaderProvider; use reth_network_api::BlockDownloaderProvider;
use reth_node_api::{ use reth_node_api::{
BuiltPayload, FullNodeTypes, NodeTypesWithDBAdapter, NodeTypesWithEngine, BeaconConsensusEngineHandle, BuiltPayload, FullNodeTypes, NodeTypesWithDBAdapter,
PayloadAttributesBuilder, PayloadBuilder, PayloadTypes, NodeTypesWithEngine, PayloadAttributesBuilder, PayloadBuilder, PayloadTypes,
}; };
use reth_node_core::{ use reth_node_core::{
dirs::{ChainPath, DataDirPath}, dirs::{ChainPath, DataDirPath},

1
crates/node/events/Cargo.toml
View File

@ -13,7 +13,6 @@ workspace = true
[dependencies] [dependencies]
# reth # reth
reth-storage-api.workspace = true reth-storage-api.workspace = true
reth-beacon-consensus.workspace = true
reth-network-api.workspace = true reth-network-api.workspace = true
reth-stages.workspace = true reth-stages.workspace = true
reth-prune-types.workspace = true reth-prune-types.workspace = true

5
crates/node/events/src/node.rs
View File

@ -5,8 +5,9 @@ use alloy_consensus::{constants::GWEI_TO_WEI, BlockHeader};
use alloy_primitives::{BlockNumber, B256}; use alloy_primitives::{BlockNumber, B256};
use alloy_rpc_types_engine::ForkchoiceState; use alloy_rpc_types_engine::ForkchoiceState;
use futures::Stream; use futures::Stream;
use reth_beacon_consensus::{BeaconConsensusEngineEvent, ConsensusEngineLiveSyncProgress}; use reth_engine_primitives::{
use reth_engine_primitives::ForkchoiceStatus; BeaconConsensusEngineEvent, ConsensusEngineLiveSyncProgress, ForkchoiceStatus,
};
use reth_network_api::PeersInfo; use reth_network_api::PeersInfo;
use reth_primitives_traits::{format_gas, format_gas_throughput, BlockBody, NodePrimitives}; use reth_primitives_traits::{format_gas, format_gas_throughput, BlockBody, NodePrimitives};
use reth_prune_types::PrunerEvent; use reth_prune_types::PrunerEvent;

2
crates/optimism/node/Cargo.toml
View File

@ -30,7 +30,6 @@ reth-transaction-pool.workspace = true
reth-network.workspace = true reth-network.workspace = true
reth-evm.workspace = true reth-evm.workspace = true
reth-revm = { workspace = true, features = ["std"] } reth-revm = { workspace = true, features = ["std"] }
reth-beacon-consensus.workspace = true
reth-trie-db.workspace = true reth-trie-db.workspace = true
reth-rpc-server-types.workspace = true reth-rpc-server-types.workspace = true
reth-rpc-types-compat.workspace = true reth-rpc-types-compat.workspace = true
@ -94,7 +93,6 @@ optimism = [
"reth-provider/optimism", "reth-provider/optimism",
"reth-optimism-evm/optimism", "reth-optimism-evm/optimism",
"reth-optimism-payload-builder/optimism", "reth-optimism-payload-builder/optimism",
"reth-beacon-consensus/optimism",
"revm/optimism", "revm/optimism",
"reth-optimism-rpc/optimism", "reth-optimism-rpc/optimism",
"reth-engine-local/op", "reth-engine-local/op",

5
crates/storage/provider/src/providers/mod.rs
View File

@ -114,6 +114,11 @@ impl<T> NodeTypesForTree for T where
{ {
} }
/// Helper trait expressing requirements for node types to be used in engine.
pub trait EngineNodeTypes: ProviderNodeTypes + NodeTypesWithEngine {}
impl<T> EngineNodeTypes for T where T: ProviderNodeTypes + NodeTypesWithEngine {}
/// Helper trait with requirements for [`ProviderNodeTypes`] to be used within legacy blockchain /// Helper trait with requirements for [`ProviderNodeTypes`] to be used within legacy blockchain
/// tree. /// tree.
pub trait TreeNodeTypes: ProviderNodeTypes + NodeTypesForTree {} pub trait TreeNodeTypes: ProviderNodeTypes + NodeTypesForTree {}