@dedot/chaintypes 0.194.0 → 0.195.0

package/paseo-asset-hub/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,
@@ -145,7 +145,7 @@ import type {
   PalletRcMigratorQueuePriority,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -156,35 +156,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.
@@ -192,7 +192,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).
@@ -200,28 +200,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.
@@ -234,14 +234,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
@@ -258,21 +258,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
@@ -280,21 +280,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * The weight reclaimed for the extrinsic.
@@ -307,12 +307,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpWeightsWeightV2Weight> =} callback
      **/
-    extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+    extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -328,7 +328,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
@@ -338,7 +338,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -352,7 +351,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
@@ -363,7 +362,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.
@@ -372,14 +371,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.
@@ -388,7 +387,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.
@@ -401,7 +400,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.
@@ -412,7 +411,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.
@@ -424,7 +423,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
@@ -438,7 +437,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -452,7 +450,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.
@@ -462,7 +460,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.
@@ -473,7 +471,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -484,7 +481,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * The last processed downward message.
@@ -494,7 +491,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedDownwardMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -503,7 +499,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * The last processed HRMP message.
@@ -513,7 +509,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined> =} callback
      **/
     lastProcessedHrmpMessage: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemParachainInherentInboundMessageId | undefined
     >;
 
@@ -524,7 +519,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.
@@ -533,21 +528,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
@@ -555,7 +550,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
@@ -563,7 +558,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
@@ -571,7 +566,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`.
@@ -580,12 +575,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 `Timestamp`'s storage queries
@@ -596,7 +591,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.
@@ -606,12 +601,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 `ParachainInfo`'s storage queries
@@ -621,12 +616,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 `Preimage`'s storage queries
@@ -640,7 +635,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @deprecated RequestStatusFor
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -648,19 +643,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 `Scheduler`'s storage queries
@@ -671,7 +666,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.
@@ -679,7 +674,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.
@@ -687,11 +682,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.
@@ -702,12 +693,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 `Parameters`'s storage queries
@@ -720,7 +711,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AssetHubPaseoRuntimeRuntimeParametersValue | undefined> =} callback
      **/
     parameters: GenericStorageQuery<
-      Rv,
       (arg: AssetHubPaseoRuntimeRuntimeParametersKey) => AssetHubPaseoRuntimeRuntimeParametersValue | undefined,
       AssetHubPaseoRuntimeRuntimeParametersKey
     >;
@@ -728,7 +718,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -741,7 +731,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletMigrationsMigrationCursor | undefined> =} callback
      **/
-    cursor: GenericStorageQuery<Rv, () => PalletMigrationsMigrationCursor | undefined>;
+    cursor: GenericStorageQuery<() => PalletMigrationsMigrationCursor | undefined>;
 
     /**
      * Set of all successfully executed migrations.
@@ -752,12 +742,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    historic: GenericStorageQuery<Rv, (arg: BytesLike) => [] | undefined, Bytes>;
+    historic: GenericStorageQuery<(arg: BytesLike) => [] | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -768,14 +758,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.
@@ -806,7 +796,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.
@@ -817,7 +807,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.
@@ -827,7 +817,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.
@@ -836,7 +826,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeHoldReason>> =} callback
      **/
     holds: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeHoldReason>,
       AccountId32
     >;
@@ -848,7 +837,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -856,7 +844,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -866,18 +854,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 `Vesting`'s storage queries
@@ -889,11 +877,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -902,12 +886,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Claims`'s storage queries
@@ -918,13 +902,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    claims: GenericStorageQuery<Rv, (arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
+    claims: GenericStorageQuery<(arg: EthereumAddressLike) => bigint | undefined, EthereumAddress>;
 
     /**
      *
      * @param {Callback<bigint> =} callback
      **/
-    total: GenericStorageQuery<Rv, () => bigint>;
+    total: GenericStorageQuery<() => bigint>;
 
     /**
      * Vesting schedule for a claim.
@@ -935,11 +919,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {EthereumAddressLike} arg
      * @param {Callback<[bigint, bigint, number] | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: EthereumAddressLike) => [bigint, bigint, number] | undefined,
-      EthereumAddress
-    >;
+    vesting: GenericStorageQuery<(arg: EthereumAddressLike) => [bigint, bigint, number] | undefined, EthereumAddress>;
 
     /**
      * The statement kind that must be signed, if any.
@@ -948,7 +928,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PolkadotRuntimeCommonClaimsStatementKind | undefined> =} callback
      **/
     signing: GenericStorageQuery<
-      Rv,
       (arg: EthereumAddressLike) => PolkadotRuntimeCommonClaimsStatementKind | undefined,
       EthereumAddress
     >;
@@ -959,12 +938,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<EthereumAddress | undefined> =} callback
      **/
