@dedot/chaintypes 0.194.0 → 0.196.0

package/substrate/query.d.ts

@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -185,7 +185,7 @@ import type {
   PalletAssetRewardsPoolInfo,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -196,35 +196,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -232,7 +232,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
+    blockHash: GenericStorageQuery<(arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -240,28 +240,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    extrinsicData: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<Rv, () => number>;
+    number: GenericStorageQuery<() => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<Rv, () => H256>;
+    parentHash: GenericStorageQuery<() => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<Rv, () => Digest>;
+    digest: GenericStorageQuery<() => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -274,14 +274,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<Rv, () => number>;
+    eventCount: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -298,21 +298,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<Rv, (arg: H256) => Array<[number, number]>, H256>;
+    eventTopics: GenericStorageQuery<(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<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -320,21 +320,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -347,12 +347,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Babe`'s storage queries
@@ -363,14 +363,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    epochIndex: GenericStorageQuery<Rv, () => bigint>;
+    epochIndex: GenericStorageQuery<() => bigint>;
 
     /**
      * Current epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * The slot at which the first epoch actually started. This is 0
@@ -378,14 +378,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    genesisSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    genesisSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Current slot number.
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * The epoch randomness for the *current* epoch.
@@ -401,28 +401,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    randomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    randomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Pending epoch configuration change that will be applied when the next epoch is enacted.
      *
      * @param {Callback<SpConsensusBabeDigestsNextConfigDescriptor | undefined> =} callback
      **/
-    pendingEpochConfigChange: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
+    pendingEpochConfigChange: GenericStorageQuery<() => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
 
     /**
      * Next epoch randomness.
      *
      * @param {Callback<FixedBytes<32>> =} callback
      **/
-    nextRandomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+    nextRandomness: GenericStorageQuery<() => FixedBytes<32>>;
 
     /**
      * Next epoch authorities.
      *
      * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+    nextAuthorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
 
     /**
      * Randomness under construction.
@@ -437,7 +437,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    segmentIndex: GenericStorageQuery<Rv, () => number>;
+    segmentIndex: GenericStorageQuery<() => number>;
 
     /**
      * TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay.
@@ -445,7 +445,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<FixedBytes<32>>> =} callback
      **/
-    underConstruction: GenericStorageQuery<Rv, (arg: number) => Array<FixedBytes<32>>, number>;
+    underConstruction: GenericStorageQuery<(arg: number) => Array<FixedBytes<32>>, number>;
 
     /**
      * Temporary value (cleared at block finalization) which is `Some`
@@ -453,7 +453,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeDigestsPreDigest | undefined | undefined> =} callback
      **/
-    initialized: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
+    initialized: GenericStorageQuery<() => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
 
     /**
      * This field should always be populated during block processing unless
@@ -463,7 +463,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedBytes<32> | undefined> =} callback
      **/
-    authorVrfRandomness: GenericStorageQuery<Rv, () => FixedBytes<32> | undefined>;
+    authorVrfRandomness: GenericStorageQuery<() => FixedBytes<32> | undefined>;
 
     /**
      * The block numbers when the last and current epoch have started, respectively `N-1` and
@@ -474,7 +474,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number]> =} callback
      **/
-    epochStart: GenericStorageQuery<Rv, () => [number, number]>;
+    epochStart: GenericStorageQuery<() => [number, number]>;
 
     /**
      * How late the current block is compared to its parent.
@@ -485,7 +485,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lateness: GenericStorageQuery<Rv, () => number>;
+    lateness: GenericStorageQuery<() => number>;
 
     /**
      * The configuration for the current epoch. Should never be `None` as it is initialized in
@@ -493,7 +493,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    epochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    epochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * The configuration for the next epoch, `None` if the config will not change
@@ -501,7 +501,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
      **/
-    nextEpochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+    nextEpochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
 
     /**
      * A list of the last 100 skipped epochs and the corresponding session index
@@ -515,12 +515,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[bigint, number]>> =} callback
      **/
-    skippedEpochs: GenericStorageQuery<Rv, () => Array<[bigint, number]>>;
+    skippedEpochs: GenericStorageQuery<() => Array<[bigint, number]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -531,7 +531,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<Rv, () => bigint>;
+    now: GenericStorageQuery<() => bigint>;
 
     /**
      * Whether the timestamp has been updated in this block.
@@ -541,12 +541,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<Rv, () => boolean>;
+    didUpdate: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -557,12 +557,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Indices`'s storage queries
@@ -574,12 +574,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[AccountId32, bigint, boolean] | undefined> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
+    accounts: GenericStorageQuery<(arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -590,14 +590,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
+    totalIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
+    inactiveIssuance: GenericStorageQuery<() => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -628,7 +628,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -639,7 +639,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -649,7 +649,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -657,7 +657,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -666,7 +666,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -674,7 +673,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -684,18 +683,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s storage queries
@@ -711,14 +710,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => number>;
+    round: GenericStorageQuery<() => number>;
 
     /**
      * Current phase.
      *
      * @param {Callback<PalletElectionProviderMultiPhasePhase> =} callback
      **/
-    currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhasePhase>;
+    currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiPhasePhase>;
 
     /**
      * Current best solution, signed or unsigned, queued to be returned upon `elect`.
@@ -727,7 +726,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseReadySolution | undefined> =} callback
      **/
-    queuedSolution: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseReadySolution | undefined>;
+    queuedSolution: GenericStorageQuery<() => PalletElectionProviderMultiPhaseReadySolution | undefined>;
 
     /**
      * Snapshot data of the round.
@@ -737,7 +736,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseRoundSnapshot | undefined> =} callback
      **/
-    snapshot: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
+    snapshot: GenericStorageQuery<() => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
 
     /**
      * Desired number of targets to elect for this round.
@@ -747,7 +746,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    desiredTargets: GenericStorageQuery<Rv, () => number | undefined>;
+    desiredTargets: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The metadata of the [`RoundSnapshot`]
@@ -757,7 +756,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined> =} callback
      **/
-    snapshotMetadata: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
+    snapshotMetadata: GenericStorageQuery<() => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
 
     /**
      * The next index to be assigned to an incoming signed submission.
@@ -772,7 +771,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    signedSubmissionNextIndex: GenericStorageQuery<Rv, () => number>;
+    signedSubmissionNextIndex: GenericStorageQuery<() => number>;
 
     /**
      * A sorted, bounded vector of `(score, block_number, index)`, where each `index` points to a
@@ -784,7 +783,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[SpNposElectionsElectionScore, number, number]>> =} callback
      **/
-    signedSubmissionIndices: GenericStorageQuery<Rv, () => Array<[SpNposElectionsElectionScore, number, number]>>;
+    signedSubmissionIndices: GenericStorageQuery<() => Array<[SpNposElectionsElectionScore, number, number]>>;
 
     /**
      * Unchecked, signed solutions.
@@ -799,7 +798,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined> =} callback
      **/
     signedSubmissionsMap: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined,
       number
     >;
@@ -812,12 +810,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    minimumUntrustedScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
+    minimumUntrustedScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -828,14 +826,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<Rv, () => number>;
+    validatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Minimum number of staking participants before emergency conditions are imposed.
      *
      * @param {Callback<number> =} callback
      **/
-    minimumValidatorCount: GenericStorageQuery<Rv, () => number>;
+    minimumValidatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -844,7 +842,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -854,28 +852,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minNominatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minValidatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+    minimumActiveStake: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -884,7 +882,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<Rv, () => Perbill>;
+    minCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -895,7 +893,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingStakingLedger | undefined> =} callback
      **/
-    ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
+    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
 
     /**
      * Where the reward payment should be made. Keyed by stash.
@@ -905,7 +903,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingRewardDestination | undefined> =} callback
      **/
-    payee: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
+    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -915,14 +913,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
+    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<Rv, () => number>;
+    counterForValidators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -931,7 +929,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -957,14 +955,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
+    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<Rv, () => number>;
+    counterForNominators: GenericStorageQuery<() => number>;
 
     /**
      * Stakers whose funds are managed by other pallets.
@@ -977,14 +975,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    virtualStakers: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    virtualStakers: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForVirtualStakers: GenericStorageQuery<Rv, () => number>;
+    counterForVirtualStakers: GenericStorageQuery<() => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -993,7 +991,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current era index.
@@ -1003,7 +1001,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+    currentEra: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -1013,7 +1011,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<Rv, () => PalletStakingActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<() => PalletStakingActiveEraInfo | undefined>;
 
     /**
      * The session index at which the era start for the last [`Config::HistoryDepth`] eras.
@@ -1024,7 +1022,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    erasStartSessionIndex: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    erasStartSessionIndex: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Exposure of validator at era.
@@ -1039,7 +1037,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<SpStakingExposure> =} callback
      **/
-    erasStakers: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
+    erasStakers: GenericStorageQuery<(arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
 
     /**
      * Summary of validator exposure at a given era.
@@ -1059,7 +1057,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -1086,7 +1083,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposure> =} callback
      **/
     erasStakersClipped: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingExposure,
       [number, AccountId32]
     >;
@@ -1103,7 +1099,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposurePage | undefined> =} callback
      **/
     erasStakersPaged: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => SpStakingExposurePage | undefined,
       [number, AccountId32, number]
     >;
@@ -1119,7 +1114,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+    claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Similar to `ErasStakers`, this holds the preferences of validators.
@@ -1132,7 +1127,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs,
       [number, AccountId32]
     >;
@@ -1145,7 +1139,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last [`Config::HistoryDepth`] eras.
@@ -1154,7 +1148,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingEraRewardPoints, number>;
+    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last [`Config::HistoryDepth`] eras.
@@ -1163,14 +1157,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<Rv, () => PalletStakingForcing>;
+    forceEra: GenericStorageQuery<() => PalletStakingForcing>;
 
     /**
      * Maximum staked rewards, i.e. the percentage of the era inflation that
@@ -1179,7 +1173,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
+    maxStakedRewards: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -1188,7 +1182,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+    slashRewardFraction: GenericStorageQuery<() => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -1196,7 +1190,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+    canceledSlashPayout: GenericStorageQuery<() => bigint>;
 
     /**
      * All unapplied slashes that are queued for later.
@@ -1204,7 +1198,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletStakingUnappliedSlash>> =} callback
      **/
-    unappliedSlashes: GenericStorageQuery<Rv, (arg: number) => Array<PalletStakingUnappliedSlash>, number>;
+    unappliedSlashes: GenericStorageQuery<(arg: number) => Array<PalletStakingUnappliedSlash>, number>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -1214,7 +1208,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -1224,7 +1218,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
     validatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
       [number, AccountId32]
     >;
@@ -1236,7 +1229,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     nominatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => bigint | undefined,
       [number, AccountId32]
     >;
@@ -1248,7 +1240,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSlashingSpans | undefined> =} callback
      **/
     slashingSpans: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined,
       AccountId32
     >;
@@ -1261,7 +1252,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSpanRecord> =} callback
      **/
     spanSlash: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord,
       [AccountId32, number]
     >;
@@ -1273,7 +1263,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentPlannedSession: GenericStorageQuery<Rv, () => number>;
+    currentPlannedSession: GenericStorageQuery<() => number>;
 
     /**
      * The threshold for when users can start calling `chill_other` for other validators /
@@ -1282,12 +1272,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1298,14 +1288,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -1313,7 +1303,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -1321,7 +1311,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, KitchensinkRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, KitchensinkRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, KitchensinkRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1332,7 +1322,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -1340,7 +1330,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<KitchensinkRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => KitchensinkRuntimeSessionKeys | undefined, AccountId32>;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => KitchensinkRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1349,7 +1339,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1357,7 +1346,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Democracy`'s storage queries
@@ -1368,14 +1357,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    publicPropCount: GenericStorageQuery<Rv, () => number>;
+    publicPropCount: GenericStorageQuery<() => number>;
 
     /**
      * The public proposals. Unsorted. The second item is the proposal.
      *
      * @param {Callback<Array<[number, FrameSupportPreimagesBounded, AccountId32]>> =} callback
      **/
-    publicProps: GenericStorageQuery<Rv, () => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
+    publicProps: GenericStorageQuery<() => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
 
     /**
      * Those who have locked a deposit.
@@ -1385,14 +1374,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[Array<AccountId32>, bigint] | undefined> =} callback
      **/
-    depositOf: GenericStorageQuery<Rv, (arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
+    depositOf: GenericStorageQuery<(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<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * The lowest referendum index representing an unbaked referendum. Equal to
@@ -1400,7 +1389,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lowestUnbaked: GenericStorageQuery<Rv, () => number>;
+    lowestUnbaked: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -1410,7 +1399,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDemocracyReferendumInfo | undefined> =} callback
      **/
-    referendumInfoOf: GenericStorageQuery<Rv, (arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
+    referendumInfoOf: GenericStorageQuery<(arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
 
     /**
      * All votes for a particular voter. We store the balance for the number of votes that we
@@ -1421,7 +1410,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDemocracyVoteVoting> =} callback
      **/
-    votingOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
+    votingOf: GenericStorageQuery<(arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
 
     /**
      * True if the last referendum tabled was submitted externally. False if it was a public
@@ -1429,7 +1418,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    lastTabledWasExternal: GenericStorageQuery<Rv, () => boolean>;
+    lastTabledWasExternal: GenericStorageQuery<() => boolean>;
 
     /**
      * The referendum to be tabled whenever it would be valid to table an external proposal.
@@ -1439,10 +1428,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined> =} callback
      **/
-    nextExternal: GenericStorageQuery<
-      Rv,
-      () => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined
-    >;
+    nextExternal: GenericStorageQuery<() => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined>;
 
     /**
      * A record of who vetoed what. Maps proposal hash to a possible existent block number
@@ -1451,7 +1437,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    blacklist: GenericStorageQuery<Rv, (arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
+    blacklist: GenericStorageQuery<(arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
 
     /**
      * Record of all proposals that have been subject to emergency cancellation.
@@ -1459,7 +1445,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<boolean> =} callback
      **/
-    cancellations: GenericStorageQuery<Rv, (arg: H256) => boolean, H256>;
+    cancellations: GenericStorageQuery<(arg: H256) => boolean, H256>;
 
     /**
      * General information concerning any proposal or referendum.
@@ -1473,7 +1459,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256 | undefined> =} callback
      **/
     metadataOf: GenericStorageQuery<
-      Rv,
       (arg: PalletDemocracyMetadataOwner) => H256 | undefined,
       PalletDemocracyMetadataOwner
     >;
@@ -1481,7 +1466,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Council`'s storage queries
@@ -1492,7 +1477,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -1500,7 +1485,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<KitchensinkRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -1512,7 +1497,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined> =} callback
      **/
     costOf: GenericStorageQuery<
-      Rv,
       (arg: H256) => [AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined,
       H256
     >;
@@ -1523,33 +1507,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TechnicalCommittee`'s storage queries
@@ -1560,7 +1544,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -1568,7 +1552,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<KitchensinkRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -1579,7 +1563,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId32, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId32, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId32, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -1587,33 +1571,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Elections`'s storage queries
@@ -1626,7 +1610,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletElectionsPhragmenSeatHolder>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<PalletElectionsPhragmenSeatHolder>>;
+    members: GenericStorageQuery<() => Array<PalletElectionsPhragmenSeatHolder>>;
 
     /**
      * The current reserved runners-up.
@@ -1636,7 +1620,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletElectionsPhragmenSeatHolder>> =} callback
      **/
-    runnersUp: GenericStorageQuery<Rv, () => Array<PalletElectionsPhragmenSeatHolder>>;
+    runnersUp: GenericStorageQuery<() => Array<PalletElectionsPhragmenSeatHolder>>;
 
     /**
      * The present candidate list. A current member or runner-up can never enter this vector
@@ -1648,14 +1632,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, bigint]>> =} callback
      **/
-    candidates: GenericStorageQuery<Rv, () => Array<[AccountId32, bigint]>>;
+    candidates: GenericStorageQuery<() => Array<[AccountId32, bigint]>>;
 
     /**
      * The total number of vote rounds that have happened, excluding the upcoming one.
      *
      * @param {Callback<number> =} callback
      **/
-    electionRounds: GenericStorageQuery<Rv, () => number>;
+    electionRounds: GenericStorageQuery<() => number>;
 
     /**
      * Votes and locked stake of a particular voter.
@@ -1665,12 +1649,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletElectionsPhragmenVoter> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletElectionsPhragmenVoter, AccountId32>;
+    voting: GenericStorageQuery<(arg: AccountId32Like) => PalletElectionsPhragmenVoter, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TechnicalMembership`'s storage queries
@@ -1681,19 +1665,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The current prime member, if one exists.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Grandpa`'s storage queries
@@ -1704,28 +1688,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletGrandpaStoredState> =} callback
      **/
-    state: GenericStorageQuery<Rv, () => PalletGrandpaStoredState>;
+    state: GenericStorageQuery<() => PalletGrandpaStoredState>;
 
     /**
      * Pending change: (signaled at, scheduled change).
      *
      * @param {Callback<PalletGrandpaStoredPendingChange | undefined> =} callback
      **/
-    pendingChange: GenericStorageQuery<Rv, () => PalletGrandpaStoredPendingChange | undefined>;
+    pendingChange: GenericStorageQuery<() => PalletGrandpaStoredPendingChange | undefined>;
 
     /**
      * next block number where we can force a change.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextForced: GenericStorageQuery<Rv, () => number | undefined>;
+    nextForced: GenericStorageQuery<() => number | undefined>;
 
     /**
      * `true` if we are currently stalled.
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    stalled: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    stalled: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * The number of changes (both in terms of keys and underlying economic responsibilities)
@@ -1733,7 +1717,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    currentSetId: GenericStorageQuery<Rv, () => bigint>;
+    currentSetId: GenericStorageQuery<() => bigint>;
 
     /**
      * A mapping from grandpa set ID to the index of the *most recent* session for which its
@@ -1750,19 +1734,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * The current list of authorities.
      *
      * @param {Callback<Array<[SpConsensusGrandpaAppPublic, bigint]>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
+    authorities: GenericStorageQuery<() => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -1776,7 +1760,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -1787,14 +1771,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -1804,14 +1788,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -1819,19 +1803,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * The blocknumber for the last triggered spend period.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSpendPeriod: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSpendPeriod: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRate`'s storage queries
@@ -1846,7 +1830,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
     conversionRateToNative: GenericStorageQuery<
-      Rv,
       (arg: FrameSupportTokensFungibleUnionOfNativeOrWithId) => FixedU128 | undefined,
       FrameSupportTokensFungibleUnionOfNativeOrWithId
     >;
@@ -1854,7 +1837,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Contracts`'s storage queries
@@ -1866,7 +1849,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
 
     /**
      * A mapping from a contract's code hash to its code info.
@@ -1874,7 +1857,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletContractsWasmCodeInfo | undefined> =} callback
      **/
-    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletContractsWasmCodeInfo | undefined, H256>;
+    codeInfoOf: GenericStorageQuery<(arg: H256) => PalletContractsWasmCodeInfo | undefined, H256>;
 
     /**
      * This is a **monotonic** counter incremented on contract instantiation.
@@ -1902,7 +1885,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    nonce: GenericStorageQuery<Rv, () => bigint>;
+    nonce: GenericStorageQuery<() => bigint>;
 
     /**
      * The code associated with a given account.
@@ -1913,7 +1896,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletContractsStorageContractInfo | undefined> =} callback
      **/
     contractInfoOf: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletContractsStorageContractInfo | undefined,
       AccountId32
     >;
@@ -1927,7 +1909,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    deletionQueue: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    deletionQueue: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * A pair of monotonic counters used to track the latest contract marked for deletion
@@ -1935,7 +1917,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletContractsStorageDeletionQueueManager> =} callback
      **/
-    deletionQueueCounter: GenericStorageQuery<Rv, () => PalletContractsStorageDeletionQueueManager>;
+    deletionQueueCounter: GenericStorageQuery<() => PalletContractsStorageDeletionQueueManager>;
 
     /**
      * A migration can span across multiple blocks. This storage defines a cursor to track the
@@ -1943,12 +1925,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    migrationInProgress: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    migrationInProgress: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Sudo`'s storage queries
@@ -1959,12 +1941,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    key: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ImOnline`'s storage queries
@@ -1985,14 +1967,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    heartbeatAfter: GenericStorageQuery<Rv, () => number>;
+    heartbeatAfter: GenericStorageQuery<() => number>;
 
     /**
      * The current set of keys that may issue a heartbeat.
      *
      * @param {Callback<Array<PalletImOnlineSr25519AppSr25519Public>> =} callback
      **/
-    keys: GenericStorageQuery<Rv, () => Array<PalletImOnlineSr25519AppSr25519Public>>;
+    keys: GenericStorageQuery<() => Array<PalletImOnlineSr25519AppSr25519Public>>;
 
     /**
      * For each session index, we keep a mapping of `SessionIndex` and `AuthIndex`.
@@ -2000,7 +1982,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<boolean | undefined> =} callback
      **/
-    receivedHeartbeats: GenericStorageQuery<Rv, (arg: [number, number]) => boolean | undefined, [number, number]>;
+    receivedHeartbeats: GenericStorageQuery<(arg: [number, number]) => boolean | undefined, [number, number]>;
 
     /**
      * For each session index, we keep a mapping of `ValidatorId<T>` to the
@@ -2009,12 +1991,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<number> =} callback
      **/
-    authoredBlocks: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => number, [number, AccountId32]>;
+    authoredBlocks: GenericStorageQuery<(arg: [number, AccountId32Like]) => number, [number, AccountId32]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuthorityDiscovery`'s storage queries
@@ -2025,19 +2007,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    keys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    keys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Keys of the next authority set.
      *
      * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+    nextKeys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Offences`'s storage queries
@@ -2049,7 +2031,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<SpStakingOffenceOffenceDetails | undefined> =} callback
      **/
-    reports: GenericStorageQuery<Rv, (arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
+    reports: GenericStorageQuery<(arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
 
     /**
      * A vector of reports of the same kind that happened at the same time slot.
@@ -2058,7 +2040,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<H256>> =} callback
      **/
     concurrentReportsIndex: GenericStorageQuery<
-      Rv,
       (arg: [FixedBytes<16>, BytesLike]) => Array<H256>,
       [FixedBytes<16>, Bytes]
     >;
@@ -2066,7 +2047,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Historical`'s storage queries
@@ -2078,19 +2059,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[H256, number] | undefined> =} callback
      **/
-    historicalSessions: GenericStorageQuery<Rv, (arg: number) => [H256, number] | undefined, number>;
+    historicalSessions: GenericStorageQuery<(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>;
+    storedRange: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `RandomnessCollectiveFlip`'s storage queries
@@ -2103,12 +2084,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    randomMaterial: GenericStorageQuery<Rv, () => Array<H256>>;
+    randomMaterial: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -2123,7 +2104,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletIdentityRegistration | undefined> =} callback
      **/
-    identityOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
+    identityOf: GenericStorageQuery<(arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
 
     /**
      * Identifies the primary username of an account.
@@ -2131,7 +2112,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    usernameOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    usernameOf: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * The super-identity of an alternative "sub" identity together with its name, within that
@@ -2140,7 +2121,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -2152,7 +2133,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -2162,7 +2143,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -2170,7 +2151,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
-    authorityOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
+    authorityOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
 
     /**
      * Reverse lookup from `username` to the `AccountId` that has registered it and the provider of
@@ -2183,7 +2164,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityUsernameInformation | undefined> =} callback
      **/
-    usernameInfoOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
+    usernameInfoOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -2197,7 +2178,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, number, PalletIdentityProvider] | undefined> =} callback
      **/
     pendingUsernames: GenericStorageQuery<
-      Rv,
       (arg: BytesLike) => [AccountId32, number, PalletIdentityProvider] | undefined,
       Bytes
     >;
@@ -2211,12 +2191,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    unbindingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    unbindingUsernames: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Society`'s storage queries
@@ -2227,28 +2207,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletSocietyGroupParams | undefined> =} callback
      **/
-    parameters: GenericStorageQuery<Rv, () => PalletSocietyGroupParams | undefined>;
+    parameters: GenericStorageQuery<() => PalletSocietyGroupParams | undefined>;
 
     /**
      * Amount of our account balance that is specifically for the next round's bid(s).
      *
      * @param {Callback<bigint> =} callback
      **/
-    pot: GenericStorageQuery<Rv, () => bigint>;
+    pot: GenericStorageQuery<() => bigint>;
 
     /**
      * The first member.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    founder: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    founder: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * The most primary from the most recently approved rank 0 members in the society.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    head: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    head: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * A hash of the rules of this society concerning membership. Can only be set once and
@@ -2256,7 +2236,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256 | undefined> =} callback
      **/
-    rules: GenericStorageQuery<Rv, () => H256 | undefined>;
+    rules: GenericStorageQuery<() => H256 | undefined>;
 
     /**
      * The current members and their rank. Doesn't include `SuspendedMembers`.
@@ -2264,7 +2244,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyMemberRecord | undefined> =} callback
      **/
-    members: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
+    members: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
 
     /**
      * Information regarding rank-0 payouts, past and future.
@@ -2272,14 +2252,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyPayoutRecord> =} callback
      **/
-    payouts: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyPayoutRecord, AccountId32>;
+    payouts: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyPayoutRecord, AccountId32>;
 
     /**
      * The number of items in `Members` currently. (Doesn't include `SuspendedMembers`.)
      *
      * @param {Callback<number> =} callback
      **/
-    memberCount: GenericStorageQuery<Rv, () => number>;
+    memberCount: GenericStorageQuery<() => number>;
 
     /**
      * The current items in `Members` keyed by their unique index. Keys are densely populated
@@ -2288,7 +2268,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    memberByIndex: GenericStorageQuery<Rv, (arg: number) => AccountId32 | undefined, number>;
+    memberByIndex: GenericStorageQuery<(arg: number) => AccountId32 | undefined, number>;
 
     /**
      * The set of suspended members, with their old membership record.
@@ -2296,39 +2276,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyMemberRecord | undefined> =} callback
      **/
-    suspendedMembers: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletSocietyMemberRecord | undefined,
-      AccountId32
-    >;
+    suspendedMembers: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
 
     /**
      * The number of rounds which have passed.
      *
      * @param {Callback<number> =} callback
      **/
-    roundCount: GenericStorageQuery<Rv, () => number>;
+    roundCount: GenericStorageQuery<() => number>;
 
     /**
      * The current bids, stored ordered by the value of the bid.
      *
      * @param {Callback<Array<PalletSocietyBid>> =} callback
      **/
-    bids: GenericStorageQuery<Rv, () => Array<PalletSocietyBid>>;
+    bids: GenericStorageQuery<() => Array<PalletSocietyBid>>;
 
     /**
      *
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSocietyCandidacy | undefined> =} callback
      **/
-    candidates: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyCandidacy | undefined, AccountId32>;
+    candidates: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyCandidacy | undefined, AccountId32>;
 
     /**
      * The current skeptic.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    skeptic: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    skeptic: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Double map from Candidate -> Voter -> (Maybe) Vote.
@@ -2337,7 +2313,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletSocietyVote | undefined> =} callback
      **/
     votes: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, AccountId32Like]) => PalletSocietyVote | undefined,
       [AccountId32, AccountId32]
     >;
@@ -2348,7 +2323,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    voteClearCursor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    voteClearCursor: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * At the end of the claim period, this contains the most recently approved members (along with
@@ -2357,21 +2332,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletSocietyIntakeRecord | undefined> =} callback
      **/
-    nextHead: GenericStorageQuery<Rv, () => PalletSocietyIntakeRecord | undefined>;
+    nextHead: GenericStorageQuery<() => PalletSocietyIntakeRecord | undefined>;
 
     /**
      * The number of challenge rounds there have been. Used to identify stale DefenderVotes.
      *
      * @param {Callback<number> =} callback
      **/
-    challengeRoundCount: GenericStorageQuery<Rv, () => number>;
+    challengeRoundCount: GenericStorageQuery<() => number>;
 
     /**
      * The defending member currently being challenged, along with a running tally of votes.
      *
      * @param {Callback<[AccountId32, AccountId32, PalletSocietyTally] | undefined> =} callback
      **/
-    defending: GenericStorageQuery<Rv, () => [AccountId32, AccountId32, PalletSocietyTally] | undefined>;
+    defending: GenericStorageQuery<() => [AccountId32, AccountId32, PalletSocietyTally] | undefined>;
 
     /**
      * Votes for the defender, keyed by challenge round.
@@ -2380,7 +2355,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletSocietyVote | undefined> =} callback
      **/
     defenderVotes: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletSocietyVote | undefined,
       [number, AccountId32]
     >;
@@ -2388,7 +2362,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Recovery`'s storage queries
@@ -2400,11 +2374,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRecoveryRecoveryConfig | undefined> =} callback
      **/
-    recoverable: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined,
-      AccountId32
-    >;
+    recoverable: GenericStorageQuery<(arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined, AccountId32>;
 
     /**
      * Active recovery attempts.
@@ -2416,7 +2386,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRecoveryActiveRecovery | undefined> =} callback
      **/
     activeRecoveries: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, AccountId32Like]) => PalletRecoveryActiveRecovery | undefined,
       [AccountId32, AccountId32]
     >;
@@ -2429,12 +2398,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    proxy: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    proxy: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -2446,11 +2415,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -2459,12 +2424,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -2475,7 +2440,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
+    incompleteSince: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -2483,7 +2448,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
+    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Retry configurations for items to be executed, indexed by task address.
@@ -2491,11 +2456,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletSchedulerRetryConfig | undefined> =} callback
      **/
