Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add onboard_as_parachain flag to parachain options #886

Merged
merged 17 commits into from
Apr 6, 2023
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flake-module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
default = pkgs.buildNpmPackage rec {
# root hash (hash of hashes of each dependnecies)
# this should be updated on each dependency change (use `prefetch-npm-deps` to get new hash)
npmDepsHash = "sha256-hsQ7Z0/wU8FPNWeR68N9NnbvW95Ux1gHwk+MoTQYBRE=";
npmDepsHash = "sha256-lA8xOKnzthgscr0pMmQ6KcZjYxNdOK5lfZ301PZ29Xg=";

pname = "zombienet";
name = pname;
Expand Down
1 change: 1 addition & 0 deletions javascript/packages/orchestrator/src/configGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ export async function generateNetworkSpec(
parachain.register_para === undefined
? true
: parachain.register_para, // register by default
onboardAsParachain: parachain.onboard_as_parachain || false,
antonva marked this conversation as resolved.
Show resolved Hide resolved
collators,
};

Expand Down
18 changes: 10 additions & 8 deletions javascript/packages/orchestrator/src/jsapi-helpers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { ApiPromise, WsProvider } from "@polkadot/api";
import { Keyring } from "@polkadot/keyring";
import { cryptoWaitReady } from "@polkadot/util-crypto";
import { readDataFile } from "@zombienet/utils";
import { RegisterParachainOptions } from "../types";
import {
chainCustomSectionUpgrade,
chainUpgradeFromLocalFile,
Expand All @@ -18,14 +19,15 @@ async function connect(apiUrl: string, types?: any): Promise<ApiPromise> {
return api;
}

async function registerParachain(
id: number,
wasmPath: string,
statePath: string,
apiUrl: string,
seed: string = "//Alice",
async function registerParachain({
id,
wasmPath,
statePath,
apiUrl,
onboard_as_parachain,
antonva marked this conversation as resolved.
Show resolved Hide resolved
seed = "//Alice",
finalization = false,
) {
}: RegisterParachainOptions) {
return new Promise<void>(async (resolve, reject) => {
await cryptoWaitReady();

Expand All @@ -42,7 +44,7 @@ async function registerParachain(
const parachainGenesisArgs = {
genesis_head: genesis_state,
validation_code: wasm_data,
parachain: true,
parachain: onboard_as_parachain,
antonva marked this conversation as resolved.
Show resolved Hide resolved
};

const genesis = api.createType("ParaGenesisArgs", parachainGenesisArgs);
Expand Down
13 changes: 7 additions & 6 deletions javascript/packages/orchestrator/src/orchestrator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -703,12 +703,13 @@ export async function start(
for (const parachain of networkSpec.parachains) {
if (!parachain.addToGenesis && parachain.registerPara) {
// register parachain on a running network
await registerParachain(
parachain.id,
`${tmpDir.path}/${parachain.name}/${GENESIS_WASM_FILENAME}`,
`${tmpDir.path}/${parachain.name}/${GENESIS_STATE_FILENAME}`,
network.relay[0].wsUri,
);
await registerParachain({
id: parachain.id,
wasmPath: `${tmpDir.path}/${parachain.name}/${GENESIS_WASM_FILENAME}`,
statePath: `${tmpDir.path}/${parachain.name}/${GENESIS_STATE_FILENAME}`,
apiUrl: network.relay[0].wsUri,
onboard_as_parachain: parachain.onboardAsParachain,
antonva marked this conversation as resolved.
Show resolved Hide resolved
});
}

if (parachain.cumulusBased) {
Expand Down
12 changes: 12 additions & 0 deletions javascript/packages/orchestrator/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export interface ParachainConfig {
chain?: string;
add_to_genesis?: boolean;
register_para?: boolean;
onboard_as_parachain?: boolean;
balance?: number;
genesis_wasm_path?: string;
genesis_wasm_generator?: string;
Expand Down Expand Up @@ -203,6 +204,7 @@ export interface Parachain {
para: PARA;
addToGenesis: boolean;
registerPara: boolean;
onboardAsParachain: boolean;
cumulusBased: boolean;
genesisWasmPath?: string;
genesisWasmGenerator?: string;
Expand Down Expand Up @@ -347,3 +349,13 @@ export interface PL_ConfigType {
types?: any;
finalization?: boolean;
}

export interface RegisterParachainOptions {
id: number;
wasmPath: string;
statePath: string;
apiUrl: string;
onboard_as_parachain: boolean;
antonva marked this conversation as resolved.
Show resolved Hide resolved
seed?: string;
finalization?: boolean;
}