@acala-network/chopsticks-core 1.2.7 → 1.3.0

package/dist/cjs/blockchain/block-builder.js

@@ -151,6 +151,7 @@ const newHeader = async (head, unsafeBlockHeight)=>{
 };
 const initNewBlock = async (head, header, inherentProviders, params, storageLayer, callback)=>{
     const blockNumber = header.number.toNumber();
+    const { unsafeBlockHeight } = params;
     const hash = `0x${Math.round(Math.random() * 100000000).toString(16).padEnd(64, '0')}`;
     const newBlock = new _block.Block(head.chain, blockNumber, hash, head, {
         header,
@@ -158,6 +159,13 @@ const initNewBlock = async (head, header, inherentProviders, params, storageLaye
         storage: storageLayer ?? head.storage
     });
     {
+        // override block number in storage when using unsafeBlockHeight
+        // this is needed because the runtime validates that block numbers are strictly increasing
+        if (unsafeBlockHeight !== undefined && blockNumber > head.number + 1) {
+            const meta = await head.meta;
+            const value = meta.registry.createType('BlockNumber', blockNumber - 1).toU8a();
+            newBlock.pushStorageLayer().set((0, _index.compactHex)(meta.query.system.number()), (0, _util.u8aToHex)(value));
+        }
         // initialize block
         const resp = await newBlock.call('Core_initialize_block', [
             header.toHex()

package/dist/cjs/blockchain/inherent/parachain/validation-data.d.ts

@@ -3,8 +3,8 @@ import type { Block } from '../../block.js';
 import type { BuildBlockParams, DownwardMessage, HorizontalMessage } from '../../txpool.js';
 import type { InherentProvider } from '../index.js';
 export type ValidationData = {
-    downwardMessages: DownwardMessage[];
-    horizontalMessages: Record<number, HorizontalMessage[]>;
+    downwardMessages?: DownwardMessage[];
+    horizontalMessages?: Record<number, HorizontalMessage[]>;
     validationData: {
         relayParentNumber: number;
         relayParentStorageRoot: HexString;

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

@@ -51,8 +51,7 @@ const MOCK_VALIDATION_DATA = {
     horizontalMessages: [],
     downwardMessages: []
 };
-const getValidationData = async (parent, fallback = true)=>{
-    const meta = await parent.meta;
+const getValidationData = async (parent)=>{
     if (parent.number === 0) {
         const { trieRootHash, nodes } = await (0, _index1.createProof)(MOCK_VALIDATION_DATA.relayChainState.trieNodes, []);
         return {
@@ -66,39 +65,19 @@ const getValidationData = async (parent, fallback = true)=>{
             }
         };
     }
-    try {
-        const extrinsics = await parent.extrinsics;
-        const validationDataExtrinsic = extrinsics.find((extrinsic)=>{
-            const firstArg = meta.registry.createType('GenericExtrinsic', extrinsic)?.args?.[0];
-            return firstArg && 'validationData' in firstArg;
-        });
-        if (!validationDataExtrinsic) {
-            throw new Error('Missing validation data from block');
-        }
-        return meta.registry.createType('GenericExtrinsic', validationDataExtrinsic).args[0].toJSON();
-    } catch (e) {
-        logger.warn('Failed to get validation data from block %d %s', parent.number, e);
-        if (fallback) {
-            // this could fail due to wasm override that breaks the validation data format
-            // so we will try parent's parent
-            const grandParent = await parent.parentBlock;
-            if (grandParent) {
-                const data = await getValidationData(grandParent, false);
-                return {
-                    ...data,
-                    validationData: {
-                        ...data.validationData,
-                        relayParentNumber: data.validationData.relayParentNumber + 2
-                    }
-                };
-            } else {
-                throw e;
-            }
-        } else {
-            // fallback failed, throw error
-            throw e;
-        }
+    // Parent extrinsics are encoded by grand parent meta and new block extrinsics are encoded with parent meta.
+    const grandParent = await parent.parentBlock;
+    if (!grandParent) throw new Error('grand parent block not found');
+    const grandMeta = await grandParent.meta;
+    const extrinsics = await parent.extrinsics;
+    const validationDataExtrinsic = extrinsics.find((extrinsic)=>{
+        const firstArg = grandMeta.registry.createType('GenericExtrinsic', extrinsic)?.args?.[0];
+        return firstArg && 'validationData' in firstArg;
+    });
+    if (!validationDataExtrinsic) {
+        throw new Error('Missing validation data from block');
     }
+    return grandMeta.registry.createType('GenericExtrinsic', validationDataExtrinsic).args[0].toJSON();
 };
 class SetValidationData {
     async createInherents(newBlock, params) {

package/dist/cjs/setup.js

@@ -26,10 +26,13 @@ const processOptions = async (options)=>{
     _logger.defaultLogger.debug(options, 'Setup options');
     let provider;
     if (options.genesis) {
+        _logger.defaultLogger.debug(options, 'Setup options - genesis');
         provider = options.genesis;
     } else if (typeof options.endpoint === 'string' && /^(https|http):\/\//.test(options.endpoint || '')) {
+        _logger.defaultLogger.debug(options, 'Setup options - HTTP');
         provider = new _rpcprovider.HttpProvider(options.endpoint);
     } else {
+        _logger.defaultLogger.debug(options, 'Setup options - WS');
         provider = new _rpcprovider.WsProvider(options.endpoint, 3_000, undefined, options.rpcTimeout);
     }
     const api = new _api.Api(provider);

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/block-builder.js

@@ -1,4 +1,4 @@
-import { compactAddLength, hexToU8a, stringToHex, u8aConcat } from '@polkadot/util';
+import { compactAddLength, hexToU8a, stringToHex, u8aConcat, u8aToHex } from '@polkadot/util';
 import { blake2AsU8a } from '@polkadot/util-crypto';
 import { defaultLogger, truncate } from '../logger.js';
 import { compactHex, getCurrentSlot } from '../utils/index.js';
@@ -127,6 +127,7 @@ export const newHeader = async (head, unsafeBlockHeight)=>{
 };
 const initNewBlock = async (head, header, inherentProviders, params, storageLayer, callback)=>{
     const blockNumber = header.number.toNumber();
+    const { unsafeBlockHeight } = params;
     const hash = `0x${Math.round(Math.random() * 100000000).toString(16).padEnd(64, '0')}`;
     const newBlock = new Block(head.chain, blockNumber, hash, head, {
         header,
@@ -134,6 +135,13 @@ const initNewBlock = async (head, header, inherentProviders, params, storageLaye
         storage: storageLayer ?? head.storage
     });
     {
+        // override block number in storage when using unsafeBlockHeight
+        // this is needed because the runtime validates that block numbers are strictly increasing
+        if (unsafeBlockHeight !== undefined && blockNumber > head.number + 1) {
+            const meta = await head.meta;
+            const value = meta.registry.createType('BlockNumber', blockNumber - 1).toU8a();
+            newBlock.pushStorageLayer().set(compactHex(meta.query.system.number()), u8aToHex(value));
+        }
         // initialize block
         const resp = await newBlock.call('Core_initialize_block', [
             header.toHex()

package/dist/esm/blockchain/inherent/parachain/validation-data.d.ts

@@ -3,8 +3,8 @@ import type { Block } from '../../block.js';
 import type { BuildBlockParams, DownwardMessage, HorizontalMessage } from '../../txpool.js';
 import type { InherentProvider } from '../index.js';
 export type ValidationData = {
-    downwardMessages: DownwardMessage[];
-    horizontalMessages: Record<number, HorizontalMessage[]>;
+    downwardMessages?: DownwardMessage[];
+    horizontalMessages?: Record<number, HorizontalMessage[]>;
     validationData: {
         relayParentNumber: number;
         relayParentStorageRoot: HexString;

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

@@ -36,8 +36,7 @@ const MOCK_VALIDATION_DATA = {
     horizontalMessages: [],
     downwardMessages: []
 };
-const getValidationData = async (parent, fallback = true)=>{
-    const meta = await parent.meta;
+const getValidationData = async (parent)=>{
     if (parent.number === 0) {
         const { trieRootHash, nodes } = await createProof(MOCK_VALIDATION_DATA.relayChainState.trieNodes, []);
         return {
@@ -51,39 +50,19 @@ const getValidationData = async (parent, fallback = true)=>{
             }
         };
     }
-    try {
-        const extrinsics = await parent.extrinsics;
-        const validationDataExtrinsic = extrinsics.find((extrinsic)=>{
-            const firstArg = meta.registry.createType('GenericExtrinsic', extrinsic)?.args?.[0];
-            return firstArg && 'validationData' in firstArg;
-        });
-        if (!validationDataExtrinsic) {
-            throw new Error('Missing validation data from block');
-        }
-        return meta.registry.createType('GenericExtrinsic', validationDataExtrinsic).args[0].toJSON();
-    } catch (e) {
-        logger.warn('Failed to get validation data from block %d %s', parent.number, e);
-        if (fallback) {
-            // this could fail due to wasm override that breaks the validation data format
-            // so we will try parent's parent
-            const grandParent = await parent.parentBlock;
-            if (grandParent) {
-                const data = await getValidationData(grandParent, false);
-                return {
-                    ...data,
-                    validationData: {
-                        ...data.validationData,
-                        relayParentNumber: data.validationData.relayParentNumber + 2
-                    }
-                };
-            } else {
-                throw e;
-            }
-        } else {
-            // fallback failed, throw error
-            throw e;
-        }
+    // Parent extrinsics are encoded by grand parent meta and new block extrinsics are encoded with parent meta.
+    const grandParent = await parent.parentBlock;
+    if (!grandParent) throw new Error('grand parent block not found');
+    const grandMeta = await grandParent.meta;
+    const extrinsics = await parent.extrinsics;
+    const validationDataExtrinsic = extrinsics.find((extrinsic)=>{
+        const firstArg = grandMeta.registry.createType('GenericExtrinsic', extrinsic)?.args?.[0];
+        return firstArg && 'validationData' in firstArg;
+    });
+    if (!validationDataExtrinsic) {
+        throw new Error('Missing validation data from block');
     }
+    return grandMeta.registry.createType('GenericExtrinsic', validationDataExtrinsic).args[0].toJSON();
 };
 export class SetValidationData {
     async createInherents(newBlock, params) {

package/dist/esm/setup.js

@@ -8,10 +8,13 @@ export const processOptions = async (options)=>{
     defaultLogger.debug(options, 'Setup options');
     let provider;
     if (options.genesis) {
+        defaultLogger.debug(options, 'Setup options - genesis');
         provider = options.genesis;
     } else if (typeof options.endpoint === 'string' && /^(https|http):\/\//.test(options.endpoint || '')) {
+        defaultLogger.debug(options, 'Setup options - HTTP');
         provider = new HttpProvider(options.endpoint);
     } else {
+        defaultLogger.debug(options, 'Setup options - WS');
         provider = new WsProvider(options.endpoint, 3_000, undefined, options.rpcTimeout);
     }
     const api = new Api(provider);

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.7",
+  "version": "1.3.0",
   "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.7",
+    "@acala-network/chopsticks-executor": "1.3.0",
     "@polkadot/rpc-provider": "^16.4.1",
     "@polkadot/types": "^16.4.1",
     "@polkadot/types-codec": "^16.4.1",