From d66821db30d4fb78520f11310a6aae011fc0181f Mon Sep 17 00:00:00 2001 From: Shunsuke Watanabe Date: Fri, 28 Apr 2023 13:08:14 +0900 Subject: [PATCH 1/2] updated swanky-node version --- packages/cli/src/commands/node/start.ts | 6 ++++++ packages/core/src/lib/nodeInfo.ts | 18 +++++++++++------- packages/core/src/lib/tasks.ts | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/packages/cli/src/commands/node/start.ts b/packages/cli/src/commands/node/start.ts index 717ff8c7..cc1718e7 100644 --- a/packages/cli/src/commands/node/start.ts +++ b/packages/cli/src/commands/node/start.ts @@ -18,6 +18,11 @@ export class StartNode extends Command { Without it, you may need to specify by comma separated string. By default, 'http://localhost:*,http://127.0.0.1:*,https://localhost:*,https://127.0.0.1:*,https://polkadot.js.org,https://contracts-ui.substrate.io/' is set.`, }), + finalizeDelaySec: Flags.integer({ + required: false, + default: 0, // 0 means instant finalitization + description: "Delay time in seconds after blocks being sealed", + }) }; async run(): Promise { @@ -30,6 +35,7 @@ export class StartNode extends Command { // Non-Persistent mode (`--dev`) allows all CORS origin, without `--dev`, users need to specify origins by `--rpc-cors`. await execa.command( `${config.node.localPath} \ + --finalize-delay-sec ${flags.finalizeDelaySec} \ ${flags.tmp ? "--dev" : `--rpc-cors ${flags.rpcCors}`}`, { stdio: "inherit", diff --git a/packages/core/src/lib/nodeInfo.ts b/packages/core/src/lib/nodeInfo.ts index 9e2d2fd9..3064488a 100644 --- a/packages/core/src/lib/nodeInfo.ts +++ b/packages/core/src/lib/nodeInfo.ts @@ -1,13 +1,17 @@ export type nodeInfo = typeof swankyNode; export const swankyNode = { - version: "1.1.0", - polkadotPalletVersions: "polkadot-v0.9.37", - supportedInk: "v4.0.0", + version: "1.6.0", + polkadotPalletVersions: "polkadot-v0.9.39", + supportedInk: "v4.2.0", downloadUrl: { - darwin: - "https://github.com/AstarNetwork/swanky-node/releases/download/v1.1.0/swanky-node-v1.1.0-macOS-x86_64.tar.gz", - linux: - "https://github.com/AstarNetwork/swanky-node/releases/download/v1.1.0/swanky-node-v1.1.0-ubuntu-x86_64.tar.gz", + darwin: { + "arm64": "https://github.com/AstarNetwork/swanky-node/releases/download/v1.6.0/swanky-node-v1.6.0-macOS-universal.tar.gz", + "x64": "https://github.com/AstarNetwork/swanky-node/releases/download/v1.6.0/swanky-node-v1.6.0-macOS-universal.tar.gz" + }, + linux: { + "arm64": "https://github.com/AstarNetwork/swanky-node/releases/download/v1.6.0/swanky-node-v1.6.0-ubuntu-aarch64.tar.gz", + "x64": "https://github.com/AstarNetwork/swanky-node/releases/download/v1.6.0/swanky-node-v1.6.0-ubuntu-x86_64.tar.gz", + } }, }; diff --git a/packages/core/src/lib/tasks.ts b/packages/core/src/lib/tasks.ts index b511220d..492ffefd 100644 --- a/packages/core/src/lib/tasks.ts +++ b/packages/core/src/lib/tasks.ts @@ -91,7 +91,7 @@ export async function processTemplates(projectPath: string, templateData: Record export async function downloadNode(projectPath: string, nodeInfo: nodeInfo, spinner: Spinner) { const binPath = path.resolve(projectPath, "bin"); await ensureDir(binPath); - const dlUrl = nodeInfo.downloadUrl[process.platform]; + const dlUrl = nodeInfo.downloadUrl[process.platform][process.arch]; if (!dlUrl) throw new Error(`Could not download swanky-node. Platform ${process.platform} not supported!`); From b59a11d1e5a7af4cfb973fb18ec558efa2c582e9 Mon Sep 17 00:00:00 2001 From: Shunsuke Watanabe Date: Fri, 28 Apr 2023 16:21:28 +0900 Subject: [PATCH 2/2] up --- packages/cli/src/commands/node/install.ts | 5 +++++ packages/core/src/lib/tasks.ts | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/commands/node/install.ts b/packages/cli/src/commands/node/install.ts index bd65dca3..de69bee6 100644 --- a/packages/cli/src/commands/node/install.ts +++ b/packages/cli/src/commands/node/install.ts @@ -10,6 +10,11 @@ export class InstallNode extends BaseCommand { async run(): Promise { await ensureSwankyProject(); + const { flags } = await this.parse(InstallNode); + if (flags.verbose) { + this.spinner.verbose = true; + } + const projectPath = path.resolve(); if (this.swankyConfig.node.localPath !== "") { diff --git a/packages/core/src/lib/tasks.ts b/packages/core/src/lib/tasks.ts index 492ffefd..631d62ff 100644 --- a/packages/core/src/lib/tasks.ts +++ b/packages/core/src/lib/tasks.ts @@ -91,10 +91,15 @@ export async function processTemplates(projectPath: string, templateData: Record export async function downloadNode(projectPath: string, nodeInfo: nodeInfo, spinner: Spinner) { const binPath = path.resolve(projectPath, "bin"); await ensureDir(binPath); - const dlUrl = nodeInfo.downloadUrl[process.platform][process.arch]; - if (!dlUrl) + const platformDlUrls = nodeInfo.downloadUrl[process.platform]; + if (!platformDlUrls) throw new Error(`Could not download swanky-node. Platform ${process.platform} not supported!`); + + const dlUrl = platformDlUrls[process.arch]; + if (!dlUrl) + throw new Error(`Could not download swanky-node. Platform ${process.platform} Arch ${process.arch} not supported!`); + const dlFileDetails = await new Promise((resolve, reject) => { const dl = new DownloaderHelper(dlUrl, binPath);