From 5e16cbc58f173e56b18629bc8fab213114400fc5 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Tue, 2 May 2023 10:30:30 -0300
Subject: [PATCH] fix(orchestrator): make genesis overrides first (#989)

* fix(orchestrator): make genesis overrides first

* fmt
---
 javascript/packages/orchestrator/src/chainSpec.ts | 9 +++++----
 javascript/packages/orchestrator/src/paras.ts     | 7 ++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/javascript/packages/orchestrator/src/chainSpec.ts b/javascript/packages/orchestrator/src/chainSpec.ts
index a6c64e0fb..fd7ccfc93 100644
--- a/javascript/packages/orchestrator/src/chainSpec.ts
+++ b/javascript/packages/orchestrator/src/chainSpec.ts
@@ -674,6 +674,11 @@ export async function customizePlainRelayChain(
       ? "session"
       : "aura";
 
+    // make genesis overrides first.
+    if (networkSpec.relaychain.genesis) {
+      await changeGenesisConfig(specPath, networkSpec.relaychain.genesis);
+    }
+
     // Clear all defaults
     clearAuthorities(specPath);
 
@@ -707,10 +712,6 @@ export async function customizePlainRelayChain(
       );
     }
 
-    if (networkSpec.relaychain.genesis) {
-      await changeGenesisConfig(specPath, networkSpec.relaychain.genesis);
-    }
-
     if (networkSpec.hrmp_channels) {
       await addHrmpChannelsToGenesis(specPath, networkSpec.hrmp_channels);
     }
diff --git a/javascript/packages/orchestrator/src/paras.ts b/javascript/packages/orchestrator/src/paras.ts
index ce9c44907..5f56dd676 100644
--- a/javascript/packages/orchestrator/src/paras.ts
+++ b/javascript/packages/orchestrator/src/paras.ts
@@ -108,6 +108,10 @@ export async function generateParachainFiles(
 
       writeChainSpec(chainSpecFullPathPlain, plainData);
 
+      // make genesis overrides first.
+      if (parachain.genesis)
+        await changeGenesisConfig(chainSpecFullPathPlain, parachain.genesis);
+
       // clear auths
       await clearAuthorities(chainSpecFullPathPlain);
 
@@ -137,9 +141,6 @@ export async function generateParachainFiles(
         }
       }
 
-      if (parachain.genesis)
-        await changeGenesisConfig(chainSpecFullPathPlain, parachain.genesis);
-
       debug("creating chain spec raw");
       // ensure needed file
       if (parachain.chain)