From 0dfab48121e65767eee831003235508db6121f30 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Fri, 3 Nov 2023 11:27:08 -0300
Subject: [PATCH 1/2] fix(orchestrator): fix chain-spec cmd custom

---
 .../orchestrator/src/configGenerator.ts       |  4 ++--
 javascript/packages/orchestrator/src/paras.ts | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/javascript/packages/orchestrator/src/configGenerator.ts b/javascript/packages/orchestrator/src/configGenerator.ts
index ccb948744..5a2c5f5dc 100644
--- a/javascript/packages/orchestrator/src/configGenerator.ts
+++ b/javascript/packages/orchestrator/src/configGenerator.ts
@@ -414,9 +414,9 @@ export async function generateNetworkSpec(
         }
       } else {
         parachainSetup.chainSpecCommand = parachain.chain_spec_command
-          ? config.relaychain.chain_spec_command
+          ? parachain.chain_spec_command
           : `${collatorBinary} build-spec ${
-              parachain.chain ? "--chain " + parachain.chain : ""
+              parachain.chain ? "--chain {{chainName}}" : ""
             } --disable-default-bootnode`;
       }
 
diff --git a/javascript/packages/orchestrator/src/paras.ts b/javascript/packages/orchestrator/src/paras.ts
index 4bb692de2..1bf2d6253 100644
--- a/javascript/packages/orchestrator/src/paras.ts
+++ b/javascript/packages/orchestrator/src/paras.ts
@@ -91,7 +91,7 @@ export async function generateParachainFiles(
           chainSpecCommand: parachain.chainSpecCommand!,
           defaultImage: parachain.collators[0].image,
         },
-        chainName,
+        parachain.chain,
         chainSpecFullPathPlain,
       );
     }
@@ -157,11 +157,7 @@ export async function generateParachainFiles(
       // Generate the raw chain-spec logic
 
       // Make sure we include the plain chain-spec
-      const chainSpecRawCommand = parachain
-        .chainSpecCommand!.split(" ")
-        .includes("--chain")
-        ? parachain.chainSpecCommand
-        : `${parachain.chainSpecCommand} --chain {{chainName}}`;
+      const chainSpecRawCommand = getChainSpecCmdRaw(parachain.chainSpecCommand!);
 
       await getChainSpecRaw(
         namespace,
@@ -333,3 +329,14 @@ export async function generateParachainFiles(
 
   return;
 }
+
+function getChainSpecCmdRaw(chainSpecCommand: string) {
+  // Default to the provided cmd, will work for custom generator.
+  let returnCmd = chainSpecCommand;
+  const parts = chainSpecCommand!.split(" ").filter((part: string) => part.length);
+  if(parts.includes("build-spec") && !parts.includes("--chain")) {
+    returnCmd = `${chainSpecCommand} --chain {{chainName}}`;
+  }
+
+  return returnCmd;
+}

From fe15e49095b7470a39f6ea25be2fe6e226f4c7a6 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Fri, 3 Nov 2023 11:32:19 -0300
Subject: [PATCH 2/2] fmt

---
 javascript/packages/orchestrator/src/paras.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/javascript/packages/orchestrator/src/paras.ts b/javascript/packages/orchestrator/src/paras.ts
index 1bf2d6253..b17d05184 100644
--- a/javascript/packages/orchestrator/src/paras.ts
+++ b/javascript/packages/orchestrator/src/paras.ts
@@ -157,7 +157,9 @@ export async function generateParachainFiles(
       // Generate the raw chain-spec logic
 
       // Make sure we include the plain chain-spec
-      const chainSpecRawCommand = getChainSpecCmdRaw(parachain.chainSpecCommand!);
+      const chainSpecRawCommand = getChainSpecCmdRaw(
+        parachain.chainSpecCommand!,
+      );
 
       await getChainSpecRaw(
         namespace,
@@ -333,8 +335,10 @@ export async function generateParachainFiles(
 function getChainSpecCmdRaw(chainSpecCommand: string) {
   // Default to the provided cmd, will work for custom generator.
   let returnCmd = chainSpecCommand;
-  const parts = chainSpecCommand!.split(" ").filter((part: string) => part.length);
-  if(parts.includes("build-spec") && !parts.includes("--chain")) {
+  const parts = chainSpecCommand!
+    .split(" ")
+    .filter((part: string) => part.length);
+  if (parts.includes("build-spec") && !parts.includes("--chain")) {
     returnCmd = `${chainSpecCommand} --chain {{chainName}}`;
   }