features: decouple 'testnet' and 'develop' features to allow 'staging' builds (#1609)

Co-authored-by: Branimir Malesevic <[email protected]>

Author: FlorianFranzen

.github/workflows/merge-docker-chronicle.yaml

@@ -45,6 +45,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - image: test
+            profile: testnet
+            features: testnet
           - image: dev
             profile: testnet
             features: testnet,develop

.github/workflows/merge-docker-timenode.yaml

@@ -39,12 +39,15 @@ jobs:
           - image: bridge
             profile: mainnet
             features: bridge
+          - image: staging
+            profile: mainnet
+            features: develop
           - image: test
             profile: testnet
-            features: default
+            features: testnet
           - image: dev
             profile: testnet
-            features: develop
+            features: testnet,develop
     steps:
       - name: Fetch latest code
         uses: actions/checkout@v4

.github/workflows/merge-srtool-runtime.yaml

@@ -82,10 +82,12 @@ jobs:
           # Name denotes the artifact name in the workflow run
           - name: mainnet
             features: default
+          - name: staging
+            features: develop
           - name: testnet
             features: testnet
           - name: develop
-            features: develop
+            features: testnet,develop
     steps:
       - name: Fetch latest code
         uses: actions/checkout@v4

.github/workflows/pr-optional-benchmarks.yaml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pallet: [elections, members, networks, shards, tasks, timegraph, dmail]
+        pallet: [elections, launch, members, networks, shards, tasks, timegraph, dmail]
     steps:
       - name: Download runtime benchmarks
         uses: actions/download-artifact@v4

node/Cargo.toml

@@ -142,7 +142,6 @@ testnet = [
 	"timechain-runtime/testnet",
 ]
 develop = [
-    "testnet",
     "time-primitives/develop",
 	"timechain-runtime/develop",
 ]

runtime/Cargo.toml

@@ -123,7 +123,6 @@ substrate-wasm-builder = { workspace = true, optional = true }
 default = [ "std" ]
 testnet = [ "time-primitives/testnet" ]
 develop = [
-  "testnet",
   "genesis-builder",
   "time-primitives/develop",
 ]

runtime/build.rs

@@ -4,19 +4,23 @@
 fn main() {
 	use substrate_wasm_builder::WasmBuilder;
 
-	// Build mainnet runtime (default)
-	#[cfg(not(any(feature = "testnet", feature = "develop")))]
-	WasmBuilder::init_with_defaults()
-		.enable_metadata()
-		.enable_metadata_hash("ANLOG", 12)
-		.build();
+	// Build runtime to be used on live chain
+	#[cfg(not(feature = "develop"))]
+	{
+		// Build mainnet runtime (default)
+		#[cfg(not(feature = "testnet"))]
+		WasmBuilder::init_with_defaults()
+			.enable_metadata()
+			.enable_metadata_hash("ANLOG", 12)
+			.build();
 
-	// Build testnet runtime
-	#[cfg(all(feature = "testnet", not(feature = "develop")))]
-	WasmBuilder::init_with_defaults()
-		.enable_metadata()
-		.enable_metadata_hash("TANLOG", 12)
-		.build();
+		// Build testnet runtime
+		#[cfg(feature = "testnet")]
+		WasmBuilder::init_with_defaults()
+			.enable_metadata()
+			.enable_metadata_hash("TANLOG", 12)
+			.build();
+	}
 
 	// Build develop runtime
 	#[cfg(feature = "develop")]

runtime/src/lib.rs

@@ -2,12 +2,12 @@
 //!
 //! # Timechain Runtime
 //!
-//!
-//! | Name    | Features | Profile |
-//! |---------|----------|---------|
-//! | mainnet | default  | mainnet |
-//! | testnet | testnet  | testnet |
-//! | develop | develop  | dev     |
+//! | Name    | Features         | Profile |
+//! |---------|------------------|---------|
+//! | mainnet | default          | mainnet |
+//! | staging | develop          | testnet |
+//! | testnet | testnet          | testnet |
+//! | develop | testnet,develop  | testnet |
 //!
 //! Until we can extract individual package config a bit better,
 //! please check [`Runtime`] and the individual pallets.
@@ -82,13 +82,21 @@
 #![allow(clippy::identity_op)]
 #![allow(non_local_definitions)]
 
-/// The runtime is split into its components
+// The runtime is split into its components
 pub mod apis;
 pub mod configs;
 pub mod offchain;
+pub mod version;
+
+/// Helpers to handle variant flags
+pub mod variants;
 
 pub use apis::RuntimeApi;
 use apis::_InternalImplRuntimeApis;
+
+pub use version::VERSION;
+
+// The runtime configs and its sections
 pub use configs::consensus::SessionKeys;
 pub use configs::core::{
 	BlockHashCount, RuntimeBlockLength, RuntimeBlockWeights, AVERAGE_ON_INITIALIZE_RATIO,
@@ -99,9 +107,6 @@ pub use configs::governance::{
 };
 pub use configs::tokenomics::{ExistentialDeposit, LengthToFee, WeightToFee};
 
-/// Helpers to handle variant flags
-pub mod variants;
-
 /// Import variant constants and macros
 pub use variants::*;
 
@@ -140,15 +145,8 @@ use pallet_session::historical as pallet_session_historical;
 #[allow(deprecated)]
 pub use pallet_transaction_payment::{CurrencyAdapter, Multiplier, TargetedFeeAdjustment};
 
-use sp_runtime::{
-	create_runtime_str,
-	generic,
-	//traits::{OpaqueKeys},
-};
+use sp_runtime::generic;
 use sp_std::prelude::*;
-#[cfg(any(feature = "std", test))]
-use sp_version::NativeVersion;
-use sp_version::RuntimeVersion;
 
 pub use time_primitives::{
 	AccountId, Balance, BatchId, BlockHash, BlockNumber, ChainName, ChainNetwork, Commitment,
@@ -229,57 +227,6 @@ pub type PositiveImbalance = <Balances as Currency<AccountId>>::PositiveImbalanc
 #[cfg(test)]
 pub const CALL_PARAMS_MAX_SIZE: usize = 448;
 
-/// Mainnet runtime version
-#[cfg(not(any(feature = "testnet", feature = "develop")))]
-#[sp_version::runtime_version]
-pub const VERSION: RuntimeVersion = RuntimeVersion {
-	spec_name: create_runtime_str!("analog-timechain"),
-	impl_name: create_runtime_str!("analog-timechain"),
-	authoring_version: 0,
-	spec_version: 19,
-	impl_version: 0,
-	apis: apis::RUNTIME_API_VERSIONS,
-	transaction_version: 1,
-	state_version: 1,
-};
-
-/// Testnet runtime version.
-#[cfg(all(feature = "testnet", not(feature = "develop")))]
-#[sp_version::runtime_version]
-pub const VERSION: RuntimeVersion = RuntimeVersion {
-	spec_name: create_runtime_str!("analog-testnet"),
-	impl_name: create_runtime_str!("analog-testnet"),
-	authoring_version: 0,
-	spec_version: 19,
-	impl_version: 0,
-	apis: apis::RUNTIME_API_VERSIONS,
-	transaction_version: 1,
-	state_version: 1,
-};
-
-/// Development runtime version.
-#[cfg(feature = "develop")]
-#[sp_version::runtime_version]
-pub const VERSION: RuntimeVersion = RuntimeVersion {
-	spec_name: create_runtime_str!("analog-develop"),
-	impl_name: create_runtime_str!("analog-develop"),
-	authoring_version: 0,
-	spec_version: 19,
-	impl_version: 0,
-	apis: apis::RUNTIME_API_VERSIONS,
-	transaction_version: 1,
-	state_version: 1,
-};
-
-/// Native version.
-#[cfg(any(feature = "std", test))]
-pub fn native_version() -> NativeVersion {
-	NativeVersion {
-		runtime_version: VERSION,
-		can_author_with: Default::default(),
-	}
-}
-
 /// Maximum block size
 pub const MAX_BLOCK_LENGTH: u32 = 5 * 1024 * 1024;
 

runtime/src/variants.rs

@@ -1,19 +1,19 @@
 ///! Helpers to handle runtime variants
 
-// Safety check to preserve assumption via code
-#[cfg(all(feature = "develop", not(feature = "testnet")))]
-compile_error!("Runtime variant \"develop\" expects \"testnet\" feature to be set as well.");
-
 /// Mainnet runtime variant string
 #[cfg(not(any(feature = "testnet", feature = "develop")))]
 pub const RUNTIME_VARIANT: &str = "mainnet";
 
+/// Staging runtime variant string
+#[cfg(all(not(feature = "testnet"), feature = "develop"))]
+pub const RUNTIME_VARIANT: &str = "staging";
+
 /// Testnet runtime variant string
 #[cfg(all(feature = "testnet", not(feature = "develop")))]
 pub const RUNTIME_VARIANT: &str = "testnet";
 
 /// Develop runtime variant string
-#[cfg(feature = "develop")]
+#[cfg(all(feature = "testnet", feature = "develop"))]
 pub const RUNTIME_VARIANT: &str = "develop";
 
 /// Macro to set a value (e.g. when using the `parameter_types` macro) based on

runtime/src/version.rs

@@ -0,0 +1,62 @@
+use crate::apis;
+
+use polkadot_sdk::*;
+
+use sp_runtime::create_runtime_str;
+use sp_version::RuntimeVersion;
+
+/// Mainnet runtime version
+#[cfg(not(any(feature = "testnet", feature = "develop")))]
+#[sp_version::runtime_version]
+pub const VERSION: RuntimeVersion = RuntimeVersion {
+	spec_name: create_runtime_str!("analog-timechain"),
+	impl_name: create_runtime_str!("analog-timechain"),
+	authoring_version: 0,
+	spec_version: 19,
+	impl_version: 0,
+	apis: apis::RUNTIME_API_VERSIONS,
+	transaction_version: 1,
+	state_version: 1,
+};
+
+/// Staging runtime version.
+#[cfg(all(not(feature = "testnet"), feature = "develop"))]
+#[sp_version::runtime_version]
+pub const VERSION: RuntimeVersion = RuntimeVersion {
+	spec_name: create_runtime_str!("analog-staging"),
+	impl_name: create_runtime_str!("analog-staging"),
+	authoring_version: 0,
+	spec_version: 19,
+	impl_version: 0,
+	apis: apis::RUNTIME_API_VERSIONS,
+	transaction_version: 1,
+	state_version: 1,
+};
+
+/// Testnet runtime version.
+#[cfg(all(feature = "testnet", not(feature = "develop")))]
+#[sp_version::runtime_version]
+pub const VERSION: RuntimeVersion = RuntimeVersion {
+	spec_name: create_runtime_str!("analog-testnet"),
+	impl_name: create_runtime_str!("analog-testnet"),
+	authoring_version: 0,
+	spec_version: 19,
+	impl_version: 0,
+	apis: apis::RUNTIME_API_VERSIONS,
+	transaction_version: 1,
+	state_version: 1,
+};
+
+/// Development runtime version.
+#[cfg(all(feature = "testnet", feature = "develop"))]
+#[sp_version::runtime_version]
+pub const VERSION: RuntimeVersion = RuntimeVersion {
+	spec_name: create_runtime_str!("analog-develop"),
+	impl_name: create_runtime_str!("analog-develop"),
+	authoring_version: 0,
+	spec_version: 19,
+	impl_version: 0,
+	apis: apis::RUNTIME_API_VERSIONS,
+	transaction_version: 1,
+	state_version: 1,
+};

runtime/src/weights/develop/mod.rs

@@ -13,6 +13,8 @@ pub mod pallet_balances;
 pub mod pallet_dmail;
 pub mod pallet_elections;
 pub mod pallet_im_online;
+#[cfg(not(feature = "testnet"))]
+pub mod pallet_launch;
 pub mod pallet_members;
 pub mod pallet_multisig;
 pub mod pallet_networks;

runtime/src/weights/develop/pallet_launch.rs

@@ -0,0 +1,52 @@
+
+//! Autogenerated weights for `pallet_launch`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 42.0.1
+//! DATE: 2025-02-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `benchmark-agent-1`, CPU: `AMD EPYC Processor`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+
+// Executed Command:
+// ./timechain-node
+// benchmark
+// pallet
+// --chain
+// dev
+// --pallet
+// pallet_launch
+// --extrinsic
+// *
+// --output
+// ./develop/pallet_launch.rs
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use polkadot_sdk::*;
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_launch`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_launch::WeightInfo for WeightInfo<T> {
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	fn lock_operational() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `165`
+		//  Estimated: `4764`
+		// Minimum execution time: 35_428_000 picoseconds.
+		Weight::from_parts(36_650_000, 0)
+			.saturating_add(Weight::from_parts(0, 4764))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}