@acala-network/chopsticks 0.6.1 → 0.6.3

package/lib/blockchain/txpool.d.ts

@@ -31,6 +31,8 @@ export declare class TxPool {
     get ump(): Record<number, HexString[]>;
     get dmp(): DownwardMessage[];
     get hrmp(): Record<number, HorizontalMessage[]>;
+    get mode(): BuildBlockMode;
+    set mode(mode: BuildBlockMode);
     clear(): void;
     pendingExtrinsicsBy(address: string): HexString[];
     submitExtrinsic(extrinsic: HexString): Promise<void>;

package/lib/blockchain/txpool.js

@@ -45,6 +45,12 @@ class TxPool {
     get hrmp() {
         return this.#hrmp;
     }
+    get mode() {
+        return this.#mode;
+    }
+    set mode(mode) {
+        this.#mode = mode;
+    }
     clear() {
         this.#pool.length = 0;
         for (const id of Object.keys(this.#ump)) {

package/lib/cli.js

@@ -81,18 +81,43 @@ const defaultOptions = {
         number: true,
     },
 };
+const mockOptions = {
+    '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,
+    },
+};
 (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .scriptName('chopsticks')
+    .command('*', 'Dev mode, fork off a chain', (yargs) => yargs.options({
+    ...defaultOptions,
+    ...mockOptions,
+    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],
+    },
+    'allow-unresolved-imports': {
+        desc: 'Allow wasm unresolved imports',
+        boolean: true,
+    },
+}), async (argv) => {
+    await (0, _1.setupWithServer)(await processArgv(argv));
+})
     .command('run-block', 'Replay a block', (yargs) => yargs.options({
     ...defaultOptions,
+    ...mockOptions,
     'output-path': {
         desc: 'File path to print output',
         string: true,
     },
-    'import-storage': {
-        desc: 'Pre-defined JSON/YAML storage file path',
-        string: true,
-    },
     html: {
         desc: 'Generate html with storage diff',
     },
@@ -158,31 +183,6 @@ const defaultOptions = {
     else {
         await (0, dry_run_1.dryRun)(config);
     }
-})
-    .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)(await processArgv(argv));
 })
     .command('decode-key <key>', 'Deocde a key', (yargs) => yargs
     .positional('key', {
@@ -202,7 +202,8 @@ const defaultOptions = {
     }
     process.exit(0);
 })
-    .command('xcm', 'XCM setup with relaychain and parachains', (yargs) => yargs.options({
+    .command('xcm', 'XCM setup with relaychain and parachains', (yargs) => yargs
+    .options({
     relaychain: {
         desc: 'Relaychain config file path',
         string: true,
@@ -213,7 +214,9 @@ const defaultOptions = {
         string: true,
         required: true,
     },
-}), async (argv) => {
+})
+    .alias('relaychain', 'r')
+    .alias('parachain', 'p'), async (argv) => {
     const parachains = [];
     for (const config of argv.parachain) {
         const { chain } = await (0, _1.setupWithServer)(await processConfig(config));
@@ -228,13 +231,16 @@ const defaultOptions = {
             await (0, _1.connectVertical)(relaychain, parachain);
         }
     }
-})
-    .command({
-    command: '*',
-    handler() {
-        yargs_1.default.showHelp();
-    },
 })
     .strict()
     .help()
-    .alias('help', 'h').argv;
+    .alias('help', 'h')
+    .alias('version', 'v')
+    .alias('config', 'c')
+    .alias('endpoint', 'e')
+    .alias('port', 'p')
+    .alias('block', 'b')
+    .alias('import-storage', 's')
+    .alias('wasm-override', 'w')
+    .usage('Usage: $0 <command> [options]')
+    .example('$0', '-c acala').argv;

package/lib/executor.d.ts

@@ -18,7 +18,7 @@ export type RuntimeVersion = {
     stateVersion: number;
 };
 export declare const getRuntimeVersion: (code: HexString) => Promise<RuntimeVersion>;
-export declare const calculateStateRoot: (entries: [HexString, HexString][]) => Promise<HexString>;
+export declare const calculateStateRoot: (entries: [HexString, HexString][], trie_version: number) => Promise<HexString>;
 export declare const decodeProof: (trieRootHash: HexString, keys: HexString[], nodes: HexString[]) => Promise<Record<`0x${string}`, `0x${string}` | null>>;
 export declare const createProof: (trieRootHash: HexString, nodes: HexString[], entries: [HexString, HexString | null][]) => Promise<{
     trieRootHash: `0x${string}`;

package/lib/executor.js

@@ -17,8 +17,9 @@ const getRuntimeVersion = async (code) => {
     });
 };
 exports.getRuntimeVersion = getRuntimeVersion;
-const calculateStateRoot = async (entries) => {
-    return (0, chopsticks_executor_1.calculate_state_root)(entries);
+// trie_version: 0 for old trie, 1 for new trie
+const calculateStateRoot = async (entries, trie_version) => {
+    return (0, chopsticks_executor_1.calculate_state_root)(entries, trie_version);
 };
 exports.calculateStateRoot = calculateStateRoot;
 const decodeProof = async (trieRootHash, keys, nodes) => {

package/lib/genesis-provider.js

@@ -23,7 +23,7 @@ class GenesisProvider {
         this.#stateRoot = (0, executor_1.calculateStateRoot)(Object.entries(this.#genesis.genesis.raw.top).reduce((accu, item) => {
             accu.push(item);
             return accu;
-        }, []));
+        }, []), 1);
         this.#eventemitter = new node_events_1.EventEmitter();
         this.#isReadyPromise = new Promise((resolve, reject) => {
             this.#eventemitter.once('connected', () => {

package/lib/rpc/dev/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const txpool_1 = require("@acala-network/chopsticks/blockchain/txpool");
 const shared_1 = require("../shared");
 const set_storage_1 = require("../../utils/set-storage");
 const logger_1 = require("../../logger");
@@ -63,5 +64,12 @@ const handlers = {
         return block.hash;
     },
     dev_dryRun: dry_run_1.dev_dryRun,
+    dev_setBlockBuildMode: async (context, [mode]) => {
+        logger.debug({ mode }, 'dev_setBlockBuildMode');
+        if (txpool_1.BuildBlockMode[mode] === undefined) {
+            throw new shared_1.ResponseError(1, `Invalid mode ${mode}`);
+        }
+        context.chain.txPool.mode = mode;
+    },
 };
 exports.default = handlers;

