github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-04-30 03:01:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: rename reth_primitives::RecoveredTx functions to match alloy::Recovered (#13663)

Browse Source
This commit is contained in:
Tuan Tran
2025-01-06 21:27:43 +07:00
committed by GitHub
parent d10af50e45
commit 20d3fa6bbb
27 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/optimism/node/src/txpool.rs
View File

@@ -58,7 +58,7 @@ impl TryFrom<RecoveredTx<OpTransactionSigned>> for OpPooledTransaction {
type Error = TransactionConversionError;
fn try_from(value: RecoveredTx<OpTransactionSigned>) -> Result<Self, Self::Error> {
let (tx, signer) = value.to_components();
let (tx, signer) = value.into_parts();
let pooled: RecoveredTx<op_alloy_consensus::OpPooledTransaction> =
RecoveredTx::from_signed_transaction(tx.try_into()?, signer);
Ok(pooled.into())
@@ -83,7 +83,7 @@ impl PoolTransaction for OpPooledTransaction {
fn try_consensus_into_pooled(
tx: RecoveredTx<Self::Consensus>,
) -> Result<RecoveredTx<Self::Pooled>, Self::TryFromConsensusError> {
let (tx, signer) = tx.to_components();
let (tx, signer) = tx.into_parts();
Ok(RecoveredTx::from_signed_transaction(tx.try_into()?, signer))
}

8
crates/optimism/payload/src/builder.rs
View File

@@ -790,7 +790,7 @@ where
))
})?;
*evm.tx_mut() = self.evm_config.tx_env(sequencer_tx.as_signed(), sequencer_tx.signer());
*evm.tx_mut() = self.evm_config.tx_env(sequencer_tx.tx(), sequencer_tx.signer());
let ResultAndState { result, state } = match evm.transact() {
Ok(res) => res,
@@ -841,7 +841,7 @@ where
// append sender and transaction to the respective lists
info.executed_senders.push(sequencer_tx.signer());
info.executed_transactions.push(sequencer_tx.into_signed());
info.executed_transactions.push(sequencer_tx.into_tx());
}
Ok(info)
@@ -891,7 +891,7 @@ where
}
// Configure the environment for the tx.
*evm.tx_mut() = self.evm_config.tx_env(tx.as_signed(), tx.signer());
*evm.tx_mut() = self.evm_config.tx_env(tx.tx(), tx.signer());
let ResultAndState { result, state } = match evm.transact() {
Ok(res) => res,
@@ -954,7 +954,7 @@ where
// append sender and transaction to the respective lists
info.executed_senders.push(tx.signer());
info.executed_transactions.push(tx.into_signed());
info.executed_transactions.push(tx.into_tx());
}
Ok(None)

2
crates/optimism/rpc/src/eth/transaction.rs
View File

@@ -89,7 +89,7 @@ where
) -> Result<Self::Transaction, Self::Error> {
let from = tx.signer();
let hash = *tx.tx_hash();
let OpTransactionSigned { transaction, signature, .. } = tx.into_signed();
let OpTransactionSigned { transaction, signature, .. } = tx.into_tx();
let mut deposit_receipt_version = None;
let mut deposit_nonce = None;