@acala-network/chopsticks 0.4.1 → 0.4.2

package/lib/blockchain/block-builder.js

@@ -71,8 +71,11 @@ const newHeader = async (head) => {
                 ],
             },
             ...consensus.rest,
-            head.pushStorageLayer().set((0, utils_1.compactHex)(meta.query.randomness.notFirstBlock()), "Deleted" /* StorageValueKind.Deleted */),
         ];
+        if (meta.query.randomness) {
+            // reset notFirstBlock so randomness will skip validation
+            head.pushStorageLayer().set((0, utils_1.compactHex)(meta.query.randomness.notFirstBlock()), "Deleted" /* StorageValueKind.Deleted */);
+        }
     }
     const header = meta.registry.createType('Header', {
         parentHash: head.hash,

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, UpcomingBlockParams } from './txpool';
+import { BuildBlockMode, BuildBlockParams, DownwardMessage, HorizontalMessage, TxPool, UpcomingBlockParams } from './txpool';
 import { HeadState } from './head-state';
 import { InherentProvider } from './inherent';
 export interface Options {
@@ -46,6 +46,8 @@ export declare class Blockchain {
         outcome: ApplyExtrinsicResult;
         storageDiff: [HexString, HexString | null][];
     }>;
-    dryRunHrmp(hrmp: Record<number, HorizontalMessage[]>): Promise<[HexString, HexString | null][]>;
+    dryRunHrmp(hrmp: Record<number, HorizontalMessage[]>, at?: HexString): Promise<[HexString, HexString | null][]>;
+    dryRunDmp(dmp: DownwardMessage[], at?: HexString): Promise<[HexString, HexString | null][]>;
+    dryRunUmp(ump: Record<number, HexString[]>, at?: HexString): Promise<[HexString, HexString | null][]>;
     getInherents(): Promise<HexString[]>;
 }

package/lib/blockchain/index.js

@@ -6,6 +6,7 @@ const util_1 = require("@polkadot/util");
 const block_1 = require("./block");
 const txpool_1 = require("./txpool");
 const head_state_1 = require("./head-state");
+const utils_1 = require("../utils");
 const logger_1 = require("../logger");
 const block_builder_1 = require("./block-builder");
 const logger = logger_1.defaultLogger.child({ name: 'blockchain' });
@@ -136,12 +137,50 @@ class Blockchain {
         const outcome = registry.createType('ApplyExtrinsicResult', result);
         return { outcome, storageDiff };
     }
-    async dryRunHrmp(hrmp) {
+    async dryRunHrmp(hrmp, at) {
         await this.api.isReady;
-        const head = this.head;
+        const head = at ? await this.getBlock(at) : this.head;
+        if (!head) {
+            throw new Error(`Cannot find block ${at}`);
+        }
         const inherents = await this.#inherentProvider.createInherents(head, { horizontalMessages: hrmp });
         return (0, block_builder_1.dryRunInherents)(head, inherents);
     }
+    async dryRunDmp(dmp, at) {
+        await this.api.isReady;
+        const head = at ? await this.getBlock(at) : this.head;
+        if (!head) {
+            throw new Error(`Cannot find block ${at}`);
+        }
+        const inherents = await this.#inherentProvider.createInherents(head, { downwardMessages: dmp });
+        return (0, block_builder_1.dryRunInherents)(head, inherents);
+    }
+    async dryRunUmp(ump, at) {
+        await this.api.isReady;
+        const head = at ? await this.getBlock(at) : this.head;
+        if (!head) {
+            throw new Error(`Cannot find block ${at}`);
+        }
+        const meta = await head.meta;
+        const needsDispatch = meta.registry.createType('Vec<u32>', Object.keys(ump));
+        const stroageValues = [
+            [(0, utils_1.compactHex)(meta.query.ump.needsDispatch()), needsDispatch.toHex()],
+        ];
+        for (const [paraId, messages] of Object.entries(ump)) {
+            const upwardMessages = meta.registry.createType('Vec<Bytes>', messages);
+            if (upwardMessages.length === 0)
+                throw new Error('No upward meesage');
+            const queueSize = meta.registry.createType('(u32, u32)', [
+                upwardMessages.length,
+                upwardMessages.map((x) => x.byteLength).reduce((s, i) => s + i, 0),
+            ]);
+            stroageValues.push([(0, utils_1.compactHex)(meta.query.ump.relayDispatchQueues(paraId)), upwardMessages.toHex()]);
+            stroageValues.push([(0, utils_1.compactHex)(meta.query.ump.relayDispatchQueueSize(paraId)), queueSize.toHex()]);
+        }
+        head.pushStorageLayer().setAll(stroageValues);
+        const inherents = await this.#inherentProvider.createInherents(head);
+        return (0, block_builder_1.dryRunInherents)(head, inherents);
+    }
     async getInherents() {
         await this.api.isReady;
         const inherents = await this.#inherentProvider.createInherents(this.head);

package/lib/blockchain/inherent/parachain/validation-data.d.ts

@@ -1,16 +1,10 @@
 import { HexString } from '@polkadot/util/types';
 import { Block } from '../../block';
-import { BuildBlockParams } from '../../txpool';
+import { BuildBlockParams, DownwardMessage, HorizontalMessage } from '../../txpool';
 import { CreateInherents } from '..';
 export type ValidationData = {
-    downwardMessages: {
-        sent_at: number;
-        msg: HexString;
-    }[];
-    horizontalMessages: Record<number, {
-        sent_at: number;
-        data: HexString;
-    }[]>;
+    downwardMessages: DownwardMessage[];
+    horizontalMessages: Record<number, HorizontalMessage[]>;
     validationData: {
         relayParentNumber: number;
         relayParentStorageRoot: HexString;

package/lib/blockchain/inherent/parachain/validation-data.js

@@ -80,7 +80,7 @@ class SetValidationData {
                     dmqMqcHeadHash = (0, util_crypto_1.blake2AsHex)((0, util_1.u8aConcat)(meta.registry.createType('Hash', dmqMqcHeadHash).toU8a(), meta.registry.createType('BlockNumber', sentAt).toU8a(), (0, util_crypto_1.blake2AsU8a)(meta.registry.createType('Bytes', msg).toU8a(), 256)), 256);
                     downwardMessages.push({
                         msg,
-                        sent_at: sentAt,
+                        sentAt,
                     });
                 }
                 newEntries.push([dmqMqcHeadKey, dmqMqcHeadHash]);
@@ -92,6 +92,7 @@ class SetValidationData {
                 .createType('Vec<ParaId>', decoded[hrmpEgressChannelIndexKey])
                 .toJSON();
             const hrmpMessages = {
+                // reset values, we just need the keys
                 ...lodash_1.default.mapValues(extrinsic.horizontalMessages, () => []),
                 ...(params?.horizontalMessages || {}),
             };
@@ -120,7 +121,7 @@ class SetValidationData {
                     abridgedHrmp.totalSize = abridgedHrmp.totalSize + bytes.length;
                     paraMessages.push({
                         data,
-                        sent_at: sentAt,
+                        sentAt,
                     });
                 }
                 horizontalMessages[sender] = paraMessages;

package/lib/rpc/dev/dry-run.d.ts

@@ -0,0 +1,2 @@
+import { Handler } from '../shared';
+export declare const dev_dryRun: Handler;

package/lib/rpc/dev/dry-run.js

@@ -0,0 +1,75 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dev_dryRun = void 0;
+const zod_1 = __importDefault(require("zod"));
+const decoder_1 = require("../../utils/decoder");
+const generate_html_diff_1 = require("../../utils/generate-html-diff");
+const zHex = zod_1.default.custom((val) => /^0x\w+$/.test(val));
+const zHash = zod_1.default.string().length(66).and(zHex);
+const zParaId = zod_1.default.string().regex(/^\d+$/).transform(Number);
+const dryRunSchema = zod_1.default.object({
+    raw: zod_1.default.boolean().optional(),
+    html: zod_1.default.boolean().optional(),
+    extrinsic: zHex
+        .or(zod_1.default.object({
+        call: zHex,
+        address: zHex,
+    }))
+        .optional(),
+    hrmp: zod_1.default
+        .record(zParaId, zod_1.default
+        .array(zod_1.default.object({
+        sentAt: zod_1.default.number(),
+        data: zHex,
+    }))
+        .min(1))
+        .optional(),
+    dmp: zod_1.default
+        .array(zod_1.default.object({
+        sentAt: zod_1.default.number(),
+        msg: zHex,
+    }))
+        .min(1)
+        .optional(),
+    ump: zod_1.default.record(zParaId, zod_1.default.array(zHex).min(1)).optional(),
+    at: zHash.optional(),
+});
+const dev_dryRun = async (context, [params]) => {
+    const { html, extrinsic, hrmp, dmp, ump, raw, at } = dryRunSchema.parse(params);
+    const dryRun = async () => {
+        if (extrinsic) {
+            const { outcome, storageDiff } = await context.chain.dryRunExtrinsic(extrinsic, at);
+            if (outcome.isErr) {
+                throw new Error(outcome.asErr.toString());
+            }
+            return storageDiff;
+        }
+        if (hrmp) {
+            return context.chain.dryRunHrmp(hrmp, at);
+        }
+        if (dmp) {
+            return context.chain.dryRunDmp(dmp, at);
+        }
+        if (ump) {
+            return context.chain.dryRunUmp(ump, at);
+        }
+        throw new Error('No extrinsic to run');
+    };
+    const storageDiff = await dryRun();
+    if (html) {
+        return (0, generate_html_diff_1.generateHtmlDiff)(context.chain.head, storageDiff);
+    }
+    if (raw) {
+        return storageDiff;
+    }
+    const [oldData, newData, delta] = await (0, decoder_1.decodeStorageDiff)(context.chain.head, storageDiff);
+    return {
+        old: oldData,
+        new: newData,
+        delta,
+    };
+};
+exports.dev_dryRun = dev_dryRun;

package/lib/rpc/{dev.d.ts → dev/index.d.ts}

@@ -1,3 +1,3 @@
-import { Handlers } from './shared';
+import { Handlers } from '../shared';
 declare const handlers: Handlers;
 export default handlers;

package/lib/rpc/{dev.js → dev/index.js}

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const shared_1 = require("./shared");
-const set_storage_1 = require("../utils/set-storage");
-const decoder_1 = require("../utils/decoder");
-const logger_1 = require("../logger");
-const generate_html_diff_1 = require("../utils/generate-html-diff");
-const time_travel_1 = require("../utils/time-travel");
+const shared_1 = require("../shared");
+const set_storage_1 = require("../../utils/set-storage");
+const logger_1 = require("../../logger");
+const dry_run_1 = require("./dry-run");
+const time_travel_1 = require("../../utils/time-travel");
 const logger = logger_1.defaultLogger.child({ name: 'rpc-dev' });
 const handlers = {
     dev_newBlock: async (context, [param]) => {
@@ -41,31 +40,6 @@ const handlers = {
         await (0, time_travel_1.timeTravel)(context.chain, timestamp);
         return timestamp;
     },
-    dev_dryRun: async (context, [{ html, extrinsic, hrmp, raw }]) => {
-        const dryRun = async () => {
-            if (extrinsic) {
-                const { outcome, storageDiff } = await context.chain.dryRunExtrinsic(extrinsic);
-                if (outcome.isErr) {
-                    throw new Error(outcome.asErr.toString());
-                }
-                return storageDiff;
-            }
-            return context.chain.dryRunHrmp(hrmp);
-        };
-        const storageDiff = await dryRun();
-        if (html) {
-            return (0, generate_html_diff_1.generateHtmlDiff)(context.chain.head, storageDiff);
-        }
-        if (raw) {
-            return storageDiff;
-        }
-        const [oldData, newData, delta] = await (0, decoder_1.decodeStorageDiff)(context.chain.head, storageDiff);
-        return {
-            old: oldData,
-            new: newData,
-            delta,
-        };
-    },
     dev_setHead: async (context, [hashOrNumber]) => {
         let block;
         if (typeof hashOrNumber === 'number') {
@@ -81,5 +55,6 @@ const handlers = {
         await context.chain.setHead(block);
         return block.hash;
     },
+    dev_dryRun: dry_run_1.dev_dryRun,
 };
 exports.default = handlers;

package/lib/xcm/upward.js

@@ -8,26 +8,25 @@ const connectUpward = async (parachain, relaychain) => {
     const meta = await parachain.head.meta;
     const paraId = await (0, utils_1.getParaId)(parachain);
     const upwardMessagesKey = (0, utils_1.compactHex)(meta.query.parachainSystem.upwardMessages());
-    await parachain.headState.subscribeStorage([upwardMessagesKey], async (head, pairs) => {
+    await parachain.headState.subscribeStorage([upwardMessagesKey], async (_head, pairs) => {
         const value = pairs[0][1];
         if (!value)
             return;
-        const parachainMeta = await head.meta;
-        const relaychainMeta = await relaychain.head.meta;
-        const upwardMessages = parachainMeta.registry.createType('Vec<Bytes>', (0, util_1.hexToU8a)(value));
+        const meta = await relaychain.head.meta;
+        const upwardMessages = meta.registry.createType('Vec<Bytes>', (0, util_1.hexToU8a)(value));
         if (upwardMessages.length === 0)
             return;
-        const queueSize = parachainMeta.registry.createType('(u32, u32)', [
+        const queueSize = meta.registry.createType('(u32, u32)', [
             upwardMessages.length,
             upwardMessages.map((x) => x.byteLength).reduce((s, i) => s + i, 0),
         ]);
-        const needsDispatch = parachainMeta.registry.createType('Vec<u32>', [paraId]);
+        const needsDispatch = meta.registry.createType('Vec<u32>', [paraId]);
         _1.logger.debug({ [paraId.toNumber()]: upwardMessages.toJSON(), queueSize: queueSize.toJSON() }, 'upward_message');
         // TODO: make sure we append instead of replace
         relaychain.head.pushStorageLayer().setAll([
-            [(0, utils_1.compactHex)(relaychainMeta.query.ump.needsDispatch()), needsDispatch.toHex()],
-            [(0, utils_1.compactHex)(relaychainMeta.query.ump.relayDispatchQueues(paraId)), upwardMessages.toHex()],
-            [(0, utils_1.compactHex)(relaychainMeta.query.ump.relayDispatchQueueSize(paraId)), queueSize.toHex()],
+            [(0, utils_1.compactHex)(meta.query.ump.needsDispatch()), needsDispatch.toHex()],
+            [(0, utils_1.compactHex)(meta.query.ump.relayDispatchQueues(paraId)), upwardMessages.toHex()],
+            [(0, utils_1.compactHex)(meta.query.ump.relayDispatchQueueSize(paraId)), queueSize.toHex()],
         ]);
         await relaychain.newBlock();
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
@@ -12,7 +12,7 @@
     "build": "rm -rf lib && tsc -p ./tsconfig.json",
     "test": "vitest run",
     "test:watch": "vitest",
-    "script:start": "cd ../..; ts-node packages/chopsticks/src/cli.ts",
+    "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",
@@ -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.1",
+    "@acala-network/chopsticks-executor": "0.4.2",
     "@polkadot/api": "^9.14.2",
     "@polkadot/rpc-provider": "^9.14.2",
     "@polkadot/types": "^9.14.2",
@@ -35,6 +35,7 @@
     "pino": "^8.11.0",
     "pino-pretty": "^9.4.0",
     "reflect-metadata": "^0.1.13",
+    "rxjs": "^7.8.0",
     "sqlite3": "^5.1.4",
     "typeorm": "^0.3.12",
     "ws": "^8.12.1",

package/template/diff.html

@@ -147,10 +147,10 @@
 
 					function renderDelta(value) {
 						if (/^\d+(,\d+)*$/.test(value[0]) && /^\d+(,\d+)*$/.test(value[1])) {
-							const oldValue = parseInt(value[0].replace(/,/g, ''))
-							const newValue = parseInt(value[1].replace(/,/g, ''))
+							const oldValue = BigInt(value[0].replace(/,/g, ''))
+							const newValue = BigInt(value[1].replace(/,/g, ''))
 							if (oldValue > 0 && newValue > 0) {
-								const delta = Number(newValue - oldValue)
+								const delta = newValue - oldValue
 								return (<span className="delta" >{delta > 0 ? '+' : ''}{delta.toLocaleString()}</span>)
 							}
 						}