@acala-network/chopsticks 0.8.0 → 0.8.1

package/lib/cli.js

@@ -41,6 +41,12 @@ const commands = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
         desc: 'Max memory block count',
         number: true,
     },
+    resume: {
+        desc: `Resume from the specified block hash or block number in db.
+                 If true, it will resume from the latest block in db.
+                 Note this will override the block option`,
+        string: true,
+    },
 }), async (argv) => {
     await (0, _1.setupWithServer)(argv);
 })

package/lib/context.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupContext = void 0;
 require("./utils/tunnel");
+const entities_1 = require("@acala-network/chopsticks-core/db/entities");
 const override_1 = require("./utils/override");
 const chopsticks_core_1 = require("@acala-network/chopsticks-core");
 const setupContext = async (argv, overrideParent = false) => {
@@ -18,6 +19,27 @@ const setupContext = async (argv, overrideParent = false) => {
         offchainWorker: argv['offchain-worker'],
         maxMemoryBlockCount: argv['max-memory-block-count'],
     });
+    // load block from db
+    if (chain.db) {
+        if (argv.resume) {
+            const where = {};
+            switch (typeof argv.resume) {
+                case 'string':
+                    where.hash = argv.resume;
+                    break;
+                case 'number':
+                    where.number = argv.resume;
+                    break;
+                default:
+                    break;
+            }
+            const blockData = await chain.db.getRepository(entities_1.BlockEntity).findOne({ where, order: { number: 'desc' } });
+            if (blockData) {
+                const block = await chain.loadBlockFromDB(blockData?.number);
+                block && (await chain.setHead(block));
+            }
+        }
+    }
     if (argv.timestamp)
         await (0, chopsticks_core_1.timeTravel)(chain, argv.timestamp);
     let at;

package/lib/rpc/substrate/author.js

@@ -39,18 +39,18 @@ const handlers = {
             });
             done(id);
         };
