Skip to content

chore: only fetch deposit info for deposit tx #12474

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
Nov 12, 2024
Merged

chore: only fetch deposit info for deposit tx #12474

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
24 changes: 16 additions & 8 deletions crates/optimism/rpc/src/eth/transaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ where
) -> Result<Self::Transaction, Self::Error> {
let from = tx.signer();
let TransactionSigned { transaction, signature, hash } = tx.into_signed();
let mut deposit_receipt_version = None;

let inner = match transaction {
reth_primitives::Transaction::Legacy(tx) => {
Expand All @@ -100,16 +101,23 @@ where
reth_primitives::Transaction::Eip7702(tx) => {
Signed::new_unchecked(tx, signature, hash).into()
}
reth_primitives::Transaction::Deposit(tx) => OpTxEnvelope::Deposit(tx),
reth_primitives::Transaction::Deposit(tx) => {
let deposit_info = self
.inner
.provider()
.receipt_by_hash(hash)
.map_err(Self::Error::from_eth_err)?
.and_then(|receipt| receipt.deposit_receipt_version.zip(receipt.deposit_nonce));

if let Some((version, _)) = deposit_info {
deposit_receipt_version = Some(version);
// TODO: set nonce
}

OpTxEnvelope::Deposit(tx)
}
};

let deposit_receipt_version = self
.inner
.provider()
.receipt_by_hash(hash)
.map_err(Self::Error::from_eth_err)?
.and_then(|receipt| receipt.deposit_receipt_version);

let TransactionInfo {
block_hash, block_number, index: transaction_index, base_fee, ..
} = tx_info;
Expand Down