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

perf(default_ethereum_payload): reuse Evm between txs (#12365)

Browse Source
This commit is contained in:
Hai | RISE
2024-11-07 17:52:25 +07:00
committed by GitHub
parent 037dffeb15
commit 6d05788de2
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
crates/ethereum/payload/src/lib.rs
View File

@ -41,7 +41,7 @@ use revm::{
primitives::{EVMError, EnvWithHandlerCfg, InvalidTransaction, ResultAndState},
DatabaseCommit,
};
use revm_primitives::calc_excess_blob_gas;
use revm_primitives::{calc_excess_blob_gas, TxEnv};
use std::sync::Arc;
use tracing::{debug, trace, warn};
@ -212,6 +212,13 @@ where
PayloadBuilderError::Internal(err.into())
})?;
let env = EnvWithHandlerCfg::new_with_cfg_env(
initialized_cfg.clone(),
initialized_block_env.clone(),
TxEnv::default(),
);
let mut evm = evm_config.evm_with_env(&mut db, env);
let mut receipts = Vec::new();
while let Some(pool_tx) = best_txs.next() {
// ensure we still have capacity for this transaction
@ -246,14 +253,8 @@ where
}
}
let env = EnvWithHandlerCfg::new_with_cfg_env(
initialized_cfg.clone(),
initialized_block_env.clone(),
evm_config.tx_env(tx.as_signed(), tx.signer()),
);
// Configure the environment for the block.
let mut evm = evm_config.evm_with_env(&mut db, env);
// Configure the environment for the tx.
*evm.tx_mut() = evm_config.tx_env(tx.as_signed(), tx.signer());
let ResultAndState { result, state } = match evm.transact() {
Ok(res) => res,
@ -279,10 +280,9 @@ where
}
}
};
// drop evm so db is released.
drop(evm);
// commit changes
db.commit(state);
evm.db_mut().commit(state);
// add to the total blob gas used if the transaction successfully executed
if let Some(blob_tx) = tx.transaction.as_eip4844() {
@ -321,6 +321,9 @@ where
executed_txs.push(tx.into_signed());
}
// Release db
drop(evm);
// check if we have a better block
if !is_better_payload(best_payload.as_ref(), total_fees) {
// can skip building the block