fix(orchestrator): use tmp dir when we create paras artifacts (#1638)

* fix(orchestrator): use tmp dir when we create paras artifacts * Fix nix hash * lint * typo * downgrade chai to 4.x * Fix nix hash * fix lock file * Fix nix hash --------- Co-authored-by: pepoviola <[email protected]>
paritytech · Jan 2, 2024 · 80224c3 · 80224c3
1 parent 35b2811
commit 80224c3
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 58 deletions.
diff --git a/flake-module.nix b/flake-module.nix
@@ -8,7 +8,7 @@
     ...
   }: let
     # this change on each change of dependencies, unfortunately this hash not yet automatically updated from SRI of package.lock
-    npmDepsHash = "sha256-PK1YPfUkLWwzpAQ00S7j5VbfLA8G+zxHaDN4Bjwz7lc=";
+    npmDepsHash = "sha256-FMIJ+cCwnskUaqrKVgs8klsQVCwEt9q4FvjhqEg9B28=";
     ####
 
     # there is officia polkadot on nixpkgs, but it has no local rococo wasm to run

diff --git a/javascript/package-lock.json b/javascript/package-lock.json
diff --git a/javascript/packages/orchestrator/package.json b/javascript/packages/orchestrator/package.json
@@ -41,7 +41,7 @@
     "@polkadot/keyring": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.1",
     "@zombienet/utils": "^0.0.24",
-    "chai": "^5.0.0",
+    "chai": "^4.3.10",
     "debug": "^4.3.4",
     "execa": "^5.1.1",
     "fs-extra": "^11.2.0",

diff --git a/javascript/packages/orchestrator/src/paras.ts b/javascript/packages/orchestrator/src/paras.ts
@@ -241,6 +241,21 @@ export async function generateParachainFiles(
           chainSpecPathInNode!,
         );
       }
+
+      if (client.providerName === "native") {
+        // inject a tmp base-path to prevent the use of a pre-existing un-purged data directory.
+        // see https://github.com/paritytech/zombienet/issues/1519
+        // NOTE: this is only needed in native provider since un k8s/podman the fs is always fresh
+        const exportGenesisStateCustomPath = `${client.tmpDir}/export-genesis-state/${parachain.id}`;
+        await fs.promises.mkdir(exportGenesisStateCustomPath, {
+          recursive: true,
+        });
+        genesisStateGenerator = injectBasePathInCmd(
+          genesisStateGenerator,
+          exportGenesisStateCustomPath,
+        );
+      }
+
       commands.push(`${genesisStateGenerator}-${parachain.id}`);
     }
     if (parachain.genesisWasmGenerator) {
@@ -359,3 +374,15 @@ function injectChainInCmd(cmd: string, chain: string): string {
   parts.splice(index, 0, `--chain ${chain}`);
   return parts.join(" ");
 }
+
+// Inject the base-path  (e.g. --base-path <path> or -d <path>)
+// IFF is not present
+function injectBasePathInCmd(cmd: string, path: string): string {
+  const parts = cmd.split(" ").filter(Boolean);
+  // IFF is present don't modify the cmd
+  if (parts.includes("-d") || parts.includes("--base-path")) return cmd;
+
+  // inject just after the subcommand
+  parts.splice(2, 0, `-d ${path}`);
+  return parts.join(" ");
+}