jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rm re-exports of alloy eip 4844 constants (#12120)

Browse Source
This commit is contained in:
Thomas Coratger
2024-10-28 09:30:06 +01:00
committed by GitHub
parent 1c36b71612
commit 8605d04a09
16 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/transaction-pool/src/pool/txpool.rs
View File

@ -22,9 +22,11 @@ use alloy_consensus::constants::{
EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID, EIP7702_TX_TYPE_ID,
LEGACY_TX_TYPE_ID,
};
use alloy_eips::eip1559::{ETHEREUM_BLOCK_GAS_LIMIT, MIN_PROTOCOL_BASE_FEE};
use alloy_eips::{
eip1559::{ETHEREUM_BLOCK_GAS_LIMIT, MIN_PROTOCOL_BASE_FEE},
eip4844::BLOB_TX_MIN_BLOB_GASPRICE,
};
use alloy_primitives::{Address, TxHash, B256};
use reth_primitives::constants::eip4844::BLOB_TX_MIN_BLOB_GASPRICE;
use rustc_hash::FxHashMap;
use smallvec::SmallVec;
use std::{

8
crates/transaction-pool/src/test_utils/mock.rs
View File

@ -11,7 +11,7 @@ use alloy_consensus::{
constants::{EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID, LEGACY_TX_TYPE_ID},
TxEip1559, TxEip2930, TxEip4844, TxLegacy,
};
use alloy_eips::{eip1559::MIN_PROTOCOL_BASE_FEE, eip2930::AccessList};
use alloy_eips::{eip1559::MIN_PROTOCOL_BASE_FEE, eip2930::AccessList, eip4844::DATA_GAS_PER_BLOB};
use alloy_primitives::{Address, Bytes, ChainId, TxHash, TxKind, B256, U256};
use paste::paste;
use rand::{
@ -19,9 +19,9 @@ use rand::{
prelude::Distribution,
};
use reth_primitives::{
constants::eip4844::DATA_GAS_PER_BLOB, transaction::TryFromRecoveredTransactionError,
BlobTransactionSidecar, BlobTransactionValidationError, PooledTransactionsElementEcRecovered,
Signature, Transaction, TransactionSigned, TransactionSignedEcRecovered, TxType,
transaction::TryFromRecoveredTransactionError, BlobTransactionSidecar,
BlobTransactionValidationError, PooledTransactionsElementEcRecovered, Signature, Transaction,
TransactionSigned, TransactionSignedEcRecovered, TxType,
};
use std::{ops::Range, sync::Arc, time::Instant, vec::IntoIter};

3
crates/transaction-pool/src/traits.rs
View File

@ -1484,7 +1484,8 @@ impl<Tx: PoolTransaction> Stream for NewSubpoolTransactionStream<Tx> {
mod tests {
use super::*;
use alloy_consensus::{TxEip1559, TxEip2930, TxEip4844, TxEip7702, TxLegacy};
use reth_primitives::{constants::eip4844::DATA_GAS_PER_BLOB, Signature, TransactionSigned};
use alloy_eips::eip4844::DATA_GAS_PER_BLOB;
use reth_primitives::{Signature, TransactionSigned};
#[test]
fn test_pool_size_invariants() {

5
crates/transaction-pool/src/validate/eth.rs
View File

@ -15,10 +15,9 @@ use alloy_consensus::constants::{
EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID, EIP7702_TX_TYPE_ID,
LEGACY_TX_TYPE_ID,
};
use alloy_eips::eip4844::MAX_BLOBS_PER_BLOCK;
use reth_chainspec::{ChainSpec, EthereumHardforks};
use reth_primitives::{
constants::eip4844::MAX_BLOBS_PER_BLOCK, GotExpected, InvalidTransactionError, SealedBlock,
};
use reth_primitives::{GotExpected, InvalidTransactionError, SealedBlock};
use reth_storage_api::{AccountReader, StateProviderFactory};
use reth_tasks::TaskSpawner;
use revm::{