@acala-network/chopsticks-core 0.9.10 → 0.9.11-1

package/dist/cjs/blockchain/index.d.ts

@@ -37,6 +37,8 @@ export interface Options {
     offchainWorker?: boolean;
     /** Max memory block count */
     maxMemoryBlockCount?: number;
+    /** Whether to process queued messages */
+    processQueuedMessages?: boolean;
 }
 /**
  * Local blockchain which provides access to blocks, txpool and methods
@@ -76,10 +78,11 @@ export declare class Blockchain {
     /** For subscribing and managing the head state. */
     readonly headState: HeadState;
     readonly offchainWorker: OffchainWorker | undefined;
+    readonly processQueuedMessages: boolean;
     /**
      * @param options - Options for instantiating the blockchain
      */
-    constructor({ api, buildBlockMode, inherentProviders, db, header, mockSignatureHost, allowUnresolvedImports, runtimeLogLevel, registeredTypes, offchainWorker, maxMemoryBlockCount, }: Options);
+    constructor({ api, buildBlockMode, inherentProviders, db, header, mockSignatureHost, allowUnresolvedImports, runtimeLogLevel, registeredTypes, offchainWorker, maxMemoryBlockCount, processQueuedMessages, }: Options);
     get head(): Block;
     get txPool(): TxPool;
     get runtimeLogLevel(): number;

package/dist/cjs/blockchain/index.js

