@dedot/chaintypes 0.193.0 → 0.195.0

package/basilisk/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,
@@ -104,7 +104,7 @@ import type {
   StagingXcmV4Location,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -115,35 +115,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.
@@ -151,7 +151,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).
@@ -159,28 +159,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.
@@ -193,14 +193,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
@@ -217,21 +217,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
@@ -239,26 +239,26 @@ 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>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Timestamp`'s storage queries
@@ -269,7 +269,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.
@@ -279,12 +279,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 `Balances`'s storage queries
@@ -295,14 +295,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.
@@ -333,7 +333,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.
@@ -344,7 +344,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.
@@ -354,7 +354,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.
@@ -362,7 +362,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.
@@ -370,12 +370,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount002>> =} callback
      **/
-    freezes: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
+    freezes: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -385,18 +385,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 `MultiTransactionPayment`'s storage queries
@@ -408,7 +408,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    accountCurrencyMap: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    accountCurrencyMap: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Curated list of currencies which fees can be paid mapped to corresponding fallback price
@@ -416,7 +416,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
-    acceptedCurrencies: GenericStorageQuery<Rv, (arg: number) => FixedU128 | undefined, number>;
+    acceptedCurrencies: GenericStorageQuery<(arg: number) => FixedU128 | undefined, number>;
 
     /**
      * Asset prices from the spot price provider or the fallback price if the price is not available. Updated at the beginning of every block.
@@ -424,19 +424,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
-    acceptedCurrencyPrice: GenericStorageQuery<Rv, (arg: number) => FixedU128 | undefined, number>;
+    acceptedCurrencyPrice: GenericStorageQuery<(arg: number) => FixedU128 | undefined, number>;
 
     /**
      *
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    transactionCurrencyOverride: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    transactionCurrencyOverride: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -447,7 +447,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * Proposals that have been made.
@@ -455,28 +455,28 @@ 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>;
 
     /**
      * Proposal indices that have been approved but not yet awarded.
      *
      * @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.
@@ -484,12 +484,12 @@ 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>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Democracy`'s storage queries
@@ -500,14 +500,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    publicPropCount: GenericStorageQuery<Rv, () => number>;
+    publicPropCount: GenericStorageQuery<() => number>;
 
     /**
      * The public proposals. Unsorted. The second item is the proposal.
      *
      * @param {Callback<Array<[number, FrameSupportPreimagesBounded, AccountId32]>> =} callback
      **/
-    publicProps: GenericStorageQuery<Rv, () => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
+    publicProps: GenericStorageQuery<() => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
 
     /**
      * Those who have locked a deposit.
@@ -517,14 +517,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[Array<AccountId32>, bigint] | undefined> =} callback
      **/
