Skip to content

fix: Preload txn receipt from eth_api for historical deposit txns #28

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

fix: Preload txn receipt from eth_api for historical deposit txns #28

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2cc7752
preload txn receipt from eth_api for historical deposit txns
haardikk21 May 9, 2025
c93f3e8
error handle being unable to load txn receipt
haardikk21 May 13, 2025
4d65f29
propogate upstream RPC error to client separately
haardikk21 May 13, 2025
101aa6c
update cache to use structured keys
haardikk21 May 10, 2025
9b8a665
preload txn receipt from eth_api for historical deposit txns
haardikk21 May 9, 2025
35acca2
remove old comment
haardikk21 May 14, 2025
4bec491
clean up match statement
haardikk21 May 14, 2025
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
56 changes: 46 additions & 10 deletions crates/flashblocks-rpc/src/rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use jsonrpsee::{
proc_macros::rpc,
};
use op_alloy_consensus::OpTxEnvelope;
use op_alloy_consensus::{OpDepositReceipt, OpReceiptEnvelope};
use op_alloy_network::Optimism;
use op_alloy_rpc_types::Transaction;
use reth::providers::TransactionsProvider;
Expand All @@ -28,7 +29,7 @@ use reth_rpc_eth_api::{
RpcNodeCore,
};
use reth_rpc_eth_api::{RpcReceipt, RpcTransaction};
use tracing::{debug, info};
use tracing::{debug, error, info};

#[cfg_attr(not(test), rpc(server, namespace = "eth"))]
#[cfg_attr(test, rpc(server, client, namespace = "eth"))]
Expand Down Expand Up @@ -102,7 +103,7 @@ impl<E> EthApiExt<E> {
index: Some(idx as u64),
base_fee: block.base_fee_per_gas,
};
self.transform_tx(signed_tx_ec_recovered, tx_info)
self.transform_tx(signed_tx_ec_recovered, tx_info, None)
})
.collect();
RpcBlock::<Optimism> {
Expand All @@ -126,19 +127,26 @@ impl<E> EthApiExt<E> {
&self,
tx: Recovered<OpTransactionSigned>,
tx_info: TransactionInfo,
deposit_receipt: Option<OpDepositReceipt>,
) -> Transaction {
let tx = tx.convert::<OpTxEnvelope>();
let mut deposit_receipt_version = None;
let mut deposit_nonce = None;

if tx.is_deposit() {
let receipt = self
.cache
.get::<OpReceipt>(&CacheKey::Receipt(tx_info.hash.unwrap()))
.unwrap();
if let OpReceipt::Deposit(receipt) = receipt {
if let Some(receipt) = deposit_receipt {
deposit_receipt_version = receipt.deposit_receipt_version;
deposit_nonce = receipt.deposit_nonce;
} else {
let cached_receipt = self
.cache
.get::<OpReceipt>(&CacheKey::Receipt(tx_info.hash.unwrap()))
.unwrap();

if let OpReceipt::Deposit(receipt) = cached_receipt {
deposit_receipt_version = receipt.deposit_receipt_version;
deposit_nonce = receipt.deposit_nonce;
}
}
}

Expand Down Expand Up @@ -370,7 +378,7 @@ where
TransactionSource::Pool(tx) => {
// Convert the pool transaction
let tx_info = TransactionInfo::default();
Ok(Some(self.transform_tx(tx, tx_info)))
Ok(Some(self.transform_tx(tx, tx_info, None)))
}
TransactionSource::Block {
transaction,
Expand All @@ -387,7 +395,35 @@ where
block_number: Some(block_number),
base_fee,
};
Ok(Some(self.transform_tx(transaction, tx_info)))
// preload transaction receipt if it's a deposit transaction
if transaction.is_deposit() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did all this move to this method and pass in the receipt? Why not keep this logic in the transform_tx and prevent the addition of the receipt param? That way if the method is used anywhere else we won't have to replicate this logic. Otherwise looks good

Copy link
Contributor Author

@haardikk21 haardikk21 May 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pretty much to avoid marking a bunch of other functions async because rust has colored functions

let receipt = EthTransactions::transaction_receipt(&self.eth_api, tx_hash)
.await
.map_err(Into::into)?;

match receipt {
Some(txn_receipt) => {
let envelope: OpReceiptEnvelope = txn_receipt.into();

if let OpReceiptEnvelope::Deposit(deposit_receipt) = envelope {
return Ok(Some(self.transform_tx(
transaction,
tx_info,
Some(deposit_receipt.receipt),
)));
}
}
None => {
error!(
"could not find receipt for block transaction: {:?}",
tx_hash
);
return Ok(None);
}
}
}

Ok(Some(self.transform_tx(transaction, tx_info, None)))
}
}
} else {
Expand Down Expand Up @@ -420,7 +456,7 @@ where
base_fee: block.base_fee_per_gas,
};
let tx = Recovered::new_unchecked(tx, sender);
Ok(Some(self.transform_tx(tx, tx_info)))
Ok(Some(self.transform_tx(tx, tx_info, None)))
} else {
Ok(None)
}
Expand Down