package/lib/utils/index.d.ts

@@ -6,7 +6,7 @@ export type ProcessKey = (key: StorageKey<any>) => any;
 export declare function fetchKeys(getKeys: GetKeys, processKey: ProcessKey): Promise<void>;
 export declare function fetchKeysToArray(getKeys: GetKeys): Promise<StorageKey<any>[]>;
 export declare const compactHex: (value: Uint8Array) => HexString;
-export declare const getParaId: (chain: Blockchain) => Promise<import("@polkadot/types").u32>;
+export declare const getParaId: (chain: Blockchain) => Promise<import("@polkadot/types").U32>;
 export declare const isUrl: (url: string) => boolean;
 export type Deferred<T> = {
     resolve: (value: T | PromiseLike<T>) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
   "license": "Apache-2.0",
   "bin": "./chopsticks.js",
@@ -8,22 +8,17 @@
     "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": "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"
+    "script:run": "cd ../..; LOG_LEVEL=trace ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- --config=configs/dev.yml",
+    "dev:karura": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- --config=configs/karura.yml",
+    "dev:acala": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- --config=configs/acala.yml",
+    "dev:polkadot": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- --config=configs/polkadot.yml",
+    "dev:moonriver": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- --config=configs/moonriver.yml",
+    "dev:moonbeam": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- --config=configs/moonbeam.yml"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.6.1",
-    "@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",
+    "@acala-network/chopsticks-executor": "0.6.3",
+    "@polkadot/api": "^10.5.1",
+    "axios": "^1.4.0",
     "js-yaml": "^4.1.0",
     "jsondiffpatch": "^0.4.1",
     "lodash": "^4.17.21",
@@ -31,20 +26,20 @@
     "pino-pretty": "^10.0.0",
     "reflect-metadata": "^0.1.13",
     "sqlite3": "^5.1.6",
-    "typeorm": "^0.3.12",
+    "typeorm": "^0.3.15",
     "ws": "^8.13.0",
-    "yargs": "^17.7.1",
+    "yargs": "^17.7.2",
     "zod": "^3.21.4"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.5",
-    "@types/lodash": "^4.14.192",
-    "@types/node": "^18.15.11",
+    "@types/lodash": "^4.14.194",
+    "@types/node": "^18.16.3",
     "@types/ws": "^8.5.4",
     "@types/yargs": "^17.0.24",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.0.3"
+    "typescript": "^5.0.4"
   },
   "files": [
     "lib",