-        context.chain
-            .submitExtrinsic(extrinsic)
-            .then(() => {
+        try {
+            await context.chain.submitExtrinsic(extrinsic);
             callback({
                 Ready: null,
             });
-        })
-            .catch((error) => {
+        }
+        catch (error) {
             logger.error({ error }, 'ExtrinsicFailed');
-            callback(error?.toJSON() ?? error);
+            const code = error.isInvalid ? 1010 : 1011;
             done(id);
-        });
+            throw new shared_1.ResponseError(code, error.toString());
+        }
         return id;
     },
     author_unwatchExtrinsic: async (_context, [subid], { unsubscribe }) => {

package/lib/rpc/substrate/state.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const chopsticks_core_1 = require("@acala-network/chopsticks-core");
 const shared_1 = require("../shared");
 const logger_1 = require("../../logger");
 const logger = logger_1.defaultLogger.child({ name: 'rpc-state' });
@@ -78,5 +79,21 @@ const handlers = {
     state_unsubscribeStorage: async (_context, [subid], { unsubscribe }) => {
         unsubscribe(subid);
     },
+    childstate_getStorage: async (context, [child, key, hash]) => {
+        if (!(0, chopsticks_core_1.isPrefixedChildKey)(child)) {
+            throw new shared_1.ResponseError(-32000, 'Client error: Invalid child storage key');
+        }
+        const block = await context.chain.getBlock(hash);
+        return block?.get((0, chopsticks_core_1.prefixedChildKey)(child, key));
+    },
+    childstate_getKeysPaged: async (context, [child, prefix, pageSize, startKey, hash]) => {
+        if (!(0, chopsticks_core_1.isPrefixedChildKey)(child)) {
+            throw new shared_1.ResponseError(-32000, 'Client error: Invalid child storage key');
+        }
+        const block = await context.chain.getBlock(hash);
+        return block
+            ?.getKeysPaged({ prefix: (0, chopsticks_core_1.prefixedChildKey)(child, prefix), pageSize, startKey: (0, chopsticks_core_1.prefixedChildKey)(child, startKey) })
+            .then((keys) => keys.map(chopsticks_core_1.stripChildPrefix));
+    },
 };
 exports.default = handlers;

package/lib/schema/index.d.ts

@@ -45,12 +45,12 @@ export declare const configSchema: z.ZodObject<{
         }>;
     }, "strip", z.ZodTypeAny, {
         name: string;
-        id: string;
         properties: {
             ss58Format?: number | undefined;
             tokenDecimals?: number | number[] | undefined;
             tokenSymbol?: string | string[] | undefined;
         };
+        id: string;
         genesis: {
             raw: {
                 top: Record<string, string>;
@@ -58,12 +58,12 @@ export declare const configSchema: z.ZodObject<{
         };
     }, {
         name: string;
-        id: string;
         properties: {
             ss58Format?: number | undefined;
             tokenDecimals?: number | number[] | undefined;
             tokenSymbol?: string | string[] | undefined;
         };
+        id: string;
         genesis: {
             raw: {
                 top: Record<string, string>;
@@ -74,6 +74,7 @@ export declare const configSchema: z.ZodObject<{
     'registered-types': z.ZodOptional<z.ZodAny>;
     'runtime-log-level': z.ZodOptional<z.ZodNumber>;
     'offchain-worker': z.ZodOptional<z.ZodBoolean>;
+    resume: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean]>>;
 }, "strict", z.ZodTypeAny, {
     port?: number | undefined;
     endpoint?: string | undefined;
@@ -86,12 +87,12 @@ export declare const configSchema: z.ZodObject<{
     'wasm-override'?: string | undefined;
     genesis?: string | {
         name: string;
-        id: string;
         properties: {
             ss58Format?: number | undefined;
             tokenDecimals?: number | number[] | undefined;
             tokenSymbol?: string | string[] | undefined;
         };
+        id: string;
         genesis: {
             raw: {
                 top: Record<string, string>;
@@ -102,6 +103,7 @@ export declare const configSchema: z.ZodObject<{
     'registered-types'?: any;
     'runtime-log-level'?: number | undefined;
     'offchain-worker'?: boolean | undefined;
+    resume?: string | number | boolean | undefined;
 }, {
     port?: number | undefined;
     endpoint?: string | undefined;
@@ -114,12 +116,12 @@ export declare const configSchema: z.ZodObject<{
     'wasm-override'?: string | undefined;
     genesis?: string | {
         name: string;
-        id: string;
         properties: {
             ss58Format?: number | undefined;
             tokenDecimals?: number | number[] | undefined;
             tokenSymbol?: string | string[] | undefined;
         };
+        id: string;
         genesis: {
             raw: {
                 top: Record<string, string>;
@@ -130,6 +132,7 @@ export declare const configSchema: z.ZodObject<{
     'registered-types'?: any;
     'runtime-log-level'?: number | undefined;
     'offchain-worker'?: boolean | undefined;
+    resume?: string | number | boolean | undefined;
 }>;
 export type Config = z.infer<typeof configSchema>;
 export declare const fetchConfig: (path: string) => Promise<Config>;

package/lib/schema/index.js

@@ -27,6 +27,7 @@ exports.configSchema = zod_1.z
     'registered-types': zod_1.z.any().optional(),
     'runtime-log-level': zod_1.z.number().min(0).max(5).optional(),
     'offchain-worker': zod_1.z.boolean().optional(),
+    resume: zod_1.z.union([zod_1.z.string().length(66).startsWith('0x'), zod_1.z.number(), zod_1.z.boolean()]).optional(),
 })
     .strict();
 const CONFIGS_BASE_URL = 'https://raw.githubusercontent.com/AcalaNetwork/chopsticks/master/configs/';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
   "license": "Apache-2.0",
   "bin": "./chopsticks.js",
@@ -16,7 +16,7 @@
     "dev:moonbeam": "cd ../..; ts-node-dev --transpile-only --inspect -r tsconfig-paths/register --notify=false packages/chopsticks/src/cli.ts -- --config=configs/moonbeam.yml"
   },
   "dependencies": {
-    "@acala-network/chopsticks-core": "0.8.0",
+    "@acala-network/chopsticks-core": "0.8.1",
     "@pnpm/npm-conf": "^2.2.2",
     "@polkadot/api": "^10.9.1",
     "axios": "^1.5.0",