-    preclaims: GenericStorageQuery<Rv, (arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
+    preclaims: GenericStorageQuery<(arg: AccountId32Like) => EthereumAddress | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -975,12 +954,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
@@ -991,7 +970,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
@@ -1002,7 +981,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.
@@ -1010,7 +989,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.
@@ -1019,7 +998,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.
@@ -1028,12 +1007,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
@@ -1044,14 +1023,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
@@ -1059,7 +1038,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
@@ -1067,7 +1046,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, AssetHubPaseoRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, AssetHubPaseoRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, AssetHubPaseoRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1078,7 +1057,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+    disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
 
     /**
      * The next session keys for a validator.
@@ -1086,11 +1065,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AssetHubPaseoRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => AssetHubPaseoRuntimeSessionKeys | undefined,
-      AccountId32
-    >;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => AssetHubPaseoRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1099,7 +1074,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1107,7 +1081,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
@@ -1118,7 +1092,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.
@@ -1127,12 +1101,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
@@ -1147,7 +1121,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current relay chain slot paired with a number of authored blocks.
@@ -1157,12 +1131,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    relaySlotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    relaySlotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -1180,7 +1154,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
@@ -1192,7 +1166,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.
@@ -1201,7 +1175,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -1213,7 +1186,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1223,14 +1195,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.
@@ -1239,7 +1211,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1247,7 +1218,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -1258,7 +1229,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -1266,7 +1237,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.
@@ -1277,7 +1248,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`,
@@ -1285,7 +1256,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.
@@ -1294,7 +1265,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1306,7 +1276,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1319,7 +1288,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]
     >;
@@ -1331,14 +1299,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.
@@ -1347,7 +1315,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]
     >;
@@ -1359,7 +1326,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
     >;
@@ -1369,7 +1335,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.
@@ -1382,7 +1348,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
@@ -1394,7 +1360,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Map of authorized aliasers of local origins. Each local location can authorize a list of
@@ -1405,7 +1371,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -1413,7 +1378,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ToKusamaXcmRouter`'s storage queries
@@ -1430,12 +1395,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<BpXcmBridgeHubRouterBridgeState> =} callback
      **/
-    bridge: GenericStorageQuery<Rv, () => BpXcmBridgeHubRouterBridgeState>;
+    bridge: GenericStorageQuery<() => BpXcmBridgeHubRouterBridgeState>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -1448,7 +1413,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -1458,7 +1422,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.
@@ -1467,7 +1431,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -1475,7 +1438,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `SnowbridgeSystemFrontend`'s storage queries
@@ -1486,12 +1449,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SnowbridgeCoreOperatingModeBasicOperatingMode> =} callback
      **/
-    exportOperatingMode: GenericStorageQuery<Rv, () => SnowbridgeCoreOperatingModeBasicOperatingMode>;
+    exportOperatingMode: GenericStorageQuery<() => SnowbridgeCoreOperatingModeBasicOperatingMode>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1504,7 +1467,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>]
     >;
@@ -1512,7 +1474,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1526,7 +1488,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Array<PalletProxyProxyDefinitionProxyType>, bigint]> =} callback
      **/
     proxies: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => [Array<PalletProxyProxyDefinitionProxyType>, bigint],
       AccountId32
     >;
@@ -1537,16 +1498,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 `Indices`'s storage queries
@@ -1558,12 +1515,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[AccountId32, bigint, boolean] | undefined> =} callback
      **/
-    accounts: GenericStorageQuery<Rv, (arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
+    accounts: GenericStorageQuery<(arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -1575,7 +1532,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -1584,7 +1541,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -1598,7 +1554,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -1609,7 +1564,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -1624,12 +1579,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Uniques`'s storage queries
@@ -1641,7 +1596,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionDetails | undefined> =} callback
      **/
-    class: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionDetails | undefined, number>;
+    class: GenericStorageQuery<(arg: number) => PalletUniquesCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -1649,7 +1604,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -1659,7 +1614,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -1671,7 +1625,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    classAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
+    classAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -1679,7 +1633,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletUniquesItemDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
+    asset: GenericStorageQuery<(arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -1687,7 +1641,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletUniquesCollectionMetadata | undefined> =} callback
      **/
-    classMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
+    classMetadataOf: GenericStorageQuery<(arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -1696,7 +1650,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
      **/
     instanceMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletUniquesItemMetadata | undefined,
       [number, number]
     >;
@@ -1708,7 +1661,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, bigint] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (arg: [number, number | undefined, BytesLike]) => [Bytes, bigint] | undefined,
       [number, number | undefined, Bytes]
     >;
@@ -1720,7 +1672,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -1731,12 +1682,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    collectionMaxSupply: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    collectionMaxSupply: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Nfts`'s storage queries
@@ -1748,7 +1699,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionDetails | undefined> =} callback
      **/
-    collection: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionDetails | undefined, number>;
+    collection: GenericStorageQuery<(arg: number) => PalletNftsCollectionDetails | undefined, number>;
 
     /**
      * The collection, if any, of which an account is willing to take ownership.
@@ -1756,7 +1707,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * The items held by any given account; set out this way so that items owned by a single
@@ -1766,7 +1717,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[] | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number, number]) => [] | undefined,
       [AccountId32, number, number]
     >;
@@ -1778,11 +1728,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    collectionAccount: GenericStorageQuery<
-      Rv,
-      (arg: [AccountId32Like, number]) => [] | undefined,
-      [AccountId32, number]
-    >;
+    collectionAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
 
     /**
      * The items in existence and their ownership details.
@@ -1792,7 +1738,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsBitFlagsCollectionRole | undefined> =} callback
      **/
     collectionRoleOf: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletNftsBitFlagsCollectionRole | undefined,
       [number, AccountId32]
     >;
@@ -1803,7 +1748,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemDetails | undefined> =} callback
      **/
