@acala-network/chopsticks 0.6.5 → 0.6.6

package/lib/blockchain/block-builder.js

@@ -135,20 +135,71 @@ const buildBlock = async (head, inherents, extrinsics, ump, onApplyExtrinsicErro
         const meta = await head.meta;
         layer = new storage_layer_1.StorageLayer(head.storage);
         for (const [paraId, upwardMessages] of Object.entries(ump)) {
-            const queueSize = meta.registry.createType('(u32, u32)', [
-                upwardMessages.length,
-                upwardMessages.map((x) => x.length).reduce((s, i) => s + i, 0),
-            ]);
-            const messages = meta.registry.createType('Vec<Bytes>', upwardMessages);
-            // TODO: make sure we append instead of replace
-            layer.setAll([
-                [(0, utils_1.compactHex)(meta.query.ump.relayDispatchQueues(paraId)), messages.toHex()],
-                [(0, utils_1.compactHex)(meta.query.ump.relayDispatchQueueSize(paraId)), queueSize.toHex()],
-            ]);
+            const upwardMessagesU8a = upwardMessages.map((x) => (0, util_1.hexToU8a)(x));
+            const messagesCount = upwardMessages.length;
+            const messagesSize = upwardMessagesU8a.map((x) => x.length).reduce((s, i) => s + i, 0);
+            if (meta.query.ump) {
+                const queueSize = meta.registry.createType('(u32, u32)', [messagesCount, messagesSize]);
+                const messages = meta.registry.createType('Vec<Bytes>', upwardMessages);
+                // TODO: make sure we append instead of replace
+                layer.setAll([
+                    [(0, utils_1.compactHex)(meta.query.ump.relayDispatchQueues(paraId)), messages.toHex()],
+                    [(0, utils_1.compactHex)(meta.query.ump.relayDispatchQueueSize(paraId)), queueSize.toHex()],
+                ]);
+            }
+            else if (meta.query.messageQueue) {
+                // TODO: make sure we append instead of replace
+                const origin = { ump: { para: paraId } };
+                let last = 0;
+                let heap = new Uint8Array(0);
+                for (const message of upwardMessagesU8a) {
+                    const payloadLen = message.length;
+                    const header = meta.registry.createType('(u32, bool)', [payloadLen, false]);
+                    last = heap.length;
+                    heap = (0, util_1.u8aConcat)(heap, header.toU8a(), message);
+                }
+                layer.setAll([
+                    [
+                        (0, utils_1.compactHex)(meta.query.messageQueue.bookStateFor(origin)),
+                        meta.registry
+                            .createType('PalletMessageQueueBookState', {
+                            begin: 0,
+                            end: 1,
+                            count: 1,
+                            readyNeighbours: { prev: origin, next: origin },
+                            messageCount: messagesCount,
+                            size_: messagesSize,
+                        })
+                            .toHex(),
+                    ],
+                    [
+                        (0, utils_1.compactHex)(meta.query.messageQueue.serviceHead(origin)),
+                        meta.registry.createType('PolkadotRuntimeParachainsInclusionAggregateMessageOrigin', origin).toHex(),
+                    ],
+                    [
+                        (0, utils_1.compactHex)(meta.query.messageQueue.pages(origin, 0)),
+                        meta.registry
+                            .createType('PalletMessageQueuePage', {
+                            remaining: messagesCount,
+                            remaining_size: messagesSize,
+                            first_index: 0,
+                            first: 0,
+                            last,
+                            heap: (0, util_1.compactAddLength)(heap),
+                        })
+                            .toHex(),
+                    ],
+                ]);
+            }
+            else {
+                throw new Error('Unknown ump storage');
+            }
             logger.trace({ paraId, upwardMessages: (0, logger_1.truncate)(upwardMessages) }, 'Pushed UMP');
         }
-        const needsDispatch = meta.registry.createType('Vec<u32>', Object.keys(ump));
-        layer.set((0, utils_1.compactHex)(meta.query.ump.needsDispatch()), needsDispatch.toHex());
+        if (meta.query.ump) {
+            const needsDispatch = meta.registry.createType('Vec<u32>', Object.keys(ump));
+            layer.set((0, utils_1.compactHex)(meta.query.ump.needsDispatch()), needsDispatch.toHex());
+        }
     }
     const { block: newBlock } = await initNewBlock(head, header, inherents, layer);
     logger.info({

package/lib/blockchain/txpool.js

@@ -157,8 +157,8 @@ class TxPool {
         }
         finally {
             this.#isBuilding = false;
-            this.#buildBlockIfNeeded();
         }
+        this.#buildBlockIfNeeded();
     }
     async #buildBlock() {
         await this.#chain.api.isReady;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
   "license": "Apache-2.0",
   "bin": "./chopsticks.js",
@@ -16,7 +16,7 @@
     "dev:moonbeam": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- --config=configs/moonbeam.yml"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.6.5",
+    "@acala-network/chopsticks-executor": "0.6.6",
     "@polkadot/api": "^10.7.2",
     "axios": "^1.4.0",
     "js-yaml": "^4.1.0",