@acala-network/chopsticks-core 1.2.2 → 1.2.4

package/dist/cjs/api.d.ts

@@ -33,7 +33,7 @@ export declare class Api {
     getBlock(hash?: string): Promise<SignedBlock | null>;
     getStorage(key: string, hash?: string): Promise<`0x${string}` | null>;
     getKeysPaged(prefix: string, pageSize: number, startKey: string, hash?: string): Promise<`0x${string}`[]>;
-    getStorageBatch(prefix: HexString, keys: HexString[], hash?: HexString): Promise<[`0x${string}`, `0x${string}` | null][]>;
+    getStorageBatch(prefix: HexString, keys: HexString[], hash?: HexString): any;
     subscribeRemoteNewHeads(cb: ProviderInterfaceCallback): Promise<string | number>;
     subscribeRemoteFinalizedHeads(cb: ProviderInterfaceCallback): Promise<string | number>;
 }

package/dist/cjs/api.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "Api", {
         return Api;
     }
 });
+const _error = /*#__PURE__*/ _interop_require_default(require("@polkadot/rpc-provider/coder/error"));
 const _lodash = /*#__PURE__*/ _interop_require_default(require("lodash"));
 const _index = require("./utils/index.js");
 function _check_private_redeclaration(obj, privateCollection) {
@@ -179,6 +180,21 @@ class Api {
         return this.send('state_getKeysPaged', params, !!hash);
     }
     async getStorageBatch(prefix, keys, hash) {
+        // On response limit error, retry with a smaller batch size
+        const retryOnError = async (ex)=>{
+            if (ex instanceof _error.default && (ex.code === -32008 || ex.message === 'Response is too big')) {
+                // Can't split beyond key size = 2
+                if (keys.length < 2) throw ex;
+                const mid = Math.floor(keys.length / 2);
+                const batches = [
+                    keys.slice(0, mid),
+                    keys.slice(mid)
+                ];
+                const results = await Promise.all(batches.map((batch)=>this.getStorageBatch(prefix, batch, hash)));
+                return results.flat();
+            }
+            throw ex;
+        };
         const [child] = (0, _index.splitChildKey)(prefix);
         if (child) {
             // child storage key, use childstate_getStorageEntries
@@ -188,14 +204,14 @@ class Api {
                 keys.map((key)=>(0, _index.stripChildPrefix)(key))
             ];
             if (hash) params.push(hash);
-            return _class_private_field_get(this, _provider).send('childstate_getStorageEntries', params, !!hash).then((values)=>_lodash.default.zip(keys, values));
+            return _class_private_field_get(this, _provider).send('childstate_getStorageEntries', params, !!hash).then((values)=>_lodash.default.zip(keys, values)).catch(retryOnError);
         }
         // main storage key, use state_getStorageAt
         const params = [
             keys
         ];
         if (hash) params.push(hash);
-        return _class_private_field_get(this, _provider).send('state_queryStorageAt', params, !!hash).then((result)=>result[0]?.['changes'] || []);
+        return _class_private_field_get(this, _provider).send('state_queryStorageAt', params, !!hash).then((result)=>result[0]?.['changes'] || []).catch(retryOnError);
     }
     async subscribeRemoteNewHeads(cb) {
         if (!_class_private_field_get(this, _provider).hasSubscriptions) {

package/dist/cjs/blockchain/block-builder.d.ts

@@ -1,10 +1,9 @@
-import type { DigestItem, Header, TransactionValidityError } from '@polkadot/types/interfaces';
+import type { Header, TransactionValidityError } from '@polkadot/types/interfaces';
 import type { HexString } from '@polkadot/util/types';
 import type { TaskCallResponse } from '../wasm-executor/index.js';
 import { Block } from './block.js';
 import type { InherentProvider } from './inherent/index.js';
 import type { BuildBlockParams } from './txpool.js';
-export declare const genesisDigestLogs: (head: Block) => Promise<DigestItem[]>;
 export declare const newHeader: (head: Block, unsafeBlockHeight?: number) => Promise<Header>;
 export type BuildBlockCallbacks = {
     onApplyExtrinsicError?: (extrinsic: HexString, error: TransactionValidityError) => void;

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

@@ -18,9 +18,6 @@ _export(exports, {
     get dryRunInherents () {
         return dryRunInherents;
     },
-    get genesisDigestLogs () {
-        return genesisDigestLogs;
-    },
     get newHeader () {
         return newHeader;
     }
@@ -70,15 +67,6 @@ const genesisDigestLogs = async (head)=>{
         digest
     ];
 };
-const getConsensus = (header)=>{
-    if (header.digest.logs.length === 0) return;
-    const [consensusEngine, preDigest] = header.digest.logs[0].asPreRuntime;
-    return {
-        consensusEngine,
-        preDigest,
-        rest: header.digest.logs.slice(1)
-    };
-};
 const babePreDigestSetSlot = (digest, slotNumber)=>{
     if (digest.isPrimary) {
         return {
@@ -110,50 +98,46 @@ const newHeader = async (head, unsafeBlockHeight)=>{
     const meta = await head.meta;
     const parentHeader = await head.header;
     let newLogs = !head.number ? await genesisDigestLogs(head) : parentHeader.digest.logs.toArray();
-    const consensus = getConsensus(parentHeader);
-    if (consensus?.consensusEngine.isAura) {
-        const slot = await (0, _index.getCurrentSlot)(head);
-        const newSlot = (0, _util.compactAddLength)(meta.registry.createType('Slot', slot + 1).toU8a());
-        newLogs = [
-            meta.registry.createType('DigestItem', {
-                PreRuntime: [
-                    consensus.consensusEngine,
-                    newSlot
-                ]
-            }),
-            ...consensus.rest
-        ];
-    } else if (consensus?.consensusEngine.isBabe) {
-        const slot = await (0, _index.getCurrentSlot)(head);
-        const digest = meta.registry.createType('RawBabePreDigest', consensus.preDigest);
-        const newSlot = (0, _util.compactAddLength)(meta.registry.createType('RawBabePreDigest', babePreDigestSetSlot(digest, slot + 1)).toU8a());
-        newLogs = [
-            meta.registry.createType('DigestItem', {
-                PreRuntime: [
-                    consensus.consensusEngine,
-                    newSlot
-                ]
-            }),
-            ...consensus.rest
-        ];
-    } else if (consensus?.consensusEngine?.toString() === 'nmbs') {
-        const nmbsKey = (0, _util.stringToHex)('nmbs');
-        newLogs = [
-            meta.registry.createType('DigestItem', {
-                // Using previous block author
-                PreRuntime: [
-                    consensus.consensusEngine,
-                    parentHeader.digest.logs.find((log)=>log.isPreRuntime && log.asPreRuntime[0].toHex() === nmbsKey)?.asPreRuntime[1].toHex()
-                ]
-            }),
-            ...consensus.rest
-        ];
-        if (meta.query.randomness?.notFirstBlock) {
-            // TODO: shouldn't modify existing head
-            // reset notFirstBlock so randomness will skip validation
-            head.pushStorageLayer().set((0, _index.compactHex)(meta.query.randomness.notFirstBlock()), _storagelayer.StorageValueKind.Deleted);
+    newLogs = await Promise.all(newLogs.map(async (item)=>{
+        if (item.isPreRuntime) {
+            const [consensusEngine, preDigest] = item.asPreRuntime;
+            if (consensusEngine.isAura) {
+                const slot = await (0, _index.getCurrentSlot)(head);
+                const newSlot = (0, _util.compactAddLength)(meta.registry.createType('Slot', slot + 1).toU8a());
+                return meta.registry.createType('DigestItem', {
+                    PreRuntime: [
+                        consensusEngine,
+                        newSlot
+                    ]
+                });
+            } else if (consensusEngine.isBabe) {
+                const slot = await (0, _index.getCurrentSlot)(head);
+                const digest = meta.registry.createType('RawBabePreDigest', preDigest);
+                const newSlot = (0, _util.compactAddLength)(meta.registry.createType('RawBabePreDigest', babePreDigestSetSlot(digest, slot + 1)).toU8a());
+                return meta.registry.createType('DigestItem', {
+                    PreRuntime: [
+                        consensusEngine,
+                        newSlot
+                    ]
+                });
+            } else if (consensusEngine?.toString() === 'nmbs') {
+                const nmbsKey = (0, _util.stringToHex)('nmbs');
+                if (meta.query.randomness?.notFirstBlock) {
+                    // TODO: shouldn't modify existing head
+                    // reset notFirstBlock so randomness will skip validation
+                    head.pushStorageLayer().set((0, _index.compactHex)(meta.query.randomness.notFirstBlock()), _storagelayer.StorageValueKind.Deleted);
+                }
+                return meta.registry.createType('DigestItem', {
+                    // Using previous block author
+                    PreRuntime: [
+                        consensusEngine,
+                        parentHeader.digest.logs.find((log)=>log.isPreRuntime && log.asPreRuntime[0].toHex() === nmbsKey)?.asPreRuntime[1].toHex()
+                    ]
+                });
+            }
         }
-    }
+        return item;
+    }));
     const header = meta.registry.createType('Header', {
         parentHash: head.hash,
         number: unsafeBlockHeight ?? head.number + 1,
@@ -202,7 +186,10 @@ const initNewBlock = async (head, header, inherentProviders, params, storageLaye
             if (extrinsics.length === 0) {
                 continue;
             }
-            const resp = await newBlock.call('BlockBuilder_apply_extrinsic', extrinsics);
+            // bypass signature check during inherent extrinsics
+            // this is needed to allow cumulus to accept fake relay block digests
+            // this should be safe because there are no valid use of invalid signatures in inherents
+            const resp = await newBlock.call('BlockBuilder_apply_extrinsic', extrinsics, true);
             const layer = newBlock.pushStorageLayer();
             layer.setAll(resp.storageDiff);
             layers.push(layer);

package/dist/cjs/blockchain/block.d.ts

@@ -92,5 +92,5 @@ export declare class Block {
     /**
      * Call a runtime method.
      */
-    call(method: string, args: HexString[]): Promise<TaskCallResponse>;
+    call(method: string, args: HexString[], mockSigantureHostOverride?: boolean): Promise<TaskCallResponse>;
 }

package/dist/cjs/blockchain/block.js

@@ -242,7 +242,7 @@ class Block {
     }
     /**
    * Call a runtime method.
-   */ async call(method, args) {
+   */ async call(method, args, mockSigantureHostOverride = false) {
         const wasm = await this.wasm;
         const response = await (0, _index1.runTask)({
             wasm,
@@ -255,7 +255,7 @@ class Block {
             mockSignatureHost: _class_private_field_get(this, _chain).mockSignatureHost,
             allowUnresolvedImports: _class_private_field_get(this, _chain).allowUnresolvedImports,
             runtimeLogLevel: _class_private_field_get(this, _chain).runtimeLogLevel
-        }, (0, _index1.taskHandler)(this));
+        }, (0, _index1.taskHandler)(this), mockSigantureHostOverride);
         if ('Call' in response) {
             if (this.chain.offchainWorker) {
                 // apply offchain storage

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

@@ -13,6 +13,7 @@ export type ValidationData = {
     relayChainState: {
         trieNodes: HexString[];
     };
+    relayParentDescendants?: any[];
 };
 export declare class SetValidationData implements InherentProvider {
     createInherents(newBlock: Block, params: BuildBlockParams): Promise<HexString[]>;

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

@@ -24,6 +24,7 @@ function _interop_require_default(obj) {
 const logger = _logger.defaultLogger.child({
     name: 'parachain-validation-data'
 });
+const RELAY_CHAIN_SLOT_DURATION_MILLIS = 6_000;
 const MOCK_VALIDATION_DATA = {
     validationData: {
         relayParentNumber: 1000,
@@ -116,17 +117,14 @@ class SetValidationData {
         const hrmpIngressChannelIndexKey = (0, _proof.hrmpIngressChannelIndex)(paraId);
         const hrmpEgressChannelIndexKey = (0, _proof.hrmpEgressChannelIndex)(paraId);
         const decoded = await (0, _index1.decodeProof)(extrinsic.validationData.relayParentStorageRoot, extrinsic.relayChainState.trieNodes);
-        const relaySlotIncrease = Math.max(1, meta.consts.timestamp?.minimumPeriod // legacy
-        ?.divn(3000) // relaychain min period
-        ?.toNumber() || meta.consts.aura?.slotDuration // async backing
-        ?.divn(6000) // relaychain block time
-        ?.toNumber() || 1);
+        const slotDuration = await (0, _index.getSlotDuration)(newBlock);
+        const relaySlotIncrease = Math.trunc(slotDuration / RELAY_CHAIN_SLOT_DURATION_MILLIS) || 1 // at least increase by 1
+        ;
         for (const key of Object.values(_proof.WELL_KNOWN_KEYS)){
             if (key === _proof.WELL_KNOWN_KEYS.CURRENT_SLOT) {
                 // increment current slot
                 const relayCurrentSlot = decoded[key] ? meta.registry.createType('Slot', (0, _util.hexToU8a)(decoded[key])).toNumber() : await (0, _index.getCurrentSlot)(parent) * relaySlotIncrease;
-                const newSlot = meta.registry.createType('Slot', relayCurrentSlot + relaySlotIncrease + 1) // +1 to be safe
-                ;
+                const newSlot = meta.registry.createType('Slot', relayCurrentSlot + relaySlotIncrease);
                 logger.debug({
                     relayCurrentSlot,
                     newSlot: newSlot.toNumber()
@@ -276,6 +274,7 @@ class SetValidationData {
         }
         const { trieRootHash, nodes } = await (0, _index1.createProof)(extrinsic.relayChainState.trieNodes, newEntries);
         const argsLengh = meta.tx.parachainSystem.setValidationData.meta.args.length;
+        const relayParentNumber = params.relayParentNumber ?? extrinsic.validationData.relayParentNumber + relaySlotIncrease;
         if (argsLengh === 1) {
             // old version
             const newData = {
@@ -285,7 +284,7 @@ class SetValidationData {
                 validationData: {
                     ...extrinsic.validationData,
                     relayParentStorageRoot: trieRootHash,
-                    relayParentNumber: params.relayParentNumber ?? extrinsic.validationData.relayParentNumber + relaySlotIncrease
+                    relayParentNumber
                 },
                 relayChainState: {
                     trieNodes: nodes
@@ -297,16 +296,40 @@ class SetValidationData {
             ];
         } else if (argsLengh === 2) {
             // new 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,
                 validationData: {
                     ...extrinsic.validationData,
                     relayParentStorageRoot: trieRootHash,
-                    relayParentNumber: params.relayParentNumber ?? extrinsic.validationData.relayParentNumber + relaySlotIncrease
+                    relayParentNumber
                 },
                 relayChainState: {
                     trieNodes: nodes
-                }
+                },
+                relayParentDescendants
             };
             const horizontalMessagesArray = Object.entries(horizontalMessages).flatMap(([sender, messages])=>messages.map((msg)=>[
                         sender,

package/dist/cjs/rpc/rpc-spec/chainHead_v1.js

@@ -106,6 +106,10 @@ const chainHead_v1_follow = async (context, [withRuntime], { subscribe })=>{
             ],
             finalizedBlockRuntime: withRuntime ? await context.chain.head.runtimeVersion : null
         });
+        callback({
+            event: 'bestBlockChanged',
+            bestBlockHash: context.chain.head.hash
+        });
     });
     return id;
 };

package/dist/cjs/utils/proof.d.ts

@@ -8,6 +8,7 @@ export declare const WELL_KNOWN_KEYS: {
     TWO_EPOCHS_AGO_RANDOMNESS: HexString;
     CURRENT_SLOT: HexString;
     ACTIVE_CONFIG: HexString;
+    AUTHORITIES: HexString;
 };
 export declare const dmqMqcHead: (paraId: u32) => `0x${string}`;
 export declare const upgradeGoAheadSignal: (paraId: u32) => `0x${string}`;

package/dist/cjs/utils/proof.js

@@ -42,7 +42,8 @@ const WELL_KNOWN_KEYS = {
     ONE_EPOCH_AGO_RANDOMNESS: '0x1cb6f36e027abb2091cfb5110ab5087f7ce678799d3eff024253b90e84927cc6',
     TWO_EPOCHS_AGO_RANDOMNESS: '0x1cb6f36e027abb2091cfb5110ab5087f7a414cb008e0e61e46722aa60abdd672',
     CURRENT_SLOT: '0x1cb6f36e027abb2091cfb5110ab5087f06155b3cd9a8c9e5e9a23fd5dc13a5ed',
-    ACTIVE_CONFIG: '0x06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385'
+    ACTIVE_CONFIG: '0x06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385',
+    AUTHORITIES: '0x1cb6f36e027abb2091cfb5110ab5087f5e0621c4869aa60c02be9adcc98a0d1d'
 };
 const hash = (prefix, suffix)=>{
     return (0, _util.u8aToHex)((0, _util.u8aConcat)((0, _util.hexToU8a)(prefix), (0, _utilcrypto.xxhashAsU8a)(suffix, 64), suffix));

package/dist/cjs/wasm-executor/index.d.ts

@@ -46,7 +46,7 @@ export interface WasmExecutor {
     runTask: (task: {
         wasm: HexString;
         calls: [string, HexString[]][];
-        mockSignatureHost: boolean;
+        mockSignatureHost: number;
         allowUnresolvedImports: boolean;
         runtimeLogLevel: number;
     }, callback?: JsCallback) => Promise<TaskResponse>;
@@ -65,7 +65,7 @@ export declare const createProof: (nodes: HexString[], updates: [HexString, HexS
     trieRootHash: `0x${string}`;
     nodes: `0x${string}`[];
 }>;
-export declare const runTask: (task: TaskCall, callback?: JsCallback) => Promise<{
+export declare const runTask: (task: TaskCall, callback?: JsCallback, overrideMockSignatureHost?: boolean) => Promise<{
     Call: TaskCallResponse;
 } | {
     Error: string;

package/dist/cjs/wasm-executor/index.js

@@ -136,12 +136,13 @@ const createProof = async (nodes, updates)=>{
     };
 };
 let nextTaskId = 0;
-const runTask = async (task, callback = emptyTaskHandler)=>{
+const runTask = async (task, callback = emptyTaskHandler, overrideMockSignatureHost = false)=>{
     const taskId = nextTaskId++;
     const task2 = {
         ...task,
         id: taskId,
-        storageProofSize: task.storageProofSize ?? 0
+        storageProofSize: task.storageProofSize ?? 0,
+        mockSignatureHost: overrideMockSignatureHost ? 2 : task.mockSignatureHost ? 1 : 0
     };
     const worker = await getWorker();
     logger.trace((0, _logger.truncate)(task2), `runTask #${taskId}`);

package/dist/esm/api.d.ts

@@ -33,7 +33,7 @@ export declare class Api {
     getBlock(hash?: string): Promise<SignedBlock | null>;
     getStorage(key: string, hash?: string): Promise<`0x${string}` | null>;
     getKeysPaged(prefix: string, pageSize: number, startKey: string, hash?: string): Promise<`0x${string}`[]>;
-    getStorageBatch(prefix: HexString, keys: HexString[], hash?: HexString): Promise<[`0x${string}`, `0x${string}` | null][]>;
+    getStorageBatch(prefix: HexString, keys: HexString[], hash?: HexString): any;
     subscribeRemoteNewHeads(cb: ProviderInterfaceCallback): Promise<string | number>;
     subscribeRemoteFinalizedHeads(cb: ProviderInterfaceCallback): Promise<string | number>;
 }

package/dist/esm/api.js

@@ -1,3 +1,4 @@
+import RpcError from '@polkadot/rpc-provider/coder/error';
 import _ from 'lodash';
 import { prefixedChildKey, splitChildKey, stripChildPrefix } from './utils/index.js';
 /**
@@ -131,6 +132,21 @@ import { prefixedChildKey, splitChildKey, stripChildPrefix } from './utils/index
         return this.send('state_getKeysPaged', params, !!hash);
     }
     async getStorageBatch(prefix, keys, hash) {
+        // On response limit error, retry with a smaller batch size
+        const retryOnError = async (ex)=>{
+            if (ex instanceof RpcError && (ex.code === -32008 || ex.message === 'Response is too big')) {
+                // Can't split beyond key size = 2
+                if (keys.length < 2) throw ex;
+                const mid = Math.floor(keys.length / 2);
+                const batches = [
+                    keys.slice(0, mid),
+                    keys.slice(mid)
+                ];
+                const results = await Promise.all(batches.map((batch)=>this.getStorageBatch(prefix, batch, hash)));
+                return results.flat();
+            }
+            throw ex;
+        };
         const [child] = splitChildKey(prefix);
         if (child) {
             // child storage key, use childstate_getStorageEntries
@@ -140,14 +156,14 @@ import { prefixedChildKey, splitChildKey, stripChildPrefix } from './utils/index
                 keys.map((key)=>stripChildPrefix(key))
             ];
             if (hash) params.push(hash);
-            return this.#provider.send('childstate_getStorageEntries', params, !!hash).then((values)=>_.zip(keys, values));
+            return this.#provider.send('childstate_getStorageEntries', params, !!hash).then((values)=>_.zip(keys, values)).catch(retryOnError);
         }
         // main storage key, use state_getStorageAt
         const params = [
             keys
         ];
         if (hash) params.push(hash);
-        return this.#provider.send('state_queryStorageAt', params, !!hash).then((result)=>result[0]?.['changes'] || []);
+        return this.#provider.send('state_queryStorageAt', params, !!hash).then((result)=>result[0]?.['changes'] || []).catch(retryOnError);
     }
     async subscribeRemoteNewHeads(cb) {
         if (!this.#provider.hasSubscriptions) {

package/dist/esm/blockchain/block-builder.d.ts

@@ -1,10 +1,9 @@
-import type { DigestItem, Header, TransactionValidityError } from '@polkadot/types/interfaces';
+import type { Header, TransactionValidityError } from '@polkadot/types/interfaces';
 import type { HexString } from '@polkadot/util/types';
 import type { TaskCallResponse } from '../wasm-executor/index.js';
 import { Block } from './block.js';
 import type { InherentProvider } from './inherent/index.js';
 import type { BuildBlockParams } from './txpool.js';
-export declare const genesisDigestLogs: (head: Block) => Promise<DigestItem[]>;
 export declare const newHeader: (head: Block, unsafeBlockHeight?: number) => Promise<Header>;
 export type BuildBlockCallbacks = {
     onApplyExtrinsicError?: (extrinsic: HexString, error: TransactionValidityError) => void;

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

@@ -7,7 +7,7 @@ import { StorageLayer, StorageValueKind } from './storage-layer.js';
 const logger = defaultLogger.child({
     name: 'block-builder'
 });
-export const genesisDigestLogs = async (head)=>{
+const genesisDigestLogs = async (head)=>{
     const meta = await head.meta;
     const currentSlot = await getCurrentSlot(head);
     if (meta.consts.babe) {
@@ -43,15 +43,6 @@ export const genesisDigestLogs = async (head)=>{
         digest
     ];
 };
-const getConsensus = (header)=>{
-    if (header.digest.logs.length === 0) return;
-    const [consensusEngine, preDigest] = header.digest.logs[0].asPreRuntime;
-    return {
-        consensusEngine,
-        preDigest,
-        rest: header.digest.logs.slice(1)
-    };
-};
 const babePreDigestSetSlot = (digest, slotNumber)=>{
     if (digest.isPrimary) {
         return {
@@ -83,50 +74,46 @@ export const newHeader = async (head, unsafeBlockHeight)=>{
     const meta = await head.meta;
     const parentHeader = await head.header;
     let newLogs = !head.number ? await genesisDigestLogs(head) : parentHeader.digest.logs.toArray();
-    const consensus = getConsensus(parentHeader);
-    if (consensus?.consensusEngine.isAura) {
-        const slot = await getCurrentSlot(head);
-        const newSlot = compactAddLength(meta.registry.createType('Slot', slot + 1).toU8a());
-        newLogs = [
-            meta.registry.createType('DigestItem', {
-                PreRuntime: [
-                    consensus.consensusEngine,
-                    newSlot
-                ]
-            }),
-            ...consensus.rest
-        ];
-    } else if (consensus?.consensusEngine.isBabe) {
-        const slot = await getCurrentSlot(head);
-        const digest = meta.registry.createType('RawBabePreDigest', consensus.preDigest);
-        const newSlot = compactAddLength(meta.registry.createType('RawBabePreDigest', babePreDigestSetSlot(digest, slot + 1)).toU8a());
-        newLogs = [
-            meta.registry.createType('DigestItem', {
-                PreRuntime: [
-                    consensus.consensusEngine,
-                    newSlot
-                ]
-            }),
-            ...consensus.rest
-        ];
-    } else if (consensus?.consensusEngine?.toString() === 'nmbs') {
-        const nmbsKey = stringToHex('nmbs');
-        newLogs = [
-            meta.registry.createType('DigestItem', {
-                // Using previous block author
-                PreRuntime: [
-                    consensus.consensusEngine,
-                    parentHeader.digest.logs.find((log)=>log.isPreRuntime && log.asPreRuntime[0].toHex() === nmbsKey)?.asPreRuntime[1].toHex()
-                ]
-            }),
-            ...consensus.rest
-        ];
-        if (meta.query.randomness?.notFirstBlock) {
-            // TODO: shouldn't modify existing head
-            // reset notFirstBlock so randomness will skip validation
-            head.pushStorageLayer().set(compactHex(meta.query.randomness.notFirstBlock()), StorageValueKind.Deleted);
+    newLogs = await Promise.all(newLogs.map(async (item)=>{
+        if (item.isPreRuntime) {
+            const [consensusEngine, preDigest] = item.asPreRuntime;
+            if (consensusEngine.isAura) {
+                const slot = await getCurrentSlot(head);
+                const newSlot = compactAddLength(meta.registry.createType('Slot', slot + 1).toU8a());
+                return meta.registry.createType('DigestItem', {
+                    PreRuntime: [
+                        consensusEngine,
+                        newSlot
+                    ]
+                });
+            } else if (consensusEngine.isBabe) {
+                const slot = await getCurrentSlot(head);
+                const digest = meta.registry.createType('RawBabePreDigest', preDigest);
+                const newSlot = compactAddLength(meta.registry.createType('RawBabePreDigest', babePreDigestSetSlot(digest, slot + 1)).toU8a());
+                return meta.registry.createType('DigestItem', {
+                    PreRuntime: [
+                        consensusEngine,
+                        newSlot
+                    ]
+                });
+            } else if (consensusEngine?.toString() === 'nmbs') {
+                const nmbsKey = stringToHex('nmbs');
+                if (meta.query.randomness?.notFirstBlock) {
+                    // TODO: shouldn't modify existing head
+                    // reset notFirstBlock so randomness will skip validation
+                    head.pushStorageLayer().set(compactHex(meta.query.randomness.notFirstBlock()), StorageValueKind.Deleted);
+                }
+                return meta.registry.createType('DigestItem', {
+                    // Using previous block author
+                    PreRuntime: [
+                        consensusEngine,
+                        parentHeader.digest.logs.find((log)=>log.isPreRuntime && log.asPreRuntime[0].toHex() === nmbsKey)?.asPreRuntime[1].toHex()
+                    ]
+                });
+            }
         }
-    }
+        return item;
+    }));
     const header = meta.registry.createType('Header', {
         parentHash: head.hash,
         number: unsafeBlockHeight ?? head.number + 1,
@@ -175,7 +162,10 @@ const initNewBlock = async (head, header, inherentProviders, params, storageLaye
             if (extrinsics.length === 0) {
                 continue;
             }
-            const resp = await newBlock.call('BlockBuilder_apply_extrinsic', extrinsics);
+            // bypass signature check during inherent extrinsics
+            // this is needed to allow cumulus to accept fake relay block digests
+            // this should be safe because there are no valid use of invalid signatures in inherents
+            const resp = await newBlock.call('BlockBuilder_apply_extrinsic', extrinsics, true);
             const layer = newBlock.pushStorageLayer();
             layer.setAll(resp.storageDiff);
             layers.push(layer);

package/dist/esm/blockchain/block.d.ts

@@ -92,5 +92,5 @@ export declare class Block {
     /**
      * Call a runtime method.
      */
-    call(method: string, args: HexString[]): Promise<TaskCallResponse>;
+    call(method: string, args: HexString[], mockSigantureHostOverride?: boolean): Promise<TaskCallResponse>;
 }

package/dist/esm/blockchain/block.js

@@ -232,7 +232,7 @@ import { RemoteStorageLayer, StorageLayer, StorageValueKind } from './storage-la
     }
     /**
    * Call a runtime method.
-   */ async call(method, args) {
+   */ async call(method, args, mockSigantureHostOverride = false) {
         const wasm = await this.wasm;
         const response = await runTask({
             wasm,
@@ -245,7 +245,7 @@ import { RemoteStorageLayer, StorageLayer, StorageValueKind } from './storage-la
             mockSignatureHost: this.#chain.mockSignatureHost,
             allowUnresolvedImports: this.#chain.allowUnresolvedImports,
             runtimeLogLevel: this.#chain.runtimeLogLevel
-        }, taskHandler(this));
+        }, taskHandler(this), mockSigantureHostOverride);
         if ('Call' in response) {
             if (this.chain.offchainWorker) {
                 // apply offchain storage

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

@@ -13,6 +13,7 @@ export type ValidationData = {
     relayChainState: {
         trieNodes: HexString[];
     };
+    relayParentDescendants?: any[];
 };
 export declare class SetValidationData implements InherentProvider {
     createInherents(newBlock: Block, params: BuildBlockParams): Promise<HexString[]>;

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

@@ -3,12 +3,13 @@ import { hexToU8a, u8aConcat, u8aToHex } from '@polkadot/util';
 import { blake2AsHex, blake2AsU8a } from '@polkadot/util-crypto';
 import _ from 'lodash';
 import { defaultLogger } from '../../../logger.js';
-import { compactHex, getCurrentSlot, getParaId } from '../../../utils/index.js';
+import { compactHex, getCurrentSlot, getParaId, getSlotDuration } from '../../../utils/index.js';
 import { dmqMqcHead, hrmpChannels, hrmpEgressChannelIndex, hrmpIngressChannelIndex, paraHead, upgradeGoAheadSignal, WELL_KNOWN_KEYS } from '../../../utils/proof.js';
 import { createProof, decodeProof } from '../../../wasm-executor/index.js';
 const logger = defaultLogger.child({
     name: 'parachain-validation-data'
 });
+const RELAY_CHAIN_SLOT_DURATION_MILLIS = 6_000;
 const MOCK_VALIDATION_DATA = {
     validationData: {
         relayParentNumber: 1000,
@@ -101,17 +102,14 @@ export class SetValidationData {
         const hrmpIngressChannelIndexKey = hrmpIngressChannelIndex(paraId);
         const hrmpEgressChannelIndexKey = hrmpEgressChannelIndex(paraId);
         const decoded = await decodeProof(extrinsic.validationData.relayParentStorageRoot, extrinsic.relayChainState.trieNodes);
-        const relaySlotIncrease = Math.max(1, meta.consts.timestamp?.minimumPeriod // legacy
-        ?.divn(3000) // relaychain min period
-        ?.toNumber() || meta.consts.aura?.slotDuration // async backing
-        ?.divn(6000) // relaychain block time
-        ?.toNumber() || 1);
+        const slotDuration = await getSlotDuration(newBlock);
+        const relaySlotIncrease = Math.trunc(slotDuration / RELAY_CHAIN_SLOT_DURATION_MILLIS) || 1 // at least increase by 1
+        ;
         for (const key of Object.values(WELL_KNOWN_KEYS)){
             if (key === WELL_KNOWN_KEYS.CURRENT_SLOT) {
                 // increment current slot
                 const relayCurrentSlot = decoded[key] ? meta.registry.createType('Slot', hexToU8a(decoded[key])).toNumber() : await getCurrentSlot(parent) * relaySlotIncrease;
-                const newSlot = meta.registry.createType('Slot', relayCurrentSlot + relaySlotIncrease + 1) // +1 to be safe
-                ;
+                const newSlot = meta.registry.createType('Slot', relayCurrentSlot + relaySlotIncrease);
                 logger.debug({
                     relayCurrentSlot,
                     newSlot: newSlot.toNumber()
@@ -261,6 +259,7 @@ export class SetValidationData {
         }
         const { trieRootHash, nodes } = await createProof(extrinsic.relayChainState.trieNodes, newEntries);
         const argsLengh = meta.tx.parachainSystem.setValidationData.meta.args.length;
+        const relayParentNumber = params.relayParentNumber ?? extrinsic.validationData.relayParentNumber + relaySlotIncrease;
         if (argsLengh === 1) {
             // old version
             const newData = {
@@ -270,7 +269,7 @@ export class SetValidationData {
                 validationData: {
                     ...extrinsic.validationData,
                     relayParentStorageRoot: trieRootHash,
-                    relayParentNumber: params.relayParentNumber ?? extrinsic.validationData.relayParentNumber + relaySlotIncrease
+                    relayParentNumber
                 },
                 relayChainState: {
                     trieNodes: nodes
@@ -282,16 +281,40 @@ export class SetValidationData {
             ];
         } else if (argsLengh === 2) {
             // new 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,
                 validationData: {
                     ...extrinsic.validationData,
                     relayParentStorageRoot: trieRootHash,
-                    relayParentNumber: params.relayParentNumber ?? extrinsic.validationData.relayParentNumber + relaySlotIncrease
+                    relayParentNumber
                 },
                 relayChainState: {
                     trieNodes: nodes
-                }
+                },
+                relayParentDescendants
             };
             const horizontalMessagesArray = Object.entries(horizontalMessages).flatMap(([sender, messages])=>messages.map((msg)=>[
                         sender,

package/dist/esm/rpc/rpc-spec/chainHead_v1.js

@@ -75,6 +75,10 @@ const following = new Map();
             ],
             finalizedBlockRuntime: withRuntime ? await context.chain.head.runtimeVersion : null
         });
+        callback({
+            event: 'bestBlockChanged',
+            bestBlockHash: context.chain.head.hash
+        });
     });
     return id;
 };

package/dist/esm/utils/proof.d.ts

@@ -8,6 +8,7 @@ export declare const WELL_KNOWN_KEYS: {
     TWO_EPOCHS_AGO_RANDOMNESS: HexString;
     CURRENT_SLOT: HexString;
     ACTIVE_CONFIG: HexString;
+    AUTHORITIES: HexString;
 };
 export declare const dmqMqcHead: (paraId: u32) => `0x${string}`;
 export declare const upgradeGoAheadSignal: (paraId: u32) => `0x${string}`;

package/dist/esm/utils/proof.js

@@ -6,7 +6,8 @@ export const WELL_KNOWN_KEYS = {
     ONE_EPOCH_AGO_RANDOMNESS: '0x1cb6f36e027abb2091cfb5110ab5087f7ce678799d3eff024253b90e84927cc6',
     TWO_EPOCHS_AGO_RANDOMNESS: '0x1cb6f36e027abb2091cfb5110ab5087f7a414cb008e0e61e46722aa60abdd672',
     CURRENT_SLOT: '0x1cb6f36e027abb2091cfb5110ab5087f06155b3cd9a8c9e5e9a23fd5dc13a5ed',
-    ACTIVE_CONFIG: '0x06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385'
+    ACTIVE_CONFIG: '0x06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385',
+    AUTHORITIES: '0x1cb6f36e027abb2091cfb5110ab5087f5e0621c4869aa60c02be9adcc98a0d1d'
 };
 const hash = (prefix, suffix)=>{
     return u8aToHex(u8aConcat(hexToU8a(prefix), xxhashAsU8a(suffix, 64), suffix));

package/dist/esm/wasm-executor/index.d.ts

@@ -46,7 +46,7 @@ export interface WasmExecutor {
     runTask: (task: {
         wasm: HexString;
         calls: [string, HexString[]][];
-        mockSignatureHost: boolean;
+        mockSignatureHost: number;
         allowUnresolvedImports: boolean;
         runtimeLogLevel: number;
     }, callback?: JsCallback) => Promise<TaskResponse>;
@@ -65,7 +65,7 @@ export declare const createProof: (nodes: HexString[], updates: [HexString, HexS
     trieRootHash: `0x${string}`;
     nodes: `0x${string}`[];
 }>;
-export declare const runTask: (task: TaskCall, callback?: JsCallback) => Promise<{
+export declare const runTask: (task: TaskCall, callback?: JsCallback, overrideMockSignatureHost?: boolean) => Promise<{
     Call: TaskCallResponse;
 } | {
     Error: string;

package/dist/esm/wasm-executor/index.js

@@ -49,12 +49,13 @@ export const createProof = async (nodes, updates)=>{
     };
 };
 let nextTaskId = 0;
-export const runTask = async (task, callback = emptyTaskHandler)=>{
+export const runTask = async (task, callback = emptyTaskHandler, overrideMockSignatureHost = false)=>{
     const taskId = nextTaskId++;
     const task2 = {
         ...task,
         id: taskId,
-        storageProofSize: task.storageProofSize ?? 0
+        storageProofSize: task.storageProofSize ?? 0,
+        mockSignatureHost: overrideMockSignatureHost ? 2 : task.mockSignatureHost ? 1 : 0
     };
     const worker = await getWorker();
     logger.trace(truncate(task2), `runTask #${taskId}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "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.2",
+    "@acala-network/chopsticks-executor": "1.2.4",
     "@polkadot/rpc-provider": "^16.4.1",
     "@polkadot/types": "^16.4.1",
     "@polkadot/types-codec": "^16.4.1",