-    item: GenericStorageQuery<Rv, (arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
+    item: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
 
     /**
      * Metadata of a collection.
@@ -1811,7 +1756,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionMetadata | undefined> =} callback
      **/
-    collectionMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionMetadata | undefined, number>;
+    collectionMetadataOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionMetadata | undefined, number>;
 
     /**
      * Metadata of an item.
@@ -1820,7 +1765,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNftsItemMetadata | undefined> =} callback
      **/
     itemMetadataOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletNftsItemMetadata | undefined,
       [number, number]
     >;
@@ -1832,7 +1776,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Bytes, PalletNftsAttributeDeposit] | undefined> =} callback
      **/
     attribute: GenericStorageQuery<
-      Rv,
       (
         arg: [number, number | undefined, PalletNftsAttributeNamespace, BytesLike],
       ) => [Bytes, PalletNftsAttributeDeposit] | undefined,
@@ -1846,7 +1789,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
      **/
     itemPriceOf: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined,
       [number, number]
     >;
@@ -1857,7 +1799,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    itemAttributesApprovalsOf: GenericStorageQuery<Rv, (arg: [number, number]) => Array<AccountId32>, [number, number]>;
+    itemAttributesApprovalsOf: GenericStorageQuery<(arg: [number, number]) => Array<AccountId32>, [number, number]>;
 
     /**
      * Stores the `CollectionId` that is going to be used for the next collection.
@@ -1865,7 +1807,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextCollectionId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextCollectionId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Handles all the pending swaps.
@@ -1873,11 +1815,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsPendingSwap | undefined> =} callback
      **/
-    pendingSwapOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsPendingSwap | undefined,
-      [number, number]
-    >;
+    pendingSwapOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsPendingSwap | undefined, [number, number]>;
 
     /**
      * Config of a collection.
@@ -1885,7 +1823,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNftsCollectionConfig | undefined> =} callback
      **/
-    collectionConfigOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionConfig | undefined, number>;
+    collectionConfigOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionConfig | undefined, number>;
 
     /**
      * Config of an item.
@@ -1893,16 +1831,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<PalletNftsItemConfig | undefined> =} callback
      **/
-    itemConfigOf: GenericStorageQuery<
-      Rv,
-      (arg: [number, number]) => PalletNftsItemConfig | undefined,
-      [number, number]
-    >;
+    itemConfigOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemConfig | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ForeignAssets`'s storage queries
@@ -1915,7 +1849,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
     asset: GenericStorageQuery<
-      Rv,
       (arg: StagingXcmV5Location) => PalletAssetsAssetDetails | undefined,
       StagingXcmV5Location
     >;
@@ -1927,7 +1860,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [StagingXcmV5Location, AccountId32]
     >;
@@ -1941,7 +1873,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [StagingXcmV5Location, AccountId32, AccountId32]
     >;
@@ -1952,7 +1883,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {StagingXcmV5Location} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: StagingXcmV5Location) => PalletAssetsAssetMetadata, StagingXcmV5Location>;
+    metadata: GenericStorageQuery<(arg: StagingXcmV5Location) => PalletAssetsAssetMetadata, StagingXcmV5Location>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -1967,12 +1898,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Location | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => StagingXcmV5Location | undefined>;
+    nextAssetId: GenericStorageQuery<() => StagingXcmV5Location | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `PoolAssets`'s storage queries
@@ -1984,7 +1915,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+    asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -1993,7 +1924,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [number, AccountId32]
     >;
@@ -2007,7 +1937,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [number, AccountId32, AccountId32]
     >;
@@ -2018,7 +1947,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+    metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -2033,12 +1962,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetConversion`'s storage queries
@@ -2052,7 +1981,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetConversionPoolInfo | undefined> =} callback
      **/
     pools: GenericStorageQuery<
