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

chore: simplify some features for env (#5928)

Browse Source
This commit is contained in:
yjh
2024-01-03 21:12:24 +08:00
committed by GitHub
parent d5975a3291
commit 22ba0adae0
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
crates/primitives/src/revm/env.rs
View File

@ -246,9 +246,6 @@ pub fn fill_tx_env<T>(
tx_env.access_list.clear();
tx_env.blob_hashes.clear();
tx_env.max_fee_per_blob_gas.take();
#[cfg(feature = "optimism")]
fill_op_tx_env(tx_env, transaction, envelope);
}
Transaction::Eip2930(tx) => {
tx_env.gas_limit = tx.gas_limit;
@ -272,9 +269,6 @@ pub fn fill_tx_env<T>(
.collect();
tx_env.blob_hashes.clear();
tx_env.max_fee_per_blob_gas.take();
#[cfg(feature = "optimism")]
fill_op_tx_env(tx_env, transaction, envelope);
}
Transaction::Eip1559(tx) => {
tx_env.gas_limit = tx.gas_limit;
@ -298,9 +292,6 @@ pub fn fill_tx_env<T>(
.collect();
tx_env.blob_hashes.clear();
tx_env.max_fee_per_blob_gas.take();
#[cfg(feature = "optimism")]
fill_op_tx_env(tx_env, transaction, envelope);
}
Transaction::Eip4844(tx) => {
tx_env.gas_limit = tx.gas_limit;
@ -324,9 +315,6 @@ pub fn fill_tx_env<T>(
.collect();
tx_env.blob_hashes = tx.blob_versioned_hashes.clone();
tx_env.max_fee_per_blob_gas = Some(U256::from(tx.max_fee_per_blob_gas));
#[cfg(feature = "optimism")]
fill_op_tx_env(tx_env, transaction, envelope);
}
#[cfg(feature = "optimism")]
Transaction::Deposit(tx) => {
@ -342,10 +330,11 @@ pub fn fill_tx_env<T>(
tx_env.data = tx.input.clone();
tx_env.chain_id = None;
tx_env.nonce = None;
fill_op_tx_env(tx_env, transaction, envelope);
}
}
#[cfg(feature = "optimism")]
fill_op_tx_env(tx_env, transaction, envelope);
}
#[cfg(feature = "optimism")]

2
crates/revm/src/processor.rs
View File

@ -462,8 +462,6 @@ impl<'a> BlockExecutor for EVMProcessor<'a> {
cumulative_gas_used,
// convert to reth log
logs: result.into_logs().into_iter().map(into_reth_log).collect(),
#[cfg(feature = "optimism")]
deposit_nonce: None,
});
}