diff --git a/Cargo.lock b/Cargo.lock index 72f5f5dff6..6d67e0e7ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6267,6 +6267,7 @@ dependencies = [ name = "reth-basic-payload-builder" version = "1.0.7" dependencies = [ + "alloy-primitives", "alloy-rlp", "futures-core", "futures-util", @@ -8076,6 +8077,7 @@ dependencies = [ name = "reth-payload-builder" version = "1.0.7" dependencies = [ + "alloy-primitives", "futures-util", "metrics", "pin-project", @@ -8098,6 +8100,7 @@ dependencies = [ name = "reth-payload-primitives" version = "1.0.7" dependencies = [ + "alloy-primitives", "reth-chain-state", "reth-chainspec", "reth-errors", diff --git a/crates/payload/basic/Cargo.toml b/crates/payload/basic/Cargo.toml index de9be0e35b..939eb5b54b 100644 --- a/crates/payload/basic/Cargo.toml +++ b/crates/payload/basic/Cargo.toml @@ -24,6 +24,7 @@ reth-tasks.workspace = true # ethereum alloy-rlp.workspace = true +alloy-primitives.workspace = true revm.workspace = true # async diff --git a/crates/payload/basic/src/lib.rs b/crates/payload/basic/src/lib.rs index b565e37fe3..6a03c35c19 100644 --- a/crates/payload/basic/src/lib.rs +++ b/crates/payload/basic/src/lib.rs @@ -9,6 +9,7 @@ #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] use crate::metrics::PayloadBuilderMetrics; +use alloy_primitives::{Bytes, B256, U256}; use futures_core::ready; use futures_util::FutureExt; use reth_chainspec::{ChainSpec, EthereumHardforks}; @@ -19,7 +20,7 @@ use reth_payload_builder::{ use reth_payload_primitives::{BuiltPayload, PayloadBuilderAttributes}; use reth_primitives::{ constants::{EMPTY_WITHDRAWALS, RETH_CLIENT_VERSION, SLOT_DURATION}, - proofs, BlockNumberOrTag, Bytes, SealedBlock, Withdrawals, B256, U256, + proofs, BlockNumberOrTag, SealedBlock, Withdrawals, }; use reth_provider::{ BlockReaderIdExt, BlockSource, CanonStateNotification, ProviderError, StateProviderFactory, diff --git a/crates/payload/builder/Cargo.toml b/crates/payload/builder/Cargo.toml index d551b4838f..6ca0dd5062 100644 --- a/crates/payload/builder/Cargo.toml +++ b/crates/payload/builder/Cargo.toml @@ -21,6 +21,9 @@ reth-provider.workspace = true reth-payload-primitives.workspace = true reth-ethereum-engine-primitives.workspace = true +# alloy +alloy-primitives.workspace = true + # async tokio = { workspace = true, features = ["sync"] } tokio-stream.workspace = true diff --git a/crates/payload/builder/src/database.rs b/crates/payload/builder/src/database.rs index 03ca508439..6abaed3424 100644 --- a/crates/payload/builder/src/database.rs +++ b/crates/payload/builder/src/database.rs @@ -1,11 +1,8 @@ //! Database adapters for payload building. - -use reth_primitives::{ - revm_primitives::{ - db::{Database, DatabaseRef}, - AccountInfo, Address, Bytecode, B256, - }, - U256, +use alloy_primitives::{Address, B256, U256}; +use reth_primitives::revm_primitives::{ + db::{Database, DatabaseRef}, + AccountInfo, Bytecode, }; use std::{ cell::RefCell, diff --git a/crates/payload/builder/src/error.rs b/crates/payload/builder/src/error.rs index ef3874e74f..3a3f4a8bde 100644 --- a/crates/payload/builder/src/error.rs +++ b/crates/payload/builder/src/error.rs @@ -1,7 +1,8 @@ //! Error types emitted by types or implementations of this crate. +use alloy_primitives::B256; use reth_errors::{ProviderError, RethError}; -use reth_primitives::{revm_primitives::EVMError, B256}; +use reth_primitives::revm_primitives::EVMError; use reth_transaction_pool::BlobStoreError; use tokio::sync::oneshot; diff --git a/crates/payload/builder/src/test_utils.rs b/crates/payload/builder/src/test_utils.rs index e4083d3ab3..718f9b1dee 100644 --- a/crates/payload/builder/src/test_utils.rs +++ b/crates/payload/builder/src/test_utils.rs @@ -5,8 +5,9 @@ use crate::{ EthPayloadBuilderAttributes, PayloadBuilderHandle, PayloadBuilderService, PayloadJob, PayloadJobGenerator, }; +use alloy_primitives::U256; use reth_payload_primitives::PayloadTypes; -use reth_primitives::{Block, U256}; +use reth_primitives::Block; use reth_provider::CanonStateNotification; use std::{ future::Future, diff --git a/crates/payload/primitives/Cargo.toml b/crates/payload/primitives/Cargo.toml index 85a72a3fcd..76d55d28dd 100644 --- a/crates/payload/primitives/Cargo.toml +++ b/crates/payload/primitives/Cargo.toml @@ -20,6 +20,9 @@ reth-transaction-pool.workspace = true reth-rpc-types.workspace = true reth-chain-state.workspace = true +# alloy +alloy-primitives.workspace = true + # async tokio = { workspace = true, features = ["sync"] } diff --git a/crates/payload/primitives/src/error.rs b/crates/payload/primitives/src/error.rs index 458dc4e308..b8b278b4db 100644 --- a/crates/payload/primitives/src/error.rs +++ b/crates/payload/primitives/src/error.rs @@ -1,7 +1,8 @@ //! Error types emitted by types or implementations of this crate. +use alloy_primitives::B256; use reth_errors::{ProviderError, RethError}; -use reth_primitives::{revm_primitives::EVMError, B256}; +use reth_primitives::revm_primitives::EVMError; use reth_transaction_pool::BlobStoreError; use tokio::sync::oneshot; diff --git a/crates/payload/primitives/src/payload.rs b/crates/payload/primitives/src/payload.rs index 3bd53861bc..cbaccac36c 100644 --- a/crates/payload/primitives/src/payload.rs +++ b/crates/payload/primitives/src/payload.rs @@ -1,5 +1,5 @@ use crate::{MessageValidationKind, PayloadAttributes}; -use reth_primitives::B256; +use alloy_primitives::B256; use reth_rpc_types::engine::ExecutionPayload; /// Either an [`ExecutionPayload`] or a types that implements the [`PayloadAttributes`] trait. diff --git a/crates/payload/primitives/src/traits.rs b/crates/payload/primitives/src/traits.rs index 5c231d1a6c..cce0fd97d3 100644 --- a/crates/payload/primitives/src/traits.rs +++ b/crates/payload/primitives/src/traits.rs @@ -1,9 +1,10 @@ use crate::{ validate_version_specific_fields, EngineApiMessageVersion, EngineObjectValidationError, }; +use alloy_primitives::{Address, B256, U256}; use reth_chain_state::ExecutedBlock; use reth_chainspec::ChainSpec; -use reth_primitives::{Address, SealedBlock, Withdrawals, B256, U256}; +use reth_primitives::{SealedBlock, Withdrawals}; use reth_rpc_types::{ engine::{PayloadAttributes as EthPayloadAttributes, PayloadId}, optimism::OptimismPayloadAttributes,