@acala-network/chopsticks-testing 1.5.1 → 1.6.0

package/dist/cjs/check.js

@@ -25,15 +25,12 @@ function _check_private_redeclaration(obj, privateCollection) {
     }
 }
 function _class_apply_descriptor_get(receiver, descriptor) {
-    if (descriptor.get) {
-        return descriptor.get.call(receiver);
-    }
+    if (descriptor.get) return descriptor.get.call(receiver);
     return descriptor.value;
 }
 function _class_apply_descriptor_set(receiver, descriptor, value) {
-    if (descriptor.set) {
-        descriptor.set.call(receiver, value);
-    } else {
+    if (descriptor.set) descriptor.set.call(receiver, value);
+    else {
         if (!descriptor.writable) {
             throw new TypeError("attempted to set read only private field");
         }
@@ -41,9 +38,7 @@ function _class_apply_descriptor_set(receiver, descriptor, value) {
     }
 }
 function _class_extract_field_descriptor(receiver, privateMap, action) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to " + action + " private field on non-instance");
-    }
+    if (!privateMap.has(receiver)) throw new TypeError("attempted to " + action + " private field on non-instance");
     return privateMap.get(receiver);
 }
 function _class_private_field_get(receiver, privateMap) {
@@ -60,15 +55,64 @@ function _class_private_field_set(receiver, privateMap, value) {
     return value;
 }
 function _class_private_method_get(receiver, privateSet, fn) {
-    if (!privateSet.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
-    }
+    if (!privateSet.has(receiver)) throw new TypeError("attempted to get private field on non-instance");
     return fn;
 }
 function _class_private_method_init(obj, privateSet) {
     _check_private_redeclaration(obj, privateSet);
     privateSet.add(obj);
 }
+/**
+ * `XcmpMessageFormat` index of the `ConcatenatedOpaqueVersionedXcm` variant.
+ *
+ * The variant is matched by index, not by name, because older versions of
+ * `@polkadot/types` do not declare it and cannot decode it.
+ */ const CONCATENATED_OPAQUE_VERSIONED_XCM = 3;
+/**
+ * Decode one XCMP message.
+ *
+ * A message starts with an `XcmpMessageFormat` byte. In the
+ * `ConcatenatedOpaqueVersionedXcm` format, each XCM that follows has a compact
+ * length prefix. Such a payload is not a single `XcmVersionedXcm`, so it must be
+ * read one item at a time. All other formats keep the previous behaviour.
+ *
+ * @param api - Polkadot API instance
+ * @param data - Message bytes, or their hex string, with the format byte first
+ */ /**
+ * Convert a hex string to bytes. Storage gives the message as a hex string.
+ * Bytes are also accepted.
+ *
+ * @param data - Hex string or bytes
+ */ const toBytes = (data)=>{
+    if (typeof data !== 'string') {
+        return data;
+    }
+    const digits = data.startsWith('0x') ? data.slice(2) : data;
+    const bytes = new Uint8Array(digits.length / 2);
+    for(let index = 0; index < bytes.length; index++){
+        bytes[index] = Number.parseInt(digits.slice(index * 2, index * 2 + 2), 16);
+    }
+    return bytes;
+};
+const decodeXcmpMessage = (api, data)=>{
+    const bytes = toBytes(data);
+    if (bytes[0] !== CONCATENATED_OPAQUE_VERSIONED_XCM) {
+        return api.createType('(XcmpMessageFormat, XcmVersionedXcm)', data).toJSON();
+    }
+    const messages = [];
+    let offset = 1;
+    while(offset < bytes.length){
+        const length = api.createType('Compact<u32>', bytes.subarray(offset));
+        offset += length.encodedLength;
+        const end = offset + length.toNumber();
+        messages.push(api.createType('XcmVersionedXcm', bytes.subarray(offset, end)).toJSON());
+        offset = end;
+    }
+    return [
+        'ConcatenatedOpaqueVersionedXcm',
+        messages
+    ];
+};
 /**
  * Processes a Codec or array of Codecs with a given transformation function
  * @param codec - Single Codec or array of Codecs to process
@@ -389,7 +433,7 @@ const setupCheck = (options)=>{
    * Check HRMP (Horizontal Relay-routed Message Passing) messages
    * @param api - Polkadot API instance
    */ const checkHrmp = ({ api })=>check(api.query.parachainSystem.hrmpOutboundMessages(), 'hrmp').map((value)=>value.map(({ recipient, data })=>({
-                    data: api.createType('(XcmpMessageFormat, XcmVersionedXcm)', data).toJSON(),
+                    data: decodeXcmpMessage(api, data),
                     recipient
                 })));
     /**

package/dist/esm/check.js

@@ -1,3 +1,54 @@
+/**
+ * `XcmpMessageFormat` index of the `ConcatenatedOpaqueVersionedXcm` variant.
+ *
+ * The variant is matched by index, not by name, because older versions of
+ * `@polkadot/types` do not declare it and cannot decode it.
+ */ const CONCATENATED_OPAQUE_VERSIONED_XCM = 3;
+/**
+ * Decode one XCMP message.
+ *
+ * A message starts with an `XcmpMessageFormat` byte. In the
+ * `ConcatenatedOpaqueVersionedXcm` format, each XCM that follows has a compact
+ * length prefix. Such a payload is not a single `XcmVersionedXcm`, so it must be
+ * read one item at a time. All other formats keep the previous behaviour.
+ *
+ * @param api - Polkadot API instance
+ * @param data - Message bytes, or their hex string, with the format byte first
+ */ /**
+ * Convert a hex string to bytes. Storage gives the message as a hex string.
+ * Bytes are also accepted.
+ *
+ * @param data - Hex string or bytes
+ */ const toBytes = (data)=>{
+    if (typeof data !== 'string') {
+        return data;
+    }
+    const digits = data.startsWith('0x') ? data.slice(2) : data;
+    const bytes = new Uint8Array(digits.length / 2);
+    for(let index = 0; index < bytes.length; index++){
+        bytes[index] = Number.parseInt(digits.slice(index * 2, index * 2 + 2), 16);
+    }
+    return bytes;
+};
+const decodeXcmpMessage = (api, data)=>{
+    const bytes = toBytes(data);
+    if (bytes[0] !== CONCATENATED_OPAQUE_VERSIONED_XCM) {
+        return api.createType('(XcmpMessageFormat, XcmVersionedXcm)', data).toJSON();
+    }
+    const messages = [];
+    let offset = 1;
+    while(offset < bytes.length){
+        const length = api.createType('Compact<u32>', bytes.subarray(offset));
+        offset += length.encodedLength;
+        const end = offset + length.toNumber();
+        messages.push(api.createType('XcmVersionedXcm', bytes.subarray(offset, end)).toJSON());
+        offset = end;
+    }
+    return [
+        'ConcatenatedOpaqueVersionedXcm',
+        messages
+    ];
+};
 /**
  * Processes a Codec or array of Codecs with a given transformation function
  * @param codec - Single Codec or array of Codecs to process
@@ -301,7 +352,7 @@
    * Check HRMP (Horizontal Relay-routed Message Passing) messages
    * @param api - Polkadot API instance
    */ const checkHrmp = ({ api })=>check(api.query.parachainSystem.hrmpOutboundMessages(), 'hrmp').map((value)=>value.map(({ recipient, data })=>({
-                    data: api.createType('(XcmpMessageFormat, XcmVersionedXcm)', data).toJSON(),
+                    data: decodeXcmpMessage(api, data),
                     recipient
                 })));
     /**

package/package.json

@@ -1,43 +1,47 @@
 {
-  "name": "@acala-network/chopsticks-testing",
-  "version": "1.5.1",
-  "author": "Acala Developers <hello@acala.network>",
-  "license": "Apache-2.0",
-  "type": "module",
-  "engines": {
-    "node": ">=v22"
-  },
-  "scripts": {
-    "clean": "rm -rf dist tsconfig.tsbuildinfo",
-    "build": "yarn clean && ../../package-build.sh",
-    "depcheck": "npx depcheck"
-  },
-  "dependencies": {
-    "@acala-network/chopsticks-utils": "1.5.1",
-    "@polkadot/api": "^16.4.1",
-    "@polkadot/types": "^16.4.1"
-  },
-  "devDependencies": {
-    "@swc/cli": "0.7.10",
-    "@swc/core": "^1.12.14",
-    "typescript": "^5.8.3"
-  },
-  "files": [
-    "dist/esm/**",
-    "dist/cjs/**"
-  ],
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "exports": {
-    ".": {
-      "require": "./dist/cjs/index.js",
-      "import": "./dist/esm/index.js",
-      "default": "./dist/esm/index.js"
-    },
-    "./*": {
-      "require": "./dist/cjs/*.js",
-      "import": "./dist/esm/*.js",
-      "default": "./dist/esm/*.js"
-    }
-  }
-}
+	"name": "@acala-network/chopsticks-testing",
+	"version": "1.6.0",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/AcalaNetwork/chopsticks"
+	},
+	"author": "Acala Developers <hello@acala.network>",
+	"license": "Apache-2.0",
+	"type": "module",
+	"engines": {
+		"node": ">=v24"
+	},
+	"scripts": {
+		"clean": "rm -rf dist tsconfig.tsbuildinfo",
+		"build": "bun run clean && ../../package-build.sh",
+		"depcheck": "bunx depcheck"
+	},
+	"dependencies": {
+		"@acala-network/chopsticks-utils": "workspace:*",
+		"@polkadot/api": "^17.0.2",
+		"@polkadot/types": "^17.0.2"
+	},
+	"devDependencies": {
+		"@swc/cli": "0.8.2",
+		"@swc/core": "^1.16.22",
+		"typescript": "^6.0.3"
+	},
+	"files": [
+		"dist/esm/**",
+		"dist/cjs/**"
+	],
+	"main": "./dist/cjs/index.js",
+	"module": "./dist/esm/index.js",
+	"exports": {
+		".": {
+			"require": "./dist/cjs/index.js",
+			"import": "./dist/esm/index.js",
+			"default": "./dist/esm/index.js"
+		},
+		"./*": {
+			"require": "./dist/cjs/*.js",
+			"import": "./dist/esm/*.js",
+			"default": "./dist/esm/*.js"
+		}
+	}
+}