@dedot/chaintypes 0.194.0 → 0.196.0

package/westend/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,
@@ -152,7 +152,7 @@ import type {
   SpConsensusBeefyMmrBeefyAuthoritySet,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -163,35 +163,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.
@@ -199,7 +199,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).
@@ -207,28 +207,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.
@@ -241,14 +241,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
@@ -265,21 +265,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
@@ -287,21 +287,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.
@@ -314,12 +314,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
@@ -330,14 +330,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
@@ -345,14 +345,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.
@@ -368,28 +368,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.
@@ -404,7 +404,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.
@@ -412,7 +412,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`
@@ -420,7 +420,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
@@ -430,7 +430,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
@@ -441,7 +441,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.
@@ -452,7 +452,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
@@ -460,7 +460,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
@@ -468,7 +468,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
@@ -482,12 +482,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
@@ -498,7 +498,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.
@@ -508,12 +508,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 `Indices`'s storage queries
@@ -525,12 +525,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
@@ -541,14 +541,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.
@@ -579,7 +579,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.
@@ -590,7 +590,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.
@@ -600,7 +600,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.
@@ -608,7 +608,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.
@@ -617,7 +617,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -625,7 +624,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
@@ -635,18 +634,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 `Authorship`'s storage queries
@@ -657,12 +656,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 `Staking`'s storage queries
@@ -673,14 +672,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
@@ -689,7 +688,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.
@@ -699,28 +698,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.
@@ -729,7 +728,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.
@@ -740,7 +739,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.
@@ -750,7 +749,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.
@@ -760,14 +759,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.
@@ -776,7 +775,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
@@ -802,14 +801,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.
@@ -822,14 +821,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.
@@ -838,7 +837,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.
@@ -848,7 +847,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.
@@ -858,7 +857,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.
@@ -869,7 +868,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.
@@ -884,7 +883,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.
@@ -904,7 +903,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -931,7 +929,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingExposure> =} callback
      **/
     erasStakersClipped: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingExposure,
       [number, AccountId32]
     >;
@@ -948,7 +945,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]
     >;
@@ -964,7 +960,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.
@@ -977,7 +973,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs,
       [number, AccountId32]
     >;
@@ -990,7 +985,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.
@@ -999,7 +994,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.
@@ -1008,14 +1003,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
@@ -1024,7 +1019,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.
@@ -1033,7 +1028,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
@@ -1041,7 +1036,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.
@@ -1049,7 +1044,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.
@@ -1059,7 +1054,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
@@ -1069,7 +1064,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]
     >;
@@ -1081,7 +1075,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     nominatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => bigint | undefined,
       [number, AccountId32]
     >;
@@ -1093,7 +1086,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSlashingSpans | undefined> =} callback
      **/
     slashingSpans: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined,
       AccountId32
     >;
@@ -1106,7 +1098,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingSlashingSpanRecord> =} callback
      **/
     spanSlash: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord,
       [AccountId32, number]
     >;
@@ -1118,7 +1109,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 /
@@ -1127,12 +1118,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 `Offences`'s storage queries
@@ -1144,7 +1135,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.
@@ -1153,7 +1144,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]
     >;
@@ -1161,7 +1151,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
@@ -1173,19 +1163,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 `Parameters`'s storage queries
@@ -1198,7 +1188,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<WestendRuntimeRuntimeParametersValue | undefined> =} callback
      **/
     parameters: GenericStorageQuery<
-      Rv,
       (arg: WestendRuntimeRuntimeParametersKey) => WestendRuntimeRuntimeParametersValue | undefined,
       WestendRuntimeRuntimeParametersKey
     >;
@@ -1206,7 +1195,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1217,14 +1206,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
@@ -1232,7 +1221,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
@@ -1240,7 +1229,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, WestendRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, WestendRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, WestendRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1251,7 +1240,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.
@@ -1259,7 +1248,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<WestendRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => WestendRuntimeSessionKeys | undefined, AccountId32>;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => WestendRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1268,7 +1257,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1276,7 +1264,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Grandpa`'s storage queries
@@ -1287,28 +1275,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)
@@ -1316,7 +1304,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
@@ -1333,19 +1321,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 `AuthorityDiscovery`'s storage queries
@@ -1356,19 +1344,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 `Identity`'s storage queries
@@ -1383,7 +1371,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.
@@ -1391,7 +1379,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
@@ -1400,7 +1388,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.
@@ -1412,7 +1400,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
@@ -1422,7 +1410,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.
@@ -1430,7 +1418,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
@@ -1443,7 +1431,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
@@ -1457,7 +1445,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
     >;
