chore: bump reth and update everything

Author: prestwich

Cargo.toml

@@ -74,22 +74,22 @@ alloy = { version = "1.0.35", features = [
 alloy-contract = { version = "1.0.35", features = ["pubsub"] }
 
 # Reth
-reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
 
 # Foundry periphery
 foundry-blob-explorers = "0.17"

crates/block-processor/src/utils.rs

@@ -4,7 +4,13 @@ use reth_chainspec::EthereumHardforks;
 /// Equivalent to [`reth_evm_ethereum::revm_spec`], however, always starts at
 /// [`SpecId::PRAGUE`] and transitions to [`SpecId::OSAKA`].
 pub fn revm_spec(chain_spec: &reth::chainspec::ChainSpec, timestamp: u64) -> SpecId {
-    if chain_spec.is_osaka_active_at_timestamp(timestamp) { SpecId::OSAKA } else { SpecId::PRAGUE }
+    if chain_spec.is_amsterdam_active_at_timestamp(timestamp) {
+        SpecId::AMSTERDAM
+    } else if chain_spec.is_osaka_active_at_timestamp(timestamp) {
+        SpecId::OSAKA
+    } else {
+        SpecId::PRAGUE
+    }
 }
 
 /// This is simply a compile-time assertion to ensure that all SpecIds are
@@ -32,6 +38,7 @@ const fn assert_in_range(spec_id: SpecId) {
         | SpecId::SHANGHAI
         | SpecId::CANCUN
         | SpecId::PRAGUE
-        | SpecId::OSAKA => {}
+        | SpecId::OSAKA
+        | SpecId::AMSTERDAM => {}
     }
 }