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

package/substrate/query.d.ts

@@ -1,26 +1,27 @@
-// 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,
   FixedBytes,
-  AccountId32,
   FixedU128,
   Perbill,
   Percent,
   BytesLike,
   Data,
   FixedU64,
-} from '@dedot/codecs';
+} from 'dedot/codecs';
 import type {
   FrameSystemAccountInfo,
   FrameSupportDispatchPerDispatchClass,
   FrameSystemEventRecord,
   FrameSystemLastRuntimeUpgradeInfo,
+  FrameSystemCodeUpgradeAuthorization,
   SpConsensusBabeAppPublic,
   SpConsensusSlotsSlot,
   SpConsensusBabeDigestsNextConfigDescriptor,
@@ -30,7 +31,7 @@ import type {
   PalletBalancesBalanceLock,
   PalletBalancesReserveData,
   PalletBalancesIdAmount,
-  PalletBalancesIdAmount002,
+  PalletBalancesIdAmountRuntimeFreezeReason,
   PalletTransactionPaymentReleases,
   PalletElectionProviderMultiPhasePhase,
   PalletElectionProviderMultiPhaseReadySolution,
@@ -43,7 +44,9 @@ import type {
   PalletStakingValidatorPrefs,
   PalletStakingNominations,
   PalletStakingActiveEraInfo,
-  PalletStakingExposure,
+  SpStakingExposure,
+  SpStakingPagedExposureMetadata,
+  SpStakingExposurePage,
   PalletStakingEraRewardPoints,
   PalletStakingForcing,
   PalletStakingUnappliedSlash,
@@ -62,7 +65,9 @@ import type {
   PalletElectionsPhragmenVoter,
   PalletGrandpaStoredState,
   PalletGrandpaStoredPendingChange,
+  SpConsensusGrandpaAppPublic,
   PalletTreasuryProposal,
+  PalletTreasurySpendStatus,
   PalletContractsWasmCodeInfo,
   PalletContractsStorageContractInfo,
   PalletContractsStorageDeletionQueueManager,
@@ -71,6 +76,7 @@ import type {
   SpStakingOffenceOffenceDetails,
   PalletIdentityRegistration,
   PalletIdentityRegistrarInfo,
+  PalletIdentityAuthorityProperties,
   PalletSocietyGroupParams,
   PalletSocietyMemberRecord,
   PalletSocietyPayoutRecord,
@@ -84,6 +90,8 @@ import type {
   PalletVestingVestingInfo,
   PalletVestingReleases,
   PalletSchedulerScheduled,
+  PalletSchedulerRetryConfig,
+  PalletPreimageOldRequestStatus,
   PalletPreimageRequestStatus,
   PalletProxyProxyDefinition,
   PalletProxyAnnouncement,
@@ -94,6 +102,8 @@ import type {
   PalletAssetsAssetAccount,
   PalletAssetsApproval,
   PalletAssetsAssetMetadata,
+  SpConsensusBeefyEcdsaCryptoPublic,
+  SpConsensusBeefyMmrBeefyAuthoritySet,
   PalletLotteryLotteryConfig,
   PalletNisBid,
   PalletNisSummaryRecord,
@@ -137,10 +147,11 @@ import type {
   PalletRankedCollectiveMemberRecord,
   PalletRankedCollectiveVoteRecord,
   PalletAssetConversionPoolInfo,
-  PalletAssetConversionNativeOrAssetId,
+  FrameSupportTokensFungibleUnionOfNativeOrWithId,
   PalletFastUnstakeUnstakeRequest,
   PalletMessageQueueBookState,
   PalletMessageQueuePage,
+  PalletMigrationsMigrationCursor,
   PalletBrokerConfigRecord,
   PalletBrokerScheduleItem,
   PalletBrokerLeaseRecordItem,
@@ -153,9 +164,13 @@ import type {
   PalletBrokerContributionRecord,
   PalletBrokerPoolIoRecord,
   PalletBrokerInstaPoolHistoryRecord,
+  SpMixnetAppPublic,
+  PalletMixnetBoundedMixnode,
+  KitchensinkRuntimeRuntimeParametersValue,
+  KitchensinkRuntimeRuntimeParametersKey,
 } from './types';
 
-export interface ChainStorage extends GenericChainStorage {
+export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -166,28 +181,35 @@ 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>;
+
+    /**
+     * Whether all inherents have been applied.
+     *
+     * @param {Callback<boolean> =} callback
+     **/
+    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * 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.
@@ -195,7 +217,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).
@@ -203,28 +225,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.
@@ -237,14 +259,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
@@ -261,21 +283,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
@@ -283,19 +305,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 `Babe`'s storage queries
@@ -306,14 +335,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    epochIndex: GenericStorageQuery<() => bigint>;
+    epochIndex: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * Current epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * The slot at which the first epoch actually started. This is 0
@@ -321,14 +350,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    genesisSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
+    genesisSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
 
     /**
      * Current slot number.
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
 
     /**
      * The epoch randomness for the *current* epoch.
@@ -344,28 +373,28 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    randomness: GenericStorageQuery<() => FixedBytes<32>>;
+    randomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
 
     /**
      * Pending epoch configuration change that will be applied when the next epoch is enacted.
      *
      * @param {Callback<SpConsensusBabeDigestsNextConfigDescriptor | undefined> =} callback
      **/
-    pendingEpochConfigChange: GenericStorageQuery<() => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
+    pendingEpochConfigChange: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
 
     /**
      * Next epoch randomness.
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    nextRandomness: GenericStorageQuery<() => FixedBytes<32>>;
+    nextRandomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
 
     /**
      * Next epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    nextAuthorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * Randomness under construction.
@@ -380,7 +409,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    segmentIndex: GenericStorageQuery<() => number>;
+    segmentIndex: GenericStorageQuery<Rv, () => number>;
 
     /**
      * TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay.
@@ -388,7 +417,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Array<FixedBytes<32>>> =} callback
      **/
-    underConstruction: GenericStorageQuery<(arg: number) => Array<FixedBytes<32>>>;
+    underConstruction: GenericStorageQuery<Rv, (arg: number) => Array<FixedBytes<32>>, number>;
 
     /**
      * Temporary value (cleared at block finalization) which is `Some`
@@ -396,7 +425,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<SpConsensusBabeDigestsPreDigest | undefined | undefined> =} callback
      **/
-    initialized: GenericStorageQuery<() => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
+    initialized: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
 
     /**
      * This field should always be populated during block processing unless
@@ -406,7 +435,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<FixedBytes<32> | undefined> =} callback
      **/
-    authorVrfRandomness: GenericStorageQuery<() => FixedBytes<32> | undefined>;
+    authorVrfRandomness: GenericStorageQuery<Rv, () => FixedBytes<32> | undefined>;
 
     /**
      * The block numbers when the last and current epoch have started, respectively `N-1` and
@@ -417,7 +446,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<[number, number]> =} callback
      **/
-    epochStart: GenericStorageQuery<() => [number, number]>;
+    epochStart: GenericStorageQuery<Rv, () => [number, number]>;
 
     /**
      * How late the current block is compared to its parent.
@@ -428,7 +457,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    lateness: GenericStorageQuery<() => number>;
+    lateness: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The configuration for the current epoch. Should never be `None` as it is initialized in
@@ -436,7 +465,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    epochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    epochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * The configuration for the next epoch, `None` if the config will not change
@@ -444,7 +473,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    nextEpochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    nextEpochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * A list of the last 100 skipped epochs and the corresponding session index
@@ -458,35 +487,38 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[bigint, number]>> =} callback
      **/
-    skippedEpochs: GenericStorageQuery<() => Array<[bigint, number]>>;
+    skippedEpochs: GenericStorageQuery<Rv, () => Array<[bigint, number]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Timestamp`'s storage queries
    **/
   timestamp: {
     /**
-     * Current time for the current block.
+     * The current time for the current block.
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<() => bigint>;
+    now: GenericStorageQuery<Rv, () => bigint>;
 
     /**
-     * Did the timestamp get updated in this block?
+     * Whether the timestamp has been updated in this block.
+     *
+     * This value is updated to `true` upon successful submission of a timestamp by a node.
+     * It is then checked at the end of each block execution in the `on_finalize` hook.
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<() => boolean>;
+    didUpdate: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -497,12 +529,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 `Indices`'s storage queries
@@ -514,12 +546,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<[AccountId32, bigint, boolean] | undefined> =} callback
      **/
-    accounts: GenericStorageQuery<(arg: number) => [AccountId32, bigint, boolean] | undefined>;
+    accounts: GenericStorageQuery<Rv, (arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -530,14 +562,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.
@@ -568,7 +600,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.
@@ -577,7 +609,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.
@@ -585,7 +617,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.
@@ -593,20 +625,24 @@ 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.
      *
      * @param {AccountId32Like} arg
-     * @param {Callback<Array<PalletBalancesIdAmount002>> =} callback
+     * @param {Callback<Array<PalletBalancesIdAmountRuntimeFreezeReason>> =} callback
      **/
-    freezes: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesIdAmount002>>;
+    freezes: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => Array<PalletBalancesIdAmountRuntimeFreezeReason>,
+      AccountId32
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -616,18 +652,18 @@ 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;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s storage queries
@@ -643,14 +679,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    round: GenericStorageQuery<() => number>;
+    round: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Current phase.
      *
      * @param {Callback<PalletElectionProviderMultiPhasePhase> =} callback
      **/
-    currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiPhasePhase>;
+    currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhasePhase>;
 
     /**
      * Current best solution, signed or unsigned, queued to be returned upon `elect`.
@@ -659,34 +695,37 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletElectionProviderMultiPhaseReadySolution | undefined> =} callback
      **/
-    queuedSolution: GenericStorageQuery<() => PalletElectionProviderMultiPhaseReadySolution | undefined>;
+    queuedSolution: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseReadySolution | undefined>;
 
     /**
      * Snapshot data of the round.
      *
      * This is created at the beginning of the signed phase and cleared upon calling `elect`.
+     * Note: This storage type must only be mutated through [`SnapshotWrapper`].
      *
      * @param {Callback<PalletElectionProviderMultiPhaseRoundSnapshot | undefined> =} callback
      **/
-    snapshot: GenericStorageQuery<() => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
+    snapshot: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
 
     /**
      * Desired number of targets to elect for this round.
      *
      * Only exists when [`Snapshot`] is present.
+     * Note: This storage type must only be mutated through [`SnapshotWrapper`].
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    desiredTargets: GenericStorageQuery<() => number | undefined>;
+    desiredTargets: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The metadata of the [`RoundSnapshot`]
      *
      * Only exists when [`Snapshot`] is present.
+     * Note: This storage type must only be mutated through [`SnapshotWrapper`].
      *
      * @param {Callback<PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined> =} callback
      **/
-    snapshotMetadata: GenericStorageQuery<() => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
+    snapshotMetadata: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
 
     /**
      * The next index to be assigned to an incoming signed submission.
@@ -701,7 +740,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    signedSubmissionNextIndex: GenericStorageQuery<() => number>;
+    signedSubmissionNextIndex: GenericStorageQuery<Rv, () => number>;
 
     /**
      * A sorted, bounded vector of `(score, block_number, index)`, where each `index` points to a
@@ -713,7 +752,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[SpNposElectionsElectionScore, number, number]>> =} callback
      **/
-    signedSubmissionIndices: GenericStorageQuery<() => Array<[SpNposElectionsElectionScore, number, number]>>;
+    signedSubmissionIndices: GenericStorageQuery<Rv, () => Array<[SpNposElectionsElectionScore, number, number]>>;
 
     /**
      * Unchecked, signed solutions.
@@ -728,7 +767,9 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined> =} callback
      **/
     signedSubmissionsMap: GenericStorageQuery<
-      (arg: number) => PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined
+      Rv,
+      (arg: number) => PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined,
+      number
     >;
 
     /**
@@ -739,12 +780,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    minimumUntrustedScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
+    minimumUntrustedScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -755,14 +796,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<() => number>;
+    validatorCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Minimum number of staking participants before emergency conditions are imposed.
      *
      * @param {Callback<number> =} callback
      **/
-    minimumValidatorCount: GenericStorageQuery<() => number>;
+    minimumValidatorCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -771,7 +812,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -781,28 +822,28 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined>;
+    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<() => bigint>;
+    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<() => bigint>;
+    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<() => bigint>;
+    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -811,15 +852,18 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<() => Perbill>;
+    minCommission: GenericStorageQuery<Rv, () => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
      *
+     * Note: All the reads and mutations to this storage *MUST* be done through the methods exposed
+     * by [`StakingLedger`] to ensure data and lock consistency.
+     *
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingStakingLedger | undefined> =} callback
      **/
-    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingStakingLedger | undefined>;
+    ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
 
     /**
      * Where the reward payment should be made. Keyed by stash.
@@ -827,9 +871,9 @@ export interface ChainStorage extends GenericChainStorage {
      * TWOX-NOTE: SAFE since `AccountId` is a secure hash.
      *
      * @param {AccountId32Like} arg
-     * @param {Callback<PalletStakingRewardDestination> =} callback
+     * @param {Callback<PalletStakingRewardDestination | undefined> =} callback
      **/
-    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingRewardDestination>;
+    payee: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -839,14 +883,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingValidatorPrefs>;
+    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<() => number>;
+    counterForValidators: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -855,7 +899,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -881,14 +925,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingNominations | undefined>;
+    nominators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<() => number>;
+    counterForNominators: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -897,7 +941,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The current era index.
@@ -907,7 +951,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<() => number | undefined>;
+    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -917,10 +961,10 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletStakingActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<() => PalletStakingActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<Rv, () => PalletStakingActiveEraInfo | undefined>;
 
     /**
-     * The session index at which the era start for the last `HISTORY_DEPTH` eras.
+     * The session index at which the era start for the last [`Config::HistoryDepth`] eras.
      *
      * Note: This tracks the starting session (i.e. session index when era start being active)
      * for the eras in `[CurrentEra - HISTORY_DEPTH, CurrentEra]`.
@@ -928,85 +972,162 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    erasStartSessionIndex: GenericStorageQuery<(arg: number) => number | undefined>;
+    erasStartSessionIndex: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
 
     /**
      * Exposure of validator at era.
      *
      * This is keyed first by the era index to allow bulk deletion and then the stash account.
      *
-     * Is it removed after `HISTORY_DEPTH` eras.
+     * Is it removed after [`Config::HistoryDepth`] eras.
      * If stakers hasn't been set or has been removed then empty exposure is returned.
      *
+     * Note: Deprecated since v14. Use `EraInfo` instead to work with exposures.
+     *
+     * @param {[number, AccountId32Like]} arg
+     * @param {Callback<SpStakingExposure> =} callback
+     **/
+    erasStakers: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
+
+    /**
+     * Summary of validator exposure at a given era.
+     *
+     * This contains the total stake in support of the validator and their own stake. In addition,
+     * it can also be used to get the number of nominators backing this validator and the number of
+     * exposure pages they are divided into. The page count is useful to determine the number of
+     * pages of rewards that needs to be claimed.
+     *
+     * This is keyed first by the era index to allow bulk deletion and then the stash account.
+     * Should only be accessed through `EraInfo`.
+     *
+     * Is it removed after [`Config::HistoryDepth`] eras.
+     * If stakers hasn't been set or has been removed then empty overview is returned.
+     *
      * @param {[number, AccountId32Like]} arg
-     * @param {Callback<PalletStakingExposure> =} callback
+     * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
-    erasStakers: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletStakingExposure>;
+    erasStakersOverview: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
+      [number, AccountId32]
+    >;
 
     /**
      * Clipped Exposure of validator at era.
      *
+     * Note: This is deprecated, should be used as read-only and will be removed in the future.
+     * New `Exposure`s are stored in a paged manner in `ErasStakersPaged` instead.
+     *
      * This is similar to [`ErasStakers`] but number of nominators exposed is reduced to the
-     * `T::MaxNominatorRewardedPerValidator` biggest stakers.
+     * `T::MaxExposurePageSize` biggest stakers.
      * (Note: the field `total` and `own` of the exposure remains unchanged).
      * This is used to limit the i/o cost for the nominator payout.
      *
      * This is keyed fist by the era index to allow bulk deletion and then the stash account.
      *
-     * Is it removed after `HISTORY_DEPTH` eras.
+     * It is removed after [`Config::HistoryDepth`] eras.
      * If stakers hasn't been set or has been removed then empty exposure is returned.
      *
+     * Note: Deprecated since v14. Use `EraInfo` instead to work with exposures.
+     *
+     * @param {[number, AccountId32Like]} arg
+     * @param {Callback<SpStakingExposure> =} callback
+     **/
+    erasStakersClipped: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => SpStakingExposure,
+      [number, AccountId32]
+    >;
+
+    /**
+     * Paginated exposure of a validator at given era.
+     *
+     * This is keyed first by the era index to allow bulk deletion, then stash account and finally
+     * the page. Should only be accessed through `EraInfo`.
+     *
+     * This is cleared after [`Config::HistoryDepth`] eras.
+     *
+     * @param {[number, AccountId32Like, number]} arg
+     * @param {Callback<SpStakingExposurePage | undefined> =} callback
+     **/
+    erasStakersPaged: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like, number]) => SpStakingExposurePage | undefined,
+      [number, AccountId32, number]
+    >;
+
+    /**
+     * History of claimed paged rewards by era and validator.
+     *
+     * This is keyed by era and validator stash which maps to the set of page indexes which have
+     * been claimed.
+     *
+     * It is removed after [`Config::HistoryDepth`] eras.
+     *
      * @param {[number, AccountId32Like]} arg
-     * @param {Callback<PalletStakingExposure> =} callback
+     * @param {Callback<Array<number>> =} callback
      **/
-    erasStakersClipped: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletStakingExposure>;
+    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Similar to `ErasStakers`, this holds the preferences of validators.
      *
      * This is keyed first by the era index to allow bulk deletion and then the stash account.
      *
-     * Is it removed after `HISTORY_DEPTH` eras.
+     * Is it removed after [`Config::HistoryDepth`] eras.
      *
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
-    erasValidatorPrefs: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs>;
+    erasValidatorPrefs: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs,
+      [number, AccountId32]
+    >;
 
     /**
-     * The total validator era payout for the last `HISTORY_DEPTH` eras.
+     * The total validator era payout for the last [`Config::HistoryDepth`] eras.
      *
      * Eras that haven't finished yet or has been removed doesn't have reward.
      *
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined>;
+    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
 
     /**
-     * Rewards for the last `HISTORY_DEPTH` eras.
+     * Rewards for the last [`Config::HistoryDepth`] eras.
      * If reward hasn't been set or has been removed then 0 reward is returned.
      *
      * @param {number} arg
      * @param {Callback<PalletStakingEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingEraRewardPoints>;
+    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingEraRewardPoints, number>;
 
     /**
-     * The total amount staked for the last `HISTORY_DEPTH` eras.
+     * The total amount staked for the last [`Config::HistoryDepth`] eras.
      * If total hasn't been set or has been removed then 0 stake is returned.
      *
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<(arg: number) => bigint>;
+    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<() => PalletStakingForcing>;
+    forceEra: GenericStorageQuery<Rv, () => PalletStakingForcing>;
+
+    /**
+     * Maximum staked rewards, i.e. the percentage of the era inflation that
+     * is used for stake rewards.
+     * See [Era payout](./index.html#era-payout).
+     *
+     * @param {Callback<Percent | undefined> =} callback
+     **/
+    maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -1015,7 +1136,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<() => Perbill>;
+    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -1023,7 +1144,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<() => bigint>;
+    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * All unapplied slashes that are queued for later.
@@ -1031,7 +1152,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Array<PalletStakingUnappliedSlash>> =} callback
      **/
-    unappliedSlashes: GenericStorageQuery<(arg: number) => Array<PalletStakingUnappliedSlash>>;
+    unappliedSlashes: GenericStorageQuery<Rv, (arg: number) => Array<PalletStakingUnappliedSlash>, number>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -1041,7 +1162,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -1050,7 +1171,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
-    validatorSlashInEra: GenericStorageQuery<(arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined>;
+    validatorSlashInEra: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
+      [number, AccountId32]
+    >;
 
     /**
      * All slashing events on nominators, mapped by era to the highest slash value of the era.
@@ -1058,7 +1183,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    nominatorSlashInEra: GenericStorageQuery<(arg: [number, AccountId32Like]) => bigint | undefined>;
+    nominatorSlashInEra: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => bigint | undefined,
+      [number, AccountId32]
+    >;
 
     /**
      * Slashing spans for stash accounts.
@@ -1066,7 +1195,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingSlashingSlashingSpans | undefined> =} callback
      **/
-    slashingSpans: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined>;
+    slashingSpans: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined,
+      AccountId32
+    >;
 
     /**
      * Records information about the maximum slash of a stash within a slashing span,
@@ -1075,7 +1208,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<PalletStakingSlashingSpanRecord> =} callback
      **/
-    spanSlash: GenericStorageQuery<(arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord>;
+    spanSlash: GenericStorageQuery<
+      Rv,
+      (arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord,
+      [AccountId32, number]
+    >;
 
     /**
      * The last planned session scheduled by the session pallet.
@@ -1084,7 +1221,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    currentPlannedSession: GenericStorageQuery<() => number>;
+    currentPlannedSession: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Indices of validators that have offended in the active era and whether they are currently
@@ -1099,7 +1236,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[number, boolean]>> =} callback
      **/
-    offendingValidators: GenericStorageQuery<() => Array<[number, boolean]>>;
+    offendingValidators: GenericStorageQuery<Rv, () => Array<[number, boolean]>>;
 
     /**
      * The threshold for when users can start calling `chill_other` for other validators /
@@ -1108,12 +1245,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1124,14 +1261,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
@@ -1139,7 +1276,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
@@ -1147,7 +1284,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[AccountId32, KitchensinkRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, KitchensinkRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, KitchensinkRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1158,7 +1295,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.
@@ -1166,7 +1303,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<KitchensinkRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => KitchensinkRuntimeSessionKeys | undefined>;
+    nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => KitchensinkRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1174,12 +1311,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 `Democracy`'s storage queries
@@ -1190,14 +1331,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    publicPropCount: GenericStorageQuery<() => number>;
+    publicPropCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The public proposals. Unsorted. The second item is the proposal.
      *
      * @param {Callback<Array<[number, FrameSupportPreimagesBounded, AccountId32]>> =} callback
      **/
-    publicProps: GenericStorageQuery<() => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
+    publicProps: GenericStorageQuery<Rv, () => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
 
     /**
      * Those who have locked a deposit.
@@ -1207,14 +1348,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<[Array<AccountId32>, bigint] | undefined> =} callback
      **/
-    depositOf: GenericStorageQuery<(arg: number) => [Array<AccountId32>, bigint] | undefined>;
+    depositOf: GenericStorageQuery<Rv, (arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
 
     /**
      * The next free referendum index, aka the number of referenda started so far.
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<() => number>;
+    referendumCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The lowest referendum index representing an unbaked referendum. Equal to
@@ -1222,7 +1363,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    lowestUnbaked: GenericStorageQuery<() => number>;
+    lowestUnbaked: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Information concerning any given referendum.
@@ -1232,7 +1373,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletDemocracyReferendumInfo | undefined> =} callback
      **/
-    referendumInfoOf: GenericStorageQuery<(arg: number) => PalletDemocracyReferendumInfo | undefined>;
+    referendumInfoOf: GenericStorageQuery<Rv, (arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
 
     /**
      * All votes for a particular voter. We store the balance for the number of votes that we
@@ -1243,7 +1384,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDemocracyVoteVoting> =} callback
      **/
-    votingOf: GenericStorageQuery<(arg: AccountId32Like) => PalletDemocracyVoteVoting>;
+    votingOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
 
     /**
      * True if the last referendum tabled was submitted externally. False if it was a public
@@ -1251,7 +1392,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<boolean> =} callback
      **/
-    lastTabledWasExternal: GenericStorageQuery<() => boolean>;
+    lastTabledWasExternal: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * The referendum to be tabled whenever it would be valid to table an external proposal.
@@ -1261,7 +1402,10 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<[FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined> =} callback
      **/
-    nextExternal: GenericStorageQuery<() => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined>;
+    nextExternal: GenericStorageQuery<
+      Rv,
+      () => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined
+    >;
 
     /**
      * A record of who vetoed what. Maps proposal hash to a possible existent block number
@@ -1270,7 +1414,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    blacklist: GenericStorageQuery<(arg: H256) => [number, Array<AccountId32>] | undefined>;
+    blacklist: GenericStorageQuery<Rv, (arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
 
     /**
      * Record of all proposals that have been subject to emergency cancellation.
@@ -1278,11 +1422,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<boolean> =} callback
      **/
-    cancellations: GenericStorageQuery<(arg: H256) => boolean>;
+    cancellations: GenericStorageQuery<Rv, (arg: H256) => boolean, H256>;
 
     /**
      * General information concerning any proposal or referendum.
-     * The `PreimageHash` refers to the preimage of the `Preimages` provider which can be a JSON
+     * The `Hash` refers to the preimage of the `Preimages` provider which can be a JSON
      * dump or IPFS hash of a JSON file.
      *
      * Consider a garbage collection for a metadata of finished referendums to `unrequest` (remove)
@@ -1291,12 +1435,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {PalletDemocracyMetadataOwner} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<(arg: PalletDemocracyMetadataOwner) => H256 | undefined>;
+    metadataOf: GenericStorageQuery<
+      Rv,
+      (arg: PalletDemocracyMetadataOwner) => H256 | undefined,
+      PalletDemocracyMetadataOwner
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Council`'s storage queries
@@ -1307,7 +1455,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<() => Array<H256>>;
+    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -1315,7 +1463,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<KitchensinkRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<(arg: H256) => KitchensinkRuntimeRuntimeCall | undefined>;
+    proposalOf: GenericStorageQuery<Rv, (arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -1323,33 +1471,33 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined>;
+    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<() => number>;
+    proposalCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<() => Array<AccountId32>>;
+    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of absentations.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<() => AccountId32 | undefined>;
+    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `TechnicalCommittee`'s storage queries
@@ -1360,7 +1508,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<() => Array<H256>>;
+    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -1368,7 +1516,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<KitchensinkRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<(arg: H256) => KitchensinkRuntimeRuntimeCall | undefined>;
+    proposalOf: GenericStorageQuery<Rv, (arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -1376,33 +1524,33 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined>;
+    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<() => number>;
+    proposalCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<() => Array<AccountId32>>;
+    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of absentations.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<() => AccountId32 | undefined>;
+    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Elections`'s storage queries
@@ -1415,7 +1563,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<PalletElectionsPhragmenSeatHolder>> =} callback
      **/
-    members: GenericStorageQuery<() => Array<PalletElectionsPhragmenSeatHolder>>;
+    members: GenericStorageQuery<Rv, () => Array<PalletElectionsPhragmenSeatHolder>>;
 
     /**
      * The current reserved runners-up.
@@ -1425,7 +1573,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<PalletElectionsPhragmenSeatHolder>> =} callback
      **/
-    runnersUp: GenericStorageQuery<() => Array<PalletElectionsPhragmenSeatHolder>>;
+    runnersUp: GenericStorageQuery<Rv, () => Array<PalletElectionsPhragmenSeatHolder>>;
 
     /**
      * The present candidate list. A current member or runner-up can never enter this vector
@@ -1437,14 +1585,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[AccountId32, bigint]>> =} callback
      **/
-    candidates: GenericStorageQuery<() => Array<[AccountId32, bigint]>>;
+    candidates: GenericStorageQuery<Rv, () => Array<[AccountId32, bigint]>>;
 
     /**
      * The total number of vote rounds that have happened, excluding the upcoming one.
      *
      * @param {Callback<number> =} callback
      **/
-    electionRounds: GenericStorageQuery<() => number>;
+    electionRounds: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Votes and locked stake of a particular voter.
@@ -1454,12 +1602,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletElectionsPhragmenVoter> =} callback
      **/
-    voting: GenericStorageQuery<(arg: AccountId32Like) => PalletElectionsPhragmenVoter>;
+    voting: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletElectionsPhragmenVoter, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `TechnicalMembership`'s storage queries
@@ -1470,19 +1618,19 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<() => Array<AccountId32>>;
+    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      * The current prime member, if one exists.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<() => AccountId32 | undefined>;
+    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Grandpa`'s storage queries
@@ -1493,28 +1641,28 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletGrandpaStoredState> =} callback
      **/
-    state: GenericStorageQuery<() => PalletGrandpaStoredState>;
+    state: GenericStorageQuery<Rv, () => PalletGrandpaStoredState>;
 
     /**
      * Pending change: (signaled at, scheduled change).
      *
      * @param {Callback<PalletGrandpaStoredPendingChange | undefined> =} callback
      **/
-    pendingChange: GenericStorageQuery<() => PalletGrandpaStoredPendingChange | undefined>;
+    pendingChange: GenericStorageQuery<Rv, () => PalletGrandpaStoredPendingChange | undefined>;
 
     /**
      * next block number where we can force a change.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextForced: GenericStorageQuery<() => number | undefined>;
+    nextForced: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * `true` if we are currently stalled.
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    stalled: GenericStorageQuery<() => [number, number] | undefined>;
+    stalled: GenericStorageQuery<Rv, () => [number, number] | undefined>;
 
     /**
      * The number of changes (both in terms of keys and underlying economic responsibilities)
@@ -1522,7 +1670,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    currentSetId: GenericStorageQuery<() => bigint>;
+    currentSetId: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * A mapping from grandpa set ID to the index of the *most recent* session for which its
@@ -1539,12 +1687,19 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined>;
+    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+
+    /**
+     * The current list of authorities.
+     *
+     * @param {Callback<Array<[SpConsensusGrandpaAppPublic, bigint]>> =} callback
+     **/
+    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -1555,7 +1710,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<() => number>;
+    proposalCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Proposals that have been made.
@@ -1563,26 +1718,41 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined>;
+    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<() => bigint>;
+    deactivated: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * Proposal indices that have been approved but not yet awarded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<() => Array<number>>;
+    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+
+    /**
+     * The count of spends that have been made.
+     *
+     * @param {Callback<number> =} callback
+     **/
+    spendCount: GenericStorageQuery<Rv, () => number>;
+
+    /**
+     * Spends that have been approved and being processed.
+     *
+     * @param {number} arg
+     * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
+     **/
+    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `AssetRate`'s storage queries
@@ -1596,12 +1766,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
-    conversionRateToNative: GenericStorageQuery<(arg: number) => FixedU128 | undefined>;
+    conversionRateToNative: GenericStorageQuery<Rv, (arg: number) => FixedU128 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Contracts`'s storage queries
@@ -1613,7 +1783,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined>;
+    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
 
     /**
      * A mapping from a contract's code hash to its code info.
@@ -1621,7 +1791,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<PalletContractsWasmCodeInfo | undefined> =} callback
      **/
-    codeInfoOf: GenericStorageQuery<(arg: H256) => PalletContractsWasmCodeInfo | undefined>;
+    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletContractsWasmCodeInfo | undefined, H256>;
 
     /**
      * This is a **monotonic** counter incremented on contract instantiation.
@@ -1649,7 +1819,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    nonce: GenericStorageQuery<() => bigint>;
+    nonce: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The code associated with a given account.
@@ -1659,7 +1829,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletContractsStorageContractInfo | undefined> =} callback
      **/
-    contractInfoOf: GenericStorageQuery<(arg: AccountId32Like) => PalletContractsStorageContractInfo | undefined>;
+    contractInfoOf: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => PalletContractsStorageContractInfo | undefined,
+      AccountId32
+    >;
 
     /**
      * Evicted contracts that await child trie deletion.
@@ -1670,7 +1844,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    deletionQueue: GenericStorageQuery<(arg: number) => Bytes | undefined>;
+    deletionQueue: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
 
     /**
      * A pair of monotonic counters used to track the latest contract marked for deletion
@@ -1678,7 +1852,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletContractsStorageDeletionQueueManager> =} callback
      **/
-    deletionQueueCounter: GenericStorageQuery<() => PalletContractsStorageDeletionQueueManager>;
+    deletionQueueCounter: GenericStorageQuery<Rv, () => PalletContractsStorageDeletionQueueManager>;
 
     /**
      * A migration can span across multiple blocks. This storage defines a cursor to track the
@@ -1686,12 +1860,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    migrationInProgress: GenericStorageQuery<() => Bytes | undefined>;
+    migrationInProgress: GenericStorageQuery<Rv, () => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Sudo`'s storage queries
@@ -1702,12 +1876,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<() => AccountId32 | undefined>;
+    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `ImOnline`'s storage queries
@@ -1728,14 +1902,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    heartbeatAfter: GenericStorageQuery<() => number>;
+    heartbeatAfter: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The current set of keys that may issue a heartbeat.
      *
      * @param {Callback<Array<PalletImOnlineSr25519AppSr25519Public>> =} callback
      **/
-    keys: GenericStorageQuery<() => Array<PalletImOnlineSr25519AppSr25519Public>>;
+    keys: GenericStorageQuery<Rv, () => Array<PalletImOnlineSr25519AppSr25519Public>>;
 
     /**
      * For each session index, we keep a mapping of `SessionIndex` and `AuthIndex`.
@@ -1743,7 +1917,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<boolean | undefined> =} callback
      **/
-    receivedHeartbeats: GenericStorageQuery<(arg: [number, number]) => boolean | undefined>;
+    receivedHeartbeats: GenericStorageQuery<Rv, (arg: [number, number]) => boolean | undefined, [number, number]>;
 
     /**
      * For each session index, we keep a mapping of `ValidatorId<T>` to the
@@ -1752,12 +1926,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<number> =} callback
      **/
-    authoredBlocks: GenericStorageQuery<(arg: [number, AccountId32Like]) => number>;
+    authoredBlocks: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => number, [number, AccountId32]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `AuthorityDiscovery`'s storage queries
@@ -1768,19 +1942,19 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    keys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
+    keys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Keys of the next authority set.
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    nextKeys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
+    nextKeys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Offences`'s storage queries
@@ -1792,7 +1966,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<SpStakingOffenceOffenceDetails | undefined> =} callback
      **/
-    reports: GenericStorageQuery<(arg: H256) => SpStakingOffenceOffenceDetails | undefined>;
+    reports: GenericStorageQuery<Rv, (arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
 
     /**
      * A vector of reports of the same kind that happened at the same time slot.
@@ -1800,12 +1974,40 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[FixedBytes<16>, BytesLike]} arg
      * @param {Callback<Array<H256>> =} callback
      **/
-    concurrentReportsIndex: GenericStorageQuery<(arg: [FixedBytes<16>, BytesLike]) => Array<H256>>;
+    concurrentReportsIndex: GenericStorageQuery<
+      Rv,
+      (arg: [FixedBytes<16>, BytesLike]) => Array<H256>,
+      [FixedBytes<16>, Bytes]
+    >;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery<Rv>;
+  };
+  /**
+   * Pallet `Historical`'s storage queries
+   **/
+  historical: {
+    /**
+     * Mapping from historical session indices to session-data root hash and validator count.
+     *
+     * @param {number} arg
+     * @param {Callback<[H256, number] | undefined> =} callback
+     **/
+    historicalSessions: GenericStorageQuery<Rv, (arg: number) => [H256, number] | undefined, number>;
+
+    /**
+     * The range of historical sessions we store. [first, last)
+     *
+     * @param {Callback<[number, number] | undefined> =} callback
+     **/
+    storedRange: GenericStorageQuery<Rv, () => [number, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `RandomnessCollectiveFlip`'s storage queries
@@ -1818,26 +2020,31 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    randomMaterial: GenericStorageQuery<() => Array<H256>>;
+    randomMaterial: GenericStorageQuery<Rv, () => Array<H256>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Identity`'s storage queries
    **/
   identity: {
     /**
-     * Information that is pertinent to identify the entity behind an account.
+     * Information that is pertinent to identify the entity behind an account. First item is the
+     * registration, second is the account's primary username.
      *
      * TWOX-NOTE: OK ― `AccountId` is a secure hash.
      *
      * @param {AccountId32Like} arg
-     * @param {Callback<PalletIdentityRegistration | undefined> =} callback
+     * @param {Callback<[PalletIdentityRegistration, Bytes | undefined] | undefined> =} callback
      **/
-    identityOf: GenericStorageQuery<(arg: AccountId32Like) => PalletIdentityRegistration | undefined>;
+    identityOf: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => [PalletIdentityRegistration, Bytes | undefined] | undefined,
+      AccountId32
+    >;
 
     /**
      * The super-identity of an alternative "sub" identity together with its name, within that
@@ -1846,7 +2053,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined>;
+    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -1858,7 +2065,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>]>;
+    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -1868,12 +2075,49 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+
+    /**
+     * A map of the accounts who are authorized to grant usernames.
+     *
+     * @param {AccountId32Like} arg
+     * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
+     **/
+    usernameAuthorities: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => PalletIdentityAuthorityProperties | undefined,
+      AccountId32
+    >;
+
+    /**
+     * Reverse lookup from `username` to the `AccountId` that has registered it. The value should
+     * be a key in the `IdentityOf` map, but it may not if the user has cleared their identity.
+     *
+     * Multiple usernames may map to the same `AccountId`, but `IdentityOf` will only map to one
+     * primary username.
+     *
+     * @param {BytesLike} arg
+     * @param {Callback<AccountId32 | undefined> =} callback
+     **/
+    accountOfUsername: GenericStorageQuery<Rv, (arg: BytesLike) => AccountId32 | undefined, Bytes>;
+
+    /**
+     * Usernames that an authority has granted, but that the account controller has not confirmed
+     * that they want it. Used primarily in cases where the `AccountId` cannot provide a signature
+     * because they are a pure proxy, multisig, etc. In order to confirm it, they should call
+     * [`Call::accept_username`].
+     *
+     * First tuple item is the account and second is the acceptance deadline.
+     *
+     * @param {BytesLike} arg
+     * @param {Callback<[AccountId32, number] | undefined> =} callback
+     **/
+    pendingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => [AccountId32, number] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Society`'s storage queries
@@ -1884,28 +2128,28 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletSocietyGroupParams | undefined> =} callback
      **/
-    parameters: GenericStorageQuery<() => PalletSocietyGroupParams | undefined>;
+    parameters: GenericStorageQuery<Rv, () => PalletSocietyGroupParams | undefined>;
 
     /**
      * Amount of our account balance that is specifically for the next round's bid(s).
      *
      * @param {Callback<bigint> =} callback
      **/
-    pot: GenericStorageQuery<() => bigint>;
+    pot: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The first member.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    founder: GenericStorageQuery<() => AccountId32 | undefined>;
+    founder: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * The most primary from the most recently approved rank 0 members in the society.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    head: GenericStorageQuery<() => AccountId32 | undefined>;
+    head: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * A hash of the rules of this society concerning membership. Can only be set once and
@@ -1913,7 +2157,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<H256 | undefined> =} callback
      **/
-    rules: GenericStorageQuery<() => H256 | undefined>;
+    rules: GenericStorageQuery<Rv, () => H256 | undefined>;
 
     /**
      * The current members and their rank. Doesn't include `SuspendedMembers`.
@@ -1921,7 +2165,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyMemberRecord | undefined> =} callback
      **/
-    members: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyMemberRecord | undefined>;
+    members: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
 
     /**
      * Information regarding rank-0 payouts, past and future.
@@ -1929,14 +2173,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyPayoutRecord> =} callback
      **/
-    payouts: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyPayoutRecord>;
+    payouts: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyPayoutRecord, AccountId32>;
 
     /**
      * The number of items in `Members` currently. (Doesn't include `SuspendedMembers`.)
      *
      * @param {Callback<number> =} callback
      **/
-    memberCount: GenericStorageQuery<() => number>;
+    memberCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The current items in `Members` keyed by their unique index. Keys are densely populated
@@ -1945,7 +2189,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    memberByIndex: GenericStorageQuery<(arg: number) => AccountId32 | undefined>;
+    memberByIndex: GenericStorageQuery<Rv, (arg: number) => AccountId32 | undefined, number>;
 
     /**
      * The set of suspended members, with their old membership record.
@@ -1953,35 +2197,39 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyMemberRecord | undefined> =} callback
      **/
-    suspendedMembers: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyMemberRecord | undefined>;
+    suspendedMembers: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => PalletSocietyMemberRecord | undefined,
+      AccountId32
+    >;
 
     /**
      * The number of rounds which have passed.
      *
      * @param {Callback<number> =} callback
      **/
-    roundCount: GenericStorageQuery<() => number>;
+    roundCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The current bids, stored ordered by the value of the bid.
      *
      * @param {Callback<Array<PalletSocietyBid>> =} callback
      **/
-    bids: GenericStorageQuery<() => Array<PalletSocietyBid>>;
+    bids: GenericStorageQuery<Rv, () => Array<PalletSocietyBid>>;
 
     /**
      *
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyCandidacy | undefined> =} callback
      **/
-    candidates: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyCandidacy | undefined>;
+    candidates: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyCandidacy | undefined, AccountId32>;
 
     /**
      * The current skeptic.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    skeptic: GenericStorageQuery<() => AccountId32 | undefined>;
+    skeptic: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * Double map from Candidate -> Voter -> (Maybe) Vote.
@@ -1989,7 +2237,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[AccountId32Like, AccountId32Like]} arg
      * @param {Callback<PalletSocietyVote | undefined> =} callback
      **/
-    votes: GenericStorageQuery<(arg: [AccountId32Like, AccountId32Like]) => PalletSocietyVote | undefined>;
+    votes: GenericStorageQuery<
+      Rv,
+      (arg: [AccountId32Like, AccountId32Like]) => PalletSocietyVote | undefined,
+      [AccountId32, AccountId32]
+    >;
 
     /**
      * Clear-cursor for Vote, map from Candidate -> (Maybe) Cursor.
@@ -1997,7 +2249,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    voteClearCursor: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined>;
+    voteClearCursor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * At the end of the claim period, this contains the most recently approved members (along with
@@ -2006,21 +2258,21 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletSocietyIntakeRecord | undefined> =} callback
      **/
-    nextHead: GenericStorageQuery<() => PalletSocietyIntakeRecord | undefined>;
+    nextHead: GenericStorageQuery<Rv, () => PalletSocietyIntakeRecord | undefined>;
 
     /**
      * The number of challenge rounds there have been. Used to identify stale DefenderVotes.
      *
      * @param {Callback<number> =} callback
      **/
-    challengeRoundCount: GenericStorageQuery<() => number>;
+    challengeRoundCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The defending member currently being challenged, along with a running tally of votes.
      *
      * @param {Callback<[AccountId32, AccountId32, PalletSocietyTally] | undefined> =} callback
      **/
-    defending: GenericStorageQuery<() => [AccountId32, AccountId32, PalletSocietyTally] | undefined>;
+    defending: GenericStorageQuery<Rv, () => [AccountId32, AccountId32, PalletSocietyTally] | undefined>;
 
     /**
      * Votes for the defender, keyed by challenge round.
@@ -2028,12 +2280,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<PalletSocietyVote | undefined> =} callback
      **/
-    defenderVotes: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletSocietyVote | undefined>;
+    defenderVotes: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => PalletSocietyVote | undefined,
+      [number, AccountId32]
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Recovery`'s storage queries
@@ -2045,7 +2301,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRecoveryRecoveryConfig | undefined> =} callback
      **/
-    recoverable: GenericStorageQuery<(arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined>;
+    recoverable: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined,
+      AccountId32
+    >;
 
     /**
      * Active recovery attempts.
@@ -2057,7 +2317,9 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletRecoveryActiveRecovery | undefined> =} callback
      **/
     activeRecoveries: GenericStorageQuery<
-      (arg: [AccountId32Like, AccountId32Like]) => PalletRecoveryActiveRecovery | undefined
+      Rv,
+      (arg: [AccountId32Like, AccountId32Like]) => PalletRecoveryActiveRecovery | undefined,
+      [AccountId32, AccountId32]
     >;
 
     /**
@@ -2068,12 +2330,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    proxy: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined>;
+    proxy: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -2085,7 +2347,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined>;
+    vesting: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
+      AccountId32
+    >;
 
     /**
      * Storage version of the pallet.
@@ -2094,12 +2360,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -2109,7 +2375,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<() => number | undefined>;
+    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -2117,7 +2383,19 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>>;
+    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+
+    /**
+     * Retry configurations for items to be executed, indexed by task address.
+     *
+     * @param {[number, number]} arg
+     * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
+     **/
+    retries: GenericStorageQuery<
+      Rv,
+      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
+      [number, number]
+    >;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -2128,12 +2406,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined>;
+    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Glutton`'s storage queries
@@ -2147,7 +2425,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<FixedU64> =} callback
      **/
-    compute: GenericStorageQuery<() => FixedU64>;
+    compute: GenericStorageQuery<Rv, () => FixedU64>;
 
     /**
      * The proportion of the remaining `proof_size` to consume during `on_idle`.
@@ -2157,7 +2435,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<FixedU64> =} callback
      **/
-    storage: GenericStorageQuery<() => FixedU64>;
+    storage: GenericStorageQuery<Rv, () => FixedU64>;
 
     /**
      * Storage map used for wasting proof size.
@@ -2172,43 +2450,51 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<FixedBytes<1024> | undefined> =} callback
      **/
-    trashData: GenericStorageQuery<(arg: number) => FixedBytes<1024> | undefined>;
+    trashData: GenericStorageQuery<Rv, (arg: number) => FixedBytes<1024> | undefined, number>;
 
     /**
      * The current number of entries in `TrashData`.
      *
      * @param {Callback<number> =} callback
      **/
-    trashDataCount: GenericStorageQuery<() => number>;
+    trashDataCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Preimage`'s storage queries
    **/
   preimage: {
+    /**
+     * The request status of a given hash.
+     *
+     * @param {H256} arg
+     * @param {Callback<PalletPreimageOldRequestStatus | undefined> =} callback
+     **/
+    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+
     /**
      * The request status of a given hash.
      *
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined>;
+    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined>;
+    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -2221,7 +2507,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).
@@ -2229,12 +2519,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 `Multisig`'s storage queries
@@ -2246,12 +2540,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 `Bounties`'s storage queries
@@ -2262,7 +2560,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    bountyCount: GenericStorageQuery<() => number>;
+    bountyCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Bounties that have been made.
@@ -2270,7 +2568,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletBountiesBounty | undefined> =} callback
      **/
-    bounties: GenericStorageQuery<(arg: number) => PalletBountiesBounty | undefined>;
+    bounties: GenericStorageQuery<Rv, (arg: number) => PalletBountiesBounty | undefined, number>;
 
     /**
      * The description of each bounty.
@@ -2278,19 +2576,19 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    bountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined>;
+    bountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
 
     /**
      * Bounty indices that have been approved but not yet funded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    bountyApprovals: GenericStorageQuery<() => Array<number>>;
+    bountyApprovals: GenericStorageQuery<Rv, () => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Tips`'s storage queries
@@ -2304,7 +2602,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<PalletTipsOpenTip | undefined> =} callback
      **/
-    tips: GenericStorageQuery<(arg: H256) => PalletTipsOpenTip | undefined>;
+    tips: GenericStorageQuery<Rv, (arg: H256) => PalletTipsOpenTip | undefined, H256>;
 
     /**
      * Simple preimage lookup from the reason's hash to the original data. Again, has an
@@ -2313,12 +2611,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    reasons: GenericStorageQuery<(arg: H256) => Bytes | undefined>;
+    reasons: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -2330,7 +2628,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.
@@ -2338,7 +2636,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
@@ -2349,7 +2651,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]
     >;
 
     /**
@@ -2358,12 +2662,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 `PoolAssets`'s storage queries
@@ -2375,7 +2679,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.
@@ -2383,7 +2687,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
@@ -2394,7 +2702,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]
     >;
 
     /**
@@ -2403,12 +2713,68 @@ 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 `Beefy`'s storage queries
+   **/
+  beefy: {
+    /**
+     * The current authorities set
+     *
+     * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
+     **/
+    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+
+    /**
+     * The current validator set id
+     *
+     * @param {Callback<bigint> =} callback
+     **/
+    validatorSetId: GenericStorageQuery<Rv, () => bigint>;
+
+    /**
+     * Authorities set scheduled to be used with the next session
+     *
+     * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
+     **/
+    nextAuthorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+
+    /**
+     * A mapping from BEEFY set ID to the index of the *most recent* session for which its
+     * members were responsible.
+     *
+     * This is only used for validating equivocation proofs. An equivocation proof must
+     * contains a key-ownership proof for a given session, therefore we need a way to tie
+     * together sessions and BEEFY set ids, i.e. we need to validate that a validator
+     * was the owner of a given key on a given session, and what the active set ID was
+     * during that session.
+     *
+     * TWOX-NOTE: `ValidatorSetId` is not under user control.
+     *
+     * @param {bigint} arg
+     * @param {Callback<number | undefined> =} callback
+     **/
+    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+
+    /**
+     * Block number where BEEFY consensus is enabled/started.
+     * By changing this (through privileged `set_new_genesis()`), BEEFY consensus is effectively
+     * restarted from the newly set block number.
+     *
+     * @param {Callback<number | undefined> =} callback
+     **/
+    genesisBlock: GenericStorageQuery<Rv, () => number | undefined>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Mmr`'s storage queries
@@ -2419,14 +2785,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<H256> =} callback
      **/
-    rootHash: GenericStorageQuery<() => H256>;
+    rootHash: GenericStorageQuery<Rv, () => H256>;
 
     /**
      * Current size of the MMR (number of leaves).
      *
      * @param {Callback<bigint> =} callback
      **/
-    numberOfLeaves: GenericStorageQuery<() => bigint>;
+    numberOfLeaves: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * Hashes of the nodes in the MMR.
@@ -2437,12 +2803,37 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {bigint} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    nodes: GenericStorageQuery<(arg: bigint) => H256 | undefined>;
+    nodes: GenericStorageQuery<Rv, (arg: bigint) => H256 | undefined, bigint>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery<Rv>;
+  };
+  /**
+   * Pallet `MmrLeaf`'s storage queries
+   **/
+  mmrLeaf: {
+    /**
+     * Details of current BEEFY authority set.
+     *
+     * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
+     **/
+    beefyAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+
+    /**
+     * Details of next BEEFY authority set.
+     *
+     * This storage entry is used as cache for calls to `update_beefy_next_authority_set`.
+     *
+     * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
+     **/
+    beefyNextAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Lottery`'s storage queries
@@ -2452,14 +2843,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    lotteryIndex: GenericStorageQuery<() => number>;
+    lotteryIndex: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The configuration for the current lottery.
      *
      * @param {Callback<PalletLotteryLotteryConfig | undefined> =} callback
      **/
-    lottery: GenericStorageQuery<() => PalletLotteryLotteryConfig | undefined>;
+    lottery: GenericStorageQuery<Rv, () => PalletLotteryLotteryConfig | undefined>;
 
     /**
      * Users who have purchased a ticket. (Lottery Index, Tickets Purchased)
@@ -2467,14 +2858,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<[number, Array<[number, number]>]> =} callback
      **/
-    participants: GenericStorageQuery<(arg: AccountId32Like) => [number, Array<[number, number]>]>;
+    participants: GenericStorageQuery<Rv, (arg: AccountId32Like) => [number, Array<[number, number]>], AccountId32>;
 
     /**
      * Total number of tickets sold.
      *
      * @param {Callback<number> =} callback
      **/
-    ticketsCount: GenericStorageQuery<() => number>;
+    ticketsCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Each ticket's owner.
@@ -2485,7 +2876,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    tickets: GenericStorageQuery<(arg: number) => AccountId32 | undefined>;
+    tickets: GenericStorageQuery<Rv, (arg: number) => AccountId32 | undefined, number>;
 
     /**
      * The calls stored in this pallet to be used in an active lottery if configured
@@ -2493,12 +2884,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    callIndices: GenericStorageQuery<() => Array<[number, number]>>;
+    callIndices: GenericStorageQuery<Rv, () => Array<[number, number]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Nis`'s storage queries
@@ -2513,7 +2904,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    queueTotals: GenericStorageQuery<() => Array<[number, bigint]>>;
+    queueTotals: GenericStorageQuery<Rv, () => Array<[number, bigint]>>;
 
     /**
      * The queues of bids. Indexed by duration (in `Period`s).
@@ -2521,14 +2912,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Array<PalletNisBid>> =} callback
      **/
-    queues: GenericStorageQuery<(arg: number) => Array<PalletNisBid>>;
+    queues: GenericStorageQuery<Rv, (arg: number) => Array<PalletNisBid>, number>;
 
     /**
      * Summary information over the general state.
      *
      * @param {Callback<PalletNisSummaryRecord> =} callback
      **/
-    summary: GenericStorageQuery<() => PalletNisSummaryRecord>;
+    summary: GenericStorageQuery<Rv, () => PalletNisSummaryRecord>;
 
     /**
      * The currently outstanding receipts, indexed according to the order of creation.
@@ -2536,12 +2927,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletNisReceiptRecord | undefined> =} callback
      **/
-    receipts: GenericStorageQuery<(arg: number) => PalletNisReceiptRecord | undefined>;
+    receipts: GenericStorageQuery<Rv, (arg: number) => PalletNisReceiptRecord | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Uniques`'s storage queries
@@ -2553,7 +2944,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.
@@ -2561,7 +2952,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
@@ -2570,7 +2961,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
@@ -2579,7 +2974,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.
@@ -2587,7 +2982,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.
@@ -2595,7 +2990,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.
@@ -2603,7 +2998,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.
@@ -2611,7 +3010,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.
@@ -2619,7 +3022,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.
@@ -2627,12 +3034,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
@@ -2644,7 +3051,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.
@@ -2652,7 +3059,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
@@ -2661,7 +3068,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
@@ -2670,7 +3081,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.
@@ -2680,7 +3095,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]
     >;
 
     /**
@@ -2689,7 +3106,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.
@@ -2697,7 +3114,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.
@@ -2705,7 +3122,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.
@@ -2714,9 +3135,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]
     >;
 
     /**
@@ -2725,7 +3148,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.
@@ -2733,7 +3160,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.
@@ -2741,7 +3168,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.
@@ -2749,7 +3176,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.
@@ -2757,7 +3188,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.
@@ -2765,12 +3196,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 `NftFractionalization`'s storage queries
@@ -2782,12 +3217,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 `Salary`'s storage queries
@@ -2798,7 +3237,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletSalaryStatusType | undefined> =} callback
      **/
-    status: GenericStorageQuery<() => PalletSalaryStatusType | undefined>;
+    status: GenericStorageQuery<Rv, () => PalletSalaryStatusType | undefined>;
 
     /**
      * The status of a claimant.
@@ -2806,12 +3245,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSalaryClaimantStatus | undefined> =} callback
      **/
-    claimant: GenericStorageQuery<(arg: AccountId32Like) => PalletSalaryClaimantStatus | undefined>;
+    claimant: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSalaryClaimantStatus | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `CoreFellowship`'s storage queries
@@ -2822,7 +3261,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletCoreFellowshipParamsType> =} callback
      **/
-    params: GenericStorageQuery<() => PalletCoreFellowshipParamsType>;
+    params: GenericStorageQuery<Rv, () => PalletCoreFellowshipParamsType>;
 
     /**
      * The status of a claimant.
@@ -2830,7 +3269,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletCoreFellowshipMemberStatus | undefined> =} callback
      **/
-    member: GenericStorageQuery<(arg: AccountId32Like) => PalletCoreFellowshipMemberStatus | undefined>;
+    member: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => PalletCoreFellowshipMemberStatus | undefined,
+      AccountId32
+    >;
 
     /**
      * Some evidence together with the desired outcome for which it was presented.
@@ -2838,12 +3281,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<[PalletCoreFellowshipWish, Bytes] | undefined> =} callback
      **/
-    memberEvidence: GenericStorageQuery<(arg: AccountId32Like) => [PalletCoreFellowshipWish, Bytes] | undefined>;
+    memberEvidence: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => [PalletCoreFellowshipWish, Bytes] | undefined,
+      AccountId32
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `TransactionStorage`'s storage queries
@@ -2855,7 +3302,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Array<PalletTransactionStorageTransactionInfo> | undefined> =} callback
      **/
-    transactions: GenericStorageQuery<(arg: number) => Array<PalletTransactionStorageTransactionInfo> | undefined>;
+    transactions: GenericStorageQuery<
+      Rv,
+      (arg: number) => Array<PalletTransactionStorageTransactionInfo> | undefined,
+      number
+    >;
 
     /**
      * Count indexed chunks for each block.
@@ -2863,21 +3314,21 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    chunkCount: GenericStorageQuery<(arg: number) => number>;
+    chunkCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
 
     /**
      * Storage fee per byte.
      *
      * @param {Callback<bigint | undefined> =} callback
      **/
-    byteFee: GenericStorageQuery<() => bigint | undefined>;
+    byteFee: GenericStorageQuery<Rv, () => bigint | undefined>;
 
     /**
      * Storage fee per transaction.
      *
      * @param {Callback<bigint | undefined> =} callback
      **/
-    entryFee: GenericStorageQuery<() => bigint | undefined>;
+    entryFee: GenericStorageQuery<Rv, () => bigint | undefined>;
 
     /**
      * Storage period for data in blocks. Should match `sp_storage_proof::DEFAULT_STORAGE_PERIOD`
@@ -2885,25 +3336,25 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    storagePeriod: GenericStorageQuery<() => number>;
+    storagePeriod: GenericStorageQuery<Rv, () => number>;
 
     /**
      *
      * @param {Callback<Array<PalletTransactionStorageTransactionInfo>> =} callback
      **/
-    blockTransactions: GenericStorageQuery<() => Array<PalletTransactionStorageTransactionInfo>>;
+    blockTransactions: GenericStorageQuery<Rv, () => Array<PalletTransactionStorageTransactionInfo>>;
 
     /**
      * Was the proof checked in this block?
      *
      * @param {Callback<boolean> =} callback
      **/
-    proofChecked: GenericStorageQuery<() => boolean>;
+    proofChecked: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `VoterList`'s storage queries
@@ -2917,14 +3368,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBagsListListNode | undefined> =} callback
      **/
-    listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined>;
+    listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForListNodes: GenericStorageQuery<() => number>;
+    counterForListNodes: GenericStorageQuery<Rv, () => number>;
 
     /**
      * A bag stored in storage.
@@ -2934,12 +3385,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {bigint} arg
      * @param {Callback<PalletBagsListListBag | undefined> =} callback
      **/
-    listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined>;
+    listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -2953,7 +3404,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
      **/
-    migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
+    migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
 
     /**
      * The limits that are imposed on automatic migrations.
@@ -2962,7 +3413,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
+    autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * The maximum limits that the signed migration could use.
@@ -2971,12 +3422,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
+    signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `ChildBounties`'s storage queries
@@ -2987,7 +3438,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    childBountyCount: GenericStorageQuery<() => number>;
+    childBountyCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Number of child bounties per parent bounty.
@@ -2996,7 +3447,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentChildBounties: GenericStorageQuery<(arg: number) => number>;
+    parentChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
 
     /**
      * Child bounties that have been added.
@@ -3004,7 +3455,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<PalletChildBountiesChildBounty | undefined> =} callback
      **/
-    childBounties: GenericStorageQuery<(arg: [number, number]) => PalletChildBountiesChildBounty | undefined>;
+    childBounties: GenericStorageQuery<
+      Rv,
+      (arg: [number, number]) => PalletChildBountiesChildBounty | undefined,
+      [number, number]
+    >;
 
     /**
      * The description of each child-bounty.
@@ -3012,7 +3467,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    childBountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined>;
+    childBountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
 
     /**
      * The cumulative child-bounty curator fee for each parent bounty.
@@ -3020,12 +3475,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    childrenCuratorFees: GenericStorageQuery<(arg: number) => bigint>;
+    childrenCuratorFees: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -3036,7 +3491,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<() => number>;
+    referendumCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Information concerning any given referendum.
@@ -3044,7 +3499,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined>;
+    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -3055,7 +3510,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>>;
+    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -3063,11 +3518,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<(arg: number) => number>;
+    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
-     * The `PreimageHash` refers to the preimage of the `Preimages` provider which can be a JSON
+     * The `Hash` refers to the preimage of the `Preimages` provider which can be a JSON
      * dump or IPFS hash of a JSON file.
      *
      * Consider a garbage collection for a metadata of finished referendums to `unrequest` (remove)
@@ -3076,12 +3531,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined>;
+    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -3094,7 +3549,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
-    votingFor: GenericStorageQuery<(arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting>;
+    votingFor: GenericStorageQuery<
+      Rv,
+      (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
+      [AccountId32, number]
+    >;
 
     /**
      * The voting classes which have a non-zero lock requirement and the lock amounts which they
@@ -3104,12 +3563,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>>;
+    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -3120,12 +3579,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined>;
+    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `AllianceMotion`'s storage queries
@@ -3136,7 +3595,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<() => Array<H256>>;
+    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -3144,7 +3603,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<KitchensinkRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<(arg: H256) => KitchensinkRuntimeRuntimeCall | undefined>;
+    proposalOf: GenericStorageQuery<Rv, (arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -3152,33 +3611,33 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined>;
+    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<() => number>;
+    proposalCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<() => Array<AccountId32>>;
+    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of absentations.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<() => AccountId32 | undefined>;
+    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Alliance`'s storage queries
@@ -3190,14 +3649,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletAllianceCid | undefined> =} callback
      **/
-    rule: GenericStorageQuery<() => PalletAllianceCid | undefined>;
+    rule: GenericStorageQuery<Rv, () => PalletAllianceCid | undefined>;
 
     /**
      * The current IPFS CIDs of any announcements.
      *
      * @param {Callback<Array<PalletAllianceCid>> =} callback
      **/
-    announcements: GenericStorageQuery<() => Array<PalletAllianceCid>>;
+    announcements: GenericStorageQuery<Rv, () => Array<PalletAllianceCid>>;
 
     /**
      * Maps members to their candidacy deposit.
@@ -3205,7 +3664,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    depositOf: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined>;
+    depositOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * Maps member type to members of each type.
@@ -3213,7 +3672,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {PalletAllianceMemberRole} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<(arg: PalletAllianceMemberRole) => Array<AccountId32>>;
+    members: GenericStorageQuery<Rv, (arg: PalletAllianceMemberRole) => Array<AccountId32>, PalletAllianceMemberRole>;
 
     /**
      * A set of members who gave a retirement notice. They can retire after the end of retirement
@@ -3222,7 +3681,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    retiringMembers: GenericStorageQuery<(arg: AccountId32Like) => number | undefined>;
+    retiringMembers: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The current list of accounts deemed unscrupulous. These accounts non grata cannot submit
@@ -3230,30 +3689,41 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    unscrupulousAccounts: GenericStorageQuery<() => Array<AccountId32>>;
+    unscrupulousAccounts: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      * The current list of websites deemed unscrupulous.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    unscrupulousWebsites: GenericStorageQuery<() => Array<Bytes>>;
+    unscrupulousWebsites: GenericStorageQuery<Rv, () => Array<Bytes>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `NominationPools`'s storage queries
    **/
   nominationPools: {
+    /**
+     * The sum of funds across all pools.
+     *
+     * This might be lower but never higher than the sum of `total_balance` of all [`PoolMembers`]
+     * because calling `pool_withdraw_unbonded` might decrease the total stake of the pool's
+     * `bonded_account` without adjusting the pallet-internal `UnbondingPool`'s.
+     *
+     * @param {Callback<bigint> =} callback
+     **/
+    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<() => bigint>;
+    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -3266,7 +3736,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<() => bigint>;
+    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -3274,7 +3744,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<() => number | undefined>;
+    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -3282,7 +3752,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -3290,7 +3760,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -3299,7 +3769,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
 
     /**
      * Active members.
@@ -3309,14 +3779,18 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
-    poolMembers: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined>;
+    poolMembers: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
+      AccountId32
+    >;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<() => number>;
+    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Storage for bonded pools.
@@ -3324,30 +3798,30 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined>;
+    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<() => number>;
+    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
-     * claimed, the balance comes out fo the reward pool. Keyed by the bonded pools account.
+     * claimed, the balance comes out of the reward pool. Keyed by the bonded pools account.
      *
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined>;
+    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<() => number>;
+    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -3356,14 +3830,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined>;
+    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Metadata for the pool.
@@ -3371,39 +3845,39 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<(arg: number) => Bytes>;
+    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<() => number>;
+    counterForMetadata: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<() => number>;
+    lastPoolId: GenericStorageQuery<Rv, () => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
      *
-     * This is only used for slashing. In all other instances, the pool id is used, and the
-     * accounts are deterministically derived from it.
+     * This is only used for slashing and on automatic withdraw update. In all other instances, the
+     * pool id is used, and the accounts are deterministically derived from it.
      *
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined>;
+    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -3411,12 +3885,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission>;
+    claimPermissions: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
+      AccountId32
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `RankedPolls`'s storage queries
@@ -3427,7 +3905,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<() => number>;
+    referendumCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Information concerning any given referendum.
@@ -3435,7 +3913,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfoTally | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfoTally | undefined>;
+    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfoTally | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -3446,7 +3924,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, number]>>;
+    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, number]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -3454,11 +3932,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<(arg: number) => number>;
+    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
-     * The `PreimageHash` refers to the preimage of the `Preimages` provider which can be a JSON
+     * The `Hash` refers to the preimage of the `Preimages` provider which can be a JSON
      * dump or IPFS hash of a JSON file.
      *
      * Consider a garbage collection for a metadata of finished referendums to `unrequest` (remove)
@@ -3467,12 +3945,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined>;
+    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `RankedCollective`'s storage queries
@@ -3485,7 +3963,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    memberCount: GenericStorageQuery<(arg: number) => number>;
+    memberCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
 
     /**
      * The current members of the collective.
@@ -3493,7 +3971,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRankedCollectiveMemberRecord | undefined> =} callback
      **/
-    members: GenericStorageQuery<(arg: AccountId32Like) => PalletRankedCollectiveMemberRecord | undefined>;
+    members: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => PalletRankedCollectiveMemberRecord | undefined,
+      AccountId32
+    >;
 
     /**
      * The index of each ranks's member into the group of members who have at least that rank.
@@ -3501,7 +3983,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    idToIndex: GenericStorageQuery<(arg: [number, AccountId32Like]) => number | undefined>;
+    idToIndex: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => number | undefined, [number, AccountId32]>;
 
     /**
      * The members in the collective by index. All indices in the range `0..MemberCount` will
@@ -3510,7 +3992,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    indexToId: GenericStorageQuery<(arg: [number, number]) => AccountId32 | undefined>;
+    indexToId: GenericStorageQuery<Rv, (arg: [number, number]) => AccountId32 | undefined, [number, number]>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -3518,19 +4000,23 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<PalletRankedCollectiveVoteRecord | undefined> =} callback
      **/
-    voting: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletRankedCollectiveVoteRecord | undefined>;
+    voting: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => PalletRankedCollectiveVoteRecord | undefined,
+      [number, AccountId32]
+    >;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    votingCleanup: GenericStorageQuery<(arg: number) => Bytes | undefined>;
+    votingCleanup: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `AssetConversion`'s storage queries
@@ -3540,13 +4026,15 @@ export interface ChainStorage extends GenericChainStorage {
      * Map from `PoolAssetId` to `PoolInfo`. This establishes whether a pool has been officially
      * created rather than people sending tokens directly to a pool's public account.
      *
-     * @param {[PalletAssetConversionNativeOrAssetId, PalletAssetConversionNativeOrAssetId]} arg
+     * @param {[FrameSupportTokensFungibleUnionOfNativeOrWithId, FrameSupportTokensFungibleUnionOfNativeOrWithId]} arg
      * @param {Callback<PalletAssetConversionPoolInfo | undefined> =} callback
      **/
     pools: GenericStorageQuery<
+      Rv,
       (
-        arg: [PalletAssetConversionNativeOrAssetId, PalletAssetConversionNativeOrAssetId],
-      ) => PalletAssetConversionPoolInfo | undefined
+        arg: [FrameSupportTokensFungibleUnionOfNativeOrWithId, FrameSupportTokensFungibleUnionOfNativeOrWithId],
+      ) => PalletAssetConversionPoolInfo | undefined,
+      [FrameSupportTokensFungibleUnionOfNativeOrWithId, FrameSupportTokensFungibleUnionOfNativeOrWithId]
     >;
 
     /**
@@ -3555,12 +4043,12 @@ 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>;
   };
   /**
    * Pallet `FastUnstake`'s storage queries
@@ -3573,7 +4061,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletFastUnstakeUnstakeRequest | undefined> =} callback
      **/
-    head: GenericStorageQuery<() => PalletFastUnstakeUnstakeRequest | undefined>;
+    head: GenericStorageQuery<Rv, () => PalletFastUnstakeUnstakeRequest | undefined>;
 
     /**
      * The map of all accounts wishing to be unstaked.
@@ -3583,14 +4071,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    queue: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined>;
+    queue: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForQueue: GenericStorageQuery<() => number>;
+    counterForQueue: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Number of eras to check per block.
@@ -3604,12 +4092,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    erasToCheckPerBlock: GenericStorageQuery<() => number>;
+    erasToCheckPerBlock: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -3621,14 +4109,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
-    bookStateFor: GenericStorageQuery<(arg: number) => PalletMessageQueueBookState>;
+    bookStateFor: GenericStorageQuery<Rv, (arg: number) => PalletMessageQueueBookState, number>;
 
     /**
      * The origin at which we should begin servicing.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<() => number | undefined>;
+    serviceHead: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -3636,12 +4124,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
-    pages: GenericStorageQuery<(arg: [number, number]) => PalletMessageQueuePage | undefined>;
+    pages: GenericStorageQuery<Rv, (arg: [number, number]) => PalletMessageQueuePage | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Pov`'s storage queries
@@ -3651,40 +4139,40 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    value: GenericStorageQuery<() => number | undefined>;
+    value: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    value2: GenericStorageQuery<() => number | undefined>;
+    value2: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * A value without a MEL bound.
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    unboundedValue: GenericStorageQuery<() => Bytes | undefined>;
+    unboundedValue: GenericStorageQuery<Rv, () => Bytes | undefined>;
 
     /**
      * A value with a MEL bound of 32 byte.
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    boundedValue: GenericStorageQuery<() => Bytes | undefined>;
+    boundedValue: GenericStorageQuery<Rv, () => Bytes | undefined>;
 
     /**
      * 4MiB value.
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    largeValue: GenericStorageQuery<() => Bytes | undefined>;
+    largeValue: GenericStorageQuery<Rv, () => Bytes | undefined>;
 
     /**
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    largeValue2: GenericStorageQuery<() => Bytes | undefined>;
+    largeValue2: GenericStorageQuery<Rv, () => Bytes | undefined>;
 
     /**
      * A map with a maximum of 1M entries.
@@ -3692,7 +4180,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    map1M: GenericStorageQuery<(arg: number) => number | undefined>;
+    map1M: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
 
     /**
      * A map with a maximum of 16M entries.
@@ -3700,40 +4188,40 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    map16M: GenericStorageQuery<(arg: number) => number | undefined>;
+    map16M: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
 
     /**
      *
      * @param {[number, number]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    doubleMap1M: GenericStorageQuery<(arg: [number, number]) => number | undefined>;
+    doubleMap1M: GenericStorageQuery<Rv, (arg: [number, number]) => number | undefined, [number, number]>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    unboundedMap: GenericStorageQuery<(arg: number) => Array<number> | undefined>;
+    unboundedMap: GenericStorageQuery<Rv, (arg: number) => Array<number> | undefined, number>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    unboundedMap2: GenericStorageQuery<(arg: number) => Array<number> | undefined>;
+    unboundedMap2: GenericStorageQuery<Rv, (arg: number) => Array<number> | undefined, number>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    unboundedMapTwox: GenericStorageQuery<(arg: number) => Array<number> | undefined>;
+    unboundedMapTwox: GenericStorageQuery<Rv, (arg: number) => Array<number> | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `TxPause`'s storage queries
@@ -3745,12 +4233,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[BytesLike, BytesLike]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pausedCalls: GenericStorageQuery<(arg: [BytesLike, BytesLike]) => [] | undefined>;
+    pausedCalls: GenericStorageQuery<Rv, (arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `SafeMode`'s storage queries
@@ -3765,7 +4253,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    enteredUntil: GenericStorageQuery<() => number | undefined>;
+    enteredUntil: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * Holds the reserve that was taken from an account at a specific block number.
@@ -3776,12 +4264,41 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    deposits: GenericStorageQuery<(arg: [AccountId32Like, number]) => bigint | undefined>;
+    deposits: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => bigint | undefined, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
+  };
+  /**
+   * Pallet `MultiBlockMigrations`'s storage queries
+   **/
+  multiBlockMigrations: {
+    /**
+     * The currently active migration to run and its cursor.
+     *
+     * `None` indicates that no migration is running.
+     *
+     * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
+     **/
+    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+
+    /**
+     * Set of all successfully executed migrations.
+     *
+     * This is used as blacklist, to not re-execute migrations that have not been removed from the
+     * codebase yet. Governance can regularly clear this out via `clear_historic`.
+     *
+     * @param {BytesLike} arg
+     * @param {Callback<[] | undefined> =} callback
+     **/
+    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Broker`'s storage queries
@@ -3792,35 +4309,35 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletBrokerConfigRecord | undefined> =} callback
      **/
-    configuration: GenericStorageQuery<() => PalletBrokerConfigRecord | undefined>;
+    configuration: GenericStorageQuery<Rv, () => PalletBrokerConfigRecord | undefined>;
 
     /**
      * The Polkadot Core reservations (generally tasked with the maintenance of System Chains).
      *
      * @param {Callback<Array<Array<PalletBrokerScheduleItem>>> =} callback
      **/
-    reservations: GenericStorageQuery<() => Array<Array<PalletBrokerScheduleItem>>>;
+    reservations: GenericStorageQuery<Rv, () => Array<Array<PalletBrokerScheduleItem>>>;
 
     /**
      * The Polkadot Core legacy leases.
      *
      * @param {Callback<Array<PalletBrokerLeaseRecordItem>> =} callback
      **/
-    leases: GenericStorageQuery<() => Array<PalletBrokerLeaseRecordItem>>;
+    leases: GenericStorageQuery<Rv, () => Array<PalletBrokerLeaseRecordItem>>;
 
     /**
      * The current status of miscellaneous subsystems of this pallet.
      *
      * @param {Callback<PalletBrokerStatusRecord | undefined> =} callback
      **/
-    status: GenericStorageQuery<() => PalletBrokerStatusRecord | undefined>;
+    status: GenericStorageQuery<Rv, () => PalletBrokerStatusRecord | undefined>;
 
     /**
      * The details of the current sale, including its properties and status.
      *
      * @param {Callback<PalletBrokerSaleInfoRecord | undefined> =} callback
      **/
-    saleInfo: GenericStorageQuery<() => PalletBrokerSaleInfoRecord | undefined>;
+    saleInfo: GenericStorageQuery<Rv, () => PalletBrokerSaleInfoRecord | undefined>;
 
     /**
      * Records of allowed renewals.
@@ -3829,7 +4346,9 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletBrokerAllowedRenewalRecord | undefined> =} callback
      **/
     allowedRenewals: GenericStorageQuery<
-      (arg: PalletBrokerAllowedRenewalId) => PalletBrokerAllowedRenewalRecord | undefined
+      Rv,
+      (arg: PalletBrokerAllowedRenewalId) => PalletBrokerAllowedRenewalRecord | undefined,
+      PalletBrokerAllowedRenewalId
     >;
 
     /**
@@ -3838,7 +4357,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {PalletBrokerRegionId} arg
      * @param {Callback<PalletBrokerRegionRecord | undefined> =} callback
      **/
-    regions: GenericStorageQuery<(arg: PalletBrokerRegionId) => PalletBrokerRegionRecord | undefined>;
+    regions: GenericStorageQuery<
+      Rv,
+      (arg: PalletBrokerRegionId) => PalletBrokerRegionRecord | undefined,
+      PalletBrokerRegionId
+    >;
 
     /**
      * The work we plan on having each core do at a particular time in the future.
@@ -3846,7 +4369,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, number]} arg
      * @param {Callback<Array<PalletBrokerScheduleItem> | undefined> =} callback
      **/
-    workplan: GenericStorageQuery<(arg: [number, number]) => Array<PalletBrokerScheduleItem> | undefined>;
+    workplan: GenericStorageQuery<
+      Rv,
+      (arg: [number, number]) => Array<PalletBrokerScheduleItem> | undefined,
+      [number, number]
+    >;
 
     /**
      * The current workload of each core. This gets updated with workplan as timeslices pass.
@@ -3854,7 +4381,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Array<PalletBrokerScheduleItem>> =} callback
      **/
-    workload: GenericStorageQuery<(arg: number) => Array<PalletBrokerScheduleItem>>;
+    workload: GenericStorageQuery<Rv, (arg: number) => Array<PalletBrokerScheduleItem>, number>;
 
     /**
      * Record of a single contribution to the Instantaneous Coretime Pool.
@@ -3863,7 +4390,9 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletBrokerContributionRecord | undefined> =} callback
      **/
     instaPoolContribution: GenericStorageQuery<
-      (arg: PalletBrokerRegionId) => PalletBrokerContributionRecord | undefined
+      Rv,
+      (arg: PalletBrokerRegionId) => PalletBrokerContributionRecord | undefined,
+      PalletBrokerRegionId
     >;
 
     /**
@@ -3872,7 +4401,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletBrokerPoolIoRecord> =} callback
      **/
-    instaPoolIo: GenericStorageQuery<(arg: number) => PalletBrokerPoolIoRecord>;
+    instaPoolIo: GenericStorageQuery<Rv, (arg: number) => PalletBrokerPoolIoRecord, number>;
 
     /**
      * Total InstaPool rewards for each Timeslice and the number of core parts which contributed.
@@ -3880,11 +4409,112 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletBrokerInstaPoolHistoryRecord | undefined> =} callback
      **/
-    instaPoolHistory: GenericStorageQuery<(arg: number) => PalletBrokerInstaPoolHistoryRecord | undefined>;
+    instaPoolHistory: GenericStorageQuery<Rv, (arg: number) => PalletBrokerInstaPoolHistoryRecord | undefined, number>;
+
+    /**
+     * Received core count change from the relay chain.
+     *
+     * @param {Callback<number | undefined> =} callback
+     **/
+    coreCountInbox: GenericStorageQuery<Rv, () => number | undefined>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery<Rv>;
+  };
+  /**
+   * Pallet `TasksExample`'s storage queries
+   **/
+  tasksExample: {
+    /**
+     * Some running total.
+     *
+     * @param {Callback<[number, number]> =} callback
+     **/
+    total: GenericStorageQuery<Rv, () => [number, number]>;
+
+    /**
+     * Numbers to be added into the total.
+     *
+     * @param {number} arg
+     * @param {Callback<number | undefined> =} callback
+     **/
+    numbers: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery<Rv>;
+  };
+  /**
+   * Pallet `Mixnet`'s storage queries
+   **/
+  mixnet: {
+    /**
+     * Index of the current session. This may be offset relative to the session index tracked by
+     * eg `pallet_session`; mixnet session indices are independent.
+     *
+     * @param {Callback<number> =} callback
+     **/
+    currentSessionIndex: GenericStorageQuery<Rv, () => number>;
+
+    /**
+     * Block in which the current session started.
+     *
+     * @param {Callback<number> =} callback
+     **/
+    currentSessionStartBlock: GenericStorageQuery<Rv, () => number>;
+
+    /**
+     * Authority list for the next session.
+     *
+     * @param {number} arg
+     * @param {Callback<SpMixnetAppPublic | undefined> =} callback
+     **/
+    nextAuthorityIds: GenericStorageQuery<Rv, (arg: number) => SpMixnetAppPublic | undefined, number>;
+
+    /**
+     * Mixnode sets by session index. Only the mixnode sets for the previous, current, and next
+     * sessions are kept; older sets are discarded.
+     *
+     * The mixnodes in each set are keyed by authority index so we can easily check if an
+     * authority has registered a mixnode. The authority indices should only be used during
+     * registration; the authority indices for the very first session are made up.
+     *
+     * @param {[number, number]} arg
+     * @param {Callback<PalletMixnetBoundedMixnode | undefined> =} callback
+     **/
+    mixnodes: GenericStorageQuery<
+      Rv,
+      (arg: [number, number]) => PalletMixnetBoundedMixnode | undefined,
+      [number, number]
+    >;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery<Rv>;
+  };
+  /**
+   * Pallet `Parameters`'s storage queries
+   **/
+  parameters: {
+    /**
+     * Stored parameters.
+     *
+     * @param {KitchensinkRuntimeRuntimeParametersKey} arg
+     * @param {Callback<KitchensinkRuntimeRuntimeParametersValue | undefined> =} callback
+     **/
+    parameters: GenericStorageQuery<
+      Rv,
+      (arg: KitchensinkRuntimeRuntimeParametersKey) => KitchensinkRuntimeRuntimeParametersValue | undefined,
+      KitchensinkRuntimeRuntimeParametersKey
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
 }