@@ -1471,12 +1458,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 `Recovery`'s storage queries
@@ -1488,11 +1475,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.
@@ -1504,7 +1487,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRecoveryActiveRecovery | undefined> =} callback
      **/
     activeRecoveries: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, AccountId32Like]) => PalletRecoveryActiveRecovery | undefined,
       [AccountId32, AccountId32]
     >;
@@ -1517,12 +1499,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
@@ -1534,11 +1516,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.
@@ -1547,12 +1525,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
@@ -1563,7 +1541,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.
@@ -1571,7 +1549,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.
@@ -1579,11 +1557,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.
@@ -1594,12 +1568,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 `Preimage`'s storage queries
@@ -1613,7 +1587,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @deprecated RequestStatusFor
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -1621,19 +1595,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 `Sudo`'s storage queries
@@ -1644,12 +1618,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 `Proxy`'s storage queries
@@ -1662,11 +1636,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).
@@ -1674,16 +1644,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
@@ -1696,7 +1662,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>]
     >;
@@ -1704,7 +1669,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ElectionProviderMultiPhase`'s storage queries
@@ -1720,14 +1685,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`.
@@ -1736,7 +1701,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.
@@ -1746,7 +1711,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.
@@ -1756,7 +1721,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`]
@@ -1766,7 +1731,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.
@@ -1781,7 +1746,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
@@ -1793,7 +1758,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.
@@ -1808,7 +1773,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined> =} callback
      **/
     signedSubmissionsMap: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined,
       number
     >;
@@ -1821,12 +1785,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 `VoterList`'s storage queries
@@ -1840,14 +1804,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.
@@ -1857,7 +1821,7 @@ 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>;
 
     /**
      * Pointer that remembers the next node that will be auto-rebagged.
@@ -1865,7 +1829,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    nextNodeAutoRebagged: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    nextNodeAutoRebagged: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Lock all updates to this pallet.
@@ -1875,12 +1839,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    lock: GenericStorageQuery<Rv, () => [] | undefined>;
+    lock: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -1895,14 +1859,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.
@@ -1915,7 +1879,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
@@ -1923,7 +1887,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
@@ -1931,7 +1895,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
@@ -1939,7 +1903,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
@@ -1948,7 +1912,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.
@@ -1959,7 +1923,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -1969,7 +1932,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -1977,14 +1940,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
@@ -1993,14 +1956,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
@@ -2009,14 +1972,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.
@@ -2024,21 +1987,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.
@@ -2049,14 +2012,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.
@@ -2064,16 +2027,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 `FastUnstake`'s storage queries
@@ -2086,7 +2045,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.
@@ -2096,14 +2055,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.
@@ -2117,12 +2076,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 `ConvictionVoting`'s storage queries
@@ -2136,7 +2095,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -2149,12 +2107,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 `Referenda`'s storage queries
@@ -2165,7 +2123,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.
@@ -2173,7 +2131,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
@@ -2184,7 +2142,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.
@@ -2192,7 +2150,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.
@@ -2205,12 +2163,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 `Whitelist`'s storage queries
@@ -2221,12 +2179,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 `Treasury`'s storage queries
@@ -2240,7 +2198,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.
@@ -2251,14 +2209,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.
@@ -2268,14 +2226,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.
@@ -2283,19 +2241,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 `DelegatedStaking`'s storage queries
@@ -2311,7 +2269,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDelegatedStakingDelegation | undefined> =} callback
      **/
     delegators: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined,
       AccountId32
     >;
@@ -2321,7 +2278,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`.
@@ -2329,23 +2286,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 `Configuration`'s storage queries
@@ -2356,7 +2309,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsConfigurationHostConfiguration> =} callback
      **/
