From 108e14c2e618a845c1c20f178737f2a900e52c6a Mon Sep 17 00:00:00 2001 From: Clara van Staden Date: Tue, 23 Jan 2024 13:16:33 +0200 Subject: [PATCH] Remove minimal spec (#100) * remove minimal spec * update test modules * fix fork versions in runtime * adds deneb * fix lodestar setup in nix, update fixtures with deneb fork --------- Co-authored-by: claravanstaden --- .../bridge-hubs/bridge-hub-rococo/Cargo.toml | 4 +--- .../bridge-hubs/bridge-hub-rococo/src/lib.rs | 14 +++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml index 849a4cf8cd6f..e12485bf3beb 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml @@ -297,9 +297,7 @@ try-runtime = [ ] experimental = ["pallet-aura/experimental"] -fast-runtime = [ - "snowbridge-pallet-ethereum-client/beacon-spec-minimal", -] +fast-runtime = [] # A feature that should be enabled when the runtime should be built for on-chain # deployment. This will disable stuff that shouldn't be part of the on-chain wasm diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index 58dd8a1c2637..553a45aeb3fb 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -592,33 +592,33 @@ impl snowbridge_pallet_outbound_queue::Config for Runtime { type Channels = EthereumSystem; } -#[cfg(feature = "fast-runtime")] +#[cfg(any(feature = "fast-runtime", feature = "runtime-benchmarks"))] parameter_types! { pub const ChainForkVersions: ForkVersions = ForkVersions { genesis: Fork { - version: [0, 0, 0, 1], // 0x00000001 + version: [0, 0, 0, 0], // 0x00000000 epoch: 0, }, altair: Fork { - version: [1, 0, 0, 1], // 0x01000001 + version: [1, 0, 0, 0], // 0x01000000 epoch: 0, }, bellatrix: Fork { - version: [2, 0, 0, 1], // 0x02000001 + version: [2, 0, 0, 0], // 0x02000000 epoch: 0, }, capella: Fork { - version: [3, 0, 0, 1], // 0x03000001 + version: [3, 0, 0, 0], // 0x03000000 epoch: 0, }, deneb: Fork { - version: [4, 0, 0, 1], // 0x04000001 + version: [4, 0, 0, 0], // 0x04000000 epoch: 0, } }; } -#[cfg(not(feature = "fast-runtime"))] +#[cfg(all(not(feature = "fast-runtime"), not(feature = "runtime-benchmarks")))] parameter_types! { pub const ChainForkVersions: ForkVersions = ForkVersions { genesis: Fork {