@acala-network/chopsticks-core 0.9.0 → 0.9.1-2

package/dist/cjs/api.js

@@ -124,6 +124,18 @@ class Api {
             return __classPrivateFieldGet(this, _Api_provider, "f").send('state_getKeysPaged', params, !!hash);
         }
     }
+    async subscribeRemoteNewHeads(cb) {
+        if (!__classPrivateFieldGet(this, _Api_provider, "f").hasSubscriptions) {
+            throw new Error('subscribeRemoteNewHeads only works with subscriptions');
+        }
+        return __classPrivateFieldGet(this, _Api_provider, "f").subscribe('chain_newHead', 'chain_subscribeNewHeads', [], cb);
+    }
+    async subscribeRemoteFinalizedHeads(cb) {
+        if (!__classPrivateFieldGet(this, _Api_provider, "f").hasSubscriptions) {
+            throw new Error('subscribeRemoteFinalizedHeads only works with subscriptions');
+        }
+        return __classPrivateFieldGet(this, _Api_provider, "f").subscribe('chain_finalizedHead', 'chain_subscribeFinalizedHeads', [], cb);
+    }
 }
 exports.Api = Api;
 _Api_provider = new WeakMap(), _Api_ready = new WeakMap(), _Api_chain = new WeakMap(), _Api_chainProperties = new WeakMap();

package/dist/cjs/blockchain/txpool.js

@@ -16,7 +16,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var _TxPool_instances, _TxPool_chain, _TxPool_pool, _TxPool_ump, _TxPool_dmp, _TxPool_hrmp, _TxPool_mode, _TxPool_inherentProvider, _TxPool_pendingBlocks, _TxPool_isBuilding, _TxPool_getSigner, _TxPool_maybeBuildBlock, _TxPool_batchBuildBlock, _TxPool_buildBlockIfNeeded, _TxPool_buildBlock;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TxPool = exports.BuildBlockMode = exports.APPLY_EXTRINSIC_ERROR = void 0;
-const eventemitter3_1 = require("eventemitter3");
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const lodash_1 = __importDefault(require("lodash"));
 const utils_1 = require("../utils");
 const block_builder_1 = require("./block-builder");
@@ -43,7 +43,7 @@ class TxPool {
         _TxPool_mode.set(this, void 0);
         _TxPool_inherentProvider.set(this, void 0);
         _TxPool_pendingBlocks.set(this, []);
-        this.event = new eventemitter3_1.EventEmitter();
+        this.event = new eventemitter3_1.default();
         _TxPool_isBuilding.set(this, false);
         _TxPool_batchBuildBlock.set(this, lodash_1.default.debounce(this.buildBlock, 100, { maxWait: 1000 }));
         __classPrivateFieldSet(this, _TxPool_chain, chain, "f");

package/dist/cjs/chopsticks-provider.js

@@ -10,10 +10,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 var _a, _ChopsticksProvider_isConnected, _ChopsticksProvider_eventemitter, _ChopsticksProvider_isReadyPromise, _ChopsticksProvider_subscriptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChopsticksProvider = void 0;
-const eventemitter3_1 = require("eventemitter3");
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const rpc_1 = require("./rpc");
 const logger_1 = require("./logger");
 const setup_1 = require("./setup");
@@ -113,7 +116,7 @@ class ChopsticksProvider {
                 throw e;
             }
         };