-      Rv,
       (arg: [StagingXcmV5Location, StagingXcmV5Location]) => PalletAssetConversionPoolInfo | undefined,
       [StagingXcmV5Location, StagingXcmV5Location]
     >;
@@ -2063,12 +1991,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextPoolAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+    nextPoolAssetId: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -2082,7 +2010,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -2093,14 +2021,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
@@ -2110,14 +2038,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The count of spends that have been made.
      *
      * @param {Callback<number> =} callback
      **/
-    spendCount: GenericStorageQuery<Rv, () => number>;
+    spendCount: GenericStorageQuery<() => number>;
 
     /**
      * Spends that have been approved and being processed.
@@ -2125,19 +2053,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
      **/
-    spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+    spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
 
     /**
      * The blocknumber for the last triggered spend period.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSpendPeriod: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSpendPeriod: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ConvictionVoting`'s storage queries
@@ -2151,7 +2079,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId32, number]
     >;
@@ -2164,12 +2091,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
@@ -2180,7 +2107,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.
@@ -2189,7 +2116,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletReferendaReferendumInfoOriginCaller | undefined> =} callback
      **/
     referendumInfoFor: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletReferendaReferendumInfoOriginCaller | undefined,
       number
     >;
@@ -2203,7 +2129,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.
@@ -2211,7 +2137,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.
@@ -2224,12 +2150,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
@@ -2240,12 +2166,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 `Bounties`'s storage queries
@@ -2256,7 +2182,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    bountyCount: GenericStorageQuery<Rv, () => number>;
+    bountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Bounties that have been made.
@@ -2264,7 +2190,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletBountiesBounty | undefined> =} callback
      **/
-    bounties: GenericStorageQuery<Rv, (arg: number) => PalletBountiesBounty | undefined, number>;
+    bounties: GenericStorageQuery<(arg: number) => PalletBountiesBounty | undefined, number>;
 
     /**
      * The description of each bounty.
@@ -2272,19 +2198,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    bountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    bountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * Bounty indices that have been approved but not yet funded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    bountyApprovals: GenericStorageQuery<Rv, () => Array<number>>;
+    bountyApprovals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ChildBounties`'s storage queries
@@ -2296,7 +2222,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    childBountyCount: GenericStorageQuery<Rv, () => number>;
+    childBountyCount: GenericStorageQuery<() => number>;
 
     /**
      * Number of active child bounties per parent bounty.
@@ -2305,7 +2231,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Number of total child bounties per parent bounty, including completed bounties.
@@ -2313,7 +2239,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    parentTotalChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    parentTotalChildBounties: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Child bounties that have been added.
@@ -2322,7 +2248,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletChildBountiesChildBounty | undefined> =} callback
      **/
     childBounties: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => PalletChildBountiesChildBounty | undefined,
       [number, number]
     >;
@@ -2335,7 +2260,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    childBountyDescriptionsV1: GenericStorageQuery<Rv, (arg: [number, number]) => Bytes | undefined, [number, number]>;
+    childBountyDescriptionsV1: GenericStorageQuery<(arg: [number, number]) => Bytes | undefined, [number, number]>;
 
     /**
      * The mapping of the child bounty ids from storage version `V0` to the new `V1` version.
@@ -2347,7 +2272,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    v0ToV1ChildBountyIds: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+    v0ToV1ChildBountyIds: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
 
     /**
      * The cumulative child-bounty curator fee for each parent bounty.
@@ -2355,12 +2280,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    childrenCuratorFees: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    childrenCuratorFees: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AssetRate`'s storage queries
@@ -2375,7 +2300,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128 | undefined> =} callback
      **/
     conversionRateToNative: GenericStorageQuery<
-      Rv,
       (arg: PolkadotRuntimeCommonImplsVersionedLocatableAsset) => FixedU128 | undefined,
       PolkadotRuntimeCommonImplsVersionedLocatableAsset
     >;
