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

package/dist/cjs/blockchain/txpool.js

@@ -102,7 +102,7 @@ var BuildBlockMode;
     /** One block per tx */ BuildBlockMode["Instant"] = "Instant";
     /** Only build when triggered */ BuildBlockMode["Manual"] = "Manual";
 })(BuildBlockMode || (BuildBlockMode = {}));
-var _chain = /*#__PURE__*/ new WeakMap(), _pool = /*#__PURE__*/ new WeakMap(), _ump = /*#__PURE__*/ new WeakMap(), _dmp = /*#__PURE__*/ new WeakMap(), _hrmp = /*#__PURE__*/ new WeakMap(), _mode = /*#__PURE__*/ new WeakMap(), _inherentProvider = /*#__PURE__*/ new WeakMap(), _pendingBlocks = /*#__PURE__*/ new WeakMap(), _isBuilding = /*#__PURE__*/ new WeakMap(), _getSigner = /*#__PURE__*/ new WeakSet(), _maybeBuildBlock = /*#__PURE__*/ new WeakSet(), _batchBuildBlock = /*#__PURE__*/ new WeakMap(), _buildBlockIfNeeded = /*#__PURE__*/ new WeakSet(), _buildBlock = /*#__PURE__*/ new WeakSet();
+var _chain = /*#__PURE__*/ new WeakMap(), _pool = /*#__PURE__*/ new WeakMap(), _ump = /*#__PURE__*/ new WeakMap(), _dmp = /*#__PURE__*/ new WeakMap(), _hrmp = /*#__PURE__*/ new WeakMap(), _mode = /*#__PURE__*/ new WeakMap(), _inherentProviders = /*#__PURE__*/ new WeakMap(), _pendingBlocks = /*#__PURE__*/ new WeakMap(), _isBuilding = /*#__PURE__*/ new WeakMap(), _getSigner = /*#__PURE__*/ new WeakSet(), _maybeBuildBlock = /*#__PURE__*/ new WeakSet(), _batchBuildBlock = /*#__PURE__*/ new WeakMap(), _buildBlockIfNeeded = /*#__PURE__*/ new WeakSet(), _buildBlock = /*#__PURE__*/ new WeakSet();
 class TxPool {
     get pendingExtrinsics() {
         return _class_private_field_get(this, _pool).map(({ extrinsic })=>extrinsic);
@@ -223,7 +223,7 @@ class TxPool {
         }
         return count;
     }
-    constructor(chain, inherentProvider, mode = "Batch"){
+    constructor(chain, inherentProviders, mode = "Batch"){
         _class_private_method_init(this, _getSigner);
         _class_private_method_init(this, _maybeBuildBlock);
         _class_private_method_init(this, _buildBlockIfNeeded);
@@ -252,7 +252,7 @@ class TxPool {
             writable: true,
             value: void 0
         });
-        _class_private_field_init(this, _inherentProvider, {
+        _class_private_field_init(this, _inherentProviders, {
             writable: true,
             value: void 0
         });
@@ -273,7 +273,7 @@ class TxPool {
         });
         _class_private_field_set(this, _chain, chain);
         _class_private_field_set(this, _mode, mode);
-        _class_private_field_set(this, _inherentProvider, inherentProvider);
+        _class_private_field_set(this, _inherentProviders, inherentProviders);
     }
 }
 async function getSigner(extrinsic) {
@@ -314,9 +314,7 @@ async function buildBlock() {
     logger.trace({
         params
     }, 'build block');
-    const head = _class_private_field_get(this, _chain).head;
-    const inherents = await _class_private_field_get(this, _inherentProvider).createInherents(head, params);
-    const [newBlock, pendingExtrinsics] = await (0, _blockbuilder.buildBlock)(head, inherents, params.transactions, params.upwardMessages, {
+    const [newBlock, pendingExtrinsics] = await (0, _blockbuilder.buildBlock)(_class_private_field_get(this, _chain).head, _class_private_field_get(this, _inherentProviders), params, {
         onApplyExtrinsicError: (extrinsic, error)=>{
             this.event.emit(APPLY_EXTRINSIC_ERROR, [
                 extrinsic,
@@ -335,7 +333,7 @@ async function buildBlock() {
                     logger.trace((0, _logger.truncate)(resp.storageDiff), `Apply extrinsic ${phase}`);
             }
         } : undefined
-    }, params.unsafeBlockHeight);
+    });
     for (const extrinsic of pendingExtrinsics){
         _class_private_field_get(this, _pool).push({
             extrinsic,

package/dist/cjs/logger.js

@@ -20,10 +20,16 @@ _export(exports, {
     }
 });
 const _pino = require("pino");
+const level = typeof process === 'object' && process.env.LOG_LEVEL || 'info';
+const hideObject = typeof process === 'object' && !!process.env.LOG_COMPACT || false;
 const pinoLogger = (0, _pino.pino)({
-    level: typeof process === 'object' && process.env.LOG_LEVEL || 'info',
+    level,
     transport: {
-        target: 'pino-pretty'
+        target: 'pino-pretty',
+        options: {
+            ignore: 'pid,hostname',
+            hideObject
+        }
     }
 });
 const defaultLogger = pinoLogger.child({

package/dist/cjs/setup.js

@@ -21,21 +21,21 @@ const _rpcprovider = require("@polkadot/rpc-provider");
 const _util = require("@polkadot/util");
 const _api = require("./api.js");
 const _index = require("./blockchain/index.js");
-const _index1 = require("./blockchain/inherent/index.js");
 const _logger = require("./logger.js");
-const _index2 = require("./index.js");
+const _index1 = require("./index.js");
+const _index2 = require("./blockchain/inherent/index.js");
 const genesisSetup = async (chain, genesis)=>{
     const meta = await chain.head.meta;
     const timestamp = Date.now();
-    await (0, _index2.setStorage)(chain, {
+    await (0, _index1.setStorage)(chain, {
         Timestamp: {
             Now: timestamp
         }
     });
-    const slotDuration = await (0, _index2.getSlotDuration)(chain);
+    const slotDuration = await (0, _index1.getSlotDuration)(chain);
     const currentSlot = Math.floor(timestamp / slotDuration);
     if (meta.consts.babe) {
-        await (0, _index2.setStorage)(chain, {
+        await (0, _index1.setStorage)(chain, {
             Babe: {
                 CurrentSlot: currentSlot
             }
@@ -44,7 +44,7 @@ const genesisSetup = async (chain, genesis)=>{
             '0x0642414245b50103020200001c5fef100000000044cadd14aaefbda13ac8d85e1a6d58be082e7e2f56a4f95a3c612c784aaa4063f5517bf67d93ce633cde2fde7fbcf8ddca80017aaf8cd48436514687c662f60eda0ffa2c4781906416f4e71a196c9783c60c1b83d54c3a29365d03706714570b'
         ];
     } else {
-        await (0, _index2.setStorage)(chain, {
+        await (0, _index1.setStorage)(chain, {
             Aura: {
                 CurrentSlot: currentSlot
             }
@@ -104,16 +104,10 @@ const setup = async (options)=>{
     if (!header) {
         throw new Error(`Cannot find header for ${blockHash}`);
     }
-    const inherents = new _index1.InherentProviders(new _index1.SetTimestamp(), [
-        new _index1.SetValidationData(),
-        new _index1.ParaInherentEnter(),
-        new _index1.SetNimbusAuthorInherent(),
-        new _index1.SetBabeRandomness()
-    ]);
     const chain = new _index.Blockchain({
         api,
         buildBlockMode: options.buildBlockMode,
-        inherentProvider: inherents,
+        inherentProviders: _index2.inherentProviders,
         db: options.db,
         header: {
             hash: blockHash,

package/dist/cjs/utils/decoder.js

@@ -34,7 +34,7 @@ function _interop_require_default(obj) {
     };
 }
 const logger = _logger.defaultLogger.child({
-    module: 'decoder'
+    name: 'decoder'
 });
 const _CACHE = new _lrucache.LRUCache({
     max: 20 /* max 20 registries */ 

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

@@ -23,3 +23,6 @@ export declare const prefixedChildKey: (prefix: HexString, key: HexString) => st
 export declare const isPrefixedChildKey: (key: HexString) => boolean;
 export declare const splitChildKey: (key: HexString) => never[] | [`0x${string}`, `0x${string}`];
 export declare const stripChildPrefix: (key: HexString) => `0x${string}`;
+export declare const getCurrentSlot: (chain: Blockchain) => Promise<number>;
+export declare const getCurrentTimestamp: (chain: Blockchain) => Promise<bigint>;
+export declare const getSlotDuration: (chain: Blockchain) => Promise<number>;

package/dist/cjs/utils/index.js

@@ -27,9 +27,18 @@ _export(exports, {
     fetchKeysToArray: function() {
         return fetchKeysToArray;
     },
+    getCurrentSlot: function() {
+        return getCurrentSlot;
+    },
+    getCurrentTimestamp: function() {
+        return getCurrentTimestamp;
+    },
     getParaId: function() {
         return getParaId;
     },
+    getSlotDuration: function() {
+        return getSlotDuration;
+    },
     isPrefixedChildKey: function() {
         return isPrefixedChildKey;
     },
@@ -47,6 +56,7 @@ _export(exports, {
     }
 });
 const _util = require("@polkadot/util");
+const _index = require("../wasm-executor/index.js");
 const _hex = require("@polkadot/util/hex");
 _export_star(require("./set-storage.js"), exports);
 _export_star(require("./time-travel.js"), exports);
@@ -136,3 +146,28 @@ const stripChildPrefix = (key)=>{
     if (!child) return key;
     return storageKey;
 };
+// use raw key here because some chain did not expose those storage to metadata
+const POTENTIAL_SLOT_KEYS = [
+    '0x1cb6f36e027abb2091cfb5110ab5087f06155b3cd9a8c9e5e9a23fd5dc13a5ed',
+    '0x57f8dc2f5ab09467896f47300f04243806155b3cd9a8c9e5e9a23fd5dc13a5ed',
+    '0xab2a8d5eca218f218c6fda6b1d22bb926bc171ab77f6a731a6e80c34ee1eda19'
+];
+const getCurrentSlot = async (chain)=>{
+    const meta = await chain.head.meta;
+    for (const key of POTENTIAL_SLOT_KEYS){
+        const slotRaw = await chain.head.get(key);
+        if (slotRaw) {
+            return meta.registry.createType('Slot', (0, _util.hexToU8a)(slotRaw)).toNumber();
+        }
+    }
+    throw new Error('Cannot find current slot');
+};
+const getCurrentTimestamp = async (chain)=>{
+    const meta = await chain.head.meta;
+    const timestamp = await chain.head.read('u64', meta.query.timestamp.now);
+    return timestamp?.toBigInt() ?? 0n;
+};
+const getSlotDuration = async (chain)=>{
+    const meta = await chain.head.meta;
+    return meta.consts.babe ? meta.consts.babe.expectedBlockTime.toNumber() : meta.query.aura ? (0, _index.getAuraSlotDuration)(await chain.head.wasm) : 12_000;
+};

package/dist/cjs/utils/time-travel.d.ts

@@ -1,5 +1,2 @@
 import { Blockchain } from '../blockchain/index.js';
-export declare const getCurrentSlot: (chain: Blockchain) => Promise<number>;
-export declare const getCurrentTimestamp: (chain: Blockchain) => Promise<bigint>;
-export declare const getSlotDuration: (chain: Blockchain) => Promise<number>;
 export declare const timeTravel: (chain: Blockchain, timestamp: number) => Promise<void>;

package/dist/cjs/utils/time-travel.js

@@ -2,51 +2,18 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    getCurrentSlot: function() {
-        return getCurrentSlot;
-    },
-    getCurrentTimestamp: function() {
-        return getCurrentTimestamp;
-    },
-    getSlotDuration: function() {
-        return getSlotDuration;
-    },
-    timeTravel: function() {
+Object.defineProperty(exports, "timeTravel", {
+    enumerable: true,
+    get: function() {
         return timeTravel;
     }
 });
 const _util = require("@polkadot/util");
 const _index = require("./index.js");
-const _index1 = require("../wasm-executor/index.js");
 const _setstorage = require("./set-storage.js");
-const getCurrentSlot = async (chain)=>{
-    const meta = await chain.head.meta;
-    // use raw key here because some chain did not expose those storage to metadata
-    const slotRaw = meta.consts.babe ? await chain.head.get('0x1cb6f36e027abb2091cfb5110ab5087f06155b3cd9a8c9e5e9a23fd5dc13a5ed') // babe.currentSlot
-     : await chain.head.get('0x57f8dc2f5ab09467896f47300f04243806155b3cd9a8c9e5e9a23fd5dc13a5ed') // aura.currentSlot
-    ;
-    if (!slotRaw) throw new Error('Cannot find current slot');
-    return meta.registry.createType('Slot', (0, _util.hexToU8a)(slotRaw)).toNumber();
-};
-const getCurrentTimestamp = async (chain)=>{
-    const meta = await chain.head.meta;
-    const timestamp = await chain.head.read('u64', meta.query.timestamp.now);
-    return timestamp?.toBigInt() ?? 0n;
-};
-const getSlotDuration = async (chain)=>{
-    const meta = await chain.head.meta;
-    return meta.consts.babe ? meta.consts.babe.expectedBlockTime.toNumber() : meta.query.aura ? (0, _index1.getAuraSlotDuration)(await chain.head.wasm) : 12_000;
-};
 const timeTravel = async (chain, timestamp)=>{
     const meta = await chain.head.meta;
-    const slotDuration = await getSlotDuration(chain);
+    const slotDuration = await (0, _index.getSlotDuration)(chain);
     const newSlot = Math.floor(timestamp / slotDuration);
     // new timestamp
     const storage = [

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

@@ -1,15 +1,17 @@
 import { Header, TransactionValidityError } from '@polkadot/types/interfaces';
 import { Block } from './block.js';
+import { BuildBlockParams } from './txpool.js';
 import { HexString } from '@polkadot/util/types';
+import { InherentProvider } from './inherent/index.js';
 import { TaskCallResponse } from '../wasm-executor/index.js';
 export declare const newHeader: (head: Block, unsafeBlockHeight?: number) => Promise<Header>;
 export type BuildBlockCallbacks = {
     onApplyExtrinsicError?: (extrinsic: HexString, error: TransactionValidityError) => void;
     onPhaseApplied?: (phase: 'initialize' | 'finalize' | number, resp: TaskCallResponse) => void;
 };
-export declare const buildBlock: (head: Block, inherents: HexString[], extrinsics: HexString[], ump: Record<number, HexString[]>, callbacks?: BuildBlockCallbacks, unsafeBlockHeight?: number) => Promise<[Block, HexString[]]>;
-export declare const dryRunExtrinsic: (head: Block, inherents: HexString[], extrinsic: HexString | {
+export declare const buildBlock: (head: Block, inherentProviders: InherentProvider[], params: BuildBlockParams, callbacks?: BuildBlockCallbacks) => Promise<[Block, HexString[]]>;
+export declare const dryRunExtrinsic: (head: Block, inherentProviders: InherentProvider[], extrinsic: HexString | {
     call: HexString;
     address: string;
-}) => Promise<TaskCallResponse>;
-export declare const dryRunInherents: (head: Block, inherents: HexString[]) => Promise<[HexString, HexString | null][]>;
+}, params: BuildBlockParams) => Promise<TaskCallResponse>;
+export declare const dryRunInherents: (head: Block, inherentProviders: InherentProvider[], params: BuildBlockParams) => Promise<[HexString, HexString | null][]>;

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

@@ -1,9 +1,8 @@
 import { Block } from './block.js';
 import { StorageLayer, StorageValueKind } from './storage-layer.js';
 import { compactAddLength, hexToU8a, stringToHex, u8aConcat } from '@polkadot/util';
-import { compactHex } from '../utils/index.js';
+import { compactHex, getCurrentSlot } from '../utils/index.js';
 import { defaultLogger, truncate } from '../logger.js';
-import { getCurrentSlot } from '../utils/time-travel.js';
 const logger = defaultLogger.child({
     name: 'block-builder'
 });
@@ -103,7 +102,7 @@ export const newHeader = async (head, unsafeBlockHeight)=>{
     });
     return header;
 };
-const initNewBlock = async (head, header, inherents, storageLayer, callback)=>{
+const initNewBlock = async (head, header, inherentProviders, params, storageLayer, callback)=>{
     const blockNumber = header.number.toNumber();
     const hash = `0x${Math.round(Math.random() * 100000000).toString(16).padEnd(64, '0')}`;
     const newBlock = new Block(head.chain, blockNumber, hash, head, {
@@ -131,16 +130,20 @@ const initNewBlock = async (head, header, inherents, storageLayer, callback)=>{
         }
         callback?.onPhaseApplied?.('initialize', resp);
     }
+    const inherents = [];
     const layers = [];
     // apply inherents
-    for (const extrinsic of inherents){
+    for (const inherentProvider of inherentProviders){
         try {
-            const resp = await newBlock.call('BlockBuilder_apply_extrinsic', [
-                extrinsic
-            ]);
+            const extrinsics = await inherentProvider.createInherents(newBlock, params);
+            if (extrinsics.length === 0) {
+                continue;
+            }
+            const resp = await newBlock.call('BlockBuilder_apply_extrinsic', extrinsics);
             const layer = newBlock.pushStorageLayer();
             layer.setAll(resp.storageDiff);
             layers.push(layer);
+            inherents.push(...extrinsics);
             callback?.onPhaseApplied?.(layers.length - 1, resp);
         } catch (e) {
             logger.warn('Failed to apply inherents %o %s', e, e);
@@ -149,18 +152,20 @@ const initNewBlock = async (head, header, inherents, storageLayer, callback)=>{
     }
     return {
         block: newBlock,
-        layers: layers
+        layers,
+        inherents
     };
 };
-export const buildBlock = async (head, inherents, extrinsics, ump, callbacks, unsafeBlockHeight)=>{
+export const buildBlock = async (head, inherentProviders, params, callbacks)=>{
+    const { transactions: extrinsics, upwardMessages: ump, unsafeBlockHeight } = params;
     const registry = await head.registry;
     const header = await newHeader(head, unsafeBlockHeight);
     const newBlockNumber = header.number.toNumber();
     logger.info({
         number: newBlockNumber,
-        extrinsicsCount: extrinsics.length,
+        extrinsics: extrinsics.map(truncate),
         umpCount: Object.keys(ump).length
-    }, `Try building block #${newBlockNumber.toLocaleString()}`);
+    }, `${await head.chain.api.getSystemChain()} building #${newBlockNumber.toLocaleString()}`);
     let layer;
     // apply ump via storage override hack
     if (Object.keys(ump).length > 0) {
@@ -249,7 +254,7 @@ export const buildBlock = async (head, inherents, extrinsics, ump, callbacks, un
             layer.set(compactHex(meta.query.ump.needsDispatch()), needsDispatch.toHex());
         }
     }
-    const { block: newBlock } = await initNewBlock(head, header, inherents, layer);
+    const { block: newBlock, inherents } = await initNewBlock(head, header, inherentProviders, params, layer);
     const pendingExtrinsics = [];
     const includedExtrinsic = [];
     // apply extrinsics
@@ -298,21 +303,21 @@ export const buildBlock = async (head, inherents, extrinsics, ump, callbacks, un
         storageDiff
     });
     logger.info({
-        number: newBlock.number,
+        number: finalBlock.number,
         hash: finalBlock.hash,
         extrinsics: truncate(includedExtrinsic),
-        pendingExtrinsicsCount: pendingExtrinsics.length,
+        pendingExtrinsics: pendingExtrinsics.map(truncate),
         ump: truncate(ump)
-    }, 'Block built');
+    }, `${await head.chain.api.getSystemChain()} new head #${finalBlock.number.toLocaleString()}`);
     return [
         finalBlock,
         pendingExtrinsics
     ];
 };
-export const dryRunExtrinsic = async (head, inherents, extrinsic)=>{
+export const dryRunExtrinsic = async (head, inherentProviders, extrinsic, params)=>{
     const registry = await head.registry;
     const header = await newHeader(head);
-    const { block: newBlock } = await initNewBlock(head, header, inherents);
+    const { block: newBlock } = await initNewBlock(head, header, inherentProviders, params);
     if (typeof extrinsic !== 'string') {
         if (!head.chain.mockSignatureHost) {
             throw new Error('Cannot fake signature because mock signature host is not enabled. Start chain with `mockSignatureHost: true`');
@@ -351,9 +356,9 @@ export const dryRunExtrinsic = async (head, inherents, extrinsic)=>{
         extrinsic
     ]);
 };
-export const dryRunInherents = async (head, inherents)=>{
+export const dryRunInherents = async (head, inherentProviders, params)=>{
     const header = await newHeader(head);
-    const { layers } = await initNewBlock(head, header, inherents);
+    const { layers } = await initNewBlock(head, header, inherentProviders, params);
     const storage = {};
     for (const layer of layers){
         await layer.mergeInto(storage);

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

@@ -17,7 +17,7 @@ export interface Options {
     /** Build block mode. Default to Batch. */
     buildBlockMode?: BuildBlockMode;
     /** Inherent provider, for creating inherents. */
-    inherentProvider: InherentProvider;
+    inherentProviders: InherentProvider[];
     /** Datasource for caching storage and blocks data. */
     db?: Database;
     /** Used to create the initial head. */
@@ -48,7 +48,7 @@ export interface Options {
  * const chain = new Blockchain({
  *  api,
  *  buildBlockMode: BuildBlockMode.Manual,
- *  inherentProvider: inherents,
+ *  inherentProviders,
  *  header: {
  *    hash: blockHash,
  *    number: Number(header.number),
@@ -79,7 +79,7 @@ export declare class Blockchain {
     /**
      * @param options - Options for instantiating the blockchain
      */
-    constructor({ api, buildBlockMode, inherentProvider, db, header, mockSignatureHost, allowUnresolvedImports, runtimeLogLevel, registeredTypes, offchainWorker, maxMemoryBlockCount, }: Options);
+    constructor({ api, buildBlockMode, inherentProviders, db, header, mockSignatureHost, allowUnresolvedImports, runtimeLogLevel, registeredTypes, offchainWorker, maxMemoryBlockCount, }: Options);
     get head(): Block;
     get txPool(): TxPool;
     get runtimeLogLevel(): number;
@@ -163,7 +163,7 @@ export declare class Blockchain {
     /**
      * Get inherents of head.
      */
-    getInherents(): Promise<HexString[]>;
+    getInherents(): InherentProvider[];
     /**
      * Close the db and disconnect api.
      */

package/dist/esm/blockchain/index.js

@@ -23,7 +23,7 @@ const logger = defaultLogger.child({
  * const chain = new Blockchain({
  *  api,
  *  buildBlockMode: BuildBlockMode.Manual,
- *  inherentProvider: inherents,
+ *  inherentProviders,
  *  header: {
  *    hash: blockHash,
  *    number: Number(header.number),
@@ -43,7 +43,7 @@ const logger = defaultLogger.child({
     #runtimeLogLevel;
     /** Polkadot.js custom types registration. */ registeredTypes;
     #txpool;
-    #inherentProvider;
+    #inherentProviders;
     #head;
     #blocksByNumber = new Map();
     #blocksByHash = new Map();
@@ -65,7 +65,7 @@ const logger = defaultLogger.child({
     });
     /**
    * @param options - Options for instantiating the blockchain
-   */ constructor({ api, buildBlockMode, inherentProvider, db, header, mockSignatureHost = false, allowUnresolvedImports = false, runtimeLogLevel = 0, registeredTypes = {}, offchainWorker = false, maxMemoryBlockCount = 500 }){
+   */ constructor({ api, buildBlockMode, inherentProviders, db, header, mockSignatureHost = false, allowUnresolvedImports = false, runtimeLogLevel = 0, registeredTypes = {}, offchainWorker = false, maxMemoryBlockCount = 500 }){
         this.api = api;
         this.db = db;
         this.mockSignatureHost = mockSignatureHost;
@@ -74,8 +74,8 @@ const logger = defaultLogger.child({
         this.registeredTypes = registeredTypes;
         this.#head = new Block(this, header.number, header.hash);
         this.#registerBlock(this.#head);
-        this.#txpool = new TxPool(this, inherentProvider, buildBlockMode);
-        this.#inherentProvider = inherentProvider;
+        this.#txpool = new TxPool(this, inherentProviders, buildBlockMode);
+        this.#inherentProviders = inherentProviders;
         this.headState = new HeadState(this.#head);
         if (offchainWorker) {
             this.offchainWorker = new OffchainWorker();
@@ -311,13 +311,13 @@ const logger = defaultLogger.child({
             throw new Error(`Cannot find block ${at}`);
         }
         const registry = await head.registry;
-        const inherents = await this.#inherentProvider.createInherents(head, {
+        const params = {
             transactions: [],
             downwardMessages: [],
             upwardMessages: [],
             horizontalMessages: {}
-        });
-        const { result, storageDiff } = await dryRunExtrinsic(head, inherents, extrinsic);
+        };
+        const { result, storageDiff } = await dryRunExtrinsic(head, this.#inherentProviders, extrinsic, params);
         const outcome = registry.createType('ApplyExtrinsicResult', result);
         return {
             outcome,
@@ -333,13 +333,13 @@ const logger = defaultLogger.child({
         if (!head) {
             throw new Error(`Cannot find block ${at}`);
         }
-        const inherents = await this.#inherentProvider.createInherents(head, {
+        const params = {
             transactions: [],
             downwardMessages: [],
             upwardMessages: [],
             horizontalMessages: hrmp
-        });
-        return dryRunInherents(head, inherents);
+        };
+        return dryRunInherents(head, this.#inherentProviders, params);
     }
     /**
    * Dry run dmp messages in block `at`.
@@ -350,13 +350,13 @@ const logger = defaultLogger.child({
         if (!head) {
             throw new Error(`Cannot find block ${at}`);
         }
-        const inherents = await this.#inherentProvider.createInherents(head, {
+        const params = {
             transactions: [],
             downwardMessages: dmp,
             upwardMessages: [],
             horizontalMessages: {}
-        });
-        return dryRunInherents(head, inherents);
+        };
+        return dryRunInherents(head, this.#inherentProviders, params);
     }
     /**
    * Dry run ump messages in block `at`.
@@ -392,25 +392,18 @@ const logger = defaultLogger.child({
             ]);
         }
         head.pushStorageLayer().setAll(storageValues);
-        const inherents = await this.#inherentProvider.createInherents(head, {
+        const params = {
             transactions: [],
             downwardMessages: [],
             upwardMessages: [],
             horizontalMessages: {}
-        });
-        return dryRunInherents(head, inherents);
+        };
+        return dryRunInherents(head, this.#inherentProviders, params);
     }
     /**
    * Get inherents of head.
-   */ async getInherents() {
-        await this.api.isReady;
-        const inherents = await this.#inherentProvider.createInherents(this.head, {
-            transactions: [],
-            downwardMessages: [],
-            upwardMessages: [],
-            horizontalMessages: {}
-        });
-        return inherents;
+   */ getInherents() {
+        return this.#inherentProviders;
     }
     /**
    * Close the db and disconnect api.

package/dist/esm/blockchain/inherent/index.d.ts

@@ -1,19 +1,12 @@
 import { Block } from '../block.js';
 import { BuildBlockParams } from '../txpool.js';
 import { HexString } from '@polkadot/util/types';
-export { SetValidationData } from './parachain/validation-data.js';
-export { ParaInherentEnter } from './para-enter.js';
-export { SetBabeRandomness } from './parachain/babe-randomness.js';
-export { SetNimbusAuthorInherent } from './parachain/nimbus-author-inherent.js';
-export interface CreateInherents {
-    createInherents(parent: Block, params: BuildBlockParams): Promise<HexString[]>;
-}
-export type InherentProvider = CreateInherents;
-export declare class SetTimestamp implements InherentProvider {
-    createInherents(parent: Block): Promise<HexString[]>;
-}
-export declare class InherentProviders implements InherentProvider {
-    #private;
-    constructor(base: InherentProvider, providers: CreateInherents[]);
-    createInherents(parent: Block, params: BuildBlockParams): Promise<HexString[]>;
+import { ParaInherentEnter } from './para-enter.js';
+import { SetBabeRandomness } from './parachain/babe-randomness.js';
+import { SetNimbusAuthorInherent } from './parachain/nimbus-author-inherent.js';
+import { SetTimestamp } from './timestamp.js';
+import { SetValidationData } from './parachain/validation-data.js';
+export interface InherentProvider {
+    createInherents(newBlock: Block, params: BuildBlockParams): Promise<HexString[]>;
 }
+export declare const inherentProviders: (ParaInherentEnter | SetBabeRandomness | SetNimbusAuthorInherent | SetTimestamp | SetValidationData)[];

package/dist/esm/blockchain/inherent/index.js

@@ -1,32 +1,12 @@
-import { GenericExtrinsic } from '@polkadot/types';
-import { getCurrentTimestamp, getSlotDuration } from '../../utils/time-travel.js';
-export { SetValidationData } from './parachain/validation-data.js';
-export { ParaInherentEnter } from './para-enter.js';
-export { SetBabeRandomness } from './parachain/babe-randomness.js';
-export { SetNimbusAuthorInherent } from './parachain/nimbus-author-inherent.js';
-export class SetTimestamp {
-    async createInherents(parent) {
-        const meta = await parent.meta;
-        const slotDuration = await getSlotDuration(parent.chain);
-        const currentTimestamp = await getCurrentTimestamp(parent.chain);
-        return [
-            new GenericExtrinsic(meta.registry, meta.tx.timestamp.set(currentTimestamp + BigInt(slotDuration))).toHex()
-        ];
-    }
-}
-export class InherentProviders {
-    #base;
-    #providers;
-    constructor(base, providers){
-        this.#base = base;
-        this.#providers = providers;
-    }
-    async createInherents(parent, params) {
-        const base = await this.#base.createInherents(parent, params);
-        const extra = await Promise.all(this.#providers.map((provider)=>provider.createInherents(parent, params)));
-        return [
-            ...base,
-            ...extra.flat()
-        ];
-    }
-}
+import { ParaInherentEnter } from './para-enter.js';
+import { SetBabeRandomness } from './parachain/babe-randomness.js';
+import { SetNimbusAuthorInherent } from './parachain/nimbus-author-inherent.js';
+import { SetTimestamp } from './timestamp.js';
+import { SetValidationData } from './parachain/validation-data.js';
+export const inherentProviders = [
+    new SetTimestamp(),
+    new SetValidationData(),
+    new ParaInherentEnter(),
+    new SetNimbusAuthorInherent(),
+    new SetBabeRandomness()
+];

package/dist/esm/blockchain/inherent/para-enter.d.ts

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