-        __classPrivateFieldSet(this, _ChopsticksProvider_eventemitter, new eventemitter3_1.EventEmitter(), "f");
+        __classPrivateFieldSet(this, _ChopsticksProvider_eventemitter, new eventemitter3_1.default(), "f");
         __classPrivateFieldSet(this, _ChopsticksProvider_isReadyPromise, new Promise((resolve, reject) => {
             __classPrivateFieldGet(this, _ChopsticksProvider_eventemitter, "f").once('connected', resolve);
             __classPrivateFieldGet(this, _ChopsticksProvider_eventemitter, "f").once('error', reject);

package/dist/cjs/genesis-provider.js

@@ -10,10 +10,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 var _GenesisProvider_isConnected, _GenesisProvider_eventemitter, _GenesisProvider_isReadyPromise, _GenesisProvider_genesis, _GenesisProvider_stateRoot;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenesisProvider = void 0;
-const eventemitter3_1 = require("eventemitter3");
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const schema_1 = require("./schema");
 const wasm_executor_1 = require("./wasm-executor");
 /**
@@ -104,7 +107,7 @@ class GenesisProvider {
             accu.push(item);
             return accu;
         }, []), 1), "f");
-        __classPrivateFieldSet(this, _GenesisProvider_eventemitter, new eventemitter3_1.EventEmitter(), "f");
+        __classPrivateFieldSet(this, _GenesisProvider_eventemitter, new eventemitter3_1.default(), "f");
         __classPrivateFieldSet(this, _GenesisProvider_isReadyPromise, new Promise((resolve, reject) => {
             __classPrivateFieldGet(this, _GenesisProvider_eventemitter, "f").once('connected', () => {
                 resolve();

package/dist/cjs/utils/decoder.js

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeBlockStorageDiff = exports.decodeKeyValue = exports.decodeKey = void 0;
+exports.decodeBlockStorageDiff = exports.toStorageObject = exports.decodeKeyValue = exports.decodeKey = void 0;
 require("@polkadot/types-codec");
-const util_crypto_1 = require("@polkadot/util-crypto");
 const util_1 = require("@polkadot/util");
 const lodash_1 = __importDefault(require("lodash"));
+const well_known_keys_1 = require("./well-known-keys");
 const _CACHE = {};
 const getCache = (uid) => {
     if (!_CACHE[uid]) {
@@ -43,48 +43,52 @@ const decodeKey = (meta, block, key) => {
 };
 exports.decodeKey = decodeKey;
 const decodeKeyValue = (meta, block, key, value, toHuman = true) => {
+    const res = (0, well_known_keys_1.decodeWellKnownKey)(meta.registry, key, value);
+    if (res) {
+        return {
+            section: 'substrate',
+            method: res.name,
+            key: res.key,
+            value: res.value,
+        };
+    }
     const { storage, decodedKey } = (0, exports.decodeKey)(meta, block, key);
     if (!storage || !decodedKey) {
-        return { [key]: value };
+        return undefined;
     }
     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 ? 'toHuman' : 'toJSON']();
     };
-    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(),
-                    },
-                },
-            };
+    return {
+        section: storage.section,
+        method: storage.method,
+        key: decodedKey.args,
+        value: decodeValue(),
+    };
+};
+exports.decodeKeyValue = decodeKeyValue;
+const toStorageObject = (decoded) => {
+    if (!decoded) {
+        return undefined;
+    }
+    const { section, method, key, value } = decoded;
+    let obj = value;
+    if (key) {
+        for (let i = key.length - 1; i >= 0; i--) {
+            const k = key[i];
+            const newObj = { [k.toString()]: obj };
+            obj = newObj;
         }
-        default:
-            return {
-                [storage.section]: {
-                    [storage.method]: decodeValue(),
-                },
-            };
     }
+    return {
+        [section]: {
+            [method]: obj,
+        },
+    };
 };
-exports.decodeKeyValue = decodeKeyValue;
+exports.toStorageObject = toStorageObject;
 /**
  * Decode block storage diff
  * @param block Block to compare storage diff
@@ -96,8 +100,11 @@ const decodeBlockStorageDiff = async (block, diff) => {
     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 oldValue = await block.get(key);
+        const oldDecoded = (0, exports.toStorageObject)((0, exports.decodeKeyValue)(meta, block, key, oldValue)) ?? { [key]: oldValue };
+        lodash_1.default.merge(oldState, oldDecoded);
+        const newDecoded = (0, exports.toStorageObject)((0, exports.decodeKeyValue)(meta, block, key, value)) ?? { [key]: value };
+        lodash_1.default.merge(newState, newDecoded);
     }
     return [oldState, newState];
 };

package/dist/cjs/utils/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printRuntimeLogs = exports.stripChildPrefix = exports.splitChildKey = exports.isPrefixedChildKey = exports.prefixedChildKey = exports.defer = exports.isUrl = exports.getParaId = exports.compactHex = exports.fetchKeysToArray = exports.fetchKeys = void 0;
+exports.printRuntimeLogs = exports.formatRuntimeLog = exports.stripChildPrefix = exports.splitChildKey = exports.isPrefixedChildKey = exports.prefixedChildKey = exports.defer = exports.isUrl = exports.getParaId = exports.compactHex = exports.fetchKeysToArray = exports.fetchKeys = void 0;
 const util_1 = require("@polkadot/util");
 const hex_1 = require("@polkadot/util/hex");
 __exportStar(require("./set-storage"), exports);
@@ -107,12 +107,25 @@ const stripChildPrefix = (key) => {
     return storageKey;
 };
 exports.stripChildPrefix = stripChildPrefix;
+const logLevels = ['OFF', 'ERROR', 'WARN', 'INFO', 'DEBUG', 'TRACE'];
+const formatRuntimeLog = (log) => {
+    let msg = '';
+    if (log.level != null) {
+        msg += `${logLevels[log.level]}\t `;
+    }
+    if (log.target) {
+        msg += `[${log.target}]:\t `;
+    }
+    msg += log.message;
+    return msg;
+};
+exports.formatRuntimeLog = formatRuntimeLog;
 const printRuntimeLogs = (logs) => {
     if (!logs.length)
         return;
     console.group('RuntimeLogs:');
     for (const log of logs) {
-        console.log(log);
+        console.log((0, exports.formatRuntimeLog)(log));
     }
     console.groupEnd();
 };

package/dist/cjs/utils/well-known-keys.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeWellKnownKey = void 0;
+const util_crypto_1 = require("@polkadot/util-crypto");
+const util_1 = require("@polkadot/util");
+const decodeValue = (type) => (registry, value) => {
+    return registry.createType(type, (0, util_1.hexToU8a)(value)).toJSON();
+};
+// https://github.com/paritytech/polkadot-sdk/issues/2126
+const wellKnownKeys = [
+    {
+        name: 'code',
+        key: ':code',
+        decodeValue: (_registry, value) => {
+            return `<:code blake2_256 ${(0, util_crypto_1.blake2AsHex)(value, 256)} (${value.length / 2 - 1} bytes)>`;
+        },
+    },
+    {
+        name: 'heapPages',
+        key: ':heappages',
+        type: 'u64',
+    },
+    {
+        name: 'extrinsicIndex',
+        key: ':extrinsic_index',
+        type: 'u32',
+    },
+    {
+        name: 'intrablockEntropy',
+        key: ':intrablock_entropy',
+        type: '[u8; 32]',
+    },
+    {
+        name: 'transactionLevel',
+        key: ':transaction_level:',
+        type: 'u32',
+    },
+    {
+        name: 'grandpaAuthorities',
+        key: ':grandpa_authorities',
+        type: '(u8, AuthorityList)',
+    },
+    {
+        name: 'relayDispatchQueueRemainingCapacity',
+        prefix: ':relay_dispatch_queue_remaining_capacity',
+        decodeKey: (registry, key) => {
+            return [registry.createType('u32', (0, util_1.hexToU8a)(key)).toJSON()];
+        },
+        type: '(u32, u32)',
+    },
+].map((def) => {
+    const prefix = (0, util_1.stringToHex)(def.prefix || def.key);
+    return {
+        name: def.name,
+        prefix,
+        decodeKey: def.decodeKey || ((_registry, key) => [key]),
+        decodeValue: def.decodeValue || decodeValue(def.type),
+    };
+});
+const decodeWellKnownKey = (registry, key, value) => {
+    for (const defs of wellKnownKeys) {
+        if (key.startsWith(defs.prefix)) {
+            const remaining = key.slice(defs.prefix.length);
+            const decodedKey = remaining ? defs.decodeKey(registry, `0x${remaining}`) : undefined;
+            const decodedValue = value ? defs.decodeValue(registry, value) : undefined;
+            return {
+                name: defs.name,
+                key: decodedKey ?? [],
+                value: decodedValue,
+            };
+        }
+    }
+};
+exports.decodeWellKnownKey = decodeWellKnownKey;

package/dist/cjs/wasm-executor/node-worker.js

@@ -7,10 +7,41 @@ exports.startWorker = void 0;
 const comlink_1 = require("comlink");
 const node_adapter_js_1 = __importDefault(require("comlink/dist/umd/node-adapter.js"));
 const node_worker_threads_1 = __importDefault(require("node:worker_threads"));
-const node_url_1 = __importDefault(require("node:url"));
 const startWorker = async () => {
-    const worker = new node_worker_threads_1.default.Worker(node_url_1.default.resolve(__filename, 'node-wasm-executor.mjs'), {
+    const workerCode = `
+    const Comlink = require('comlink')
+    const pkg = require('@acala-network/chopsticks-executor')
+    const { parentPort } = require('node:worker_threads')
+    const nodeEndpoint = require('comlink/dist/umd/node-adapter.js')
+
+    const getRuntimeVersion = async (code) => {
+      return pkg.get_runtime_version(code)
+    }
+
+    // trie_version: 0 for old trie, 1 for new trie
+    const calculateStateRoot = async (entries, trie_version) => {
+      return pkg.calculate_state_root(entries, trie_version)
+    }
+
+    const decodeProof = async (trieRootHash, keys, nodes) => {
+      return pkg.decode_proof(trieRootHash, keys, nodes)
+    }
+
+    const createProof = async (nodes, entries) => {
+      return pkg.create_proof(nodes, entries)
+    }
+
+    const runTask = async (task, callback) => {
+      return pkg.run_task(task, callback, process.env.RUST_LOG)
+    }
+
+    const wasmExecutor = { runTask, getRuntimeVersion, calculateStateRoot, createProof, decodeProof }
+
+    Comlink.expose(wasmExecutor, nodeEndpoint(parentPort))
+    `;
+    const worker = new node_worker_threads_1.default.Worker(workerCode, {
         name: 'chopsticks-wasm-executor',
+        eval: true,
     });
     return {
         remote: (0, comlink_1.wrap)((0, node_adapter_js_1.default)(worker)),

package/dist/esm/api.js

@@ -121,5 +121,17 @@ export class Api {
             return __classPrivateFieldGet(this, _Api_provider, "f").send('state_getKeysPaged', params, !!hash);
         }
     }
+    async subscribeRemoteNewHeads(cb) {
+        if (!__classPrivateFieldGet(this, _Api_provider, "f").hasSubscriptions) {
+            throw new Error('subscribeRemoteNewHeads only works with subscriptions');
+        }
+        return __classPrivateFieldGet(this, _Api_provider, "f").subscribe('chain_newHead', 'chain_subscribeNewHeads', [], cb);
+    }
+    async subscribeRemoteFinalizedHeads(cb) {
+        if (!__classPrivateFieldGet(this, _Api_provider, "f").hasSubscriptions) {
+            throw new Error('subscribeRemoteFinalizedHeads only works with subscriptions');
+        }
+        return __classPrivateFieldGet(this, _Api_provider, "f").subscribe('chain_finalizedHead', 'chain_subscribeFinalizedHeads', [], cb);
+    }
 }
 _Api_provider = new WeakMap(), _Api_ready = new WeakMap(), _Api_chain = new WeakMap(), _Api_chainProperties = new WeakMap();

package/dist/esm/blockchain/txpool.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TxPool_instances, _TxPool_chain, _TxPool_pool, _TxPool_ump, _TxPool_dmp, _TxPool_hrmp, _TxPool_mode, _TxPool_inherentProvider, _TxPool_pendingBlocks, _TxPool_isBuilding, _TxPool_getSigner, _TxPool_maybeBuildBlock, _TxPool_batchBuildBlock, _TxPool_buildBlockIfNeeded, _TxPool_buildBlock;
-import { EventEmitter } from 'eventemitter3';
+import { default as EventEmitter } from 'eventemitter3';
 import _ from 'lodash';
 import { defer } from '../utils';
 import { buildBlock } from './block-builder';

package/dist/esm/chopsticks-provider.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _a, _ChopsticksProvider_isConnected, _ChopsticksProvider_eventemitter, _ChopsticksProvider_isReadyPromise, _ChopsticksProvider_subscriptions;
-import { EventEmitter } from 'eventemitter3';
+import { default as EventEmitter } from 'eventemitter3';
 import { allHandlers } from './rpc';
 import { defaultLogger } from './logger';
 import { setup } from './setup';

package/dist/esm/genesis-provider.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _GenesisProvider_isConnected, _GenesisProvider_eventemitter, _GenesisProvider_isReadyPromise, _GenesisProvider_genesis, _GenesisProvider_stateRoot;
-import { EventEmitter } from 'eventemitter3';
+import { default as EventEmitter } from 'eventemitter3';
 import { genesisSchema } from './schema';
 import { calculateStateRoot, emptyTaskHandler } from './wasm-executor';
 /**

package/dist/esm/package.json

@@ -0,0 +1 @@
+{"type": "module"}

package/dist/esm/utils/decoder.js

@@ -1,7 +1,7 @@
 import '@polkadot/types-codec';
-import { blake2AsHex } from '@polkadot/util-crypto';
 import { hexToU8a, u8aToHex } from '@polkadot/util';
 import _ from 'lodash';
+import { decodeWellKnownKey } from './well-known-keys';
 const _CACHE = {};
 const getCache = (uid) => {
     if (!_CACHE[uid]) {
@@ -36,46 +36,49 @@ export const decodeKey = (meta, block, key) => {
     return {};
 };
 export const decodeKeyValue = (meta, block, key, value, toHuman = true) => {
+    const res = decodeWellKnownKey(meta.registry, key, value);
+    if (res) {
+        return {
+            section: 'substrate',
+            method: res.name,
+            key: res.key,
+            value: res.value,
+        };
+    }
     const { storage, decodedKey } = decodeKey(meta, block, key);
     if (!storage || !decodedKey) {
-        return { [key]: value };
+        return undefined;
     }
     const decodeValue = () => {
         if (!value)
             return null;
-        if (storage.section === 'substrate' && storage.method === 'code') {
-            return `:code blake2_256 ${blake2AsHex(value, 256)} (${hexToU8a(value).length} bytes)`;
-        }
         return meta.registry.createType(decodedKey.outputType, hexToU8a(value))[toHuman ? 'toHuman' : 'toJSON']();
     };
-    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(),
-                    },
-                },
-            };
+    return {
+        section: storage.section,
+        method: storage.method,
+        key: decodedKey.args,
+        value: decodeValue(),
+    };
+};
+export const toStorageObject = (decoded) => {
+    if (!decoded) {
+        return undefined;
+    }
+    const { section, method, key, value } = decoded;
+    let obj = value;
+    if (key) {
+        for (let i = key.length - 1; i >= 0; i--) {
+            const k = key[i];
+            const newObj = { [k.toString()]: obj };
+            obj = newObj;
         }
-        default:
-            return {
-                [storage.section]: {
-                    [storage.method]: decodeValue(),
-                },
-            };
     }
+    return {
+        [section]: {
+            [method]: obj,
+        },
+    };
 };
 /**
  * Decode block storage diff
@@ -88,8 +91,11 @@ export const decodeBlockStorageDiff = async (block, diff) => {
     const newState = {};
     const meta = await block.meta;
     for (const [key, value] of diff) {
-        _.merge(oldState, decodeKeyValue(meta, block, key, (await block.get(key))));
-        _.merge(newState, decodeKeyValue(meta, block, key, value));
+        const oldValue = await block.get(key);
+        const oldDecoded = toStorageObject(decodeKeyValue(meta, block, key, oldValue)) ?? { [key]: oldValue };
+        _.merge(oldState, oldDecoded);
+        const newDecoded = toStorageObject(decodeKeyValue(meta, block, key, value)) ?? { [key]: value };
+        _.merge(newState, newDecoded);
     }
     return [oldState, newState];
 };

package/dist/esm/utils/index.js

@@ -80,12 +80,24 @@ export const stripChildPrefix = (key) => {
         return key;
     return storageKey;
 };
+const logLevels = ['OFF', 'ERROR', 'WARN', 'INFO', 'DEBUG', 'TRACE'];
+export const formatRuntimeLog = (log) => {
+    let msg = '';
+    if (log.level != null) {
+        msg += `${logLevels[log.level]}\t `;
+    }
+    if (log.target) {
+        msg += `[${log.target}]:\t `;
+    }
+    msg += log.message;
+    return msg;
+};
 export const printRuntimeLogs = (logs) => {
     if (!logs.length)
         return;
     console.group('RuntimeLogs:');
     for (const log of logs) {
-        console.log(log);
+        console.log(formatRuntimeLog(log));
     }
     console.groupEnd();
 };

package/dist/esm/utils/well-known-keys.js

@@ -0,0 +1,70 @@
+import { blake2AsHex } from '@polkadot/util-crypto';
+import { hexToU8a, stringToHex } from '@polkadot/util';
+const decodeValue = (type) => (registry, value) => {
+    return registry.createType(type, hexToU8a(value)).toJSON();
+};
+// https://github.com/paritytech/polkadot-sdk/issues/2126
+const wellKnownKeys = [
+    {
+        name: 'code',
+        key: ':code',
+        decodeValue: (_registry, value) => {
+            return `<:code blake2_256 ${blake2AsHex(value, 256)} (${value.length / 2 - 1} bytes)>`;
+        },
+    },
+    {
+        name: 'heapPages',
+        key: ':heappages',
+        type: 'u64',
+    },
+    {
+        name: 'extrinsicIndex',
+        key: ':extrinsic_index',
+        type: 'u32',
+    },
+    {
+        name: 'intrablockEntropy',
+        key: ':intrablock_entropy',
+        type: '[u8; 32]',
+    },
+    {
+        name: 'transactionLevel',
+        key: ':transaction_level:',
+        type: 'u32',
+    },
+    {
+        name: 'grandpaAuthorities',
+        key: ':grandpa_authorities',
+        type: '(u8, AuthorityList)',
+    },
+    {
+        name: 'relayDispatchQueueRemainingCapacity',
+        prefix: ':relay_dispatch_queue_remaining_capacity',
+        decodeKey: (registry, key) => {
+            return [registry.createType('u32', hexToU8a(key)).toJSON()];
+        },
+        type: '(u32, u32)',
+    },
+].map((def) => {
+    const prefix = stringToHex(def.prefix || def.key);
+    return {
+        name: def.name,
+        prefix,
+        decodeKey: def.decodeKey || ((_registry, key) => [key]),
+        decodeValue: def.decodeValue || decodeValue(def.type),
+    };
+});
+export const decodeWellKnownKey = (registry, key, value) => {
+    for (const defs of wellKnownKeys) {
+        if (key.startsWith(defs.prefix)) {
+            const remaining = key.slice(defs.prefix.length);
+            const decodedKey = remaining ? defs.decodeKey(registry, `0x${remaining}`) : undefined;
+            const decodedValue = value ? defs.decodeValue(registry, value) : undefined;
+            return {
+                name: defs.name,
+                key: decodedKey ?? [],
+                value: decodedValue,
+            };
+        }
+    }
+};

package/dist/esm/wasm-executor/node-worker.js

@@ -1,10 +1,41 @@
 import { wrap } from 'comlink';
 import nodeEndpoint from 'comlink/dist/umd/node-adapter.js';
 import threads from 'node:worker_threads';
-import url from 'node:url';
 export const startWorker = async () => {
-    const worker = new threads.Worker(url.resolve(__filename, 'node-wasm-executor.mjs'), {
+    const workerCode = `
+    const Comlink = require('comlink')
+    const pkg = require('@acala-network/chopsticks-executor')
+    const { parentPort } = require('node:worker_threads')
+    const nodeEndpoint = require('comlink/dist/umd/node-adapter.js')
+
+    const getRuntimeVersion = async (code) => {
+      return pkg.get_runtime_version(code)
+    }
+
+    // trie_version: 0 for old trie, 1 for new trie
+    const calculateStateRoot = async (entries, trie_version) => {
+      return pkg.calculate_state_root(entries, trie_version)
+    }
+
+    const decodeProof = async (trieRootHash, keys, nodes) => {
+      return pkg.decode_proof(trieRootHash, keys, nodes)
+    }
+
+    const createProof = async (nodes, entries) => {
+      return pkg.create_proof(nodes, entries)
+    }
+
+    const runTask = async (task, callback) => {
+      return pkg.run_task(task, callback, process.env.RUST_LOG)
+    }
+
+    const wasmExecutor = { runTask, getRuntimeVersion, calculateStateRoot, createProof, decodeProof }
+
+    Comlink.expose(wasmExecutor, nodeEndpoint(parentPort))
+    `;
+    const worker = new threads.Worker(workerCode, {
         name: 'chopsticks-wasm-executor',
+        eval: true,
     });
     return {
         remote: wrap(nodeEndpoint(worker)),

package/dist/types/api.d.ts

@@ -1,6 +1,6 @@
 import { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types';
 import { HexString } from '@polkadot/util/types';
-import { ProviderInterface } from '@polkadot/rpc-provider/types';
+import { ProviderInterface, ProviderInterfaceCallback } from '@polkadot/rpc-provider/types';
 export type ChainProperties = {
     ss58Format?: number;
     tokenDecimals?: number[];
@@ -50,5 +50,7 @@ export declare class Api {
     getBlock(hash?: string): Promise<SignedBlock | null>;
     getStorage(key: string, hash?: string): Promise<`0x${string}` | null>;
     getKeysPaged(prefix: string, pageSize: number, startKey: string, hash?: string): Promise<string[]>;
+    subscribeRemoteNewHeads(cb: ProviderInterfaceCallback): Promise<string | number>;
+    subscribeRemoteFinalizedHeads(cb: ProviderInterfaceCallback): Promise<string | number>;
 }
 export {};

package/dist/types/blockchain/block-builder.d.ts

@@ -1,6 +1,7 @@
 import { Header, TransactionValidityError } from '@polkadot/types/interfaces';
-import { Block, TaskCallResponse } from './block';
+import { Block } from './block';
 import { HexString } from '@polkadot/util/types';
+import { TaskCallResponse } from '../wasm-executor';
 export declare const newHeader: (head: Block, unsafeBlockHeight?: number) => Promise<Header>;
 export type BuildBlockCallbacks = {
     onApplyExtrinsicError?: (extrinsic: HexString, error: TransactionValidityError) => void;

package/dist/types/blockchain/block.d.ts

@@ -5,13 +5,7 @@ import { StorageEntry } from '@polkadot/types/primitive/types';
 import type { HexString } from '@polkadot/util/types';
 import { Blockchain } from '.';
 import { StorageLayer, StorageLayerProvider, StorageValue } from './storage-layer';
-import type { RuntimeVersion } from '../wasm-executor';
-export type TaskCallResponse = {
-    result: HexString;
-    storageDiff: [HexString, HexString | null][];
-    offchainStorageDiff: [HexString, HexString | null][];
-    runtimeLogs: string[];
-};
+import type { RuntimeVersion, TaskCallResponse } from '../wasm-executor';
 /**
  * Block class.
  *
@@ -53,7 +47,7 @@ export declare class Block {
     /**
      * Get the block storage by key.
      */
-    get(key: string): Promise<string | undefined>;
+    get(key: string): Promise<HexString | undefined>;
     read<T extends string>(type: T, query: StorageEntry, ...args: any[]): Promise<import("@polkadot/types/types").DetectCodec<import("@polkadot/types-codec/types").Codec, T> | undefined>;
     /**
      * Get paged storage keys.

package/dist/types/blockchain/txpool.d.ts

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'eventemitter3';
+import { default as EventEmitter } from 'eventemitter3';
 import { HexString } from '@polkadot/util/types';
 import { Blockchain } from '.';
 import { InherentProvider } from './inherent';

package/dist/types/utils/decoder.d.ts

@@ -9,12 +9,16 @@ export declare const decodeKey: (meta: DecoratedMeta, block: Block, key: HexStri
     decodedKey?: StorageKey<import("@polkadot/types-codec/types").AnyTuple> | undefined;
 };
 export declare const decodeKeyValue: (meta: DecoratedMeta, block: Block, key: HexString, value?: HexString | null, toHuman?: boolean) => {
-    [x: string]: `0x${string}` | null | undefined;
-} | {
+    section: string;
+    method: string;
+    key: any[];
+    value: import("@polkadot/types-codec/types").AnyJson;
+} | undefined;
+export declare const toStorageObject: (decoded: ReturnType<typeof decodeKeyValue>) => {
     [x: string]: {
         [x: string]: import("@polkadot/types-codec/types").AnyJson;
     };
-};
+} | undefined;
 /**
  * Decode block storage diff
  * @param block Block to compare storage diff

package/dist/types/utils/index.d.ts

@@ -1,6 +1,7 @@
 import { HexString } from '@polkadot/util/types';
 import { StorageKey } from '@polkadot/types';
 import { Blockchain } from '../blockchain';
+import { RuntimeLog } from '../wasm-executor';
 export * from './set-storage';
 export * from './time-travel';
 export * from './decoder';
@@ -21,4 +22,5 @@ export declare const prefixedChildKey: (prefix: HexString, key: HexString) => st
 export declare const isPrefixedChildKey: (key: HexString) => boolean;
 export declare const splitChildKey: (key: HexString) => never[] | [`0x${string}`, `0x${string}`];
 export declare const stripChildPrefix: (key: HexString) => `0x${string}`;
-export declare const printRuntimeLogs: (logs: string[]) => void;
+export declare const formatRuntimeLog: (log: RuntimeLog) => string;
+export declare const printRuntimeLogs: (logs: RuntimeLog[]) => void;

package/dist/types/utils/well-known-keys.d.ts

@@ -0,0 +1,7 @@
+import { HexString } from '@polkadot/util/types';
+import { Registry } from '@polkadot/types-codec/types';
+export declare const decodeWellKnownKey: (registry: Registry, key: HexString, value?: HexString | null) => {
+    name: string;
+    key: any[];
+    value: import("@polkadot/types-codec/types").AnyJson;
+} | undefined;

package/dist/types/wasm-executor/browser-worker.d.ts

@@ -1,5 +1,4 @@
-import type { WasmExecutor } from '.';
-export declare const startWorker: () => Promise<{
-    remote: import("comlink").Remote<WasmExecutor>;
+export declare const startWorker: <T>() => Promise<{
+    remote: import("comlink").Remote<T>;
     terminate: () => Promise<void>;
 }>;

package/dist/types/wasm-executor/index.d.ts

@@ -14,13 +14,19 @@ export type RuntimeVersion = {
     transactionVersion: number;
     stateVersion: number;
 };
+export type RuntimeLog = {
+    message: string;
+    level?: number;
+    target?: string;
+};
+export type TaskCallResponse = {
+    result: HexString;
+    storageDiff: [HexString, HexString | null][];
+    offchainStorageDiff: [HexString, HexString | null][];
+    runtimeLogs: RuntimeLog[];
+};
 export type TaskResponse = {
-    Call: {
-        result: HexString;
-        storageDiff: [HexString, HexString | null][];
-        offchainStorageDiff: [HexString, HexString | null][];
-        runtimeLogs: string[];
-    };
+    Call: TaskCallResponse;
 } | {
     Error: string;
 };
@@ -51,12 +57,7 @@ export declare const runTask: (task: {
     allowUnresolvedImports: boolean;
     runtimeLogLevel: number;
 }, callback?: JsCallback) => Promise<{
-    Call: {
-        result: HexString;
-        storageDiff: [HexString, HexString | null][];
-        offchainStorageDiff: [HexString, HexString | null][];
-        runtimeLogs: string[];
-    };
+    Call: TaskCallResponse;
 } | {
     Error: string;
 }>;

package/dist/types/wasm-executor/node-worker.d.ts

@@ -1,5 +1,4 @@
-import type { WasmExecutor } from '.';
-export declare const startWorker: () => Promise<{
-    remote: import("comlink").Remote<WasmExecutor>;
+export declare const startWorker: <T>() => Promise<{
+    remote: import("comlink").Remote<T>;
     terminate: () => Promise<void>;
 }>;

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.9.0",
+  "version": "0.9.1-2",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "scripts": {
     "clean": "rm -rf dist",
-    "build": "yarn clean && tsc -p ./tsconfig.json && tsc -p ./tsconfig.esm.json && yarn copyfiles",
+    "build": "yarn clean && tsc -p ./tsconfig.json && tsc -p ./tsconfig.esm.json && echo '{\"type\": \"module\"}' > ./dist/esm/package.json && yarn copyfiles",
     "copyfiles": "cp -r src/wasm-executor/*.mjs dist/cjs/wasm-executor/ && cp -r src/wasm-executor/*.mjs dist/esm/wasm-executor/",
     "docs:prep": "typedoc"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.9.0",
+    "@acala-network/chopsticks-executor": "0.9.1-2",
     "@polkadot/api": "^10.10.1",
     "@polkadot/util-crypto": "^12.5.1",
     "comlink": "^4.4.1",
     "eventemitter3": "^5.0.1",
     "lodash": "^4.17.21",
-    "pino": "^8.15.0",
+    "pino": "^8.16.1",
     "pino-pretty": "^10.2.0",
     "zod": "^3.22.3"
   },
@@ -45,12 +45,11 @@
       "import": "./dist/esm/index.js",
       "default": "./dist/esm/index.js"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./package.esm.json": "./dist/esm/package.json"
   },
   "browser": {
-    "./dist/cjs/wasm-executor/node-wasm-executor.mjs": "./dist/cjs/wasm-executor/browser-wasm-executor.mjs",
     "./dist/cjs/wasm-executor/node-worker.js": "./dist/cjs/wasm-executor/browser-worker.js",
-    "./dist/esm/wasm-executor/node-wasm-executor.mjs": "./dist/esm/wasm-executor/browser-wasm-executor.mjs",
     "./dist/esm/wasm-executor/node-worker.js": "./dist/esm/wasm-executor/browser-worker.js"
   }
 }

package/dist/cjs/wasm-executor/node-wasm-executor.mjs

@@ -1,29 +0,0 @@
-import * as Comlink from 'comlink'
-import * as pkg from '@acala-network/chopsticks-executor'
-import { parentPort } from 'node:worker_threads'
-import nodeEndpoint from 'comlink/dist/umd/node-adapter.js'
-
-const getRuntimeVersion = async (code) => {
-	return pkg.get_runtime_version(code)
-}
-
-// trie_version: 0 for old trie, 1 for new trie
-const calculateStateRoot = async (entries, trie_version) => {
-	return pkg.calculate_state_root(entries, trie_version)
-}
-
-const decodeProof = async (trieRootHash, keys, nodes) => {
-	return pkg.decode_proof(trieRootHash, keys, nodes)
-}
-
-const createProof = async (nodes, entries) => {
-	return pkg.create_proof(nodes, entries)
-}
-
-const runTask = async (task, callback) => {
-	return pkg.run_task(task, callback, process.env.RUST_LOG)
-}
-
-const wasmExecutor = { runTask, getRuntimeVersion, calculateStateRoot, createProof, decodeProof }
-
-Comlink.expose(wasmExecutor, nodeEndpoint(parentPort))

package/dist/esm/wasm-executor/node-wasm-executor.mjs

@@ -1,29 +0,0 @@
-import * as Comlink from 'comlink'
-import * as pkg from '@acala-network/chopsticks-executor'
-import { parentPort } from 'node:worker_threads'
-import nodeEndpoint from 'comlink/dist/umd/node-adapter.js'
-
-const getRuntimeVersion = async (code) => {
-	return pkg.get_runtime_version(code)
-}
-
-// trie_version: 0 for old trie, 1 for new trie
-const calculateStateRoot = async (entries, trie_version) => {
-	return pkg.calculate_state_root(entries, trie_version)
-}
-
-const decodeProof = async (trieRootHash, keys, nodes) => {
-	return pkg.decode_proof(trieRootHash, keys, nodes)
-}
-
-const createProof = async (nodes, entries) => {
-	return pkg.create_proof(nodes, entries)
-}
-
-const runTask = async (task, callback) => {
-	return pkg.run_task(task, callback, process.env.RUST_LOG)
-}
-
-const wasmExecutor = { runTask, getRuntimeVersion, calculateStateRoot, createProof, decodeProof }
-
-Comlink.expose(wasmExecutor, nodeEndpoint(parentPort))