@acala-network/chopsticks-core 1.2.5 → 1.2.8

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()
@@ -196,7 +204,9 @@ const initNewBlock = async (head, header, inherentProviders, params, storageLaye
             inherents.push(...extrinsics);
             callback?.onPhaseApplied?.(layers.length - 1, resp);
         } catch (e) {
-            logger.warn('Failed to apply inherents %o %s', e, e);
+            logger.warn({
+                err: e
+            }, 'Failed to apply inherents');
             throw new Error('Failed to apply inherents');
         }
     }
@@ -322,7 +332,9 @@ const buildBlock = async (head, inherentProviders, params, callbacks)=>{
             includedExtrinsic.push(extrinsic);
             callbacks?.onPhaseApplied?.(includedExtrinsic.length - 1, resp);
         } catch (e) {
-            logger.info('Failed to apply extrinsic %o %s', e, e);
+            logger.info({
+                err: e
+            }, 'Failed to apply extrinsic');
             pendingExtrinsics.push(extrinsic);
         }
     }

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/blockchain/storage-layer.js

@@ -144,7 +144,9 @@ class RemoteStorageLayer {
                         blockHash: _class_private_field_get(this, _at)
                     })));
             } else if (_class_private_field_get(this, _db)) {
-                data.forEach(([key, value])=>_class_private_field_get(this, _db)?.saveStorage(_class_private_field_get(this, _at), key, value));
+                data.forEach(([key, value])=>{
+                    _class_private_field_get(this, _db)?.saveStorage(_class_private_field_get(this, _at), key, value);
+                });
             }
         }
         return result;

package/dist/cjs/chopsticks-provider.js

@@ -156,7 +156,11 @@ class ChopsticksProvider {
                     sub.onCancel = onCancel;
                 }
                 return (data)=>{
-                    logger.debug('subscribe-callback', method, subid, data);
+                    logger.debug({
+                        method,
+                        subid,
+                        data
+                    }, 'subscribe-callback');
                     const sub = _class_private_field_get(this, _subscriptions)[subid];
                     if (sub) {
                         sub.callback(null, data);
@@ -166,7 +170,9 @@ class ChopsticksProvider {
                 };
             },
             unsubscribe: (subid)=>{
-                logger.debug('unsubscribe-callback', subid);
+                logger.debug({
+                    subid
+                }, 'unsubscribe-callback');
                 const sub = _class_private_field_get(this, _subscriptions)[subid];
                 if (sub) {
                     sub.onCancel?.();
@@ -178,20 +184,20 @@ class ChopsticksProvider {
         };
         this.send = async (method, params, _isCacheable, subscription)=>{
             try {
-                logger.debug('send', {
+                logger.debug({
                     method,
                     params
-                });
+                }, 'send');
                 const rpcHandler = providerHandlers[method];
                 if (!rpcHandler) {
                     logger.error(`Unable to find rpc handler=${method}`);
                     throw new Error(`Unable to find rpc handler=${method}`);
                 }
                 if (subscription) {
-                    logger.debug('subscribe', {
+                    logger.debug({
                         method,
                         params
-                    });
+                    }, 'subscribe');
                     const subid = await rpcHandler({
                         chain: this.chain
                     }, params, this.subscriptionManager);
@@ -206,15 +212,17 @@ class ChopsticksProvider {
                     };
                     return subid;
                 }
-                logger.debug('call', {
+                logger.debug({
                     method,
                     params
-                });
+                }, 'call');
                 return rpcHandler({
                     chain: this.chain
                 }, params, this.subscriptionManager);
             } catch (e) {
-                logger.error('send error.', e);
+                logger.error({
+                    err: e
+                }, 'send error');
                 throw e;
             }
         };

package/dist/cjs/logger.d.ts

@@ -1,4 +1,3 @@
-import { pino } from 'pino';
 export declare const pinoLogger: import("pino").Logger<never, boolean>;
-export declare const defaultLogger: pino.Logger<never, boolean>;
+export declare const defaultLogger: import("pino").Logger<never, boolean>;
 export declare const truncate: (val: any) => any;

package/dist/cjs/rpc/shared.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Blockchain } from '../blockchain/index.js';
-export declare const logger: import("pino").default.Logger<never, boolean>;
+export declare const logger: import("pino").Logger<never, boolean>;
 export declare const zHex: z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>;
 export declare const zHash: z.ZodIntersection<z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>>;
 export declare class ResponseError extends Error {

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/index.d.ts

@@ -1,4 +1,4 @@
 import type { Blockchain } from '../blockchain/index.js';
-export declare const xcmLogger: import("pino").default.Logger<never, boolean>;
+export declare const xcmLogger: import("pino").Logger<never, boolean>;
 export declare const connectVertical: (relaychain: Blockchain, parachain: Blockchain) => Promise<void>;
 export declare const connectParachains: (parachains: Blockchain[], disableAutoHrmp?: boolean) => Promise<void>;

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()
@@ -172,7 +180,9 @@ const initNewBlock = async (head, header, inherentProviders, params, storageLaye
             inherents.push(...extrinsics);
             callback?.onPhaseApplied?.(layers.length - 1, resp);
         } catch (e) {
-            logger.warn('Failed to apply inherents %o %s', e, e);
+            logger.warn({
+                err: e
+            }, 'Failed to apply inherents');
             throw new Error('Failed to apply inherents');
         }
     }
@@ -298,7 +308,9 @@ export const buildBlock = async (head, inherentProviders, params, callbacks)=>{
             includedExtrinsic.push(extrinsic);
             callbacks?.onPhaseApplied?.(includedExtrinsic.length - 1, resp);
         } catch (e) {
-            logger.info('Failed to apply extrinsic %o %s', e, e);
+            logger.info({
+                err: e
+            }, 'Failed to apply extrinsic');
             pendingExtrinsics.push(extrinsic);
         }
     }

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/blockchain/storage-layer.js

@@ -77,7 +77,9 @@ export class RemoteStorageLayer {
                         blockHash: this.#at
                     })));
             } else if (this.#db) {
-                data.forEach(([key, value])=>this.#db?.saveStorage(this.#at, key, value));
+                data.forEach(([key, value])=>{
+                    this.#db?.saveStorage(this.#at, key, value);
+                });
             }
         }
         return result;

