diff --git a/Cargo.lock b/Cargo.lock index 49f58bafca05..0176e60f6779 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8119,6 +8119,7 @@ name = "reth-node-builder" version = "1.1.3" dependencies = [ "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rpc-types", "aquamarine", @@ -8171,7 +8172,6 @@ dependencies = [ "reth-tokio-util", "reth-tracing", "reth-transaction-pool", - "revm-primitives", "secp256k1", "tempfile", "tokio", diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml index cf9c53261b45..fb86a8ced2b3 100644 --- a/bin/reth/Cargo.toml +++ b/bin/reth/Cargo.toml @@ -68,7 +68,7 @@ reth-engine-util.workspace = true reth-prune.workspace = true # crypto -alloy-eips.workspace = true +alloy-eips = { workspace = true, features = ["kzg"] } alloy-rlp.workspace = true alloy-rpc-types = { workspace = true, features = ["engine"] } alloy-consensus.workspace = true diff --git a/bin/reth/src/commands/debug_cmd/build_block.rs b/bin/reth/src/commands/debug_cmd/build_block.rs index 0e4d3f7188a9..41a9d9f4f570 100644 --- a/bin/reth/src/commands/debug_cmd/build_block.rs +++ b/bin/reth/src/commands/debug_cmd/build_block.rs @@ -1,6 +1,9 @@ //! Command for debugging block building. use alloy_consensus::TxEip4844; -use alloy_eips::{eip2718::Encodable2718, eip4844::BlobTransactionSidecar}; +use alloy_eips::{ + eip2718::Encodable2718, + eip4844::{env_settings::EnvKzgSettings, BlobTransactionSidecar}, +}; use alloy_primitives::{Address, Bytes, B256, U256}; use alloy_rlp::Decodable; use alloy_rpc_types::engine::{BlobsBundleV1, PayloadAttributes}; @@ -33,11 +36,7 @@ use reth_provider::{ BlockHashReader, BlockReader, BlockWriter, ChainSpecProvider, ProviderFactory, StageCheckpointReader, StateProviderFactory, }; -use reth_revm::{ - cached::CachedReads, - database::StateProviderDatabase, - primitives::{EnvKzgSettings, KzgSettings}, -}; +use reth_revm::{cached::CachedReads, database::StateProviderDatabase, primitives::KzgSettings}; use reth_stages::StageId; use reth_transaction_pool::{ blobstore::InMemoryBlobStore, BlobStore, EthPooledTransaction, PoolConfig, TransactionOrigin, diff --git a/crates/node/builder/Cargo.toml b/crates/node/builder/Cargo.toml index 26d157e1e0cb..bd2998afed5f 100644 --- a/crates/node/builder/Cargo.toml +++ b/crates/node/builder/Cargo.toml @@ -61,8 +61,8 @@ reth-transaction-pool.workspace = true ## ethereum alloy-primitives.workspace = true alloy-rpc-types = { workspace = true, features = ["engine"] } +alloy-eips = { workspace = true, features = ["kzg"] } alloy-consensus.workspace = true -revm-primitives.workspace = true ## async futures.workspace = true diff --git a/crates/node/builder/src/builder/mod.rs b/crates/node/builder/src/builder/mod.rs index e2b18f666c76..95903d2695ea 100644 --- a/crates/node/builder/src/builder/mod.rs +++ b/crates/node/builder/src/builder/mod.rs @@ -9,6 +9,7 @@ use crate::{ rpc::{RethRpcAddOns, RethRpcServerHandles, RpcContext}, DefaultNodeLauncher, LaunchNode, Node, NodeHandle, }; +use alloy_eips::eip4844::env_settings::EnvKzgSettings; use futures::Future; use reth_blockchain_tree::externals::NodeTypesForTree; use reth_chainspec::{EthChainSpec, EthereumHardforks, Hardforks}; @@ -38,7 +39,6 @@ use reth_provider::{ }; use reth_tasks::TaskExecutor; use reth_transaction_pool::{PoolConfig, PoolTransaction, TransactionPool}; -use revm_primitives::EnvKzgSettings; use secp256k1::SecretKey; use std::sync::Arc; use tracing::{info, trace, warn};