@dedot/chaintypes 0.194.0 → 0.195.0

package/hydration/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,
@@ -125,12 +125,17 @@ import type {
   SpCoreCryptoKeyTypeId,
   SpConsensusAuraSr25519AppSr25519Public,
   SpConsensusSlotsSlot,
+  IsmpConsensusStateCommitment,
+  IsmpConsensusStateMachineHeight,
+  IsmpConsensusStateMachineId,
+  PalletHyperbridgeVersionedHostParams,
+  IsmpHostStateMachine,
   PalletEmaOracleOracleEntry,
   HydradxTraitsOracleOraclePeriod,
   PalletBroadcastExecutionType,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -141,35 +146,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.
@@ -177,7 +182,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).
@@ -185,28 +190,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.
@@ -219,14 +224,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
@@ -243,21 +248,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
@@ -265,26 +270,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
@@ -295,7 +300,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.
@@ -305,12 +310,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
@@ -321,14 +326,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.
@@ -359,7 +364,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.
@@ -370,7 +375,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.
@@ -380,7 +385,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.
@@ -388,7 +393,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.
@@ -396,12 +401,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
@@ -411,18 +416,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
@@ -434,7 +439,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
@@ -442,7 +447,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.
@@ -450,19 +455,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
@@ -473,7 +478,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.
@@ -481,28 +486,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.
@@ -510,12 +515,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 `Preimage`'s storage queries
@@ -527,7 +532,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.
@@ -535,19 +540,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 `Identity`'s storage queries
@@ -563,7 +568,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
     >;
@@ -575,7 +579,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.
@@ -587,7 +591,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
@@ -597,7 +601,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.
@@ -606,7 +610,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
     usernameAuthorities: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletIdentityAuthorityProperties | undefined,
       AccountId32
     >;
@@ -621,7 +624,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
@@ -634,12 +637,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 `Democracy`'s storage queries
@@ -650,14 +653,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.
@@ -667,14 +670,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
@@ -682,7 +685,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.
@@ -692,7 +695,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
@@ -703,7 +706,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
@@ -711,7 +714,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.
@@ -721,10 +724,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
@@ -733,7 +733,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.
@@ -741,7 +741,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.
@@ -755,7 +755,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256 | undefined> =} callback
      **/
     metadataOf: GenericStorageQuery<
-      Rv,
       (arg: PalletDemocracyMetadataOwner) => H256 | undefined,
       PalletDemocracyMetadataOwner
     >;
@@ -763,7 +762,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
@@ -774,7 +773,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.
@@ -782,7 +781,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<HydradxRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => HydradxRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => HydradxRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -790,33 +789,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 `Proxy`'s storage queries
@@ -829,11 +828,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).
@@ -841,16 +836,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
@@ -863,7 +854,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>]
     >;
@@ -871,7 +861,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Uniques`'s storage queries
@@ -883,7 +873,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.
@@ -891,7 +881,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
@@ -901,7 +891,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, bigint, bigint]) => [] | undefined,
       [AccountId32, bigint, bigint]
     >;
@@ -913,7 +902,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.
@@ -921,7 +910,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.
@@ -929,7 +918,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.
@@ -938,7 +927,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
      **/
     instanceMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [bigint, bigint]) => PalletUniquesItemMetadata | undefined,
       [bigint, bigint]
     >;
@@ -950,7 +938,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]
     >;
@@ -962,7 +949,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]
     >;
@@ -973,12 +959,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 `StateTrieMigration`'s storage queries
@@ -992,7 +978,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.
@@ -1001,7 +987,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.
@@ -1010,12 +996,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
@@ -1029,7 +1015,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -1042,12 +1027,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
@@ -1058,7 +1043,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.
@@ -1066,7 +1051,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
@@ -1077,7 +1062,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.
@@ -1085,7 +1070,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.
@@ -1098,12 +1083,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
@@ -1114,12 +1099,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 `Dispatcher`'s storage queries
@@ -1129,24 +1114,24 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32> =} callback
      **/
-    aaveManagerAccount: GenericStorageQuery<Rv, () => AccountId32>;
+    aaveManagerAccount: GenericStorageQuery<() => AccountId32>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    extraGas: GenericStorageQuery<Rv, () => bigint>;
+    extraGas: GenericStorageQuery<() => bigint>;
 
     /**
      *
      * @param {Callback<EvmCoreErrorExitReason | undefined> =} callback
      **/
-    lastEvmCallExitReason: GenericStorageQuery<Rv, () => EvmCoreErrorExitReason | undefined>;
+    lastEvmCallExitReason: GenericStorageQuery<() => EvmCoreErrorExitReason | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRegistry`'s storage queries
@@ -1158,14 +1143,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.
@@ -1173,7 +1158,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.
@@ -1181,7 +1166,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<HydradxRuntimeXcmAssetLocation | undefined> =} callback
      **/
