@acala-network/chopsticks 0.3.8 → 0.3.10

package/dist/blockchain/block-builder.js

@@ -92,14 +92,14 @@ const initNewBlock = async (head, header, inherents) => {
     const newBlock = new block_1.Block(head.chain, blockNumber, hash, head, { header, extrinsics: [], storage: head.storage });
     {
         // initialize block
-        const { storageDiff } = await newBlock.call('Core_initialize_block', header.toHex());
+        const { storageDiff } = await newBlock.call('Core_initialize_block', [header.toHex()]);
         newBlock.pushStorageLayer().setAll(storageDiff);
         logger.trace((0, logger_1.truncate)(storageDiff), 'Initialize block');
     }
     // apply inherents
     for (const extrinsic of inherents) {
         try {
-            const { storageDiff } = await newBlock.call('BlockBuilder_apply_extrinsic', extrinsic);
+            const { storageDiff } = await newBlock.call('BlockBuilder_apply_extrinsic', [extrinsic]);
             newBlock.pushStorageLayer().setAll(storageDiff);
             logger.trace((0, logger_1.truncate)(storageDiff), 'Applied inherent');
         }
@@ -123,7 +123,7 @@ const buildBlock = async (head, inherents, extrinsics) => {
     // apply extrinsics
     for (const extrinsic of extrinsics) {
         try {
-            const { storageDiff } = await newBlock.call('BlockBuilder_apply_extrinsic', extrinsic);
+            const { storageDiff } = await newBlock.call('BlockBuilder_apply_extrinsic', [extrinsic]);
             newBlock.pushStorageLayer().setAll(storageDiff);
             logger.trace((0, logger_1.truncate)(storageDiff), 'Applied extrinsic');
         }
@@ -134,7 +134,7 @@ const buildBlock = async (head, inherents, extrinsics) => {
     }
     {
         // finalize block
-        const { storageDiff } = await newBlock.call('BlockBuilder_finalize_block', '0x');
+        const { storageDiff } = await newBlock.call('BlockBuilder_finalize_block', []);
         newBlock.pushStorageLayer().setAll(storageDiff);
         logger.trace((0, logger_1.truncate)(storageDiff), 'Finalize block');
     }
@@ -178,10 +178,10 @@ const dryRunExtrinsic = async (head, inherents, extrinsic) => {
         mockSignature.set([0xde, 0xad, 0xbe, 0xef]);
         generic.signature.set(mockSignature);
         logger_1.defaultLogger.info({ call: call.toHuman() }, 'dry_run_call');
-        return newBlock.call('BlockBuilder_apply_extrinsic', generic.toHex());
+        return newBlock.call('BlockBuilder_apply_extrinsic', [generic.toHex()]);
     }
     logger_1.defaultLogger.info({ call: registry.createType('GenericExtrinsic', (0, util_1.hexToU8a)(extrinsic)).toHuman() }, 'dry_run_extrinsic');
-    return newBlock.call('BlockBuilder_apply_extrinsic', extrinsic);
+    return newBlock.call('BlockBuilder_apply_extrinsic', [extrinsic]);
 };
 exports.dryRunExtrinsic = dryRunExtrinsic;
 const dryRunInherents = async (head, inherents) => {

package/dist/blockchain/block.d.ts

@@ -39,5 +39,5 @@ export declare class Block {
     get runtimeVersion(): Promise<RuntimeVersion>;
     get metadata(): Promise<HexString>;
     get meta(): Promise<DecoratedMeta>;
-    call(method: string, args: HexString, storage?: [HexString, HexString | null][]): Promise<TaskCallResponse>;
+    call(method: string, args: HexString[], storage?: [HexString, HexString | null][]): Promise<TaskCallResponse>;
 }

package/dist/blockchain/block.js

@@ -131,6 +131,7 @@ class Block {
                 this.runtimeVersion,
             ]).then(([data, properties, chain, version]) => {
                 const registry = new types_1.TypeRegistry(this.hash);
+                registry.setKnownTypes(this.chain.registeredTypes);
                 registry.setChainProperties(registry.createType('ChainProperties', properties));
                 registry.register((0, util_1.getSpecTypes)(registry, chain, version.specName, version.specVersion));
                 registry.setHasher((0, util_1.getSpecHasher)(registry, chain, version.specName));
@@ -148,7 +149,7 @@ class Block {
     }
     get metadata() {
         if (!this.#metadata) {
-            this.#metadata = this.call('Metadata_metadata', '0x').then((resp) => (0, utils_1.compactHex)((0, util_2.hexToU8a)(resp.result)));
+            this.#metadata = this.call('Metadata_metadata', []).then((resp) => (0, utils_1.compactHex)((0, util_2.hexToU8a)(resp.result)));
         }
         return this.#metadata;
     }

package/dist/blockchain/index.d.ts

@@ -1,6 +1,7 @@
 import { ApplyExtrinsicResult } from '@polkadot/types/interfaces';
 import { DataSource } from 'typeorm';
 import { HexString } from '@polkadot/util/types';
+import { RegisteredTypes } from '@polkadot/types/types';
 import { Api } from '../api';
 import { Block } from './block';
 import { BuildBlockMode, BuildBlockParams, HorizontalMessage } from './txpool';
@@ -17,6 +18,7 @@ export interface Options {
     };
     mockSignatureHost?: boolean;
     allowUnresolvedImports?: boolean;
+    registeredTypes: RegisteredTypes;
 }
 export declare class Blockchain {
     #private;
@@ -25,8 +27,9 @@ export declare class Blockchain {
     readonly db: DataSource | undefined;
     readonly mockSignatureHost: boolean;
     readonly allowUnresolvedImports: boolean;
+    readonly registeredTypes: RegisteredTypes;
     readonly headState: HeadState;
-    constructor({ api, buildBlockMode, inherentProvider, db, header, mockSignatureHost, allowUnresolvedImports, }: Options);
+    constructor({ api, buildBlockMode, inherentProvider, db, header, mockSignatureHost, allowUnresolvedImports, registeredTypes, }: Options);
     get head(): Block;
     get pendingExtrinsics(): HexString[];
     getBlockAt(number?: number): Promise<Block | undefined>;
@@ -35,7 +38,7 @@ export declare class Blockchain {
     setHead(block: Block): Promise<void>;
     submitExtrinsic(extrinsic: HexString): Promise<HexString>;
     newBlock(params?: BuildBlockParams): Promise<Block>;
-    upcomingBlock(count?: number): Promise<Block>;
+    upcomingBlock(skipCount?: number): Promise<Block>;
     dryRunExtrinsic(extrinsic: HexString | {
         call: HexString;
         address: string;

package/dist/blockchain/index.js

@@ -15,6 +15,7 @@ class Blockchain {
     db;
     mockSignatureHost;
     allowUnresolvedImports;
+    registeredTypes;
     #txpool;
     #inherentProvider;
     #head;
@@ -22,11 +23,12 @@ class Blockchain {
     #blocksByHash = {};
     #loadingBlocks = {};
     headState;
-    constructor({ api, buildBlockMode, inherentProvider, db, header, mockSignatureHost = false, allowUnresolvedImports = false, }) {
+    constructor({ api, buildBlockMode, inherentProvider, db, header, mockSignatureHost = false, allowUnresolvedImports = false, registeredTypes = {}, }) {
         this.api = api;
         this.db = db;
         this.mockSignatureHost = mockSignatureHost;
         this.allowUnresolvedImports = allowUnresolvedImports;
+        this.registeredTypes = registeredTypes;
         this.#head = new block_1.Block(this, header.number, header.hash);
         this.#registerBlock(this.#head);
         this.#txpool = new txpool_1.TxPool(this, inherentProvider, buildBlockMode);
@@ -106,7 +108,7 @@ class Blockchain {
     async submitExtrinsic(extrinsic) {
         const source = '0x02'; // External
         const args = (0, util_1.u8aToHex)((0, util_1.u8aConcat)(source, extrinsic, this.head.hash));
-        const res = await this.head.call('TaggedTransactionQueue_validate_transaction', args);
+        const res = await this.head.call('TaggedTransactionQueue_validate_transaction', [args]);
         const registry = await this.head.registry;
         const validity = registry.createType('TransactionValidity', res.result);
         if (validity.isOk) {
@@ -119,8 +121,8 @@ class Blockchain {
         await this.#txpool.buildBlock(params);
         return this.#head;
     }
-    async upcomingBlock(count = 1) {
-        return this.#txpool.upcomingBlock(count);
+    async upcomingBlock(skipCount = 0) {
+        return this.#txpool.upcomingBlock(skipCount);
     }
     async dryRunExtrinsic(extrinsic, at) {
         await this.api.isReady;

package/dist/blockchain/txpool.d.ts

@@ -27,5 +27,5 @@ export declare class TxPool {
     get pendingExtrinsics(): HexString[];
     submitExtrinsic(extrinsic: HexString): void;
     buildBlock(params?: BuildBlockParams): Promise<void>;
-    upcomingBlock(count?: number): Promise<Block>;
+    upcomingBlock(skipCount?: number): Promise<Block>;
 }

package/dist/blockchain/txpool.js

@@ -19,11 +19,11 @@ class TxPool {
     #pool = [];
     #mode;
     #inherentProvider;
+    #last;
     #lastBuildBlockPromise = Promise.resolve();
-    #last = new rxjs_1.ReplaySubject(1);
-    #upcoming = this.#last.pipe((0, rxjs_1.share)());
     constructor(chain, inherentProvider, mode = BuildBlockMode.Batch) {
         this.#chain = chain;
+        this.#last = new rxjs_1.BehaviorSubject(chain.head);
         this.#mode = mode;
         this.#inherentProvider = inherentProvider;
     }
@@ -51,10 +51,10 @@ class TxPool {
         await this.#lastBuildBlockPromise;
         this.#last.next(this.#chain.head);
     }
-    async upcomingBlock(count = 1) {
-        if (count < 1)
-            throw new Error('count needs to be greater than 0');
-        return (0, rxjs_1.firstValueFrom)(this.#upcoming.pipe((0, operators_1.skip)(count - 1), (0, operators_1.first)()));
+    async upcomingBlock(skipCount = 0) {
+        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)));
     }
     async #buildBlock(wait, params) {
         await this.#chain.api.isReady;

package/dist/executor.d.ts

@@ -26,7 +26,7 @@ export declare const createProof: (trieRootHash: HexString, nodes: HexString[],
 }>;
 export declare const runTask: (task: {
     wasm: HexString;
-    calls: [string, HexString][];
+    calls: [string, HexString[]][];
     storage: [HexString, HexString | null][];
     mockSignatureHost: boolean;
     allowUnresolvedImports: boolean;

package/dist/executor.js

@@ -79,7 +79,7 @@ exports.emptyTaskHandler = {
 exports.getAuraSlotDuration = lodash_1.default.memoize(async (wasm, registry) => {
     const result = await (0, exports.runTask)({
         wasm,
-        calls: [['AuraApi_slot_duration', '0x']],
+        calls: [['AuraApi_slot_duration', []]],
         storage: [],
         mockSignatureHost: false,
         allowUnresolvedImports: false,

package/dist/genesis-provider.js

@@ -123,7 +123,7 @@ class GenesisProvider {
                 const code = this.#genesis.genesis.raw.top[(0, util_1.stringToHex)(':code')];
                 return (0, executor_1.runTask)({
                     wasm: code,
-                    calls: [['Metadata_metadata', '0x']],
+                    calls: [['Metadata_metadata', []]],
                     storage: [],
                     mockSignatureHost: false,
                     allowUnresolvedImports: true,

package/dist/rpc/dev.js

@@ -15,7 +15,7 @@ const handlers = {
         const finalCount = diff > 0 ? diff : 1;
         let finalHash;
         for (let i = 0; i < finalCount; i++) {
-            const block = await context.chain.newBlock({ inherent: { horizontalMessages: hrmp } }).catch((error) => {
+            const block = await context.chain.newBlock({ inherent: { horizontalMessages: hrmp || [] } }).catch((error) => {
                 throw new shared_1.ResponseError(1, error.toString());
             });
             logger.debug({ hash: block.hash }, 'dev_newBlock');

package/dist/rpc/substrate/index.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const author_1 = __importDefault(require("./author"));
 const chain_1 = __importDefault(require("./chain"));
+const payment_1 = __importDefault(require("./payment"));
 const state_1 = __importDefault(require("./state"));
 const system_1 = __importDefault(require("./system"));
 const handlers = {
@@ -12,5 +13,6 @@ const handlers = {
     ...chain_1.default,
     ...state_1.default,
     ...system_1.default,
+    ...payment_1.default,
 };
 exports.default = handlers;

package/dist/rpc/substrate/payment.d.ts

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

package/dist/rpc/substrate/payment.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const shared_1 = require("../shared");
+const util_1 = require("@polkadot/util");
+const handlers = {
+    payment_queryFeeDetails: async (context, [extrinsic, hash]) => {
+        const block = await context.chain.getBlock(hash);
+        if (!block) {
+            throw new shared_1.ResponseError(1, `Block ${hash} not found`);
+        }
+        const registry = await block.registry;
+        const tx = (0, util_1.hexToU8a)(extrinsic);
+        const resp = await block.call('TransactionPaymentApi_query_fee_details', [
+            registry.createType('Extrinsic', tx).toHex(),
+            registry.createType('u32', tx.byteLength).toHex(),
+        ]);
+        return resp.result;
+    },
+    payment_queryInfo: async (context, [extrinsic, hash]) => {
+        const block = await context.chain.getBlock(hash);
+        if (!block) {
+            throw new shared_1.ResponseError(1, `Block ${hash} not found`);
+        }
+        const registry = await block.registry;
+        const tx = (0, util_1.hexToU8a)(extrinsic);
+        const resp = await block.call('TransactionPaymentApi_query_info', [
+            registry.createType('Extrinsic', tx).toHex(),
+            registry.createType('u32', tx.byteLength).toHex(),
+        ]);
+        return resp.result;
+    },
+};
+exports.default = handlers;

package/dist/rpc/substrate/state.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const shared_1 = require("../shared");
 const logger_1 = require("../../logger");
 const logger = logger_1.defaultLogger.child({ name: 'rpc-state' });
 const handlers = {
@@ -35,9 +36,10 @@ const handlers = {
     state_call: async (context, [method, data, hash]) => {
         const block = await context.chain.getBlock(hash);
         if (!block) {
-            return [];
+            throw new shared_1.ResponseError(1, `Block ${hash} not found`);
         }
-        return (await block.call(method, data)).result;
+        const resp = await block.call(method, [data]);
+        return resp.result;
     },
     state_subscribeRuntimeVersion: async (context, _params, { subscribe }) => {
         let update = (_block) => { };

package/dist/rpc/substrate/system.js

@@ -7,6 +7,9 @@ const util_1 = require("@polkadot/util");
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const handlers = {
+    system_localPeerId: async () => '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY',
+    system_nodeRoles: async () => ['Full'],
+    system_localListenAddresses: async () => [],
     system_chain: async (context) => {
         return context.chain.api.getSystemChain();
     },
@@ -38,7 +41,7 @@ const handlers = {
         const head = context.chain.head;
         const registry = await head.registry;
         const account = registry.createType('AccountId', address);
-        const result = await head.call('AccountNonceApi_account_nonce', account.toHex());
+        const result = await head.call('AccountNonceApi_account_nonce', [account.toHex()]);
         return registry.createType('Index', (0, util_1.hexToU8a)(result.result)).toNumber();
     },
 };

package/dist/run-block.js

@@ -14,11 +14,11 @@ const runBlock = async (argv) => {
     const parent = await block.parentBlock;
     if (!parent)
         throw Error('cant find parent block');
-    const calls = [['Core_initialize_block', header.toHex()]];
+    const calls = [['Core_initialize_block', [header.toHex()]]];
     for (const extrinsic of await block.extrinsics) {
-        calls.push(['BlockBuilder_apply_extrinsic', extrinsic]);
+        calls.push(['BlockBuilder_apply_extrinsic', [extrinsic]]);
     }
-    calls.push(['BlockBuilder_finalize_block', '0x']);
+    calls.push(['BlockBuilder_finalize_block', []]);
     const result = await (0, executor_1.runTask)({
         wasm,
         calls,

package/dist/schema/index.d.ts

@@ -131,6 +131,7 @@ export declare const configSchema: z.ZodObject<{
         };
     }>]>>;
     timestamp: z.ZodOptional<z.ZodNumber>;
+    'registered-types': z.ZodOptional<z.ZodAny>;
 }, "strict", z.ZodTypeAny, {
     timestamp?: number | undefined;
     db?: string | undefined;
@@ -155,6 +156,7 @@ export declare const configSchema: z.ZodObject<{
     'import-storage'?: any;
     'mock-signature-host'?: boolean | undefined;
     'wasm-override'?: string | undefined;
+    'registered-types'?: any;
 }, {
     timestamp?: number | undefined;
     db?: string | undefined;
@@ -179,5 +181,6 @@ export declare const configSchema: z.ZodObject<{
     'import-storage'?: any;
     'mock-signature-host'?: boolean | undefined;
     'wasm-override'?: string | undefined;
+    'registered-types'?: any;
 }>;
 export type Config = z.infer<typeof configSchema>;

package/dist/schema/index.js

@@ -25,5 +25,6 @@ exports.configSchema = zod_1.z
     'wasm-override': zod_1.z.string().optional(),
     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(),
 })
     .strict();

package/dist/setup.js

@@ -59,6 +59,7 @@ const setup = async (argv) => {
         },
         mockSignatureHost: argv['mock-signature-host'],
         allowUnresolvedImports: argv['allow-unresolved-imports'],
+        registeredTypes: argv['registered-types'],
     });
     if (argv.timestamp)
         await (0, time_travel_1.timeTravel)(chain, argv.timestamp);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
@@ -30,14 +30,14 @@
   },
   "dependencies": {
     "@acala-network/chopsticks-executor": "0.3.7",
-    "@polkadot/api": "^9.11.3",
-    "@polkadot/rpc-provider": "^9.11.3",
-    "@polkadot/types": "^9.11.3",
-    "@polkadot/types-codec": "^9.11.3",
-    "@polkadot/types-known": "^9.11.3",
+    "@polkadot/api": "^9.12.1",
+    "@polkadot/rpc-provider": "^9.12.1",
+    "@polkadot/types": "^9.12.1",
+    "@polkadot/types-codec": "^9.12.1",
+    "@polkadot/types-known": "^9.12.1",
     "@polkadot/util": "^10.2.6",
     "@polkadot/util-crypto": "^10.2.6",
-    "axios": "^1.2.3",
+    "axios": "^1.2.5",
     "js-yaml": "^4.1.0",
     "jsondiffpatch": "^0.4.1",
     "lodash": "^4.17.21",
@@ -56,9 +56,9 @@
     "@types/lodash": "^4.14.191",
     "@types/node": "^18.11.18",
     "@types/ws": "^8.5.4",
-    "@types/yargs": "^17.0.19",
-    "@typescript-eslint/eslint-plugin": "^5.48.2",
-    "@typescript-eslint/parser": "^5.48.2",
+    "@types/yargs": "^17.0.20",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
     "eslint": "^8.32.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-import": "^2.27.5",
@@ -68,7 +68,7 @@
     "prettier": "^2.8.3",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
-    "vitest": "^0.27.2",
+    "vitest": "^0.28.3",
     "wasm-pack": "^0.10.3"
   },
   "files": [