github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-27 08:08:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat(rpc): Replace manual IntoRpcTx implementation with FromConsensusTx using an additional generic (#16855)

Browse Source
This commit is contained in:
Roman Hodulák
2025-06-17 16:06:49 +02:00
committed by GitHub
parent 576cef4b13
commit bcb4fd3711
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/rpc/rpc-types-compat/src/transaction.rs
View File

@@ -22,7 +22,7 @@ use reth_evm::{
ConfigureEvm, TxEnvFor,
};
use reth_optimism_primitives::DepositReceipt;
use reth_primitives_traits::{NodePrimitives, SignedTransaction, TxTy};
use reth_primitives_traits::{NodePrimitives, TxTy};
use reth_storage_api::{errors::ProviderError, ReceiptProvider};
use revm_context::{BlockEnv, CfgEnv, TxEnv};
use serde::{Deserialize, Serialize};
@@ -123,10 +123,12 @@ pub trait FromConsensusTx<T> {
fn from_consensus_tx(tx: T, signer: Address, tx_info: Self::TxInfo) -> Self;
}
impl<T: alloy_consensus::Transaction> FromConsensusTx<T> for Transaction<T> {
impl<TxIn: alloy_consensus::Transaction, T: alloy_consensus::Transaction + From<TxIn>>
FromConsensusTx<TxIn> for Transaction<T>
{
type TxInfo = TransactionInfo;
fn from_consensus_tx(tx: T, signer: Address, tx_info: Self::TxInfo) -> Self {
fn from_consensus_tx(tx: TxIn, signer: Address, tx_info: Self::TxInfo) -> Self {
let TransactionInfo {
block_hash, block_number, index: transaction_index, base_fee, ..
} = tx_info;
@@ -137,7 +139,7 @@ impl<T: alloy_consensus::Transaction> FromConsensusTx<T> for Transaction<T> {
.unwrap_or_else(|| tx.max_fee_per_gas());
Self {
inner: Recovered::new_unchecked(tx, signer),
inner: Recovered::new_unchecked(tx, signer).convert(),
block_hash,
block_number,
transaction_index,
@@ -175,14 +177,6 @@ where
fn try_into_sim_tx(self) -> Result<T, ValueError<Self>>;
}
impl IntoRpcTx<Transaction> for EthereumTxEnvelope<TxEip4844> {
type TxInfo = TransactionInfo;
fn into_rpc_tx(self, signer: Address, tx_info: TransactionInfo) -> Transaction {
Transaction::from_transaction(self.with_signer(signer).convert(), tx_info)
}
}
/// Adds extra context to [`TransactionInfo`].
pub trait TxInfoMapper<T> {
/// An associated output type that carries [`TransactionInfo`] with some extra context.