@acala-network/chopsticks-core 0.13.2 → 0.14.0

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

@@ -88,7 +88,7 @@ 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 = Math.max(1, meta.consts.timestamp?.minimumPeriod // legacy
+        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
@@ -96,8 +96,8 @@ class SetValidationData {
         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) * slotIncrease;
-                const newSlot = meta.registry.createType('Slot', relayCurrentSlot + slotIncrease);
+                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);
                 newEntries.push([
                     key,
                     (0, _util.u8aToHex)(newSlot.toU8a())
@@ -237,7 +237,7 @@ class SetValidationData {
             validationData: {
                 ...extrinsic.validationData,
                 relayParentStorageRoot: trieRootHash,
-                relayParentNumber: extrinsic.validationData.relayParentNumber + slotIncrease
+                relayParentNumber: extrinsic.validationData.relayParentNumber + relaySlotIncrease
             },
             relayChainState: {
                 trieNodes: nodes

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

@@ -15,7 +15,7 @@ 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);
+        const slotDuration = await (0, _index.getSlotDuration)(newBlock);
         const currentTimestamp = await (0, _index.getCurrentTimestamp)(parent);
         return [
             new _types.GenericExtrinsic(meta.registry, meta.tx.timestamp.set(currentTimestamp + BigInt(slotDuration))).toHex()

package/dist/cjs/utils/index.js

@@ -146,21 +146,7 @@ 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',
-    '0x8985dff79e6002d0deba9ddac46f32a5a70806914c906d747e668a21f9021729',
-    '0xab2a8d5eca218f218c6fda6b1d22bb926bc171ab77f6a731a6e80c34ee1eda19'
-];
 const getCurrentSlot = async (head)=>{
-    const meta = await head.meta;
-    for (const key of POTENTIAL_SLOT_KEYS){
-        const slotRaw = await head.get(key);
-        if (slotRaw) {
-            return meta.registry.createType('Slot', (0, _util.hexToU8a)(slotRaw)).toNumber();
-        }
-    }
     const timestamp = await getCurrentTimestamp(head);
     const slotDuration = await getSlotDuration(head);
     return Math.floor(Number(timestamp / BigInt(slotDuration)));
@@ -172,5 +158,8 @@ const getCurrentTimestamp = async (head)=>{
 };
 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;
+    let slotDuration;
+    slotDuration ??= meta.consts.babe?.expectedBlockTime?.toNumber();
+    slotDuration ??= meta.consts.asyncBacking?.expectedBlockTime?.toNumber();
+    return slotDuration || (0, _index.getAuraSlotDuration)(await head.wasm).catch(()=>12_000);
 };

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

@@ -73,7 +73,7 @@ export class SetValidationData {
         const hrmpIngressChannelIndexKey = hrmpIngressChannelIndex(paraId);
         const hrmpEgressChannelIndexKey = hrmpEgressChannelIndex(paraId);
         const decoded = await decodeProof(extrinsic.validationData.relayParentStorageRoot, extrinsic.relayChainState.trieNodes);
-        const slotIncrease = Math.max(1, meta.consts.timestamp?.minimumPeriod // legacy
+        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
@@ -81,8 +81,8 @@ export class SetValidationData {
         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) * slotIncrease;
-                const newSlot = meta.registry.createType('Slot', relayCurrentSlot + slotIncrease);
+                const relayCurrentSlot = decoded[key] ? meta.registry.createType('Slot', hexToU8a(decoded[key])).toNumber() : await getCurrentSlot(parent) * relaySlotIncrease;
+                const newSlot = meta.registry.createType('Slot', relayCurrentSlot + relaySlotIncrease);
                 newEntries.push([
                     key,
                     u8aToHex(newSlot.toU8a())
@@ -222,7 +222,7 @@ export class SetValidationData {
             validationData: {
                 ...extrinsic.validationData,
                 relayParentStorageRoot: trieRootHash,
-                relayParentNumber: extrinsic.validationData.relayParentNumber + slotIncrease
+                relayParentNumber: extrinsic.validationData.relayParentNumber + relaySlotIncrease
             },
             relayChainState: {
                 trieNodes: nodes

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

@@ -5,7 +5,7 @@ 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);
+        const slotDuration = await getSlotDuration(newBlock);
         const currentTimestamp = await getCurrentTimestamp(parent);
         return [
             new GenericExtrinsic(meta.registry, meta.tx.timestamp.set(currentTimestamp + BigInt(slotDuration))).toHex()

package/dist/esm/utils/index.js

@@ -1,4 +1,4 @@
-import { compactStripLength, hexToU8a, u8aToHex } from '@polkadot/util';
+import { compactStripLength, u8aToHex } from '@polkadot/util';
 import { getAuraSlotDuration } from '../wasm-executor/index.js';
 import { hexAddPrefix, hexStripPrefix } from '@polkadot/util/hex';
 export * from './set-storage.js';
@@ -82,21 +82,7 @@ export 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',
-    '0x8985dff79e6002d0deba9ddac46f32a5a70806914c906d747e668a21f9021729',
-    '0xab2a8d5eca218f218c6fda6b1d22bb926bc171ab77f6a731a6e80c34ee1eda19'
-];
 export const getCurrentSlot = async (head)=>{
-    const meta = await head.meta;
-    for (const key of POTENTIAL_SLOT_KEYS){
-        const slotRaw = await head.get(key);
-        if (slotRaw) {
-            return meta.registry.createType('Slot', hexToU8a(slotRaw)).toNumber();
-        }
-    }
     const timestamp = await getCurrentTimestamp(head);
     const slotDuration = await getSlotDuration(head);
     return Math.floor(Number(timestamp / BigInt(slotDuration)));
@@ -108,5 +94,8 @@ export const getCurrentTimestamp = async (head)=>{
 };
 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;
+    let slotDuration;
+    slotDuration ??= meta.consts.babe?.expectedBlockTime?.toNumber();
+    slotDuration ??= meta.consts.asyncBacking?.expectedBlockTime?.toNumber();
+    return slotDuration || getAuraSlotDuration(await head.wasm).catch(()=>12_000);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.13.2",
+  "version": "0.14.0",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "type": "module",
@@ -11,7 +11,7 @@
     "depcheck": "npx depcheck"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.13.2",
+    "@acala-network/chopsticks-executor": "0.14.0",
     "@polkadot/rpc-provider": "^12.3.1",
     "@polkadot/types": "^12.3.1",
     "@polkadot/types-codec": "^12.3.1",