fix: node-side panics after refactoring (#718)

Fixes KILTprotocol/ticket#3596 and fixes
KILTprotocol/ticket#3598.

Author: ntn-x2

Cargo.lock

@@ -1,7 +1,7 @@
 # this container builds the kilt-parachain binary from source files and the runtime library
 # pinned the version to avoid build cache invalidation
 
-FROM paritytech/ci-unified:bullseye-1.70.0 as builder
+FROM paritytech/ci-unified:bullseye-1.74.0 as builder
 
 WORKDIR /build
 
@@ -32,5 +32,7 @@ VOLUME ["/data"]
 
 COPY ./chainspecs /node/chainspecs
 
+ENV CHAINSPECS_FOLDER=/node/chainspecs
+
 ENTRYPOINT ["/usr/local/bin/node-executable"]
 CMD ["--help"]

Dockerfile

@@ -86,15 +86,29 @@ pub(crate) fn load_spec(id: &str) -> Result<Box<dyn sc_service::ChainSpec>, Stri
 	}
 }
 
+// Compile-time env variable used when running the binary with cargo or via
+// cargo (after `cargo build`).
 const MANIFEST_DIR: &str = env!("CARGO_MANIFEST_DIR");
-const CHAINSPECS_FOLDER: &str = "chainspecs";
+// Name of the runtime-time env variable that can be used to configure the
+// chainspecs folder path, useful especially when running the binary in a Docker
+// container.
+const CHAINSPECS_FOLDER_VAR_NAME: &str = "CHAINSPECS_FOLDER";
 
-// Prepends the given path with the `<workspace_root>/chainspecs` path.
 fn get_chainspec_full_path(path: &str) -> PathBuf {
-	Path::new(MANIFEST_DIR)
-		.join("..")
-		.join("..")
-		.join(CHAINSPECS_FOLDER)
+	// Use the provided env variable, if present at runtime, or else uses the
+	// compile-time `CARGO_MANIFEST_DIR` variable (e.g., if the binary is run via
+	// cargo instead of in a Docker container).
+	let chainspecs_root = match std::env::var(CHAINSPECS_FOLDER_VAR_NAME) {
+		Ok(chainspecs_folder_name) => chainspecs_folder_name.to_owned(),
+		Err(_) => Path::new(MANIFEST_DIR)
+			.join("..")
+			.join("..")
+			.join("chainspecs")
+			.to_string_lossy()
+			.into_owned(),
+	};
+
+	Path::new(chainspecs_root.as_str())
 		.join(path)
 		.canonicalize()
 		.expect("Invalid path provided.")

nodes/parachain/src/chain_spec/utils.rs

@@ -58,6 +58,7 @@ sp-api                     = { workspace = true }
 sp-block-builder           = { workspace = true }
 sp-consensus-aura          = { workspace = true }
 sp-core                    = { workspace = true }
+sp-genesis-builder         = { workspace = true }
 sp-inherents               = { workspace = true }
 sp-offchain                = { workspace = true }
 sp-runtime                 = { workspace = true }
@@ -138,6 +139,7 @@ std = [
   "sp-block-builder/std",
   "sp-consensus-aura/std",
   "sp-core/std",
+  "sp-genesis-builder/std",
   "sp-inherents/std",
   "sp-offchain/std",
   "sp-runtime/std",

runtimes/kestrel/Cargo.toml

@@ -28,7 +28,9 @@
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	genesis_builder_helper::{build_config, create_default_config},
+	parameter_types,
 	traits::{Everything, InstanceFilter},
 	weights::{constants::RocksDbWeight, ConstantMultiplier, IdentityFee, Weight},
 };
@@ -1158,6 +1160,17 @@ impl_runtime_apis! {
 		}
 	}
 
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
+
 
 	#[cfg(feature = "try-runtime")]
 	impl frame_try_runtime::TryRuntime<Block> for Runtime {