-    activeConfig: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsConfigurationHostConfiguration>;
+    activeConfig: GenericStorageQuery<() => PolkadotRuntimeParachainsConfigurationHostConfiguration>;
 
     /**
      * Pending configuration changes.
@@ -2369,10 +2322,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>> =} callback
      **/
-    pendingConfigs: GenericStorageQuery<
-      Rv,
-      () => Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>
-    >;
+    pendingConfigs: GenericStorageQuery<() => Array<[number, PolkadotRuntimeParachainsConfigurationHostConfiguration]>>;
 
     /**
      * If this is set, then the configuration setters will bypass the consistency checks. This
@@ -2380,12 +2330,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    bypassConsistencyCheck: GenericStorageQuery<Rv, () => boolean>;
+    bypassConsistencyCheck: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasShared`'s storage queries
@@ -2396,7 +2346,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    currentSessionIndex: GenericStorageQuery<Rv, () => number>;
+    currentSessionIndex: GenericStorageQuery<() => number>;
 
     /**
      * All the validators actively participating in parachain consensus.
@@ -2404,7 +2354,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorIndex>> =} callback
      **/
-    activeValidatorIndices: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8ValidatorIndex>>;
+    activeValidatorIndices: GenericStorageQuery<() => Array<PolkadotPrimitivesV8ValidatorIndex>>;
 
     /**
      * The parachain attestation keys of the validators actively participating in parachain
@@ -2412,19 +2362,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorAppPublic>> =} callback
      **/
-    activeValidatorKeys: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8ValidatorAppPublic>>;
+    activeValidatorKeys: GenericStorageQuery<() => Array<PolkadotPrimitivesV8ValidatorAppPublic>>;
 
     /**
      * All allowed relay-parents.
      *
      * @param {Callback<PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker> =} callback
      **/
-    allowedRelayParents: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker>;
+    allowedRelayParents: GenericStorageQuery<() => PolkadotRuntimeParachainsSharedAllowedRelayParentsTracker>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaInclusion`'s storage queries
@@ -2441,7 +2391,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotRuntimeParachainsInclusionCandidatePendingAvailability> | undefined> =} callback
      **/
     v1: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => Array<PolkadotRuntimeParachainsInclusionCandidatePendingAvailability> | undefined,
@@ -2451,7 +2400,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaInherent`'s storage queries
@@ -2467,19 +2416,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    included: GenericStorageQuery<Rv, () => [] | undefined>;
+    included: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Scraped on chain data for extracting resolved disputes as well as backing votes.
      *
      * @param {Callback<PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined> =} callback
      **/
-    onChainVotes: GenericStorageQuery<Rv, () => PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>;
+    onChainVotes: GenericStorageQuery<() => PolkadotPrimitivesVstagingScrapedOnChainVotes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaScheduler`'s storage queries
@@ -2496,7 +2445,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Array<PolkadotPrimitivesV8ValidatorIndex>>> =} callback
      **/
-    validatorGroups: GenericStorageQuery<Rv, () => Array<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
+    validatorGroups: GenericStorageQuery<() => Array<Array<PolkadotPrimitivesV8ValidatorIndex>>>;
 
     /**
      * The block number where the session start occurred. Used to track how many group rotations
@@ -2509,7 +2458,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    sessionStartBlock: GenericStorageQuery<Rv, () => number>;
+    sessionStartBlock: GenericStorageQuery<() => number>;
 
     /**
      * One entry for each availability core. The `VecDeque` represents the assignments to be
@@ -2518,14 +2467,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotRuntimeParachainsSchedulerCommonAssignment>]>> =} callback
      **/
     claimQueue: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotPrimitivesV8CoreIndex, Array<PolkadotRuntimeParachainsSchedulerCommonAssignment>]>
     >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Paras`'s storage queries
@@ -2541,7 +2489,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasPvfCheckActiveVoteState | undefined> =} callback
      **/
     pvfActiveVoteMap: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => PolkadotRuntimeParachainsParasPvfCheckActiveVoteState | undefined,
@@ -2553,7 +2500,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>> =} callback
      **/
