@acala-network/chopsticks-core 1.2.8 → 1.3.1

package/dist/cjs/blockchain/inherent/parachain/validation-data.js

@@ -256,6 +256,29 @@ class SetValidationData {
         const relayParentNumber = params.relayParentNumber ?? extrinsic.validationData.relayParentNumber + relaySlotIncrease;
         if (argsLengh === 1) {
             // old version
+            let relayParentDescendants = extrinsic.relayParentDescendants;
+            if (relayParentDescendants) {
+                let fakeParentHeader = relayParentDescendants[0];
+                if (fakeParentHeader) {
+                    fakeParentHeader = {
+                        ...fakeParentHeader,
+                        number: relayParentNumber,
+                        stateRoot: trieRootHash
+                    };
+                    relayParentDescendants = [
+                        fakeParentHeader,
+                        ...relayParentDescendants.slice(1)
+                    ];
+                    let lastHeader;
+                    for (const descendant of relayParentDescendants){
+                        if (lastHeader) {
+                            descendant.parentHash = lastHeader.hash;
+                            descendant.number = lastHeader.number.toNumber() + 1;
+                        }
+                        lastHeader = meta.registry.createType('Header', descendant);
+                    }
+                }
+            }
             const newData = {
                 ...extrinsic,
                 downwardMessages,
@@ -267,7 +290,8 @@ class SetValidationData {
                 },
                 relayChainState: {
                     trieNodes: nodes
-                }
+                },
+                relayParentDescendants
             };
             const inherent = new _types.GenericExtrinsic(meta.registry, meta.tx.parachainSystem.setValidationData(newData));
             return [

package/dist/cjs/xcm/upward.d.ts

@@ -1,2 +1,6 @@
 import type { Blockchain } from '../blockchain/index.js';
+/** Filter out UMP signals, keeping only XCM messages before the empty separator. */
+export declare function filterXcmMessages<T extends {
+    length: number;
+}>(messages: T[]): T[];
 export declare const connectUpward: (parachain: Blockchain, relaychain: Blockchain) => Promise<void>;

package/dist/cjs/xcm/upward.js

@@ -2,14 +2,33 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "connectUpward", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get connectUpward () {
         return connectUpward;
+    },
+    get filterXcmMessages () {
+        return filterXcmMessages;
     }
 });
 const _util = require("@polkadot/util");
 const _index = require("../utils/index.js");
+const _index1 = require("./index.js");
+function filterXcmMessages(messages) {
+    const separatorIndex = messages.findIndex((m)=>m.length === 0);
+    if (separatorIndex === -1) return messages;
+    const signalCount = messages.length - separatorIndex - 1;
+    _index1.xcmLogger.debug({
+        xcmCount: separatorIndex,
+        signalCount
+    }, 'Filtered UMP signals from upward messages');
+    return messages.slice(0, separatorIndex);
+}
 const connectUpward = async (parachain, relaychain)=>{
     const meta = await parachain.head.meta;
     const paraId = (await (0, _index.getParaId)(parachain)).toNumber();
@@ -22,6 +41,8 @@ const connectUpward = async (parachain, relaychain)=>{
         const meta = await relaychain.head.meta;
         const upwardMessages = meta.registry.createType('Vec<Bytes>', (0, _util.hexToU8a)(value));
         if (upwardMessages.length === 0) return;
-        relaychain.submitUpwardMessages(paraId, upwardMessages.map((x)=>x.toHex()));
+        const xcmMessages = filterXcmMessages(upwardMessages.toArray());
+        if (xcmMessages.length === 0) return;
+        relaychain.submitUpwardMessages(paraId, xcmMessages.map((x)=>x.toHex()));
     });
 };

package/dist/esm/blockchain/inherent/parachain/validation-data.js