@@ -414,7 +414,7 @@ class Blockchain {
     }
     /**
    * @param options - Options for instantiating the blockchain
-   */ constructor({ api, buildBlockMode, inherentProviders, db, header, mockSignatureHost = false, allowUnresolvedImports = false, runtimeLogLevel = 0, registeredTypes = {}, offchainWorker = false, maxMemoryBlockCount = 500 }){
+   */ constructor({ api, buildBlockMode, inherentProviders, db, header, mockSignatureHost = false, allowUnresolvedImports = false, runtimeLogLevel = 0, registeredTypes = {}, offchainWorker = false, maxMemoryBlockCount = 500, processQueuedMessages = true }){
         _class_private_method_init(this, _registerBlock);
         /** API instance, for getting on-chain data. */ _define_property(this, "api", void 0);
         /** Datasource for caching storage and blocks data. */ _define_property(this, "db", void 0);
@@ -455,6 +455,7 @@ class Blockchain {
             writable: true,
             value: void 0
         });
+        _define_property(this, "processQueuedMessages", true);
         // first arg is used as cache key
         _class_private_field_init(this, _registryBuilder, {
             writable: true,
@@ -485,6 +486,7 @@ class Blockchain {
             this.offchainWorker = new _offchain.OffchainWorker();
         }
         _class_private_field_set(this, _maxMemoryBlockCount, maxMemoryBlockCount);
+        this.processQueuedMessages = processQueuedMessages;
     }
 }
 function registerBlock(block) {

package/dist/cjs/blockchain/storage-layer.js

@@ -290,8 +290,8 @@ class StorageLayer {
         };
         const res = [];
         const foundNextKey = (key)=>{
-            // make sure keys are unique
-            if (!res.includes(key)) {
+            // make sure keys are unique and start with the prefix
+            if (!res.includes(key) && key.startsWith(prefix)) {
                 res.push(key);
             }
         };
@@ -311,7 +311,7 @@ class StorageLayer {
             if (idx !== -1) {
                 if (includeFirst) {
                     const key = _class_private_field_get(this, _keys)[idx];
-                    if (key) {
+                    if (key && key.startsWith(prefix)) {
                         foundNextKey(key);
                     }
                 }

package/dist/cjs/blockchain/txpool.js

@@ -20,6 +20,7 @@ _export(exports, {
     }
 });
 const _eventemitter3 = require("eventemitter3");
+const _toU8a = require("@polkadot/util/hex/toU8a");
 const _lodash = /*#__PURE__*/ _interop_require_default(require("lodash"));
 const _index = require("../utils/index.js");
 const _blockbuilder = require("./block-builder.js");
@@ -210,6 +211,27 @@ class TxPool {
                 horizontalMessages,
                 unsafeBlockHeight
             });
+            // with the latest message queue, messages are processed in the upcoming block
+            if (!_class_private_field_get(this, _chain).processQueuedMessages || !params?.horizontalMessages) return;
+            if (!(params?.horizontalMessages || params?.downwardMessages)) return;
+            // messageQueue.bookStateFor
+            const prefix = '0xb8753e9383841da95f7b8871e5de326954e062a2cf8df68178ee2e5dbdf00bff';
+            const meta = await _class_private_field_get(this, _chain).head.meta;
+            const keys = await _class_private_field_get(this, _chain).head.getKeysPaged({
+                prefix,
+                pageSize: 1000
+            });
+            for (const key of keys){
+                const rawValue = await _class_private_field_get(this, _chain).head.get(key);
+                if (!rawValue) continue;
+                const message = meta.registry.createType('PalletMessageQueueBookState', (0, _toU8a.hexToU8a)(rawValue)).toJSON();
+                if (message.size > 0) {
+                    logger.info('Queued messages detected, building a new block');
+                    // build a new block to process the queued messages
+                    await _class_private_field_get(this, _chain).newBlock();
+                    return;
+                }
+            }
         } catch (err) {
             logger.error({
                 err

package/dist/cjs/setup.d.ts

@@ -17,6 +17,7 @@ export type SetupOptions = {
     registeredTypes?: RegisteredTypes;
     offchainWorker?: boolean;
     maxMemoryBlockCount?: number;
+    processQueuedMessages?: boolean;
 };
 export declare const genesisSetup: (chain: Blockchain, genesis: GenesisProvider) => Promise<void>;
 export declare const processOptions: (options: SetupOptions) => Promise<{
@@ -33,5 +34,6 @@ export declare const processOptions: (options: SetupOptions) => Promise<{
     registeredTypes?: RegisteredTypes | undefined;
     offchainWorker?: boolean | undefined;
     maxMemoryBlockCount?: number | undefined;
+    processQueuedMessages?: boolean | undefined;
 }>;
 export declare const setup: (options: SetupOptions) => Promise<Blockchain>;

package/dist/cjs/setup.js

@@ -129,7 +129,8 @@ const setup = async (options)=>{
         runtimeLogLevel: opts.runtimeLogLevel,
         registeredTypes: opts.registeredTypes || {},
         offchainWorker: opts.offchainWorker,
-        maxMemoryBlockCount: opts.maxMemoryBlockCount
+        maxMemoryBlockCount: opts.maxMemoryBlockCount,
+        processQueuedMessages: opts.processQueuedMessages
     });
     if (opts.genesis) {
         await genesisSetup(chain, opts.genesis);

package/dist/cjs/utils/index.js

@@ -170,5 +170,5 @@ const getCurrentTimestamp = async (chain)=>{
 };
 const getSlotDuration = async (chain)=>{
     const meta = await chain.head.meta;
-    return meta.consts.babe ? meta.consts.babe.expectedBlockTime.toNumber() : meta.query.aura ? (0, _index.getAuraSlotDuration)(await chain.head.wasm) : 12_000;
+    return meta.consts.babe ? meta.consts.babe.expectedBlockTime.toNumber() : meta.query.aura ? (0, _index.getAuraSlotDuration)(await chain.head.wasm) : meta.consts.asyncBacking ? meta.consts.asyncBacking.expectedBlockTime.toNumber() : 12_000;
 };

package/dist/cjs/xcm/horizontal.js

@@ -37,5 +37,14 @@ const connectHorizontal = async (parachains)=>{
                 }
             }
         });
+        const hrmpHeads = await chain.head.read('BTreeMap<u32, H256>', meta.query.parachainSystem.lastHrmpMqcHeads);
+        if (hrmpHeads && !process.env.DISABLE_AUTO_HRMP) {
+            const existingChannels = Array.from(hrmpHeads.keys()).map((x)=>x.toNumber());
+            for (const paraId of Object.keys(parachains).filter((x)=>x !== id)){
+                if (!existingChannels.includes(Number(paraId))) {
+                    chain.submitHorizontalMessages(Number(paraId), []);
+                }
+            }
+        }
     }
 };

package/dist/esm/blockchain/index.d.ts

@@ -37,6 +37,8 @@ export interface Options {
     offchainWorker?: boolean;
     /** Max memory block count */
     maxMemoryBlockCount?: number;
+    /** Whether to process queued messages */
+    processQueuedMessages?: boolean;
 }
 /**
  * Local blockchain which provides access to blocks, txpool and methods
@@ -76,10 +78,11 @@ export declare class Blockchain {
     /** For subscribing and managing the head state. */
     readonly headState: HeadState;
     readonly offchainWorker: OffchainWorker | undefined;
+    readonly processQueuedMessages: boolean;
     /**
      * @param options - Options for instantiating the blockchain
      */
-    constructor({ api, buildBlockMode, inherentProviders, db, header, mockSignatureHost, allowUnresolvedImports, runtimeLogLevel, registeredTypes, offchainWorker, maxMemoryBlockCount, }: Options);
+    constructor({ api, buildBlockMode, inherentProviders, db, header, mockSignatureHost, allowUnresolvedImports, runtimeLogLevel, registeredTypes, offchainWorker, maxMemoryBlockCount, processQueuedMessages, }: Options);
     get head(): Block;
     get txPool(): TxPool;
     get runtimeLogLevel(): number;

package/dist/esm/blockchain/index.js

@@ -51,6 +51,7 @@ const logger = defaultLogger.child({
     /** For subscribing and managing the head state. */ headState;
     offchainWorker;
     #maxMemoryBlockCount;
+    processQueuedMessages = true;
     // first arg is used as cache key
     #registryBuilder = _.memoize(async (_cacheKey, metadata, version)=>{
         const chain = await this.api.chain;
@@ -65,7 +66,7 @@ const logger = defaultLogger.child({
     });
     /**
    * @param options - Options for instantiating the blockchain
-   */ constructor({ api, buildBlockMode, inherentProviders, db, header, mockSignatureHost = false, allowUnresolvedImports = false, runtimeLogLevel = 0, registeredTypes = {}, offchainWorker = false, maxMemoryBlockCount = 500 }){
+   */ constructor({ api, buildBlockMode, inherentProviders, db, header, mockSignatureHost = false, allowUnresolvedImports = false, runtimeLogLevel = 0, registeredTypes = {}, offchainWorker = false, maxMemoryBlockCount = 500, processQueuedMessages = true }){
         this.api = api;
         this.db = db;
         this.mockSignatureHost = mockSignatureHost;
@@ -81,6 +82,7 @@ const logger = defaultLogger.child({
             this.offchainWorker = new OffchainWorker();
         }
         this.#maxMemoryBlockCount = maxMemoryBlockCount;
+        this.processQueuedMessages = processQueuedMessages;
     }
     #registerBlock(block) {
         // if exceed max memory block count, delete the oldest block

package/dist/esm/blockchain/storage-layer.js

@@ -219,8 +219,8 @@ export class StorageLayer {
         };
         const res = [];
         const foundNextKey = (key)=>{
-            // make sure keys are unique
-            if (!res.includes(key)) {
+            // make sure keys are unique and start with the prefix
+            if (!res.includes(key) && key.startsWith(prefix)) {
                 res.push(key);
             }
         };
@@ -240,7 +240,7 @@ export class StorageLayer {
             if (idx !== -1) {
                 if (includeFirst) {
                     const key = this.#keys[idx];
-                    if (key) {
+                    if (key && key.startsWith(prefix)) {
                         foundNextKey(key);
                     }
                 }

package/dist/esm/blockchain/txpool.js

@@ -1,4 +1,5 @@
 import { EventEmitter } from 'eventemitter3';
+import { hexToU8a } from '@polkadot/util/hex/toU8a';
 import _ from 'lodash';
 import { defer } from '../utils/index.js';
 import { buildBlock } from './block-builder.js';
@@ -155,6 +156,27 @@ export class TxPool {
                 horizontalMessages,
                 unsafeBlockHeight
             });
+            // with the latest message queue, messages are processed in the upcoming block
+            if (!this.#chain.processQueuedMessages || !params?.horizontalMessages) return;
+            if (!(params?.horizontalMessages || params?.downwardMessages)) return;
+            // messageQueue.bookStateFor
+            const prefix = '0xb8753e9383841da95f7b8871e5de326954e062a2cf8df68178ee2e5dbdf00bff';
+            const meta = await this.#chain.head.meta;
+            const keys = await this.#chain.head.getKeysPaged({
+                prefix,
+                pageSize: 1000
+            });
+            for (const key of keys){
+                const rawValue = await this.#chain.head.get(key);
+                if (!rawValue) continue;
+                const message = meta.registry.createType('PalletMessageQueueBookState', hexToU8a(rawValue)).toJSON();
+                if (message.size > 0) {
+                    logger.info('Queued messages detected, building a new block');
+                    // build a new block to process the queued messages
+                    await this.#chain.newBlock();
+                    return;
+                }
+            }
         } catch (err) {
             logger.error({
                 err

package/dist/esm/setup.d.ts

@@ -17,6 +17,7 @@ export type SetupOptions = {
     registeredTypes?: RegisteredTypes;
     offchainWorker?: boolean;
     maxMemoryBlockCount?: number;
+    processQueuedMessages?: boolean;
 };
 export declare const genesisSetup: (chain: Blockchain, genesis: GenesisProvider) => Promise<void>;
 export declare const processOptions: (options: SetupOptions) => Promise<{
@@ -33,5 +34,6 @@ export declare const processOptions: (options: SetupOptions) => Promise<{
     registeredTypes?: RegisteredTypes | undefined;
     offchainWorker?: boolean | undefined;
     maxMemoryBlockCount?: number | undefined;
+    processQueuedMessages?: boolean | undefined;
 }>;
 export declare const setup: (options: SetupOptions) => Promise<Blockchain>;

package/dist/esm/setup.js

@@ -108,7 +108,8 @@ export const setup = async (options)=>{
         runtimeLogLevel: opts.runtimeLogLevel,
         registeredTypes: opts.registeredTypes || {},
         offchainWorker: opts.offchainWorker,
-        maxMemoryBlockCount: opts.maxMemoryBlockCount
+        maxMemoryBlockCount: opts.maxMemoryBlockCount,
+        processQueuedMessages: opts.processQueuedMessages
     });
     if (opts.genesis) {
         await genesisSetup(chain, opts.genesis);

package/dist/esm/utils/index.js

@@ -106,5 +106,5 @@ export const getCurrentTimestamp = async (chain)=>{
 };
 export const getSlotDuration = async (chain)=>{
     const meta = await chain.head.meta;
-    return meta.consts.babe ? meta.consts.babe.expectedBlockTime.toNumber() : meta.query.aura ? getAuraSlotDuration(await chain.head.wasm) : 12_000;
+    return meta.consts.babe ? meta.consts.babe.expectedBlockTime.toNumber() : meta.query.aura ? getAuraSlotDuration(await chain.head.wasm) : meta.consts.asyncBacking ? meta.consts.asyncBacking.expectedBlockTime.toNumber() : 12_000;
 };

package/dist/esm/xcm/horizontal.js

@@ -27,5 +27,14 @@ export const connectHorizontal = async (parachains)=>{
                 }
             }
         });
+        const hrmpHeads = await chain.head.read('BTreeMap<u32, H256>', meta.query.parachainSystem.lastHrmpMqcHeads);
+        if (hrmpHeads && !process.env.DISABLE_AUTO_HRMP) {
+            const existingChannels = Array.from(hrmpHeads.keys()).map((x)=>x.toNumber());
+            for (const paraId of Object.keys(parachains).filter((x)=>x !== id)){
+                if (!existingChannels.includes(Number(paraId))) {
+                    chain.submitHorizontalMessages(Number(paraId), []);
+                }
+            }
+        }
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.9.10",
+  "version": "0.9.11-1",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "type": "module",
@@ -12,7 +12,7 @@
     "docs:prep": "typedoc"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.9.10",
+    "@acala-network/chopsticks-executor": "0.9.11-1",
     "@polkadot/rpc-provider": "^10.11.2",
     "@polkadot/types": "^10.11.2",
     "@polkadot/types-codec": "^10.11.2",
@@ -22,18 +22,18 @@
     "comlink": "^4.4.1",
     "eventemitter3": "^5.0.1",
     "lodash": "^4.17.21",
-    "lru-cache": "^10.1.0",
-    "pino": "^8.17.2",
-    "pino-pretty": "^10.3.1",
+    "lru-cache": "^10.2.0",
+    "pino": "^8.19.0",
+    "pino-pretty": "^11.0.0",
     "rxjs": "^7.8.1",
     "zod": "^3.22.4"
   },
   "devDependencies": {
     "@swc/cli": "0.1.65",
-    "@swc/core": "^1.3.105",
-    "@types/lodash": "^4.14.202",
+    "@swc/core": "^1.4.8",
+    "@types/lodash": "^4.17.0",
     "typescript": "^5.3.3",
-    "vitest": "^1.2.1"
+    "vitest": "^1.4.0"
   },
   "files": [
     "dist/esm/**",