From 9a4c01fbeec0e5788fc54c2d7a0d2288250f491a Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Fri, 12 Apr 2024 16:11:54 +0200 Subject: [PATCH] chore: rm node api deps (#7593) --- Cargo.lock | 5 +++-- crates/consensus/auto-seal/Cargo.toml | 3 ++- crates/consensus/auto-seal/src/lib.rs | 3 ++- crates/consensus/auto-seal/src/task.rs | 3 ++- crates/revm/Cargo.toml | 2 +- crates/revm/src/factory.rs | 2 +- crates/revm/src/optimism/processor.rs | 2 +- crates/revm/src/processor.rs | 2 +- crates/revm/src/test_utils.rs | 2 +- 9 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6ae7d5b0a..ae67f44a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6121,8 +6121,9 @@ version = "0.2.0-beta.5" dependencies = [ "futures-util", "reth-beacon-consensus", + "reth-engine-primitives", + "reth-evm", "reth-interfaces", - "reth-node-api", "reth-primitives", "reth-provider", "reth-revm", @@ -7132,8 +7133,8 @@ name = "reth-revm" version = "0.2.0-beta.5" dependencies = [ "reth-consensus-common", + "reth-evm", "reth-interfaces", - "reth-node-api", "reth-primitives", "reth-provider", "reth-trie", diff --git a/crates/consensus/auto-seal/Cargo.toml b/crates/consensus/auto-seal/Cargo.toml index 62ef0e9f1..72a593b5a 100644 --- a/crates/consensus/auto-seal/Cargo.toml +++ b/crates/consensus/auto-seal/Cargo.toml @@ -20,7 +20,8 @@ reth-provider.workspace = true reth-stages.workspace = true reth-revm.workspace = true reth-transaction-pool.workspace = true -reth-node-api.workspace = true +reth-evm.workspace = true +reth-engine-primitives.workspace = true # async futures-util.workspace = true diff --git a/crates/consensus/auto-seal/src/lib.rs b/crates/consensus/auto-seal/src/lib.rs index f48c5cea1..59efc0d48 100644 --- a/crates/consensus/auto-seal/src/lib.rs +++ b/crates/consensus/auto-seal/src/lib.rs @@ -16,11 +16,12 @@ #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] use reth_beacon_consensus::BeaconEngineMessage; +use reth_engine_primitives::EngineTypes; +use reth_evm::ConfigureEvm; use reth_interfaces::{ consensus::{Consensus, ConsensusError}, executor::{BlockExecutionError, BlockValidationError}, }; -use reth_node_api::{ConfigureEvm, EngineTypes}; use reth_primitives::{ constants::{EMPTY_RECEIPTS, EMPTY_TRANSACTIONS, ETHEREUM_BLOCK_GAS_LIMIT}, eip4844::calculate_excess_blob_gas, diff --git a/crates/consensus/auto-seal/src/task.rs b/crates/consensus/auto-seal/src/task.rs index 0084583b6..6d7a29a33 100644 --- a/crates/consensus/auto-seal/src/task.rs +++ b/crates/consensus/auto-seal/src/task.rs @@ -1,8 +1,9 @@ use crate::{mode::MiningMode, Storage}; use futures_util::{future::BoxFuture, FutureExt}; use reth_beacon_consensus::{BeaconEngineMessage, ForkchoiceStatus}; +use reth_engine_primitives::EngineTypes; +use reth_evm::ConfigureEvm; use reth_interfaces::consensus::ForkchoiceState; -use reth_node_api::{ConfigureEvm, EngineTypes}; use reth_primitives::{Block, ChainSpec, IntoRecoveredTransaction, SealedBlockWithSenders}; use reth_provider::{CanonChainTracker, CanonStateNotificationSender, Chain, StateProviderFactory}; use reth_stages::PipelineEvent; diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml index 74818a20a..2bd04d278 100644 --- a/crates/revm/Cargo.toml +++ b/crates/revm/Cargo.toml @@ -17,7 +17,7 @@ reth-primitives.workspace = true reth-interfaces.workspace = true reth-provider.workspace = true reth-consensus-common.workspace = true -reth-node-api.workspace = true +reth-evm.workspace = true # revm revm.workspace = true diff --git a/crates/revm/src/factory.rs b/crates/revm/src/factory.rs index bf8117e8b..61e43cc18 100644 --- a/crates/revm/src/factory.rs +++ b/crates/revm/src/factory.rs @@ -3,8 +3,8 @@ use crate::{ processor::EVMProcessor, stack::{InspectorStack, InspectorStackConfig}, }; +use reth_evm::ConfigureEvm; use reth_interfaces::executor::BlockExecutionError; -use reth_node_api::ConfigureEvm; use reth_primitives::ChainSpec; use reth_provider::{ExecutorFactory, PrunableBlockExecutor, StateProvider}; use std::sync::Arc; diff --git a/crates/revm/src/optimism/processor.rs b/crates/revm/src/optimism/processor.rs index 9fdbe45c9..ef421d46a 100644 --- a/crates/revm/src/optimism/processor.rs +++ b/crates/revm/src/optimism/processor.rs @@ -3,7 +3,7 @@ use reth_interfaces::executor::{ BlockExecutionError, BlockValidationError, OptimismBlockExecutionError, }; -use reth_node_api::ConfigureEvm; +use reth_evm::ConfigureEvm; use reth_primitives::{ proofs::calculate_receipt_root_optimism, revm_primitives::ResultAndState, BlockWithSenders, Bloom, ChainSpec, Hardfork, Receipt, ReceiptWithBloom, TxType, B256, U256, diff --git a/crates/revm/src/processor.rs b/crates/revm/src/processor.rs index ec698bcd1..38bacd7f1 100644 --- a/crates/revm/src/processor.rs +++ b/crates/revm/src/processor.rs @@ -11,8 +11,8 @@ use std::{sync::Arc, time::Instant}; #[cfg(not(feature = "optimism"))] use tracing::{debug, trace}; +use reth_evm::ConfigureEvm; use reth_interfaces::executor::{BlockExecutionError, BlockValidationError}; -use reth_node_api::ConfigureEvm; #[cfg(feature = "optimism")] use reth_primitives::revm::env::fill_op_tx_env; #[cfg(not(feature = "optimism"))] diff --git a/crates/revm/src/test_utils.rs b/crates/revm/src/test_utils.rs index 535d7919f..cf0b82998 100644 --- a/crates/revm/src/test_utils.rs +++ b/crates/revm/src/test_utils.rs @@ -1,5 +1,5 @@ +use reth_evm::{ConfigureEvm, ConfigureEvmEnv}; use reth_interfaces::provider::ProviderResult; -use reth_node_api::{ConfigureEvm, ConfigureEvmEnv}; use reth_primitives::{ keccak256, revm::config::revm_spec, trie::AccountProof, Account, Address, BlockNumber, Bytecode, Bytes, ChainSpec, Head, Header, StorageKey, Transaction, B256, U256,