From 35cf50ea5c8634138e6d6f0a5283f10f62a886a2 Mon Sep 17 00:00:00 2001 From: Andrea Giacobino Date: Thu, 25 Jan 2024 00:07:49 +0100 Subject: [PATCH 1/3] use the new chainspec format post polkadot-sdk-v1.4.0 --- src/tools/run-moonbeam-fork.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tools/run-moonbeam-fork.ts b/src/tools/run-moonbeam-fork.ts index 2dea117..3e7da0a 100644 --- a/src/tools/run-moonbeam-fork.ts +++ b/src/tools/run-moonbeam-fork.ts @@ -444,11 +444,14 @@ const main = async () => { ], ], ]; + relayChainSpec.genesis.runtimeGenesis.patch.paras = paras; + /* if ("runtime_genesis_config" in relayChainSpec.genesis.runtime) { relayChainSpec.genesis.runtime.runtime_genesis_config.paras = paras; } else { relayChainSpec.genesis.runtime.paras = paras; } + */ await fs.writeFile(relayPlainSpecFile, JSON.stringify(relayChainSpec, null, 2)); process.stdout.write(` ✓\n`); process.stdout.write(`\t - ${chalk.yellow(`Saving`)} plain relaychain spec...`); From e3fbbe7b27829f928e6ff26ec4a7b04b1798509f Mon Sep 17 00:00:00 2001 From: crystalin Date: Thu, 25 Jan 2024 08:40:00 +0100 Subject: [PATCH 2/3] Keep fix retro-compatible --- src/tools/run-moonbeam-fork.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/tools/run-moonbeam-fork.ts b/src/tools/run-moonbeam-fork.ts index 3e7da0a..7922415 100644 --- a/src/tools/run-moonbeam-fork.ts +++ b/src/tools/run-moonbeam-fork.ts @@ -444,14 +444,16 @@ const main = async () => { ], ], ]; - relayChainSpec.genesis.runtimeGenesis.patch.paras = paras; - /* - if ("runtime_genesis_config" in relayChainSpec.genesis.runtime) { + if ("patch" in relayChainSpec.genesis?.runtimeGenesis) { + relayChainSpec.genesis.runtimeGenesis.patch.paras = paras; + } else if ("runtime_genesis_config" in relayChainSpec.genesis?.runtime) { relayChainSpec.genesis.runtime.runtime_genesis_config.paras = paras; - } else { + } else if ("paras" in relayChainSpec.genesis?.runtime) { relayChainSpec.genesis.runtime.paras = paras; + } else { + process.stdout.write(` X - Could not find parachain genesis format.\n`); + process.exit(1); } - */ await fs.writeFile(relayPlainSpecFile, JSON.stringify(relayChainSpec, null, 2)); process.stdout.write(` ✓\n`); process.stdout.write(`\t - ${chalk.yellow(`Saving`)} plain relaychain spec...`); From 0d60e89af4e2362ab2d9b1f06b1c062bc2fd08d0 Mon Sep 17 00:00:00 2001 From: crystalin Date: Thu, 25 Jan 2024 08:41:29 +0100 Subject: [PATCH 3/3] better desc --- src/tools/run-moonbeam-fork.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/run-moonbeam-fork.ts b/src/tools/run-moonbeam-fork.ts index 7922415..900dd2e 100644 --- a/src/tools/run-moonbeam-fork.ts +++ b/src/tools/run-moonbeam-fork.ts @@ -451,7 +451,7 @@ const main = async () => { } else if ("paras" in relayChainSpec.genesis?.runtime) { relayChainSpec.genesis.runtime.paras = paras; } else { - process.stdout.write(` X - Could not find parachain genesis format.\n`); + process.stdout.write(` X - Could not find parachain format in relay genesis file.\n`); process.exit(1); } await fs.writeFile(relayPlainSpecFile, JSON.stringify(relayChainSpec, null, 2));