jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(payload): sum cumulative gas used before adding receipt (#2284)

Browse Source
This commit is contained in:
Matthias Seitz
2023-04-17 16:31:52 +02:00
committed by GitHub
parent e5d4767c8e
commit 0559d8c2d5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/payload/basic/src/lib.rs
View File

@ -477,10 +477,14 @@ fn build_payload<Pool, Client>(
// TODO skip invalid transactions // TODO skip invalid transactions
let ResultAndState { result, state } = let ResultAndState { result, state } =
evm.transact().map_err(PayloadBuilderError::EvmExecutionError)?; evm.transact().map_err(PayloadBuilderError::EvmExecutionError)?;
let gas_used = result.gas_used();
// commit changes // commit changes
commit_state_changes(&mut db, &mut post_state, state, true); commit_state_changes(&mut db, &mut post_state, state, true);
// add gas used by the transaction to cumulative gas used, before creating the receipt
cumulative_gas_used += gas_used;
// Push transaction changeset and calculate header bloom filter for receipt. // Push transaction changeset and calculate header bloom filter for receipt.
post_state.add_receipt(Receipt { post_state.add_receipt(Receipt {
tx_type: tx.tx_type(), tx_type: tx.tx_type(),
@ -489,17 +493,12 @@ fn build_payload<Pool, Client>(
logs: result.logs().into_iter().map(into_reth_log).collect(), logs: result.logs().into_iter().map(into_reth_log).collect(),
}); });
let gas_used = result.gas_used();
// update add to total fees // update add to total fees
let miner_fee = tx let miner_fee = tx
.effective_tip_per_gas(base_fee) .effective_tip_per_gas(base_fee)
.expect("fee is always valid; execution succeeded"); .expect("fee is always valid; execution succeeded");
total_fees += U256::from(miner_fee) * U256::from(gas_used); total_fees += U256::from(miner_fee) * U256::from(gas_used);
// append gas used
cumulative_gas_used += gas_used;
// append transaction to the list of executed transactions // append transaction to the list of executed transactions
executed_txs.push(tx.into_signed()); executed_txs.push(tx.into_signed());
} }