using specid

Author: Rimeeeeee

Cargo.lock

@@ -481,7 +481,7 @@ alloy-sol-macro = "1.3.0"
 alloy-sol-types = { version = "1.3.0", default-features = false }
 alloy-trie = { version = "0.9.0", default-features = false }
 
-alloy-hardforks = "0.2.7"
+alloy-hardforks = "0.3.0"
 
 alloy-consensus = { version = "1.0.25", default-features = false }
 alloy-contract = { version = "1.0.25", default-features = false }
@@ -514,7 +514,7 @@ alloy-block-access-list = { version = "1.0.25", default-features = false }
 
 # op
 alloy-op-evm = { version = "0.18", default-features = false }
-alloy-op-hardforks = "0.2.2"
+alloy-op-hardforks = "0.3.0"
 op-alloy-rpc-types = { version = "0.18.12", default-features = false }
 op-alloy-rpc-types-engine = { version = "0.18.12", default-features = false }
 op-alloy-network = { version = "0.18.12", default-features = false }
@@ -744,7 +744,9 @@ alloy-transport = { git = "https://github.com/Soubhik-10/alloy", branch = "engin
 alloy-transport-http = { git = "https://github.com/Soubhik-10/alloy", branch = "engine-api-trial" }
 alloy-transport-ipc = { git = "https://github.com/Soubhik-10/alloy", branch = "engine-api-trial" }
 alloy-transport-ws = { git = "https://github.com/Soubhik-10/alloy", branch = "engine-api-trial" }
+alloy-hardforks = { git = "https://github.com/Rimeeeeee/hardforks", branch = "amsterdam" }
 
+alloy-op-hardforks = { git = "https://github.com/Rimeeeeee/hardforks", branch = "amsterdam" }
 # op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }
 # op-alloy-network = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }
 # op-alloy-rpc-types = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }

Cargo.toml

@@ -88,6 +88,16 @@ where
             };
         }
 
+        let mut built_block_access_list = None;
+        let mut block_access_list_hash = None;
+
+        if self.chain_spec.is_amsterdam_active_at_timestamp(timestamp) {
+            built_block_access_list = block_access_list.clone();
+            block_access_list_hash = block_access_list
+                .as_ref()
+                .map(|bal| alloy_primitives::keccak256(alloy_rlp::encode(bal)));
+        }
+
         let header = Header {
             parent_hash: ctx.parent_hash,
             ommers_hash: EMPTY_OMMER_ROOT_HASH,
@@ -110,9 +120,7 @@ where
             blob_gas_used,
             excess_blob_gas,
             requests_hash,
-            block_access_list_hash: block_access_list
-                .as_ref()
-                .map(|bal| alloy_primitives::keccak256(alloy_rlp::encode(bal))),
+            block_access_list_hash,
         };
 
         Ok(Block {
@@ -121,7 +129,7 @@ where
                 transactions,
                 ommers: Default::default(),
                 withdrawals,
-                block_access_list: block_access_list.clone(),
+                block_access_list: built_block_access_list,
             },
         })
     }