feat(rpc): propagate TransactionOrigin through send_transaction and batcher#21969
Merged
feat(rpc): propagate TransactionOrigin through send_transaction and batcher#21969
Conversation
…atcher - Add `origin` field to `BatchTxRequest` so the batcher respects the caller-specified origin instead of hardcoding `TransactionOrigin::Local` - Add `origin` parameter to `EthTransactions::send_transaction` trait method - Update `EthApiInner::add_pool_transaction` to accept and forward origin - `BatchTxProcessor::process_batch` groups requests by origin before batch insertion via `add_transactions` - Derive `PartialOrd, Ord` on `TransactionOrigin` for `BTreeMap` grouping - Existing callers (`send_raw_transaction`, `send_transaction_request`) continue to use `TransactionOrigin::Local` Co-authored-by: klkvr <klkvr@users.noreply.github.com> Amp-Thread-ID: https://ampcode.com/threads/T-019c3f5c-0c1c-703a-9da7-c46be75e7acf Co-authored-by: Amp <amp@ampcode.com>
Contributor
|
e0ce4f1 to
e1e6e3f
Compare
…atcher - Add `origin` field to `BatchTxRequest` - Add `TransactionOrigin` parameter to `EthTransactions::send_transaction` - Add `TransactionPool::add_transactions_with_origins` accepting per-tx origins via `Vec<(TransactionOrigin, Transaction)>` - Make `TransactionPool::add_transactions` a default method delegating to `add_transactions_with_origins` - Inner `Pool::add_transactions` delegates to `Pool::add_transactions_with_origins` - `BatchTxProcessor::process_batch` uses `add_transactions_with_origins` directly - Existing callers (`send_raw_transaction`, `send_transaction_request`) continue to use `TransactionOrigin::Local` Co-authored-by: klkvr <klkvr@users.noreply.github.com> Co-authored-by: Amp <amp@ampcode.com> Amp-Thread-ID: https://ampcode.com/threads/T-019c3f5c-0c1c-703a-9da7-c46be75e7acf
e1e6e3f to
44e9a2e
Compare
klkvr
reviewed
Feb 9, 2026
mattsse
approved these changes
Feb 9, 2026
klkvr
reviewed
Feb 9, 2026
- task.rs: collect mapped iterator into Vec before passing to validate_transactions, fixing Send bound error - transaction.rs: change send_raw_transaction to use TransactionOrigin::External instead of Local Amp-Thread-ID: https://ampcode.com/threads/T-019c4401-f497-7668-a25e-64c6fe49d873 Co-authored-by: Amp <amp@ampcode.com>
Member
Author
|
The PR is in the merge queue so I can't push arsenii's suggestion directly. The current fix (Vec collect) works but is suboptimal. A follow-up can replace it by adding |
CarlBeek
added a commit
to CarlBeek/reth
that referenced
this pull request
Feb 10, 2026
* paradigmxyz/main: (144 commits) feat(engine): add getPayloadBodiesV2 endpoints for EIP-7928 BAL support (paradigmxyz#21774) ci: skip scheduled workflows on forks (paradigmxyz#22022) chore: rm random log file (paradigmxyz#22023) chore: remove base.reth.rs public endpoint references (paradigmxyz#22019) feat(rpc): add `subscribeFinalizedChainNotifications` endpoint (paradigmxyz#22011) feat(trie): remove `SerialSparseTrie` (paradigmxyz#21808) fix(rocksdb): set max_open_files to prevent fd exhaustion (paradigmxyz#22005) refactor(txpool): rename and document validation methods (paradigmxyz#22008) feat(engine): prefetch withdrawal addresses in pre-warming (paradigmxyz#21966) refactor(pool): add IntoIter: Send bounds to avoid unnecessary Vec collect (paradigmxyz#22001) fix(rpc): enforce blockHash constraint in append_matching_block_logs (paradigmxyz#22007) chore: move Kurtosis failures to the hive slack channel (paradigmxyz#21983) feat(rpc): propagate TransactionOrigin through send_transaction and batcher (paradigmxyz#21969) feat(engine): reorg depth commitment metric (paradigmxyz#21992) feat(storage): add use_hashed_state storage setting (paradigmxyz#21997) perf: better scheduling for storage roots computation (paradigmxyz#21987) chore(deps): bump alloy 1.6.2 -> 1.6.3 (paradigmxyz#21986) fix(stages): skip sender unwind when fully pruned (paradigmxyz#21988) chore(net): remove OP stack bootnodes (paradigmxyz#21984) ci: use depot for hive and kurtosis image builds, run daily (paradigmxyz#21976) ... # Conflicts: # .github/workflows/compact.yml # .github/workflows/dependencies.yml # .github/workflows/docker-tag-latest.yml # .github/workflows/docker.yml # .github/workflows/e2e.yml # .github/workflows/hive.yml # .github/workflows/integration.yml # .github/workflows/kurtosis.yml # .github/workflows/lint.yml # .github/workflows/release.yml # .github/workflows/reproducible-build.yml # .github/workflows/stale.yml # .github/workflows/sync-era.yml # .github/workflows/sync.yml # .github/workflows/unit.yml # bin/reth/Cargo.toml # crates/cli/commands/src/node.rs # crates/node/core/src/node_config.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds
TransactionOriginas a parameter toEthTransactions::send_transactionand propagates it all the way down to theBatchTxProcessor, which previously hardcodedTransactionOrigin::Local.This allows downstream implementations (e.g. custom
eth_sendRawTransactionPrivateendpoints) to submit transactions withTransactionOrigin::Privatethrough the same batcher pipeline.Changes
BatchTxRequest: addorigin: TransactionOriginfieldBatchTxProcessor::process_batch: group requests by origin before callingadd_transactionsEthApiInner::add_pool_transaction: acceptoriginparameterEthTransactions::send_transaction: acceptoriginparameterEthApi::send_transactionimpl: forwardorigintoadd_pool_transactionPartialOrd, OrdonTransactionOriginfor groupingsend_raw_transaction,send_transaction_request) continue to useLocalTesting
cargo test -p reth-transaction-pool --lib batcher— 4/4 passcargo clippy -p reth-rpc -p reth-rpc-eth-api -p reth-transaction-pool— clean