mirror of
https://github.com/hl-archive-node/nanoreth.git
synced 2025-12-06 10:59:55 +00:00
qol: purge goerli (#9310)
This commit is contained in:
@ -15,9 +15,7 @@ extern crate alloc;
|
||||
use core::ops::Deref;
|
||||
|
||||
use reth_chainspec::ChainSpec;
|
||||
use reth_primitives::{
|
||||
header::block_coinbase, Address, Header, TransactionSigned, TransactionSignedEcRecovered, U256,
|
||||
};
|
||||
use reth_primitives::{Address, Header, TransactionSigned, TransactionSignedEcRecovered, U256};
|
||||
use revm::{inspector_handle_register, Database, Evm, EvmBuilder, GetInspector};
|
||||
use revm_primitives::{
|
||||
BlockEnv, Bytes, CfgEnvWithHandlerCfg, Env, EnvWithHandlerCfg, SpecId, TxEnv,
|
||||
@ -139,27 +137,9 @@ pub trait ConfigureEvmEnv: Send + Sync + Unpin + Clone + 'static {
|
||||
);
|
||||
|
||||
/// Fill [`BlockEnv`] field according to the chain spec and given header
|
||||
fn fill_block_env(
|
||||
&self,
|
||||
block_env: &mut BlockEnv,
|
||||
chain_spec: &ChainSpec,
|
||||
header: &Header,
|
||||
after_merge: bool,
|
||||
) {
|
||||
let coinbase = block_coinbase(chain_spec, header, after_merge);
|
||||
self.fill_block_env_with_coinbase(block_env, header, after_merge, coinbase);
|
||||
}
|
||||
|
||||
/// Fill block environment with coinbase.
|
||||
fn fill_block_env_with_coinbase(
|
||||
&self,
|
||||
block_env: &mut BlockEnv,
|
||||
header: &Header,
|
||||
after_merge: bool,
|
||||
coinbase: Address,
|
||||
) {
|
||||
fn fill_block_env(&self, block_env: &mut BlockEnv, header: &Header, after_merge: bool) {
|
||||
block_env.number = U256::from(header.number);
|
||||
block_env.coinbase = coinbase;
|
||||
block_env.coinbase = header.beneficiary;
|
||||
block_env.timestamp = U256::from(header.timestamp);
|
||||
if after_merge {
|
||||
block_env.prevrandao = Some(header.mix_hash);
|
||||
@ -189,11 +169,6 @@ pub trait ConfigureEvmEnv: Send + Sync + Unpin + Clone + 'static {
|
||||
) {
|
||||
self.fill_cfg_env(cfg, chain_spec, header, total_difficulty);
|
||||
let after_merge = cfg.handler_cfg.spec_id >= SpecId::MERGE;
|
||||
self.fill_block_env_with_coinbase(
|
||||
block_env,
|
||||
header,
|
||||
after_merge,
|
||||
block_coinbase(chain_spec, header, after_merge),
|
||||
);
|
||||
self.fill_block_env(block_env, header, after_merge);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user