@acala-network/chopsticks 0.3.7 → 0.3.9

package/dist/blockchain/head-state.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeadState = exports.randomId = void 0;
+const rxjs_1 = require("rxjs");
 const util_1 = require("@polkadot/util");
 const logger_1 = require("../logger");
 const randomId = () => Math.random().toString(36).substring(2);
@@ -46,23 +47,27 @@ class HeadState {
     async setHead(head) {
         this.#head = head;
         for (const cb of Object.values(this.#headListeners)) {
-            try {
-                cb(head);
-            }
-            catch (error) {
-                logger.error(error, 'callback');
-            }
-        }
-        const diff = await this.#head.storageDiff();
-        for (const [keys, cb] of Object.values(this.#storageListeners)) {
-            const changed = keys.filter((key) => diff[key]).map((key) => [key, diff[key]]);
-            if (changed.length > 0) {
+            rxjs_1.asapScheduler.schedule(() => {
                 try {
-                    cb(head, changed);
+                    cb(head);
                 }
                 catch (error) {
                     logger.error(error, 'callback');
                 }
+            });
+        }
+        const diff = await this.#head.storageDiff();
+        for (const [keys, cb] of Object.values(this.#storageListeners)) {
+            const changed = keys.filter((key) => diff[key]).map((key) => [key, diff[key]]);
+            if (changed.length > 0) {
+                rxjs_1.asapScheduler.schedule(() => {
+                    try {
+                        cb(head, changed);
+                    }
+                    catch (error) {
+                        logger.error(error, 'callback');
+                    }
+                });
             }
         }
         Object.assign(this.#oldValues, diff);

package/dist/blockchain/index.d.ts

@@ -35,7 +35,7 @@ export declare class Blockchain {
     setHead(block: Block): Promise<void>;
     submitExtrinsic(extrinsic: HexString): Promise<HexString>;
     newBlock(params?: BuildBlockParams): Promise<Block>;
-    upcomingBlock(count?: number): Promise<Block>;
+    upcomingBlock(skipCount?: number): Promise<Block>;
     dryRunExtrinsic(extrinsic: HexString | {
         call: HexString;
         address: string;

package/dist/blockchain/index.js

@@ -119,8 +119,8 @@ class Blockchain {
         await this.#txpool.buildBlock(params);
         return this.#head;
     }
-    async upcomingBlock(count = 1) {
-        return this.#txpool.upcomingBlock(count);
+    async upcomingBlock(skipCount = 0) {
+        return this.#txpool.upcomingBlock(skipCount);
     }
     async dryRunExtrinsic(extrinsic, at) {
         await this.api.isReady;

package/dist/blockchain/txpool.d.ts

@@ -27,5 +27,5 @@ export declare class TxPool {
     get pendingExtrinsics(): HexString[];
     submitExtrinsic(extrinsic: HexString): void;
     buildBlock(params?: BuildBlockParams): Promise<void>;
-    upcomingBlock(count?: number): Promise<Block>;
+    upcomingBlock(skipCount?: number): Promise<Block>;
 }

package/dist/blockchain/txpool.js

@@ -19,11 +19,11 @@ class TxPool {
     #pool = [];
     #mode;
     #inherentProvider;
+    #last;
     #lastBuildBlockPromise = Promise.resolve();
-    #last = new rxjs_1.ReplaySubject(1);
-    #upcoming = this.#last.pipe((0, rxjs_1.share)());
     constructor(chain, inherentProvider, mode = BuildBlockMode.Batch) {
         this.#chain = chain;
+        this.#last = new rxjs_1.BehaviorSubject(chain.head);
         this.#mode = mode;
         this.#inherentProvider = inherentProvider;
     }
@@ -51,15 +51,10 @@ class TxPool {
         await this.#lastBuildBlockPromise;
         this.#last.next(this.#chain.head);
     }
-    async upcomingBlock(count = 1) {
-        if (count < 1)
-            throw new Error('count needs to be greater than 0');
-        return new Promise((resolve) => {
-            const sub = this.#upcoming.pipe((0, operators_1.skip)(count - 1)).subscribe((block) => {
-                sub.unsubscribe();
-                resolve(block);
-            });
-        });
+    async upcomingBlock(skipCount = 0) {
+        if (skipCount < 0)
+            throw new Error('skipCount needs to be greater or equal to 0');
+        return (0, rxjs_1.firstValueFrom)(this.#last.pipe((0, operators_1.skip)(1 + skipCount), (0, operators_1.take)(1)));
     }
     async #buildBlock(wait, params) {
         await this.#chain.api.isReady;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Bryan Chen <xlchen1291@gmail.com>",