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

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

@@ -1,8 +1,8 @@
 import { Header, TransactionValidityError } from '@polkadot/types/interfaces';
 import { Block, TaskCallResponse } from './block';
 import { HexString } from '@polkadot/util/types';
-export declare const newHeader: (head: Block) => Promise<Header>;
-export declare const buildBlock: (head: Block, inherents: HexString[], extrinsics: HexString[], ump: Record<number, HexString[]>, onApplyExtrinsicError: (extrinsic: HexString, error: TransactionValidityError) => void) => Promise<[Block, HexString[]]>;
+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 declare const dryRunExtrinsic: (head: Block, inherents: HexString[], extrinsic: HexString | {
     call: HexString;
     address: string;

package/lib/blockchain/block-builder.js

@@ -42,7 +42,7 @@ const getNewSlot = (digest, slotNumber) => {
     }
     return digest.toJSON();
 };
-const newHeader = (head) => __awaiter(void 0, void 0, void 0, function* () {
+const newHeader = (head, unsafeBlockHeight) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     const meta = yield head.meta;
     const parentHeader = yield head.header;
@@ -80,7 +80,7 @@ const newHeader = (head) => __awaiter(void 0, void 0, void 0, function* () {
     }
     const header = meta.registry.createType('Header', {
         parentHash: head.hash,
-        number: head.number + 1,
+        number: unsafeBlockHeight !== null && unsafeBlockHeight !== void 0 ? unsafeBlockHeight : head.number + 1,
         stateRoot: '0x0000000000000000000000000000000000000000000000000000000000000000',
         extrinsicsRoot: '0x0000000000000000000000000000000000000000000000000000000000000000',
         digest: {
@@ -126,14 +126,18 @@ const initNewBlock = (head, header, inherents, storageLayer) => __awaiter(void 0
         layers: layers,
     };
 });
-const buildBlock = (head, inherents, extrinsics, ump, onApplyExtrinsicError) => __awaiter(void 0, void 0, void 0, function* () {
+const buildBlock = (head, inherents, extrinsics, ump, onApplyExtrinsicError, unsafeBlockHeight) => __awaiter(void 0, void 0, void 0, function* () {
     const registry = yield head.registry;
-    const header = yield (0, exports.newHeader)(head);
+    const header = yield (0, exports.newHeader)(head, unsafeBlockHeight);
+    const newBlockNumber = header.number.toNumber();
+    if (newBlockNumber < head.number) {
+        throw new Error('unsafeBlockHeight is not allowed to be less than current block number');
+    }
     logger.info({
-        number: head.number + 1,
+        number: newBlockNumber,
         extrinsicsCount: extrinsics.length,
         umpCount: Object.keys(ump).length,
-    }, `Try building block #${(head.number + 1).toLocaleString()}`);
+    }, `Try building block #${newBlockNumber.toLocaleString()}`);
     let layer;
     // apply ump via storage override hack
     if (Object.keys(ump).length > 0) {

package/lib/blockchain/index.d.ts

@@ -32,13 +32,14 @@ export declare class Blockchain {
     readonly db: DataSource | undefined;
     readonly mockSignatureHost: boolean;
     readonly allowUnresolvedImports: boolean;
-    readonly runtimeLogLevel: number;
     readonly registeredTypes: RegisteredTypes;
     readonly headState: HeadState;
     readonly offchainWorker: OffchainWorker | undefined;
     constructor({ api, buildBlockMode, inherentProvider, db, header, mockSignatureHost, allowUnresolvedImports, runtimeLogLevel, registeredTypes, offchainWorker, maxMemoryBlockCount, }: Options);
     get head(): Block;
     get txPool(): TxPool;
+    get runtimeLogLevel(): number;
+    set runtimeLogLevel(level: number);
     saveBlockToDB(block: Block): Promise<void>;
     /**
      * Try to load block from db and register it

package/lib/blockchain/index.js

@@ -19,7 +19,7 @@ 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 _Blockchain_instances, _Blockchain_txpool, _Blockchain_inherentProvider, _Blockchain_head, _Blockchain_blocksByNumber, _Blockchain_blocksByHash, _Blockchain_loadingBlocks, _Blockchain_maxMemoryBlockCount, _Blockchain_registerBlock;
+var _Blockchain_instances, _Blockchain_runtimeLogLevel, _Blockchain_txpool, _Blockchain_inherentProvider, _Blockchain_head, _Blockchain_blocksByNumber, _Blockchain_blocksByHash, _Blockchain_loadingBlocks, _Blockchain_maxMemoryBlockCount, _Blockchain_registerBlock;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Blockchain = void 0;
 const util_crypto_1 = require("@polkadot/util-crypto");
@@ -37,6 +37,7 @@ class Blockchain {
     constructor({ api, buildBlockMode, inherentProvider, db, header, mockSignatureHost = false, allowUnresolvedImports = false, runtimeLogLevel = 0, registeredTypes = {}, offchainWorker = false, maxMemoryBlockCount = 2000, }) {
         _Blockchain_instances.add(this);
         this.uid = Math.random().toString(36).substring(2);
+        _Blockchain_runtimeLogLevel.set(this, void 0);
         _Blockchain_txpool.set(this, void 0);
         _Blockchain_inherentProvider.set(this, void 0);
         _Blockchain_head.set(this, void 0);
@@ -48,7 +49,7 @@ class Blockchain {
         this.db = db;
         this.mockSignatureHost = mockSignatureHost;
         this.allowUnresolvedImports = allowUnresolvedImports;
-        this.runtimeLogLevel = runtimeLogLevel;
+        __classPrivateFieldSet(this, _Blockchain_runtimeLogLevel, runtimeLogLevel, "f");
         this.registeredTypes = registeredTypes;
         __classPrivateFieldSet(this, _Blockchain_head, new block_1.Block(this, header.number, header.hash), "f");
         __classPrivateFieldGet(this, _Blockchain_instances, "m", _Blockchain_registerBlock).call(this, __classPrivateFieldGet(this, _Blockchain_head, "f"));
@@ -66,6 +67,13 @@ class Blockchain {
     get txPool() {
         return __classPrivateFieldGet(this, _Blockchain_txpool, "f");
     }
+    get runtimeLogLevel() {
+        return __classPrivateFieldGet(this, _Blockchain_runtimeLogLevel, "f");
+    }
+    set runtimeLogLevel(level) {
+        __classPrivateFieldSet(this, _Blockchain_runtimeLogLevel, level, "f");
+        logger.debug(`Runtime log level set to ${logger.level}`);
+    }
     saveBlockToDB(block) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.db) {
@@ -101,7 +109,12 @@ class Blockchain {
                     const { hash, number, header, extrinsics, parentHash } = blockData;
                     const parentBlock = parentHash ? __classPrivateFieldGet(this, _Blockchain_blocksByHash, "f")[parentHash] : undefined;
                     const storageDiff = (_a = blockData.storageDiff) !== null && _a !== void 0 ? _a : undefined;
-                    const block = new block_1.Block(this, number, hash, parentBlock, { header, extrinsics, storageDiff });
+                    const registry = yield this.head.registry;
+                    const block = new block_1.Block(this, number, hash, parentBlock, {
+                        header: registry.createType('Header', header),
+                        extrinsics,
+                        storageDiff,
+                    });
                     __classPrivateFieldGet(this, _Blockchain_instances, "m", _Blockchain_registerBlock).call(this, block);
                     return block;
                 }
@@ -358,7 +371,7 @@ class Blockchain {
     }
 }
 exports.Blockchain = Blockchain;
-_Blockchain_txpool = new WeakMap(), _Blockchain_inherentProvider = new WeakMap(), _Blockchain_head = new WeakMap(), _Blockchain_blocksByNumber = new WeakMap(), _Blockchain_blocksByHash = new WeakMap(), _Blockchain_loadingBlocks = new WeakMap(), _Blockchain_maxMemoryBlockCount = new WeakMap(), _Blockchain_instances = new WeakSet(), _Blockchain_registerBlock = function _Blockchain_registerBlock(block) {
+_Blockchain_runtimeLogLevel = new WeakMap(), _Blockchain_txpool = new WeakMap(), _Blockchain_inherentProvider = new WeakMap(), _Blockchain_head = new WeakMap(), _Blockchain_blocksByNumber = new WeakMap(), _Blockchain_blocksByHash = new WeakMap(), _Blockchain_loadingBlocks = new WeakMap(), _Blockchain_maxMemoryBlockCount = new WeakMap(), _Blockchain_instances = new WeakSet(), _Blockchain_registerBlock = function _Blockchain_registerBlock(block) {
     // if exceed max memory block count, delete the oldest block
     if (__classPrivateFieldGet(this, _Blockchain_blocksByNumber, "f").size === __classPrivateFieldGet(this, _Blockchain_maxMemoryBlockCount, "f")) {
         const firstKey = __classPrivateFieldGet(this, _Blockchain_blocksByNumber, "f").keys().next().value;

package/lib/blockchain/txpool.d.ts

@@ -21,6 +21,7 @@ export interface BuildBlockParams {
     upwardMessages: Record<number, HexString[]>;
     horizontalMessages: Record<number, HorizontalMessage[]>;
     transactions: HexString[];
+    unsafeBlockHeight?: number;
 }
 export declare class TxPool {
     #private;

package/lib/blockchain/txpool.js

@@ -131,6 +131,7 @@ class TxPool {
             const upwardMessages = (params === null || params === void 0 ? void 0 : params.upwardMessages) || Object.assign({}, __classPrivateFieldGet(this, _TxPool_ump, "f"));
             const downwardMessages = (params === null || params === void 0 ? void 0 : params.downwardMessages) || __classPrivateFieldGet(this, _TxPool_dmp, "f").splice(0);
             const horizontalMessages = (params === null || params === void 0 ? void 0 : params.horizontalMessages) || Object.assign({}, __classPrivateFieldGet(this, _TxPool_hrmp, "f"));
+            const unsafeBlockHeight = params === null || params === void 0 ? void 0 : params.unsafeBlockHeight;
             if (!(params === null || params === void 0 ? void 0 : params.upwardMessages)) {
                 for (const id of Object.keys(__classPrivateFieldGet(this, _TxPool_ump, "f"))) {
                     delete __classPrivateFieldGet(this, _TxPool_ump, "f")[id];
@@ -146,6 +147,7 @@ class TxPool {
                 upwardMessages,
                 downwardMessages,
                 horizontalMessages,
+                unsafeBlockHeight,
             });
         });
     }
@@ -206,7 +208,7 @@ _TxPool_chain = new WeakMap(), _TxPool_pool = new WeakMap(), _TxPool_ump = new W
         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]);
-        });
+        }, 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/db/entities.d.ts

@@ -1,5 +1,4 @@
 import { EntitySchema } from 'typeorm';
-import { Header } from '@polkadot/types/interfaces';
 import { HexString } from '@polkadot/util/types';
 export declare const KeyValuePair: EntitySchema<{
     blockHash: string;
@@ -9,7 +8,7 @@ export declare const KeyValuePair: EntitySchema<{
 export declare const BlockEntity: EntitySchema<{
     hash: HexString;
     number: number;
-    header: Header;
+    header: object;
     parentHash: HexString | null;
     extrinsics: HexString[];
     storageDiff: Record<HexString, HexString | null> | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.8.0-5",
+  "version": "0.8.0",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
   "license": "Apache-2.0",
   "scripts": {
@@ -9,10 +9,10 @@
     "build": "yarn pack-wasm; tsc -p ./tsconfig.json"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.8.0-5",
+    "@acala-network/chopsticks-executor": "0.8.0",
     "@polkadot/api": "^10.9.1",
     "@polkadot/util-crypto": "^12.3.2",
-    "axios": "^1.4.0",
+    "axios": "^1.5.0",
     "eventemitter3": "^5.0.1",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
@@ -44,6 +44,5 @@
       "default": "./lib/*.js"
     },
     "./package.json": "./package.json"
-  },
-  "stableVersion": "0.7.3"
+  }
 }