primitives: rm alloy Withdrawals reexport (#12421)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
Thomas Coratger
2024-11-09 14:09:46 +01:00
committed by GitHub
parent ae257f5685
commit 59ebebaa63
32 changed files with 104 additions and 71 deletions

View File

@ -10,7 +10,7 @@
use crate::metrics::PayloadBuilderMetrics;
use alloy_consensus::constants::EMPTY_WITHDRAWALS;
use alloy_eips::merge::SLOT_DURATION;
use alloy_eips::{eip4895::Withdrawals, merge::SLOT_DURATION};
use alloy_primitives::{Bytes, B256, U256};
use futures_core::ready;
use futures_util::FutureExt;
@ -20,7 +20,7 @@ use reth_payload_builder::{KeepPayloadJobAlive, PayloadId, PayloadJob, PayloadJo
use reth_payload_primitives::{
BuiltPayload, PayloadBuilderAttributes, PayloadBuilderError, PayloadKind,
};
use reth_primitives::{constants::RETH_CLIENT_VERSION, proofs, SealedHeader, Withdrawals};
use reth_primitives::{constants::RETH_CLIENT_VERSION, proofs, SealedHeader};
use reth_provider::{BlockReaderIdExt, CanonStateNotification, StateProviderFactory};
use reth_revm::cached::CachedReads;
use reth_tasks::TaskSpawner;

View File

@ -3,10 +3,11 @@ use crate::{
PayloadConfig,
};
use alloy_eips::eip4895::Withdrawals;
use alloy_primitives::{Address, B256, U256};
use reth_payload_builder::PayloadId;
use reth_payload_primitives::BuiltPayload;
use reth_primitives::{SealedBlock, Withdrawals};
use reth_primitives::SealedBlock;
use alloy_eips::eip7685::Requests;
use std::{error::Error, fmt};

View File

@ -1,9 +1,12 @@
use crate::{PayloadBuilderError, PayloadEvents, PayloadKind, PayloadTypes};
use alloy_eips::{eip4895::Withdrawal, eip7685::Requests};
use alloy_eips::{
eip4895::{Withdrawal, Withdrawals},
eip7685::Requests,
};
use alloy_primitives::{Address, B256, U256};
use alloy_rpc_types_engine::{PayloadAttributes as EthPayloadAttributes, PayloadId};
use reth_chain_state::ExecutedBlock;
use reth_primitives::{SealedBlock, Withdrawals};
use reth_primitives::SealedBlock;
use tokio::sync::oneshot;
/// A type that can request, subscribe to and resolve payloads.