-    depositOf: GenericStorageQuery<Rv, (arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
+    depositOf: GenericStorageQuery<(arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
 
     /**
      * The next free referendum index, aka the number of referenda started so far.
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * The lowest referendum index representing an unbaked referendum. Equal to
@@ -532,7 +532,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lowestUnbaked: GenericStorageQuery<Rv, () => number>;
+    lowestUnbaked: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -542,7 +542,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDemocracyReferendumInfo | undefined> =} callback
      **/
-    referendumInfoOf: GenericStorageQuery<Rv, (arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
+    referendumInfoOf: GenericStorageQuery<(arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
 
     /**
      * All votes for a particular voter. We store the balance for the number of votes that we
@@ -553,7 +553,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDemocracyVoteVoting> =} callback
      **/
-    votingOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
+    votingOf: GenericStorageQuery<(arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
 
     /**
      * True if the last referendum tabled was submitted externally. False if it was a public
@@ -561,7 +561,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    lastTabledWasExternal: GenericStorageQuery<Rv, () => boolean>;
+    lastTabledWasExternal: GenericStorageQuery<() => boolean>;
 
     /**
      * The referendum to be tabled whenever it would be valid to table an external proposal.
@@ -571,10 +571,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined> =} callback
      **/
-    nextExternal: GenericStorageQuery<
-      Rv,
-      () => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined
-    >;
+    nextExternal: GenericStorageQuery<() => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined>;
 
     /**
      * A record of who vetoed what. Maps proposal hash to a possible existent block number
@@ -583,7 +580,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    blacklist: GenericStorageQuery<Rv, (arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
+    blacklist: GenericStorageQuery<(arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
 
     /**
      * Record of all proposals that have been subject to emergency cancellation.
@@ -591,7 +588,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<boolean> =} callback
      **/
-    cancellations: GenericStorageQuery<Rv, (arg: H256) => boolean, H256>;
+    cancellations: GenericStorageQuery<(arg: H256) => boolean, H256>;
 
     /**
      * General information concerning any proposal or referendum.
@@ -605,7 +602,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256 | undefined> =} callback
      **/
     metadataOf: GenericStorageQuery<
-      Rv,
       (arg: PalletDemocracyMetadataOwner) => H256 | undefined,
       PalletDemocracyMetadataOwner
     >;
@@ -613,7 +609,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TechnicalCommittee`'s storage queries
@@ -624,7 +620,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -632,7 +628,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<BasiliskRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => BasiliskRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => BasiliskRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -640,33 +636,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -680,12 +676,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<OrmlVestingVestingSchedule>> =} callback
      **/
-    vestingSchedules: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<OrmlVestingVestingSchedule>, AccountId32>;
+    vestingSchedules: GenericStorageQuery<(arg: AccountId32Like) => Array<OrmlVestingVestingSchedule>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -698,11 +694,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).
@@ -710,16 +702,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 `Authorship`'s storage queries
@@ -730,12 +718,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 `CollatorSelection`'s storage queries
@@ -746,7 +734,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
@@ -757,7 +745,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidateList: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidateList: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -765,7 +753,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -774,7 +762,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -783,12 +771,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -799,14 +787,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
@@ -814,7 +802,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
@@ -822,7 +810,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, BasiliskRuntimeOpaqueSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, BasiliskRuntimeOpaqueSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, BasiliskRuntimeOpaqueSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -833,7 +821,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<number>>;
+    disabledValidators: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The next session keys for a validator.
@@ -841,11 +829,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<BasiliskRuntimeOpaqueSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => BasiliskRuntimeOpaqueSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => BasiliskRuntimeOpaqueSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -854,7 +838,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -862,7 +845,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -873,7 +856,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -882,12 +865,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -899,7 +882,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageOldRequestStatus | undefined> =} callback
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -907,19 +890,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 `Uniques`'s storage queries
@@ -931,7 +914,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletUniquesCollectionDetails | undefined> =} callback
      **/
-    class: GenericStorageQuery<Rv, (arg: bigint) => PalletUniquesCollectionDetails | undefined, bigint>;
+    class: GenericStorageQuery<(arg: bigint) => PalletUniquesCollectionDetails | undefined, bigint>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -939,7 +922,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -949,7 +932,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, bigint, bigint]) => [] | undefined,
       [AccountId32, bigint, bigint]
     >;
@@ -961,7 +943,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, bigint]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    classAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, bigint]) => [] | undefined, [AccountId32, bigint]>;
+    classAccount: GenericStorageQuery<(arg: [AccountId32Like, bigint]) => [] | undefined, [AccountId32, bigint]>;
 
     /**
      * The items in existence and their ownership details.
@@ -969,7 +951,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[bigint, bigint]} arg
      * @param {Callback<PalletUniquesItemDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: [bigint, bigint]) => PalletUniquesItemDetails | undefined, [bigint, bigint]>;
+    asset: GenericStorageQuery<(arg: [bigint, bigint]) => PalletUniquesItemDetails | undefined, [bigint, bigint]>;
 
     /**
      * Metadata of a collection.
@@ -977,7 +959,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletUniquesCollectionMetadata | undefined> =} callback
      **/
-    classMetadataOf: GenericStorageQuery<Rv, (arg: bigint) => PalletUniquesCollectionMetadata | undefined, bigint>;
+    classMetadataOf: GenericStorageQuery<(arg: bigint) => PalletUniquesCollectionMetadata | undefined, bigint>;
 
     /**
      * Metadata of an item.
@@ -986,7 +968,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
      **/
     instanceMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint]) => PalletUniquesItemMetadata | undefined,
       [bigint, bigint]
     >;
@@ -998,7 +979,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, bigint] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint | undefined, BytesLike]) => [Bytes, bigint] | undefined,
       [bigint, bigint | undefined, Bytes]
     >;
@@ -1010,7 +990,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint]) => [bigint, AccountId32 | undefined] | undefined,
       [bigint, bigint]
     >;
@@ -1021,12 +1000,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    collectionMaxSupply: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+    collectionMaxSupply: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -1042,7 +1021,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[PalletIdentityRegistration, Bytes | undefined] | undefined> =} callback
      **/
     identityOf: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => [PalletIdentityRegistration, Bytes | undefined] | undefined,
       AccountId32
     >;
@@ -1054,7 +1032,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.
@@ -1066,7 +1044,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
@@ -1076,7 +1054,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.
@@ -1085,7 +1063,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
     usernameAuthorities: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletIdentityAuthorityProperties | undefined,
       AccountId32
     >;
@@ -1100,7 +1077,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    accountOfUsername: GenericStorageQuery<Rv, (arg: BytesLike) => AccountId32 | undefined, Bytes>;
+    accountOfUsername: GenericStorageQuery<(arg: BytesLike) => AccountId32 | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -1113,12 +1090,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[AccountId32, number] | undefined> =} callback
      **/
-    pendingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => [AccountId32, number] | undefined, Bytes>;
+    pendingUsernames: GenericStorageQuery<(arg: BytesLike) => [AccountId32, number] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1131,7 +1108,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>]
     >;
@@ -1139,7 +1115,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -1153,7 +1129,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
      **/
-    migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
+    migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
 
     /**
      * The limits that are imposed on automatic migrations.
@@ -1162,7 +1138,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * The maximum limits that the signed migration could use.
@@ -1171,12 +1147,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
      **/
-    signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+    signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -1190,7 +1166,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -1203,12 +1178,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
@@ -1219,7 +1194,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.
@@ -1227,7 +1202,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
@@ -1238,7 +1213,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.
@@ -1246,7 +1221,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.
@@ -1259,12 +1234,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
@@ -1275,12 +1250,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 `Scheduler`'s storage queries
@@ -1290,7 +1265,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.
@@ -1298,7 +1273,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.
@@ -1306,11 +1281,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.
@@ -1321,12 +1292,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 `ParachainSystem`'s storage queries
@@ -1342,7 +1313,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
      **/
-    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+    unincludedSegment: GenericStorageQuery<() => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
 
     /**
      * Storage field that keeps track of bandwidth used by the unincluded segment along with the
@@ -1352,7 +1323,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -1366,7 +1336,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
+    pendingValidationCode: GenericStorageQuery<() => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -1377,7 +1347,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
@@ -1386,14 +1356,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<() => PolkadotPrimitivesV8PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
+    didSetValidationCode: GenericStorageQuery<() => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
@@ -1402,7 +1372,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -1415,7 +1385,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeRestriction | undefined>;
 
     /**
      * Optional upgrade go-ahead signal from the relay-chain.
@@ -1426,7 +1396,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8UpgradeGoAhead | undefined> =} callback
      **/
-    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
+    upgradeGoAhead: GenericStorageQuery<() => PolkadotPrimitivesV8UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -1438,7 +1408,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -1452,7 +1422,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -1466,7 +1435,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotPrimitivesV8AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV8AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -1476,7 +1445,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -1487,7 +1456,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -1498,7 +1466,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * HRMP watermark that was set in a block.
@@ -1507,7 +1475,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * HRMP messages that were sent in a block.
@@ -1516,7 +1484,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -1525,21 +1493,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
 
     /**
      * The factor to multiply the base delivery fee by for UMP.
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
+    upwardDeliveryFeeFactor: GenericStorageQuery<() => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -1547,7 +1515,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -1555,7 +1523,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -1563,7 +1531,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
@@ -1572,12 +1540,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -1587,12 +1555,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
+    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -1603,7 +1571,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -1611,7 +1579,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.
@@ -1622,7 +1590,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`,
@@ -1630,7 +1598,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.
@@ -1639,7 +1607,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1651,7 +1618,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1664,7 +1630,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]
     >;
@@ -1676,14 +1641,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.
@@ -1692,7 +1657,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]
     >;
@@ -1704,7 +1668,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
     >;
@@ -1714,7 +1677,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.
@@ -1727,7 +1690,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
@@ -1739,12 +1702,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV4Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV4Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV4Xcm | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -1762,7 +1725,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PolkadotParachainPrimitivesPrimitivesId>> =} callback
      **/
-    inboundXcmpSuspended: GenericStorageQuery<Rv, () => Array<PolkadotParachainPrimitivesPrimitivesId>>;
+    inboundXcmpSuspended: GenericStorageQuery<() => Array<PolkadotParachainPrimitivesPrimitivesId>>;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -1774,7 +1737,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
@@ -1783,7 +1746,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -1795,7 +1757,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1805,14 +1766,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+    queueSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * The factor to multiply the base delivery fee by.
@@ -1821,7 +1782,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1829,7 +1789,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
@@ -1842,7 +1802,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -1852,7 +1811,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<CumulusPrimitivesCoreAggregateMessageOrigin | undefined> =} callback
      **/
-    serviceHead: GenericStorageQuery<Rv, () => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
+    serviceHead: GenericStorageQuery<() => CumulusPrimitivesCoreAggregateMessageOrigin | undefined>;
 
     /**
      * The map of page indices to pages.
@@ -1861,7 +1820,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -1869,7 +1827,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRegistry`'s storage queries
@@ -1881,14 +1839,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetRegistryAssetDetails | undefined> =} callback
      **/
-    assets: GenericStorageQuery<Rv, (arg: number) => PalletAssetRegistryAssetDetails | undefined, number>;
+    assets: GenericStorageQuery<(arg: number) => PalletAssetRegistryAssetDetails | undefined, number>;
 
     /**
      * Next available asset id. This is sequential id assigned for each new registered asset.
      *
      * @param {Callback<number> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number>;
+    nextAssetId: GenericStorageQuery<() => number>;
 
     /**
      * Mapping between asset name and asset id.
@@ -1896,7 +1854,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    assetIds: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    assetIds: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Native location of an asset.
@@ -1904,7 +1862,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<BasiliskRuntimeXcmAssetLocation | undefined> =} callback
      **/
-    assetLocations: GenericStorageQuery<Rv, (arg: number) => BasiliskRuntimeXcmAssetLocation | undefined, number>;
+    assetLocations: GenericStorageQuery<(arg: number) => BasiliskRuntimeXcmAssetLocation | undefined, number>;
 
     /**
      * Local asset for native location.
@@ -1913,7 +1871,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     locationAssets: GenericStorageQuery<
-      Rv,
       (arg: BasiliskRuntimeXcmAssetLocation) => number | undefined,
       BasiliskRuntimeXcmAssetLocation
     >;
@@ -1924,12 +1881,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetRegistryAssetMetadata | undefined> =} callback
      **/
-    assetMetadataMap: GenericStorageQuery<Rv, (arg: number) => PalletAssetRegistryAssetMetadata | undefined, number>;
+    assetMetadataMap: GenericStorageQuery<(arg: number) => PalletAssetRegistryAssetMetadata | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XYK`'s storage queries
@@ -1941,7 +1898,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    shareToken: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    shareToken: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Total liquidity in a pool.
@@ -1949,7 +1906,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    totalLiquidity: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    totalLiquidity: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Asset pair in a pool.
@@ -1957,12 +1914,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    poolAssets: GenericStorageQuery<Rv, (arg: AccountId32Like) => [number, number] | undefined, AccountId32>;
+    poolAssets: GenericStorageQuery<(arg: AccountId32Like) => [number, number] | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Duster`'s storage queries
@@ -1974,26 +1931,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    accountBlacklist: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    accountBlacklist: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Account to take reward from.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    rewardAccount: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    rewardAccount: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Account to send dust to.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    dustAccount: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    dustAccount: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `LBP`'s storage queries
@@ -2005,7 +1962,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletLbpPool | undefined> =} callback
      **/
