@acala-network/chopsticks 0.3.5 → 0.3.6

package/chopsticks.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('./dist/index.js')
+require('./dist/cli.js')

package/dist/api.d.ts

@@ -1,7 +1,6 @@
 import { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types';
 import { HexString } from '@polkadot/util/types';
 import { ProviderInterface } from '@polkadot/rpc-provider/types';
-import { WsProvider } from '@polkadot/rpc-provider';
 type ChainProperties = {
     ss58Format?: number;
     tokenDecimals?: number[];
@@ -28,7 +27,7 @@ export declare class Api {
     readonly signedExtensions: ExtDef;
     constructor(provider: ProviderInterface, signedExtensions?: ExtDef);
     disconnect(): Promise<void>;
-    get isReady(): Promise<void> | Promise<WsProvider>;
+    get isReady(): Promise<void> | undefined;
     get chain(): Promise<string>;
     get chainProperties(): Promise<ChainProperties>;
     getSystemName(): Promise<string>;

package/dist/api.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Api = void 0;
-const rpc_provider_1 = require("@polkadot/rpc-provider");
 class Api {
     #provider;
     #ready;
@@ -16,11 +15,18 @@ class Api {
         return this.#provider.disconnect();
     }
     get isReady() {
-        if (this.#provider instanceof rpc_provider_1.WsProvider) {
-            return this.#provider.isReady;
-        }
         if (!this.#ready) {
-            this.#ready = this.#provider.connect();
+            if (this.#provider['isReady']) {
+                this.#ready = this.#provider['isReady'];
+            }
+            else {
+                this.#ready = new Promise((resolve) => {
+                    this.#provider.on('connected', () => {
+                        resolve();
+                    });
+                    this.#provider.connect();
+                });
+            }
         }
         return this.#ready;
     }

package/dist/cli.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/cli.js