@@ -2383,7 +2307,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StateTrieMigration`'s storage queries
@@ -2397,7 +2321,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.
@@ -2406,7 +2330,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.
@@ -2415,12 +2339,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 `NominationPools`'s storage queries
@@ -2435,14 +2359,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+    totalValueLocked: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum amount to bond to join a pool.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+    minJoinBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -2455,7 +2379,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+    minCreateBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -2463,7 +2387,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPools: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -2471,7 +2395,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -2479,7 +2403,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -2488,7 +2412,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
 
     /**
      * Active members.
@@ -2499,7 +2423,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
     poolMembers: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
       AccountId32
     >;
@@ -2509,7 +2432,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+    counterForPoolMembers: GenericStorageQuery<() => number>;
 
     /**
      * Storage for bonded pools.
@@ -2517,14 +2440,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+    counterForBondedPools: GenericStorageQuery<() => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -2533,14 +2456,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+    counterForRewardPools: GenericStorageQuery<() => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -2549,14 +2472,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
 
     /**
      * Metadata for the pool.
@@ -2564,21 +2487,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+    metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<Rv, () => number>;
+    counterForMetadata: GenericStorageQuery<() => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<Rv, () => number>;
+    lastPoolId: GenericStorageQuery<() => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -2589,14 +2512,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -2604,16 +2527,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
-      AccountId32
-    >;
+    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `VoterList`'s storage queries
@@ -2627,14 +2546,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBagsListListNode | undefined> =} callback
      **/
-    listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
+    listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForListNodes: GenericStorageQuery<Rv, () => number>;
+    counterForListNodes: GenericStorageQuery<() => number>;
 
     /**
      * A bag stored in storage.
@@ -2644,7 +2563,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletBagsListListBag | undefined> =} callback
      **/
-    listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
+    listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined, bigint>;
 
     /**
      * Pointer that remembers the next node that will be auto-rebagged.
@@ -2652,7 +2571,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    nextNodeAutoRebagged: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    nextNodeAutoRebagged: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Lock all updates to this pallet.
@@ -2662,12 +2581,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    lock: GenericStorageQuery<Rv, () => [] | undefined>;
+    lock: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DelegatedStaking`'s storage queries
@@ -2683,7 +2602,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDelegatedStakingDelegation | undefined> =} callback
      **/
     delegators: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined,
       AccountId32
     >;
@@ -2693,7 +2611,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForDelegators: GenericStorageQuery<Rv, () => number>;
+    counterForDelegators: GenericStorageQuery<() => number>;
 
     /**
      * Map of `Agent` to their `Ledger`.
@@ -2701,23 +2619,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDelegatedStakingAgentLedger | undefined> =} callback
      **/
-    agents: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined,
-      AccountId32
-    >;
+    agents: GenericStorageQuery<(arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForAgents: GenericStorageQuery<Rv, () => number>;
+    counterForAgents: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `StakingRcClient`'s storage queries
@@ -2728,7 +2642,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncRcClientSessionReport | undefined> =} callback
      **/
-    incompleteSessionReport: GenericStorageQuery<Rv, () => PalletStakingAsyncRcClientSessionReport | undefined>;
+    incompleteSessionReport: GenericStorageQuery<() => PalletStakingAsyncRcClientSessionReport | undefined>;
 
     /**
      * The last session report's `end_index` that we have acted upon.
@@ -2742,7 +2656,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    lastSessionReportEndingIndex: GenericStorageQuery<Rv, () => number | undefined>;
+    lastSessionReportEndingIndex: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A validator set that is outgoing, and should be sent.
@@ -2752,15 +2666,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[PalletStakingAsyncRcClientValidatorSetReport, number] | undefined> =} callback
      **/
-    outgoingValidatorSet: GenericStorageQuery<
-      Rv,
-      () => [PalletStakingAsyncRcClientValidatorSetReport, number] | undefined
-    >;
+    outgoingValidatorSet: GenericStorageQuery<() => [PalletStakingAsyncRcClientValidatorSetReport, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElection`'s storage queries
@@ -2776,14 +2687,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => number>;
+    round: GenericStorageQuery<() => number>;
 
     /**
      * Current phase.
      *
      * @param {Callback<PalletElectionProviderMultiBlockPhase> =} callback
      **/
-    currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiBlockPhase>;
+    currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiBlockPhase>;
 
     /**
      * Desired number of targets to elect for this round.
@@ -2791,7 +2702,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    desiredTargets: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+    desiredTargets: GenericStorageQuery<(arg: number) => number | undefined, number>;
 
     /**
      * Paginated voter snapshot. At most [`T::Pages`] keys will exist.
@@ -2800,7 +2711,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, bigint, Array<AccountId32>]> | undefined> =} callback
      **/
     pagedVoterSnapshot: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => Array<[AccountId32, bigint, Array<AccountId32>]> | undefined,
       [number, number]
     >;
@@ -2813,7 +2723,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    pagedVoterSnapshotHash: GenericStorageQuery<Rv, (arg: [number, number]) => H256 | undefined, [number, number]>;
+    pagedVoterSnapshotHash: GenericStorageQuery<(arg: [number, number]) => H256 | undefined, [number, number]>;
 
     /**
      * Paginated target snapshot.
@@ -2824,7 +2734,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<AccountId32> | undefined> =} callback
      **/
     pagedTargetSnapshot: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => Array<AccountId32> | undefined,
       [number, number]
     >;
@@ -2837,12 +2746,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, number]} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    pagedTargetSnapshotHash: GenericStorageQuery<Rv, (arg: [number, number]) => H256 | undefined, [number, number]>;
+    pagedTargetSnapshotHash: GenericStorageQuery<(arg: [number, number]) => H256 | undefined, [number, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElectionVerifier`'s storage queries
@@ -2861,7 +2770,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FrameElectionProviderSupportBoundedSupports | undefined> =} callback
      **/
     queuedSolutionX: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => FrameElectionProviderSupportBoundedSupports | undefined,
       [number, number]
     >;
@@ -2873,7 +2781,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FrameElectionProviderSupportBoundedSupports | undefined> =} callback
      **/
     queuedSolutionY: GenericStorageQuery<
-      Rv,
       (arg: [number, number]) => FrameElectionProviderSupportBoundedSupports | undefined,
       [number, number]
     >;
@@ -2886,7 +2793,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiBlockVerifierImplsValidSolution> =} callback
      **/
     queuedValidVariant: GenericStorageQuery<
-      Rv,
       (arg: number) => PalletElectionProviderMultiBlockVerifierImplsValidSolution,
       number
     >;
@@ -2905,7 +2811,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[AccountId32, PalletElectionProviderMultiBlockVerifierImplsPartialBackings]> | undefined> =} callback
      **/
     queuedSolutionBackings: GenericStorageQuery<
-      Rv,
       (
         arg: [number, number],
       ) => Array<[AccountId32, PalletElectionProviderMultiBlockVerifierImplsPartialBackings]> | undefined,
@@ -2920,26 +2825,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    queuedSolutionScore: GenericStorageQuery<Rv, (arg: number) => SpNposElectionsElectionScore | undefined, number>;
+    queuedSolutionScore: GenericStorageQuery<(arg: number) => SpNposElectionsElectionScore | undefined, number>;
 
     /**
      * The minimum score that each solution must attain in order to be considered feasible.
      *
      * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
      **/
-    minimumScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
+    minimumScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
 
     /**
      * Storage item for [`Status`].
      *
      * @param {Callback<PalletElectionProviderMultiBlockVerifierImplsStatus> =} callback
      **/
