Skip to content

feat: load account should return db error #1447

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 2 commits into from
May 24, 2024
Merged

feat: load account should return db error #1447

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d47076
feat: load account should return db error
yjhmelody May 21, 2024
1f1ee3c
simplify
yjhmelody May 23, 2024
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
18 changes: 4 additions & 14 deletions crates/revm/src/optimism/handler_register.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,30 +240,20 @@ pub fn reward_beneficiary<SPEC: Spec, EXT, DB: Database>(
let l1_cost = l1_block_info.calculate_tx_l1_cost(enveloped_tx, SPEC::SPEC_ID);

// Send the L1 cost of the transaction to the L1 Fee Vault.
let Ok((l1_fee_vault_account, _)) = context
let (l1_fee_vault_account, _) = context
.evm
.inner
.journaled_state
.load_account(optimism::L1_FEE_RECIPIENT, &mut context.evm.inner.db)
else {
return Err(EVMError::Custom(
"[OPTIMISM] Failed to load L1 Fee Vault account.".to_string(),
));
};
.load_account(optimism::L1_FEE_RECIPIENT, &mut context.evm.inner.db)?;
l1_fee_vault_account.mark_touch();
l1_fee_vault_account.info.balance += l1_cost;

// Send the base fee of the transaction to the Base Fee Vault.
let Ok((base_fee_vault_account, _)) = context
let (base_fee_vault_account, _) = context
.evm
.inner
.journaled_state
.load_account(optimism::BASE_FEE_RECIPIENT, &mut context.evm.inner.db)
else {
return Err(EVMError::Custom(
"[OPTIMISM] Failed to load Base Fee Vault account.".to_string(),
));
};
.load_account(optimism::BASE_FEE_RECIPIENT, &mut context.evm.inner.db)?;
base_fee_vault_account.mark_touch();
base_fee_vault_account.info.balance += context
.evm
Expand Down