diff --git a/crates/rpc/rpc-types-compat/src/transaction.rs b/crates/rpc/rpc-types-compat/src/transaction.rs index d1274494a..e50249f42 100644 --- a/crates/rpc/rpc-types-compat/src/transaction.rs +++ b/crates/rpc/rpc-types-compat/src/transaction.rs @@ -50,11 +50,3 @@ pub trait TransactionCompat: // . fn otterscan_api_truncate_input(tx: &mut Self::Transaction); } - -/// Convert [`Recovered`] to [`TransactionRequest`] -pub fn transaction_to_call_request( - tx: Recovered, -) -> TransactionRequest { - let from = tx.signer(); - TransactionRequest::from_transaction_with_sender(tx.into_tx(), from) -} diff --git a/examples/custom-inspector/src/main.rs b/examples/custom-inspector/src/main.rs index 4e0913376..9afaf17ea 100644 --- a/examples/custom-inspector/src/main.rs +++ b/examples/custom-inspector/src/main.rs @@ -12,7 +12,7 @@ use alloy_eips::BlockNumberOrTag; use alloy_primitives::Address; -use alloy_rpc_types_eth::state::EvmOverrides; +use alloy_rpc_types_eth::{state::EvmOverrides, TransactionRequest}; use clap::Parser; use futures_util::StreamExt; use reth::{ @@ -25,7 +25,7 @@ use reth::{ primitives::{Env, EnvWithHandlerCfg}, Database, Evm, EvmContext, Inspector, }, - rpc::{api::eth::helpers::Call, compat::transaction::transaction_to_call_request}, + rpc::api::eth::helpers::Call, transaction_pool::TransactionPool, }; use reth_evm::EvmEnv; @@ -57,7 +57,8 @@ fn main() { if let Some(recipient) = tx.to() { if args.is_match(&recipient) { // convert the pool transaction - let call_request = transaction_to_call_request(tx.to_consensus()); + let call_request = + TransactionRequest::from_recovered_transaction(tx.to_consensus()); let result = eth_api .spawn_with_call_at( diff --git a/examples/txpool-tracing/src/main.rs b/examples/txpool-tracing/src/main.rs index 76abd65f4..5937ed2d7 100644 --- a/examples/txpool-tracing/src/main.rs +++ b/examples/txpool-tracing/src/main.rs @@ -16,7 +16,7 @@ use clap::Parser; use futures_util::StreamExt; use reth::{ builder::NodeHandle, chainspec::EthereumChainSpecParser, cli::Cli, - rpc::compat::transaction::transaction_to_call_request, transaction_pool::TransactionPool, + rpc::types::TransactionRequest, transaction_pool::TransactionPool, }; use reth_node_ethereum::node::EthereumNode; @@ -44,7 +44,8 @@ fn main() { if let Some(recipient) = tx.to() { if args.is_match(&recipient) { // trace the transaction with `trace_call` - let callrequest = transaction_to_call_request(tx.to_consensus()); + let callrequest = + TransactionRequest::from_recovered_transaction(tx.to_consensus()); let tracerequest = TraceCallRequest::new(callrequest) .with_trace_type(TraceType::Trace); if let Ok(trace_result) = traceapi.trace_call(tracerequest).await {