chain-spec: getting ready for native-runtime-free world (#1256)

This PR prepares chains specs for _native-runtime-free_  world.

This PR has following changes:
- `substrate`:
  - adds support for:
- JSON based `GenesisConfig` to `ChainSpec` allowing interaction with
runtime `GenesisBuilder` API.
- interacting with arbitrary runtime wasm blob to[
`chain-spec-builder`](https://github.com/paritytech/substrate/blob/3ef576eaeb3f42610e85daecc464961cf1295570/bin/utils/chain-spec-builder/src/lib.rs#L46)
command line util,
- removes
[`code`](https://github.com/paritytech/substrate/blob/3ef576eaeb3f42610e85daecc464961cf1295570/frame/system/src/lib.rs#L660)
from `system_pallet`
  - adds `code` to the `ChainSpec`
- deprecates
[`ChainSpec::from_genesis`](https://github.com/paritytech/substrate/blob/3ef576eaeb3f42610e85daecc464961cf1295570/client/chain-spec/src/chain_spec.rs#L263),
but also changes the signature of this method extending it with `code`
argument.
[`ChainSpec::builder()`](https://github.com/paritytech/substrate/blob/20bee680ed098be7239cf7a6b804cd4de267983e/client/chain-spec/src/chain_spec.rs#L507)
should be used instead.
- `polkadot`:
- all references to `RuntimeGenesisConfig` in `node/service` are
removed,
- all
`(kusama|polkadot|versi|rococo|wococo)_(staging|dev)_genesis_config`
functions now return the JSON patch for default runtime `GenesisConfig`,
  - `ChainSpecBuilder` is used, `ChainSpec::from_genesis` is removed,

- `cumulus`:
  - `ChainSpecBuilder` is used, `ChainSpec::from_genesis` is removed,
- _JSON_ patch configuration used instead of `RuntimeGenesisConfig
struct` in all chain specs.
  
---------

Co-authored-by: command-bot <>
Co-authored-by: Javier Viola <javier@parity.io>
Co-authored-by: Davide Galassi <davxy@datawok.net>
Co-authored-by: Francisco Aguirre <franciscoaguirreperez@gmail.com>
Co-authored-by: Kevin Krone <kevin@parity.io>
Co-authored-by: Bastian Köcher <git@kchr.de>

cumulus/test/client/src/lib.rs

@@ -19,13 +19,13 @@
 mod block_builder;
 use codec::{Decode, Encode};
 use runtime::{
-	Balance, Block, BlockHashCount, Runtime, RuntimeCall, RuntimeGenesisConfig, Signature,
-	SignedExtra, SignedPayload, UncheckedExtrinsic, VERSION,
+	Balance, Block, BlockHashCount, Runtime, RuntimeCall, Signature, SignedExtra, SignedPayload,
+	UncheckedExtrinsic, VERSION,
 };
 use sc_executor::HeapAllocStrategy;
 use sc_executor_common::runtime_blob::RuntimeBlob;
 use sp_blockchain::HeaderBackend;
-use sp_core::{sr25519, Pair};
+use sp_core::Pair;
 use sp_io::TestExternalities;
 use sp_runtime::{generic::Era, BuildStorage, SaturatedConversion};
 
@@ -84,17 +84,12 @@ pub struct GenesisParameters {
 
 impl substrate_test_client::GenesisInit for GenesisParameters {
 	fn genesis_storage(&self) -> Storage {
-		if self.endowed_accounts.is_empty() {
-			genesis_config().build_storage().unwrap()
-		} else {
-			cumulus_test_service::testnet_genesis(
-				cumulus_test_service::get_account_id_from_seed::<sr25519::Public>("Alice"),
-				self.endowed_accounts.clone(),
-				None,
-			)
-			.build_storage()
-			.unwrap()
-		}
+		cumulus_test_service::chain_spec::get_chain_spec_with_extra_endowed(
+			None,
+			self.endowed_accounts.clone(),
+		)
+		.build_storage()
+		.expect("Builds test runtime genesis storage")
 	}
 }
 
@@ -127,10 +122,6 @@ impl DefaultTestClientBuilderExt for TestClientBuilder {
 	}
 }
 
-fn genesis_config() -> RuntimeGenesisConfig {
-	cumulus_test_service::testnet_genesis_with_default_endowed(Default::default(), None)
-}
-
 /// Create an unsigned extrinsic from a runtime call.
 pub fn generate_unsigned(function: impl Into<RuntimeCall>) -> UncheckedExtrinsic {
 	UncheckedExtrinsic::new_unsigned(function.into())

cumulus/test/runtime/Cargo.toml

@@ -23,6 +23,7 @@ pallet-transaction-payment = { path = "../../../substrate/frame/transaction-paym
 sp-api = { path = "../../../substrate/primitives/api", default-features = false}
 sp-block-builder = { path = "../../../substrate/primitives/block-builder", default-features = false}
 sp-core = { path = "../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../substrate/primitives/genesis-builder", default-features = false}
 sp-inherents = { path = "../../../substrate/primitives/inherents", default-features = false}
 sp-io = { path = "../../../substrate/primitives/io", default-features = false}
 sp-offchain = { path = "../../../substrate/primitives/offchain", default-features = false}
@@ -59,6 +60,7 @@ std = [
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-io/std",
 	"sp-offchain/std",

cumulus/test/runtime/src/lib.rs

@@ -47,6 +47,7 @@ use sp_version::RuntimeVersion;
 pub use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
 	traits::{ConstU8, Randomness},
 	weights::{
@@ -473,6 +474,16 @@ impl_runtime_apis! {
 			ParachainSystem::collect_collation_info(header)
 		}
 	}
+
+	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)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {

cumulus/test/service/Cargo.toml

@@ -17,6 +17,7 @@ criterion = { version = "0.5.1", features = [ "async_tokio" ] }
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 rand = "0.8.5"
 serde = { version = "1.0.188", features = ["derive"] }
+serde_json = "1.0.107"
 tokio = { version = "1.32.0", features = ["macros"] }
 tracing = "0.1.37"
 url = "2.4.0"

cumulus/test/service/src/chain_spec.rs

@@ -63,25 +63,25 @@ where
 /// The given accounts are initialized with funds in addition
 /// to the default known accounts.
 pub fn get_chain_spec_with_extra_endowed(
-	id: ParaId,
+	id: Option<ParaId>,
 	extra_endowed_accounts: Vec<AccountId>,
 ) -> ChainSpec {
-	ChainSpec::from_genesis(
-		"Local Testnet",
-		"local_testnet",
-		ChainType::Local,
-		move || testnet_genesis_with_default_endowed(extra_endowed_accounts.clone(), Some(id)),
-		Vec::new(),
-		None,
-		None,
-		None,
-		None,
-		Extensions { para_id: id.into() },
+	ChainSpec::builder(
+		cumulus_test_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
+		Extensions { para_id: id.unwrap_or(cumulus_test_runtime::PARACHAIN_ID.into()).into() },
 	)
+	.with_name("Local Testnet")
+	.with_id("local_testnet")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(testnet_genesis_with_default_endowed(
+		extra_endowed_accounts.clone(),
+		id,
+	))
+	.build()
 }
 
 /// Get the chain spec for a specific parachain ID.
-pub fn get_chain_spec(id: ParaId) -> ChainSpec {
+pub fn get_chain_spec(id: Option<ParaId>) -> ChainSpec {
 	get_chain_spec_with_extra_endowed(id, Default::default())
 }
 
@@ -89,7 +89,7 @@ pub fn get_chain_spec(id: ParaId) -> ChainSpec {
 pub fn testnet_genesis_with_default_endowed(
 	mut extra_endowed_accounts: Vec<AccountId>,
 	self_para_id: Option<ParaId>,
-) -> cumulus_test_runtime::RuntimeGenesisConfig {
+) -> serde_json::Value {
 	let mut endowed = vec![
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
 		get_account_id_from_seed::<sr25519::Public>("Bob"),
@@ -114,21 +114,12 @@ pub fn testnet_genesis(
 	root_key: AccountId,
 	endowed_accounts: Vec<AccountId>,
 	self_para_id: Option<ParaId>,
-) -> cumulus_test_runtime::RuntimeGenesisConfig {
-	cumulus_test_runtime::RuntimeGenesisConfig {
-		system: cumulus_test_runtime::SystemConfig {
-			code: cumulus_test_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		glutton: Default::default(),
-		parachain_system: Default::default(),
-		balances: cumulus_test_runtime::BalancesConfig {
+) -> serde_json::Value {
+	serde_json::json!({
+		"balances": cumulus_test_runtime::BalancesConfig {
 			balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
 		},
-		sudo: cumulus_test_runtime::SudoConfig { key: Some(root_key) },
-		transaction_payment: Default::default(),
-		test_pallet: cumulus_test_runtime::TestPalletConfig { self_para_id, ..Default::default() },
-	}
+		"sudo": cumulus_test_runtime::SudoConfig { key: Some(root_key) },
+		"testPallet": cumulus_test_runtime::TestPalletConfig { self_para_id, ..Default::default() }
+	})
 }

cumulus/test/service/src/cli.rs

@@ -287,8 +287,9 @@ impl SubstrateCli for TestCollatorCli {
 
 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
 		Ok(match id {
-			"" => Box::new(cumulus_test_service::get_chain_spec(ParaId::from(self.parachain_id)))
-				as Box<_>,
+			"" => Box::new(cumulus_test_service::get_chain_spec(Some(ParaId::from(
+				self.parachain_id,
+			)))) as Box<_>,
 			path => {
 				let chain_spec =
 					cumulus_test_service::chain_spec::ChainSpec::from_json_file(path.into())?;

cumulus/test/service/src/genesis.rs

@@ -23,7 +23,7 @@ use sp_runtime::traits::Block as BlockT;
 
 /// Returns the initial head data for a parachain ID.
 pub fn initial_head_data(para_id: ParaId) -> HeadData {
-	let spec = crate::chain_spec::get_chain_spec(para_id);
+	let spec = crate::chain_spec::get_chain_spec(Some(para_id));
 	let block: Block = generate_genesis_block(&spec, sp_runtime::StateVersion::V1).unwrap();
 	let genesis_state = block.header().encode();
 	genesis_state.into()

cumulus/test/service/src/lib.rs

@@ -719,7 +719,7 @@ pub fn node_config(
 	let role = if is_collator { Role::Authority } else { Role::Full };
 	let key_seed = key.to_seed();
 	let mut spec =
-		Box::new(chain_spec::get_chain_spec_with_extra_endowed(para_id, endowed_accounts));
+		Box::new(chain_spec::get_chain_spec_with_extra_endowed(Some(para_id), endowed_accounts));
 
 	let mut storage = spec.as_storage_builder().build_storage().expect("could not build storage");
 

cumulus/test/service/src/main.rs

@@ -73,7 +73,7 @@ fn main() -> Result<(), sc_cli::Error> {
 			let runner = cli.create_runner(cmd)?;
 			runner.sync_run(|_config| {
 				let parachain_id = ParaId::from(cmd.parachain_id);
-				let spec = cumulus_test_service::get_chain_spec(parachain_id);
+				let spec = cumulus_test_service::get_chain_spec(Some(parachain_id));
 				cmd.base.run(&spec)
 			})
 		},