-    retries: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletSchedulerRetryConfig | undefined,
-      [number, number]
-    >;
+    retries: GenericStorageQuery<(arg: [number, number]) => PalletSchedulerRetryConfig | undefined, [number, number]>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -2506,12 +2467,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Glutton`'s storage queries
@@ -2525,7 +2486,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU64> =} callback
      **/
-    compute: GenericStorageQuery<Rv, () => FixedU64>;
+    compute: GenericStorageQuery<() => FixedU64>;
 
     /**
      * The proportion of the remaining `proof_size` to consume during `on_idle`.
@@ -2535,7 +2496,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU64> =} callback
      **/
-    storage: GenericStorageQuery<Rv, () => FixedU64>;
+    storage: GenericStorageQuery<() => FixedU64>;
 
     /**
      * The proportion of the `block length` to consume on each block.
@@ -2545,7 +2506,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<FixedU64> =} callback
      **/
-    length: GenericStorageQuery<Rv, () => FixedU64>;
+    length: GenericStorageQuery<() => FixedU64>;
 
     /**
      * Storage map used for wasting proof size.
@@ -2560,19 +2521,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<FixedBytes<1024> | undefined> =} callback
      **/
-    trashData: GenericStorageQuery<Rv, (arg: number) => FixedBytes<1024> | undefined, number>;
+    trashData: GenericStorageQuery<(arg: number) => FixedBytes<1024> | undefined, number>;
 
     /**
      * The current number of entries in `TrashData`.
      *
      * @param {Callback<number> =} callback
      **/
-    trashDataCount: GenericStorageQuery<Rv, () => number>;
+    trashDataCount: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -2584,7 +2545,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageOldRequestStatus | undefined> =} callback
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -2592,19 +2553,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -2617,11 +2578,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -2629,16 +2586,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -2651,7 +2604,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -2659,7 +2611,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Bounties`'s storage queries
@@ -2670,7 +2622,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    bountyCount: GenericStorageQuery<Rv, () => number>;
+    bountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Bounties that have been made.
@@ -2678,7 +2630,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBountiesBounty | undefined> =} callback
      **/