-    pvfActiveVoteList: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>;
+    pvfActiveVoteList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesValidationCodeHash>>;
 
     /**
      * All lease holding parachains. Ordered ascending by `ParaId`. On demand parachains are not
@@ -2563,7 +2510,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    parachains: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    parachains: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The current lifecycle of a all known Para IDs.
@@ -2572,7 +2519,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaLifecycle | undefined> =} callback
      **/
     paraLifecycles: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaLifecycle | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2584,7 +2530,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesHeadData | undefined> =} callback
      **/
     heads: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotParachainPrimitivesPrimitivesHeadData | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2596,7 +2541,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     mostRecentContext: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2610,7 +2554,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     currentCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -2627,7 +2570,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     pastCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: [PolkadotParachainPrimitivesPrimitivesId, number],
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -2643,7 +2585,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaPastCodeMeta> =} callback
      **/
     pastCodeMeta: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaPastCodeMeta,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2658,7 +2599,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    pastCodePruning: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    pastCodePruning: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The block number at which the planned code change is expected for a parachain.
@@ -2670,7 +2611,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     futureCodeUpgrades: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2687,7 +2627,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    futureCodeUpgradesAt: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    futureCodeUpgradesAt: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The actual future code hash of a para.
@@ -2698,7 +2638,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined> =} callback
      **/
     futureCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCodeHash | undefined,
@@ -2712,7 +2651,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasAuthorizedCodeHashAndExpiry | undefined> =} callback
      **/
     authorizedCodeHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotRuntimeParachainsParasAuthorizedCodeHashAndExpiry | undefined,
@@ -2735,7 +2673,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
     upgradeGoAheadSignal: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotPrimitivesV8UpgradeGoAhead | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2755,7 +2692,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
     upgradeRestrictionSignal: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotPrimitivesV8UpgradeRestriction | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2767,7 +2703,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    upgradeCooldowns: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    upgradeCooldowns: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The list of upcoming code upgrades.
@@ -2779,7 +2715,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, number]>> =} callback
      **/
-    upcomingUpgrades: GenericStorageQuery<Rv, () => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
+    upcomingUpgrades: GenericStorageQuery<() => Array<[PolkadotParachainPrimitivesPrimitivesId, number]>>;
 
     /**
      * The actions to perform during the start of a specific session index.
@@ -2787,7 +2723,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    actionsQueue: GenericStorageQuery<Rv, (arg: number) => Array<PolkadotParachainPrimitivesPrimitivesId>, number>;
+    actionsQueue: GenericStorageQuery<(arg: number) => Array<PolkadotParachainPrimitivesPrimitivesId>, number>;
 
     /**
      * Upcoming paras instantiation arguments.
@@ -2799,7 +2735,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsParasParaGenesisArgs | undefined> =} callback
      **/
     upcomingParasGenesis: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeParachainsParasParaGenesisArgs | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2811,7 +2746,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     codeByHashRefs: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash) => number,
       PolkadotParachainPrimitivesPrimitivesValidationCodeHash
     >;
@@ -2826,7 +2760,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesValidationCode | undefined> =} callback
      **/
     codeByHash: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesValidationCodeHash,
       ) => PolkadotParachainPrimitivesPrimitivesValidationCode | undefined,
