diff --git a/crates/chainspec/res/genesis/hoodi.json b/crates/chainspec/res/genesis/hoodi.json index 0fa3359..afa9883 100644 --- a/crates/chainspec/res/genesis/hoodi.json +++ b/crates/chainspec/res/genesis/hoodi.json @@ -21,7 +21,7 @@ "morph203Time": 0, "viridianTime": 1761544800, "emeraldTime": 1766988000, - "jadeTime": 1774418400, + "jadeForkTime": 1774418400, "morph": { "useZktrie": true, "maxTxPayloadBytesPerBlock": 122880, diff --git a/crates/chainspec/res/genesis/mainnet.json b/crates/chainspec/res/genesis/mainnet.json index 3e31ac4..44ccc48 100644 --- a/crates/chainspec/res/genesis/mainnet.json +++ b/crates/chainspec/res/genesis/mainnet.json @@ -19,7 +19,7 @@ "morph203Time": 1747029600, "viridianTime": 1762149600, "emeraldTime": 1767765600, - "jadeTime": 1775628000, + "jadeForkTime": 1775628000, "terminalTotalDifficulty": 0, "morph": { "useZktrie": true, diff --git a/crates/chainspec/src/genesis.rs b/crates/chainspec/src/genesis.rs index 9a3f714..b296b1b 100644 --- a/crates/chainspec/src/genesis.rs +++ b/crates/chainspec/src/genesis.rs @@ -61,7 +61,7 @@ pub struct MorphHardforkInfo { pub emerald_time: Option, /// Jade hardfork timestamp. #[serde(skip_serializing_if = "Option::is_none")] - pub jade_time: Option, + pub jade_fork_time: Option, } impl MorphHardforkInfo { @@ -136,7 +136,7 @@ mod tests { "morph203Time": 3000, "viridianTime": 4000, "emeraldTime": 5000, - "jadeTime": 6000 + "jadeForkTime": 6000 } "#; @@ -151,7 +151,7 @@ mod tests { morph203_time: Some(3000), viridian_time: Some(4000), emerald_time: Some(5000), - jade_time: Some(6000), + jade_fork_time: Some(6000), } ); } diff --git a/crates/chainspec/src/spec.rs b/crates/chainspec/src/spec.rs index 5396a9f..44f11e7 100644 --- a/crates/chainspec/src/spec.rs +++ b/crates/chainspec/src/spec.rs @@ -110,7 +110,7 @@ fn build_hardforks(genesis: &Genesis, chain_info: &MorphGenesisInfo) -> ChainHar (MorphHardfork::Morph203, hardfork_info.morph203_time), (MorphHardfork::Viridian, hardfork_info.viridian_time), (MorphHardfork::Emerald, hardfork_info.emerald_time), - (MorphHardfork::Jade, hardfork_info.jade_time), + (MorphHardfork::Jade, hardfork_info.jade_fork_time), ] .into_iter() .filter_map(|(fork, time)| time.map(|t| (fork, ForkCondition::Timestamp(t)))); diff --git a/crates/engine-api/src/validator.rs b/crates/engine-api/src/validator.rs index 43b5d90..e56a637 100644 --- a/crates/engine-api/src/validator.rs +++ b/crates/engine-api/src/validator.rs @@ -70,7 +70,7 @@ mod tests { }); if let Some(time) = jade_time { - genesis_json["config"]["jadeTime"] = json!(time); + genesis_json["config"]["jadeForkTime"] = json!(time); } let genesis: Genesis = serde_json::from_value(genesis_json).unwrap(); diff --git a/crates/node/src/test_utils.rs b/crates/node/src/test_utils.rs index 0b0a084..1856087 100644 --- a/crates/node/src/test_utils.rs +++ b/crates/node/src/test_utils.rs @@ -110,7 +110,7 @@ impl HardforkSchedule { /// Apply this schedule's fork timestamps to a mutable genesis JSON value. /// /// - `AllActive`: no changes (test genesis already has all forks at 0) - /// - `PreJade`: set `jadeTime` to `u64::MAX` + /// - `PreJade`: set `jadeForkTime` to `u64::MAX` /// - `Hoodi`/`Mainnet`: compare each `*Time` key against the reference network; /// forks active now → 0, forks not yet active → `u64::MAX`. /// Block-based forks (`*Block`) are always kept at 0. @@ -122,13 +122,13 @@ impl HardforkSchedule { Self::PreJade => { // Disable only Jade; all other forks remain at 0. let config = genesis["config"].as_object_mut().expect("genesis.config"); - config.insert("jadeTime".to_string(), serde_json::json!(u64::MAX)); + config.insert("jadeForkTime".to_string(), serde_json::json!(u64::MAX)); } Self::PreViridian => { let config = genesis["config"].as_object_mut().expect("genesis.config"); config.insert("viridianTime".to_string(), serde_json::json!(u64::MAX)); config.insert("emeraldTime".to_string(), serde_json::json!(u64::MAX)); - config.insert("jadeTime".to_string(), serde_json::json!(u64::MAX)); + config.insert("jadeForkTime".to_string(), serde_json::json!(u64::MAX)); } Self::Hoodi | Self::Mainnet => { let reference_json = self.reference_genesis_json().unwrap(); diff --git a/crates/node/tests/assets/test-genesis.json b/crates/node/tests/assets/test-genesis.json index c26e622..09cc751 100644 --- a/crates/node/tests/assets/test-genesis.json +++ b/crates/node/tests/assets/test-genesis.json @@ -19,7 +19,7 @@ "morph203Time": 0, "viridianTime": 0, "emeraldTime": 0, - "jadeTime": 0, + "jadeForkTime": 0, "morph": { "feeVaultAddress": "0x530000000000000000000000000000000000000a" }