-    assetLocations: GenericStorageQuery<Rv, (arg: number) => HydradxRuntimeXcmAssetLocation | undefined, number>;
+    assetLocations: GenericStorageQuery<(arg: number) => HydradxRuntimeXcmAssetLocation | undefined, number>;
 
     /**
      * Non-native assets which transfer is banned.
@@ -1189,7 +1174,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    bannedAssets: GenericStorageQuery<Rv, (arg: number) => [] | undefined, number>;
+    bannedAssets: GenericStorageQuery<(arg: number) => [] | undefined, number>;
 
     /**
      * Local asset for native location.
@@ -1198,7 +1183,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     locationAssets: GenericStorageQuery<
-      Rv,
       (arg: HydradxRuntimeXcmAssetLocation) => number | undefined,
       HydradxRuntimeXcmAssetLocation
     >;
@@ -1209,12 +1193,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    existentialDepositCounter: GenericStorageQuery<Rv, () => bigint>;
+    existentialDepositCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Claims`'s storage queries
@@ -1226,12 +1210,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {PalletClaimsEthereumAddress} arg
      * @param {Callback<bigint> =} callback
      **/
-    claims: GenericStorageQuery<Rv, (arg: PalletClaimsEthereumAddress) => bigint, PalletClaimsEthereumAddress>;
+    claims: GenericStorageQuery<(arg: PalletClaimsEthereumAddress) => bigint, PalletClaimsEthereumAddress>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `GenesisHistory`'s storage queries
@@ -1241,12 +1225,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletGenesisHistoryChain> =} callback
      **/
-    previousChain: GenericStorageQuery<Rv, () => PalletGenesisHistoryChain>;
+    previousChain: GenericStorageQuery<() => PalletGenesisHistoryChain>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorRewards`'s storage queries
@@ -1258,12 +1242,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 `Omnipool`'s storage queries
@@ -1275,14 +1259,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletOmnipoolAssetState | undefined> =} callback
      **/
-    assets: GenericStorageQuery<Rv, (arg: number) => PalletOmnipoolAssetState | undefined, number>;
+    assets: GenericStorageQuery<(arg: number) => PalletOmnipoolAssetState | undefined, number>;
 
     /**
      * Tradable state of hub asset.
      *
      * @param {Callback<PalletOmnipoolTradability> =} callback
      **/
-    hubAssetTradability: GenericStorageQuery<Rv, () => PalletOmnipoolTradability>;
+    hubAssetTradability: GenericStorageQuery<() => PalletOmnipoolTradability>;
 
     /**
      * LP positions. Maps NFT instance id to corresponding position
@@ -1290,19 +1274,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletOmnipoolPosition | undefined> =} callback
      **/
-    positions: GenericStorageQuery<Rv, (arg: bigint) => PalletOmnipoolPosition | undefined, bigint>;
+    positions: GenericStorageQuery<(arg: bigint) => PalletOmnipoolPosition | undefined, bigint>;
 
     /**
      * Position ids sequencer
      *
      * @param {Callback<bigint> =} callback
      **/
-    nextPositionId: GenericStorageQuery<Rv, () => bigint>;
+    nextPositionId: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPause`'s storage queries
@@ -1316,12 +1300,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 `Duster`'s storage queries
@@ -1333,26 +1317,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    accountBlacklist: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
-
-    /**
-     * Account to take reward from.
-     *
-     * @param {Callback<AccountId32 | undefined> =} callback
-     **/
-    rewardAccount: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
-
-    /**
-     * Account to send dust to.
-     *
-     * @param {Callback<AccountId32 | undefined> =} callback
-     **/
-    dustAccount: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    accountWhitelist: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OmnipoolWarehouseLM`'s storage queries
@@ -1363,20 +1333,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.
@@ -1385,7 +1355,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletLiquidityMiningYieldFarmData | undefined> =} callback
      **/
     yieldFarm: GenericStorageQuery<
-      Rv,
       (arg: [number, number, number]) => PalletLiquidityMiningYieldFarmData | undefined,
       [number, number, number]
     >;
@@ -1396,7 +1365,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.
@@ -1404,12 +1373,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    activeYieldFarm: GenericStorageQuery<Rv, (arg: [number, number]) => number | undefined, [number, number]>;
+    activeYieldFarm: GenericStorageQuery<(arg: [number, number]) => number | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OmnipoolLiquidityMining`'s storage queries
@@ -1421,12 +1390,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    omniPositionId: GenericStorageQuery<Rv, (arg: bigint) => bigint | undefined, bigint>;
+    omniPositionId: GenericStorageQuery<(arg: bigint) => bigint | undefined, bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OTC`'s storage queries
@@ -1437,19 +1406,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    nextOrderId: GenericStorageQuery<Rv, () => number>;
+    nextOrderId: GenericStorageQuery<() => number>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<PalletOtcOrder | undefined> =} callback
      **/
-    orders: GenericStorageQuery<Rv, (arg: number) => PalletOtcOrder | undefined, number>;
+    orders: GenericStorageQuery<(arg: number) => PalletOtcOrder | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CircuitBreaker`'s storage queries
@@ -1462,7 +1431,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number]> =} callback
      **/
