@acala-network/chopsticks 0.8.0-3 → 0.8.0-5

package/lib/plugins/decode-key/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cli = void 0;
-const decoder_1 = require("../../utils/decoder");
+const chopsticks_core_1 = require("@acala-network/chopsticks-core");
 const cli_options_1 = require("../../cli-options");
 const context_1 = require("../../context");
 const cli = (y) => {
@@ -14,7 +14,7 @@ const cli = (y) => {
         ...cli_options_1.defaultOptions,
     }), async (argv) => {
         const context = await (0, context_1.setupContext)(argv);
-        const { storage, decodedKey } = (0, decoder_1.decodeKey)(await context.chain.head.meta, context.chain.head, argv.key);
+        const { storage, decodedKey } = (0, chopsticks_core_1.decodeKey)(await context.chain.head.meta, context.chain.head, argv.key);
         if (storage && decodedKey) {
             console.log(`${storage.section}.${storage.method}`, decodedKey.args.map((x) => JSON.stringify(x.toHuman())).join(', '));
         }

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

@@ -68,10 +68,10 @@ const rpc = async (context, [params]) => {
     if (raw) {
         return storageDiff;
     }
-    const [oldData, newData, delta] = await (0, decoder_1.decodeStorageDiff)(context.chain.head, storageDiff);
+    const { oldState, newState, delta } = await (0, decoder_1.decodeStorageDiff)(context.chain.head, storageDiff);
     return {
-        old: oldData,
-        new: newData,
+        old: oldState,
+        new: newState,
         delta,
     };
 };

package/lib/setup-with-server.d.ts

@@ -1,6 +1,6 @@
 import { Config } from './schema';
 export declare const setupWithServer: (argv: Config) => Promise<{
-    close: () => Promise<void>;
     listenPort: number;
+    close(): Promise<void>;
     chain: import("@acala-network/chopsticks-core").Blockchain;
 }>;

package/lib/setup-with-server.js

@@ -16,8 +16,11 @@ const setupWithServer = async (argv) => {
     shared_1.logger.info(`${await context.chain.api.getSystemChain()} RPC listening on port ${listenPort}`);
     return {
         ...context,
-        close,
         listenPort,
+        async close() {
+            await context.chain.close();
+            await close();
+        },
     };
 };
 exports.setupWithServer = setupWithServer;

package/lib/utils/decoder.d.ts

@@ -1,18 +1,7 @@
-import '@polkadot/types-codec';
 import { Block } from '@acala-network/chopsticks-core';
-import { DecoratedMeta } from '@polkadot/types/metadata/decorate/types';
 import { HexString } from '@polkadot/util/types';
-import { StorageEntry } from '@polkadot/types/primitive/types';
-import { StorageKey } from '@polkadot/types';
-export declare const decodeKey: (meta: DecoratedMeta, block: Block, key: HexString) => {
-    storage?: StorageEntry | undefined;
-    decodedKey?: StorageKey<import("@polkadot/types-codec/types").AnyTuple> | undefined;
-};
-export declare const decodeKeyValue: (meta: DecoratedMeta, block: Block, key: HexString, value?: HexString | null) => {
-    [x: string]: `0x${string}` | null | undefined;
-} | {
-    [x: string]: {
-        [x: string]: import("@polkadot/types-codec/types").AnyJson;
-    };
-};
-export declare const decodeStorageDiff: (block: Block, diff: [HexString, HexString | null][]) => Promise<({} | undefined)[]>;
+export declare const decodeStorageDiff: (block: Block, diff: [HexString, HexString | null][]) => Promise<{
+    oldState: {};
+    newState: {};
+    delta: import("jsondiffpatch").Delta | undefined;
+}>;

package/lib/utils/decoder.js

@@ -3,105 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeStorageDiff = exports.decodeKeyValue = exports.decodeKey = void 0;
-require("@polkadot/types-codec");
-const util_crypto_1 = require("@polkadot/util-crypto");
+exports.decodeStorageDiff = void 0;
+const chopsticks_core_1 = require("@acala-network/chopsticks-core");
 const jsondiffpatch_1 = require("jsondiffpatch");
-const util_1 = require("@polkadot/util");
 const lodash_1 = __importDefault(require("lodash"));
 const diffPatcher = (0, jsondiffpatch_1.create)({
     array: { detectMove: false },
     textDiff: { minLength: Number.MAX_VALUE }, // skip text diff
 });
-const _CACHE = {};
-const getCache = (uid) => {
-    if (!_CACHE[uid]) {
-        _CACHE[uid] = {};
-    }
-    return _CACHE[uid];
-};
-const getStorageEntry = (meta, block, key) => {
-    const cache = getCache(block.chain.uid);
-    for (const [prefix, storageEntry] of Object.entries(cache)) {
-        if (key.startsWith(prefix))
-            return storageEntry;
-    }
-    for (const module of Object.values(meta.query)) {
-        for (const storage of Object.values(module)) {
-            const keyPrefix = (0, util_1.u8aToHex)(storage.keyPrefix());
-            if (key.startsWith(keyPrefix)) {
-                cache[keyPrefix] = storage;
-                return storage;
-            }
-        }
-    }
-    return undefined;
-};
-const decodeKey = (meta, block, key) => {
-    const storage = getStorageEntry(meta, block, key);
-    const decodedKey = meta.registry.createType('StorageKey', key);
-    if (storage) {
-        decodedKey.setMeta(storage.meta);
-        return { storage, decodedKey };
-    }
-    return {};
-};
-exports.decodeKey = decodeKey;
-const decodeKeyValue = (meta, block, key, value) => {
-    const { storage, decodedKey } = (0, exports.decodeKey)(meta, block, key);
-    if (!storage || !decodedKey) {
-        return { [key]: value };
-    }
-    const decodeValue = () => {
-        if (!value)
-            return null;
-        if (storage.section === 'substrate' && storage.method === 'code') {
-            return `:code blake2_256 ${(0, util_crypto_1.blake2AsHex)(value, 256)} (${(0, util_1.hexToU8a)(value).length} bytes)`;
-        }
-        return meta.registry.createType(decodedKey.outputType, (0, util_1.hexToU8a)(value)).toHuman();
-    };
-    switch (decodedKey.args.length) {
-        case 2: {
-            return {
-                [storage.section]: {
-                    [storage.method]: {
-                        [decodedKey.args[0].toString()]: {
-                            [decodedKey.args[1].toString()]: decodeValue(),
-                        },
-                    },
-                },
-            };
-        }
-        case 1: {
-            return {
-                [storage.section]: {
-                    [storage.method]: {
-                        [decodedKey.args[0].toString()]: decodeValue(),
-                    },
-                },
-            };
-        }
-        default:
-            return {
-                [storage.section]: {
-                    [storage.method]: decodeValue(),
-                },
-            };
-    }
-};
-exports.decodeKeyValue = decodeKeyValue;
 const decodeStorageDiff = async (block, diff) => {
-    const oldState = {};
-    const newState = {};
-    const meta = await block.meta;
-    for (const [key, value] of diff) {
-        lodash_1.default.merge(oldState, (0, exports.decodeKeyValue)(meta, block, key, (await block.get(key))));
-        lodash_1.default.merge(newState, (0, exports.decodeKeyValue)(meta, block, key, value));
-    }
+    const [oldState, newState] = await (0, chopsticks_core_1.decodeBlockStorageDiff)(block, diff);
     const oldStateWithoutEvents = lodash_1.default.cloneDeep(oldState);
     if (oldStateWithoutEvents['system']?.['events']) {
         oldStateWithoutEvents['system']['events'] = [];
     }
-    return [oldState, newState, diffPatcher.diff(oldStateWithoutEvents, newState)];
+    return { oldState, newState, delta: diffPatcher.diff(oldStateWithoutEvents, newState) };
 };
 exports.decodeStorageDiff = decodeStorageDiff;

package/lib/utils/generate-html-diff.js

@@ -9,9 +9,9 @@ const node_fs_1 = require("node:fs");
 const lodash_1 = require("lodash");
 const node_path_1 = __importDefault(require("node:path"));
 const generateHtmlDiff = async (block, diff) => {
-    const [left, _right, delta] = await (0, decoder_1.decodeStorageDiff)(block, diff);
+    const { oldState, delta } = await (0, decoder_1.decodeStorageDiff)(block, diff);
     const htmlTemplate = (0, node_fs_1.readFileSync)(node_path_1.default.join(__dirname, '../../template/diff.html'), 'utf-8');
-    return (0, lodash_1.template)(htmlTemplate)({ left: JSON.stringify(left), delta: JSON.stringify(delta) });
+    return (0, lodash_1.template)(htmlTemplate)({ left: JSON.stringify(oldState), delta: JSON.stringify(delta) });
 };
 exports.generateHtmlDiff = generateHtmlDiff;
 const generateHtmlDiffPreviewFile = async (block, diff, filename) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.8.0-3",
+  "version": "0.8.0-5",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
   "license": "Apache-2.0",
   "bin": "./chopsticks.js",
@@ -16,24 +16,24 @@
     "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-3",
+    "@acala-network/chopsticks-core": "0.8.0-5",
     "@pnpm/npm-conf": "^2.2.2",
     "@polkadot/api": "^10.9.1",
     "axios": "^1.4.0",
     "dotenv": "^16.3.1",
     "global-agent": "^3.0.0",
     "js-yaml": "^4.1.0",
-    "jsondiffpatch": "^0.4.1",
+    "jsondiffpatch": "^0.5.0",
     "lodash": "^4.17.21",
     "ws": "^8.13.0",
     "yargs": "^17.7.2",
-    "zod": "^3.21.4"
+    "zod": "^3.22.2"
   },
   "devDependencies": {
     "@types/global-agent": "^2.1.1",
     "@types/js-yaml": "^4.0.5",
     "@types/lodash": "^4.14.197",
-    "@types/node": "^20.4.9",
+    "@types/node": "^20.5.1",
     "@types/ws": "^8.5.5",
     "@types/yargs": "^17.0.24",
     "ts-node": "^10.9.1",