-    bounties: GenericStorageQuery<Rv, (arg: number) => PalletBountiesBounty | undefined, number>;
+    bounties: GenericStorageQuery<(arg: number) => PalletBountiesBounty | undefined, number>;
 
     /**
      * The description of each bounty.
@@ -2686,19 +2638,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    bountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    bountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Bounty indices that have been approved but not yet funded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    bountyApprovals: GenericStorageQuery<Rv, () => Array<number>>;
+    bountyApprovals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Tips`'s storage queries
@@ -2712,7 +2664,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletTipsOpenTip | undefined> =} callback
      **/
-    tips: GenericStorageQuery<Rv, (arg: H256) => PalletTipsOpenTip | undefined, H256>;
+    tips: GenericStorageQuery<(arg: H256) => PalletTipsOpenTip | undefined, H256>;
 
     /**
      * Simple preimage lookup from the reason's hash to the original data. Again, has an
@@ -2721,12 +2673,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    reasons: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+    reasons: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -2738,7 +2690,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -2747,7 +2699,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -2761,7 +2712,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -2772,7 +2722,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -2787,12 +2737,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PoolAssets`'s storage queries
@@ -2804,7 +2754,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -2813,7 +2763,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -2827,7 +2776,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -2838,7 +2786,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -2853,12 +2801,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Beefy`'s storage queries
@@ -2869,21 +2817,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
 
     /**
      * The current validator set id
      *
      * @param {Callback<bigint> =} callback
      **/