@@ -2836,7 +2769,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Initializer`'s storage queries
@@ -2854,7 +2787,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    hasInitialized: GenericStorageQuery<Rv, () => [] | undefined>;
+    hasInitialized: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Buffered session changes.
@@ -2867,15 +2800,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>> =} callback
      **/
-    bufferedSessionChanges: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>
-    >;
+    bufferedSessionChanges: GenericStorageQuery<() => Array<PolkadotRuntimeParachainsInitializerBufferedSessionChange>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Dmp`'s storage queries
@@ -2888,7 +2818,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotCorePrimitivesInboundDownwardMessage>> =} callback
      **/
     downwardMessageQueues: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotCorePrimitivesInboundDownwardMessage>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2906,7 +2835,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256> =} callback
      **/
     downwardMessageQueueHeads: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => H256,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2918,7 +2846,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2926,7 +2853,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Hrmp`'s storage queries
@@ -2944,7 +2871,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest | undefined> =} callback
      **/
     hrmpOpenChannelRequests: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId,
       ) => PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest | undefined,
@@ -2955,10 +2881,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>> =} callback
      **/
-    hrmpOpenChannelRequestsList: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>
-    >;
+    hrmpOpenChannelRequestsList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>>;
 
     /**
      * This mapping tracks how many open channel requests are initiated by a given sender para.
@@ -2969,7 +2892,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     hrmpOpenChannelRequestCount: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2983,7 +2905,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number> =} callback
      **/
     hrmpAcceptedChannelRequestCount: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3001,7 +2922,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     hrmpCloseChannelRequests: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => [] | undefined,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3010,10 +2930,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>> =} callback
      **/
-    hrmpCloseChannelRequestsList: GenericStorageQuery<
-      Rv,
-      () => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>
-    >;
+    hrmpCloseChannelRequestsList: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesHrmpChannelId>>;
 
     /**
      * The HRMP watermark associated with each para.
@@ -3025,7 +2942,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     hrmpWatermarks: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => number | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3039,7 +2955,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsHrmpHrmpChannel | undefined> =} callback
      **/
     hrmpChannels: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => PolkadotRuntimeParachainsHrmpHrmpChannel | undefined,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3063,7 +2978,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
     hrmpIngressChannelsIndex: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotParachainPrimitivesPrimitivesId>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3074,7 +2988,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
     hrmpEgressChannelsIndex: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<PolkadotParachainPrimitivesPrimitivesId>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3087,7 +3000,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotCorePrimitivesInboundHrmpMessage>> =} callback
      **/
     hrmpChannelContents: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesHrmpChannelId) => Array<PolkadotCorePrimitivesInboundHrmpMessage>,
       PolkadotParachainPrimitivesPrimitivesHrmpChannelId
     >;
@@ -3104,7 +3016,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[number, Array<PolkadotParachainPrimitivesPrimitivesId>]>> =} callback
      **/
     hrmpChannelDigests: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<[number, Array<PolkadotParachainPrimitivesPrimitivesId>]>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3112,7 +3023,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParaSessionInfo`'s storage queries
@@ -3125,14 +3036,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotPrimitivesV8AssignmentAppPublic>> =} callback
      **/
-    assignmentKeysUnsafe: GenericStorageQuery<Rv, () => Array<PolkadotPrimitivesV8AssignmentAppPublic>>;
+    assignmentKeysUnsafe: GenericStorageQuery<() => Array<PolkadotPrimitivesV8AssignmentAppPublic>>;
 
     /**
      * The earliest session for which previous session info is stored.
      *
      * @param {Callback<number> =} callback
      **/
-    earliestStoredSession: GenericStorageQuery<Rv, () => number>;
+    earliestStoredSession: GenericStorageQuery<() => number>;
 
     /**
      * Session information in a rolling window.
@@ -3142,7 +3053,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PolkadotPrimitivesV8SessionInfo | undefined> =} callback
      **/
-    sessions: GenericStorageQuery<Rv, (arg: number) => PolkadotPrimitivesV8SessionInfo | undefined, number>;
+    sessions: GenericStorageQuery<(arg: number) => PolkadotPrimitivesV8SessionInfo | undefined, number>;
 
     /**
      * The validator account keys of the validators actively participating in parachain consensus.
@@ -3150,7 +3061,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<AccountId32> | undefined> =} callback
      **/
-    accountKeys: GenericStorageQuery<Rv, (arg: number) => Array<AccountId32> | undefined, number>;
+    accountKeys: GenericStorageQuery<(arg: number) => Array<AccountId32> | undefined, number>;
 
     /**
      * Executor parameter set for a given session index
@@ -3158,16 +3069,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PolkadotPrimitivesV8ExecutorParams | undefined> =} callback
      **/
