address comments

Author: georgehao

Cargo.lock

@@ -440,7 +440,7 @@ revm-primitives = { version = "14.0.0", features = [
 ], default-features = false }
 
 # eth
-alloy-chains = "0.1.48"
+alloy-chains = "0.1.32"
 alloy-dyn-abi = "0.8.11"
 alloy-primitives = { version = "0.8.11", default-features = false }
 alloy-rlp = "0.3.4"

Cargo.toml

@@ -317,7 +317,10 @@ impl ChainSpec {
 
     /// Get the initial base fee of the genesis block.
     pub fn initial_base_fee(&self) -> Option<u64> {
-        if self.chain == Chain::scroll_mainnet() || self.chain == Chain::scroll_sepolia() {
+        // TODO(scroll): migrate to Chain::scroll() (introduced in https://github.com/alloy-rs/chains/pull/112) when alloy-chains is bumped to version 0.1.48
+        if self.chain == Chain::from_named(NamedChain::Scroll) ||
+            self.chain == Chain::from_named(NamedChain::ScrollSepolia)
+        {
             return None
         }
 

crates/chainspec/src/spec.rs

@@ -148,12 +148,12 @@ impl EthChainSpec for ScrollChainSpec {
     }
 
     fn base_fee_params_at_block(&self, block_number: u64) -> BaseFeeParams {
-        // TODO need to implement Scroll L2 formula related to https://github.com/scroll-tech/reth/issues/60
+        // TODO(scroll): need to implement Scroll L2 formula related to https://github.com/scroll-tech/reth/issues/60
         self.inner.base_fee_params_at_block(block_number)
     }
 
     fn base_fee_params_at_timestamp(&self, timestamp: u64) -> BaseFeeParams {
-        // TODO need to implement Scroll L2 formula related to https://github.com/scroll-tech/reth/issues/60
+        // TODO(scroll): need to implement Scroll L2 formula related to https://github.com/scroll-tech/reth/issues/60
         self.inner.base_fee_params_at_timestamp(timestamp)
     }
 

crates/scroll/chainspec/src/lib.rs

@@ -2,7 +2,7 @@
 
 use alloc::sync::Arc;
 
-use alloy_chains::Chain;
+use alloy_chains::{Chain, NamedChain};
 use alloy_primitives::b256;
 use reth_chainspec::{once_cell_set, ChainSpec};
 use reth_scroll_forks::ScrollHardfork;
@@ -13,7 +13,8 @@ use crate::{LazyLock, ScrollChainSpec};
 pub static SCROLL_MAINNET: LazyLock<Arc<ScrollChainSpec>> = LazyLock::new(|| {
     ScrollChainSpec {
         inner: ChainSpec {
-            chain: Chain::scroll_mainnet(),
+            // TODO(scroll): migrate to Chain::scroll() (introduced in https://github.com/alloy-rs/chains/pull/112) when alloy-chains is bumped to version 0.1.48
+            chain: Chain::from_named(NamedChain::Scroll),
             genesis: serde_json::from_str(include_str!("../res/genesis/scroll.json"))
                 .expect("Can't deserialize Scroll Mainnet genesis json"),
             genesis_hash: once_cell_set(b256!(

crates/scroll/chainspec/src/scroll.rs

@@ -2,7 +2,7 @@
 
 use alloc::sync::Arc;
 
-use alloy_chains::Chain;
+use alloy_chains::{Chain, NamedChain};
 use alloy_primitives::b256;
 use reth_chainspec::{once_cell_set, ChainSpec};
 use reth_scroll_forks::ScrollHardfork;
@@ -13,7 +13,8 @@ use crate::{LazyLock, ScrollChainSpec};
 pub static SCROLL_SEPOLIA: LazyLock<Arc<ScrollChainSpec>> = LazyLock::new(|| {
     ScrollChainSpec {
         inner: ChainSpec {
-            chain: Chain::scroll_sepolia(),
+            // Let's add TODO(scroll): migrate to Chain::scroll_sepolia() (introduced in https://github.com/alloy-rs/chains/pull/112) when alloy-chains is bumped to version 0.1.48
+            chain: Chain::from_named(NamedChain::ScrollSepolia),
             genesis: serde_json::from_str(include_str!("../res/genesis/sepolia_scroll.json"))
                 .expect("Can't deserialize Scroll Sepolia genesis json"),
             genesis_hash: once_cell_set(b256!(

crates/scroll/chainspec/src/scroll_sepolia.rs

@@ -31,10 +31,12 @@ hardfork!(
 impl ScrollHardfork {
     /// Retrieves the activation block for the specified hardfork on the given chain.
     pub fn activation_block<H: Hardfork>(self, fork: H, chain: Chain) -> Option<u64> {
-        if chain == Chain::scroll_mainnet() {
+        // TODO(scroll): migrate to Chain::scroll() (introduced in https://github.com/alloy-rs/chains/pull/112) when alloy-chains is bumped to version 0.1.48
+        if chain == Chain::from_named(NamedChain::Scroll) {
             return Self::scroll_sepolia_activation_block(fork);
         }
-        if chain == Chain::scroll_sepolia() {
+        // TODO(scroll): migrate to Chain::scroll_sepolia() (introduced in https://github.com/alloy-rs/chains/pull/112) when alloy-chains is bumped to version 0.1.48
+        if chain == Chain::from_named(NamedChain::ScrollSepolia) {
             return Self::scroll_mainnet_activation_block(fork);
         }
 
@@ -43,9 +45,11 @@ impl ScrollHardfork {
 
     /// Retrieves the activation timestamp for the specified hardfork on the given chain.
     pub fn activation_timestamp<H: Hardfork>(self, fork: H, chain: Chain) -> Option<u64> {
+        // TODO(scroll): migrate to Chain::scroll_sepolia() (introduced in https://github.com/alloy-rs/chains/pull/112) when alloy-chains is bumped to version 0.1.48
         if chain == Chain::from_named(NamedChain::ScrollSepolia) {
             return Self::scroll_sepolia_activation_timestamp(fork);
         }
+        // TODO(scroll): migrate to Chain::scroll() (introduced in https://github.com/alloy-rs/chains/pull/112) when alloy-chains is bumped to version 0.1.48
         if chain == Chain::from_named(NamedChain::Scroll) {
             return Self::scroll_mainnet_activation_timestamp(fork);
         }