Merge branch 'nik-make-cumulus-based-true-by-default' of github.com:p…

…aritytech/zombienet into nik-make-cumulus-based-true-by-default
paritytech · Feb 23, 2023 · 6252e81 · 6252e81
2 parents 8c73687 + 3687ea2
commit 6252e81
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/javascript/packages/cli/package.json b/javascript/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zombienet/cli",
-  "version": "1.3.34",
+  "version": "1.3.35",
   "description": "ZombieNet aim to be a testing framework for substrate based blockchains, providing a simple cli tool that allow users to spawn and test ephemeral Substrate based networks",
   "main": "dist/index.js",
   "scripts": {
@@ -53,8 +53,8 @@
   },
   "dependencies": {
     "@zombienet/dsl-parser-wrapper": "^0.1.7",
-    "@zombienet/orchestrator": "^0.0.25",
-    "@zombienet/utils": "^0.0.14",
+    "@zombienet/orchestrator": "^0.0.26",
+    "@zombienet/utils": "^0.0.15",
     "axios": "^0.27.2",
     "commander": "^10.0.0",
     "debug": "^4.3.2",

diff --git a/javascript/packages/orchestrator/package.json b/javascript/packages/orchestrator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zombienet/orchestrator",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "ZombieNet aim to be a testing framework for substrate based blockchains, providing a simple cli tool that allow users to spawn and test ephemeral Substrate based networks",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -36,7 +36,7 @@
     "@polkadot/api": "^9.2.4",
     "@polkadot/keyring": "^10.1.6",
     "@polkadot/util-crypto": "^10.1.6",
-    "@zombienet/utils": "^0.0.14",
+    "@zombienet/utils": "^0.0.15",
     "axios": "^0.27.2",
     "chai": "^4.3.4",
     "debug": "^4.3.2",

diff --git a/javascript/packages/orchestrator/src/configGenerator.ts b/javascript/packages/orchestrator/src/configGenerator.ts
@@ -23,6 +23,7 @@ import {
   DEFAULT_WASM_GENERATE_SUBCOMMAND,
   GENESIS_STATE_FILENAME,
   GENESIS_WASM_FILENAME,
+  UNDYING_COLLATOR_BIN,
   ZOMBIE_WRAPPER,
 } from "./constants";
 import { generateKeyForNode } from "./keys";
@@ -350,11 +351,20 @@ export async function generateNetworkSpec(
         computedWasmCommand += ` > {{CLIENT_REMOTE_DIR}}/${GENESIS_WASM_FILENAME}`;
       }
 
+      // IF is defined use that value
+      // else check if the command is one off undying/adder otherwise true
+      const isCumulusBased =
+        parachain.cumulus_based !== undefined
+          ? parachain.cumulus_based
+          : ![DEFAULT_ADDER_COLLATOR_BIN, UNDYING_COLLATOR_BIN].includes(
+              collators[0].command!,
+            );
+
       let parachainSetup: Parachain = {
         id: parachain.id,
         name: getUniqueName(parachain.id.toString()),
         para,
-        cumulusBased: parachain.cumulus_based || true,
+        cumulusBased: isCumulusBased,
         addToGenesis:
           parachain.add_to_genesis === undefined
             ? true

diff --git a/javascript/packages/orchestrator/src/constants.ts b/javascript/packages/orchestrator/src/constants.ts
@@ -36,6 +36,7 @@ const DEFAULT_CHAIN_SPEC_COMMAND =
 const DEFAULT_GENESIS_GENERATE_SUBCOMMAND = "export-genesis-state";
 const DEFAULT_WASM_GENERATE_SUBCOMMAND = "export-genesis-wasm";
 const DEFAULT_ADDER_COLLATOR_BIN = "adder-collator";
+const UNDYING_COLLATOR_BIN = "undying-collator";
 const DEFAULT_CUMULUS_COLLATOR_BIN = "polkadot-parachain";
 const DEFAULT_COLLATOR_IMAGE = "paritypr/colander:4131-e5c7e975";
 const DEFAULT_MAX_NOMINATIONS = 24; // kusama value is 24
@@ -150,4 +151,5 @@ export {
   DEV_ACCOUNTS,
   DEFAULT_BALANCE,
   ARGS_TO_REMOVE,
+  UNDYING_COLLATOR_BIN,
 };
diff --git a/javascript/packages/utils/package.json b/javascript/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zombienet/utils",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "Useful utilities for ZombieNet Framework",
   "main": "dist/index.js",
   "author": "Parity Technologies <admin@parity.io>",