-    sessionExecutorParams: GenericStorageQuery<
-      Rv,
-      (arg: number) => PolkadotPrimitivesV8ExecutorParams | undefined,
-      number
-    >;
+    sessionExecutorParams: GenericStorageQuery<(arg: number) => PolkadotPrimitivesV8ExecutorParams | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasDisputes`'s storage queries
@@ -3179,7 +3086,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastPrunedSession: GenericStorageQuery<Rv, () => number | undefined>;
+    lastPrunedSession: GenericStorageQuery<() => number | undefined>;
 
     /**
      * All ongoing or concluded disputes for the last several sessions.
@@ -3188,7 +3095,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesV8DisputeState | undefined> =} callback
      **/
     disputes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => PolkadotPrimitivesV8DisputeState | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3201,7 +3107,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PolkadotPrimitivesV8ValidatorIndex> | undefined> =} callback
      **/
     backersOnDisputes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => Array<PolkadotPrimitivesV8ValidatorIndex> | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3214,7 +3119,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     included: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => number | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3227,12 +3131,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    frozen: GenericStorageQuery<Rv, () => number | undefined>;
+    frozen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParasSlashing`'s storage queries
@@ -3245,7 +3149,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotPrimitivesVstagingPendingSlashes | undefined> =} callback
      **/
     unappliedSlashes: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotCorePrimitivesCandidateHash]) => PolkadotPrimitivesVstagingPendingSlashes | undefined,
       [number, PolkadotCorePrimitivesCandidateHash]
     >;
@@ -3256,12 +3159,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    validatorSetCounts: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    validatorSetCounts: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OnDemandAssignmentProvider`'s storage queries
@@ -3276,7 +3179,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsOnDemandTypesCoreAffinityCount | undefined> =} callback
      **/
     paraIdAffinity: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotRuntimeParachainsOnDemandTypesCoreAffinityCount | undefined,
@@ -3288,14 +3190,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsOnDemandTypesQueueStatusType> =} callback
      **/
-    queueStatus: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsOnDemandTypesQueueStatusType>;
+    queueStatus: GenericStorageQuery<() => PolkadotRuntimeParachainsOnDemandTypesQueueStatusType>;
 
     /**
      * Priority queue for all orders which don't yet (or not any more) have any core affinity.
      *
      * @param {Callback<BinaryHeapEnqueuedOrder> =} callback
      **/
-    freeEntries: GenericStorageQuery<Rv, () => BinaryHeapEnqueuedOrder>;
+    freeEntries: GenericStorageQuery<() => BinaryHeapEnqueuedOrder>;
 
     /**
      * Queue entries that are currently bound to a particular core due to core affinity.
@@ -3304,7 +3206,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BinaryHeapEnqueuedOrder> =} callback
      **/
     affinityEntries: GenericStorageQuery<
-      Rv,
       (arg: PolkadotPrimitivesV8CoreIndex) => BinaryHeapEnqueuedOrder,
       PolkadotPrimitivesV8CoreIndex
     >;
@@ -3314,7 +3215,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<bigint>> =} callback
      **/
-    revenue: GenericStorageQuery<Rv, () => Array<bigint>>;
+    revenue: GenericStorageQuery<() => Array<bigint>>;
 
     /**
      * Keeps track of credits owned by each account.
@@ -3322,12 +3223,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    credits: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    credits: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CoretimeAssignmentProvider`'s storage queries
@@ -3343,7 +3244,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsAssignerCoretimeSchedule | undefined> =} callback
      **/
     coreSchedules: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotPrimitivesV8CoreIndex]) => PolkadotRuntimeParachainsAssignerCoretimeSchedule | undefined,
       [number, PolkadotPrimitivesV8CoreIndex]
     >;
@@ -3358,7 +3258,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeParachainsAssignerCoretimeCoreDescriptor> =} callback
      **/
     coreDescriptors: GenericStorageQuery<
-      Rv,
       (arg: PolkadotPrimitivesV8CoreIndex) => PolkadotRuntimeParachainsAssignerCoretimeCoreDescriptor,
       PolkadotPrimitivesV8CoreIndex
     >;
@@ -3366,7 +3265,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Registrar`'s storage queries
@@ -3379,7 +3278,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId | undefined> =} callback
      **/
     pendingSwap: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotParachainPrimitivesPrimitivesId | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3394,7 +3292,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonParasRegistrarParaInfo | undefined> =} callback
      **/
     paras: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeCommonParasRegistrarParaInfo | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3404,12 +3301,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    nextFreeParaId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    nextFreeParaId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Slots`'s storage queries