-    poolData: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletLbpPool | undefined, AccountId32>;
+    poolData: GenericStorageQuery<(arg: AccountId32Like) => PalletLbpPool | undefined, AccountId32>;
 
     /**
      * Storage used for tracking existing fee collectors
@@ -2014,12 +1971,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<boolean> =} callback
      **/
-    feeCollectorWithAsset: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => boolean, [AccountId32, number]>;
+    feeCollectorWithAsset: GenericStorageQuery<(arg: [AccountId32Like, number]) => boolean, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `NFT`'s storage queries
@@ -2031,7 +1988,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletNftCollectionInfo | undefined> =} callback
      **/
-    collections: GenericStorageQuery<Rv, (arg: bigint) => PalletNftCollectionInfo | undefined, bigint>;
+    collections: GenericStorageQuery<(arg: bigint) => PalletNftCollectionInfo | undefined, bigint>;
 
     /**
      * Stores item info
@@ -2039,12 +1996,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[bigint, bigint]} arg
      * @param {Callback<PalletNftItemInfo | undefined> =} callback
      **/
-    items: GenericStorageQuery<Rv, (arg: [bigint, bigint]) => PalletNftItemInfo | undefined, [bigint, bigint]>;
+    items: GenericStorageQuery<(arg: [bigint, bigint]) => PalletNftItemInfo | undefined, [bigint, bigint]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Marketplace`'s storage queries
@@ -2056,7 +2013,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[bigint, bigint]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    prices: GenericStorageQuery<Rv, (arg: [bigint, bigint]) => bigint | undefined, [bigint, bigint]>;
+    prices: GenericStorageQuery<(arg: [bigint, bigint]) => bigint | undefined, [bigint, bigint]>;
 
     /**
      * Stores offer info
@@ -2065,7 +2022,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMarketplaceOffer | undefined> =} callback
      **/
     offers: GenericStorageQuery<
-      Rv,
       (arg: [[bigint, bigint], AccountId32Like]) => PalletMarketplaceOffer | undefined,
       [[bigint, bigint], AccountId32]
     >;
@@ -2077,7 +2033,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMarketplaceRoyalty | undefined> =} callback
      **/
     marketplaceItems: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint]) => PalletMarketplaceRoyalty | undefined,
       [bigint, bigint]
     >;
@@ -2085,7 +2040,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPause`'s storage queries
@@ -2099,12 +2054,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[BytesLike, BytesLike]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pausedTransactions: GenericStorageQuery<Rv, (arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
+    pausedTransactions: GenericStorageQuery<(arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Router`'s storage queries
@@ -2115,7 +2070,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRouteExecutorSkipEd | undefined> =} callback
      **/
-    skipEd: GenericStorageQuery<Rv, () => PalletRouteExecutorSkipEd | undefined>;
+    skipEd: GenericStorageQuery<() => PalletRouteExecutorSkipEd | undefined>;
 
     /**
      * Storing routes for asset pairs
@@ -2124,7 +2079,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<HydradxTraitsRouterTrade> | undefined> =} callback
      **/
     routes: GenericStorageQuery<
-      Rv,
       (arg: HydradxTraitsRouterAssetPair) => Array<HydradxTraitsRouterTrade> | undefined,
       HydradxTraitsRouterAssetPair
     >;
@@ -2132,7 +2086,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XYKWarehouseLM`'s storage queries
@@ -2143,20 +2097,20 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    farmSequencer: GenericStorageQuery<Rv, () => number>;
+    farmSequencer: GenericStorageQuery<() => number>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    depositSequencer: GenericStorageQuery<Rv, () => bigint>;
+    depositSequencer: GenericStorageQuery<() => bigint>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<PalletLiquidityMiningGlobalFarmData | undefined> =} callback
      **/
-    globalFarm: GenericStorageQuery<Rv, (arg: number) => PalletLiquidityMiningGlobalFarmData | undefined, number>;
+    globalFarm: GenericStorageQuery<(arg: number) => PalletLiquidityMiningGlobalFarmData | undefined, number>;
 
     /**
      * Yield farm details.
@@ -2165,7 +2119,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletLiquidityMiningYieldFarmData | undefined> =} callback
      **/
     yieldFarm: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => PalletLiquidityMiningYieldFarmData | undefined,
       [AccountId32, number, number]
     >;
@@ -2176,7 +2129,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletLiquidityMiningDepositData | undefined> =} callback
      **/
