@acala-network/chopsticks 0.4.0 → 0.4.1

package/lib/blockchain/index.d.ts

@@ -4,7 +4,7 @@ import { HexString } from '@polkadot/util/types';
 import { RegisteredTypes } from '@polkadot/types/types';
 import { Api } from '../api';
 import { Block } from './block';
-import { BuildBlockMode, BuildBlockParams, HorizontalMessage, TxPool } from './txpool';
+import { BuildBlockMode, BuildBlockParams, HorizontalMessage, TxPool, UpcomingBlockParams } from './txpool';
 import { HeadState } from './head-state';
 import { InherentProvider } from './inherent';
 export interface Options {
@@ -38,7 +38,7 @@ export declare class Blockchain {
     setHead(block: Block): Promise<void>;
     submitExtrinsic(extrinsic: HexString): Promise<HexString>;
     newBlock(params?: BuildBlockParams): Promise<Block>;
-    upcomingBlock(skipCount?: number): Promise<Block>;
+    upcomingBlock(params?: UpcomingBlockParams): Promise<Block>;
     dryRunExtrinsic(extrinsic: HexString | {
         call: HexString;
         address: string;

package/lib/blockchain/index.js

@@ -121,8 +121,8 @@ class Blockchain {
         await this.#txpool.buildBlock(params);
         return this.#head;
     }
-    async upcomingBlock(skipCount = 0) {
-        return this.#txpool.upcomingBlock(skipCount);
+    async upcomingBlock(params) {
+        return this.#txpool.upcomingBlock(params);
     }
     async dryRunExtrinsic(extrinsic, at) {
         await this.api.isReady;

package/lib/blockchain/txpool.d.ts

@@ -24,6 +24,10 @@ export interface BuildBlockParams {
         horizontalMessages?: Record<number, HorizontalMessage[]>;
     };
 }
+export interface UpcomingBlockParams {
+    skipCount?: number;
+    timeout?: number;
+}
 export declare class TxPool {
     #private;
     readonly event: EventEmitter;
@@ -31,5 +35,5 @@ export declare class TxPool {
     get pendingExtrinsics(): HexString[];
     submitExtrinsic(extrinsic: HexString): void;
     buildBlock(params?: BuildBlockParams): Promise<void>;
-    upcomingBlock(skipCount?: number): Promise<Block>;
+    upcomingBlock(params?: UpcomingBlockParams): Promise<Block>;
 }

package/lib/blockchain/txpool.js

@@ -54,10 +54,15 @@ class TxPool {
         await this.#lastBuildBlockPromise;
         this.#last.next(this.#chain.head);
     }
-    async upcomingBlock(skipCount = 0) {
+    async upcomingBlock(params) {
+        const { skipCount, timeout: millisecs } = { skipCount: 0, ...(params || {}) };
         if (skipCount < 0)
             throw new Error('skipCount needs to be greater or equal to 0');
-        return (0, rxjs_1.firstValueFrom)(this.#last.pipe((0, operators_1.skip)(1 + skipCount), (0, operators_1.take)(1)));
+        let stream$ = this.#last.pipe();
+        if (millisecs) {
+            stream$ = stream$.pipe((0, operators_1.timeout)(millisecs));
+        }
+        return (0, rxjs_1.firstValueFrom)(stream$.pipe((0, operators_1.skip)(1 + skipCount), (0, operators_1.take)(1)));
     }
     async #buildBlock(wait, params) {
         await this.#chain.api.isReady;

package/lib/cli.js

@@ -28,8 +28,9 @@ const processConfig = async (path) => {
 };
 const processArgv = async (argv) => {
     if (argv.config) {
-        return { ...(await processConfig(argv.config)), ...argv };
+        argv = { ...(await processConfig(argv.config)), ...argv };
     }
+    argv.port = argv.port ?? (process.env.PORT ? Number(process.env.PORT) : 8000);
     return argv;
 };
 const defaultOptions = {

package/lib/rpc/substrate/author.js

@@ -49,7 +49,7 @@ const handlers = {
         })
             .catch((error) => {
             logger.error({ error }, 'ExtrinsicFailed');
-            callback(error.toJSON());
+            callback(error?.toJSON() ?? error);
             done(id);
         });
         return id;

package/lib/server.js

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

package/lib/setup-with-server.js

@@ -7,7 +7,7 @@ const shared_1 = require("./rpc/shared");
 const setup_1 = require("./setup");
 const setupWithServer = async (argv) => {
     const context = await (0, setup_1.setup)(argv);
-    const port = argv.port || Number(process.env.PORT) || 8000;
+    const port = argv.port ?? 8000;
     if (argv.genesis) {
         // mine 1st block when starting from genesis to set some mock validation data
         await context.chain.newBlock();

package/lib/utils/time-travel.js

@@ -7,9 +7,10 @@ const executor_1 = require("../executor");
 const set_storage_1 = require("./set-storage");
 const getCurrentSlot = async (chain) => {
     const meta = await chain.head.meta;
+    // use raw key here because some chain did not expose those storage to metadata
     const slotRaw = meta.consts.babe
-        ? await chain.head.get((0, _1.compactHex)(meta.query.babe.currentSlot()))
-        : await chain.head.get((0, _1.compactHex)(meta.query.aura.currentSlot()));
+        ? await chain.head.get('0x1cb6f36e027abb2091cfb5110ab5087f06155b3cd9a8c9e5e9a23fd5dc13a5ed') // babe.currentSlot
+        : await chain.head.get('0x57f8dc2f5ab09467896f47300f04243806155b3cd9a8c9e5e9a23fd5dc13a5ed'); // aura.currentSlot
     if (!slotRaw)
         throw new Error('Cannot find current slot');
     return meta.registry.createType('Slot', (0, util_1.hexToU8a)(slotRaw)).toNumber();

package/lib/xcm/downward.js

@@ -13,7 +13,7 @@ const connectDownward = async (relaychain, parachain) => {
         const value = pairs[0][1];
         if (!value)
             return;
-        const meta = await relaychain.head.meta;
+        const meta = await head.meta;
         const downwardMessageQueuesKey = (0, utils_1.compactHex)(meta.query.dmp.downwardMessageQueues(paraId));
         // clear relaychain message queue
         await (0, set_storage_1.setStorage)(relaychain, [[downwardMessageQueuesKey, null]], head.hash);

package/lib/xcm/horizontal.js

@@ -4,7 +4,6 @@ exports.connectHorizontal = void 0;
 const util_1 = require("@polkadot/util");
 const utils_1 = require("../utils");
 const _1 = require(".");
-const set_storage_1 = require("../utils/set-storage");
 const connectHorizontal = async (parachains) => {
     for (const [id, chain] of Object.entries(parachains)) {
         const meta = await chain.head.meta;
@@ -13,17 +12,14 @@ const connectHorizontal = async (parachains) => {
             const value = pairs[0][1];
             if (!value)
                 return;
-            const meta = await chain.head.meta;
-            const hrmpOutboundMessagesKey = (0, utils_1.compactHex)(meta.query.parachainSystem.hrmpOutboundMessages());
-            // clear sender message queue
-            await (0, set_storage_1.setStorage)(chain, [[hrmpOutboundMessagesKey, null]], head.hash);
+            const meta = await head.meta;
             const outboundHrmpMessage = meta.registry
                 .createType('Vec<PolkadotCorePrimitivesOutboundHrmpMessage>', (0, util_1.hexToU8a)(value))
                 .toJSON();
             _1.logger.info({ outboundHrmpMessage }, 'outboundHrmpMessage');
             for (const { recipient, data } of outboundHrmpMessage) {
                 const horizontalMessages = {
-                    [Number(id)]: [{ sentAt: chain.head.number, data }],
+                    [Number(id)]: [{ sentAt: head.number, data }],
                 };
                 const receiver = parachains[recipient];
                 if (receiver) {

package/lib/xcm/upward.js

@@ -4,7 +4,6 @@ exports.connectUpward = void 0;
 const util_1 = require("@polkadot/util");
 const utils_1 = require("../utils");
 const _1 = require(".");
-const set_storage_1 = require("../utils/set-storage");
 const connectUpward = async (parachain, relaychain) => {
     const meta = await parachain.head.meta;
     const paraId = await (0, utils_1.getParaId)(parachain);
@@ -13,10 +12,7 @@ const connectUpward = async (parachain, relaychain) => {
         const value = pairs[0][1];
         if (!value)
             return;
-        const parachainMeta = await parachain.head.meta;
-        const upwardMessagesKey = (0, utils_1.compactHex)(parachainMeta.query.parachainSystem.upwardMessages());
-        // clear parachain message queue
-        await (0, set_storage_1.setStorage)(parachain, [[upwardMessagesKey, null]], head.hash);
+        const parachainMeta = await head.meta;
         const relaychainMeta = await relaychain.head.meta;
         const upwardMessages = parachainMeta.registry.createType('Vec<Bytes>', (0, util_1.hexToU8a)(value));
         if (upwardMessages.length === 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
@@ -20,7 +20,7 @@
     "dev:moonbeam": "ts-node-dev --transpile-only --inspect --notify=false src/cli.ts -- dev --config=../../configs/moonbeam.yml"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.4.0",
+    "@acala-network/chopsticks-executor": "0.4.1",
     "@polkadot/api": "^9.14.2",
     "@polkadot/rpc-provider": "^9.14.2",
     "@polkadot/types": "^9.14.2",
@@ -32,8 +32,8 @@
     "js-yaml": "^4.1.0",
     "jsondiffpatch": "^0.4.1",
     "lodash": "^4.17.21",
-    "pino": "^8.10.0",
-    "pino-pretty": "^9.3.0",
+    "pino": "^8.11.0",
+    "pino-pretty": "^9.4.0",
     "reflect-metadata": "^0.1.13",
     "sqlite3": "^5.1.4",
     "typeorm": "^0.3.12",
@@ -44,11 +44,11 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.5",
     "@types/lodash": "^4.14.191",
-    "@types/node": "^18.14.0",
+    "@types/node": "^18.14.2",
     "@types/prettier": "^2.7.2",
     "@types/ws": "^8.5.4",
     "@types/yargs": "^17.0.22",
-    "@typescript-eslint/eslint-plugin": "^5.53.0",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
     "@typescript-eslint/parser": "^5.53.0",
     "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.0",
@@ -58,7 +58,7 @@
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
     "typescript": "^4.9.5",
-    "vitest": "^0.28.5"
+    "vitest": "^0.29.2"
   },
   "files": [
     "lib",