@acala-network/chopsticks-core 0.10.0 → 0.10.2

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

@@ -1,9 +1,10 @@
-import { Header, TransactionValidityError } from '@polkadot/types/interfaces';
+import { DigestItem, 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 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,6 +18,9 @@ _export(exports, {
     dryRunInherents: function() {
         return dryRunInherents;
     },
+    genesisDigestLogs: function() {
+        return genesisDigestLogs;
+    },
     newHeader: function() {
         return newHeader;
     }
@@ -30,17 +33,53 @@ const _logger = require("../logger.js");
 const logger = _logger.defaultLogger.child({
     name: 'block-builder'
 });
+const genesisDigestLogs = async (head)=>{
+    const meta = await head.meta;
+    const currentSlot = await (0, _index.getCurrentSlot)(head);
+    if (meta.consts.babe) {
+        const newSlot = meta.registry.createType('Slot', currentSlot + 1);
+        const consensusEngine = meta.registry.createType('ConsensusEngineId', 'BABE');
+        const preDigest = meta.registry.createType('RawBabePreDigest', {
+            SecondaryVRF: {
+                authorityIndex: 514,
+                slotNumber: newSlot,
+                vrfOutput: '0x44cadd14aaefbda13ac8d85e1a6d58be082e7e2f56a4f95a3c612c784aaa4063',
+                vrfProof: '0xf5517bf67d93ce633cde2fde7fbcf8ddca80017aaf8cd48436514687c662f60eda0ffa2c4781906416f4e71a196c9783c60c1b83d54c3a29365d03706714570b'
+            }
+        });
+        const digest = meta.registry.createType('DigestItem', {
+            PreRuntime: [
+                consensusEngine,
+                (0, _util.compactAddLength)(preDigest.toU8a())
+            ]
+        });
+        return [
+            digest
+        ];
+    } else {
+        const newSlot = meta.registry.createType('Slot', currentSlot + 1);
+        const consensusEngine = meta.registry.createType('ConsensusEngineId', 'aura');
+        const digest = meta.registry.createType('DigestItem', {
+            PreRuntime: [
+                consensusEngine,
+                (0, _util.compactAddLength)(newSlot.toU8a())
+            ]
+        });
+        return [
+            digest
+        ];
+    }
+};
 const getConsensus = (header)=>{
     if (header.digest.logs.length === 0) return;
-    const preRuntime = header.digest.logs[0].asPreRuntime;
-    const [consensusEngine, slot] = preRuntime;
+    const [consensusEngine, preDigest] = header.digest.logs[0].asPreRuntime;
     return {
         consensusEngine,
-        slot,
+        preDigest,
         rest: header.digest.logs.slice(1)
     };
 };
-const getNewSlot = (digest, slotNumber)=>{
+const babePreDigestSetSlot = (digest, slotNumber)=>{
     if (digest.isPrimary) {
         return {
             primary: {
@@ -70,43 +109,43 @@ const getNewSlot = (digest, slotNumber)=>{
 const newHeader = async (head, unsafeBlockHeight)=>{
     const meta = await head.meta;
     const parentHeader = await head.header;
-    let newLogs = parentHeader.digest.logs;
+    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.chain);
+        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.chain);
-        const digest = meta.registry.createType('RawBabePreDigest', consensus.slot);
-        const newSlot = (0, _util.compactAddLength)(meta.registry.createType('RawBabePreDigest', getNewSlot(digest, slot + 1)).toU8a());
+        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) {

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

@@ -88,12 +88,15 @@ 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 slotIncrease = meta.consts.timestamp.minimumPeriod.divn(3000) // relaychain min period
-        .toNumber();
+        const slotIncrease = 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);
         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.chain) * slotIncrease;
+                const relayCurrentSlot = decoded[key] ? meta.registry.createType('Slot', (0, _util.hexToU8a)(decoded[key])).toNumber() : await (0, _index.getCurrentSlot)(parent) * slotIncrease;
                 const newSlot = meta.registry.createType('Slot', relayCurrentSlot + slotIncrease);
                 newEntries.push([
                     key,

package/dist/cjs/blockchain/inherent/timestamp.js

@@ -15,8 +15,8 @@ class SetTimestamp {
         const parent = await newBlock.parentBlock;
         if (!parent) throw new Error('parent block not found');
         const meta = await parent.meta;
-        const slotDuration = await (0, _index.getSlotDuration)(parent.chain);
-        const currentTimestamp = await (0, _index.getCurrentTimestamp)(parent.chain);
+        const slotDuration = await (0, _index.getSlotDuration)(parent);
+        const currentTimestamp = await (0, _index.getCurrentTimestamp)(parent);
         return [
             new _types.GenericExtrinsic(meta.registry, meta.tx.timestamp.set(currentTimestamp + BigInt(slotDuration))).toHex()
         ];

package/dist/cjs/setup.d.ts

@@ -19,7 +19,6 @@ export type SetupOptions = {
     maxMemoryBlockCount?: number;
     processQueuedMessages?: boolean;
 };
-export declare const genesisSetup: (chain: Blockchain, genesis: GenesisProvider) => Promise<void>;
 export declare const processOptions: (options: SetupOptions) => Promise<{
     blockHash: string;
     api: Api;

package/dist/cjs/setup.js

@@ -9,9 +9,6 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    genesisSetup: function() {
-        return genesisSetup;
-    },
     processOptions: function() {
         return processOptions;
     },
@@ -21,51 +18,10 @@ _export(exports, {
 });
 require("@polkadot/types-codec");
 const _rpcprovider = require("@polkadot/rpc-provider");
-const _util = require("@polkadot/util");
 const _api = require("./api.js");
 const _index = require("./blockchain/index.js");
 const _logger = require("./logger.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, _index1.setStorage)(chain, {
-        Timestamp: {
-            Now: timestamp
-        }
-    });
-    const slotDuration = await (0, _index1.getSlotDuration)(chain);
-    const currentSlot = Math.floor(timestamp / slotDuration);
-    if (meta.consts.babe) {
-        await (0, _index1.setStorage)(chain, {
-            Babe: {
-                CurrentSlot: currentSlot
-            }
-        });
-        genesis.genesisHeaderLogs = [
-            '0x0642414245b50103020200001c5fef100000000044cadd14aaefbda13ac8d85e1a6d58be082e7e2f56a4f95a3c612c784aaa4063f5517bf67d93ce633cde2fde7fbcf8ddca80017aaf8cd48436514687c662f60eda0ffa2c4781906416f4e71a196c9783c60c1b83d54c3a29365d03706714570b'
-        ];
-    } else {
-        await (0, _index1.setStorage)(chain, {
-            Aura: {
-                CurrentSlot: currentSlot
-            }
-        });
-        const newSlot = (0, _util.compactAddLength)(meta.registry.createType('Slot', currentSlot + 1).toU8a());
-        const consensusEngine = meta.registry.createType('ConsensusEngineId', 'aura');
-        const digest = meta.registry.createType('DigestItem', {
-            PreRuntime: [
-                consensusEngine,
-                newSlot
-            ]
-        });
-        genesis.genesisHeaderLogs = [
-            digest.toHex()
-        ];
-    }
-    await chain.newBlock();
-};
+const _index1 = require("./blockchain/inherent/index.js");
 const processOptions = async (options)=>{
     _logger.defaultLogger.debug(options, 'Setup options');
     let provider;
@@ -118,7 +74,7 @@ const setup = async (options)=>{
     const chain = new _index.Blockchain({
         api,
         buildBlockMode: opts.buildBlockMode,
-        inherentProviders: _index2.inherentProviders,
+        inherentProviders: _index1.inherentProviders,
         db: opts.db,
         header: {
             hash: blockHash,
@@ -133,7 +89,8 @@ const setup = async (options)=>{
         processQueuedMessages: opts.processQueuedMessages
     });
     if (opts.genesis) {
-        await genesisSetup(chain, opts.genesis);
+        // build 1st block
+        await chain.newBlock();
     }
     return chain;
 };

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

@@ -1,5 +1,6 @@
 import { HexString } from '@polkadot/util/types';
 import { StorageKey } from '@polkadot/types';
+import { Block } from '../blockchain/block.js';
 import { Blockchain } from '../blockchain/index.js';
 export * from './set-storage.js';
 export * from './time-travel.js';
@@ -23,6 +24,6 @@ export declare const prefixedChildKey: (prefix: HexString, key: HexString) => st
 export declare const isPrefixedChildKey: (key: HexString) => boolean;
 export declare const splitChildKey: (key: HexString) => [`0x${string}`, `0x${string}`] | never[];
 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>;
+export declare const getCurrentSlot: (head: Block) => Promise<number>;
+export declare const getCurrentTimestamp: (head: Block) => Promise<bigint>;
+export declare const getSlotDuration: (head: Block) => Promise<number>;

package/dist/cjs/utils/index.js

@@ -153,22 +153,24 @@ const POTENTIAL_SLOT_KEYS = [
     '0x8985dff79e6002d0deba9ddac46f32a5a70806914c906d747e668a21f9021729',
     '0xab2a8d5eca218f218c6fda6b1d22bb926bc171ab77f6a731a6e80c34ee1eda19'
 ];
-const getCurrentSlot = async (chain)=>{
-    const meta = await chain.head.meta;
+const getCurrentSlot = async (head)=>{
+    const meta = await head.meta;
     for (const key of POTENTIAL_SLOT_KEYS){
-        const slotRaw = await chain.head.get(key);
+        const slotRaw = await head.get(key);
         if (slotRaw) {
             return meta.registry.createType('Slot', (0, _util.hexToU8a)(slotRaw)).toNumber();
         }
     }
-    throw new Error('Cannot find current slot');
+    const timestamp = await getCurrentTimestamp(head);
+    const slotDuration = await getSlotDuration(head);
+    return Math.floor(Number(timestamp / BigInt(slotDuration)));
 };
-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 getCurrentTimestamp = async (head)=>{
+    const meta = await head.meta;
+    const timestamp = await head.read('u64', meta.query.timestamp.now);
+    return timestamp?.toBigInt() ?? BigInt(Date.now());
 };
-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) : meta.consts.asyncBacking ? meta.consts.asyncBacking.expectedBlockTime.toNumber() : 12_000;
+const getSlotDuration = async (head)=>{
+    const meta = await head.meta;
+    return meta.consts.babe ? meta.consts.babe.expectedBlockTime.toNumber() : meta.query.aura ? (0, _index.getAuraSlotDuration)(await head.wasm) : meta.consts.asyncBacking ? meta.consts.asyncBacking.expectedBlockTime.toNumber() : 12_000;
 };

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

@@ -13,7 +13,7 @@ const _index = require("./index.js");
 const _setstorage = require("./set-storage.js");
 const timeTravel = async (chain, timestamp)=>{
     const meta = await chain.head.meta;
-    const slotDuration = await (0, _index.getSlotDuration)(chain);
+    const slotDuration = await (0, _index.getSlotDuration)(chain.head);
     const newSlot = Math.floor(timestamp / slotDuration);
     // new timestamp
     const storage = [

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

@@ -1,9 +1,10 @@
-import { Header, TransactionValidityError } from '@polkadot/types/interfaces';
+import { DigestItem, 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 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

@@ -6,17 +6,53 @@ import { defaultLogger, truncate } from '../logger.js';
 const logger = defaultLogger.child({
     name: 'block-builder'
 });
+export const genesisDigestLogs = async (head)=>{
+    const meta = await head.meta;
+    const currentSlot = await getCurrentSlot(head);
+    if (meta.consts.babe) {
+        const newSlot = meta.registry.createType('Slot', currentSlot + 1);
+        const consensusEngine = meta.registry.createType('ConsensusEngineId', 'BABE');
+        const preDigest = meta.registry.createType('RawBabePreDigest', {
+            SecondaryVRF: {
+                authorityIndex: 514,
+                slotNumber: newSlot,
+                vrfOutput: '0x44cadd14aaefbda13ac8d85e1a6d58be082e7e2f56a4f95a3c612c784aaa4063',
+                vrfProof: '0xf5517bf67d93ce633cde2fde7fbcf8ddca80017aaf8cd48436514687c662f60eda0ffa2c4781906416f4e71a196c9783c60c1b83d54c3a29365d03706714570b'
+            }
+        });
+        const digest = meta.registry.createType('DigestItem', {
+            PreRuntime: [
+                consensusEngine,
+                compactAddLength(preDigest.toU8a())
+            ]
+        });
+        return [
+            digest
+        ];
+    } else {
+        const newSlot = meta.registry.createType('Slot', currentSlot + 1);
+        const consensusEngine = meta.registry.createType('ConsensusEngineId', 'aura');
+        const digest = meta.registry.createType('DigestItem', {
+            PreRuntime: [
+                consensusEngine,
+                compactAddLength(newSlot.toU8a())
+            ]
+        });
+        return [
+            digest
+        ];
+    }
+};
 const getConsensus = (header)=>{
     if (header.digest.logs.length === 0) return;
-    const preRuntime = header.digest.logs[0].asPreRuntime;
-    const [consensusEngine, slot] = preRuntime;
+    const [consensusEngine, preDigest] = header.digest.logs[0].asPreRuntime;
     return {
         consensusEngine,
-        slot,
+        preDigest,
         rest: header.digest.logs.slice(1)
     };
 };
-const getNewSlot = (digest, slotNumber)=>{
+const babePreDigestSetSlot = (digest, slotNumber)=>{
     if (digest.isPrimary) {
         return {
             primary: {
@@ -46,43 +82,43 @@ const getNewSlot = (digest, slotNumber)=>{
 export const newHeader = async (head, unsafeBlockHeight)=>{
     const meta = await head.meta;
     const parentHeader = await head.header;
-    let newLogs = parentHeader.digest.logs;
+    let newLogs = !head.number ? await genesisDigestLogs(head) : parentHeader.digest.logs.toArray();
     const consensus = getConsensus(parentHeader);
     if (consensus?.consensusEngine.isAura) {
-        const slot = await getCurrentSlot(head.chain);
+        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.chain);
-        const digest = meta.registry.createType('RawBabePreDigest', consensus.slot);
-        const newSlot = compactAddLength(meta.registry.createType('RawBabePreDigest', getNewSlot(digest, slot + 1)).toU8a());
+        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) {

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

@@ -73,12 +73,15 @@ export class SetValidationData {
         const hrmpIngressChannelIndexKey = hrmpIngressChannelIndex(paraId);
         const hrmpEgressChannelIndexKey = hrmpEgressChannelIndex(paraId);
         const decoded = await decodeProof(extrinsic.validationData.relayParentStorageRoot, extrinsic.relayChainState.trieNodes);
-        const slotIncrease = meta.consts.timestamp.minimumPeriod.divn(3000) // relaychain min period
-        .toNumber();
+        const slotIncrease = 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);
         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.chain) * slotIncrease;
+                const relayCurrentSlot = decoded[key] ? meta.registry.createType('Slot', hexToU8a(decoded[key])).toNumber() : await getCurrentSlot(parent) * slotIncrease;
                 const newSlot = meta.registry.createType('Slot', relayCurrentSlot + slotIncrease);
                 newEntries.push([
                     key,

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

@@ -5,8 +5,8 @@ export class SetTimestamp {
         const parent = await newBlock.parentBlock;
         if (!parent) throw new Error('parent block not found');
         const meta = await parent.meta;
-        const slotDuration = await getSlotDuration(parent.chain);
-        const currentTimestamp = await getCurrentTimestamp(parent.chain);
+        const slotDuration = await getSlotDuration(parent);
+        const currentTimestamp = await getCurrentTimestamp(parent);
         return [
             new GenericExtrinsic(meta.registry, meta.tx.timestamp.set(currentTimestamp + BigInt(slotDuration))).toHex()
         ];

package/dist/esm/setup.d.ts

@@ -19,7 +19,6 @@ export type SetupOptions = {
     maxMemoryBlockCount?: number;
     processQueuedMessages?: boolean;
 };
-export declare const genesisSetup: (chain: Blockchain, genesis: GenesisProvider) => Promise<void>;
 export declare const processOptions: (options: SetupOptions) => Promise<{
     blockHash: string;
     api: Api;

package/dist/esm/setup.js

@@ -1,50 +1,9 @@
 import '@polkadot/types-codec';
 import { HttpProvider, WsProvider } from '@polkadot/rpc-provider';
-import { compactAddLength } from '@polkadot/util';
 import { Api } from './api.js';
 import { Blockchain } from './blockchain/index.js';
 import { defaultLogger } from './logger.js';
-import { getSlotDuration, setStorage } from './index.js';
 import { inherentProviders } from './blockchain/inherent/index.js';
-export const genesisSetup = async (chain, genesis)=>{
-    const meta = await chain.head.meta;
-    const timestamp = Date.now();
-    await setStorage(chain, {
-        Timestamp: {
-            Now: timestamp
-        }
-    });
-    const slotDuration = await getSlotDuration(chain);
-    const currentSlot = Math.floor(timestamp / slotDuration);
-    if (meta.consts.babe) {
-        await setStorage(chain, {
-            Babe: {
-                CurrentSlot: currentSlot
-            }
-        });
-        genesis.genesisHeaderLogs = [
-            '0x0642414245b50103020200001c5fef100000000044cadd14aaefbda13ac8d85e1a6d58be082e7e2f56a4f95a3c612c784aaa4063f5517bf67d93ce633cde2fde7fbcf8ddca80017aaf8cd48436514687c662f60eda0ffa2c4781906416f4e71a196c9783c60c1b83d54c3a29365d03706714570b'
-        ];
-    } else {
-        await setStorage(chain, {
-            Aura: {
-                CurrentSlot: currentSlot
-            }
-        });
-        const newSlot = compactAddLength(meta.registry.createType('Slot', currentSlot + 1).toU8a());
-        const consensusEngine = meta.registry.createType('ConsensusEngineId', 'aura');
-        const digest = meta.registry.createType('DigestItem', {
-            PreRuntime: [
-                consensusEngine,
-                newSlot
-            ]
-        });
-        genesis.genesisHeaderLogs = [
-            digest.toHex()
-        ];
-    }
-    await chain.newBlock();
-};
 export const processOptions = async (options)=>{
     defaultLogger.debug(options, 'Setup options');
     let provider;
@@ -112,7 +71,8 @@ export const setup = async (options)=>{
         processQueuedMessages: opts.processQueuedMessages
     });
     if (opts.genesis) {
-        await genesisSetup(chain, opts.genesis);
+        // build 1st block
+        await chain.newBlock();
     }
     return chain;
 };

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

@@ -1,5 +1,6 @@
 import { HexString } from '@polkadot/util/types';
 import { StorageKey } from '@polkadot/types';
+import { Block } from '../blockchain/block.js';
 import { Blockchain } from '../blockchain/index.js';
 export * from './set-storage.js';
 export * from './time-travel.js';
@@ -23,6 +24,6 @@ export declare const prefixedChildKey: (prefix: HexString, key: HexString) => st
 export declare const isPrefixedChildKey: (key: HexString) => boolean;
 export declare const splitChildKey: (key: HexString) => [`0x${string}`, `0x${string}`] | never[];
 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>;
+export declare const getCurrentSlot: (head: Block) => Promise<number>;
+export declare const getCurrentTimestamp: (head: Block) => Promise<bigint>;
+export declare const getSlotDuration: (head: Block) => Promise<number>;

package/dist/esm/utils/index.js

@@ -89,22 +89,24 @@ const POTENTIAL_SLOT_KEYS = [
     '0x8985dff79e6002d0deba9ddac46f32a5a70806914c906d747e668a21f9021729',
     '0xab2a8d5eca218f218c6fda6b1d22bb926bc171ab77f6a731a6e80c34ee1eda19'
 ];
-export const getCurrentSlot = async (chain)=>{
-    const meta = await chain.head.meta;
+export const getCurrentSlot = async (head)=>{
+    const meta = await head.meta;
     for (const key of POTENTIAL_SLOT_KEYS){
-        const slotRaw = await chain.head.get(key);
+        const slotRaw = await head.get(key);
         if (slotRaw) {
             return meta.registry.createType('Slot', hexToU8a(slotRaw)).toNumber();
         }
     }
-    throw new Error('Cannot find current slot');
+    const timestamp = await getCurrentTimestamp(head);
+    const slotDuration = await getSlotDuration(head);
+    return Math.floor(Number(timestamp / BigInt(slotDuration)));
 };
-export 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;
+export const getCurrentTimestamp = async (head)=>{
+    const meta = await head.meta;
+    const timestamp = await head.read('u64', meta.query.timestamp.now);
+    return timestamp?.toBigInt() ?? BigInt(Date.now());
 };
-export const getSlotDuration = async (chain)=>{
-    const meta = await chain.head.meta;
-    return meta.consts.babe ? meta.consts.babe.expectedBlockTime.toNumber() : meta.query.aura ? getAuraSlotDuration(await chain.head.wasm) : meta.consts.asyncBacking ? meta.consts.asyncBacking.expectedBlockTime.toNumber() : 12_000;
+export const getSlotDuration = async (head)=>{
+    const meta = await head.meta;
+    return meta.consts.babe ? meta.consts.babe.expectedBlockTime.toNumber() : meta.query.aura ? getAuraSlotDuration(await head.wasm) : meta.consts.asyncBacking ? meta.consts.asyncBacking.expectedBlockTime.toNumber() : 12_000;
 };

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

@@ -3,7 +3,7 @@ import { compactHex, getSlotDuration } from './index.js';
 import { setStorage } from './set-storage.js';
 export const timeTravel = async (chain, timestamp)=>{
     const meta = await chain.head.meta;
-    const slotDuration = await getSlotDuration(chain);
+    const slotDuration = await getSlotDuration(chain.head);
     const newSlot = Math.floor(timestamp / slotDuration);
     // new timestamp
     const storage = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "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.10.0",
+    "@acala-network/chopsticks-executor": "0.10.2",
     "@polkadot/rpc-provider": "^10.11.2",
     "@polkadot/types": "^10.11.2",
     "@polkadot/types-codec": "^10.11.2",