@acala-network/chopsticks-core 0.9.8 → 0.9.9-1

package/dist/cjs/blockchain/inherent/parachain/nimbus-author-inherent.d.ts

@@ -1,6 +1,6 @@
-import { HexString } from '@polkadot/util/types';
 import { Block } from '../../block.js';
 import { BuildBlockParams } from '../../txpool.js';
+import { HexString } from '@polkadot/util/types';
 import { InherentProvider } from '../index.js';
 export declare class SetNimbusAuthorInherent implements InherentProvider {
     createInherents(newBlock: Block, _params: BuildBlockParams): Promise<HexString[]>;

package/dist/cjs/blockchain/inherent/parachain/nimbus-author-inherent.js

@@ -34,6 +34,23 @@ class SetNimbusAuthorInherent {
                 alice
             ]).toHex());
         }
+        if (meta.query.authorityAssignment && meta.query.session) {
+            const session = await newBlock.chain.head.read('u32', meta.query.session.currentIndex);
+            if (session) {
+                // We need to set both the assignemnt for current and next sessions
+                layer.set((0, _index.compactHex)(meta.query.authorityAssignment.collatorContainerChain(session)), meta.registry.createType(`DpCollatorAssignmentAssignedCollatorsPublic`, {
+                    orchestratorChain: [
+                        alice
+                    ]
+                }).toHex());
+                layer.set((0, _index.compactHex)(meta.query.authorityAssignment.collatorContainerChain(session.toBigInt() + 1n)), meta.registry.createType(`DpCollatorAssignmentAssignedCollatorsPublic`, {
+                    orchestratorChain: [
+                        alice
+                    ]
+                }).toHex());
+            }
+            layer.set((0, _index.compactHex)(meta.query.authorNoting.didSetContainerAuthorData()), meta.registry.createType('bool', true).toHex());
+        }
         return [
             new _types.GenericExtrinsic(meta.registry, meta.tx.authorInherent.kickOffAuthorshipValidation()).toHex()
         ];

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

@@ -104,13 +104,28 @@ class SetValidationData {
                 ]);
             }
         }
+        // inject missing hrmpIngressChannel and hrmpEgressChannel
+        const hrmpIngressChannels = meta.registry.createType('Vec<u32>', (0, _util.hexToU8a)(decoded[hrmpIngressChannelIndexKey]));
+        const hrmpEgressChannels = meta.registry.createType('Vec<u32>', (0, _util.hexToU8a)(decoded[hrmpEgressChannelIndexKey]));
+        for(const key in params.horizontalMessages){
+            // order is important
+            const sender = meta.registry.createType('u32', key);
+            if (!hrmpIngressChannels.some((x)=>x.eq(sender))) {
+                const idx = _lodash.default.sortedIndexBy(hrmpIngressChannels, sender, (x)=>x.toNumber());
+                hrmpIngressChannels.splice(idx, 0, sender);
+            }
+            if (!hrmpEgressChannels.some((x)=>x.eq(sender))) {
+                const idx = _lodash.default.sortedIndexBy(hrmpEgressChannels, sender, (x)=>x.toNumber());
+                hrmpEgressChannels.splice(idx, 0, sender);
+            }
+        }
         newEntries.push([
             hrmpIngressChannelIndexKey,
-            decoded[hrmpIngressChannelIndexKey]
+            hrmpIngressChannels.toHex()
         ]);
         newEntries.push([
             hrmpEgressChannelIndexKey,
-            decoded[hrmpEgressChannelIndexKey]
+            hrmpEgressChannels.toHex()
         ]);
         // inject paraHead
         const headData = meta.registry.createType('HeadData', (await parent.header).toHex());
@@ -132,25 +147,26 @@ class SetValidationData {
             dmqMqcHeadKey,
             dmqMqcHeadHash
         ]);
