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

anvil: Correctly set HF fields for Genesis block #9248

Merged
merged 1 commit into from
Nov 1, 2024
Merged

anvil: Correctly set HF fields for Genesis block #9248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion crates/anvil/src/eth/backend/mem/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,10 @@ impl Backend {
trace!(target: "backend", "using forked blockchain at {}", fork.block_number());
Blockchain::forked(fork.block_number(), fork.block_hash(), fork.total_difficulty())
} else {
let env = env.read();
Blockchain::new(
&env.read(),
&env,
env.handler_cfg.spec_id,
fees.is_eip1559().then(|| fees.base_fee()),
genesis.timestamp,
)
Expand Down
21 changes: 18 additions & 3 deletions crates/anvil/src/eth/backend/mem/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ use crate::eth::{
error::BlockchainError,
pool::transactions::PoolTransaction,
};
use alloy_consensus::constants::EMPTY_WITHDRAWALS;
use alloy_eips::eip7685::EMPTY_REQUESTS_HASH;
use alloy_primitives::{
map::{B256HashMap, HashMap},
Bytes, B256, U256, U64,
Expand Down Expand Up @@ -38,6 +40,7 @@ use foundry_evm::{
},
};
use parking_lot::RwLock;
use revm::primitives::SpecId;
use std::{collections::VecDeque, fmt, sync::Arc, time::Duration};
// use yansi::Paint;

Expand Down Expand Up @@ -262,7 +265,11 @@ pub struct BlockchainStorage {

impl BlockchainStorage {
/// Creates a new storage with a genesis block
pub fn new(env: &Env, base_fee: Option<u64>, timestamp: u64) -> Self {
pub fn new(env: &Env, spec_id: SpecId, base_fee: Option<u64>, timestamp: u64) -> Self {
let is_shanghai = spec_id >= SpecId::SHANGHAI;
let is_cancun = spec_id >= SpecId::CANCUN;
let is_prague = spec_id >= SpecId::PRAGUE;

// create a dummy genesis block
let partial_header = PartialHeader {
timestamp,
Expand All @@ -272,6 +279,10 @@ impl BlockchainStorage {
difficulty: env.block.difficulty,
blob_gas_used: env.block.blob_excess_gas_and_price.as_ref().map(|_| 0),
excess_blob_gas: env.block.get_blob_excess_gas(),

parent_beacon_block_root: is_cancun.then_some(Default::default()),
withdrawals_root: is_shanghai.then_some(EMPTY_WITHDRAWALS),
requests_hash: is_prague.then_some(EMPTY_REQUESTS_HASH),
..Default::default()
};
let block = Block::new::<MaybeImpersonatedTransaction>(partial_header, vec![]);
Expand Down Expand Up @@ -423,8 +434,12 @@ pub struct Blockchain {

impl Blockchain {
/// Creates a new storage with a genesis block
pub fn new(env: &Env, base_fee: Option<u64>, timestamp: u64) -> Self {
Self { storage: Arc::new(RwLock::new(BlockchainStorage::new(env, base_fee, timestamp))) }
pub fn new(env: &Env, spec_id: SpecId, base_fee: Option<u64>, timestamp: u64) -> Self {
Self {
storage: Arc::new(RwLock::new(BlockchainStorage::new(
env, spec_id, base_fee, timestamp,
))),
}
}

pub fn forked(block_number: u64, block_hash: B256, total_difficulty: U256) -> Self {
Expand Down
Loading