@acala-network/chopsticks-core 1.2.2 → 1.2.3

package/dist/cjs/api.d.ts

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

package/dist/cjs/api.js

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

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

@@ -24,6 +24,7 @@ function _interop_require_default(obj) {
 const logger = _logger.defaultLogger.child({
     name: 'parachain-validation-data'
 });
+const RELAY_CHAIN_SLOT_DURATION_MILLIS = 6_000;
 const MOCK_VALIDATION_DATA = {
     validationData: {
         relayParentNumber: 1000,
@@ -116,17 +117,14 @@ class SetValidationData {
         const hrmpIngressChannelIndexKey = (0, _proof.hrmpIngressChannelIndex)(paraId);
         const hrmpEgressChannelIndexKey = (0, _proof.hrmpEgressChannelIndex)(paraId);
         const decoded = await (0, _index1.decodeProof)(extrinsic.validationData.relayParentStorageRoot, extrinsic.relayChainState.trieNodes);
-        const relaySlotIncrease = Math.max(1, meta.consts.timestamp?.minimumPeriod // legacy
-        ?.divn(3000) // relaychain min period
-        ?.toNumber() || meta.consts.aura?.slotDuration // async backing
-        ?.divn(6000) // relaychain block time
-        ?.toNumber() || 1);
+        const slotDuration = await (0, _index.getSlotDuration)(newBlock);
+        const relaySlotIncrease = Math.trunc(slotDuration / RELAY_CHAIN_SLOT_DURATION_MILLIS) || 1 // at least increase by 1
+        ;
         for (const key of Object.values(_proof.WELL_KNOWN_KEYS)){
             if (key === _proof.WELL_KNOWN_KEYS.CURRENT_SLOT) {
                 // increment current slot
                 const relayCurrentSlot = decoded[key] ? meta.registry.createType('Slot', (0, _util.hexToU8a)(decoded[key])).toNumber() : await (0, _index.getCurrentSlot)(parent) * relaySlotIncrease;
-                const newSlot = meta.registry.createType('Slot', relayCurrentSlot + relaySlotIncrease + 1) // +1 to be safe
-                ;
+                const newSlot = meta.registry.createType('Slot', relayCurrentSlot + relaySlotIncrease);
                 logger.debug({
                     relayCurrentSlot,
                     newSlot: newSlot.toNumber()

package/dist/esm/api.d.ts

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

package/dist/esm/api.js

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

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

@@ -3,12 +3,13 @@ import { hexToU8a, u8aConcat, u8aToHex } from '@polkadot/util';
 import { blake2AsHex, blake2AsU8a } from '@polkadot/util-crypto';
 import _ from 'lodash';
 import { defaultLogger } from '../../../logger.js';
-import { compactHex, getCurrentSlot, getParaId } from '../../../utils/index.js';
+import { compactHex, getCurrentSlot, getParaId, getSlotDuration } from '../../../utils/index.js';
 import { dmqMqcHead, hrmpChannels, hrmpEgressChannelIndex, hrmpIngressChannelIndex, paraHead, upgradeGoAheadSignal, WELL_KNOWN_KEYS } from '../../../utils/proof.js';
 import { createProof, decodeProof } from '../../../wasm-executor/index.js';
 const logger = defaultLogger.child({
     name: 'parachain-validation-data'
 });
+const RELAY_CHAIN_SLOT_DURATION_MILLIS = 6_000;
 const MOCK_VALIDATION_DATA = {
     validationData: {
         relayParentNumber: 1000,
@@ -101,17 +102,14 @@ export class SetValidationData {
         const hrmpIngressChannelIndexKey = hrmpIngressChannelIndex(paraId);
         const hrmpEgressChannelIndexKey = hrmpEgressChannelIndex(paraId);
         const decoded = await decodeProof(extrinsic.validationData.relayParentStorageRoot, extrinsic.relayChainState.trieNodes);
-        const relaySlotIncrease = Math.max(1, meta.consts.timestamp?.minimumPeriod // legacy
-        ?.divn(3000) // relaychain min period
-        ?.toNumber() || meta.consts.aura?.slotDuration // async backing
-        ?.divn(6000) // relaychain block time
-        ?.toNumber() || 1);
+        const slotDuration = await getSlotDuration(newBlock);
+        const relaySlotIncrease = Math.trunc(slotDuration / RELAY_CHAIN_SLOT_DURATION_MILLIS) || 1 // at least increase by 1
+        ;
         for (const key of Object.values(WELL_KNOWN_KEYS)){
             if (key === WELL_KNOWN_KEYS.CURRENT_SLOT) {
                 // increment current slot
                 const relayCurrentSlot = decoded[key] ? meta.registry.createType('Slot', hexToU8a(decoded[key])).toNumber() : await getCurrentSlot(parent) * relaySlotIncrease;
-                const newSlot = meta.registry.createType('Slot', relayCurrentSlot + relaySlotIncrease + 1) // +1 to be safe
-                ;
+                const newSlot = meta.registry.createType('Slot', relayCurrentSlot + relaySlotIncrease);
                 logger.debug({
                     relayCurrentSlot,
                     newSlot: newSlot.toNumber()

package/package.json

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