From fb3f6f15597a8c7fabf4ce74ace287ad1b3b275d Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Tue, 16 Apr 2024 18:20:42 +0200 Subject: [PATCH] chore: flatten node-api dep (#7682) --- Cargo.lock | 17 ++++++++++------- crates/consensus/beacon/Cargo.toml | 2 +- crates/consensus/beacon/src/engine/handle.rs | 2 +- crates/consensus/beacon/src/engine/message.rs | 2 +- crates/consensus/beacon/src/engine/mod.rs | 2 +- crates/node-core/Cargo.toml | 3 ++- crates/node-core/src/args/rpc_server_args.rs | 3 ++- crates/node-core/src/engine_api_store.rs | 2 +- crates/payload/basic/Cargo.toml | 2 +- crates/payload/basic/src/lib.rs | 2 +- crates/payload/optimism/Cargo.toml | 3 ++- crates/payload/optimism/src/builder.rs | 2 +- crates/payload/optimism/src/payload.rs | 2 +- crates/rpc/rpc-api/Cargo.toml | 2 +- crates/rpc/rpc-api/src/engine.rs | 2 +- crates/rpc/rpc-builder/Cargo.toml | 3 ++- crates/rpc/rpc-builder/src/auth.rs | 3 ++- crates/rpc/rpc-builder/src/lib.rs | 10 ++++++---- crates/rpc/rpc-engine-api/Cargo.toml | 2 +- crates/rpc/rpc-engine-api/src/engine_api.rs | 4 ++-- crates/rpc/rpc-engine-api/src/error.rs | 2 +- 21 files changed, 41 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b209fd4b..62e25f7da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6159,9 +6159,9 @@ dependencies = [ "futures-core", "futures-util", "metrics", + "reth-engine-primitives", "reth-interfaces", "reth-metrics", - "reth-node-api", "reth-payload-builder", "reth-primitives", "reth-provider", @@ -6185,9 +6185,9 @@ dependencies = [ "reth-config", "reth-db", "reth-downloaders", + "reth-engine-primitives", "reth-interfaces", "reth-metrics", - "reth-node-api", "reth-node-ethereum", "reth-payload-builder", "reth-payload-validator", @@ -6908,12 +6908,13 @@ dependencies = [ "reth-consensus-common", "reth-db", "reth-discv4", + "reth-engine-primitives", + "reth-evm", "reth-interfaces", "reth-metrics", "reth-net-nat", "reth-network", "reth-network-api", - "reth-node-api", "reth-primitives", "reth-provider", "reth-prune", @@ -7001,7 +7002,8 @@ version = "0.2.0-beta.5" dependencies = [ "alloy-rlp", "reth-basic-payload-builder", - "reth-node-api", + "reth-engine-primitives", + "reth-evm", "reth-payload-builder", "reth-primitives", "reth-provider", @@ -7225,7 +7227,7 @@ name = "reth-rpc-api" version = "0.2.0-beta.5" dependencies = [ "jsonrpsee", - "reth-node-api", + "reth-engine-primitives", "reth-primitives", "reth-rpc-types", "serde", @@ -7255,11 +7257,12 @@ dependencies = [ "metrics", "pin-project", "reth-beacon-consensus", + "reth-engine-primitives", + "reth-evm", "reth-interfaces", "reth-ipc", "reth-metrics", "reth-network-api", - "reth-node-api", "reth-node-ethereum", "reth-payload-builder", "reth-primitives", @@ -7293,9 +7296,9 @@ dependencies = [ "jsonrpsee-types", "metrics", "reth-beacon-consensus", + "reth-engine-primitives", "reth-interfaces", "reth-metrics", - "reth-node-api", "reth-node-ethereum", "reth-node-optimism", "reth-payload-builder", diff --git a/crates/consensus/beacon/Cargo.toml b/crates/consensus/beacon/Cargo.toml index 2c86a4d41..60279a65a 100644 --- a/crates/consensus/beacon/Cargo.toml +++ b/crates/consensus/beacon/Cargo.toml @@ -25,7 +25,7 @@ reth-payload-validator.workspace = true reth-prune.workspace = true reth-static-file.workspace = true reth-tokio-util.workspace = true -reth-node-api.workspace = true +reth-engine-primitives.workspace = true # async tokio = { workspace = true, features = ["sync"] } diff --git a/crates/consensus/beacon/src/engine/handle.rs b/crates/consensus/beacon/src/engine/handle.rs index 56864e7b8..121a8fac0 100644 --- a/crates/consensus/beacon/src/engine/handle.rs +++ b/crates/consensus/beacon/src/engine/handle.rs @@ -5,8 +5,8 @@ use crate::{ BeaconForkChoiceUpdateError, BeaconOnNewPayloadError, }; use futures::TryFutureExt; +use reth_engine_primitives::EngineTypes; use reth_interfaces::RethResult; -use reth_node_api::EngineTypes; use reth_rpc_types::engine::{ CancunPayloadFields, ExecutionPayload, ForkchoiceState, ForkchoiceUpdated, PayloadStatus, }; diff --git a/crates/consensus/beacon/src/engine/message.rs b/crates/consensus/beacon/src/engine/message.rs index 5e1826722..9b4324e5a 100644 --- a/crates/consensus/beacon/src/engine/message.rs +++ b/crates/consensus/beacon/src/engine/message.rs @@ -3,8 +3,8 @@ use crate::{ BeaconConsensusEngineEvent, }; use futures::{future::Either, FutureExt}; +use reth_engine_primitives::EngineTypes; use reth_interfaces::{consensus::ForkchoiceState, RethResult}; -use reth_node_api::EngineTypes; use reth_payload_builder::error::PayloadBuilderError; use reth_rpc_types::engine::{ CancunPayloadFields, ExecutionPayload, ForkChoiceUpdateResult, ForkchoiceUpdateError, diff --git a/crates/consensus/beacon/src/engine/mod.rs b/crates/consensus/beacon/src/engine/mod.rs index 7b2a689af..3f4bd2ed1 100644 --- a/crates/consensus/beacon/src/engine/mod.rs +++ b/crates/consensus/beacon/src/engine/mod.rs @@ -9,6 +9,7 @@ use crate::{ }; use futures::{Future, StreamExt}; use reth_db::database::Database; +use reth_engine_primitives::{EngineTypes, PayloadAttributes, PayloadBuilderAttributes}; use reth_interfaces::{ blockchain_tree::{ error::{BlockchainTreeError, CanonicalError, InsertBlockError, InsertBlockErrorKind}, @@ -20,7 +21,6 @@ use reth_interfaces::{ sync::{NetworkSyncUpdater, SyncState}, RethError, RethResult, }; -use reth_node_api::{EngineTypes, PayloadAttributes, PayloadBuilderAttributes}; use reth_payload_builder::PayloadBuilderHandle; use reth_primitives::{ constants::EPOCH_SLOTS, stage::StageId, BlockNumHash, BlockNumber, Head, Header, SealedBlock, diff --git a/crates/node-core/Cargo.toml b/crates/node-core/Cargo.toml index e4f6e3330..763cd00c6 100644 --- a/crates/node-core/Cargo.toml +++ b/crates/node-core/Cargo.toml @@ -29,7 +29,8 @@ reth-config.workspace = true reth-discv4.workspace = true reth-net-nat.workspace = true reth-network-api.workspace = true -reth-node-api.workspace = true +reth-evm.workspace = true +reth-engine-primitives.workspace = true reth-tasks.workspace = true reth-consensus-common.workspace = true reth-auto-seal-consensus.workspace = true diff --git a/crates/node-core/src/args/rpc_server_args.rs b/crates/node-core/src/args/rpc_server_args.rs index 5e8e1b48c..e9a21616a 100644 --- a/crates/node-core/src/args/rpc_server_args.rs +++ b/crates/node-core/src/args/rpc_server_args.rs @@ -13,8 +13,9 @@ use clap::{ Arg, Args, Command, }; use rand::Rng; +use reth_engine_primitives::EngineTypes; +use reth_evm::ConfigureEvm; use reth_network_api::{NetworkInfo, Peers}; -use reth_node_api::{ConfigureEvm, EngineTypes}; use reth_provider::{ AccountReader, BlockReaderIdExt, CanonStateSubscriptions, ChainSpecProvider, ChangeSetReader, EvmEnvProvider, HeaderProvider, StateProviderFactory, diff --git a/crates/node-core/src/engine_api_store.rs b/crates/node-core/src/engine_api_store.rs index 4a273f439..1ff5a0a30 100644 --- a/crates/node-core/src/engine_api_store.rs +++ b/crates/node-core/src/engine_api_store.rs @@ -1,7 +1,7 @@ //! Stores engine API messages to disk for later inspection and replay. use reth_beacon_consensus::BeaconEngineMessage; -use reth_node_api::EngineTypes; +use reth_engine_primitives::EngineTypes; use reth_primitives::fs::{self}; use reth_rpc_types::{ engine::{CancunPayloadFields, ForkchoiceState}, diff --git a/crates/payload/basic/Cargo.toml b/crates/payload/basic/Cargo.toml index 00ca2432c..dd2b82419 100644 --- a/crates/payload/basic/Cargo.toml +++ b/crates/payload/basic/Cargo.toml @@ -20,7 +20,7 @@ reth-provider.workspace = true reth-payload-builder.workspace = true reth-tasks.workspace = true reth-interfaces.workspace = true -reth-node-api.workspace = true +reth-engine-primitives.workspace = true # ethereum alloy-rlp.workspace = true diff --git a/crates/payload/basic/src/lib.rs b/crates/payload/basic/src/lib.rs index ef8ce9108..359a0fb16 100644 --- a/crates/payload/basic/src/lib.rs +++ b/crates/payload/basic/src/lib.rs @@ -11,8 +11,8 @@ use crate::metrics::PayloadBuilderMetrics; use futures_core::ready; use futures_util::FutureExt; +use reth_engine_primitives::{BuiltPayload, PayloadBuilderAttributes}; use reth_interfaces::RethResult; -use reth_node_api::{BuiltPayload, PayloadBuilderAttributes}; use reth_payload_builder::{ database::CachedReads, error::PayloadBuilderError, KeepPayloadJobAlive, PayloadId, PayloadJob, PayloadJobGenerator, diff --git a/crates/payload/optimism/Cargo.toml b/crates/payload/optimism/Cargo.toml index 8cafb343e..ebc776e74 100644 --- a/crates/payload/optimism/Cargo.toml +++ b/crates/payload/optimism/Cargo.toml @@ -19,7 +19,8 @@ reth-transaction-pool.workspace = true reth-provider.workspace = true reth-rpc-types.workspace = true reth-rpc-types-compat.workspace = true -reth-node-api.workspace = true +reth-engine-primitives.workspace = true +reth-evm.workspace = true reth-payload-builder.workspace = true reth-basic-payload-builder.workspace = true diff --git a/crates/payload/optimism/src/builder.rs b/crates/payload/optimism/src/builder.rs index 06583af32..1d1a2dade 100644 --- a/crates/payload/optimism/src/builder.rs +++ b/crates/payload/optimism/src/builder.rs @@ -5,7 +5,7 @@ use crate::{ payload::{OptimismBuiltPayload, OptimismPayloadBuilderAttributes}, }; use reth_basic_payload_builder::*; -use reth_node_api::ConfigureEvm; +use reth_evm::ConfigureEvm; use reth_payload_builder::error::PayloadBuilderError; use reth_primitives::{ constants::{BEACON_NONCE, EMPTY_RECEIPTS, EMPTY_TRANSACTIONS}, diff --git a/crates/payload/optimism/src/payload.rs b/crates/payload/optimism/src/payload.rs index 7a25689c4..0e4b0c826 100644 --- a/crates/payload/optimism/src/payload.rs +++ b/crates/payload/optimism/src/payload.rs @@ -3,7 +3,7 @@ //! Optimism builder support use alloy_rlp::Encodable; -use reth_node_api::{BuiltPayload, PayloadBuilderAttributes}; +use reth_engine_primitives::{BuiltPayload, PayloadBuilderAttributes}; use reth_payload_builder::EthPayloadBuilderAttributes; use reth_primitives::{ revm::config::revm_spec_by_timestamp_after_merge, diff --git a/crates/rpc/rpc-api/Cargo.toml b/crates/rpc/rpc-api/Cargo.toml index d8bf07628..c2ada1e88 100644 --- a/crates/rpc/rpc-api/Cargo.toml +++ b/crates/rpc/rpc-api/Cargo.toml @@ -15,7 +15,7 @@ workspace = true # reth reth-primitives.workspace = true reth-rpc-types.workspace = true -reth-node-api.workspace = true +reth-engine-primitives.workspace = true # misc jsonrpsee = { workspace = true, features = ["server", "macros"] } diff --git a/crates/rpc/rpc-api/src/engine.rs b/crates/rpc/rpc-api/src/engine.rs index acdc99a7e..9304bbc5b 100644 --- a/crates/rpc/rpc-api/src/engine.rs +++ b/crates/rpc/rpc-api/src/engine.rs @@ -4,7 +4,7 @@ //! the consensus client. use jsonrpsee::{core::RpcResult, proc_macros::rpc}; -use reth_node_api::EngineTypes; +use reth_engine_primitives::EngineTypes; use reth_primitives::{Address, BlockHash, BlockId, BlockNumberOrTag, Bytes, B256, U256, U64}; use reth_rpc_types::{ engine::{ diff --git a/crates/rpc/rpc-builder/Cargo.toml b/crates/rpc/rpc-builder/Cargo.toml index 1769e7860..ef79a7ed3 100644 --- a/crates/rpc/rpc-builder/Cargo.toml +++ b/crates/rpc/rpc-builder/Cargo.toml @@ -20,7 +20,8 @@ reth-rpc.workspace = true reth-rpc-api.workspace = true reth-tasks = { workspace = true, features = ["rayon"] } reth-transaction-pool.workspace = true -reth-node-api.workspace = true +reth-evm.workspace = true +reth-engine-primitives.workspace = true # rpc/net jsonrpsee = { workspace = true, features = ["server"] } diff --git a/crates/rpc/rpc-builder/src/auth.rs b/crates/rpc/rpc-builder/src/auth.rs index c6fa2f561..3daa1dc27 100644 --- a/crates/rpc/rpc-builder/src/auth.rs +++ b/crates/rpc/rpc-builder/src/auth.rs @@ -16,8 +16,9 @@ use jsonrpsee::{ use reth_ipc::client::IpcClientBuilder; pub use reth_ipc::server::{Builder as IpcServerBuilder, Endpoint}; +use reth_engine_primitives::EngineTypes; +use reth_evm::ConfigureEvm; use reth_network_api::{NetworkInfo, Peers}; -use reth_node_api::{ConfigureEvm, EngineTypes}; use reth_provider::{ BlockReaderIdExt, ChainSpecProvider, EvmEnvProvider, HeaderProvider, ReceiptProviderIdExt, StateProviderFactory, diff --git a/crates/rpc/rpc-builder/src/lib.rs b/crates/rpc/rpc-builder/src/lib.rs index ec29a6640..ef5b8868c 100644 --- a/crates/rpc/rpc-builder/src/lib.rs +++ b/crates/rpc/rpc-builder/src/lib.rs @@ -17,8 +17,8 @@ //! Configure only an http server with a selection of [RethRpcModule]s //! //! ``` +//! use reth_evm::ConfigureEvm; //! use reth_network_api::{NetworkInfo, Peers}; -//! use reth_node_api::ConfigureEvm; //! use reth_provider::{ //! AccountReader, BlockReaderIdExt, CanonStateSubscriptions, ChainSpecProvider, //! ChangeSetReader, EvmEnvProvider, StateProviderFactory, @@ -77,8 +77,9 @@ //! //! //! ``` +//! use reth_engine_primitives::EngineTypes; +//! use reth_evm::ConfigureEvm; //! use reth_network_api::{NetworkInfo, Peers}; -//! use reth_node_api::{ConfigureEvm, EngineTypes}; //! use reth_provider::{ //! AccountReader, BlockReaderIdExt, CanonStateSubscriptions, ChainSpecProvider, //! ChangeSetReader, EvmEnvProvider, StateProviderFactory, @@ -167,10 +168,11 @@ use jsonrpsee::{ server::{AlreadyStoppedError, IdProvider, RpcServiceBuilder, Server, ServerHandle}, Methods, RpcModule, }; +use reth_engine_primitives::EngineTypes; +use reth_evm::ConfigureEvm; use reth_ipc::server::IpcServer; pub use reth_ipc::server::{Builder as IpcServerBuilder, Endpoint}; use reth_network_api::{noop::NoopNetwork, NetworkInfo, Peers}; -use reth_node_api::{ConfigureEvm, EngineTypes}; use reth_provider::{ AccountReader, BlockReader, BlockReaderIdExt, CanonStateSubscriptions, ChainSpecProvider, ChangeSetReader, EvmEnvProvider, StateProviderFactory, @@ -498,8 +500,8 @@ where /// # Example /// /// ```no_run + /// use reth_evm::ConfigureEvm; /// use reth_network_api::noop::NoopNetwork; - /// use reth_node_api::ConfigureEvm; /// use reth_provider::test_utils::{NoopProvider, TestCanonStateSubscriptions}; /// use reth_rpc_builder::RpcModuleBuilder; /// use reth_tasks::TokioTaskExecutor; diff --git a/crates/rpc/rpc-engine-api/Cargo.toml b/crates/rpc/rpc-engine-api/Cargo.toml index 5ffb09294..271363963 100644 --- a/crates/rpc/rpc-engine-api/Cargo.toml +++ b/crates/rpc/rpc-engine-api/Cargo.toml @@ -22,7 +22,7 @@ reth-beacon-consensus.workspace = true reth-payload-builder.workspace = true reth-tasks.workspace = true reth-rpc-types-compat.workspace = true -reth-node-api.workspace = true +reth-engine-primitives.workspace = true # async tokio = { workspace = true, features = ["sync"] } diff --git a/crates/rpc/rpc-engine-api/src/engine_api.rs b/crates/rpc/rpc-engine-api/src/engine_api.rs index 32a267f53..d84b6ed22 100644 --- a/crates/rpc/rpc-engine-api/src/engine_api.rs +++ b/crates/rpc/rpc-engine-api/src/engine_api.rs @@ -2,11 +2,11 @@ use crate::{metrics::EngineApiMetrics, EngineApiError, EngineApiResult}; use async_trait::async_trait; use jsonrpsee_core::RpcResult; use reth_beacon_consensus::BeaconConsensusEngineHandle; -use reth_interfaces::consensus::ForkchoiceState; -use reth_node_api::{ +use reth_engine_primitives::{ validate_payload_timestamp, EngineApiMessageVersion, EngineTypes, PayloadAttributes, PayloadBuilderAttributes, PayloadOrAttributes, }; +use reth_interfaces::consensus::ForkchoiceState; use reth_payload_builder::PayloadStore; use reth_primitives::{BlockHash, BlockHashOrNumber, BlockNumber, ChainSpec, Hardfork, B256, U64}; use reth_provider::{BlockReader, EvmEnvProvider, HeaderProvider, StateProviderFactory}; diff --git a/crates/rpc/rpc-engine-api/src/error.rs b/crates/rpc/rpc-engine-api/src/error.rs index 8a9a00a3b..8a7790cf0 100644 --- a/crates/rpc/rpc-engine-api/src/error.rs +++ b/crates/rpc/rpc-engine-api/src/error.rs @@ -2,7 +2,7 @@ use jsonrpsee_types::error::{ INTERNAL_ERROR_CODE, INVALID_PARAMS_CODE, INVALID_PARAMS_MSG, SERVER_ERROR_MSG, }; use reth_beacon_consensus::{BeaconForkChoiceUpdateError, BeaconOnNewPayloadError}; -use reth_node_api::EngineObjectValidationError; +use reth_engine_primitives::EngineObjectValidationError; use reth_payload_builder::error::PayloadBuilderError; use reth_primitives::{B256, U256}; use thiserror::Error;