@@ -3437,7 +3334,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, bigint] | undefined>> =} callback
      **/
     leases: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Array<[AccountId32, bigint] | undefined>,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3445,7 +3341,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Auctions`'s storage queries
@@ -3456,7 +3352,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    auctionCounter: GenericStorageQuery<Rv, () => number>;
+    auctionCounter: GenericStorageQuery<() => number>;
 
     /**
      * Information relating to the current auction, if there is one.
@@ -3467,7 +3363,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    auctionInfo: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+    auctionInfo: GenericStorageQuery<() => [number, number] | undefined>;
 
     /**
      * Amounts currently reserved in the accounts of the bidders currently winning
@@ -3477,7 +3373,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     reservedAmounts: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, PolkadotParachainPrimitivesPrimitivesId]) => bigint | undefined,
       [AccountId32, PolkadotParachainPrimitivesPrimitivesId]
     >;
@@ -3491,7 +3386,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedArray<[AccountId32, PolkadotParachainPrimitivesPrimitivesId, bigint] | undefined, 36> | undefined> =} callback
      **/
     winning: GenericStorageQuery<
-      Rv,
       (
         arg: number,
       ) => FixedArray<[AccountId32, PolkadotParachainPrimitivesPrimitivesId, bigint] | undefined, 36> | undefined,
@@ -3501,7 +3395,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Crowdloan`'s storage queries
@@ -3514,7 +3408,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonCrowdloanFundInfo | undefined> =} callback
      **/
     funds: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => PolkadotRuntimeCommonCrowdloanFundInfo | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3525,26 +3418,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    newRaise: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    newRaise: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The number of auctions that have entered into their ending period so far.
      *
      * @param {Callback<number> =} callback
      **/
-    endingsCount: GenericStorageQuery<Rv, () => number>;
+    endingsCount: GenericStorageQuery<() => number>;
 
     /**
      * Tracker for the next available fund index
      *
      * @param {Callback<number> =} callback
      **/
-    nextFundIndex: GenericStorageQuery<Rv, () => number>;
+    nextFundIndex: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssignedSlots`'s storage queries
@@ -3557,7 +3450,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[number, number] | undefined> =} callback
      **/
     permanentSlots: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => [number, number] | undefined,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -3567,7 +3459,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    permanentSlotCount: GenericStorageQuery<Rv, () => number>;
+    permanentSlotCount: GenericStorageQuery<() => number>;
 
     /**
      * Assigned temporary slots.
@@ -3576,7 +3468,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonAssignedSlotsParachainTemporarySlot | undefined> =} callback
      **/
     temporarySlots: GenericStorageQuery<
-      Rv,
       (
         arg: PolkadotParachainPrimitivesPrimitivesId,
       ) => PolkadotRuntimeCommonAssignedSlotsParachainTemporarySlot | undefined,
@@ -3588,33 +3479,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    temporarySlotCount: GenericStorageQuery<Rv, () => number>;
+    temporarySlotCount: GenericStorageQuery<() => number>;
 
     /**
      * Number of active temporary slots in current slot lease period.
      *
      * @param {Callback<number> =} callback
      **/
-    activeTemporarySlotCount: GenericStorageQuery<Rv, () => number>;
+    activeTemporarySlotCount: GenericStorageQuery<() => number>;
 
     /**
      * The max number of temporary slots that can be assigned.
      *
      * @param {Callback<number> =} callback
      **/
-    maxTemporarySlots: GenericStorageQuery<Rv, () => number>;
+    maxTemporarySlots: GenericStorageQuery<() => number>;
 
     /**
      * The max number of permanent slots that can be assigned.
      *
      * @param {Callback<number> =} callback
      **/
-    maxPermanentSlots: GenericStorageQuery<Rv, () => number>;
+    maxPermanentSlots: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StakingAhClient`'s storage queries
@@ -3627,17 +3518,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    validatorSet: GenericStorageQuery<Rv, () => [number, Array<AccountId32>] | undefined>;
+    validatorSet: GenericStorageQuery<() => [number, Array<AccountId32>] | undefined>;
 
     /**
      * An incomplete validator set report.
      *
      * @param {Callback<PalletStakingAsyncRcClientValidatorSetReport | undefined> =} callback
      **/
