Skip to content

refactor: merge EthTransactionValidator and EthTransactionValidatorInner #18129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattsse merged 1 commit into from
Aug 28, 2025
Merged

refactor: merge EthTransactionValidator and EthTransactionValidatorInner #18129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/node/builder/src/components/pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ impl<'a, Node: FullNodeTypes, V> TxPoolBuilder<'a, Node, V> {

impl<'a, Node: FullNodeTypes, V> TxPoolBuilder<'a, Node, TransactionValidationTaskExecutor<V>>
where
V: TransactionValidator + Clone + 'static,
V: TransactionValidator + 'static,
V::Transaction:
PoolTransaction<Consensus = TxTy<Node::Types>> + reth_transaction_pool::EthPoolTransaction,
{
Expand Down
4 changes: 2 additions & 2 deletions crates/optimism/txpool/src/validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ impl OpL1BlockInfo {
#[derive(Debug, Clone)]
pub struct OpTransactionValidator<Client, Tx> {
/// The type that performs the actual validation.
inner: EthTransactionValidator<Client, Tx>,
inner: Arc<EthTransactionValidator<Client, Tx>>,
/// Additional block info required for validation.
block_info: Arc<OpL1BlockInfo>,
/// If true, ensure that the transaction's sender has enough balance to cover the L1 gas fee
Expand Down Expand Up @@ -118,7 +118,7 @@ where
block_info: OpL1BlockInfo,
) -> Self {
Self {
inner,
inner: Arc::new(inner),
block_info: Arc::new(block_info),
require_l1_data_gas_fee: true,
supervisor_client: None,
Expand Down
2 changes: 1 addition & 1 deletion crates/transaction-pool/src/maintain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ mod tests {
let validator = EthTransactionValidatorBuilder::new(provider).build(blob_store.clone());

let txpool = Pool::new(
validator.clone(),
validator,
CoinbaseTipOrdering::default(),
blob_store.clone(),
Default::default(),
Expand Down
Loading