@acala-network/chopsticks-core 0.8.2 → 0.8.3

package/lib/blockchain/block-builder.d.ts

@@ -2,7 +2,11 @@ import { Header, TransactionValidityError } from '@polkadot/types/interfaces';
 import { Block, TaskCallResponse } from './block';
 import { HexString } from '@polkadot/util/types';
 export declare const newHeader: (head: Block, unsafeBlockHeight?: number) => Promise<Header>;
-export declare const buildBlock: (head: Block, inherents: HexString[], extrinsics: HexString[], ump: Record<number, HexString[]>, onApplyExtrinsicError: (extrinsic: HexString, error: TransactionValidityError) => void, unsafeBlockHeight?: number) => Promise<[Block, HexString[]]>;
+export type BuildBlockCallbacks = {
+    onApplyExtrinsicError?: (extrinsic: HexString, error: TransactionValidityError) => void;
+    onPhaseApplied?: (phase: 'initialize' | 'finalize' | number, resp: TaskCallResponse) => void;
+};
+export declare const buildBlock: (head: Block, inherents: HexString[], extrinsics: HexString[], ump: Record<number, HexString[]>, callbacks?: BuildBlockCallbacks, unsafeBlockHeight?: number) => Promise<[Block, HexString[]]>;
 export declare const dryRunExtrinsic: (head: Block, inherents: HexString[], extrinsic: HexString | {
     call: HexString;
     address: string;

package/lib/blockchain/block-builder.js

@@ -90,7 +90,8 @@ const newHeader = (head, unsafeBlockHeight) => __awaiter(void 0, void 0, void 0,
     return header;
 });
 exports.newHeader = newHeader;
-const initNewBlock = (head, header, inherents, storageLayer) => __awaiter(void 0, void 0, void 0, function* () {
+const initNewBlock = (head, header, inherents, storageLayer, callback) => __awaiter(void 0, void 0, void 0, function* () {
+    var _c, _d;
     const blockNumber = header.number.toNumber();
     const hash = `0x${Math.round(Math.random() * 100000000)
         .toString(16)
@@ -102,19 +103,19 @@ const initNewBlock = (head, header, inherents, storageLayer) => __awaiter(void 0
     });
     {
         // initialize block
-        const { storageDiff } = yield newBlock.call('Core_initialize_block', [header.toHex()]);
-        newBlock.pushStorageLayer().setAll(storageDiff);
-        logger.trace((0, logger_1.truncate)(storageDiff), 'Initialize block');
+        const resp = yield newBlock.call('Core_initialize_block', [header.toHex()]);
+        newBlock.pushStorageLayer().setAll(resp.storageDiff);
+        (_c = callback === null || callback === void 0 ? void 0 : callback.onPhaseApplied) === null || _c === void 0 ? void 0 : _c.call(callback, 'initialize', resp);
     }
     const layers = [];
     // apply inherents
     for (const extrinsic of inherents) {
         try {
-            const { storageDiff } = yield newBlock.call('BlockBuilder_apply_extrinsic', [extrinsic]);
+            const resp = yield newBlock.call('BlockBuilder_apply_extrinsic', [extrinsic]);
             const layer = newBlock.pushStorageLayer();
-            layer.setAll(storageDiff);
+            layer.setAll(resp.storageDiff);
             layers.push(layer);
-            logger.trace((0, logger_1.truncate)(storageDiff), 'Applied inherent');
+            (_d = callback === null || callback === void 0 ? void 0 : callback.onPhaseApplied) === null || _d === void 0 ? void 0 : _d.call(callback, layers.length - 1, resp);
         }
         catch (e) {
             logger.warn('Failed to apply inherents %o %s', e, e);
@@ -126,7 +127,8 @@ const initNewBlock = (head, header, inherents, storageLayer) => __awaiter(void 0
         layers: layers,
     };
 });
-const buildBlock = (head, inherents, extrinsics, ump, onApplyExtrinsicError, unsafeBlockHeight) => __awaiter(void 0, void 0, void 0, function* () {
+const buildBlock = (head, inherents, extrinsics, ump, callbacks, unsafeBlockHeight) => __awaiter(void 0, void 0, void 0, function* () {
+    var _e, _f, _g;
     const registry = yield head.registry;
     const header = yield (0, exports.newHeader)(head, unsafeBlockHeight);
     const newBlockNumber = header.number.toNumber();
@@ -216,15 +218,15 @@ const buildBlock = (head, inherents, extrinsics, ump, onApplyExtrinsicError, uns
     // apply extrinsics
     for (const extrinsic of extrinsics) {
         try {
-            const { result, storageDiff } = yield newBlock.call('BlockBuilder_apply_extrinsic', [extrinsic]);
-            const outcome = registry.createType('ApplyExtrinsicResult', result);
+            const resp = yield newBlock.call('BlockBuilder_apply_extrinsic', [extrinsic]);
+            const outcome = registry.createType('ApplyExtrinsicResult', resp.result);
             if (outcome.isErr) {
-                onApplyExtrinsicError(extrinsic, outcome.asErr);
+                (_e = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onApplyExtrinsicError) === null || _e === void 0 ? void 0 : _e.call(callbacks, extrinsic, outcome.asErr);
                 continue;
             }
-            newBlock.pushStorageLayer().setAll(storageDiff);
-            logger.trace((0, logger_1.truncate)(storageDiff), 'Applied extrinsic');
+            newBlock.pushStorageLayer().setAll(resp.storageDiff);
             includedExtrinsic.push(extrinsic);
+            (_f = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onPhaseApplied) === null || _f === void 0 ? void 0 : _f.call(callbacks, includedExtrinsic.length - 1, resp);
         }
         catch (e) {
             logger.info('Failed to apply extrinsic %o %s', e, e);
@@ -233,16 +235,18 @@ const buildBlock = (head, inherents, extrinsics, ump, onApplyExtrinsicError, uns
     }
     {
         // finalize block
-        const { storageDiff } = yield newBlock.call('BlockBuilder_finalize_block', []);
-        newBlock.pushStorageLayer().setAll(storageDiff);
-        logger.trace((0, logger_1.truncate)(storageDiff), 'Finalize block');
+        const resp = yield newBlock.call('BlockBuilder_finalize_block', []);
+        newBlock.pushStorageLayer().setAll(resp.storageDiff);
+        (_g = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onPhaseApplied) === null || _g === void 0 ? void 0 : _g.call(callbacks, 'finalize', resp);
     }
     const blockData = registry.createType('Block', {
         header,
         extrinsics: includedExtrinsic,
     });
     const storageDiff = yield newBlock.storageDiff();
-    logger.trace(Object.entries(storageDiff).map(([key, value]) => [key, (0, logger_1.truncate)(value)]), 'Final block');
+    if (logger.level.toLowerCase() === 'trace') {
+        logger.trace(Object.entries(storageDiff).map(([key, value]) => [key, (0, logger_1.truncate)(value)]), 'Final block');
+    }
     const finalBlock = new block_1.Block(head.chain, newBlock.number, blockData.hash.toHex(), head, {
         header,
         extrinsics: [...inherents, ...includedExtrinsic],

package/lib/blockchain/storage-layer.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -28,7 +51,7 @@ exports.StorageLayer = exports.RemoteStorageLayer = exports.StorageValueKind = v
 const lodash_1 = __importDefault(require("lodash"));
 const entities_1 = require("../db/entities");
 const logger_1 = require("../logger");
-const key_cache_1 = __importDefault(require("../utils/key-cache"));
+const key_cache_1 = __importStar(require("../utils/key-cache"));
 const logger = logger_1.defaultLogger.child({ name: 'layer' });
 const BATCH_SIZE = 1000;
 var StorageValueKind;
@@ -76,7 +99,7 @@ class RemoteStorageLayer {
                 throw new Error(`pageSize must be less or equal to ${BATCH_SIZE}`);
             logger.trace({ at: __classPrivateFieldGet(this, _RemoteStorageLayer_at, "f"), prefix, pageSize, startKey }, 'RemoteStorageLayer getKeysPaged');
             // can't handle keyCache without prefix
-            if (prefix.length < 66) {
+            if (prefix.length < key_cache_1.PREFIX_LENGTH || startKey.length < key_cache_1.PREFIX_LENGTH) {
                 return __classPrivateFieldGet(this, _RemoteStorageLayer_api, "f").getKeysPaged(prefix, pageSize, startKey, __classPrivateFieldGet(this, _RemoteStorageLayer_at, "f"));
             }
             let batchComplete = false;

package/lib/blockchain/txpool.js

@@ -209,8 +209,24 @@ _TxPool_chain = new WeakMap(), _TxPool_pool = new WeakMap(), _TxPool_ump = new W
         logger.trace({ params }, 'build block');
         const head = __classPrivateFieldGet(this, _TxPool_chain, "f").head;
         const inherents = yield __classPrivateFieldGet(this, _TxPool_inherentProvider, "f").createInherents(head, params);
-        const [newBlock, pendingExtrinsics] = yield (0, block_builder_1.buildBlock)(head, inherents, params.transactions, params.upwardMessages, (extrinsic, error) => {
-            this.event.emit(exports.APPLY_EXTRINSIC_ERROR, [extrinsic, error]);
+        const [newBlock, pendingExtrinsics] = yield (0, block_builder_1.buildBlock)(head, inherents, params.transactions, params.upwardMessages, {
+            onApplyExtrinsicError: (extrinsic, error) => {
+                this.event.emit(exports.APPLY_EXTRINSIC_ERROR, [extrinsic, error]);
+            },
+            onPhaseApplied: logger.level.toLowerCase() === 'trace'
+                ? (phase, resp) => {
+                    switch (phase) {
+                        case 'initialize':
+                            logger.trace((0, logger_1.truncate)(resp.storageDiff), 'Initialize block');
+                            break;
+                        case 'finalize':
+                            logger.trace((0, logger_1.truncate)(resp.storageDiff), 'Finalize block');
+                            break;
+                        default:
+                            logger.trace((0, logger_1.truncate)(resp.storageDiff), `Apply extrinsic ${phase}`);
+                    }
+                }
+                : undefined,
         }, params.unsafeBlockHeight);
         for (const extrinsic of pendingExtrinsics) {
             __classPrivateFieldGet(this, _TxPool_pool, "f").push({ extrinsic, signer: yield __classPrivateFieldGet(this, _TxPool_instances, "m", _TxPool_getSigner).call(this, extrinsic) });

package/lib/executor.js

@@ -18,6 +18,7 @@ const util_crypto_1 = require("@polkadot/util-crypto");
 const key_cache_1 = require("./utils/key-cache");
 const chopsticks_executor_1 = require("@acala-network/chopsticks-executor");
 const logger_1 = require("./logger");
+const utils_1 = require("./utils");
 const lodash_1 = __importDefault(require("lodash"));
 const logger = logger_1.defaultLogger.child({ name: 'executor' });
 const getRuntimeVersion = (code) => __awaiter(void 0, void 0, void 0, function* () {
@@ -78,7 +79,7 @@ const taskHandler = (block) => {
                     pageSize: 1,
                     startKey: key,
                 });
-                return nextKey;
+                return nextKey && (0, utils_1.stripChildPrefix)(nextKey);
             });
         },
         offchainGetStorage: function (key) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "scripts": {
@@ -10,7 +10,7 @@
     "docs:prep": "typedoc"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.8.2",
+    "@acala-network/chopsticks-executor": "0.8.3",
     "@polkadot/api": "^10.9.1",
     "@polkadot/util-crypto": "^12.3.2",
     "axios": "^1.5.1",