-        const hrmpIngressChannels = meta.registry.createType('Vec<ParaId>', decoded[hrmpIngressChannelIndexKey]).toJSON();
-        const hrmpEgressChannels = meta.registry.createType('Vec<ParaId>', decoded[hrmpEgressChannelIndexKey]).toJSON();
-        const hrmpMessages = {
-            // reset values, we just need the keys
-            ..._lodash.default.mapValues(extrinsic.horizontalMessages, ()=>[]),
-            ...params.horizontalMessages
-        };
         // inject horizontal messages
-        for (const id of hrmpIngressChannels){
-            const messages = hrmpMessages[id];
-            const sender = Number(id);
+        for (const sender of hrmpIngressChannels){
+            // search by number and string just in case key is not a number
+            const messages = params.horizontalMessages[sender.toNumber()] || params.horizontalMessages[sender.toString()] || [];
             const channelId = meta.registry.createType('HrmpChannelId', {
                 sender,
                 receiver: paraId.toNumber()
             });
             const hrmpChannelKey = (0, _proof.hrmpChannels)(channelId);
             const abridgedHrmpRaw = decoded[hrmpChannelKey];
-            if (!abridgedHrmpRaw) throw new Error('Canoot find hrmp channels from validation data');
-            const abridgedHrmp = meta.registry.createType('AbridgedHrmpChannel', (0, _util.hexToU8a)(abridgedHrmpRaw)).toJSON();
+            const abridgedHrmp = abridgedHrmpRaw ? meta.registry.createType('AbridgedHrmpChannel', (0, _util.hexToU8a)(abridgedHrmpRaw)).toJSON() : {
+                maxCapacity: 1000,
+                maxTotalSize: 102400,
+                maxMessageSize: 102400,
+                msgCount: 0,
+                totalSize: 0,
+                mqcHead: 0x0000000000000000000000000000000000000000000000000000000000000000,
+                senderDeposit: 5000000000000,
+                recipientDeposit: 5000000000000
+            };
             const paraMessages = [];
             for (const { data, sentAt: _unused } of messages){
                 // fake relaychain sentAt to make validationData think this msg was sent at previous block
@@ -165,24 +181,31 @@ class SetValidationData {
                     sentAt
                 });
             }
-            horizontalMessages[sender] = paraMessages;
+            horizontalMessages[sender.toNumber()] = paraMessages;
             newEntries.push([
                 hrmpChannelKey,
                 meta.registry.createType('AbridgedHrmpChannel', abridgedHrmp).toHex()
             ]);
         }
         // inject hrmpEgressChannels proof
