prepare for ontake upgrade

Signed-off-by: smtmfft <smtm@taiko.xyz>

Cargo.toml

@@ -504,18 +504,16 @@ similar-asserts = "1.5.0"
 test-fuzz = "5"
 
 # raiko
-raiko-core = { git = "https://github.com/taikoxyz/raiko.git", branch = "reth-wip" }
-raiko-lib = { git = "https://github.com/taikoxyz/raiko.git", branch = "reth-wip" }
 anyhow = "1.0"
 
 [patch.crates-io]
-revm = { git = "https://github.com/taikoxyz/revm.git", branch = "v36-taiko", default-features = false, features = [
+revm = { git = "https://github.com/taikoxyz/revm.git", branch = "v36-taiko-ontake", default-features = false, features = [
     "std",
     "serde",
     "taiko",
 ]}
-revm-interpreter = { git = "https://github.com/taikoxyz/revm.git", branch = "v36-taiko" }
-revm-precompile = { git = "https://github.com/taikoxyz/revm.git", branch = "v36-taiko" }
-revm-primitives = { git = "https://github.com/taikoxyz/revm.git", branch = "v36-taiko"}
+revm-interpreter = { git = "https://github.com/taikoxyz/revm.git", branch = "v36-taiko-ontake" }
+revm-precompile = { git = "https://github.com/taikoxyz/revm.git", branch = "v36-taiko-ontake" }
+revm-primitives = { git = "https://github.com/taikoxyz/revm.git", branch = "v36-taiko-ontake"}
 c-kzg = { git = "https://github.com/brechtpd/c-kzg-4844", branch = "for-alpha7" }
 secp256k1 = { git = "https://github.com/CeciliaZ030/rust-secp256k1", branch = "sp1-patch" }

crates/ethereum-forks/Cargo.toml

@@ -36,6 +36,7 @@ proptest-derive.workspace = true
 
 [features]
 default = ["std", "serde"]
+taiko = []
 std = ["thiserror-no-std/std"]
 serde = ["dep:serde"]
 arbitrary = ["dep:arbitrary", "dep:proptest", "dep:proptest-derive"]

crates/ethereum-forks/src/hardfork.rs

@@ -75,8 +75,13 @@ pub enum Hardfork {
     /// Ecotone: <https://github.com/ethereum-optimism/specs/blob/main/specs/protocol/superchain-upgrades.md#ecotone>.
     #[cfg(feature = "optimism")]
     Ecotone,
+    /// Hekla: the 1st taiko mainnet version: <>
+    #[cfg(feature = "taiko")]
+    Hekla,
+    /// Ontake: the 1st taiko mainnet fork: <>
+    #[cfg(feature = "taiko")]
+    Ontake,
     // ArbOS20Atlas,
-
     // Upcoming
     /// Prague: <https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/prague.md>
     Prague,

crates/ethereum/evm/src/lib.rs

@@ -12,11 +12,11 @@ use reth_chainspec::ChainSpec;
 use reth_evm::{ConfigureEvm, ConfigureEvmEnv};
 use reth_primitives::{
     revm::{config::revm_spec, env::fill_tx_env},
-    revm_primitives::{AnalysisKind, CfgEnvWithHandlerCfg, TxEnv},
+    revm_primitives::{AnalysisKind, CfgEnvWithHandlerCfg, TaikoProtocolSpecId, TxEnv},
     Address, Head, Header, TransactionSigned, U256,
 };
-use reth_revm::{Database, EvmBuilder};
 use reth_revm::taiko::handler_register;
+use reth_revm::{Database, EvmBuilder};
 
 pub mod execute;
 pub mod taiko;

crates/primitives/Cargo.toml

@@ -121,6 +121,7 @@ optimism = [
 taiko = [
     "revm-primitives/taiko",
     "revm/taiko",
+    "reth-ethereum-forks/taiko",
 ]
 alloy-compat = [
     "reth-primitives-traits/alloy-compat",

crates/primitives/src/revm/config.rs

@@ -21,7 +21,7 @@ pub fn revm_spec_by_timestamp_after_merge(
             revm_primitives::REGOLITH
         } else {
             revm_primitives::BEDROCK
-        }
+        };
     }
 
     if chain_spec.is_prague_active_at_timestamp(timestamp) {
@@ -40,15 +40,24 @@ pub fn revm_spec(chain_spec: &ChainSpec, block: Head) -> revm_primitives::SpecId
     #[cfg(feature = "optimism")]
     if chain_spec.is_optimism() {
         if chain_spec.fork(Hardfork::Fjord).active_at_head(&block) {
-            return revm_primitives::FJORD
+            return revm_primitives::FJORD;
         } else if chain_spec.fork(Hardfork::Ecotone).active_at_head(&block) {
-            return revm_primitives::ECOTONE
+            return revm_primitives::ECOTONE;
         } else if chain_spec.fork(Hardfork::Canyon).active_at_head(&block) {
-            return revm_primitives::CANYON
+            return revm_primitives::CANYON;
         } else if chain_spec.fork(Hardfork::Regolith).active_at_head(&block) {
-            return revm_primitives::REGOLITH
+            return revm_primitives::REGOLITH;
         } else if chain_spec.fork(Hardfork::Bedrock).active_at_head(&block) {
-            return revm_primitives::BEDROCK
+            return revm_primitives::BEDROCK;
+        }
+    }
+
+    #[cfg(feature = "taiko")]
+    if chain_spec.is_taiko() {
+        if chain_spec.fork(Hardfork::Ontake).active_at_head(&block) {
+            return revm_primitives::ONTAKE;
+        } else if chain_spec.fork(Hardfork::Hekla).active_at_head(&block) {
+            return revm_primitives::HEKLA;
         }
     }
 

testing/ef-tests/Cargo.toml

@@ -41,6 +41,4 @@ thiserror.workspace = true
 rayon.workspace = true
 
 # raiko
-raiko-core.workspace = true
-raiko-lib.workspace = true
 anyhow.workspace = true