From dbae1f62695780bf405b702a99a7dc5de236cc60 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Thu, 26 Oct 2023 21:21:57 -0300
Subject: [PATCH] fix(orchestrator): allow to use '--<dev-account>' flag in
 args

---
 .../orchestrator/src/configGenerator.ts       | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/javascript/packages/orchestrator/src/configGenerator.ts b/javascript/packages/orchestrator/src/configGenerator.ts
index 20f007e1f..58fea0e48 100644
--- a/javascript/packages/orchestrator/src/configGenerator.ts
+++ b/javascript/packages/orchestrator/src/configGenerator.ts
@@ -24,6 +24,7 @@ import {
   DEFAULT_PORTS,
   DEFAULT_PROMETHEUS_PREFIX,
   DEFAULT_WASM_GENERATE_SUBCOMMAND,
+  DEV_ACCOUNTS,
   GENESIS_STATE_FILENAME,
   GENESIS_WASM_FILENAME,
   UNDYING_COLLATOR_BIN,
@@ -516,8 +517,6 @@ async function getCollatorNodeFromConfig(
   group?: string,
 ): Promise<Node> {
   let args: string[] = [];
-  if (collatorConfig.args)
-    args = args.concat(sanitizeArgs(collatorConfig.args, { "listen-addr": 2 }));
 
   const env = collatorConfig.env
     ? DEFAULT_ENV.concat(collatorConfig.env)
@@ -545,6 +544,10 @@ async function getCollatorNodeFromConfig(
       ? true
       : false;
 
+  if (collatorConfig.args)
+    args = args.concat(sanitizeArgs(collatorConfig.args, { "listen-addr": 2 }, { nodeName: collatorName, isValidator }));
+
+
   const node: Node = {
     name: collatorName,
     key: getSha256(collatorName),
@@ -596,9 +599,7 @@ async function getNodeFromConfig(
     : networkSpec.relaychain.defaultCommand;
   const image = node.image || networkSpec.relaychain.defaultImage;
   let args: string[] = sanitizeArgs(networkSpec.relaychain.defaultArgs || []);
-  if (node.args) args = args.concat(sanitizeArgs(node.args));
 
-  const uniqueArgs = [...new Set(args)];
   const env = node.env ? DEFAULT_ENV.concat(node.env) : DEFAULT_ENV;
 
   let nodeOverrides: Override[] = [];
@@ -628,6 +629,8 @@ async function getNodeFromConfig(
   const ports = await getPorts(provider, node);
   const externalPorts = await getExternalPorts(provider, ports, node);
 
+  if (node.args) args = args.concat(sanitizeArgs(node.args, {}, {nodeName, isValidator}));
+  const uniqueArgs = [...new Set(args)];
   // build node Setup
   const nodeSetup: Node = {
     name: nodeName,
@@ -687,6 +690,10 @@ async function getNodeFromConfig(
 function sanitizeArgs(
   args: string[],
   extraArgsToRemove: { [key: string]: number } = {},
+  context?: {
+    nodeName: string,
+    isValidator: boolean
+  }
 ): string[] {
   // Do NOT filter any argument to the internal full-node of the collator
   const augmentedArgsToRemove = { ...ARGS_TO_REMOVE, ...extraArgsToRemove };
@@ -702,6 +709,11 @@ function sanitizeArgs(
 
       const argParsed = arg === "-d" ? "d" : arg.replace(/--/g, "");
       if (augmentedArgsToRemove[argParsed]) {
+        // Don't sanitize `--<dev_account>` flags
+        // IFF the node name is one of the dev accounts and is set to be a validator
+        // see: https://github.com/paritytech/zombienet/issues/1448
+        if (context && argParsed === context.nodeName && context.isValidator && DEV_ACCOUNTS.includes(argParsed)) return true;
+
         if (augmentedArgsToRemove[argParsed] === 2) removeNext = true;
         return false;
       } else {
@@ -713,6 +725,7 @@ function sanitizeArgs(
   if (separatorIndex >= 0) {
     filteredArgs.push(...args.slice(separatorIndex));
   }
+
   return filteredArgs;
 }