-    tradeVolumeLimitPerAsset: GenericStorageQuery<Rv, (arg: number) => [number, number], number>;
+    tradeVolumeLimitPerAsset: GenericStorageQuery<(arg: number) => [number, number], number>;
 
     /**
      * Trade volumes per asset
@@ -1471,7 +1440,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCircuitBreakerTradeVolumeLimit | undefined> =} callback
      **/
     allowedTradeVolumeLimitPerAsset: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletCircuitBreakerTradeVolumeLimit | undefined,
       number
     >;
@@ -1483,7 +1451,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    liquidityAddLimitPerAsset: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    liquidityAddLimitPerAsset: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * Add liquidity volumes per asset
@@ -1492,7 +1460,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCircuitBreakerLiquidityLimit | undefined> =} callback
      **/
     allowedAddLiquidityAmountPerAsset: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletCircuitBreakerLiquidityLimit | undefined,
       number
     >;
@@ -1502,11 +1469,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletCircuitBreakerLockdownStatus | undefined> =} callback
      **/
-    assetLockdownState: GenericStorageQuery<
-      Rv,
-      (arg: number) => PalletCircuitBreakerLockdownStatus | undefined,
-      number
-    >;
+    assetLockdownState: GenericStorageQuery<(arg: number) => PalletCircuitBreakerLockdownStatus | undefined, number>;
 
     /**
      * Liquidity limits of assets for removing liquidity.
@@ -1515,7 +1478,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    liquidityRemoveLimitPerAsset: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    liquidityRemoveLimitPerAsset: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * Remove liquidity volumes per asset
@@ -1524,7 +1487,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCircuitBreakerLiquidityLimit | undefined> =} callback
      **/
     allowedRemoveLiquidityAmountPerAsset: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletCircuitBreakerLiquidityLimit | undefined,
       number
     >;
@@ -1532,7 +1494,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Router`'s storage queries
@@ -1545,7 +1507,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<HydradxTraitsRouterTrade> | undefined> =} callback
      **/
     routes: GenericStorageQuery<
-      Rv,
       (arg: HydradxTraitsRouterAssetPair) => Array<HydradxTraitsRouterTrade> | undefined,
       HydradxTraitsRouterAssetPair
     >;
@@ -1553,7 +1514,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DynamicFees`'s storage queries
@@ -1566,7 +1527,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDynamicFeesFeeEntry | undefined> =} callback
      **/
-    assetFee: GenericStorageQuery<Rv, (arg: number) => PalletDynamicFeesFeeEntry | undefined, number>;
+    assetFee: GenericStorageQuery<(arg: number) => PalletDynamicFeesFeeEntry | undefined, number>;
 
     /**
      * Stores per-asset fee configuration (Fixed or Dynamic)
@@ -1574,16 +1535,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDynamicFeesAssetFeeConfig | undefined> =} callback
      **/
-    assetFeeConfiguration: GenericStorageQuery<
-      Rv,
-      (arg: number) => PalletDynamicFeesAssetFeeConfig | undefined,
-      number
-    >;
+    assetFeeConfiguration: GenericStorageQuery<(arg: number) => PalletDynamicFeesAssetFeeConfig | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -1594,7 +1551,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingStakingData> =} callback
      **/
-    staking: GenericStorageQuery<Rv, () => PalletStakingStakingData>;
+    staking: GenericStorageQuery<() => PalletStakingStakingData>;
 
     /**
      * User's position state.
@@ -1602,14 +1559,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletStakingPosition | undefined> =} callback
      **/
-    positions: GenericStorageQuery<Rv, (arg: bigint) => PalletStakingPosition | undefined, bigint>;
+    positions: GenericStorageQuery<(arg: bigint) => PalletStakingPosition | undefined, bigint>;
 
     /**
      * Position ids sequencer.
      *
      * @param {Callback<bigint> =} callback
      **/
-    nextPositionId: GenericStorageQuery<Rv, () => bigint>;
+    nextPositionId: GenericStorageQuery<() => bigint>;
 
     /**
      * List of position votes.
@@ -1617,7 +1574,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletStakingVoting> =} callback
      **/
-    votes: GenericStorageQuery<Rv, (arg: bigint) => PalletStakingVoting, bigint>;
+    votes: GenericStorageQuery<(arg: bigint) => PalletStakingVoting, bigint>;
 
     /**
      * List of processed vote. Used to determine if the vote should be locked in case of voting not in favor.
@@ -1626,7 +1583,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingVote | undefined> =} callback
      **/
     votesRewarded: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingVote | undefined,
       [AccountId32, number]
     >;
@@ -1637,7 +1593,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletStakingVoting> =} callback
      **/
-    positionVotes: GenericStorageQuery<Rv, (arg: bigint) => PalletStakingVoting, bigint>;
+    positionVotes: GenericStorageQuery<(arg: bigint) => PalletStakingVoting, bigint>;
 
     /**
      * Legacy storage! - Used to handle democracy processed votes until democracy pallet is fully removed.
@@ -1646,7 +1602,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingVote | undefined> =} callback
      **/
     processedVotes: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletStakingVote | undefined,
       [AccountId32, number]
     >;
@@ -1656,12 +1611,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    sixSecBlocksSince: GenericStorageQuery<Rv, () => number>;
+    sixSecBlocksSince: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Stableswap`'s storage queries
@@ -1673,7 +1628,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStableswapPoolInfo | undefined> =} callback
      **/
-    pools: GenericStorageQuery<Rv, (arg: number) => PalletStableswapPoolInfo | undefined, number>;
+    pools: GenericStorageQuery<(arg: number) => PalletStableswapPoolInfo | undefined, number>;
 
     /**
      * Pool peg info.
@@ -1681,7 +1636,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStableswapPoolPegInfo | undefined> =} callback
      **/
-    poolPegs: GenericStorageQuery<Rv, (arg: number) => PalletStableswapPoolPegInfo | undefined, number>;
+    poolPegs: GenericStorageQuery<(arg: number) => PalletStableswapPoolPegInfo | undefined, number>;
 
     /**
      * Tradability state of pool assets.
@@ -1689,7 +1644,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletStableswapTradability> =} callback
      **/
-    assetTradability: GenericStorageQuery<Rv, (arg: [number, number]) => PalletStableswapTradability, [number, number]>;
+    assetTradability: GenericStorageQuery<(arg: [number, number]) => PalletStableswapTradability, [number, number]>;
 
     /**
      * Temporary pool state storage. Used to save a state of pool in a single block.
@@ -1697,12 +1652,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStableswapPoolSnapshot | undefined> =} callback
      **/
-    poolSnapshots: GenericStorageQuery<Rv, (arg: number) => PalletStableswapPoolSnapshot | undefined, number>;
+    poolSnapshots: GenericStorageQuery<(arg: number) => PalletStableswapPoolSnapshot | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Bonds`'s storage queries
@@ -1715,7 +1670,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, bigint]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    bondIds: GenericStorageQuery<Rv, (arg: [number, bigint]) => number | undefined, [number, bigint]>;
+    bondIds: GenericStorageQuery<(arg: [number, bigint]) => number | undefined, [number, bigint]>;
 
     /**
      * Registered bonds.
@@ -1724,12 +1679,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, bigint] | undefined> =} callback
      **/
-    bonds: GenericStorageQuery<Rv, (arg: number) => [number, bigint] | undefined, number>;
+    bonds: GenericStorageQuery<(arg: number) => [number, bigint] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `LBP`'s storage queries
@@ -1741,7 +1696,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
@@ -1750,12 +1705,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 `XYK`'s storage queries
@@ -1767,7 +1722,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.
@@ -1775,7 +1730,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.
@@ -1783,12 +1738,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 `Referrals`'s storage queries
@@ -1801,7 +1756,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    referralCodes: GenericStorageQuery<Rv, (arg: BytesLike) => AccountId32 | undefined, Bytes>;
+    referralCodes: GenericStorageQuery<(arg: BytesLike) => AccountId32 | undefined, Bytes>;
 
     /**
      * Referral accounts
@@ -1810,7 +1765,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    referralAccounts: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    referralAccounts: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * Linked accounts.
@@ -1819,7 +1774,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    linkedAccounts: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    linkedAccounts: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * Shares of a referral account
@@ -1827,7 +1782,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    referrerShares: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    referrerShares: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Shares of a trader account
@@ -1835,14 +1790,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint> =} callback
      **/
-    traderShares: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint, AccountId32>;
+    traderShares: GenericStorageQuery<(arg: AccountId32Like) => bigint, AccountId32>;
 
     /**
      * Total share issuance.
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalShares: GenericStorageQuery<Rv, () => bigint>;
+    totalShares: GenericStorageQuery<() => bigint>;
 
     /**
      * Referer level and total accumulated rewards over time.
@@ -1852,11 +1807,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[PalletReferralsLevel, bigint] | undefined> =} callback
      **/
-    referrer: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [PalletReferralsLevel, bigint] | undefined,
-      AccountId32
-    >;
+    referrer: GenericStorageQuery<(arg: AccountId32Like) => [PalletReferralsLevel, bigint] | undefined, AccountId32>;
 
     /**
      * Asset fee distribution rewards information.
@@ -1866,7 +1817,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletReferralsFeeDistribution | undefined> =} callback
      **/
     assetRewards: GenericStorageQuery<
-      Rv,
       (arg: [number, PalletReferralsLevel]) => PalletReferralsFeeDistribution | undefined,
       [number, PalletReferralsLevel]
     >;
@@ -1878,19 +1828,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pendingConversions: GenericStorageQuery<Rv, (arg: number) => [] | undefined, number>;
+    pendingConversions: GenericStorageQuery<(arg: number) => [] | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPendingConversions: GenericStorageQuery<Rv, () => number>;
+    counterForPendingConversions: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Liquidation`'s storage queries
@@ -1901,12 +1851,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H160> =} callback
      **/
-    borrowingContract: GenericStorageQuery<Rv, () => H160>;
+    borrowingContract: GenericStorageQuery<() => H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `HSM`'s storage queries
@@ -1922,7 +1872,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletHsmCollateralInfo | undefined> =} callback
      **/
-    collaterals: GenericStorageQuery<Rv, (arg: number) => PalletHsmCollateralInfo | undefined, number>;
+    collaterals: GenericStorageQuery<(arg: number) => PalletHsmCollateralInfo | undefined, number>;
 
     /**
      * Amount of Hollar bought with an asset in a single block
@@ -1934,19 +1884,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    hollarAmountReceived: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    hollarAmountReceived: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Address of the flash loan receiver.
      *
      * @param {Callback<H160 | undefined> =} callback
      **/
-    flashMinter: GenericStorageQuery<Rv, () => H160 | undefined>;
+    flashMinter: GenericStorageQuery<() => H160 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Parameters`'s storage queries
@@ -1956,12 +1906,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    isTestnet: GenericStorageQuery<Rv, () => boolean>;
+    isTestnet: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Tokens`'s storage queries
@@ -1973,7 +1923,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.
@@ -1982,11 +1932,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.
@@ -1999,7 +1945,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.
@@ -2008,7 +1954,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<OrmlTokensReserveData>> =} callback
      **/
     reserves: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => Array<OrmlTokensReserveData>,
       [AccountId32, number]
     >;
@@ -2016,7 +1961,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -2030,12 +1975,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 `EVM`'s storage queries
@@ -2046,33 +1991,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<Bytes> =} callback
      **/
-    accountCodes: GenericStorageQuery<Rv, (arg: H160) => Bytes, H160>;
+    accountCodes: GenericStorageQuery<(arg: H160) => Bytes, H160>;
 
     /**
      *
      * @param {H160} arg
      * @param {Callback<PalletEvmCodeMetadata | undefined> =} callback
      **/
-    accountCodesMetadata: GenericStorageQuery<Rv, (arg: H160) => PalletEvmCodeMetadata | undefined, H160>;
+    accountCodesMetadata: GenericStorageQuery<(arg: H160) => PalletEvmCodeMetadata | undefined, H160>;
 
     /**
      *
      * @param {[H160, H256]} arg
      * @param {Callback<H256> =} callback
      **/
-    accountStorages: GenericStorageQuery<Rv, (arg: [H160, H256]) => H256, [H160, H256]>;
+    accountStorages: GenericStorageQuery<(arg: [H160, H256]) => H256, [H160, H256]>;
 
     /**
      *
      * @param {H160} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    suicided: GenericStorageQuery<Rv, (arg: H160) => [] | undefined, H160>;
+    suicided: GenericStorageQuery<(arg: H160) => [] | undefined, H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EVMChainId`'s storage queries
@@ -2083,12 +2028,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    chainId: GenericStorageQuery<Rv, () => bigint>;
+    chainId: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Ethereum`'s storage queries
@@ -2101,7 +2046,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[EthereumTransactionTransactionV2, FpRpcTransactionStatus, EthereumReceiptReceiptV3] | undefined> =} callback
      **/
     pending: GenericStorageQuery<
-      Rv,
       (arg: number) => [EthereumTransactionTransactionV2, FpRpcTransactionStatus, EthereumReceiptReceiptV3] | undefined,
       number
     >;
@@ -2111,40 +2055,40 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPending: GenericStorageQuery<Rv, () => number>;
+    counterForPending: GenericStorageQuery<() => number>;
 
     /**
      * The current Ethereum block.
      *
      * @param {Callback<EthereumBlock | undefined> =} callback
      **/
-    currentBlock: GenericStorageQuery<Rv, () => EthereumBlock | undefined>;
+    currentBlock: GenericStorageQuery<() => EthereumBlock | undefined>;
 
     /**
      * The current Ethereum receipts.
      *
      * @param {Callback<Array<EthereumReceiptReceiptV3> | undefined> =} callback
      **/
-    currentReceipts: GenericStorageQuery<Rv, () => Array<EthereumReceiptReceiptV3> | undefined>;
+    currentReceipts: GenericStorageQuery<() => Array<EthereumReceiptReceiptV3> | undefined>;
 
     /**
      * The current transaction statuses.
      *
      * @param {Callback<Array<FpRpcTransactionStatus> | undefined> =} callback
      **/
-    currentTransactionStatuses: GenericStorageQuery<Rv, () => Array<FpRpcTransactionStatus> | undefined>;
+    currentTransactionStatuses: GenericStorageQuery<() => Array<FpRpcTransactionStatus> | undefined>;
 
     /**
      *
      * @param {U256} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: U256) => H256, U256>;
+    blockHash: GenericStorageQuery<(arg: U256) => H256, U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EVMAccounts`'s storage queries
@@ -2156,7 +2100,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<FixedBytes<12> | undefined> =} callback
      **/