-    deposit: GenericStorageQuery<Rv, (arg: bigint) => PalletLiquidityMiningDepositData | undefined, bigint>;
+    deposit: GenericStorageQuery<(arg: bigint) => PalletLiquidityMiningDepositData | undefined, bigint>;
 
     /**
      * Active(farms able to receive LP shares deposits) yield farms.
@@ -2184,16 +2137,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    activeYieldFarm: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => number | undefined,
-      [AccountId32, number]
-    >;
+    activeYieldFarm: GenericStorageQuery<(arg: [AccountId32Like, number]) => number | undefined, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorRewards`'s storage queries
@@ -2205,12 +2154,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    collators: GenericStorageQuery<Rv, (arg: number) => Array<AccountId32>, number>;
+    collators: GenericStorageQuery<(arg: number) => Array<AccountId32>, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Broadcast`'s storage queries
@@ -2221,14 +2170,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    incrementalId: GenericStorageQuery<Rv, () => number>;
+    incrementalId: GenericStorageQuery<() => number>;
 
     /**
      * Execution context to figure out where the trade is originated from
      *
      * @param {Callback<Array<PalletBroadcastExecutionType>> =} callback
      **/
-    executionContext: GenericStorageQuery<Rv, () => Array<PalletBroadcastExecutionType>>;
+    executionContext: GenericStorageQuery<() => Array<PalletBroadcastExecutionType>>;
 
     /**
      * To handle the overflow of increasing the execution context.
@@ -2237,12 +2186,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    overflowCount: GenericStorageQuery<Rv, () => number>;
+    overflowCount: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EmaOracle`'s storage queries
@@ -2253,7 +2202,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[[FixedBytes<8>, [number, number]], PalletEmaOracleOracleEntry]>> =} callback
      **/
