From 48b369fff2650f2fb9538391337d704aac8ecff4 Mon Sep 17 00:00:00 2001 From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com> Date: Fri, 1 Sep 2023 10:05:06 +0200 Subject: [PATCH 1/6] chainSpec: support for injecting paras into RuntimeGenesisConfigPatch --- javascript/packages/orchestrator/src/chainSpec.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/javascript/packages/orchestrator/src/chainSpec.ts b/javascript/packages/orchestrator/src/chainSpec.ts index 9332f7f4a..9a4b9b2b1 100644 --- a/javascript/packages/orchestrator/src/chainSpec.ts +++ b/javascript/packages/orchestrator/src/chainSpec.ts @@ -432,6 +432,11 @@ export async function addParachainToGenesis( else if (runtimeConfig.parachainsParas) { paras = runtimeConfig.parachainsParas.paras; } + // The config may not contain paras. Since chainspec allows to contain the RuntimeGenesisConfig patch we can inject it. + else { + runtimeConfig.paras = { paras: [] }; + paras = runtimeConfig.paras.paras; + } if (paras) { const new_para = [ parseInt(para_id), @@ -622,9 +627,11 @@ function findAndReplaceConfig(obj1: any, obj2: any) { } export function getRuntimeConfig(chainSpec: any) { - const runtimeConfig = - chainSpec.genesis.runtime?.runtime_genesis_config || - chainSpec.genesis.runtime; + // runtime_genesis_config is no logner in ChainSpec after rococo runtime rework (refer to: https://github.com/paritytech/polkadot-sdk/pull/1256) + // ChainSpec may contain a RuntimeGenesisConfigPatch + const runtimeConfig = chainSpec.genesis.runtimeGenesisConfigPatch || + chainSpec.genesis.runtime?.runtime_genesis_config || + chainSpec.genesis.runtime; return runtimeConfig; } From 4b9371b2651137466a1f9aade9013a63d4ad5c6a Mon Sep 17 00:00:00 2001 From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com> Date: Fri, 1 Sep 2023 10:22:38 +0200 Subject: [PATCH 2/6] Update javascript/packages/orchestrator/src/chainSpec.ts Co-authored-by: Nikos Kontakis --- javascript/packages/orchestrator/src/chainSpec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascript/packages/orchestrator/src/chainSpec.ts b/javascript/packages/orchestrator/src/chainSpec.ts index 9a4b9b2b1..60263d187 100644 --- a/javascript/packages/orchestrator/src/chainSpec.ts +++ b/javascript/packages/orchestrator/src/chainSpec.ts @@ -435,7 +435,7 @@ export async function addParachainToGenesis( // The config may not contain paras. Since chainspec allows to contain the RuntimeGenesisConfig patch we can inject it. else { runtimeConfig.paras = { paras: [] }; - paras = runtimeConfig.paras.paras; + paras = []; } if (paras) { const new_para = [ From af2995f950474378faec1334ae98caef12eeb955 Mon Sep 17 00:00:00 2001 From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com> Date: Fri, 1 Sep 2023 10:23:26 +0200 Subject: [PATCH 3/6] Update javascript/packages/orchestrator/src/chainSpec.ts Co-authored-by: Nikos Kontakis --- javascript/packages/orchestrator/src/chainSpec.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/javascript/packages/orchestrator/src/chainSpec.ts b/javascript/packages/orchestrator/src/chainSpec.ts index 60263d187..c29af4718 100644 --- a/javascript/packages/orchestrator/src/chainSpec.ts +++ b/javascript/packages/orchestrator/src/chainSpec.ts @@ -629,11 +629,9 @@ function findAndReplaceConfig(obj1: any, obj2: any) { export function getRuntimeConfig(chainSpec: any) { // runtime_genesis_config is no logner in ChainSpec after rococo runtime rework (refer to: https://github.com/paritytech/polkadot-sdk/pull/1256) // ChainSpec may contain a RuntimeGenesisConfigPatch - const runtimeConfig = chainSpec.genesis.runtimeGenesisConfigPatch || + return chainSpec.genesis.runtimeGenesisConfigPatch || chainSpec.genesis.runtime?.runtime_genesis_config || chainSpec.genesis.runtime; - - return runtimeConfig; } export function readAndParseChainSpec(specPath: string) { From 6fb06c295fa89910d9be894c1f03476e9a0cc442 Mon Sep 17 00:00:00 2001 From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:33:04 +0200 Subject: [PATCH 4/6] formatting --- javascript/packages/orchestrator/src/chainSpec.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/javascript/packages/orchestrator/src/chainSpec.ts b/javascript/packages/orchestrator/src/chainSpec.ts index c29af4718..b9d885d86 100644 --- a/javascript/packages/orchestrator/src/chainSpec.ts +++ b/javascript/packages/orchestrator/src/chainSpec.ts @@ -629,9 +629,11 @@ function findAndReplaceConfig(obj1: any, obj2: any) { export function getRuntimeConfig(chainSpec: any) { // runtime_genesis_config is no logner 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.runtime?.runtime_genesis_config || - chainSpec.genesis.runtime; + return ( + chainSpec.genesis.runtimeGenesisConfigPatch || + chainSpec.genesis.runtime?.runtime_genesis_config || + chainSpec.genesis.runtime + ); } export function readAndParseChainSpec(specPath: string) { From af5d1ebb1567800aa425ecd2c5024ffb91f24411 Mon Sep 17 00:00:00 2001 From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:38:20 +0200 Subject: [PATCH 5/6] spelling --- javascript/packages/orchestrator/src/chainSpec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascript/packages/orchestrator/src/chainSpec.ts b/javascript/packages/orchestrator/src/chainSpec.ts index b9d885d86..8200852d8 100644 --- a/javascript/packages/orchestrator/src/chainSpec.ts +++ b/javascript/packages/orchestrator/src/chainSpec.ts @@ -627,7 +627,7 @@ function findAndReplaceConfig(obj1: any, obj2: any) { } export function getRuntimeConfig(chainSpec: any) { - // runtime_genesis_config is no logner in ChainSpec after rococo runtime rework (refer to: https://github.com/paritytech/polkadot-sdk/pull/1256) + // 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 || From 8c572276072e944a14840be4c4dd0da60652adde Mon Sep 17 00:00:00 2001 From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:54:25 +0200 Subject: [PATCH 6/6] Update javascript/packages/orchestrator/src/chainSpec.ts --- javascript/packages/orchestrator/src/chainSpec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascript/packages/orchestrator/src/chainSpec.ts b/javascript/packages/orchestrator/src/chainSpec.ts index 8200852d8..b05f0aac6 100644 --- a/javascript/packages/orchestrator/src/chainSpec.ts +++ b/javascript/packages/orchestrator/src/chainSpec.ts @@ -435,7 +435,7 @@ export async function addParachainToGenesis( // The config may not contain paras. Since chainspec allows to contain the RuntimeGenesisConfig patch we can inject it. else { runtimeConfig.paras = { paras: [] }; - paras = []; + paras = runtimeConfig.paras.paras; } if (paras) { const new_para = [