-    statusStorage: GenericStorageQuery<Rv, () => PalletElectionProviderMultiBlockVerifierImplsStatus>;
+    statusStorage: GenericStorageQuery<() => PalletElectionProviderMultiBlockVerifierImplsStatus>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockElectionSigned`'s storage queries
@@ -2958,14 +2863,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      *
      * @param {number} arg
      * @param {Callback<Array<[AccountId32, SpNposElectionsElectionScore]>> =} callback
      **/
-    sortedScores: GenericStorageQuery<Rv, (arg: number) => Array<[AccountId32, SpNposElectionsElectionScore]>, number>;
+    sortedScores: GenericStorageQuery<(arg: number) => Array<[AccountId32, SpNposElectionsElectionScore]>, number>;
 
     /**
      * Triple map from (round, account, page) to a solution page.
@@ -2974,7 +2879,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AssetHubPaseoRuntimeStakingNposCompactSolution16 | undefined> =} callback
      **/
     submissionStorage: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => AssetHubPaseoRuntimeStakingNposCompactSolution16 | undefined,
       [number, AccountId32, number]
     >;
@@ -2989,7 +2893,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletElectionProviderMultiBlockSignedSubmissionMetadata | undefined> =} callback
      **/
     submissionMetadataStorage: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletElectionProviderMultiBlockSignedSubmissionMetadata | undefined,
       [number, AccountId32]
     >;
@@ -2997,7 +2900,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -3008,7 +2911,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<Rv, () => number>;
+    validatorCount: GenericStorageQuery<() => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -3017,7 +2920,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -3027,28 +2930,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minNominatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+    minValidatorBond: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+    minimumActiveStake: GenericStorageQuery<() => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -3057,7 +2960,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<Rv, () => Perbill>;
+    minCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -3069,7 +2972,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncLedgerStakingLedger | undefined> =} callback
      **/
     ledger: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletStakingAsyncLedgerStakingLedger | undefined,
       AccountId32
     >;
@@ -3082,11 +2984,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncRewardDestination | undefined> =} callback
      **/
-    payee: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletStakingAsyncRewardDestination | undefined,
-      AccountId32
-    >;
+    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncRewardDestination | undefined, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -3096,14 +2994,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingAsyncValidatorPrefs, AccountId32>;
+    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<Rv, () => number>;
+    counterForValidators: GenericStorageQuery<() => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -3112,7 +3010,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
@@ -3138,18 +3036,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingAsyncNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletStakingAsyncNominations | undefined,
-      AccountId32
-    >;
+    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingAsyncNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<Rv, () => number>;
+    counterForNominators: GenericStorageQuery<() => number>;
 
     /**
      * Stakers whose funds are managed by other pallets.
@@ -3162,14 +3056,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    virtualStakers: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+    virtualStakers: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForVirtualStakers: GenericStorageQuery<Rv, () => number>;
+    counterForVirtualStakers: GenericStorageQuery<() => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -3178,7 +3072,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The current planned era index.
@@ -3188,7 +3082,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+    currentEra: GenericStorageQuery<() => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -3198,7 +3092,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<Rv, () => PalletStakingAsyncActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<() => PalletStakingAsyncActiveEraInfo | undefined>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -3208,7 +3102,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
 
     /**
      * Summary of validator exposure at a given era.
@@ -3228,7 +3122,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
      **/
     erasStakersOverview: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined,
       [number, AccountId32]
     >;
@@ -3245,7 +3138,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncPalletBoundedExposurePage | undefined> =} callback
      **/
     erasStakersPaged: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, number]) => PalletStakingAsyncPalletBoundedExposurePage | undefined,
       [number, AccountId32, number]
     >;
@@ -3261,7 +3153,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<Array<number>> =} callback
      **/
-    claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+    claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
 
     /**
      * Exposure of validator at era with the preferences of validators.
@@ -3274,7 +3166,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncValidatorPrefs> =} callback
      **/
     erasValidatorPrefs: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingAsyncValidatorPrefs,
       [number, AccountId32]
     >;
@@ -3287,7 +3178,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last [`Config::HistoryDepth`] eras.
@@ -3296,7 +3187,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingAsyncEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingAsyncEraRewardPoints, number>;
+    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingAsyncEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last [`Config::HistoryDepth`] eras.
@@ -3305,14 +3196,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+    erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingAsyncForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<Rv, () => PalletStakingAsyncForcing>;
+    forceEra: GenericStorageQuery<() => PalletStakingAsyncForcing>;
 
     /**
      * Maximum staked rewards, i.e. the percentage of the era inflation that
@@ -3321,7 +3212,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
+    maxStakedRewards: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -3330,7 +3221,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+    slashRewardFraction: GenericStorageQuery<() => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -3338,7 +3229,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+    canceledSlashPayout: GenericStorageQuery<() => bigint>;
 
     /**
      * Stores reported offences in a queue until they are processed in subsequent blocks.
@@ -3356,7 +3247,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncSlashingOffenceRecord | undefined> =} callback
      **/
     offenceQueue: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => PalletStakingAsyncSlashingOffenceRecord | undefined,
       [number, AccountId32]
     >;
@@ -3376,7 +3266,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number> | undefined> =} callback
      **/
-    offenceQueueEras: GenericStorageQuery<Rv, () => Array<number> | undefined>;
+    offenceQueueEras: GenericStorageQuery<() => Array<number> | undefined>;
 
     /**
      * Tracks the currently processed offence record from the `OffenceQueue`.
@@ -3395,7 +3285,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[number, AccountId32, PalletStakingAsyncSlashingOffenceRecord] | undefined> =} callback
      **/
     processingOffence: GenericStorageQuery<
-      Rv,
       () => [number, AccountId32, PalletStakingAsyncSlashingOffenceRecord] | undefined
     >;
 
@@ -3406,7 +3295,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletStakingAsyncUnappliedSlash | undefined> =} callback
      **/
     unappliedSlashes: GenericStorageQuery<
-      Rv,
       (arg: [number, [AccountId32Like, Perbill, number]]) => PalletStakingAsyncUnappliedSlash | undefined,
       [number, [AccountId32, Perbill, number]]
     >;
@@ -3421,7 +3309,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Array<[AccountId32, Perbill]>> =} callback
      **/
-    cancelledSlashes: GenericStorageQuery<Rv, (arg: number) => Array<[AccountId32, Perbill]>, number>;
+    cancelledSlashes: GenericStorageQuery<(arg: number) => Array<[AccountId32, Perbill]>, number>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -3431,7 +3319,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
     validatorSlashInEra: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
       [number, AccountId32]
     >;
@@ -3443,7 +3330,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
 
     /**
      * Voter snapshot progress status.
@@ -3453,7 +3340,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletStakingAsyncSnapshotStatus> =} callback
      **/
-    voterSnapshotStatus: GenericStorageQuery<Rv, () => PalletStakingAsyncSnapshotStatus>;
+    voterSnapshotStatus: GenericStorageQuery<() => PalletStakingAsyncSnapshotStatus>;
 
     /**
      * Keeps track of an ongoing multi-page election solution request.
@@ -3465,14 +3352,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    nextElectionPage: GenericStorageQuery<Rv, () => number | undefined>;
+    nextElectionPage: GenericStorageQuery<() => number | undefined>;
 
     /**
      * A bounded list of the "electable" stashes that resulted from a successful election.
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    electableStashes: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    electableStashes: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Tracks the current step of era pruning process for each era being lazily pruned.
@@ -3480,12 +3367,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletStakingAsyncPalletPruningStep | undefined> =} callback
      **/
-    eraPruningState: GenericStorageQuery<Rv, (arg: number) => PalletStakingAsyncPalletPruningStep | undefined, number>;
+    eraPruningState: GenericStorageQuery<(arg: number) => PalletStakingAsyncPalletPruningStep | undefined, number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Revive`'s storage queries
@@ -3497,7 +3384,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
 
     /**
      * A mapping from a contract's code hash to its code info.
@@ -3505,7 +3392,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletReviveVmCodeInfo | undefined> =} callback
      **/