-    accumulator: GenericStorageQuery<Rv, () => Array<[[FixedBytes<8>, [number, number]], PalletEmaOracleOracleEntry]>>;
+    accumulator: GenericStorageQuery<() => Array<[[FixedBytes<8>, [number, number]], PalletEmaOracleOracleEntry]>>;
 
     /**
      * Oracle storage keyed by data source, involved asset ids and the period length of the oracle.
@@ -2264,7 +2213,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[PalletEmaOracleOracleEntry, number] | undefined> =} callback
      **/
     oracles: GenericStorageQuery<
-      Rv,
       (
         arg: [FixedBytes<8>, [number, number], HydradxTraitsOracleOraclePeriod],
       ) => [PalletEmaOracleOracleEntry, number] | undefined,
@@ -2276,12 +2224,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[FixedBytes<8>, [number, number]]>> =} callback
      **/
-    whitelistedAssets: GenericStorageQuery<Rv, () => Array<[FixedBytes<8>, [number, number]]>>;
+    whitelistedAssets: GenericStorageQuery<() => Array<[FixedBytes<8>, [number, number]]>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Tokens`'s storage queries
@@ -2293,7 +2241,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    totalIssuance: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Any liquidity locks of a token type under an account.
@@ -2302,11 +2250,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<Array<OrmlTokensBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => Array<OrmlTokensBalanceLock>,
-      [AccountId32, number]
-    >;
+    locks: GenericStorageQuery<(arg: [AccountId32Like, number]) => Array<OrmlTokensBalanceLock>, [AccountId32, number]>;
 
     /**
      * The balance of a token type under an account.
@@ -2319,7 +2263,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<OrmlTokensAccountData> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => OrmlTokensAccountData, [AccountId32, number]>;
+    accounts: GenericStorageQuery<(arg: [AccountId32Like, number]) => OrmlTokensAccountData, [AccountId32, number]>;
 
     /**
      * Named reserves on some account balances.
@@ -2328,7 +2272,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<OrmlTokensReserveData>> =} callback
      **/
     reserves: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => Array<OrmlTokensReserveData>,
       [AccountId32, number]
     >;
@@ -2336,7 +2279,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `UnknownTokens`'s storage queries
@@ -2352,7 +2295,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint> =} callback
      **/
     concreteFungibleBalances: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV4Location, StagingXcmV4Location]) => bigint,
       [StagingXcmV4Location, StagingXcmV4Location]
     >;
@@ -2367,7 +2309,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint> =} callback
      **/
     abstractFungibleBalances: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV4Location, BytesLike]) => bigint,
       [StagingXcmV4Location, Bytes]
     >;
@@ -2375,6 +2316,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }