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

chore: Replace reth-provider dependency for reth-eth-types with direct dependencies (#10175)

Browse Source
This commit is contained in:
Nikolai Golub
2024-08-07 20:05:19 +02:00
committed by GitHub
parent d191886c37
commit e199173dee
20 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/transaction-pool/Cargo.toml
View File

@ -13,12 +13,13 @@ workspace = true
[dependencies]
# reth
reth-chain-state.workspace = true
reth-chainspec.workspace = true
reth-eth-wire-types.workspace = true
reth-primitives = { workspace = true, features = ["c-kzg", "secp256k1"] }
reth-execution-types.workspace = true
reth-fs-util.workspace = true
reth-provider.workspace = true
reth-storage-api.workspace = true
reth-tasks.workspace = true
revm.workspace = true

2
crates/transaction-pool/src/blobstore/tracker.rs
View File

@ -1,7 +1,7 @@
//! Support for maintaining the blob pool.
use reth_execution_types::ChainBlocks;
use reth_primitives::{BlockNumber, B256};
use reth_provider::ChainBlocks;
use std::collections::BTreeMap;
/// The type that is used to track canonical blob transactions.

15
crates/transaction-pool/src/lib.rs
View File

@ -79,8 +79,8 @@
//! Listen for new transactions and print them:
//!
//! ```
//! use reth_chainspec::MAINNET;
//! use reth_provider::{BlockReaderIdExt, ChainSpecProvider, StateProviderFactory};
//! use reth_chainspec::{MAINNET, ChainSpecProvider};
//! use reth_storage_api::{BlockReaderIdExt, StateProviderFactory};
//! use reth_tasks::TokioTaskExecutor;
//! use reth_transaction_pool::{TransactionValidationTaskExecutor, Pool, TransactionPool};
//! use reth_transaction_pool::blobstore::InMemoryBlobStore;
@ -107,8 +107,9 @@
//!
//! ```
//! use futures_util::Stream;
//! use reth_chainspec::MAINNET;
//! use reth_provider::{BlockReaderIdExt, CanonStateNotification, ChainSpecProvider, StateProviderFactory};
//! use reth_chain_state::CanonStateNotification;
//! use reth_chainspec::{MAINNET, ChainSpecProvider};
//! use reth_storage_api::{BlockReaderIdExt, StateProviderFactory};
//! use reth_tasks::TokioTaskExecutor;
//! use reth_tasks::TaskSpawner;
//! use reth_tasks::TaskManager;
@ -153,7 +154,7 @@ use crate::{identifier::TransactionId, pool::PoolInner};
use aquamarine as _;
use reth_eth_wire_types::HandleMempoolData;
use reth_primitives::{Address, BlobTransactionSidecar, PooledTransactionsElement, TxHash, U256};
use reth_provider::StateProviderFactory;
use reth_storage_api::StateProviderFactory;
use std::{collections::HashSet, sync::Arc};
use tokio::sync::mpsc::Receiver;
use tracing::{instrument, trace};
@ -275,7 +276,7 @@ where
impl<Client, S> EthTransactionPool<Client, S>
where
Client: StateProviderFactory + reth_provider::BlockReaderIdExt + Clone + 'static,
Client: StateProviderFactory + reth_storage_api::BlockReaderIdExt + Clone + 'static,
S: BlobStore,
{
/// Returns a new [`Pool`] that uses the default [`TransactionValidationTaskExecutor`] when
@ -285,7 +286,7 @@ where
///
/// ```
/// use reth_chainspec::MAINNET;
/// use reth_provider::{BlockReaderIdExt, StateProviderFactory};
/// use reth_storage_api::{BlockReaderIdExt, StateProviderFactory};
/// use reth_tasks::TokioTaskExecutor;
/// use reth_transaction_pool::{
/// blobstore::InMemoryBlobStore, Pool, TransactionValidationTaskExecutor,

7
crates/transaction-pool/src/maintain.rs
View File

@ -11,16 +11,15 @@ use futures_util::{
future::{BoxFuture, Fuse, FusedFuture},
FutureExt, Stream, StreamExt,
};
use reth_chain_state::CanonStateNotification;
use reth_chainspec::ChainSpecProvider;
use reth_execution_types::ExecutionOutcome;
use reth_fs_util::FsPathError;
use reth_primitives::{
Address, BlockHash, BlockNumber, BlockNumberOrTag, IntoRecoveredTransaction,
PooledTransactionsElementEcRecovered, TransactionSigned,
};
use reth_provider::{
BlockReaderIdExt, CanonStateNotification, ChainSpecProvider, ProviderError,
StateProviderFactory,
};
use reth_storage_api::{errors::provider::ProviderError, BlockReaderIdExt, StateProviderFactory};
use reth_tasks::TaskSpawner;
use std::{
borrow::Borrow,

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

@ -15,7 +15,7 @@ use reth_primitives::{
EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID, EIP7702_TX_TYPE_ID,
LEGACY_TX_TYPE_ID,
};
use reth_provider::{AccountReader, BlockReaderIdExt, StateProviderFactory};
use reth_storage_api::{AccountReader, BlockReaderIdExt, StateProviderFactory};
use reth_tasks::TaskSpawner;
use revm::{
interpreter::gas::validate_initial_tx_gas,

2
crates/transaction-pool/src/validate/task.rs
View File

@ -9,7 +9,7 @@ use crate::{
use futures_util::{lock::Mutex, StreamExt};
use reth_chainspec::ChainSpec;
use reth_primitives::SealedBlock;
use reth_provider::BlockReaderIdExt;
use reth_storage_api::BlockReaderIdExt;
use reth_tasks::TaskSpawner;
use std::{future::Future, pin::Pin, sync::Arc};
use tokio::{