-        for (const id of hrmpEgressChannels){
-            // const messages = hrmpMessages[id]
-            const receiver = Number(id);
+        for (const receiver of hrmpEgressChannels){
             const channelId = meta.registry.createType('HrmpChannelId', {
                 sender: paraId.toNumber(),
                 receiver
             });
             const hrmpChannelKey = (0, _proof.hrmpChannels)(channelId);
+            const abridgedHrmpRaw = decoded[hrmpChannelKey];
+            const abridgedHrmp = abridgedHrmpRaw ? meta.registry.createType('AbridgedHrmpChannel', (0, _util.hexToU8a)(abridgedHrmpRaw)).toJSON() : {
+                maxCapacity: 1000,
+                maxTotalSize: 102400,
+                maxMessageSize: 102400,
+                msgCount: 0,
+                totalSize: 0,
+                mqcHead: 0x0000000000000000000000000000000000000000000000000000000000000000
+            };
             newEntries.push([
                 hrmpChannelKey,
-                decoded[hrmpChannelKey]
+                meta.registry.createType('AbridgedHrmpChannel', abridgedHrmp).toHex()
             ]);
         }
         const upgradeKey = (0, _proof.upgradeGoAheadSignal)(paraId);

package/dist/cjs/setup.d.ts

@@ -1,5 +1,6 @@
 import '@polkadot/types-codec';
 import { RegisteredTypes } from '@polkadot/types/types';
+import { Api } from './api.js';
 import { Blockchain } from './blockchain/index.js';
 import { BuildBlockMode } from './blockchain/txpool.js';
 import { Database } from './database.js';
@@ -18,4 +19,19 @@ export type SetupOptions = {
     maxMemoryBlockCount?: number;
 };
 export declare const genesisSetup: (chain: Blockchain, genesis: GenesisProvider) => Promise<void>;
+export declare const processOptions: (options: SetupOptions) => Promise<{
+    blockHash: string;
+    api: Api;
+    endpoint?: string | string[] | undefined;
+    block?: string | number | null | undefined;
+    genesis?: GenesisProvider | undefined;
+    buildBlockMode?: BuildBlockMode | undefined;
+    db?: Database | undefined;
+    mockSignatureHost?: boolean | undefined;
+    allowUnresolvedImports?: boolean | undefined;
+    runtimeLogLevel?: number | undefined;
+    registeredTypes?: RegisteredTypes | undefined;
+    offchainWorker?: boolean | undefined;
+    maxMemoryBlockCount?: number | undefined;
+}>;
 export declare const setup: (options: SetupOptions) => Promise<Blockchain>;

package/dist/cjs/setup.js

@@ -12,6 +12,9 @@ _export(exports, {
     genesisSetup: function() {
         return genesisSetup;
     },
+    processOptions: function() {
+        return processOptions;
+    },
     setup: function() {
         return setup;
     }
@@ -63,7 +66,7 @@ const genesisSetup = async (chain, genesis)=>{
     }
     await chain.newBlock();
 };
-const setup = async (options)=>{
+const processOptions = async (options)=>{
     _logger.defaultLogger.debug(options, 'Setup options');
     let provider;
     if (options.genesis) {
@@ -100,28 +103,36 @@ const setup = async (options)=>{
         ...options,
         blockHash
     }, 'Args');
+    return {
+        ...options,
+        blockHash,
+        api
+    };
+};
+const setup = async (options)=>{
+    const { api, blockHash, ...opts } = await processOptions(options);
     const header = await api.getHeader(blockHash);
     if (!header) {
         throw new Error(`Cannot find header for ${blockHash}`);
     }
     const chain = new _index.Blockchain({
         api,
-        buildBlockMode: options.buildBlockMode,
+        buildBlockMode: opts.buildBlockMode,
         inherentProviders: _index2.inherentProviders,
-        db: options.db,
+        db: opts.db,
         header: {
             hash: blockHash,
             number: Number(header.number)
         },
-        mockSignatureHost: options.mockSignatureHost,
-        allowUnresolvedImports: options.allowUnresolvedImports,
-        runtimeLogLevel: options.runtimeLogLevel,
-        registeredTypes: options.registeredTypes || {},
-        offchainWorker: options.offchainWorker,
-        maxMemoryBlockCount: options.maxMemoryBlockCount
+        mockSignatureHost: opts.mockSignatureHost,
+        allowUnresolvedImports: opts.allowUnresolvedImports,
+        runtimeLogLevel: opts.runtimeLogLevel,
+        registeredTypes: opts.registeredTypes || {},
+        offchainWorker: opts.offchainWorker,
+        maxMemoryBlockCount: opts.maxMemoryBlockCount
     });
-    if (options.genesis) {
-        await genesisSetup(chain, options.genesis);
+    if (opts.genesis) {
+        await genesisSetup(chain, opts.genesis);
     }
     return chain;
 };

package/dist/cjs/utils/index.js

@@ -150,6 +150,7 @@ const stripChildPrefix = (key)=>{
 const POTENTIAL_SLOT_KEYS = [
     '0x1cb6f36e027abb2091cfb5110ab5087f06155b3cd9a8c9e5e9a23fd5dc13a5ed',
     '0x57f8dc2f5ab09467896f47300f04243806155b3cd9a8c9e5e9a23fd5dc13a5ed',
+    '0x8985dff79e6002d0deba9ddac46f32a5a70806914c906d747e668a21f9021729',
     '0xab2a8d5eca218f218c6fda6b1d22bb926bc171ab77f6a731a6e80c34ee1eda19'
 ];
 const getCurrentSlot = async (chain)=>{

package/dist/esm/blockchain/inherent/parachain/nimbus-author-inherent.d.ts

@@ -1,6 +1,6 @@
-import { HexString } from '@polkadot/util/types';
 import { Block } from '../../block.js';
 import { BuildBlockParams } from '../../txpool.js';
+import { HexString } from '@polkadot/util/types';
 import { InherentProvider } from '../index.js';
 export declare class SetNimbusAuthorInherent implements InherentProvider {
     createInherents(newBlock: Block, _params: BuildBlockParams): Promise<HexString[]>;

package/dist/esm/blockchain/inherent/parachain/nimbus-author-inherent.js

@@ -25,6 +25,23 @@ export class SetNimbusAuthorInherent {
                 alice
             ]).toHex());
         }
+        if (meta.query.authorityAssignment && meta.query.session) {
+            const session = await newBlock.chain.head.read('u32', meta.query.session.currentIndex);
+            if (session) {
+                // We need to set both the assignemnt for current and next sessions
+                layer.set(compactHex(meta.query.authorityAssignment.collatorContainerChain(session)), meta.registry.createType(`DpCollatorAssignmentAssignedCollatorsPublic`, {
+                    orchestratorChain: [
+                        alice
+                    ]
+                }).toHex());
+                layer.set(compactHex(meta.query.authorityAssignment.collatorContainerChain(session.toBigInt() + 1n)), meta.registry.createType(`DpCollatorAssignmentAssignedCollatorsPublic`, {
+                    orchestratorChain: [
+                        alice
+                    ]
+                }).toHex());
+            }
+            layer.set(compactHex(meta.query.authorNoting.didSetContainerAuthorData()), meta.registry.createType('bool', true).toHex());
+        }
         return [
             new GenericExtrinsic(meta.registry, meta.tx.authorInherent.kickOffAuthorshipValidation()).toHex()
         ];

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

@@ -89,13 +89,28 @@ export class SetValidationData {
                 ]);
             }
         }
+        // inject missing hrmpIngressChannel and hrmpEgressChannel
+        const hrmpIngressChannels = meta.registry.createType('Vec<u32>', hexToU8a(decoded[hrmpIngressChannelIndexKey]));
+        const hrmpEgressChannels = meta.registry.createType('Vec<u32>', hexToU8a(decoded[hrmpEgressChannelIndexKey]));
+        for(const key in params.horizontalMessages){
+            // order is important
+            const sender = meta.registry.createType('u32', key);
+            if (!hrmpIngressChannels.some((x)=>x.eq(sender))) {
+                const idx = _.sortedIndexBy(hrmpIngressChannels, sender, (x)=>x.toNumber());
+                hrmpIngressChannels.splice(idx, 0, sender);
+            }
+            if (!hrmpEgressChannels.some((x)=>x.eq(sender))) {
+                const idx = _.sortedIndexBy(hrmpEgressChannels, sender, (x)=>x.toNumber());
+                hrmpEgressChannels.splice(idx, 0, sender);
+            }
+        }
         newEntries.push([
             hrmpIngressChannelIndexKey,
-            decoded[hrmpIngressChannelIndexKey]
+            hrmpIngressChannels.toHex()
         ]);
         newEntries.push([
             hrmpEgressChannelIndexKey,
-            decoded[hrmpEgressChannelIndexKey]
+            hrmpEgressChannels.toHex()
         ]);
         // inject paraHead
         const headData = meta.registry.createType('HeadData', (await parent.header).toHex());
@@ -117,25 +132,26 @@ export class SetValidationData {
             dmqMqcHeadKey,
             dmqMqcHeadHash
         ]);
