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

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.8.0-5",
+  "version": "0.8.0-6",
   "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-6",
     "@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",