-    validatorSetId: GenericStorageQuery<Rv, () => bigint>;
+    validatorSetId: GenericStorageQuery<() => bigint>;
 
     /**
      * Authorities set scheduled to be used with the next session
      *
      * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+    nextAuthorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
 
     /**
      * A mapping from BEEFY set ID to the index of the *most recent* session for which its
@@ -2900,7 +2848,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * Block number where BEEFY consensus is enabled/started.
@@ -2909,12 +2857,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    genesisBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    genesisBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Mmr`'s storage queries
@@ -2925,14 +2873,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256> =} callback
      **/
-    rootHash: GenericStorageQuery<Rv, () => H256>;
+    rootHash: GenericStorageQuery<() => H256>;
 
     /**
      * Current size of the MMR (number of leaves).
      *
      * @param {Callback<bigint> =} callback
      **/
-    numberOfLeaves: GenericStorageQuery<Rv, () => bigint>;
+    numberOfLeaves: GenericStorageQuery<() => bigint>;
 
     /**
      * Hashes of the nodes in the MMR.
@@ -2943,12 +2891,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    nodes: GenericStorageQuery<Rv, (arg: bigint) => H256 | undefined, bigint>;
+    nodes: GenericStorageQuery<(arg: bigint) => H256 | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MmrLeaf`'s storage queries
@@ -2959,7 +2907,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
      **/