-        const hrmpIngressChannels = meta.registry.createType('Vec<ParaId>', decoded[hrmpIngressChannelIndexKey]).toJSON();
-        const hrmpEgressChannels = meta.registry.createType('Vec<ParaId>', decoded[hrmpEgressChannelIndexKey]).toJSON();
-        const hrmpMessages = {
-            // reset values, we just need the keys
-            ..._.mapValues(extrinsic.horizontalMessages, ()=>[]),
-            ...params.horizontalMessages
-        };
         // inject horizontal messages
-        for (const id of hrmpIngressChannels){
-            const messages = hrmpMessages[id];
-            const sender = Number(id);
+        for (const sender of hrmpIngressChannels){
+            // search by number and string just in case key is not a number
+            const messages = params.horizontalMessages[sender.toNumber()] || params.horizontalMessages[sender.toString()] || [];
             const channelId = meta.registry.createType('HrmpChannelId', {
                 sender,
                 receiver: paraId.toNumber()
             });
             const hrmpChannelKey = hrmpChannels(channelId);
             const abridgedHrmpRaw = decoded[hrmpChannelKey];
-            if (!abridgedHrmpRaw) throw new Error('Canoot find hrmp channels from validation data');
-            const abridgedHrmp = meta.registry.createType('AbridgedHrmpChannel', hexToU8a(abridgedHrmpRaw)).toJSON();
+            const abridgedHrmp = abridgedHrmpRaw ? meta.registry.createType('AbridgedHrmpChannel', hexToU8a(abridgedHrmpRaw)).toJSON() : {
+                maxCapacity: 1000,
+                maxTotalSize: 102400,
+                maxMessageSize: 102400,
+                msgCount: 0,
+                totalSize: 0,
+                mqcHead: 0x0000000000000000000000000000000000000000000000000000000000000000,
+                senderDeposit: 5000000000000,
+                recipientDeposit: 5000000000000
+            };
             const paraMessages = [];
             for (const { data, sentAt: _unused } of messages){
                 // fake relaychain sentAt to make validationData think this msg was sent at previous block
@@ -150,24 +166,31 @@ export class SetValidationData {
                     sentAt
                 });
             }
-            horizontalMessages[sender] = paraMessages;
+            horizontalMessages[sender.toNumber()] = paraMessages;
             newEntries.push([
                 hrmpChannelKey,
                 meta.registry.createType('AbridgedHrmpChannel', abridgedHrmp).toHex()
             ]);
         }
         // inject hrmpEgressChannels proof
