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: skip invalid transactions (#2436)

Browse Source
This commit is contained in:
Matthias Seitz
2023-04-27 22:47:34 +02:00
committed by GitHub
parent d604bd4941
commit 7b928f31b5
1 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ use reth_tasks::TaskSpawner;
use reth_transaction_pool::TransactionPool;
use revm::{
db::{CacheDB, DatabaseRef},
primitives::{BlockEnv, CfgEnv, Env, ResultAndState},
primitives::{BlockEnv, CfgEnv, EVMError, Env, InvalidTransaction, ResultAndState},
};
use std::{
future::Future,
@ -478,13 +478,13 @@ fn build_payload<Pool, Client>(
let block_number = initialized_block_env.number.to::<u64>();
while let Some(tx) = best_txs.next() {
while let Some(pool_tx) = best_txs.next() {
// ensure we still have capacity for this transaction
if cumulative_gas_used + tx.gas_limit() > block_gas_limit {
if cumulative_gas_used + pool_tx.gas_limit() > block_gas_limit {
// we can't fit this transaction into the block, so we need to mark it as invalid
// which also removes all dependent transaction from the iterator before we can
// continue
best_txs.mark_invalid(&tx);
best_txs.mark_invalid(&pool_tx);
continue
}
@ -494,7 +494,7 @@ fn build_payload<Pool, Client>(
}
// convert tx to a signed transaction
let tx = tx.to_recovered_transaction();
let tx = pool_tx.to_recovered_transaction();
// Configure the environment for the block.
let env = Env {
@ -506,9 +506,36 @@ fn build_payload<Pool, Client>(
let mut evm = revm::EVM::with_env(env);
evm.database(&mut db);
// TODO skip invalid transactions
let ResultAndState { result, state } =
evm.transact().map_err(PayloadBuilderError::EvmExecutionError)?;
let ResultAndState { result, state } = match evm.transact() {
Ok(res) => res,
Err(err) => {
match err {
EVMError::Transaction(err) => {
if matches!(err, InvalidTransaction::NonceTooLow { .. }) {
// if the nonce is too low, we can skip this transaction
trace!(?err, ?tx, "skipping nonce too low transaction");
} else {
// if the transaction is invalid, we can skip it and all of its
// descendants
trace!(
?err,
?tx,
"skipping invalid transaction and its descendants"
);
best_txs.mark_invalid(&pool_tx);
}
continue
}
err => {
// this is an error that we should treat as fatal for this attempt
return Err(PayloadBuilderError::EvmExecutionError(err))
}
}
}
};
// let ResultAndState { result, state } =
evm.transact().map_err(PayloadBuilderError::EvmExecutionError)?;
let gas_used = result.gas_used();
// commit changes