-    incompleteValidatorSetReport: GenericStorageQuery<
-      Rv,
-      () => PalletStakingAsyncRcClientValidatorSetReport | undefined
-    >;
+    incompleteValidatorSetReport: GenericStorageQuery<() => PalletStakingAsyncRcClientValidatorSetReport | undefined>;
 
     /**
      * All of the points of the validators.
@@ -3648,7 +3536,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    validatorPoints: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    validatorPoints: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Indicates the current operating mode of the pallet.
@@ -3658,7 +3546,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncAhClientOperatingMode> =} callback
      **/
-    mode: GenericStorageQuery<Rv, () => PalletStakingAsyncAhClientOperatingMode>;
+    mode: GenericStorageQuery<() => PalletStakingAsyncAhClientOperatingMode>;
 
     /**
      * A storage value that is set when a `new_session` gives a new validator set to the session
@@ -3672,7 +3560,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextSessionChangesValidators: GenericStorageQuery<Rv, () => number | undefined>;
+    nextSessionChangesValidators: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The session index at which the latest elected validator set was applied.
@@ -3682,7 +3570,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    validatorSetAppliedAt: GenericStorageQuery<Rv, () => number | undefined>;
+    validatorSetAppliedAt: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A session report that is outgoing, and should be sent.
@@ -3692,7 +3580,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[PalletStakingAsyncRcClientSessionReport, number] | undefined> =} callback
      **/
-    outgoingSessionReport: GenericStorageQuery<Rv, () => [PalletStakingAsyncRcClientSessionReport, number] | undefined>;
+    outgoingSessionReport: GenericStorageQuery<() => [PalletStakingAsyncRcClientSessionReport, number] | undefined>;
 
     /**
      * Internal storage item of [`OffenceSendQueue`]. Should not be used manually.
@@ -3701,7 +3589,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[number, PalletStakingAsyncRcClientOffence]>> =} callback
      **/
     offenceSendQueueOffences: GenericStorageQuery<
-      Rv,
       (arg: number) => Array<[number, PalletStakingAsyncRcClientOffence]>,
       number
     >;
@@ -3711,12 +3598,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    offenceSendQueueCursor: GenericStorageQuery<Rv, () => number>;
+    offenceSendQueueCursor: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -3729,7 +3616,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.
@@ -3740,12 +3627,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 `XcmPallet`'s storage queries
@@ -3756,7 +3643,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -3764,7 +3651,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
+    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -3775,7 +3662,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
+    assetTraps: GenericStorageQuery<(arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -3783,7 +3670,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -3792,7 +3679,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -3804,7 +3690,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -3817,7 +3702,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -3829,14 +3713,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[XcmVersionedLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -3845,7 +3729,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -3857,7 +3740,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -3867,7 +3749,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Whether or not incoming XCMs (both executed locally and received) should be recorded.
@@ -3880,7 +3762,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    shouldRecordXcm: GenericStorageQuery<Rv, () => boolean>;
+    shouldRecordXcm: GenericStorageQuery<() => boolean>;
 
     /**
      * If [`ShouldRecordXcm`] is set to true, then the last XCM program executed locally
@@ -3892,7 +3774,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -3903,7 +3785,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -3911,7 +3792,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -3924,7 +3805,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeParachainsInclusionAggregateMessageOrigin) => PalletMessageQueueBookState,
       PolkadotRuntimeParachainsInclusionAggregateMessageOrigin
     >;
@@ -3934,7 +3814,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => PolkadotRuntimeParachainsInclusionAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -3943,7 +3823,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotRuntimeParachainsInclusionAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [PolkadotRuntimeParachainsInclusionAggregateMessageOrigin, number]
     >;
@@ -3951,7 +3830,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRate`'s storage queries
@@ -3966,7 +3845,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
     conversionRateToNative: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => FixedU128 | undefined,
       PolkadotRuntimeCommonImplsVersionedLocatableAsset
     >;
@@ -3974,7 +3852,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Beefy`'s storage queries
@@ -3985,21 +3863,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
@@ -4016,7 +3894,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.
@@ -4025,12 +3903,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
@@ -4041,14 +3919,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.
@@ -4059,12 +3937,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 `BeefyMmrLeaf`'s storage queries
@@ -4075,7 +3953,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.
@@ -4084,11 +3962,11 @@ 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;
   };
 }