change: adjust chainspec and zombienet settings

virto-network · Aug 29, 2024 · c8986bc · c8986bc
1 parent 71f2664
commit c8986bc
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 83 deletions.
diff --git a/node/src/chain_spec/kreivo/local.rs b/node/src/chain_spec/kreivo/local.rs
@@ -11,13 +11,13 @@ pub fn chain_spec() -> ChainSpec {
 	ChainSpec::builder(
 		kreivo_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
 		Extensions {
-			relay_chain: "rococo-local".into(),
+			relay_chain: "kusama-local".into(),
 			// You MUST set this to the correct network!
 			para_id: KREIVO_PARA_ID,
 		},
 	)
-	.with_name("Kreivo-Rococo Local")
-	.with_id("kreivo_rococo_local")
+	.with_name("Kreivo-Kusama Local")
+	.with_id("kreivo_kusama_local")
 	.with_chain_type(ChainType::Local)
 	.with_protocol_id(DEFAULT_PROTOCOL_ID)
 	.with_properties(properties)

diff --git a/node/src/command.rs b/node/src/command.rs
@@ -22,11 +22,11 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 		#[cfg(feature = "paseo")]
 		"" | "kreivo" => Box::new(chain_spec::kreivo::live::chain_spec()),
 		#[cfg(feature = "paseo")]
-		"local" => Box::new(chain_spec::kreivo::local::chain_spec()),
+		"kreivo-local" => Box::new(chain_spec::kreivo::local::chain_spec()),
 		#[cfg(not(feature = "paseo"))]
 		"" | "kreivo" => Box::new(chain_spec::kreivo::live::chain_spec()),
 		#[cfg(not(feature = "paseo"))]
-		"local" => Box::new(chain_spec::kreivo::local::chain_spec()),
+		"kreivo-local" => Box::new(chain_spec::kreivo::local::chain_spec()),
 		// -- Loading a specific spec from disk
 		path => Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?),
 	})

diff --git a/zombienet/kreivo-kusama-local.toml b/zombienet/kreivo-kusama-local.toml
@@ -0,0 +1,48 @@
+[settings]
+timeout = 1000
+
+[relaychain]
+chain = "kusama-local"
+chain_spec_command = "./bin/polkadot/chain-spec-generator {% raw %} {{chainName}} {% endraw %}"
+default_args = ["-lparachain=debug", "-lxcm=trace"]
+default_command = "./bin/polkadot"
+
+[[relaychain.nodes]]
+extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"]
+name = "alice"
+validator = true
+ws_port = 10000
+
+[[relaychain.nodes]]
+extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"]
+name = "bob"
+validator = true
+
+[[relaychain.nodes]]
+extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"]
+name = "charlie"
+validator = true
+
+[[relaychain.nodes]]
+extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"]
+name = "dave"
+validator = true
+
+[[parachains]]
+add_to_genesis = true
+chain = "local"
+cumulus_based = true
+id = 2281
+onboard_as_parachain = true
+
+[[parachains.collators]]
+args = ["--force-authoring --log=xcm=trace,parachain=trace"]
+command = "./target/release/virto-node"
+name = "kreivo1"
+ws_port = 20000
+
+[[parachains.collators]]
+args = ["--force-authoring --log=xcm=trace,parachain=trace"]
+command = "./target/release/virto-node"
+name = "kreivo2"
+ws_port = 21000
diff --git a/zombienet/kreivo-paseo-local.toml b/zombienet/kreivo-paseo-local.toml
@@ -2,46 +2,47 @@
 timeout = 1000
 
 [relaychain]
-chain_spec_path = "./release/paseo-local.raw.json"
+chain = "paseo-local"
+chain_spec_command = "./bin/paseo/chain-spec-generator {% raw %} {{chainName}} {% endraw %}"
+default_args = ["-lparachain=debug", "-lxcm=trace"]
 default_command = "./bin/polkadot"
-default_args = ["-lparachain=debug,xcm=trace"]
 
-  [[relaychain.nodes]]
-  name = "alice"
-  validator = true
-  ws_port = 10000
-  extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"]
+[[relaychain.nodes]]
+extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"]
+name = "alice"
+validator = true
+ws_port = 10000
 
-  [[relaychain.nodes]]
-  name = "bob"
-  validator = true
-  extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"]
+[[relaychain.nodes]]
+extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"]
+name = "bob"
+validator = true
 
-  [[relaychain.nodes]]
-  name = "charlie"
-  validator = true
-  extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"]
+[[relaychain.nodes]]
+extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"]
+name = "charlie"
+validator = true
 
-  [[relaychain.nodes]]
-  name = "dave"
-  validator = true
-  extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"]
+[[relaychain.nodes]]
+extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"]
+name = "dave"
+validator = true
 
 [[parachains]]
-id = 2281
 add_to_genesis = true
+chain = "local"
 cumulus_based = true
+id = 2281
 onboard_as_parachain = true
-chain = "local"
 
-  [[parachains.collators]]
-  name = "kreivo1"
-  command = "./target/release/virto-node"
-  ws_port = 20000
-  args = ["--force-authoring --log=xcm=trace,parachain=trace"]
-
-  [[parachains.collators]]
-  name = "kreivo2"
-  command = "./target/release/virto-node"
-  ws_port = 21000
-  args = ["--force-authoring --log=xcm=trace,parachain=trace"]
+[[parachains.collators]]
+args = ["--force-authoring --log=xcm=trace,parachain=trace"]
+command = "./target/release/virto-node"
+name = "kreivo1"
+ws_port = 20000
+
+[[parachains.collators]]
+args = ["--force-authoring --log=xcm=trace,parachain=trace"]
+command = "./target/release/virto-node"
+name = "kreivo2"
+ws_port = 21000
diff --git a/zombienet/kreivo-rococo-local.toml b/zombienet/kreivo-rococo-local.toml