@@ -241,6 +241,29 @@ export class SetValidationData {
         const relayParentNumber = params.relayParentNumber ?? extrinsic.validationData.relayParentNumber + relaySlotIncrease;
         if (argsLengh === 1) {
             // old version
+            let relayParentDescendants = extrinsic.relayParentDescendants;
+            if (relayParentDescendants) {
+                let fakeParentHeader = relayParentDescendants[0];
+                if (fakeParentHeader) {
+                    fakeParentHeader = {
+                        ...fakeParentHeader,
+                        number: relayParentNumber,
+                        stateRoot: trieRootHash
+                    };
+                    relayParentDescendants = [
+                        fakeParentHeader,
+                        ...relayParentDescendants.slice(1)
+                    ];
+                    let lastHeader;
+                    for (const descendant of relayParentDescendants){
+                        if (lastHeader) {
+                            descendant.parentHash = lastHeader.hash;
+                            descendant.number = lastHeader.number.toNumber() + 1;
+                        }
+                        lastHeader = meta.registry.createType('Header', descendant);
+                    }
+                }
+            }
             const newData = {
                 ...extrinsic,
                 downwardMessages,
@@ -252,7 +275,8 @@ export class SetValidationData {
                 },
                 relayChainState: {
                     trieNodes: nodes
-                }
+                },
+                relayParentDescendants
             };
             const inherent = new GenericExtrinsic(meta.registry, meta.tx.parachainSystem.setValidationData(newData));
             return [

package/dist/esm/xcm/upward.d.ts

@@ -1,2 +1,6 @@
 import type { Blockchain } from '../blockchain/index.js';
+/** Filter out UMP signals, keeping only XCM messages before the empty separator. */
+export declare function filterXcmMessages<T extends {
+    length: number;
+}>(messages: T[]): T[];
 export declare const connectUpward: (parachain: Blockchain, relaychain: Blockchain) => Promise<void>;

package/dist/esm/xcm/upward.js

@@ -1,5 +1,21 @@
 import { hexToU8a } from '@polkadot/util';
 import { compactHex, getParaId } from '../utils/index.js';
+import { xcmLogger } from './index.js';
+// The UpwardMessages storage contains both XCM messages and UMP signals (e.g. SelectCore,
+// ApprovedPeer for elastic scaling), separated by an empty entry (UMP_SEPARATOR).
+// Only messages before the separator are XCM; everything after is signals for the relay
+// chain validators. This mirrors `skip_ump_signals` in the SDK's Polkadot primitives.
+// See: [`polkadot-sdk/polkadot/primitives/src/v9/mod.rs`](https://github.com/paritytech/polkadot-sdk/blob/ff555bbd5b397e9984a42c34a799de8e5449f19f/polkadot/primitives/src/v9/mod.rs#L2771)
+/** Filter out UMP signals, keeping only XCM messages before the empty separator. */ export function filterXcmMessages(messages) {
+    const separatorIndex = messages.findIndex((m)=>m.length === 0);
+    if (separatorIndex === -1) return messages;
+    const signalCount = messages.length - separatorIndex - 1;
+    xcmLogger.debug({
+        xcmCount: separatorIndex,
+        signalCount
+    }, 'Filtered UMP signals from upward messages');
+    return messages.slice(0, separatorIndex);
+}
 export const connectUpward = async (parachain, relaychain)=>{
     const meta = await parachain.head.meta;
     const paraId = (await getParaId(parachain)).toNumber();
@@ -12,6 +28,8 @@ export const connectUpward = async (parachain, relaychain)=>{
         const meta = await relaychain.head.meta;
         const upwardMessages = meta.registry.createType('Vec<Bytes>', hexToU8a(value));
         if (upwardMessages.length === 0) return;
-        relaychain.submitUpwardMessages(paraId, upwardMessages.map((x)=>x.toHex()));
+        const xcmMessages = filterXcmMessages(upwardMessages.toArray());
+        if (xcmMessages.length === 0) return;
+        relaychain.submitUpwardMessages(paraId, xcmMessages.map((x)=>x.toHex()));
     });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "1.2.8",
+  "version": "1.3.1",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "type": "module",
@@ -14,7 +14,7 @@
     "depcheck": "npx depcheck"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "1.2.8",
+    "@acala-network/chopsticks-executor": "1.3.1",
     "@polkadot/rpc-provider": "^16.4.1",
     "@polkadot/types": "^16.4.1",
     "@polkadot/types-codec": "^16.4.1",
@@ -23,7 +23,7 @@
     "@polkadot/util-crypto": "^14.0.1",
     "comlink": "^4.4.2",
     "eventemitter3": "^5.0.1",
-    "lodash": "^4.17.21",
+    "lodash": "^4.18.1",
     "lru-cache": "^11.1.0",
     "pino": "^9.7.0",
     "pino-pretty": "^13.0.0",