Enhance substrate CLI args version handling in network configuration

- Added `defaultSubstrateCliArgsVersion` to `ComputedNetwork` interface.
- Updated `generateNetworkSpec` to utilize the new default substrate CLI args version.
- Improved `setSubstrateCliArgsVersion` to detect and log nodes and collators missing the version configuration.

Author: DenzelPenzel

javascript/packages/orchestrator/src/configGenerator.ts

@@ -132,6 +132,8 @@ export async function generateNetworkSpec(
       defaultPrometheusPrefix:
         config.relaychain.default_prometheus_prefix ||
         DEFAULT_PROMETHEUS_PREFIX,
+      defaultSubstrateCliArgsVersion:
+        config.relaychain.default_substrate_cli_args_version,
       delayNetworkSettings:
         config.relaychain.default_delay_network_settings ||
         config.settings?.global_delay_network_global_settings,
@@ -226,7 +228,7 @@ export async function generateNetworkSpec(
           networkSpec.relaychain.defaultPrometheusPrefix,
         substrate_cli_args_version:
           nodeGroup.substrate_cli_args_version ||
-          networkSpec.relaychain.default_substrate_cli_args_version,
+          networkSpec.relaychain.defaultSubstrateCliArgsVersion,
       };
 
       const nodeSetup = await getNodeFromConfig(
@@ -419,6 +421,8 @@ export async function generateNetworkSpec(
         para,
         cumulusBased: isCumulusBased,
         defaultArgs: parachain.default_args || [],
+        defaultSubstrateCliArgsVersion:
+          parachain.default_substrate_cli_args_version,
         addToGenesis:
           parachain.add_to_genesis === undefined
             ? true
@@ -644,6 +648,16 @@ async function getCollatorNodeFromConfig(
   };
 
   if (group) node.group = group;
+
+  if (
+    collatorConfig.substrate_cli_args_version ||
+    parachain.default_substrate_cli_args_version
+  )
+    node.substrateCliArgsVersion =
+      collatorConfig.substrate_cli_args_version ||
+      parachain.default_substrate_cli_args_version ||
+      undefined; // will be detected as part of the bootstrap process
+
   return node;
 }
 
@@ -740,11 +754,12 @@ async function getNodeFromConfig(
   if (dbSnapshot) nodeSetup.dbSnapshot = dbSnapshot;
   if (
     node.substrate_cli_args_version ||
-    networkSpec.default_substrate_cli_args_version
+    networkSpec.relaychain.defaultSubstrateCliArgsVersion
   )
     nodeSetup.substrateCliArgsVersion =
       node.substrate_cli_args_version ||
-      networkSpec.default_substrate_cli_args_version;
+      networkSpec.relaychain.defaultSubstrateCliArgsVersion ||
+      undefined; // will be detected as part of the bootstrap process
   return nodeSetup;
 }
 

javascript/packages/orchestrator/src/configTypes.ts

@@ -57,6 +57,7 @@ export interface ComputedNetwork {
     defaultArgs: string[];
     defaultDbSnapshot?: string;
     defaultPrometheusPrefix: string;
+    defaultSubstrateCliArgsVersion?: SubstrateCliArgsVersion;
     chain: string;
     chainSpecPath?: string;
     chainSpecCommand?: string;
@@ -124,6 +125,7 @@ export interface ParachainConfig extends CommonParachainConfig {
   cumulus_based?: boolean;
   bootnodes?: string[];
   prometheus_prefix?: string;
+  default_substrate_cli_args_version?: SubstrateCliArgsVersion;
   // backward compatibility
   collator?: NodeConfig;
   collators?: NodeConfig[];

javascript/packages/orchestrator/src/orchestrator.ts

@@ -245,6 +245,9 @@ export async function start(
 
     // Set substrate client argument version, needed from breaking change.
     // see https://github.com/paritytech/substrate/pull/13384
+    // This will only spawn detection processes for nodes that don't have
+    // substrate_cli_args_version configured via default_substrate_cli_args_version
+    // or individual node substrate_cli_args_version settings
     await setSubstrateCliArgsVersion(networkSpec, client);
 
     const random_suffix_to_isolate = networkSpec.settings.isolate_env

javascript/packages/orchestrator/src/sharedTypes.ts

@@ -54,6 +54,7 @@ export interface Parachain extends CommonParachainConfig {
   statePath?: string;
   collators: Node[];
   defaultArgs: string[];
+  defaultSubstrateCliArgsVersion?: SubstrateCliArgsVersion;
 }
 
 export interface Node extends NodeCommonTypes, Ports {

javascript/packages/orchestrator/src/substrateCliArgsHelper.ts

@@ -11,6 +11,23 @@ export const setSubstrateCliArgsVersion = async (
   network: ComputedNetwork,
   client: Client,
 ) => {
+  const nodesNeedingVersion = network.relaychain.nodes.filter(
+    (node) => !node.substrateCliArgsVersion,
+  );
+  const collatorsNeedingVersion = network.parachains.flatMap((parachain) =>
+    parachain.collators.filter((collator) => !collator.substrateCliArgsVersion),
+  );
+
+  if (
+    nodesNeedingVersion.length === 0 &&
+    collatorsNeedingVersion.length === 0
+  ) {
+    debug(
+      "All nodes already have substrate_cli_args_version configured, skipping detection",
+    );
+    return;
+  }
+
   const { getCliArgsHelp } = getProvider(client.providerName);
   // Calculate substrate cli version for each node
   // and set in the node to use later when we build the cmd.