feat(sim): Set appropiate spec id depending on chain.

Closes ENG-1506.

Appropiately sets the `SpecId` for each chain, depending on which fork is active. This only discriminates between the "expected to activate" hard fork, and the current hard fork.

Author: Evalir

Cargo.lock

@@ -41,6 +41,8 @@ alloy = { version = "1.0.35", features = [
     "getrandom",
     "provider-mev-api",
 ] }
+alloy-hardforks = "0.4.0"
+alloy-chains = "0.2"
 
 axum = "0.7.5"
 eyre = "0.6.12"

Cargo.toml

@@ -1,23 +1,70 @@
-//! This file implements the [`trevm::Cfg`] and [`trevm::Block`] traits for Pecorino blocks.
+//! This file implements the [`trevm::Cfg`] and [`trevm::Block`] traits for Signet and host networks.
+
+use alloy_chains::NamedChain;
+use alloy_hardforks::mainnet::MAINNET_OSAKA_TIMESTAMP;
+use signet_constants::pecorino;
 use trevm::revm::{context::CfgEnv, primitives::hardfork::SpecId};
 
-/// PecorinoCfg holds network-level configuration values.
+/// [`SignetCfgEnv`] holds network-level configuration values.
 #[derive(Debug, Clone, Copy)]
 pub struct SignetCfgEnv {
     /// The chain ID.
     pub chain_id: u64,
+    /// The block timestamp.
+    pub timestamp: u64,
+}
+
+impl SignetCfgEnv {
+    /// Creates a new [`SignetCfgEnv`].
+    pub const fn new(chain_id: u64, timestamp: u64) -> Self {
+        Self { chain_id, timestamp }
+    }
+
+    const fn spec_id(&self) -> SpecId {
+        match self.chain_id {
+            pecorino::HOST_CHAIN_ID | pecorino::RU_CHAIN_ID => SpecId::PRAGUE,
+            id if id == NamedChain::Mainnet as u64 => self.mainnet_spec(),
+            _ => SpecId::PRAGUE,
+        }
+    }
+
+    const fn mainnet_spec(&self) -> SpecId {
+        if self.timestamp >= MAINNET_OSAKA_TIMESTAMP { SpecId::OSAKA } else { SpecId::PRAGUE }
+    }
 }
 
 impl trevm::Cfg for SignetCfgEnv {
-    /// Fills the configuration environment with Pecorino-specific values.
-    ///
-    /// # Arguments
-    ///
-    /// - `cfg_env`: The configuration environment to be filled.
     fn fill_cfg_env(&self, cfg_env: &mut CfgEnv) {
-        let CfgEnv { chain_id, spec, .. } = cfg_env;
+        cfg_env.chain_id = self.chain_id;
+        cfg_env.spec = self.spec_id();
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn pecorino_cfg_env() {
+        let cfg = SignetCfgEnv::new(pecorino::HOST_CHAIN_ID, 0);
+        assert_eq!(cfg.spec_id(), SpecId::PRAGUE);
+
+        let cfg = SignetCfgEnv::new(pecorino::RU_CHAIN_ID, 0);
+        assert_eq!(cfg.spec_id(), SpecId::PRAGUE);
+    }
+
+    #[test]
+    fn mainnet_cfg_env() {
+        let cfg = SignetCfgEnv::new(NamedChain::Mainnet as u64, MAINNET_OSAKA_TIMESTAMP - 1);
+        assert_eq!(cfg.spec_id(), SpecId::PRAGUE);
+
+        let cfg = SignetCfgEnv::new(NamedChain::Mainnet as u64, MAINNET_OSAKA_TIMESTAMP);
+        assert_eq!(cfg.spec_id(), SpecId::OSAKA);
+    }
 
-        *chain_id = self.chain_id;
-        *spec = SpecId::default();
+    #[test]
+    fn unknown_chain_cfg_env() {
+        let cfg = SignetCfgEnv::new(999999, 0);
+        assert_eq!(cfg.spec_id(), SpecId::PRAGUE);
     }
 }

src/tasks/block/cfg.rs

@@ -162,7 +162,8 @@ impl SimEnv {
         constants: &SignetSystemConstants,
         provider: RuProvider,
     ) -> SimRollupEnv {
-        let rollup_cfg = SignetCfgEnv { chain_id: constants.ru_chain_id() };
+        let timestamp = self.rollup_env().timestamp.to::<u64>();
+        let rollup_cfg = SignetCfgEnv::new(constants.ru_chain_id(), timestamp);
         RollupEnv::new(self.rollup_db(provider), constants.clone(), &rollup_cfg, self.rollup_env())
     }
 
@@ -177,7 +178,8 @@ impl SimEnv {
         constants: &SignetSystemConstants,
         provider: HostProvider,
     ) -> SimHostEnv {
-        let host_cfg = SignetCfgEnv { chain_id: constants.host_chain_id() };
+        let timestamp = self.host_env().timestamp.to::<u64>();
+        let host_cfg = SignetCfgEnv::new(constants.host_chain_id(), timestamp);
         HostEnv::new(self.host_db(provider), constants.clone(), &host_cfg, self.host_env())
     }
 }