chainSpec: runtime genesis layout updated (#1469)

* chainSpec: runtime genesis layout updated * fix
paritytech · Nov 5, 2023 · 771fe7d · 771fe7d
1 parent ec51855
commit 771fe7d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/javascript/packages/orchestrator/src/chainSpec.ts b/javascript/packages/orchestrator/src/chainSpec.ts
@@ -632,7 +632,8 @@ export function getRuntimeConfig(chainSpec: any) {
   // runtime_genesis_config is no longer in ChainSpec after rococo runtime rework (refer to: https://github.com/paritytech/polkadot-sdk/pull/1256)
   // ChainSpec may contain a RuntimeGenesisConfigPatch
   return (
-    chainSpec.genesis.runtimeGenesisConfigPatch ||
+    chainSpec.genesis.runtimeGenesis?.config ||
+    chainSpec.genesis.runtimeGenesis?.patch ||
     chainSpec.genesis.runtime?.runtime_genesis_config ||
     chainSpec.genesis.runtime
   );

diff --git a/javascript/packages/orchestrator/src/paras.ts b/javascript/packages/orchestrator/src/paras.ts
@@ -107,9 +107,14 @@ export async function generateParachainFiles(
       if (plainData.genesis.runtime?.parachainInfo?.parachainId)
         plainData.genesis.runtime.parachainInfo.parachainId = parachain.id;
       else if (
-        plainData.genesis.runtimeGenesisConfigPatch?.parachainInfo?.parachainId
+        plainData.genesis.runtimeGenesis?.patch?.parachainInfo?.parachainId
       )
-        plainData.genesis.runtimeGenesisConfigPatch.parachainInfo.parachainId =
+        plainData.genesis.runtimeGenesis.patch.parachainInfo.parachainId =
+          parachain.id;
+      else if (
+        plainData.genesis.runtimeGenesis?.config?.parachainInfo?.parachainId
+      )
+        plainData.genesis.runtimeGenesis.config.parachainInfo.parachainId =
           parachain.id;
 
       writeChainSpec(chainSpecFullPathPlain, plainData);