@acala-network/chopsticks 0.5.10 → 0.6.0

package/lib/blockchain/block.d.ts

@@ -8,6 +8,7 @@ import type { RuntimeVersion } from '../executor';
 export type TaskCallResponse = {
     result: HexString;
     storageDiff: [HexString, HexString | null][];
+    runtimeLogs: string[];
 };
 export declare class Block {
     #private;

package/lib/blockchain/block.js

@@ -7,6 +7,7 @@ const util_1 = require("@polkadot/types-known/util");
 const util_2 = require("@polkadot/util");
 const storage_layer_1 = require("./storage-layer");
 const utils_1 = require("../utils");
+const logger_1 = require("../logger");
 const executor_1 = require("../executor");
 class Block {
     number;
@@ -172,9 +173,14 @@ class Block {
             storage,
             mockSignatureHost: this.#chain.mockSignatureHost,
             allowUnresolvedImports: this.#chain.allowUnresolvedImports,
+            runtimeLogLevel: this.#chain.runtimeLogLevel,
         }, (0, executor_1.taskHandler)(this));
-        if (response.Call)
+        if (response.Call) {
+            for (const log of response.Call.runtimeLogs) {
+                logger_1.defaultLogger.info(`RuntimeLogs:\n${log}`);
+            }
             return response.Call;
+        }
         if (response.Error)
             throw Error(response.Error);
         throw Error('Unexpected response');

package/lib/blockchain/index.d.ts

@@ -18,6 +18,7 @@ export interface Options {
     };
     mockSignatureHost?: boolean;
     allowUnresolvedImports?: boolean;
+    runtimeLogLevel?: number;
     registeredTypes: RegisteredTypes;
 }
 export declare class Blockchain {
@@ -27,9 +28,10 @@ export declare class Blockchain {
     readonly db: DataSource | undefined;
     readonly mockSignatureHost: boolean;
     readonly allowUnresolvedImports: boolean;
+    readonly runtimeLogLevel: number;
     readonly registeredTypes: RegisteredTypes;
     readonly headState: HeadState;
-    constructor({ api, buildBlockMode, inherentProvider, db, header, mockSignatureHost, allowUnresolvedImports, registeredTypes, }: Options);
+    constructor({ api, buildBlockMode, inherentProvider, db, header, mockSignatureHost, allowUnresolvedImports, runtimeLogLevel, registeredTypes, }: Options);
     get head(): Block;
     get txPool(): TxPool;
     getBlockAt(number?: number): Promise<Block | undefined>;

package/lib/blockchain/index.js

@@ -16,6 +16,7 @@ class Blockchain {
     db;
     mockSignatureHost;
     allowUnresolvedImports;
+    runtimeLogLevel;
     registeredTypes;
     #txpool;
     #inherentProvider;
@@ -24,11 +25,12 @@ class Blockchain {
     #blocksByHash = {};
     #loadingBlocks = {};
     headState;
-    constructor({ api, buildBlockMode, inherentProvider, db, header, mockSignatureHost = false, allowUnresolvedImports = false, registeredTypes = {}, }) {
+    constructor({ api, buildBlockMode, inherentProvider, db, header, mockSignatureHost = false, allowUnresolvedImports = false, runtimeLogLevel = 0, registeredTypes = {}, }) {
         this.api = api;
         this.db = db;
         this.mockSignatureHost = mockSignatureHost;
         this.allowUnresolvedImports = allowUnresolvedImports;
+        this.runtimeLogLevel = runtimeLogLevel;
         this.registeredTypes = registeredTypes;
         this.#head = new block_1.Block(this, header.number, header.hash);
         this.#registerBlock(this.#head);

package/lib/blockchain/txpool.d.ts

@@ -28,6 +28,10 @@ export declare class TxPool {
     readonly event: EventEmitter;
     constructor(chain: Blockchain, inherentProvider: InherentProvider, mode?: BuildBlockMode);
     get pendingExtrinsics(): HexString[];
+    get ump(): Record<number, HexString[]>;
+    get dmp(): DownwardMessage[];
+    get hrmp(): Record<number, HorizontalMessage[]>;
+    clear(): void;
     pendingExtrinsicsBy(address: string): HexString[];
     submitExtrinsic(extrinsic: HexString): Promise<void>;
     submitUpwardMessages(id: number, ump: HexString[]): void;

package/lib/blockchain/txpool.js

@@ -36,6 +36,25 @@ class TxPool {
     get pendingExtrinsics() {
         return this.#pool.map(({ extrinsic }) => extrinsic);
     }
+    get ump() {
+        return this.#ump;
+    }
+    get dmp() {
+        return this.#dmp;
+    }
+    get hrmp() {
+        return this.#hrmp;
+    }
+    clear() {
+        this.#pool.length = 0;
+        for (const id of Object.keys(this.#ump)) {
+            delete this.#ump[id];
+        }
+        this.#dmp.length = 0;
+        for (const id of Object.keys(this.#hrmp)) {
+            delete this.#hrmp[id];
+        }
+    }
     pendingExtrinsicsBy(address) {
         return this.#pool.filter(({ signer }) => signer === address).map(({ extrinsic }) => extrinsic);
     }

package/lib/cli.js

@@ -5,7 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const helpers_1 = require("yargs/helpers");
 const node_fs_1 = require("node:fs");
+const lodash_1 = __importDefault(require("lodash"));
 const axios_1 = __importDefault(require("axios"));
+const dotenv_1 = __importDefault(require("dotenv"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const yargs_1 = __importDefault(require("yargs"));
 const _1 = require(".");
@@ -16,6 +18,7 @@ const dry_run_preimage_1 = require("./dry-run-preimage");
 const utils_1 = require("./utils");
 const run_block_1 = require("./run-block");
 const try_runtime_1 = require("./try-runtime");
+dotenv_1.default.config();
 const processConfig = async (path) => {
     let file;
     if ((0, utils_1.isUrl)(path)) {
@@ -24,7 +27,7 @@ const processConfig = async (path) => {
     else {
         file = (0, node_fs_1.readFileSync)(path, 'utf8');
     }
-    const config = js_yaml_1.default.load(file);
+    const config = js_yaml_1.default.load(lodash_1.default.template(file, { variable: 'env' })(process.env));
     return schema_1.configSchema.parse(config);
 };
 const processArgv = async (argv) => {
@@ -55,6 +58,10 @@ const defaultOptions = {
         desc: 'Path to config file',
         string: true,
     },
+    'runtime-log-level': {
+        desc: 'Runtime maximum log level [off = 0; error = 1; warn = 2; info = 3; debug = 4; trace = 5]',
+        number: true,
+    },
 };
 (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .scriptName('chopsticks')

package/lib/dry-run-preimage.js

@@ -67,10 +67,14 @@ const dryRunPreimage = async (argv) => {
         storage: [],
         mockSignatureHost: false,
         allowUnresolvedImports: false,
+        runtimeLogLevel: argv['runtime-log-level'] || 0,
     }, (0, executor_1.taskHandler)(block));
     if (result.Error) {
         throw new Error(result.Error);
     }
+    for (const logs of result.Call.runtimeLogs) {
+        logger_1.defaultLogger.info(`RuntimeLogs:\n${logs}`);
+    }
     const filePath = await (0, generate_html_diff_1.generateHtmlDiffPreviewFile)(block, result.Call.storageDiff, hash);
     console.log(`Generated preview ${filePath}`);
     if (argv['open']) {
@@ -85,9 +89,7 @@ const dryRunPreimage = async (argv) => {
         if (outcome.isErr) {
             throw new Error(outcome.asErr.toString());
         }
-        else {
-            logger_1.defaultLogger.info(outcome.toHuman(), 'dry_run_outcome');
-        }
+        logger_1.defaultLogger.info(outcome.toHuman(), 'dry_run_outcome');
         const filePath = await (0, generate_html_diff_1.generateHtmlDiffPreviewFile)(context.chain.head, storageDiff, (0, util_crypto_1.blake2AsHex)(argv['extrinsic'], 256));
         console.log(`Generated preview ${filePath}`);
         if (argv['open']) {

package/lib/dry-run.js

@@ -14,9 +14,7 @@ const dryRun = async (argv) => {
     if (outcome.isErr) {
         throw new Error(outcome.asErr.toString());
     }
-    else {
-        logger_1.defaultLogger.info(outcome.toHuman(), 'dry_run_outcome');
-    }
+    logger_1.defaultLogger.info(outcome.toHuman(), 'dry_run_outcome');
     if (argv['html']) {
         const filePath = await (0, generate_html_diff_1.generateHtmlDiffPreviewFile)(context.chain.head, storageDiff, (0, util_crypto_1.blake2AsHex)(argv['extrinsic'], 256));
         console.log(`Generated preview ${filePath}`);

package/lib/executor.d.ts

@@ -30,6 +30,7 @@ export declare const runTask: (task: {
     storage: [HexString, HexString | null][];
     mockSignatureHost: boolean;
     allowUnresolvedImports: boolean;
+    runtimeLogLevel: number;
 }, callback?: JsCallback) => Promise<any>;
 export declare const taskHandler: (block: Block) => JsCallback;
 export declare const emptyTaskHandler: {

package/lib/executor.js

@@ -79,6 +79,7 @@ exports.getAuraSlotDuration = lodash_1.default.memoize(async (wasm, registry) =>
         storage: [],
         mockSignatureHost: false,
         allowUnresolvedImports: false,
+        runtimeLogLevel: 0,
     });
     if (!result.Call)
         throw new Error(result.Error);

package/lib/genesis-provider.js

@@ -127,6 +127,7 @@ class GenesisProvider {
                     storage: [],
                     mockSignatureHost: false,
                     allowUnresolvedImports: true,
+                    runtimeLogLevel: 0,
                 }, this._jsCallback);
             }
             case 'chain_getHeader':

package/lib/run-block.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runBlock = void 0;
 const node_fs_1 = require("node:fs");
+const logger_1 = require("./logger");
 const generate_html_diff_1 = require("./utils/generate-html-diff");
 const open_html_1 = require("./utils/open-html");
 const executor_1 = require("./executor");
@@ -25,10 +26,14 @@ const runBlock = async (argv) => {
         storage: [],
         mockSignatureHost: false,
         allowUnresolvedImports: false,
+        runtimeLogLevel: argv['runtime-log-level'] || 0,
     }, (0, executor_1.taskHandler)(parent));
     if (result.Error) {
         throw new Error(result.Error);
     }
+    for (const logs of result.Call.runtimeLogs) {
+        logger_1.defaultLogger.info(`RuntimeLogs:\n${logs}`);
+    }
     if (argv['html']) {
         const filePath = await (0, generate_html_diff_1.generateHtmlDiffPreviewFile)(parent, result.Call.storageDiff, block.hash);
         console.log(`Generated preview ${filePath}`);

package/lib/schema/index.d.ts

@@ -64,7 +64,7 @@ export type Genesis = z.infer<typeof genesisSchema>;
 export declare const configSchema: z.ZodObject<{
     port: z.ZodOptional<z.ZodNumber>;
     endpoint: z.ZodOptional<z.ZodString>;
-    block: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber]>>;
+    block: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodNull]>>;
     'build-block-mode': z.ZodOptional<z.ZodNativeEnum<typeof BuildBlockMode>>;
     'import-storage': z.ZodOptional<z.ZodAny>;
     'mock-signature-host': z.ZodOptional<z.ZodBoolean>;
@@ -132,10 +132,16 @@ export declare const configSchema: z.ZodObject<{
     }>]>>;
     timestamp: z.ZodOptional<z.ZodNumber>;
     'registered-types': z.ZodOptional<z.ZodAny>;
+    'runtime-log-level': z.ZodOptional<z.ZodNumber>;
 }, "strict", z.ZodTypeAny, {
-    timestamp?: number | undefined;
-    block?: string | number | undefined;
+    port?: number | undefined;
+    endpoint?: string | undefined;
+    block?: string | number | null | undefined;
+    'build-block-mode'?: BuildBlockMode | undefined;
+    'import-storage'?: any;
+    'mock-signature-host'?: boolean | undefined;
     db?: string | undefined;
+    'wasm-override'?: string | undefined;
     genesis?: string | {
         name: string;
         properties: {
@@ -150,17 +156,18 @@ export declare const configSchema: z.ZodObject<{
             };
         };
     } | undefined;
+    timestamp?: number | undefined;
+    'registered-types'?: any;
+    'runtime-log-level'?: number | undefined;
+}, {
     port?: number | undefined;
     endpoint?: string | undefined;
+    block?: string | number | null | undefined;
     'build-block-mode'?: BuildBlockMode | undefined;
     'import-storage'?: any;
     'mock-signature-host'?: boolean | undefined;
-    'wasm-override'?: string | undefined;
-    'registered-types'?: any;
-}, {
-    timestamp?: number | undefined;
-    block?: string | number | undefined;
     db?: string | undefined;
+    'wasm-override'?: string | undefined;
     genesis?: string | {
         name: string;
         properties: {
@@ -175,12 +182,8 @@ export declare const configSchema: z.ZodObject<{
             };
         };
     } | undefined;
-    port?: number | undefined;
-    endpoint?: string | undefined;
-    'build-block-mode'?: BuildBlockMode | undefined;
-    'import-storage'?: any;
-    'mock-signature-host'?: boolean | undefined;
-    'wasm-override'?: string | undefined;
+    timestamp?: number | undefined;
     'registered-types'?: any;
+    'runtime-log-level'?: number | undefined;
 }>;
 export type Config = z.infer<typeof configSchema>;

package/lib/schema/index.js

@@ -17,7 +17,7 @@ exports.configSchema = zod_1.z
     .object({
     port: zod_1.z.number().optional(),
     endpoint: zod_1.z.string().optional(),
-    block: zod_1.z.union([zod_1.z.string().length(66).startsWith('0x'), zod_1.z.number()]).optional(),
+    block: zod_1.z.union([zod_1.z.string().length(66).startsWith('0x'), zod_1.z.number(), zod_1.z.null()]).optional(),
     'build-block-mode': zod_1.z.nativeEnum(txpool_1.BuildBlockMode).optional(),
     'import-storage': zod_1.z.any().optional(),
     'mock-signature-host': zod_1.z.boolean().optional(),
@@ -26,5 +26,6 @@ exports.configSchema = zod_1.z
     genesis: zod_1.z.union([zod_1.z.string(), exports.genesisSchema]).optional(),
     timestamp: zod_1.z.number().optional(),
     'registered-types': zod_1.z.any().optional(),
+    'runtime-log-level': zod_1.z.number().min(0).max(5).optional(),
 })
     .strict();

package/lib/server.js

@@ -50,7 +50,7 @@ const createWS = async (port) => {
 const createServer = async (handler, port) => {
     let wss;
     let listenPort;
-    for (let i = 0; i < 5; i++) {
+    for (let i = 0; i < 10; i++) {
         const preferPort = (port ?? 0) > 0 ? (port ?? 0) + i : 0;
         logger.debug('Try starting on port %d', preferPort);
         const [maybeWss, maybeListenPort] = await createWS(preferPort);

package/lib/setup.js

@@ -62,6 +62,7 @@ const setup = async (argv, runBlock = false) => {
         },
         mockSignatureHost: argv['mock-signature-host'],
         allowUnresolvedImports: argv['allow-unresolved-imports'],
+        runtimeLogLevel: argv['runtime-log-level'],
         registeredTypes: argv['registered-types'],
     });
     if (argv.timestamp)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.5.10",
+  "version": "0.6.0",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
   "license": "Apache-2.0",
   "bin": "./chopsticks.js",
@@ -8,43 +8,43 @@
     "clean": "rm -rf lib tsconfig.tsbuildinfo",
     "build": "tsc -p ./tsconfig.json",
     "script:start": "cd ../..; ts-node --transpile-only packages/chopsticks/src/cli.ts",
-    "script:run": "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"
+    "script:run": "cd ../..; LOG_LEVEL=trace ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- dev --config=configs/dev.yml",
+    "dev:karura": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- dev --config=configs/karura.yml",
+    "dev:acala": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- dev --config=configs/acala.yml",
+    "dev:moonriver": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- dev --config=configs/moonriver.yml",
+    "dev:moonbeam": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- dev --config=configs/moonbeam.yml"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.5.10",
-    "@polkadot/api": "^9.14.2",
-    "@polkadot/rpc-provider": "^9.14.2",
-    "@polkadot/types": "^9.14.2",
-    "@polkadot/types-codec": "^9.14.2",
-    "@polkadot/types-known": "^9.14.2",
-    "@polkadot/util": "^10.4.2",
-    "@polkadot/util-crypto": "^10.4.2",
-    "axios": "^1.3.3",
+    "@acala-network/chopsticks-executor": "0.6.0",
+    "@polkadot/api": "^10.2.1",
+    "@polkadot/rpc-provider": "^10.2.1",
+    "@polkadot/types": "^10.2.1",
+    "@polkadot/types-codec": "^10.2.1",
+    "@polkadot/types-known": "^10.2.1",
+    "@polkadot/util": "^11.1.2",
+    "@polkadot/util-crypto": "^11.1.2",
+    "axios": "^1.3.4",
     "js-yaml": "^4.1.0",
     "jsondiffpatch": "^0.4.1",
     "lodash": "^4.17.21",
     "pino": "^8.11.0",
-    "pino-pretty": "^9.4.0",
+    "pino-pretty": "^10.0.0",
     "reflect-metadata": "^0.1.13",
-    "sqlite3": "^5.1.4",
+    "sqlite3": "^5.1.6",
     "typeorm": "^0.3.12",
-    "ws": "^8.12.1",
+    "ws": "^8.13.0",
     "yargs": "^17.7.1",
-    "zod": "^3.20.6"
+    "zod": "^3.21.4"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.5",
-    "@types/lodash": "^4.14.191",
-    "@types/node": "^18.14.2",
+    "@types/lodash": "^4.14.192",
+    "@types/node": "^18.15.10",
     "@types/ws": "^8.5.4",
-    "@types/yargs": "^17.0.22",
+    "@types/yargs": "^17.0.24",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^4.9.5"
+    "typescript": "^5.0.2"
   },
   "files": [
     "lib",