package/dist/esm/chopsticks-provider.js

@@ -68,7 +68,11 @@ const logger = defaultLogger.child({
                 sub.onCancel = onCancel;
             }
             return (data)=>{
-                logger.debug('subscribe-callback', method, subid, data);
+                logger.debug({
+                    method,
+                    subid,
+                    data
+                }, 'subscribe-callback');
                 const sub = this.#subscriptions[subid];
                 if (sub) {
                     sub.callback(null, data);
@@ -78,7 +82,9 @@ const logger = defaultLogger.child({
             };
         },
         unsubscribe: (subid)=>{
-            logger.debug('unsubscribe-callback', subid);
+            logger.debug({
+                subid
+            }, 'unsubscribe-callback');
             const sub = this.#subscriptions[subid];
             if (sub) {
                 sub.onCancel?.();
@@ -90,20 +96,20 @@ const logger = defaultLogger.child({
     };
     send = async (method, params, _isCacheable, subscription)=>{
         try {
-            logger.debug('send', {
+            logger.debug({
                 method,
                 params
-            });
+            }, 'send');
             const rpcHandler = providerHandlers[method];
             if (!rpcHandler) {
                 logger.error(`Unable to find rpc handler=${method}`);
                 throw new Error(`Unable to find rpc handler=${method}`);
             }
             if (subscription) {
-                logger.debug('subscribe', {
+                logger.debug({
                     method,
                     params
-                });
+                }, 'subscribe');
                 const subid = await rpcHandler({
                     chain: this.chain
                 }, params, this.subscriptionManager);
@@ -118,15 +124,17 @@ const logger = defaultLogger.child({
                 };
                 return subid;
             }
-            logger.debug('call', {
+            logger.debug({
                 method,
                 params
-            });
+            }, 'call');
             return rpcHandler({
                 chain: this.chain
             }, params, this.subscriptionManager);
         } catch (e) {
-            logger.error('send error.', e);
+            logger.error({
+                err: e
+            }, 'send error');
             throw e;
         }
     };

package/dist/esm/logger.d.ts

@@ -1,4 +1,3 @@
-import { pino } from 'pino';
 export declare const pinoLogger: import("pino").Logger<never, boolean>;
-export declare const defaultLogger: pino.Logger<never, boolean>;
+export declare const defaultLogger: import("pino").Logger<never, boolean>;
 export declare const truncate: (val: any) => any;

package/dist/esm/rpc/shared.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Blockchain } from '../blockchain/index.js';
-export declare const logger: import("pino").default.Logger<never, boolean>;
+export declare const logger: import("pino").Logger<never, boolean>;
 export declare const zHex: z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>;
 export declare const zHash: z.ZodIntersection<z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>>;
 export declare class ResponseError extends Error {

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/index.d.ts

@@ -1,4 +1,4 @@
 import type { Blockchain } from '../blockchain/index.js';
-export declare const xcmLogger: import("pino").default.Logger<never, boolean>;
+export declare const xcmLogger: import("pino").Logger<never, boolean>;
 export declare const connectVertical: (relaychain: Blockchain, parachain: Blockchain) => Promise<void>;
 export declare const connectParachains: (parachains: Blockchain[], disableAutoHrmp?: boolean) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "1.2.5",
+  "version": "1.2.8",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "type": "module",
@@ -14,13 +14,13 @@
     "depcheck": "npx depcheck"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "1.2.5",
+    "@acala-network/chopsticks-executor": "1.2.8",
     "@polkadot/rpc-provider": "^16.4.1",
     "@polkadot/types": "^16.4.1",
     "@polkadot/types-codec": "^16.4.1",
     "@polkadot/types-known": "^16.4.1",
-    "@polkadot/util": "^13.5.3",
-    "@polkadot/util-crypto": "^13.5.3",
+    "@polkadot/util": "^14.0.1",
+    "@polkadot/util-crypto": "^14.0.1",
     "comlink": "^4.4.2",
     "eventemitter3": "^5.0.1",
     "lodash": "^4.17.21",
@@ -31,11 +31,11 @@
     "zod": "^3.25.76"
   },
   "devDependencies": {
-    "@swc/cli": "0.7.8",
+    "@swc/cli": "0.7.10",
     "@swc/core": "^1.12.14",
     "@types/lodash": "^4.17.20",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.4"
+    "vitest": "^4.0.18"
   },
   "files": [
     "dist/esm/**",