-        for (const id of hrmpEgressChannels){
-            // const messages = hrmpMessages[id]
-            const receiver = Number(id);
+        for (const receiver of hrmpEgressChannels){
             const channelId = meta.registry.createType('HrmpChannelId', {
                 sender: paraId.toNumber(),
                 receiver
             });
             const hrmpChannelKey = hrmpChannels(channelId);
+            const abridgedHrmpRaw = decoded[hrmpChannelKey];
+            const abridgedHrmp = abridgedHrmpRaw ? meta.registry.createType('AbridgedHrmpChannel', hexToU8a(abridgedHrmpRaw)).toJSON() : {
+                maxCapacity: 1000,
+                maxTotalSize: 102400,
+                maxMessageSize: 102400,
+                msgCount: 0,
+                totalSize: 0,
+                mqcHead: 0x0000000000000000000000000000000000000000000000000000000000000000
+            };
             newEntries.push([
                 hrmpChannelKey,
-                decoded[hrmpChannelKey]
+                meta.registry.createType('AbridgedHrmpChannel', abridgedHrmp).toHex()
             ]);
         }
         const upgradeKey = upgradeGoAheadSignal(paraId);

package/dist/esm/setup.d.ts

@@ -1,5 +1,6 @@
 import '@polkadot/types-codec';
 import { RegisteredTypes } from '@polkadot/types/types';
+import { Api } from './api.js';
 import { Blockchain } from './blockchain/index.js';
 import { BuildBlockMode } from './blockchain/txpool.js';
 import { Database } from './database.js';
@@ -18,4 +19,19 @@ export type SetupOptions = {
     maxMemoryBlockCount?: number;
 };
 export declare const genesisSetup: (chain: Blockchain, genesis: GenesisProvider) => Promise<void>;
+export declare const processOptions: (options: SetupOptions) => Promise<{
+    blockHash: string;
+    api: Api;
+    endpoint?: string | string[] | undefined;
+    block?: string | number | null | undefined;
+    genesis?: GenesisProvider | undefined;
+    buildBlockMode?: BuildBlockMode | undefined;
+    db?: Database | undefined;
+    mockSignatureHost?: boolean | undefined;
+    allowUnresolvedImports?: boolean | undefined;
+    runtimeLogLevel?: number | undefined;
+    registeredTypes?: RegisteredTypes | undefined;
+    offchainWorker?: boolean | undefined;
+    maxMemoryBlockCount?: number | undefined;
+}>;
 export declare const setup: (options: SetupOptions) => Promise<Blockchain>;

package/dist/esm/setup.js

@@ -45,7 +45,7 @@ export const genesisSetup = async (chain, genesis)=>{
     }
     await chain.newBlock();
 };
