Skip to content
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

Jump to bottom

fix: add blob_gas_used after succesful tx execution #4913

Merged
merged 3 commits into from
Oct 5, 2023
Merged

fix: add blob_gas_used after succesful tx execution #4913

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
299e39c
fix: add blob_gas_used after succesful tx execution
Rjected Oct 5, 2023
870b0d7
fix comment
Rjected Oct 5, 2023
7578c76
also update pending block
mattsse Oct 5, 2023
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
20 changes: 12 additions & 8 deletions crates/payload/basic/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,14 +705,6 @@ where
// the gas limit condition for regular transactions above.
best_txs.mark_invalid(&pool_tx);
continue
} else {
// add to the data gas if we're going to execute the transaction
sum_blob_gas_used += tx_blob_gas;

// if we've reached the max data gas per block, we can skip blob txs entirely
if sum_blob_gas_used == MAX_DATA_GAS_PER_BLOCK {
best_txs.skip_blobs();
}
}
}

Expand Down Expand Up @@ -740,6 +732,7 @@ where
trace!(?err, ?tx, "skipping invalid transaction and its descendants");
best_txs.mark_invalid(&pool_tx);
}

continue
}
err => {
Expand All @@ -754,6 +747,17 @@ where
// commit changes
db.commit(state);

// add to the total blob gas used if the transaction successfully executed
if let Some(blob_tx) = tx.transaction.as_eip4844() {
let tx_blob_gas = blob_tx.blob_gas();
sum_blob_gas_used += tx_blob_gas;

// if we've reached the max data gas per block, we can skip blob txs entirely
if sum_blob_gas_used == MAX_DATA_GAS_PER_BLOCK {
best_txs.skip_blobs();
}
}

// add gas used by the transaction to cumulative gas used, before creating the receipt
cumulative_gas_used += gas_used;

Expand Down
Loading