-    accountExtension: GenericStorageQuery<Rv, (arg: H160) => FixedBytes<12> | undefined, H160>;
+    accountExtension: GenericStorageQuery<(arg: H160) => FixedBytes<12> | undefined, H160>;
 
     /**
      * Whitelisted addresses that are allowed to deploy smart contracts.
@@ -2164,7 +2108,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    contractDeployer: GenericStorageQuery<Rv, (arg: H160) => [] | undefined, H160>;
+    contractDeployer: GenericStorageQuery<(arg: H160) => [] | undefined, H160>;
 
     /**
      * Whitelisted contracts that are allowed to manage balances and tokens.
@@ -2172,12 +2116,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    approvedContract: GenericStorageQuery<Rv, (arg: H160) => [] | undefined, H160>;
+    approvedContract: GenericStorageQuery<(arg: H160) => [] | undefined, H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DynamicEvmFee`'s storage queries
@@ -2188,12 +2132,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<U256> =} callback
      **/
-    baseFeePerGas: GenericStorageQuery<Rv, () => U256>;
+    baseFeePerGas: GenericStorageQuery<() => U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XYKWarehouseLM`'s storage queries
@@ -2204,20 +2148,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.
@@ -2226,7 +2170,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]
     >;
@@ -2237,7 +2180,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletLiquidityMiningDepositData002 | undefined> =} callback
      **/
-    deposit: GenericStorageQuery<Rv, (arg: bigint) => PalletLiquidityMiningDepositData002 | undefined, bigint>;
+    deposit: GenericStorageQuery<(arg: bigint) => PalletLiquidityMiningDepositData002 | undefined, bigint>;
 
     /**
      * Active(farms able to receive LP shares deposits) yield farms.
@@ -2245,16 +2188,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 `DCA`'s storage queries
@@ -2265,7 +2204,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    scheduleIdSequencer: GenericStorageQuery<Rv, () => number>;
+    scheduleIdSequencer: GenericStorageQuery<() => number>;
 
     /**
      * Storing schedule details
@@ -2273,7 +2212,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDcaSchedule | undefined> =} callback
      **/
-    schedules: GenericStorageQuery<Rv, (arg: number) => PalletDcaSchedule | undefined, number>;
+    schedules: GenericStorageQuery<(arg: number) => PalletDcaSchedule | undefined, number>;
 
     /**
      * Storing schedule ownership
@@ -2281,11 +2220,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    scheduleOwnership: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => [] | undefined,
-      [AccountId32, number]
-    >;
+    scheduleOwnership: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * Keep tracking the remaining amounts to spend for DCA schedules
@@ -2293,7 +2228,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    remainingAmounts: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    remainingAmounts: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Keep tracking the retry on error flag for DCA schedules
@@ -2301,7 +2236,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    retriesOnError: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    retriesOnError: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Keep tracking the blocknumber when the schedule is planned to be executed
@@ -2309,7 +2244,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    scheduleExecutionBlock: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    scheduleExecutionBlock: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Keep tracking of the schedule ids to be executed in the block
@@ -2317,12 +2252,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    scheduleIdsPerBlock: GenericStorageQuery<Rv, (arg: number) => Array<number>, number>;
+    scheduleIdsPerBlock: GenericStorageQuery<(arg: number) => Array<number>, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -2332,7 +2267,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.
@@ -2340,7 +2275,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.
@@ -2348,11 +2283,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.
@@ -2363,12 +2294,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
@@ -2384,7 +2315,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
@@ -2394,7 +2325,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -2408,7 +2338,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
@@ -2419,7 +2349,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.
@@ -2428,14 +2358,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.
@@ -2444,7 +2374,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.
@@ -2457,7 +2387,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.
@@ -2468,7 +2398,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.
@@ -2480,7 +2410,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
@@ -2494,7 +2424,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -2508,7 +2437,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.
@@ -2518,7 +2447,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.
@@ -2529,7 +2458,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -2540,7 +2468,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.
@@ -2549,7 +2477,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.
@@ -2558,7 +2486,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.
@@ -2567,21 +2495,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
@@ -2589,7 +2517,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
@@ -2597,7 +2525,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
@@ -2605,7 +2533,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`.
@@ -2614,12 +2542,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
@@ -2629,12 +2557,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
@@ -2645,7 +2573,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -2653,7 +2581,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.
@@ -2664,7 +2592,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`,
@@ -2672,7 +2600,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.
@@ -2681,7 +2609,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -2693,7 +2620,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -2706,7 +2632,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]
     >;
@@ -2718,14 +2643,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.
@@ -2734,7 +2659,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]
     >;
@@ -2746,7 +2670,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
     >;
@@ -2756,7 +2679,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.
@@ -2769,7 +2692,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
@@ -2781,12 +2704,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
@@ -2804,7 +2727,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
@@ -2816,7 +2739,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.
@@ -2825,7 +2748,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -2837,7 +2759,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2847,14 +2768,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.
@@ -2863,7 +2784,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -2871,7 +2791,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
@@ -2884,7 +2804,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -2894,7 +2813,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.
@@ -2903,7 +2822,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -2911,7 +2829,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
@@ -2927,7 +2845,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint> =} callback
      **/
     concreteFungibleBalances: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV4Location, StagingXcmV4Location]) => bigint,
       [StagingXcmV4Location, StagingXcmV4Location]
     >;
@@ -2942,7 +2859,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint> =} callback
      **/
     abstractFungibleBalances: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV4Location, BytesLike]) => bigint,
       [StagingXcmV4Location, Bytes]
     >;
@@ -2950,7 +2866,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -2961,12 +2877,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
@@ -2977,7 +2893,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
@@ -2988,7 +2904,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.
@@ -2996,7 +2912,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.
@@ -3005,7 +2921,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.
@@ -3014,12 +2930,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
@@ -3030,14 +2946,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
@@ -3045,7 +2961,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
@@ -3053,7 +2969,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, HydradxRuntimeOpaqueSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, HydradxRuntimeOpaqueSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, HydradxRuntimeOpaqueSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -3064,7 +2980,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.
@@ -3072,11 +2988,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<HydradxRuntimeOpaqueSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => HydradxRuntimeOpaqueSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => HydradxRuntimeOpaqueSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -3085,7 +2997,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -3093,7 +3004,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
@@ -3104,7 +3015,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.
@@ -3113,12 +3024,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 `AuraExt`'s storage queries
@@ -3133,7 +3044,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current slot paired with a number of authored blocks.
@@ -3142,12 +3053,236 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    slotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    slotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery;
+  };
+  /**
+   * Pallet `Ismp`'s storage queries
+   **/
+  ismp: {
+    /**
+     * Holds a map of state machine heights to their verified state commitments. These state
+     * commitments end up here after they are successfully verified by a `ConsensusClient`
+     *
+     * @param {IsmpConsensusStateMachineHeight} arg
+     * @param {Callback<IsmpConsensusStateCommitment | undefined> =} callback
+     **/
+    stateCommitments: GenericStorageQuery<
+      (arg: IsmpConsensusStateMachineHeight) => IsmpConsensusStateCommitment | undefined,
+      IsmpConsensusStateMachineHeight
+    >;
+
+    /**
+     * Holds a map of consensus state identifiers to their consensus state.
+     *
+     * @param {FixedBytes<4>} arg
+     * @param {Callback<Bytes | undefined> =} callback
+     **/
+    consensusStates: GenericStorageQuery<(arg: FixedBytes<4>) => Bytes | undefined, FixedBytes<4>>;
+
+    /**
+     * A mapping of consensus state identifier to it's associated consensus client identifier
+     *
+     * @param {FixedBytes<4>} arg
+     * @param {Callback<FixedBytes<4> | undefined> =} callback
+     **/
+    consensusStateClient: GenericStorageQuery<(arg: FixedBytes<4>) => FixedBytes<4> | undefined, FixedBytes<4>>;
+
+    /**
+     * A mapping of consensus state identifiers to their unbonding periods
+     *
+     * @param {FixedBytes<4>} arg
+     * @param {Callback<bigint | undefined> =} callback
+     **/
+    unbondingPeriod: GenericStorageQuery<(arg: FixedBytes<4>) => bigint | undefined, FixedBytes<4>>;
+
+    /**
+     * A mapping of state machine Ids to their challenge periods
+     *
+     * @param {IsmpConsensusStateMachineId} arg
+     * @param {Callback<bigint | undefined> =} callback
+     **/
+    challengePeriod: GenericStorageQuery<
+      (arg: IsmpConsensusStateMachineId) => bigint | undefined,
+      IsmpConsensusStateMachineId
+    >;
+
+    /**
+     * Holds a map of consensus clients frozen due to byzantine
+     * behaviour
+     *
+     * @param {FixedBytes<4>} arg
+     * @param {Callback<boolean> =} callback
+     **/
+    frozenConsensusClients: GenericStorageQuery<(arg: FixedBytes<4>) => boolean, FixedBytes<4>>;
+
+    /**
+     * The latest verified height for a state machine
+     *
+     * @param {IsmpConsensusStateMachineId} arg
+     * @param {Callback<bigint | undefined> =} callback
+     **/
+    latestStateMachineHeight: GenericStorageQuery<
+      (arg: IsmpConsensusStateMachineId) => bigint | undefined,
+      IsmpConsensusStateMachineId
+    >;
+
+    /**
+     * Holds the timestamp at which a consensus client was recently updated.
+     * Used in ensuring that the configured challenge period elapses.
+     *
+     * @param {FixedBytes<4>} arg
+     * @param {Callback<bigint | undefined> =} callback
+     **/
+    consensusClientUpdateTime: GenericStorageQuery<(arg: FixedBytes<4>) => bigint | undefined, FixedBytes<4>>;
+
+    /**
+     * Holds the timestamp at which a state machine height was updated.
+     * Used in ensuring that the configured challenge period elapses.
+     *
+     * @param {IsmpConsensusStateMachineHeight} arg
+     * @param {Callback<bigint | undefined> =} callback
+     **/
+    stateMachineUpdateTime: GenericStorageQuery<
+      (arg: IsmpConsensusStateMachineHeight) => bigint | undefined,
+      IsmpConsensusStateMachineHeight
+    >;
+
+    /**
+     * Tracks requests that have been responded to
+     * The key is the request commitment
+     *
+     * @param {H256} arg
+     * @param {Callback<boolean> =} callback
+     **/
+    responded: GenericStorageQuery<(arg: H256) => boolean, H256>;
+
+    /**
+     * Latest nonce for messages sent from this chain
+     *
+     * @param {Callback<bigint> =} callback
+     **/
+    nonce: GenericStorageQuery<() => bigint>;
+
+    /**
+     * The child trie root of messages
+     *
+     * @param {Callback<H256> =} callback
+     **/
+    childTrieRoot: GenericStorageQuery<() => H256>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery;
+  };
+  /**
+   * Pallet `IsmpParachain`'s storage queries
+   **/
+  ismpParachain: {
+    /**
+     * Mapping of relay chain heights to it's state commitment. The state commitment of the parent
+     * relay block is inserted at every block in `on_finalize`. This commitment is gotten from
+     * parachain-system.
+     *
+     * @param {number} arg
+     * @param {Callback<H256 | undefined> =} callback
+     **/
+    relayChainStateCommitments: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
+
+    /**
+     * Tracks whether we've already seen the `update_parachain_consensus` inherent
+     *
+     * @param {Callback<boolean | undefined> =} callback
+     **/
+    consensusUpdated: GenericStorageQuery<() => boolean | undefined>;
+
+    /**
+     * List of parachains that this state machine is interested in.
+     *
+     * @param {number} arg
+     * @param {Callback<bigint | undefined> =} callback
+     **/
+    parachains: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery;
+  };
+  /**
+   * Pallet `Hyperbridge`'s storage queries
+   **/
+  hyperbridge: {
+    /**
+     * The host parameters of the pallet-hyperbridge.
+     *
+     * @param {Callback<PalletHyperbridgeVersionedHostParams> =} callback
+     **/
+    hostParams: GenericStorageQuery<() => PalletHyperbridgeVersionedHostParams>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery;
+  };
+  /**
+   * Pallet `TokenGateway`'s storage queries
+   **/
+  tokenGateway: {
+    /**
+     * Assets supported by this instance of token gateway
+     * A map of the local asset id to the token gateway asset id
+     *
+     * @param {number} arg
+     * @param {Callback<H256 | undefined> =} callback
+     **/
+    supportedAssets: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
+
+    /**
+     * Assets that originate from this chain
+     *
+     * @param {number} arg
+     * @param {Callback<boolean> =} callback
+     **/
+    nativeAssets: GenericStorageQuery<(arg: number) => boolean, number>;
+
+    /**
+     * Assets supported by this instance of token gateway
+     * A map of the token gateway asset id to the local asset id
+     *
+     * @param {H256} arg
+     * @param {Callback<number | undefined> =} callback
+     **/
+    localAssets: GenericStorageQuery<(arg: H256) => number | undefined, H256>;
+
+    /**
+     * The decimals used by the EVM counterpart of this asset
+     *
+     * @param {[number, IsmpHostStateMachine]} arg
+     * @param {Callback<number | undefined> =} callback
+     **/
+    precisions: GenericStorageQuery<
+      (arg: [number, IsmpHostStateMachine]) => number | undefined,
+      [number, IsmpHostStateMachine]
+    >;
+
+    /**
+     * The token gateway adresses on different chains
+     *
+     * @param {IsmpHostStateMachine} arg
+     * @param {Callback<Bytes | undefined> =} callback
+     **/
+    tokenGatewayAddresses: GenericStorageQuery<(arg: IsmpHostStateMachine) => Bytes | undefined, IsmpHostStateMachine>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EmaOracle`'s storage queries
@@ -3158,7 +3293,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.
@@ -3169,7 +3304,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,
@@ -3181,12 +3315,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 `Broadcast`'s storage queries
@@ -3197,25 +3331,25 @@ 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>>;
 
     /**
      * If filled, we overwrite the original swapper. Mainly used in router to not to use temporary trade account
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    swapper: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    swapper: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }