@dedot/chaintypes 0.0.1-next.f5bf4fc2.1 → 0.1.0

package/kusamaAssetHub/query.d.ts

@@ -1,22 +1,23 @@
-// Generated by @dedot/codegen
+// Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback } from '@dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
 import type {
+  AccountId32,
   AccountId32Like,
   H256,
   Bytes,
   Digest,
   Phase,
   FixedU128,
-  AccountId32,
   BytesLike,
   FixedBytes,
-} from '@dedot/codecs';
+} from 'dedot/codecs';
 import type {
   FrameSystemAccountInfo,
   FrameSupportDispatchPerDispatchClass,
   FrameSystemEventRecord,
   FrameSystemLastRuntimeUpgradeInfo,
+  FrameSystemCodeUpgradeAuthorization,
   CumulusPalletParachainSystemUnincludedSegmentAncestor,
   CumulusPalletParachainSystemUnincludedSegmentSegmentTracker,
   PolkadotPrimitivesV6PersistedValidationData,
@@ -29,29 +30,30 @@ import type {
   PolkadotParachainPrimitivesPrimitivesId,
   PolkadotCorePrimitivesOutboundHrmpMessage,
   SpWeightsWeightV2Weight,
-  CumulusPalletParachainSystemCodeUpgradeAuthorization,
   PalletBalancesAccountData,
   PalletBalancesBalanceLock,
   PalletBalancesReserveData,
   PalletBalancesIdAmount,
   PalletBalancesIdAmount002,
   PalletTransactionPaymentReleases,
+  PalletVestingVestingInfo,
+  PalletVestingReleases,
   PalletCollatorSelectionCandidateInfo,
   AssetHubKusamaRuntimeSessionKeys,
   SpCoreCryptoKeyTypeId,
   SpConsensusAuraSr25519AppSr25519Public,
   SpConsensusSlotsSlot,
-  CumulusPalletXcmpQueueInboundChannelDetails,
   CumulusPalletXcmpQueueOutboundChannelDetails,
   CumulusPalletXcmpQueueQueueConfigData,
   PalletXcmQueryStatus,
-  XcmVersionedMultiLocation,
+  XcmVersionedLocation,
   PalletXcmVersionMigrationStage,
   PalletXcmRemoteLockedFungibleRecord,
   XcmVersionedAssetId,
-  CumulusPalletDmpQueueConfigData,
-  CumulusPalletDmpQueuePageIndexData,
   BpXcmBridgeHubRouterBridgeState,
+  PalletMessageQueueBookState,
+  CumulusPrimitivesCoreAggregateMessageOrigin,
+  PalletMessageQueuePage,
   PalletMultisigMultisig,
   PalletProxyProxyDefinition,
   PalletProxyAnnouncement,
@@ -78,7 +80,7 @@ import type {
   PalletAssetConversionPoolInfo,
 } from './types';
 
-export interface ChainStorage extends GenericChainStorage {
+export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -89,28 +91,28 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo>;
+    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<() => number | undefined>;
+    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -118,7 +120,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<(arg: number) => H256>;
+    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -126,28 +128,28 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<(arg: number) => Bytes>;
+    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<() => number>;
+    number: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<() => H256>;
+    parentHash: GenericStorageQuery<Rv, () => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<() => Digest>;
+    digest: GenericStorageQuery<Rv, () => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -160,14 +162,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<() => number>;
+    eventCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -184,21 +186,21 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>>;
+    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
 
     /**
      * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
      *
      * @param {Callback<FrameSystemLastRuntimeUpgradeInfo | undefined> =} callback
      **/
-    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -206,19 +208,26 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<() => Phase | undefined>;
+    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+
+    /**
+     * `Some` if a code upgrade has been authorized.
+     *
+     * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
+     **/
+    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -234,7 +243,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -244,6 +253,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
+      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -257,7 +267,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<() => Bytes>;
+    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -268,7 +278,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -277,14 +287,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PolkadotPrimitivesV6PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<() => PolkadotPrimitivesV6PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV6PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<() => boolean>;
+    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -293,7 +303,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -306,7 +316,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PolkadotPrimitivesV6UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV6UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV6UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -317,7 +327,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PolkadotPrimitivesV6UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV6UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV6UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -329,7 +339,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -343,6 +353,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
+      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -356,7 +367,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PolkadotPrimitivesV6AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV6AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV6AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -366,7 +377,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -377,6 +388,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
+      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -387,7 +399,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<() => number>;
+    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
 
     /**
      * HRMP watermark that was set in a block.
@@ -396,7 +408,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<() => number>;
+    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
 
     /**
      * HRMP messages that were sent in a block.
@@ -405,7 +417,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -414,21 +426,21 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -436,7 +448,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -444,7 +456,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -452,14 +464,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
-
-    /**
-     * The next authorized upgrade, if there is one.
-     *
-     * @param {Callback<CumulusPalletParachainSystemCodeUpgradeAuthorization | undefined> =} callback
-     **/
-    authorizedUpgrade: GenericStorageQuery<() => CumulusPalletParachainSystemCodeUpgradeAuthorization | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -468,12 +473,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -484,7 +489,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<() => bigint>;
+    now: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -494,12 +499,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<() => boolean>;
+    didUpdate: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -509,12 +514,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -525,14 +530,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<() => bigint>;
+    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<() => bigint>;
+    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -563,7 +568,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData>;
+    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -572,7 +577,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>>;
+    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -580,7 +585,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>>;
+    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -588,7 +593,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesIdAmount>>;
+    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -596,12 +601,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesIdAmount002>> =} callback
      **/
-    freezes: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesIdAmount002>>;
+    freezes: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesIdAmount002>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -611,18 +616,48 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery<Rv>;
+  };
+  /**
+   * Pallet `Vesting`'s storage queries
+   **/
+  vesting: {
+    /**
+     * Information regarding the vesting of a given account.
+     *
+     * @param {AccountId32Like} arg
+     * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
+     **/
+    vesting: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
+      AccountId32
+    >;
+
+    /**
+     * Storage version of the pallet.
+     *
+     * New networks start with latest version, as determined by the genesis build.
+     *
+     * @param {Callback<PalletVestingReleases> =} callback
+     **/
+    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -633,12 +668,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<() => AccountId32 | undefined>;
+    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -649,15 +684,18 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
      * mutually exclusive.
      *
+     * This list is sorted in ascending order by deposit and when the deposits are equal, the least
+     * recently updated is considered greater.
+     *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidates: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidateList: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -665,7 +703,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number>;
+    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -674,7 +712,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<() => number>;
+    desiredCandidates: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -683,12 +721,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<() => bigint>;
+    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -699,14 +737,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<() => Array<AccountId32>>;
+    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<() => number>;
+    currentIndex: GenericStorageQuery<Rv, () => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -714,7 +752,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<() => boolean>;
+    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -722,7 +760,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[AccountId32, AssetHubKusamaRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, AssetHubKusamaRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, AssetHubKusamaRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -733,7 +771,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<() => Array<number>>;
+    disabledValidators: GenericStorageQuery<Rv, () => Array<number>>;
 
     /**
      * The next session keys for a validator.
@@ -741,7 +779,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<AssetHubKusamaRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => AssetHubKusamaRuntimeSessionKeys | undefined>;
+    nextKeys: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => AssetHubKusamaRuntimeSessionKeys | undefined,
+      AccountId32
+    >;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -749,12 +791,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[SpCoreCryptoKeyTypeId, BytesLike]} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    keyOwner: GenericStorageQuery<(arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined>;
+    keyOwner: GenericStorageQuery<
+      Rv,
+      (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
+      [SpCoreCryptoKeyTypeId, Bytes]
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -765,7 +811,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -774,12 +820,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `AuraExt`'s storage queries
@@ -794,7 +840,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current slot paired with a number of authored blocks.
@@ -803,31 +849,30 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    slotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
+    slotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
    **/
   xcmpQueue: {
     /**
-     * Status of the inbound XCMP channels.
+     * The suspended inbound XCMP channels. All others are not suspended.
      *
-     * @param {Callback<Array<CumulusPalletXcmpQueueInboundChannelDetails>> =} callback
-     **/
-    inboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueInboundChannelDetails>>;
-
-    /**
-     * Inbound aggregate XCMP messages. It can only be one per ParaId/block.
+     * This is a `StorageValue` instead of a `StorageMap` since we expect multiple reads per block
+     * to different keys with a one byte payload. The access to `BoundedBTreeSet` will be cached
+     * within the block and therefore only included once in the proof size.
      *
-     * @param {[PolkadotParachainPrimitivesPrimitivesId, number]} arg
-     * @param {Callback<Bytes> =} callback
+     * NOTE: The PoV benchmarking cannot know this and will over-estimate, but the actual proof
+     * will be smaller.
+     *
+     * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpMessages: GenericStorageQuery<(arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes>;
+    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -839,7 +884,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -847,7 +892,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[PolkadotParachainPrimitivesPrimitivesId, number]} arg
      * @param {Callback<Bytes> =} callback
      **/
-    outboundXcmpMessages: GenericStorageQuery<(arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes>;
+    outboundXcmpMessages: GenericStorageQuery<
+      Rv,
+      (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
+      [PolkadotParachainPrimitivesPrimitivesId, number]
+    >;
 
     /**
      * Any signal messages waiting to be sent.
@@ -855,49 +904,25 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {PolkadotParachainPrimitivesPrimitivesId} arg
      * @param {Callback<Bytes> =} callback
      **/
-    signalMessages: GenericStorageQuery<(arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes>;
+    signalMessages: GenericStorageQuery<
+      Rv,
+      (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
+      PolkadotParachainPrimitivesPrimitivesId
+    >;
 
     /**
      * The configuration which controls the dynamics of the outbound queue.
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
-
-    /**
-     * The messages that exceeded max individual message weight budget.
-     *
-     * These message stay in this storage map until they are manually dispatched via
-     * `service_overweight`.
-     *
-     * @param {bigint} arg
-     * @param {Callback<[PolkadotParachainPrimitivesPrimitivesId, number, Bytes] | undefined> =} callback
-     **/
-    overweight: GenericStorageQuery<
-      (arg: bigint) => [PolkadotParachainPrimitivesPrimitivesId, number, Bytes] | undefined
-    >;
-
-    /**
-     * Counter for the related counted storage map
-     *
-     * @param {Callback<number> =} callback
-     **/
-    counterForOverweight: GenericStorageQuery<() => number>;
-
-    /**
-     * The number of overweight messages ever recorded in `Overweight`. Also doubles as the next
-     * available free overweight index.
-     *
-     * @param {Callback<bigint> =} callback
-     **/
-    overweightCount: GenericStorageQuery<() => bigint>;
+    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<() => boolean>;
+    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -905,12 +930,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {PolkadotParachainPrimitivesPrimitivesId} arg
      * @param {Callback<FixedU128> =} callback
      **/
-    deliveryFeeFactor: GenericStorageQuery<(arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128>;
+    deliveryFeeFactor: GenericStorageQuery<
+      Rv,
+      (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
+      PolkadotParachainPrimitivesPrimitivesId
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -921,7 +950,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<() => bigint>;
+    queryCounter: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The ongoing queries.
@@ -929,18 +958,18 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined>;
+    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
      *
-     * Key is the blake2 256 hash of (origin, versioned `MultiAssets`) pair. Value is the number of
+     * Key is the blake2 256 hash of (origin, versioned `Assets`) pair. Value is the number of
      * times this pair has been trapped (usually just 1 if it exists at all).
      *
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<(arg: H256) => number>;
+    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -948,33 +977,43 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
      *
-     * @param {[number, XcmVersionedMultiLocation]} arg
+     * @param {[number, XcmVersionedLocation]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    supportedVersion: GenericStorageQuery<(arg: [number, XcmVersionedMultiLocation]) => number | undefined>;
+    supportedVersion: GenericStorageQuery<
+      Rv,
+      (arg: [number, XcmVersionedLocation]) => number | undefined,
+      [number, XcmVersionedLocation]
+    >;
 
     /**
      * All locations that we have requested version notifications from.
      *
-     * @param {[number, XcmVersionedMultiLocation]} arg
+     * @param {[number, XcmVersionedLocation]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    versionNotifiers: GenericStorageQuery<(arg: [number, XcmVersionedMultiLocation]) => bigint | undefined>;
+    versionNotifiers: GenericStorageQuery<
+      Rv,
+      (arg: [number, XcmVersionedLocation]) => bigint | undefined,
+      [number, XcmVersionedLocation]
+    >;
 
     /**
      * The target locations that are subscribed to our version changes, as well as the most recent
      * of our versions we informed them of.
      *
-     * @param {[number, XcmVersionedMultiLocation]} arg
+     * @param {[number, XcmVersionedLocation]} arg
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      (arg: [number, XcmVersionedMultiLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined
+      Rv,
+      (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
+      [number, XcmVersionedLocation]
     >;
 
     /**
@@ -982,16 +1021,16 @@ export interface ChainStorage extends GenericChainStorage {
      * the `u32` counter is the number of times that a send to the destination has been attempted,
      * which is used as a prioritization.
      *
-     * @param {Callback<Array<[XcmVersionedMultiLocation, number]>> =} callback
+     * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedMultiLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -1000,17 +1039,21 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined
+      Rv,
+      (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
+      [number, AccountId32, XcmVersionedAssetId]
     >;
 
     /**
      * Fungible assets which we know are locked on this chain.
      *
      * @param {AccountId32Like} arg
-     * @param {Callback<Array<[bigint, XcmVersionedMultiLocation]> | undefined> =} callback
+     * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      (arg: AccountId32Like) => Array<[bigint, XcmVersionedMultiLocation]> | undefined
+      Rv,
+      (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
+      AccountId32
     >;
 
     /**
@@ -1018,80 +1061,74 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
-   * Pallet `DmpQueue`'s storage queries
+   * Pallet `ToPolkadotXcmRouter`'s storage queries
    **/
-  dmpQueue: {
+  toPolkadotXcmRouter: {
     /**
-     * The configuration.
+     * Bridge that we are using.
      *
-     * @param {Callback<CumulusPalletDmpQueueConfigData> =} callback
-     **/
-    configuration: GenericStorageQuery<() => CumulusPalletDmpQueueConfigData>;
-
-    /**
-     * The page index.
+     * **bridges-v1** assumptions: all outbound messages through this router are using single lane
+     * and to single remote consensus. If there is some other remote consensus that uses the same
+     * bridge hub, the separate pallet instance shall be used, In `v2` we'll have all required
+     * primitives (lane-id aka bridge-id, derived from XCM locations) to support multiple bridges
+     * by the same pallet instance.
      *
-     * @param {Callback<CumulusPalletDmpQueuePageIndexData> =} callback
+     * @param {Callback<BpXcmBridgeHubRouterBridgeState> =} callback
      **/
-    pageIndex: GenericStorageQuery<() => CumulusPalletDmpQueuePageIndexData>;
+    bridge: GenericStorageQuery<Rv, () => BpXcmBridgeHubRouterBridgeState>;
 
     /**
-     * The queue pages.
-     *
-     * @param {number} arg
-     * @param {Callback<Array<[number, Bytes]>> =} callback
+     * Generic pallet storage query
      **/
-    pages: GenericStorageQuery<(arg: number) => Array<[number, Bytes]>>;
-
+    [storage: string]: GenericStorageQuery<Rv>;
+  };
+  /**
+   * Pallet `MessageQueue`'s storage queries
+   **/
+  messageQueue: {
     /**
-     * The overweight messages.
+     * The index of the first and last (non-empty) pages.
      *
-     * @param {bigint} arg
-     * @param {Callback<[number, Bytes] | undefined> =} callback
+     * @param {CumulusPrimitivesCoreAggregateMessageOrigin} arg
+     * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
-    overweight: GenericStorageQuery<(arg: bigint) => [number, Bytes] | undefined>;
+    bookStateFor: GenericStorageQuery<
+      Rv,
+      (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
+      CumulusPrimitivesCoreAggregateMessageOrigin
+    >;
 
     /**
-     * Counter for the related counted storage map
+     * The origin at which we should begin servicing.
      *
-     * @param {Callback<number> =} callback
+     * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    counterForOverweight: GenericStorageQuery<() => number>;
+    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
-     * Generic pallet storage query
-     **/
-    [storage: string]: GenericStorageQuery;
-  };
-  /**
-   * Pallet `ToPolkadotXcmRouter`'s storage queries
-   **/
-  toPolkadotXcmRouter: {
-    /**
-     * Bridge that we are using.
-     *
-     * **bridges-v1** assumptions: all outbound messages through this router are using single lane
-     * and to single remote consensus. If there is some other remote consensus that uses the same
-     * bridge hub, the separate pallet instance shall be used, In `v2` we'll have all required
-     * primitives (lane-id aka bridge-id, derived from XCM locations) to support multiple bridges
-     * by the same pallet instance.
+     * The map of page indices to pages.
      *
-     * @param {Callback<BpXcmBridgeHubRouterBridgeState> =} callback
+     * @param {[CumulusPrimitivesCoreAggregateMessageOrigin, number]} arg
+     * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
-    bridge: GenericStorageQuery<() => BpXcmBridgeHubRouterBridgeState>;
+    pages: GenericStorageQuery<
+      Rv,
+      (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
+      [CumulusPrimitivesCoreAggregateMessageOrigin, number]
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1103,12 +1140,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[AccountId32Like, FixedBytes<32>]} arg
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
-    multisigs: GenericStorageQuery<(arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined>;
+    multisigs: GenericStorageQuery<
+      Rv,
+      (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
+      [AccountId32, FixedBytes<32>]
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1121,7 +1162,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint]>;
+    proxies: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
+      AccountId32
+    >;
 
     /**
      * The announcements made by the proxy (key).
@@ -1129,12 +1174,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint]>;
+    announcements: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
+      AccountId32
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -1146,7 +1195,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined>;
+    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -1154,7 +1203,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
-    account: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined>;
+    account: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
+      [number, AccountId32]
+    >;
 
     /**
      * Approved balance transfers. First balance is the amount approved for transfer. Second
@@ -1165,7 +1218,9 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined
+      Rv,
+      (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
+      [number, AccountId32, AccountId32]
     >;
 
     /**
@@ -1174,12 +1229,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata>;
+    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Uniques`'s storage queries
@@ -1191,7 +1246,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionDetails | undefined> =} callback
      **/
-    class: GenericStorageQuery<(arg: number) => PalletUniquesCollectionDetails | undefined>;
+    class: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -1199,7 +1254,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined>;
+    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -1208,7 +1263,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[AccountId32Like, number, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    account: GenericStorageQuery<(arg: [AccountId32Like, number, number]) => [] | undefined>;
+    account: GenericStorageQuery<
+      Rv,
+      (arg: [AccountId32Like, number, number]) => [] | undefined,
+      [AccountId32, number, number]
+    >;
 
     /**
      * The collections owned by any given account; set out this way so that collections owned by
@@ -1217,7 +1276,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    classAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined>;
+    classAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -1225,7 +1284,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<PalletUniquesItemDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<(arg: [number, number]) => PalletUniquesItemDetails | undefined>;
+    asset: GenericStorageQuery<Rv, (arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -1233,7 +1292,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionMetadata | undefined> =} callback
      **/
-    classMetadataOf: GenericStorageQuery<(arg: number) => PalletUniquesCollectionMetadata | undefined>;
+    classMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -1241,7 +1300,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
      **/
-    instanceMetadataOf: GenericStorageQuery<(arg: [number, number]) => PalletUniquesItemMetadata | undefined>;
+    instanceMetadataOf: GenericStorageQuery<
+      Rv,
+      (arg: [number, number]) => PalletUniquesItemMetadata | undefined,
+      [number, number]
+    >;
 
     /**
      * Attributes of a collection.
@@ -1249,7 +1312,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number | undefined, BytesLike]} arg
      * @param {Callback<[Bytes, bigint] | undefined> =} callback
      **/
-    attribute: GenericStorageQuery<(arg: [number, number | undefined, BytesLike]) => [Bytes, bigint] | undefined>;
+    attribute: GenericStorageQuery<
+      Rv,
+      (arg: [number, number | undefined, BytesLike]) => [Bytes, bigint] | undefined,
+      [number, number | undefined, Bytes]
+    >;
 
     /**
      * Price of an asset instance.
@@ -1257,7 +1324,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
-    itemPriceOf: GenericStorageQuery<(arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined>;
+    itemPriceOf: GenericStorageQuery<
+      Rv,
+      (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
+      [number, number]
+    >;
 
     /**
      * Keeps track of the number of items a collection might have.
@@ -1265,12 +1336,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    collectionMaxSupply: GenericStorageQuery<(arg: number) => number | undefined>;
+    collectionMaxSupply: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Nfts`'s storage queries
@@ -1282,7 +1353,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionDetails | undefined> =} callback
      **/
-    collection: GenericStorageQuery<(arg: number) => PalletNftsCollectionDetails | undefined>;
+    collection: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -1290,7 +1361,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined>;
+    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -1299,7 +1370,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[AccountId32Like, number, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    account: GenericStorageQuery<(arg: [AccountId32Like, number, number]) => [] | undefined>;
+    account: GenericStorageQuery<
+      Rv,
+      (arg: [AccountId32Like, number, number]) => [] | undefined,
+      [AccountId32, number, number]
+    >;
 
     /**
      * The collections owned by any given account; set out this way so that collections owned by
@@ -1308,7 +1383,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    collectionAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined>;
+    collectionAccount: GenericStorageQuery<
+      Rv,
+      (arg: [AccountId32Like, number]) => [] | undefined,
+      [AccountId32, number]
+    >;
 
     /**
      * The items in existence and their ownership details.
@@ -1318,7 +1397,9 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletNftsBitFlagsCollectionRole | undefined> =} callback
      **/
     collectionRoleOf: GenericStorageQuery<
-      (arg: [number, AccountId32Like]) => PalletNftsBitFlagsCollectionRole | undefined
+      Rv,
+      (arg: [number, AccountId32Like]) => PalletNftsBitFlagsCollectionRole | undefined,
+      [number, AccountId32]
     >;
 
     /**
@@ -1327,7 +1408,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemDetails | undefined> =} callback
      **/
-    item: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemDetails | undefined>;
+    item: GenericStorageQuery<Rv, (arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -1335,7 +1416,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionMetadata | undefined> =} callback
      **/
-    collectionMetadataOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionMetadata | undefined>;
+    collectionMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -1343,7 +1424,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemMetadata | undefined> =} callback
      **/
-    itemMetadataOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemMetadata | undefined>;
+    itemMetadataOf: GenericStorageQuery<
+      Rv,
+      (arg: [number, number]) => PalletNftsItemMetadata | undefined,
+      [number, number]
+    >;
 
     /**
      * Attributes of a collection.
@@ -1352,9 +1437,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<[Bytes, PalletNftsAttributeDeposit] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
+      Rv,
       (
         arg: [number, number | undefined, PalletNftsAttributeNamespace, BytesLike],
-      ) => [Bytes, PalletNftsAttributeDeposit] | undefined
+      ) => [Bytes, PalletNftsAttributeDeposit] | undefined,
+      [number, number | undefined, PalletNftsAttributeNamespace, Bytes]
     >;
 
     /**
@@ -1363,7 +1450,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
-    itemPriceOf: GenericStorageQuery<(arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined>;
+    itemPriceOf: GenericStorageQuery<
+      Rv,
+      (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
+      [number, number]
+    >;
 
     /**
      * Item attribute approvals.
@@ -1371,7 +1462,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    itemAttributesApprovalsOf: GenericStorageQuery<(arg: [number, number]) => Array<AccountId32>>;
+    itemAttributesApprovalsOf: GenericStorageQuery<Rv, (arg: [number, number]) => Array<AccountId32>, [number, number]>;
 
     /**
      * Stores the `CollectionId` that is going to be used for the next collection.
@@ -1379,7 +1470,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextCollectionId: GenericStorageQuery<() => number | undefined>;
+    nextCollectionId: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * Handles all the pending swaps.
@@ -1387,7 +1478,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsPendingSwap | undefined> =} callback
      **/
-    pendingSwapOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsPendingSwap | undefined>;
+    pendingSwapOf: GenericStorageQuery<
+      Rv,
+      (arg: [number, number]) => PalletNftsPendingSwap | undefined,
+      [number, number]
+    >;
 
     /**
      * Config of a collection.
@@ -1395,7 +1490,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionConfig | undefined> =} callback
      **/
-    collectionConfigOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionConfig | undefined>;
+    collectionConfigOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionConfig | undefined, number>;
 
     /**
      * Config of an item.
@@ -1403,12 +1498,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemConfig | undefined> =} callback
      **/
-    itemConfigOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemConfig | undefined>;
+    itemConfigOf: GenericStorageQuery<
+      Rv,
+      (arg: [number, number]) => PalletNftsItemConfig | undefined,
+      [number, number]
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `ForeignAssets`'s storage queries
@@ -1420,7 +1519,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {StagingXcmV3MultilocationMultiLocation} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<(arg: StagingXcmV3MultilocationMultiLocation) => PalletAssetsAssetDetails | undefined>;
+    asset: GenericStorageQuery<
+      Rv,
+      (arg: StagingXcmV3MultilocationMultiLocation) => PalletAssetsAssetDetails | undefined,
+      StagingXcmV3MultilocationMultiLocation
+    >;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -1429,7 +1532,9 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      (arg: [StagingXcmV3MultilocationMultiLocation, AccountId32Like]) => PalletAssetsAssetAccount | undefined
+      Rv,
+      (arg: [StagingXcmV3MultilocationMultiLocation, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
+      [StagingXcmV3MultilocationMultiLocation, AccountId32]
     >;
 
     /**
@@ -1441,9 +1546,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
+      Rv,
       (
         arg: [StagingXcmV3MultilocationMultiLocation, AccountId32Like, AccountId32Like],
-      ) => PalletAssetsApproval | undefined
+      ) => PalletAssetsApproval | undefined,
+      [StagingXcmV3MultilocationMultiLocation, AccountId32, AccountId32]
     >;
 
     /**
@@ -1452,12 +1559,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {StagingXcmV3MultilocationMultiLocation} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<(arg: StagingXcmV3MultilocationMultiLocation) => PalletAssetsAssetMetadata>;
+    metadata: GenericStorageQuery<
+      Rv,
+      (arg: StagingXcmV3MultilocationMultiLocation) => PalletAssetsAssetMetadata,
+      StagingXcmV3MultilocationMultiLocation
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `NftFractionalization`'s storage queries
@@ -1469,12 +1580,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<PalletNftFractionalizationDetails | undefined> =} callback
      **/
-    nftToAsset: GenericStorageQuery<(arg: [number, number]) => PalletNftFractionalizationDetails | undefined>;
+    nftToAsset: GenericStorageQuery<
+      Rv,
+      (arg: [number, number]) => PalletNftFractionalizationDetails | undefined,
+      [number, number]
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `PoolAssets`'s storage queries
@@ -1486,7 +1601,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined>;
+    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -1494,7 +1609,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
-    account: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined>;
+    account: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
+      [number, AccountId32]
+    >;
 
     /**
      * Approved balance transfers. First balance is the amount approved for transfer. Second
@@ -1505,7 +1624,9 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined
+      Rv,
+      (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
+      [number, AccountId32, AccountId32]
     >;
 
     /**
@@ -1514,12 +1635,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata>;
+    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `AssetConversion`'s storage queries
@@ -1533,9 +1654,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletAssetConversionPoolInfo | undefined> =} callback
      **/
     pools: GenericStorageQuery<
+      Rv,
       (
         arg: [StagingXcmV3MultilocationMultiLocation, StagingXcmV3MultilocationMultiLocation],
-      ) => PalletAssetConversionPoolInfo | undefined
+      ) => PalletAssetConversionPoolInfo | undefined,
+      [StagingXcmV3MultilocationMultiLocation, StagingXcmV3MultilocationMultiLocation]
     >;
 
     /**
@@ -1544,11 +1667,11 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextPoolAssetId: GenericStorageQuery<() => number | undefined>;
+    nextPoolAssetId: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
 }