add chain specs, and more

kianenigma · kianenigma · commit d2e033bb88a0 · 2023-06-23T15:02:25.000+02:00
diff --git a/ensure_node_compatible.sh b/ensure_node_compatible.sh
@@ -29,7 +29,10 @@ do
 
             if cargo test -p tutorial-node >/dev/null 2>&1; then
                 echo "✅ cargo test for ${dir} completed successfully"
+				cargo run -p tutorial-node -- build-spec --dev > tutorial/${dir}/dev.json 2>/dev/null
+				echo "✅ written chain spec to tutorial/${dir}/dev.json"
             else
+				echo "❌ cargo test for ${dir} completed with errors"
                 cargo test -p tutorial-node >/dev/null
             fi
 
diff --git a/staging/node/src/chain_spec.rs b/staging/node/src/chain_spec.rs
@@ -28,23 +28,6 @@ pub fn development_config() -> Result<ChainSpec, String> {
 	))
 }
 
-pub fn local_testnet_config() -> Result<ChainSpec, String> {
-	let wasm_binary = WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?;
-
-	Ok(ChainSpec::from_genesis(
-		"Local Testnet",
-		"local_testnet",
-		ChainType::Local,
-		move || testnet_genesis(wasm_binary),
-		vec![],
-		None,
-		None,
-		None,
-		Some(props()),
-		None,
-	))
-}
-
 /// Configure initial storage state for FRAME modules.
 fn testnet_genesis(wasm_binary: &[u8]) -> RuntimeGenesisConfig {
 	use frame::traits::Get;
diff --git a/staging/node/src/command.rs b/staging/node/src/command.rs
@@ -37,7 +37,6 @@ impl SubstrateCli for Cli {
 	fn load_spec(&self, id: &str) -> Result<Box<dyn sc_service::ChainSpec>, String> {
 		Ok(match id {
 			"dev" => Box::new(chain_spec::development_config()?),
-			"" | "local" => Box::new(chain_spec::local_testnet_config()?),
 			path =>
 				Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?),
 		})
diff --git a/staging/runtime/src/lib.rs b/staging/runtime/src/lib.rs
@@ -19,7 +19,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("minimal-runtime"),
 	impl_name: create_runtime_str!("minimal-runtime"),
 	authoring_version: 1,
-	spec_version: 100,
+	spec_version: 0,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -86,6 +86,7 @@ impl pallet_balances::Config for Runtime {
 	type RuntimeHoldReason = RuntimeHoldReason;
 	type DustRemoval = ();
 	type AccountStore = System;
+	type ExistentialDeposit = ();
 }
 
 #[derive_impl(pallet_sudo::config_preludes::SolochainDefaultConfig as pallet_sudo::DefaultConfig)]
diff --git a/tutorial/node/src/chain_spec.rs b/tutorial/node/src/chain_spec.rs
@@ -6,15 +6,15 @@ pub type ChainSpec = sc_service::GenericChainSpec<RuntimeGenesisConfig>;
 fn props() -> Properties {
 	let mut properties = Properties::new();
 	properties.insert("tokenDecimals".to_string(), 0.into());
-	properties.insert("tokenSymbol".to_string(), "TEST".into());
+	properties.insert("tokenSymbol".to_string(), "UNIT".into());
 	properties
 }
 
 pub fn development_config() -> Result<ChainSpec, String> {
 	let wasm_binary = WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?;
 	Ok(ChainSpec::from_genesis(
-		"Development",
-		"dev",
+		"Polkadot-SDK-Tutorial-Development",
+		"pst-dev",
 		ChainType::Development,
 		move || testnet_genesis(wasm_binary),
 		vec![],
@@ -26,30 +26,10 @@ pub fn development_config() -> Result<ChainSpec, String> {
 	))
 }
 
-pub fn local_testnet_config() -> Result<ChainSpec, String> {
-	let wasm_binary = WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?;
-
-	Ok(ChainSpec::from_genesis(
-		"Local Testnet",
-		"local_testnet",
-		ChainType::Local,
-		move || testnet_genesis(wasm_binary),
-		vec![],
-		None,
-		None,
-		None,
-		Some(props()),
-		None,
-	))
-}
-
 /// Configure initial storage state for FRAME modules.
 fn testnet_genesis(wasm_binary: &[u8]) -> RuntimeGenesisConfig {
 	RuntimeGenesisConfig {
-		system: SystemConfig {
-			// Add Wasm runtime to storage.
-			code: wasm_binary.to_vec(),
-		},
+		system: SystemConfig { code: wasm_binary.to_vec() },
 		..Default::default()
 	}
 }
diff --git a/tutorial/node/src/command.rs b/tutorial/node/src/command.rs
@@ -36,8 +36,7 @@ impl SubstrateCli for Cli {
 
 	fn load_spec(&self, id: &str) -> Result<Box<dyn sc_service::ChainSpec>, String> {
 		Ok(match id {
-			"dev" => Box::new(chain_spec::development_config()?),
-			"" | "local" => Box::new(chain_spec::local_testnet_config()?),
+			"dev" | "" => Box::new(chain_spec::development_config()?),
 			path =>
 				Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?),
 		})
diff --git a/tutorial/step-3/runtime/src/lib.rs b/tutorial/step-3/runtime/src/lib.rs
@@ -6,10 +6,10 @@ use pallets::currency::pallet as pallet_currency;
 
 #[runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
-	spec_name: create_runtime_str!("node-template"),
-	impl_name: create_runtime_str!("node-template"),
+	spec_name: create_runtime_str!("tutorial-node"),
+	impl_name: create_runtime_str!(""),
 	authoring_version: 1,
-	spec_version: 100,
+	spec_version: 3,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
diff --git a/tutorial/step-4/README.md b/tutorial/step-4/README.md
@@ -1,6 +1,7 @@
 # Step 4
 
-In this step, we will only tweak the existing runtime such that it will compile to WASM as well.
+In this step, we will only tweak the existing runtime such that it will compile to WASM as well. We
+also combine it with a substrate node template.
 
 - [Step 4](#step-4)
 	- [information Points](#information-points)
diff --git a/tutorial/step-4/runtime/src/lib.rs b/tutorial/step-4/runtime/src/lib.rs
@@ -12,10 +12,10 @@ use pallets::currency::pallet as pallet_currency;
 
 #[runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
-	spec_name: create_runtime_str!("node-template"),
-	impl_name: create_runtime_str!("node-template"),
+	spec_name: create_runtime_str!("tutorial-node"),
+	impl_name: create_runtime_str!(""),
 	authoring_version: 1,
-	spec_version: 100,
+	spec_version: 4,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
diff --git a/tutorial/step-5/README.md b/tutorial/step-5/README.md
@@ -13,7 +13,7 @@ In this step, we will start using `#[pallet::genesis]` features.
 ## In the code
 
 - Let's look at our `test_state()`. Not so pretty. Also, when we launched a node, it had no initial
-  balance. Can we do better? yes.
+  balance when we ran a node. Can we do better? yes.
 - start by adding `#[pallet::genesis_config]`. The fields of this struct are the pieces of
   information that your pallet expects to receive from someone (eg. a genesis chain specification).
   For our case, we expect to get a list of accounts and balances.
diff --git a/tutorial/step-5/runtime/src/lib.rs b/tutorial/step-5/runtime/src/lib.rs
@@ -16,10 +16,10 @@ use pallets::currency::pallet as pallet_currency;
 
 #[runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
-	spec_name: create_runtime_str!("node-template"),
-	impl_name: create_runtime_str!("node-template"),
+	spec_name: create_runtime_str!("tutorial-node"),
+	impl_name: create_runtime_str!(""),
 	authoring_version: 1,
-	spec_version: 100,
+	spec_version: 5,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
diff --git a/tutorial/step-6/runtime/src/lib.rs b/tutorial/step-6/runtime/src/lib.rs
@@ -16,10 +16,10 @@ use pallets::{currency::pallet as pallet_currency, staking::pallet as pallet_sta
 
 #[runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
-	spec_name: create_runtime_str!("node-template"),
-	impl_name: create_runtime_str!("node-template"),
+	spec_name: create_runtime_str!("tutorial-node"),
+	impl_name: create_runtime_str!(""),
 	authoring_version: 1,
-	spec_version: 100,
+	spec_version: 6,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
