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

@ -1,5 +1,6 @@
//! Some payload tests
use alloy_eips::eip4895::Withdrawals;
use alloy_primitives::{Bytes, Sealable, U256};
use alloy_rlp::{Decodable, Error as RlpError};
use alloy_rpc_types_engine::{
@ -7,7 +8,7 @@ use alloy_rpc_types_engine::{
PayloadError,
};
use assert_matches::assert_matches;
use reth_primitives::{proofs, Block, SealedBlock, SealedHeader, TransactionSigned, Withdrawals};
use reth_primitives::{proofs, Block, SealedBlock, SealedHeader, TransactionSigned};
use reth_rpc_types_compat::engine::payload::{
block_to_payload, block_to_payload_v1, convert_to_payload_body_v1, try_into_sealed_block,
try_payload_v1_to_block,

View File

@ -1,14 +1,14 @@
//! Compatibility functions for rpc `Block` type.
use crate::{transaction::from_recovered_with_block_context, TransactionCompat};
use alloy_consensus::Sealed;
use alloy_eips::eip4895::Withdrawals;
use alloy_primitives::{B256, U256};
use alloy_rlp::Encodable;
use alloy_rpc_types_eth::{
Block, BlockError, BlockTransactions, BlockTransactionsKind, Header, TransactionInfo,
};
use reth_primitives::{Block as PrimitiveBlock, BlockWithSenders, Withdrawals};
use crate::{transaction::from_recovered_with_block_context, TransactionCompat};
use reth_primitives::{Block as PrimitiveBlock, BlockWithSenders};
/// Converts the given primitive block into a [`Block`] response with the given
/// [`BlockTransactionsKind`]

View File

@ -4,6 +4,7 @@
use alloy_consensus::{constants::MAXIMUM_EXTRA_DATA_SIZE, EMPTY_OMMER_ROOT_HASH};
use alloy_eips::{
eip2718::{Decodable2718, Encodable2718},
eip4895::Withdrawals,
eip7685::Requests,
};
use alloy_primitives::{B256, U256};
@ -14,7 +15,7 @@ use alloy_rpc_types_engine::{
};
use reth_primitives::{
proofs::{self},
Block, BlockBody, Header, SealedBlock, TransactionSigned, Withdrawals,
Block, BlockBody, Header, SealedBlock, TransactionSigned,
};
/// Converts [`ExecutionPayloadV1`] to [`Block`]