@@ -0,0 +1,168 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const helpers_1 = require("yargs/helpers");
+const node_fs_1 = require("node:fs");
+const js_yaml_1 = __importDefault(require("js-yaml"));
+const yargs_1 = __importDefault(require("yargs"));
+const _1 = require(".");
+const schema_1 = require("./schema");
+const decoder_1 = require("./utils/decoder");
+const dry_run_1 = require("./dry-run");
+const run_block_1 = require("./run-block");
+const processConfig = (path) => {
+    const configFile = (0, node_fs_1.readFileSync)(path, 'utf8');
+    const config = js_yaml_1.default.load(configFile);
+    return schema_1.configSchema.parse(config);
+};
+const processArgv = (argv) => {
+    if (argv.config) {
+        return { ...processConfig(argv.config), ...argv };
+    }
+    return argv;
+};
+const defaultOptions = {
+    endpoint: {
+        desc: 'Endpoint to connect to',
+        string: true,
+    },
+    block: {
+        desc: 'Block hash or block number. Default to latest block',
+    },
+    'wasm-override': {
+        desc: 'Path to wasm override',
+        string: true,
+    },
+    db: {
+        desc: 'Path to database',
+        string: true,
+    },
+    config: {
+        desc: 'Path to config file',
+        string: true,
+    },
+};
+(0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
+    .scriptName('chopsticks')
+    .command('run-block', 'Replay a block', (yargs) => yargs.options({
+    ...defaultOptions,
+    port: {
+        desc: 'Port to listen on',
+        number: true,
+    },
+    'output-path': {
+        desc: 'File path to print output',
+        string: true,
+    },
+    html: {
+        desc: 'Generate html with storage diff',
+    },
+    open: {
+        desc: 'Open generated html',
+    },
+}), async (argv) => {
+    await (0, run_block_1.runBlock)(processArgv(argv));
+})
+    .command('dry-run', 'Dry run an extrinsic', (yargs) => yargs.options({
+    ...defaultOptions,
+    extrinsic: {
+        desc: 'Extrinsic or call to dry run. If you pass call here then address is required to fake signature',
+        string: true,
+        required: true,
+    },
+    address: {
+        desc: 'Address to fake sign extrinsic',
+        string: true,
+    },
+    at: {
+        desc: 'Block hash to dry run',
+        string: true,
+    },
+    'output-path': {
+        desc: 'File path to print output',
+        string: true,
+    },
+    html: {
+        desc: 'Generate html with storage diff',
+    },
+    open: {
+        desc: 'Open generated html',
+    },
+}), async (argv) => {
+    await (0, dry_run_1.dryRun)(processArgv(argv));
+})
+    .command('dev', 'Dev mode', (yargs) => yargs.options({
+    ...defaultOptions,
+    port: {
+        desc: 'Port to listen on',
+        number: true,
+    },
+    'build-block-mode': {
+        desc: 'Build block mode. Default to Batch',
+        enum: [_1.BuildBlockMode.Batch, _1.BuildBlockMode.Manual, _1.BuildBlockMode.Instant],
+    },
+    'import-storage': {
+        desc: 'Pre-defined JSON/YAML storage file path',
+        string: true,
+    },
+    'mock-signature-host': {
+        desc: 'Mock signature host so any signature starts with 0xdeadbeef and filled by 0xcd is considered valid',
+        boolean: true,
+    },
+    'allow-unresolved-imports': {
+        desc: 'Allow wasm unresolved imports',
+        boolean: true,
+    },
+}), async (argv) => {
+    await (0, _1.setupWithServer)(processArgv(argv));
+})
+    .command('decode-key <key>', 'Deocde a key', (yargs) => yargs
+    .positional('key', {
+    desc: 'Key to decode',
+    type: 'string',
+})
+    .options({
+    ...defaultOptions,
+}), async (argv) => {
+    const context = await (0, _1.setup)(processArgv(argv));
+    const { storage, decodedKey } = await (0, decoder_1.decodeKey)(context.chain.head, argv.key);
+    if (storage && decodedKey) {
+        console.log(`${storage.section}.${storage.method}`, decodedKey.args.map((x) => JSON.stringify(x.toHuman())).join(', '));
+    }
+    else {
+        console.log('Unknown');
+    }
+    process.exit(0);
+})
+    .command('xcm', 'XCM setup with relaychain and parachains', (yargs) => yargs.options({
+    relaychain: {
+        desc: 'Relaychain config file path',
+        string: true,
+    },
+    parachain: {
+        desc: 'Parachain config file path',
+        type: 'array',
+        string: true,
+        required: true,
+    },
+}), async (argv) => {
+    const parachains = [];
+    for (const config of argv.parachain) {
+        const { chain } = await (0, _1.setupWithServer)(processConfig(config));
+        parachains.push(chain);
+    }
+    if (parachains.length > 1) {
+        await (0, _1.connectParachains)(parachains);
+    }
+    if (argv.relaychain) {
+        const { chain: relaychain } = await (0, _1.setupWithServer)(processConfig(argv.relaychain));
+        for (const parachain of parachains) {
+            await (0, _1.connectVertical)(relaychain, parachain);
+        }
+    }
+})
+    .strict()
+    .help()
+    .alias('help', 'h').argv;

package/dist/genesis-provider.d.ts

@@ -10,7 +10,7 @@ export declare class GenesisProvider implements ProviderInterface {
     clone: () => ProviderInterface;
     get hasSubscriptions(): boolean;
     get isConnected(): boolean;
-    get isReady(): Promise<GenesisProvider>;
+    get isReady(): Promise<void>;
     connect: () => Promise<void>;
     disconnect: () => Promise<void>;
     on: (type: ProviderInterfaceEmitted, sub: ProviderInterfaceEmitCb) => (() => void);

package/dist/genesis-provider.js

@@ -26,7 +26,7 @@ class GenesisProvider {
         this.#eventemitter = new node_events_1.EventEmitter();
         this.#isReadyPromise = new Promise((resolve, reject) => {
             this.#eventemitter.once('connected', () => {
-                resolve(this);
+                resolve();
             });
             this.#eventemitter.once('error', reject);
         });