-    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletReviveVmCodeInfo | undefined, H256>;
+    codeInfoOf: GenericStorageQuery<(arg: H256) => PalletReviveVmCodeInfo | undefined, H256>;
 
     /**
      * The data associated to a contract or externally owned account.
@@ -3513,7 +3400,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<PalletReviveStorageAccountInfo | undefined> =} callback
      **/
-    accountInfoOf: GenericStorageQuery<Rv, (arg: H160) => PalletReviveStorageAccountInfo | undefined, H160>;
+    accountInfoOf: GenericStorageQuery<(arg: H160) => PalletReviveStorageAccountInfo | undefined, H160>;
 
     /**
      * The immutable data associated with a given account.
@@ -3521,7 +3408,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    immutableDataOf: GenericStorageQuery<Rv, (arg: H160) => Bytes | undefined, H160>;
+    immutableDataOf: GenericStorageQuery<(arg: H160) => Bytes | undefined, H160>;
 
     /**
      * Evicted contracts that await child trie deletion.
@@ -3532,7 +3419,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    deletionQueue: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    deletionQueue: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * A pair of monotonic counters used to track the latest contract marked for deletion
@@ -3540,7 +3427,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletReviveStorageDeletionQueueManager> =} callback
      **/
-    deletionQueueCounter: GenericStorageQuery<Rv, () => PalletReviveStorageDeletionQueueManager>;
+    deletionQueueCounter: GenericStorageQuery<() => PalletReviveStorageDeletionQueueManager>;
 
     /**
      * Map a Ethereum address to its original `AccountId32`.
@@ -3553,12 +3440,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    originalAccount: GenericStorageQuery<Rv, (arg: H160) => AccountId32 | undefined, H160>;
+    originalAccount: GenericStorageQuery<(arg: H160) => AccountId32 | undefined, H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Sudo`'s storage queries
@@ -3569,12 +3456,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    key: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AhOps`'s storage queries
@@ -3600,7 +3487,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     rcLeaseReserve: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32Like]) => bigint | undefined,
       [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32]
     >;
@@ -3623,7 +3509,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, bigint] | undefined> =} callback
      **/
     rcCrowdloanContribution: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32Like]) => [AccountId32, bigint] | undefined,
       [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32]
     >;
@@ -3643,7 +3528,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     rcCrowdloanReserve: GenericStorageQuery<
-      Rv,
       (arg: [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32Like]) => bigint | undefined,
       [number, PolkadotParachainPrimitivesPrimitivesId, AccountId32]
     >;
@@ -3651,7 +3535,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AhMigrator`'s storage queries
@@ -3665,18 +3549,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletRcMigratorAccountsAccount | undefined> =} callback
      **/
-    rcAccounts: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => PalletRcMigratorAccountsAccount | undefined,
-      AccountId32
-    >;
+    rcAccounts: GenericStorageQuery<(arg: AccountId32Like) => PalletRcMigratorAccountsAccount | undefined, AccountId32>;
 
     /**
      * The Asset Hub migration state.
      *
      * @param {Callback<PalletAhMigratorMigrationStage> =} callback
      **/
-    ahMigrationStage: GenericStorageQuery<Rv, () => PalletAhMigratorMigrationStage>;
+    ahMigrationStage: GenericStorageQuery<() => PalletAhMigratorMigrationStage>;
 
     /**
      * Helper storage item to store the total balance / total issuance of native token at the start
@@ -3685,7 +3565,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletAhMigratorBalancesBefore> =} callback
      **/
-    ahBalancesBefore: GenericStorageQuery<Rv, () => PalletAhMigratorBalancesBefore>;
+    ahBalancesBefore: GenericStorageQuery<() => PalletAhMigratorBalancesBefore>;
 
     /**
      * The priority of the DMP queue during migration.
@@ -3697,7 +3577,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletRcMigratorQueuePriority> =} callback
      **/
-    dmpQueuePriorityConfig: GenericStorageQuery<Rv, () => PalletRcMigratorQueuePriority>;
+    dmpQueuePriorityConfig: GenericStorageQuery<() => PalletRcMigratorQueuePriority>;
 
     /**
      * An optional account id of a manager.
@@ -3707,7 +3587,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    manager: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    manager: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * The block number at which the migration began and the pallet's extrinsics were locked.
@@ -3717,7 +3597,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationStartBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationStartBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Block number when migration finished and extrinsics were unlocked.
@@ -3727,11 +3607,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    migrationEndBlock: GenericStorageQuery<Rv, () => number | undefined>;
+    migrationEndBlock: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }