Skip to content

fix(op-revm): return error when enveloped_tx is missing #3143

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
rakita merged 3 commits into from
Nov 13, 2025
Merged

fix(op-revm): return error when enveloped_tx is missing #3143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cae8502
fix(op-revm): return error when enveloped_tx is missing
Keemosty12 Nov 13, 2025
1917b2b
fmt
Keemosty12 Nov 13, 2025
319fc71
Remove unnecessary clone
Keemosty12 Nov 13, 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
6 changes: 5 additions & 1 deletion crates/op-revm/src/handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,11 @@ where
let mut balance = caller_account.info.balance;

if !cfg.is_fee_charge_disabled() {
let additional_cost = chain.tx_cost_with_tx(tx, spec);
let Some(additional_cost) = chain.tx_cost_with_tx(tx, spec) else {
return Err(ERROR::from_string(
"[OPTIMISM] Failed to load enveloped transaction.".into(),
));
};
let Some(new_balance) = balance.checked_sub(additional_cost) else {
return Err(InvalidTransaction::LackOfFundForMaxFee {
fee: Box::new(additional_cost),
Expand Down
10 changes: 3 additions & 7 deletions crates/op-revm/src/l1block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,15 +264,11 @@ impl L1BlockInfo {
/// Calculate additional transaction cost with OpTxTr.
///
/// Internally calls [`L1BlockInfo::tx_cost`].
#[track_caller]
pub fn tx_cost_with_tx(&mut self, tx: impl OpTxTr, spec: OpSpecId) -> U256 {
pub fn tx_cost_with_tx(&mut self, tx: impl OpTxTr, spec: OpSpecId) -> Option<U256> {
// account for additional cost of l1 fee and operator fee
let enveloped_tx = tx
.enveloped_tx()
.expect("all not deposit tx have enveloped tx")
.clone();
let enveloped_tx = tx.enveloped_tx()?;
let gas_limit = U256::from(tx.gas_limit());
self.tx_cost(&enveloped_tx, gas_limit, spec)
Some(self.tx_cost(enveloped_tx, gas_limit, spec))
}

/// Calculate additional transaction cost.
Expand Down
Loading