-export const setup = async (options)=>{
+export const processOptions = async (options)=>{
     defaultLogger.debug(options, 'Setup options');
     let provider;
     if (options.genesis) {
@@ -82,28 +82,36 @@ export const setup = async (options)=>{
         ...options,
         blockHash
     }, 'Args');
+    return {
+        ...options,
+        blockHash,
+        api
+    };
+};
+export const setup = async (options)=>{
+    const { api, blockHash, ...opts } = await processOptions(options);
     const header = await api.getHeader(blockHash);
     if (!header) {
         throw new Error(`Cannot find header for ${blockHash}`);
     }
     const chain = new Blockchain({
         api,
-        buildBlockMode: options.buildBlockMode,
+        buildBlockMode: opts.buildBlockMode,
         inherentProviders,
-        db: options.db,
+        db: opts.db,
         header: {
             hash: blockHash,
             number: Number(header.number)
         },
-        mockSignatureHost: options.mockSignatureHost,
-        allowUnresolvedImports: options.allowUnresolvedImports,
-        runtimeLogLevel: options.runtimeLogLevel,
-        registeredTypes: options.registeredTypes || {},
-        offchainWorker: options.offchainWorker,
-        maxMemoryBlockCount: options.maxMemoryBlockCount
+        mockSignatureHost: opts.mockSignatureHost,
+        allowUnresolvedImports: opts.allowUnresolvedImports,
+        runtimeLogLevel: opts.runtimeLogLevel,
+        registeredTypes: opts.registeredTypes || {},
+        offchainWorker: opts.offchainWorker,
+        maxMemoryBlockCount: opts.maxMemoryBlockCount
     });
-    if (options.genesis) {
-        await genesisSetup(chain, options.genesis);
+    if (opts.genesis) {
+        await genesisSetup(chain, opts.genesis);
     }
     return chain;
 };

package/dist/esm/utils/index.js

@@ -86,6 +86,7 @@ export const stripChildPrefix = (key)=>{
 const POTENTIAL_SLOT_KEYS = [
     '0x1cb6f36e027abb2091cfb5110ab5087f06155b3cd9a8c9e5e9a23fd5dc13a5ed',
     '0x57f8dc2f5ab09467896f47300f04243806155b3cd9a8c9e5e9a23fd5dc13a5ed',
+    '0x8985dff79e6002d0deba9ddac46f32a5a70806914c906d747e668a21f9021729',
     '0xab2a8d5eca218f218c6fda6b1d22bb926bc171ab77f6a731a6e80c34ee1eda19'
 ];
 export const getCurrentSlot = async (chain)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.9.8",
+  "version": "0.9.9-1",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "type": "module",
@@ -12,7 +12,7 @@
     "docs:prep": "typedoc"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.9.8",
+    "@acala-network/chopsticks-executor": "0.9.9-1",
     "@polkadot/rpc-provider": "^10.11.2",
     "@polkadot/types": "^10.11.2",
     "@polkadot/types-codec": "^10.11.2",