@@ -65,6 +65,7 @@ class GenesisProvider {
         return this.#isConnected;
     }
     get isReady() {
+        this.connect();
         return this.#isReadyPromise;
     }
     connect = async () => {

package/dist/index.d.ts

@@ -1 +1,7 @@
-export {};
+export { Api } from './api';
+export { Blockchain } from './blockchain';
+export { BuildBlockMode } from './blockchain/txpool';
+export { connectParachains, connectVertical } from './xcm';
+export { setup } from './setup';
+export { setupWithServer } from './setup-with-server';
+export * from './blockchain/inherent';

package/dist/index.js

@@ -1,171 +1,31 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const helpers_1 = require("yargs/helpers");
-const node_fs_1 = require("node:fs");
-const js_yaml_1 = __importDefault(require("js-yaml"));
-const yargs_1 = __importDefault(require("yargs"));
-const txpool_1 = require("./blockchain/txpool");
-const schema_1 = require("./schema");
-const xcm_1 = require("./xcm");
-const decoder_1 = require("./utils/decoder");
-const dry_run_1 = require("./dry-run");
-const run_block_1 = require("./run-block");
-const setup_1 = require("./setup");
-const setup_with_server_1 = require("./setup-with-server");
-const processConfig = (path) => {
-    const configFile = (0, node_fs_1.readFileSync)(path, 'utf8');
-    const config = js_yaml_1.default.load(configFile);
-    return schema_1.configSchema.parse(config);
-};
-const processArgv = (argv) => {
-    if (argv.config) {
-        return { ...processConfig(argv.config), ...argv };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
     }
-    return argv;
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-const defaultOptions = {
-    endpoint: {
-        desc: 'Endpoint to connect to',
-        string: true,
-    },
-    block: {
-        desc: 'Block hash or block number. Default to latest block',
-    },
-    'wasm-override': {
-        desc: 'Path to wasm override',
-        string: true,
-    },
-    db: {
-        desc: 'Path to database',
-        string: true,
-    },
-    config: {
-        desc: 'Path to config file',
-        string: true,
-    },
-};
-(0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
-    .scriptName('chopsticks')
-    .command('run-block', 'Replay a block', (yargs) => yargs.options({
-    ...defaultOptions,
-    port: {
-        desc: 'Port to listen on',
-        number: true,
-    },
-    'output-path': {
-        desc: 'File path to print output',
-        string: true,
-    },
-    html: {
-        desc: 'Generate html with storage diff',
-    },
-    open: {
-        desc: 'Open generated html',
-    },
-}), async (argv) => {
-    await (0, run_block_1.runBlock)(processArgv(argv));
-})
-    .command('dry-run', 'Dry run an extrinsic', (yargs) => yargs.options({
-    ...defaultOptions,
-    extrinsic: {
-        desc: 'Extrinsic or call to dry run. If you pass call here then address is required to fake signature',
-        string: true,
-        required: true,
-    },
-    address: {
-        desc: 'Address to fake sign extrinsic',
-        string: true,
-    },
-    at: {
-        desc: 'Block hash to dry run',
-        string: true,
-    },
-    'output-path': {
-        desc: 'File path to print output',
-        string: true,
-    },
-    html: {
-        desc: 'Generate html with storage diff',
-    },
-    open: {
-        desc: 'Open generated html',
-    },
-}), async (argv) => {
-    await (0, dry_run_1.dryRun)(processArgv(argv));
-})
-    .command('dev', 'Dev mode', (yargs) => yargs.options({
-    ...defaultOptions,
-    port: {
-        desc: 'Port to listen on',
-        number: true,
-    },
-    'build-block-mode': {
-        desc: 'Build block mode. Default to Batch',
-        enum: [txpool_1.BuildBlockMode.Batch, txpool_1.BuildBlockMode.Manual, txpool_1.BuildBlockMode.Instant],
-    },
-    'import-storage': {
-        desc: 'Pre-defined JSON/YAML storage file path',
-        string: true,
-    },
-    'mock-signature-host': {
-        desc: 'Mock signature host so any signature starts with 0xdeadbeef and filled by 0xcd is considered valid',
-        boolean: true,
-    },
-    'allow-unresolved-imports': {
-        desc: 'Allow wasm unresolved imports',
-        boolean: true,
-    },
-}), async (argv) => {
-    await (0, setup_with_server_1.setupWithServer)(processArgv(argv));
-})
-    .command('decode-key <key>', 'Deocde a key', (yargs) => yargs
-    .positional('key', {
-    desc: 'Key to decode',
-    type: 'string',
-})
-    .options({
-    ...defaultOptions,
-}), async (argv) => {
-    const context = await (0, setup_1.setup)(processArgv(argv));
-    const { storage, decodedKey } = await (0, decoder_1.decodeKey)(context.chain.head, argv.key);
-    if (storage && decodedKey) {
-        console.log(`${storage.section}.${storage.method}`, decodedKey.args.map((x) => JSON.stringify(x.toHuman())).join(', '));
-    }
-    else {
-        console.log('Unknown');
-    }
-    process.exit(0);
-})
-    .command('xcm', 'XCM setup with relaychain and parachains', (yargs) => yargs.options({
-    relaychain: {
-        desc: 'Relaychain config file path',
-        string: true,
-    },
-    parachain: {
-        desc: 'Parachain config file path',
-        type: 'array',
-        string: true,
-        required: true,
-    },
-}), async (argv) => {
-    const parachains = [];
-    for (const config of argv.parachain) {
-        const { chain } = await (0, setup_with_server_1.setupWithServer)(processConfig(config));
-        parachains.push(chain);
-    }
-    if (parachains.length > 1) {
-        await (0, xcm_1.connectParachains)(parachains);
-    }
-    if (argv.relaychain) {
-        const { chain: relaychain } = await (0, setup_with_server_1.setupWithServer)(processConfig(argv.relaychain));
-        for (const parachain of parachains) {
-            await (0, xcm_1.connectVertical)(relaychain, parachain);
-        }
-    }
-})
-    .strict()
-    .help()
-    .alias('help', 'h').argv;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupWithServer = exports.setup = exports.connectVertical = exports.connectParachains = exports.BuildBlockMode = exports.Blockchain = exports.Api = void 0;
+var api_1 = require("./api");
+Object.defineProperty(exports, "Api", { enumerable: true, get: function () { return api_1.Api; } });
+var blockchain_1 = require("./blockchain");
+Object.defineProperty(exports, "Blockchain", { enumerable: true, get: function () { return blockchain_1.Blockchain; } });
+var txpool_1 = require("./blockchain/txpool");
+Object.defineProperty(exports, "BuildBlockMode", { enumerable: true, get: function () { return txpool_1.BuildBlockMode; } });
+var xcm_1 = require("./xcm");
+Object.defineProperty(exports, "connectParachains", { enumerable: true, get: function () { return xcm_1.connectParachains; } });
+Object.defineProperty(exports, "connectVertical", { enumerable: true, get: function () { return xcm_1.connectVertical; } });
+var setup_1 = require("./setup");
+Object.defineProperty(exports, "setup", { enumerable: true, get: function () { return setup_1.setup; } });
+var setup_with_server_1 = require("./setup-with-server");
+Object.defineProperty(exports, "setupWithServer", { enumerable: true, get: function () { return setup_with_server_1.setupWithServer; } });
+__exportStar(require("./blockchain/inherent"), exports);

package/dist/rpc/dev.js

@@ -23,7 +23,7 @@ const handlers = {
         }
         return finalHash;
     },
-    dev_setStorages: async (context, params) => {
+    dev_setStorage: async (context, params) => {
         const [values, blockHash] = params;
         const hash = await (0, set_storage_1.setStorage)(context.chain, values, blockHash).catch((error) => {
             throw new shared_1.ResponseError(1, error.toString());
@@ -31,7 +31,7 @@ const handlers = {
         logger.debug({
             hash,
             values,
-        }, 'dev_setStorages');
+        }, 'dev_setStorage');
         return hash;
     },
     dev_timeTravel: async (context, [date]) => {

package/dist/rpc/substrate/system.js

@@ -27,7 +27,7 @@ const handlers = {
         return {
             peers: 0,
             isSyncing: false,
-            shouldhVePeers: false,
+            shouldHavePeers: false,
         };
     },
     system_dryRun: async (context, [extrinsic, at]) => {

package/dist/schema/index.d.ts

@@ -35,12 +35,12 @@ export declare const genesisSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     name: string;
-    id: string;
     properties: {
         ss58Format?: number | undefined;
         tokenDecimals?: number | number[] | undefined;
         tokenSymbol?: string | string[] | undefined;
     };
+    id: string;
     genesis: {
         raw: {
             top: Record<string, string>;
@@ -48,12 +48,12 @@ export declare const genesisSchema: z.ZodObject<{
     };
 }, {
     name: string;
-    id: string;
     properties: {
         ss58Format?: number | undefined;
         tokenDecimals?: number | number[] | undefined;
         tokenSymbol?: string | string[] | undefined;
     };
+    id: string;
     genesis: {
         raw: {
             top: Record<string, string>;
@@ -105,12 +105,12 @@ export declare const configSchema: z.ZodObject<{
         }>;
     }, "strip", z.ZodTypeAny, {
         name: string;
-        id: string;
         properties: {
             ss58Format?: number | undefined;
             tokenDecimals?: number | number[] | undefined;
             tokenSymbol?: string | string[] | undefined;
         };
+        id: string;
         genesis: {
             raw: {
                 top: Record<string, string>;
@@ -118,12 +118,12 @@ export declare const configSchema: z.ZodObject<{
         };
     }, {
         name: string;
-        id: string;
         properties: {
             ss58Format?: number | undefined;
             tokenDecimals?: number | number[] | undefined;
             tokenSymbol?: string | string[] | undefined;
         };
+        id: string;
         genesis: {
             raw: {
                 top: Record<string, string>;
@@ -136,12 +136,12 @@ export declare const configSchema: z.ZodObject<{
     db?: string | undefined;
     genesis?: string | {
         name: string;
-        id: string;
         properties: {
             ss58Format?: number | undefined;
             tokenDecimals?: number | number[] | undefined;
             tokenSymbol?: string | string[] | undefined;
         };
+        id: string;
         genesis: {
             raw: {
                 top: Record<string, string>;
@@ -160,12 +160,12 @@ export declare const configSchema: z.ZodObject<{
     db?: string | undefined;
     genesis?: string | {
         name: string;
-        id: string;
         properties: {
             ss58Format?: number | undefined;
             tokenDecimals?: number | number[] | undefined;
             tokenSymbol?: string | string[] | undefined;
         };
+        id: string;
         genesis: {
             raw: {
                 top: Record<string, string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
@@ -15,18 +15,18 @@
     "lint": "tsc --noEmit --project tsconfig.json && eslint . --ext .js,.ts && prettier --check .",
     "fix": "eslint . --ext .js,.ts --fix && prettier -w .",
     "prepare": "husky install",
-    "start": "ts-node --transpile-only src/index.ts",
+    "start": "ts-node --transpile-only src/cli.ts",
     "build": "rm -rf dist && tsc -p tsconfig.prod.json",
     "build-wasm": "wasm-pack build executor --target nodejs --scope acala-network",
     "build-wasm-logging": "yarn build-wasm --features=logging",
     "check": "cd executor && cargo check --locked",
     "test": "vitest --silent",
     "test:dev": "LOG_LEVEL=trace vitest --inspect",
-    "dev": "LOG_LEVEL=trace ts-node-dev --transpile-only --inspect --notify=false src/index.ts -- dev --config=configs/dev.yml",
-    "dev:karura": "ts-node-dev --transpile-only --inspect --notify=false src/index.ts -- dev --config=configs/karura.yml",
-    "dev:acala": "ts-node-dev --transpile-only --inspect --notify=false src/index.ts -- dev --config=configs/acala.yml",
-    "dev:moonriver": "ts-node-dev --transpile-only --inspect --notify=false src/index.ts -- dev --config=configs/moonriver.yml",
-    "dev:moonbeam": "ts-node-dev --transpile-only --inspect --notify=false src/index.ts -- dev --config=configs/moonbeam.yml"
+    "dev": "LOG_LEVEL=trace ts-node-dev --transpile-only --inspect --notify=false src/cli.ts -- dev --config=configs/dev.yml",
+    "dev:karura": "ts-node-dev --transpile-only --inspect --notify=false src/cli.ts -- dev --config=configs/karura.yml",
+    "dev:acala": "ts-node-dev --transpile-only --inspect --notify=false src/cli.ts -- dev --config=configs/acala.yml",
+    "dev:moonriver": "ts-node-dev --transpile-only --inspect --notify=false src/cli.ts -- dev --config=configs/moonriver.yml",
+    "dev:moonbeam": "ts-node-dev --transpile-only --inspect --notify=false src/cli.ts -- dev --config=configs/moonbeam.yml"
   },
   "dependencies": {
     "@acala-network/chopsticks-executor": "0.3.0",
@@ -74,8 +74,7 @@
   "files": [
     "dist",
     "bin",
-    "template",
-    "chopsticks.mjs"
+    "template"
   ],
   "engines": {
     "node": ">=v14"