feat/fix(anvil): add genesis number CLI option, fix genesis block construction (#10258)

* feat(anvil): add genesis block number support

- Introduced `genesis_block_number` field in `NodeConfig` and `NodeArgs`.
- Added methods to set and retrieve the genesis block number.
- Updated `into_node_config` to include the genesis block number.
- Added tests to verify setting and defaulting of the genesis block number.

* fix(anvil): include genesis block number in storage initialization

- Added the `number` field to the storage initialization to support the genesis block number.

Author: mmv08

crates/anvil/src/cmd.rs

@@ -47,6 +47,10 @@ pub struct NodeArgs {
     #[arg(long, value_name = "NUM")]
     pub timestamp: Option<u64>,
 
+    /// The number of the genesis block.
+    #[arg(long, value_name = "NUM")]
+    pub number: Option<u64>,
+
     /// BIP39 mnemonic phrase used for generating accounts.
     /// Cannot be used if `mnemonic_random` or `mnemonic_seed` are used.
     #[arg(long, short, conflicts_with_all = &["mnemonic_seed", "mnemonic_random"])]
@@ -234,6 +238,7 @@ impl NodeArgs {
             .with_account_generator(self.account_generator())?
             .with_genesis_balance(genesis_balance)
             .with_genesis_timestamp(self.timestamp)
+            .with_genesis_block_number(self.number)
             .with_port(self.port)
             .with_fork_choice(match (self.evm.fork_block_number, self.evm.fork_transaction_hash) {
                 (Some(block), None) => Some(ForkChoice::Block(block)),

crates/anvil/src/config.rs

@@ -105,6 +105,8 @@ pub struct NodeConfig {
     pub genesis_balance: U256,
     /// Genesis block timestamp
     pub genesis_timestamp: Option<u64>,
+    /// Genesis block number
+    pub genesis_block_number: Option<u64>,
     /// Signer accounts that can sign messages/transactions from the EVM node
     pub signer_accounts: Vec<PrivateKeySigner>,
     /// Configured block time for the EVM chain. Use `None` to mine a new block for every tx
@@ -430,6 +432,7 @@ impl Default for NodeConfig {
             hardfork: None,
             signer_accounts: genesis_accounts.clone(),
             genesis_timestamp: None,
+            genesis_block_number: None,
             genesis_accounts,
             // 100ETH default balance
             genesis_balance: Unit::ETHER.wei().saturating_mul(U256::from(100u64)),
@@ -669,9 +672,20 @@ impl NodeConfig {
         self
     }
 
+    /// Sets the genesis number
+    #[must_use]
+    pub fn with_genesis_block_number<U: Into<u64>>(mut self, number: Option<U>) -> Self {
+        if let Some(number) = number {
+            self.genesis_block_number = Some(number.into());
+        }
+        self
+    }
+
     /// Returns the genesis number
     pub fn get_genesis_number(&self) -> u64 {
-        self.genesis.as_ref().and_then(|g| g.number).unwrap_or(0)
+        self.genesis_block_number
+            .or_else(|| self.genesis.as_ref().and_then(|g| g.number))
+            .unwrap_or(0)
     }
 
     /// Sets the hardfork

crates/anvil/src/eth/backend/mem/storage.rs

@@ -291,7 +291,7 @@ 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(),
-
+            number: genesis_number,
             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),

crates/anvil/tests/it/anvil.rs

@@ -115,3 +115,22 @@ async fn test_cancun_fields() {
     assert!(block.header.blob_gas_used.is_some());
     assert!(block.header.excess_blob_gas.is_some());
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_can_set_genesis_block_number() {
+    let (_api, handle) = spawn(NodeConfig::test().with_genesis_block_number(Some(1337u64))).await;
+    let provider = handle.http_provider();
+
+    let block_number = provider.get_block_number().await.unwrap();
+    assert_eq!(block_number, 1337u64);
+
+    assert_eq!(1337, provider.get_block(1337.into()).await.unwrap().unwrap().header.number);
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_can_use_default_genesis_block_number() {
+    let (_api, handle) = spawn(NodeConfig::test()).await;
+    let provider = handle.http_provider();
+
+    assert_eq!(0, provider.get_block(0.into()).await.unwrap().unwrap().header.number);
+}