-    beefyAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+    beefyAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
 
     /**
      * Details of next BEEFY authority set.
@@ -2968,12 +2916,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
      **/
-    beefyNextAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+    beefyNextAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Lottery`'s storage queries
@@ -2983,14 +2931,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lotteryIndex: GenericStorageQuery<Rv, () => number>;
+    lotteryIndex: GenericStorageQuery<() => number>;
 
     /**
      * The configuration for the current lottery.
      *
      * @param {Callback<PalletLotteryLotteryConfig | undefined> =} callback
      **/
-    lottery: GenericStorageQuery<Rv, () => PalletLotteryLotteryConfig | undefined>;
+    lottery: GenericStorageQuery<() => PalletLotteryLotteryConfig | undefined>;
 
     /**
      * Users who have purchased a ticket. (Lottery Index, Tickets Purchased)
@@ -2998,14 +2946,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[number, Array<[number, number]>]> =} callback
      **/
-    participants: GenericStorageQuery<Rv, (arg: AccountId32Like) => [number, Array<[number, number]>], AccountId32>;
+    participants: GenericStorageQuery<(arg: AccountId32Like) => [number, Array<[number, number]>], AccountId32>;
 
     /**
      * Total number of tickets sold.
      *
      * @param {Callback<number> =} callback
      **/
-    ticketsCount: GenericStorageQuery<Rv, () => number>;
+    ticketsCount: GenericStorageQuery<() => number>;
 
     /**
      * Each ticket's owner.
@@ -3016,7 +2964,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    tickets: GenericStorageQuery<Rv, (arg: number) => AccountId32 | undefined, number>;
+    tickets: GenericStorageQuery<(arg: number) => AccountId32 | undefined, number>;
 
     /**
      * The calls stored in this pallet to be used in an active lottery if configured
@@ -3024,12 +2972,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    callIndices: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    callIndices: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Nis`'s storage queries
@@ -3044,7 +2992,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    queueTotals: GenericStorageQuery<Rv, () => Array<[number, bigint]>>;
+    queueTotals: GenericStorageQuery<() => Array<[number, bigint]>>;
 
     /**
      * The queues of bids. Indexed by duration (in `Period`s).
@@ -3052,14 +3000,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletNisBid>> =} callback
      **/
-    queues: GenericStorageQuery<Rv, (arg: number) => Array<PalletNisBid>, number>;
+    queues: GenericStorageQuery<(arg: number) => Array<PalletNisBid>, number>;
 
     /**
      * Summary information over the general state.
      *
      * @param {Callback<PalletNisSummaryRecord> =} callback
      **/
-    summary: GenericStorageQuery<Rv, () => PalletNisSummaryRecord>;
+    summary: GenericStorageQuery<() => PalletNisSummaryRecord>;
 
     /**
      * The currently outstanding receipts, indexed according to the order of creation.
@@ -3067,12 +3015,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNisReceiptRecord | undefined> =} callback
      **/
-    receipts: GenericStorageQuery<Rv, (arg: number) => PalletNisReceiptRecord | undefined, number>;
+    receipts: GenericStorageQuery<(arg: number) => PalletNisReceiptRecord | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Uniques`'s storage queries
@@ -3084,7 +3032,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionDetails | undefined> =} callback
      **/
-    class: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionDetails | undefined, number>;
+    class: GenericStorageQuery<(arg: number) => PalletUniquesCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -3092,7 +3040,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -3102,7 +3050,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -3114,7 +3061,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    classAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
+    classAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -3122,7 +3069,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletUniquesItemDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
+    asset: GenericStorageQuery<(arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -3130,7 +3077,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionMetadata | undefined> =} callback
      **/
-    classMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
+    classMetadataOf: GenericStorageQuery<(arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -3139,7 +3086,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
      **/
     instanceMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletUniquesItemMetadata | undefined,
       [number, number]
     >;
@@ -3151,7 +3097,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, bigint] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (arg: [number, number | undefined, BytesLike]) => [Bytes, bigint] | undefined,
       [number, number | undefined, Bytes]
     >;
@@ -3163,7 +3108,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -3174,12 +3118,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    collectionMaxSupply: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    collectionMaxSupply: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Nfts`'s storage queries
@@ -3191,7 +3135,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionDetails | undefined> =} callback
      **/
-    collection: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionDetails | undefined, number>;
+    collection: GenericStorageQuery<(arg: number) => PalletNftsCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -3199,7 +3143,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -3209,7 +3153,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -3221,11 +3164,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    collectionAccount: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => [] | undefined,
-      [AccountId32, number]
-    >;
+    collectionAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -3235,7 +3174,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsBitFlagsCollectionRole | undefined> =} callback
      **/
     collectionRoleOf: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletNftsBitFlagsCollectionRole | undefined,
       [number, AccountId32]
     >;
@@ -3246,7 +3184,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemDetails | undefined> =} callback
      **/
-    item: GenericStorageQuery<Rv, (arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
+    item: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -3254,7 +3192,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionMetadata | undefined> =} callback
      **/
-    collectionMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionMetadata | undefined, number>;
+    collectionMetadataOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -3263,7 +3201,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsItemMetadata | undefined> =} callback
      **/
     itemMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletNftsItemMetadata | undefined,
       [number, number]
     >;
@@ -3275,7 +3212,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, PalletNftsAttributeDeposit] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (
         arg: [number, number | undefined, PalletNftsAttributeNamespace, BytesLike],
       ) => [Bytes, PalletNftsAttributeDeposit] | undefined,
@@ -3289,7 +3225,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -3300,7 +3235,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    itemAttributesApprovalsOf: GenericStorageQuery<Rv, (arg: [number, number]) => Array<AccountId32>, [number, number]>;
+    itemAttributesApprovalsOf: GenericStorageQuery<(arg: [number, number]) => Array<AccountId32>, [number, number]>;
 
     /**
      * Stores the `CollectionId` that is going to be used for the next collection.
@@ -3308,7 +3243,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextCollectionId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextCollectionId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Handles all the pending swaps.
@@ -3316,11 +3251,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsPendingSwap | undefined> =} callback
      **/
-    pendingSwapOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsPendingSwap | undefined,
-      [number, number]
-    >;
+    pendingSwapOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsPendingSwap | undefined, [number, number]>;
 
     /**
      * Config of a collection.
@@ -3328,7 +3259,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionConfig | undefined> =} callback
      **/
-    collectionConfigOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionConfig | undefined, number>;
+    collectionConfigOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionConfig | undefined, number>;
 
     /**
      * Config of an item.
@@ -3336,16 +3267,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemConfig | undefined> =} callback
      **/
-    itemConfigOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsItemConfig | undefined,
-      [number, number]
-    >;
+    itemConfigOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemConfig | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NftFractionalization`'s storage queries
@@ -3358,7 +3285,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftFractionalizationDetails | undefined> =} callback
      **/
     nftToAsset: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletNftFractionalizationDetails | undefined,
       [number, number]
     >;
@@ -3366,7 +3292,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Salary`'s storage queries
@@ -3377,7 +3303,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletSalaryStatusType | undefined> =} callback
      **/
-    status: GenericStorageQuery<Rv, () => PalletSalaryStatusType | undefined>;
+    status: GenericStorageQuery<() => PalletSalaryStatusType | undefined>;
 
     /**
      * The status of a claimant.
@@ -3385,12 +3311,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletSalaryClaimantStatus | undefined> =} callback
      **/
-    claimant: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSalaryClaimantStatus | undefined, AccountId32>;
+    claimant: GenericStorageQuery<(arg: AccountId32Like) => PalletSalaryClaimantStatus | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CoreFellowship`'s storage queries
@@ -3401,7 +3327,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletCoreFellowshipParamsType> =} callback
      **/
-    params: GenericStorageQuery<Rv, () => PalletCoreFellowshipParamsType>;
+    params: GenericStorageQuery<() => PalletCoreFellowshipParamsType>;
 
     /**
      * The status of a claimant.
@@ -3409,11 +3335,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletCoreFellowshipMemberStatus | undefined> =} callback
      **/
-    member: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletCoreFellowshipMemberStatus | undefined,
-      AccountId32
-    >;
+    member: GenericStorageQuery<(arg: AccountId32Like) => PalletCoreFellowshipMemberStatus | undefined, AccountId32>;
 
     /**
      * Some evidence together with the desired outcome for which it was presented.
@@ -3422,7 +3344,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[PalletCoreFellowshipWish, Bytes] | undefined> =} callback
      **/
     memberEvidence: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => [PalletCoreFellowshipWish, Bytes] | undefined,
       AccountId32
     >;
@@ -3430,7 +3351,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionStorage`'s storage queries
@@ -3443,7 +3364,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PalletTransactionStorageTransactionInfo> | undefined> =} callback
      **/
     transactions: GenericStorageQuery<
-      Rv,
       (arg: number) => Array<PalletTransactionStorageTransactionInfo> | undefined,
       number
     >;
@@ -3454,21 +3374,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    chunkCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    chunkCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Storage fee per byte.
      *
      * @param {Callback<bigint | undefined> =} callback
      **/
-    byteFee: GenericStorageQuery<Rv, () => bigint | undefined>;
+    byteFee: GenericStorageQuery<() => bigint | undefined>;
 
     /**
      * Storage fee per transaction.
      *
      * @param {Callback<bigint | undefined> =} callback
      **/
-    entryFee: GenericStorageQuery<Rv, () => bigint | undefined>;
+    entryFee: GenericStorageQuery<() => bigint | undefined>;
 
     /**
      * Storage period for data in blocks. Should match `sp_storage_proof::DEFAULT_STORAGE_PERIOD`
@@ -3476,25 +3396,25 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    storagePeriod: GenericStorageQuery<Rv, () => number>;
+    storagePeriod: GenericStorageQuery<() => number>;
 
     /**
      *
      * @param {Callback<Array<PalletTransactionStorageTransactionInfo>> =} callback
      **/
-    blockTransactions: GenericStorageQuery<Rv, () => Array<PalletTransactionStorageTransactionInfo>>;
+    blockTransactions: GenericStorageQuery<() => Array<PalletTransactionStorageTransactionInfo>>;
 
     /**
      * Was the proof checked in this block?
      *
      * @param {Callback<boolean> =} callback
      **/
-    proofChecked: GenericStorageQuery<Rv, () => boolean>;
+    proofChecked: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `VoterList`'s storage queries
@@ -3508,14 +3428,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBagsListListNode | undefined> =} callback
      **/
-    listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
+    listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForListNodes: GenericStorageQuery<Rv, () => number>;
+    counterForListNodes: GenericStorageQuery<() => number>;
 
     /**
      * A bag stored in storage.
@@ -3525,12 +3445,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletBagsListListBag | undefined> =} callback
      **/
-    listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
+    listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -3544,7 +3464,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
      **/
-    migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
+    migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
 
     /**
      * The limits that are imposed on automatic migrations.
@@ -3553,7 +3473,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * The maximum limits that the signed migration could use.
@@ -3562,12 +3482,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ChildBounties`'s storage queries
@@ -3579,7 +3499,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    childBountyCount: GenericStorageQuery<Rv, () => number>;
+    childBountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Number of active child bounties per parent bounty.
@@ -3588,7 +3508,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Number of total child bounties per parent bounty, including completed bounties.
@@ -3596,7 +3516,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentTotalChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentTotalChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Child bounties that have been added.
@@ -3605,7 +3525,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletChildBountiesChildBounty | undefined> =} callback
      **/
     childBounties: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletChildBountiesChildBounty | undefined,
       [number, number]
     >;
@@ -3618,7 +3537,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    childBountyDescriptionsV1: GenericStorageQuery<Rv, (arg: [number, number]) => Bytes | undefined, [number, number]>;
+    childBountyDescriptionsV1: GenericStorageQuery<(arg: [number, number]) => Bytes | undefined, [number, number]>;
 
     /**
      * The mapping of the child bounty ids from storage version `V0` to the new `V1` version.
@@ -3630,7 +3549,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    v0ToV1ChildBountyIds: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    v0ToV1ChildBountyIds: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * The cumulative child-bounty curator fee for each parent bounty.
@@ -3638,12 +3557,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    childrenCuratorFees: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    childrenCuratorFees: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -3654,7 +3573,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -3662,7 +3581,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -3673,7 +3592,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -3681,7 +3600,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -3694,12 +3613,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -3713,7 +3632,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -3726,12 +3644,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Whitelist`'s storage queries
@@ -3742,12 +3660,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+    whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AllianceMotion`'s storage queries
@@ -3758,7 +3676,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -3766,7 +3684,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<KitchensinkRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -3777,7 +3695,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId32, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId32, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId32, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -3785,33 +3703,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Alliance`'s storage queries
@@ -3823,14 +3741,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletAllianceCid | undefined> =} callback
      **/
-    rule: GenericStorageQuery<Rv, () => PalletAllianceCid | undefined>;
+    rule: GenericStorageQuery<() => PalletAllianceCid | undefined>;
 
     /**
      * The current IPFS CIDs of any announcements.
      *
      * @param {Callback<Array<PalletAllianceCid>> =} callback
      **/
-    announcements: GenericStorageQuery<Rv, () => Array<PalletAllianceCid>>;
+    announcements: GenericStorageQuery<() => Array<PalletAllianceCid>>;
 
     /**
      * Maps members to their candidacy deposit.
@@ -3838,7 +3756,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    depositOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    depositOf: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * Maps member type to members of each type.
@@ -3846,7 +3764,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {PalletAllianceMemberRole} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, (arg: PalletAllianceMemberRole) => Array<AccountId32>, PalletAllianceMemberRole>;
+    members: GenericStorageQuery<(arg: PalletAllianceMemberRole) => Array<AccountId32>, PalletAllianceMemberRole>;
 
     /**
      * A set of members who gave a retirement notice. They can retire after the end of retirement
@@ -3855,7 +3773,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    retiringMembers: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    retiringMembers: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The current list of accounts deemed unscrupulous. These accounts non grata cannot submit
@@ -3863,19 +3781,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    unscrupulousAccounts: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    unscrupulousAccounts: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The current list of websites deemed unscrupulous.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    unscrupulousWebsites: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    unscrupulousWebsites: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -3890,14 +3808,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+    totalValueLocked: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+    minJoinBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -3910,7 +3828,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+    minCreateBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -3918,7 +3836,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPools: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -3926,7 +3844,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -3934,7 +3852,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -3943,7 +3861,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
 
     /**
      * Active members.
@@ -3954,7 +3872,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -3964,7 +3881,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -3972,14 +3889,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+    counterForBondedPools: GenericStorageQuery<() => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -3988,14 +3905,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+    counterForRewardPools: GenericStorageQuery<() => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -4004,14 +3921,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
 
     /**
      * Metadata for the pool.
@@ -4019,21 +3936,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<Rv, () => number>;
+    counterForMetadata: GenericStorageQuery<() => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<Rv, () => number>;
+    lastPoolId: GenericStorageQuery<() => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -4044,14 +3961,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -4059,16 +3976,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
-      AccountId32
-    >;
+    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `RankedPolls`'s storage queries
@@ -4079,7 +3992,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -4087,7 +4000,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfoTally | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfoTally | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfoTally | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -4098,7 +4011,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, number]>, number>;
+    trackQueue: GenericStorageQuery<(arg: number) => Array<[number, number]>, number>;
 
     /**
      * The number of referenda being decided currently.
@@ -4106,7 +4019,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    decidingCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The metadata is a general information concerning the referendum.
@@ -4119,12 +4032,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `RankedCollective`'s storage queries
@@ -4137,7 +4050,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    memberCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    memberCount: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * The current members of the collective.
@@ -4145,11 +4058,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRankedCollectiveMemberRecord | undefined> =} callback
      **/
-    members: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletRankedCollectiveMemberRecord | undefined,
-      AccountId32
-    >;
+    members: GenericStorageQuery<(arg: AccountId32Like) => PalletRankedCollectiveMemberRecord | undefined, AccountId32>;
 
     /**
      * The index of each ranks's member into the group of members who have at least that rank.
@@ -4157,7 +4066,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    idToIndex: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => number | undefined, [number, AccountId32]>;
+    idToIndex: GenericStorageQuery<(arg: [number, AccountId32Like]) => number | undefined, [number, AccountId32]>;
 
     /**
      * The members in the collective by index. All indices in the range `0..MemberCount` will
@@ -4166,7 +4075,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    indexToId: GenericStorageQuery<Rv, (arg: [number, number]) => AccountId32 | undefined, [number, number]>;
+    indexToId: GenericStorageQuery<(arg: [number, number]) => AccountId32 | undefined, [number, number]>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -4175,7 +4084,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRankedCollectiveVoteRecord | undefined> =} callback
      **/
     voting: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletRankedCollectiveVoteRecord | undefined,
       [number, AccountId32]
     >;
@@ -4185,12 +4093,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    votingCleanup: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    votingCleanup: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetConversion`'s storage queries
@@ -4204,7 +4112,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetConversionPoolInfo | undefined> =} callback
      **/
     pools: GenericStorageQuery<
-      Rv,
       (
         arg: [FrameSupportTokensFungibleUnionOfNativeOrWithId, FrameSupportTokensFungibleUnionOfNativeOrWithId],
       ) => PalletAssetConversionPoolInfo | undefined,
@@ -4217,12 +4124,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextPoolAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextPoolAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `FastUnstake`'s storage queries
@@ -4235,7 +4142,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletFastUnstakeUnstakeRequest | undefined> =} callback
      **/
-    head: GenericStorageQuery<Rv, () => PalletFastUnstakeUnstakeRequest | undefined>;
+    head: GenericStorageQuery<() => PalletFastUnstakeUnstakeRequest | undefined>;
 
     /**
      * The map of all accounts wishing to be unstaked.
@@ -4245,14 +4152,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    queue: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    queue: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForQueue: GenericStorageQuery<Rv, () => number>;
+    counterForQueue: GenericStorageQuery<() => number>;
 
     /**
      * Number of eras to check per block.
@@ -4266,12 +4173,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    erasToCheckPerBlock: GenericStorageQuery<Rv, () => number>;
+    erasToCheckPerBlock: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -4283,14 +4190,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
-    bookStateFor: GenericStorageQuery<Rv, (arg: number) => PalletMessageQueueBookState, number>;
+    bookStateFor: GenericStorageQuery<(arg: number) => PalletMessageQueueBookState, number>;
 
     /**
      * The origin at which we should begin servicing.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => number | undefined>;
+    serviceHead: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -4298,12 +4205,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
-    pages: GenericStorageQuery<Rv, (arg: [number, number]) => PalletMessageQueuePage | undefined, [number, number]>;
+    pages: GenericStorageQuery<(arg: [number, number]) => PalletMessageQueuePage | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Pov`'s storage queries
@@ -4313,40 +4220,40 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    value: GenericStorageQuery<Rv, () => number | undefined>;
+    value: GenericStorageQuery<() => number | undefined>;
 
     /**
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    value2: GenericStorageQuery<Rv, () => number | undefined>;
+    value2: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A value without a MEL bound.
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    unboundedValue: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    unboundedValue: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * A value with a MEL bound of 32 byte.
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    boundedValue: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    boundedValue: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * 4MiB value.
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    largeValue: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    largeValue: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    largeValue2: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    largeValue2: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * A map with a maximum of 1M entries.
@@ -4354,7 +4261,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    map1M: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    map1M: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * A map with a maximum of 16M entries.
@@ -4362,40 +4269,40 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    map16M: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    map16M: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      *
      * @param {[number, number]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    doubleMap1M: GenericStorageQuery<Rv, (arg: [number, number]) => number | undefined, [number, number]>;
+    doubleMap1M: GenericStorageQuery<(arg: [number, number]) => number | undefined, [number, number]>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    unboundedMap: GenericStorageQuery<Rv, (arg: number) => Array<number> | undefined, number>;
+    unboundedMap: GenericStorageQuery<(arg: number) => Array<number> | undefined, number>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    unboundedMap2: GenericStorageQuery<Rv, (arg: number) => Array<number> | undefined, number>;
+    unboundedMap2: GenericStorageQuery<(arg: number) => Array<number> | undefined, number>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    unboundedMapTwox: GenericStorageQuery<Rv, (arg: number) => Array<number> | undefined, number>;
+    unboundedMapTwox: GenericStorageQuery<(arg: number) => Array<number> | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TxPause`'s storage queries
@@ -4407,12 +4314,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[BytesLike, BytesLike]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pausedCalls: GenericStorageQuery<Rv, (arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
+    pausedCalls: GenericStorageQuery<(arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `SafeMode`'s storage queries
@@ -4427,7 +4334,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    enteredUntil: GenericStorageQuery<Rv, () => number | undefined>;
+    enteredUntil: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Holds the reserve that was taken from an account at a specific block number.
@@ -4438,12 +4345,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    deposits: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => bigint | undefined, [AccountId32, number]>;
+    deposits: GenericStorageQuery<(arg: [AccountId32Like, number]) => bigint | undefined, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -4456,7 +4363,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
      **/
-    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+    cursor: GenericStorageQuery<() => PalletMigrationsMigrationCursor | undefined>;
 
     /**
      * Set of all successfully executed migrations.
@@ -4467,12 +4374,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+    historic: GenericStorageQuery<(arg: BytesLike) => [] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Broker`'s storage queries
@@ -4483,35 +4390,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletBrokerConfigRecord | undefined> =} callback
      **/
-    configuration: GenericStorageQuery<Rv, () => PalletBrokerConfigRecord | undefined>;
+    configuration: GenericStorageQuery<() => PalletBrokerConfigRecord | undefined>;
 
     /**
      * The Polkadot Core reservations (generally tasked with the maintenance of System Chains).
      *
      * @param {Callback<Array<Array<PalletBrokerScheduleItem>>> =} callback
      **/
-    reservations: GenericStorageQuery<Rv, () => Array<Array<PalletBrokerScheduleItem>>>;
+    reservations: GenericStorageQuery<() => Array<Array<PalletBrokerScheduleItem>>>;
 
     /**
      * The Polkadot Core legacy leases.
      *
      * @param {Callback<Array<PalletBrokerLeaseRecordItem>> =} callback
      **/
-    leases: GenericStorageQuery<Rv, () => Array<PalletBrokerLeaseRecordItem>>;
+    leases: GenericStorageQuery<() => Array<PalletBrokerLeaseRecordItem>>;
 
     /**
      * The current status of miscellaneous subsystems of this pallet.
      *
      * @param {Callback<PalletBrokerStatusRecord | undefined> =} callback
      **/
-    status: GenericStorageQuery<Rv, () => PalletBrokerStatusRecord | undefined>;
+    status: GenericStorageQuery<() => PalletBrokerStatusRecord | undefined>;
 
     /**
      * The details of the current sale, including its properties and status.
      *
      * @param {Callback<PalletBrokerSaleInfoRecord | undefined> =} callback
      **/
-    saleInfo: GenericStorageQuery<Rv, () => PalletBrokerSaleInfoRecord | undefined>;
+    saleInfo: GenericStorageQuery<() => PalletBrokerSaleInfoRecord | undefined>;
 
     /**
      * Records of potential renewals.
@@ -4522,7 +4429,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletBrokerPotentialRenewalRecord | undefined> =} callback
      **/
     potentialRenewals: GenericStorageQuery<
-      Rv,
       (arg: PalletBrokerPotentialRenewalId) => PalletBrokerPotentialRenewalRecord | undefined,
       PalletBrokerPotentialRenewalId
     >;
@@ -4534,7 +4440,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletBrokerRegionRecord | undefined> =} callback
      **/
     regions: GenericStorageQuery<
-      Rv,
       (arg: PalletBrokerRegionId) => PalletBrokerRegionRecord | undefined,
       PalletBrokerRegionId
     >;
@@ -4546,7 +4451,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PalletBrokerScheduleItem> | undefined> =} callback
      **/
     workplan: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => Array<PalletBrokerScheduleItem> | undefined,
       [number, number]
     >;
@@ -4557,7 +4461,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PalletBrokerScheduleItem>> =} callback
      **/
-    workload: GenericStorageQuery<Rv, (arg: number) => Array<PalletBrokerScheduleItem>, number>;
+    workload: GenericStorageQuery<(arg: number) => Array<PalletBrokerScheduleItem>, number>;
 
     /**
      * Record of a single contribution to the Instantaneous Coretime Pool.
@@ -4566,7 +4470,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletBrokerContributionRecord | undefined> =} callback
      **/
     instaPoolContribution: GenericStorageQuery<
-      Rv,
       (arg: PalletBrokerRegionId) => PalletBrokerContributionRecord | undefined,
       PalletBrokerRegionId
     >;
@@ -4577,7 +4480,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBrokerPoolIoRecord> =} callback
      **/
-    instaPoolIo: GenericStorageQuery<Rv, (arg: number) => PalletBrokerPoolIoRecord, number>;
+    instaPoolIo: GenericStorageQuery<(arg: number) => PalletBrokerPoolIoRecord, number>;
 
     /**
      * Total InstaPool rewards for each Timeslice and the number of core parts which contributed.
@@ -4585,14 +4488,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBrokerInstaPoolHistoryRecord | undefined> =} callback
      **/
-    instaPoolHistory: GenericStorageQuery<Rv, (arg: number) => PalletBrokerInstaPoolHistoryRecord | undefined, number>;
+    instaPoolHistory: GenericStorageQuery<(arg: number) => PalletBrokerInstaPoolHistoryRecord | undefined, number>;
 
     /**
      * Received core count change from the relay chain.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    coreCountInbox: GenericStorageQuery<Rv, () => number | undefined>;
+    coreCountInbox: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Keeping track of cores which have auto-renewal enabled.
@@ -4601,19 +4504,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletBrokerAutoRenewalRecord>> =} callback
      **/
-    autoRenewals: GenericStorageQuery<Rv, () => Array<PalletBrokerAutoRenewalRecord>>;
+    autoRenewals: GenericStorageQuery<() => Array<PalletBrokerAutoRenewalRecord>>;
 
     /**
      * Received revenue info from the relay chain.
      *
      * @param {Callback<PalletBrokerOnDemandRevenueRecord | undefined> =} callback
      **/
-    revenueInbox: GenericStorageQuery<Rv, () => PalletBrokerOnDemandRevenueRecord | undefined>;
+    revenueInbox: GenericStorageQuery<() => PalletBrokerOnDemandRevenueRecord | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TasksExample`'s storage queries
@@ -4624,7 +4527,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number]> =} callback
      **/
-    total: GenericStorageQuery<Rv, () => [number, number]>;
+    total: GenericStorageQuery<() => [number, number]>;
 
     /**
      * Numbers to be added into the total.
@@ -4632,12 +4535,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    numbers: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    numbers: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Mixnet`'s storage queries
@@ -4649,14 +4552,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentSessionIndex: GenericStorageQuery<Rv, () => number>;
+    currentSessionIndex: GenericStorageQuery<() => number>;
 
     /**
      * Block in which the current session started.
      *
      * @param {Callback<number> =} callback
      **/
-    currentSessionStartBlock: GenericStorageQuery<Rv, () => number>;
+    currentSessionStartBlock: GenericStorageQuery<() => number>;
 
     /**
      * Authority list for the next session.
@@ -4664,7 +4567,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<SpMixnetAppPublic | undefined> =} callback
      **/
-    nextAuthorityIds: GenericStorageQuery<Rv, (arg: number) => SpMixnetAppPublic | undefined, number>;
+    nextAuthorityIds: GenericStorageQuery<(arg: number) => SpMixnetAppPublic | undefined, number>;
 
     /**
      * Mixnode sets by session index. Only the mixnode sets for the previous, current, and next
@@ -4677,16 +4580,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletMixnetBoundedMixnode | undefined> =} callback
      **/
-    mixnodes: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletMixnetBoundedMixnode | undefined,
-      [number, number]
-    >;
+    mixnodes: GenericStorageQuery<(arg: [number, number]) => PalletMixnetBoundedMixnode | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Parameters`'s storage queries
@@ -4699,7 +4598,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<KitchensinkRuntimeRuntimeParametersValue | undefined> =} callback
      **/
     parameters: GenericStorageQuery<
-      Rv,
       (arg: KitchensinkRuntimeRuntimeParametersKey) => KitchensinkRuntimeRuntimeParametersValue | undefined,
       KitchensinkRuntimeRuntimeParametersKey
     >;
@@ -4707,7 +4605,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PalletExampleMbms`'s storage queries
@@ -4719,12 +4617,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    myMap: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    myMap: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Revive`'s storage queries
@@ -4736,7 +4634,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
 
     /**
      * A mapping from a contract's code hash to its code info.
@@ -4744,7 +4642,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletReviveWasmCodeInfo | undefined> =} callback
      **/
-    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletReviveWasmCodeInfo | undefined, H256>;
+    codeInfoOf: GenericStorageQuery<(arg: H256) => PalletReviveWasmCodeInfo | undefined, H256>;
 
     /**
      * The code associated with a given account.
@@ -4752,7 +4650,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<PalletReviveStorageContractInfo | undefined> =} callback
      **/
-    contractInfoOf: GenericStorageQuery<Rv, (arg: H160) => PalletReviveStorageContractInfo | undefined, H160>;
+    contractInfoOf: GenericStorageQuery<(arg: H160) => PalletReviveStorageContractInfo | undefined, H160>;
 
     /**
      * The immutable data associated with a given account.
@@ -4760,7 +4658,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    immutableDataOf: GenericStorageQuery<Rv, (arg: H160) => Bytes | undefined, H160>;
+    immutableDataOf: GenericStorageQuery<(arg: H160) => Bytes | undefined, H160>;
 
     /**
      * Evicted contracts that await child trie deletion.
@@ -4771,7 +4669,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    deletionQueue: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    deletionQueue: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * A pair of monotonic counters used to track the latest contract marked for deletion
@@ -4779,7 +4677,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletReviveStorageDeletionQueueManager> =} callback
      **/
-    deletionQueueCounter: GenericStorageQuery<Rv, () => PalletReviveStorageDeletionQueueManager>;
+    deletionQueueCounter: GenericStorageQuery<() => PalletReviveStorageDeletionQueueManager>;
 
     /**
      * Map a Ethereum address to its original `AccountId32`.
@@ -4792,12 +4690,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    originalAccount: GenericStorageQuery<Rv, (arg: H160) => AccountId32 | undefined, H160>;
+    originalAccount: GenericStorageQuery<(arg: H160) => AccountId32 | undefined, H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DelegatedStaking`'s storage queries
@@ -4813,7 +4711,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDelegatedStakingDelegation | undefined> =} callback
      **/
     delegators: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined,
       AccountId32
     >;
@@ -4823,7 +4720,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForDelegators: GenericStorageQuery<Rv, () => number>;
+    counterForDelegators: GenericStorageQuery<() => number>;
 
     /**
      * Map of `Agent` to their `Ledger`.
@@ -4831,23 +4728,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDelegatedStakingAgentLedger | undefined> =} callback
      **/
-    agents: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined,
-      AccountId32
-    >;
+    agents: GenericStorageQuery<(arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForAgents: GenericStorageQuery<Rv, () => number>;
+    counterForAgents: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRewards`'s storage queries
@@ -4860,7 +4753,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetRewardsPoolStakerInfo | undefined> =} callback
      **/
     poolStakers: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetRewardsPoolStakerInfo | undefined,
       [number, AccountId32]
     >;
@@ -4871,7 +4763,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetRewardsPoolInfo | undefined> =} callback
      **/
-    pools: GenericStorageQuery<Rv, (arg: number) => PalletAssetRewardsPoolInfo | undefined, number>;
+    pools: GenericStorageQuery<(arg: number) => PalletAssetRewardsPoolInfo | undefined, number>;
 
     /**
      * The cost associated with storing pool information on-chain which was incurred by the pool
@@ -4883,7 +4775,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined> =} callback
      **/
     poolCost: GenericStorageQuery<
-      Rv,
       (arg: number) => [AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined,
       number
     >;
@@ -4895,12 +4786,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    nextPoolId: GenericStorageQuery<Rv, () => number>;
+    nextPoolId: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetsFreezer`'s storage queries
@@ -4913,7 +4804,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       [number, AccountId32]
     >;
@@ -4924,15 +4814,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    frozenBalances: GenericStorageQuery<
-      Rv,
-      (arg: [number, AccountId32Like]) => bigint | undefined,
-      [number, AccountId32]
-    >;
+    frozenBalances: GenericStorageQuery<(arg: [number, AccountId32Like]) => bigint | undefined, [number, AccountId32]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }