@dedot/chaintypes 0.194.0 → 0.196.0

package/moonbeam/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 {
   AccountId20,
   AccountId20Like,
@@ -125,7 +125,7 @@ import type {
   BpXcmBridgeHubBridgeId,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -136,35 +136,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId20Like) => FrameSystemAccountInfo, AccountId20>;
+    account: GenericStorageQuery<(arg: AccountId20Like) => FrameSystemAccountInfo, AccountId20>;
 
     /**
      * 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.
@@ -172,7 +172,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).
@@ -180,28 +180,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.
@@ -214,14 +214,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
@@ -238,21 +238,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
@@ -260,21 +260,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.
@@ -287,12 +287,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
@@ -308,7 +308,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
@@ -318,7 +318,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -332,7 +331,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
@@ -343,7 +342,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.
@@ -352,14 +351,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.
@@ -368,7 +367,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.
@@ -381,7 +380,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.
@@ -392,7 +391,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.
@@ -404,7 +403,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
@@ -418,7 +417,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -432,7 +430,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.
@@ -442,7 +440,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.
@@ -453,7 +451,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -464,7 +461,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
+    processedDownwardMessages: GenericStorageQuery<() => number>;
 
     /**
      * HRMP watermark that was set in a block.
@@ -473,7 +470,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
+    hrmpWatermark: GenericStorageQuery<() => number>;
 
     /**
      * HRMP messages that were sent in a block.
@@ -482,7 +479,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.
@@ -491,21 +488,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
@@ -513,7 +510,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
@@ -521,7 +518,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
@@ -529,7 +526,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`.
@@ -538,12 +535,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
@@ -554,7 +551,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.
@@ -564,12 +561,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
@@ -579,12 +576,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 `RootTesting`'s storage queries
@@ -593,7 +590,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -604,14 +601,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.
@@ -642,7 +639,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId20Like) => PalletBalancesAccountData, AccountId20>;
+    account: GenericStorageQuery<(arg: AccountId20Like) => PalletBalancesAccountData, AccountId20>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -653,7 +650,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId20Like) => Array<PalletBalancesBalanceLock>, AccountId20>;
+    locks: GenericStorageQuery<(arg: AccountId20Like) => Array<PalletBalancesBalanceLock>, AccountId20>;
 
     /**
      * Named reserves on some account balances.
@@ -663,7 +660,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId20Like) => Array<PalletBalancesReserveData>, AccountId20>;
+    reserves: GenericStorageQuery<(arg: AccountId20Like) => Array<PalletBalancesReserveData>, AccountId20>;
 
     /**
      * Holds on account balances.
@@ -671,7 +668,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId20Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId20>;
+    holds: GenericStorageQuery<(arg: AccountId20Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId20>;
 
     /**
      * Freeze locks on account balances.
@@ -679,12 +676,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount002>> =} callback
      **/
-    freezes: GenericStorageQuery<Rv, (arg: AccountId20Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId20>;
+    freezes: GenericStorageQuery<(arg: AccountId20Like) => Array<FrameSupportTokensMiscIdAmount002>, AccountId20>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -694,18 +691,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 `ParachainStaking`'s storage queries
@@ -716,14 +713,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Perbill> =} callback
      **/
-    collatorCommission: GenericStorageQuery<Rv, () => Perbill>;
+    collatorCommission: GenericStorageQuery<() => Perbill>;
 
     /**
      * The total candidates selected every round
      *
      * @param {Callback<number> =} callback
      **/
-    totalSelected: GenericStorageQuery<Rv, () => number>;
+    totalSelected: GenericStorageQuery<() => number>;
 
     /**
      * Inflation distribution configuration, including accounts that should receive inflation
@@ -733,14 +730,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletParachainStakingInflationDistributionConfig> =} callback
      **/
-    inflationDistributionInfo: GenericStorageQuery<Rv, () => PalletParachainStakingInflationDistributionConfig>;
+    inflationDistributionInfo: GenericStorageQuery<() => PalletParachainStakingInflationDistributionConfig>;
 
     /**
      * Current round index and next round scheduled transition
      *
      * @param {Callback<PalletParachainStakingRoundInfo> =} callback
      **/
-    round: GenericStorageQuery<Rv, () => PalletParachainStakingRoundInfo>;
+    round: GenericStorageQuery<() => PalletParachainStakingRoundInfo>;
 
     /**
      * Get delegator state associated with an account if account is delegating else None
@@ -749,7 +746,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletParachainStakingDelegator | undefined> =} callback
      **/
     delegatorState: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => PalletParachainStakingDelegator | undefined,
       AccountId20
     >;
@@ -761,7 +757,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletParachainStakingCandidateMetadata | undefined> =} callback
      **/
     candidateInfo: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => PalletParachainStakingCandidateMetadata | undefined,
       AccountId20
     >;
@@ -773,7 +768,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PalletParachainStakingDelegationRequestsScheduledRequest>> =} callback
      **/
     delegationScheduledRequests: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => Array<PalletParachainStakingDelegationRequestsScheduledRequest>,
       AccountId20
     >;
@@ -785,7 +779,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<PalletParachainStakingAutoCompoundAutoCompoundConfig>> =} callback
      **/
     autoCompoundingDelegations: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => Array<PalletParachainStakingAutoCompoundAutoCompoundConfig>,
       AccountId20
     >;
@@ -797,7 +790,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletParachainStakingDelegations | undefined> =} callback
      **/
     topDelegations: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => PalletParachainStakingDelegations | undefined,
       AccountId20
     >;
@@ -809,7 +801,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletParachainStakingDelegations | undefined> =} callback
      **/
     bottomDelegations: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => PalletParachainStakingDelegations | undefined,
       AccountId20
     >;
@@ -819,21 +810,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId20>> =} callback
      **/
-    selectedCandidates: GenericStorageQuery<Rv, () => Array<AccountId20>>;
+    selectedCandidates: GenericStorageQuery<() => Array<AccountId20>>;
 
     /**
      * Total capital locked by this staking pallet
      *
      * @param {Callback<bigint> =} callback
      **/
-    total: GenericStorageQuery<Rv, () => bigint>;
+    total: GenericStorageQuery<() => bigint>;
 
     /**
      * The pool of collator candidates, each with their total backing stake
      *
      * @param {Callback<PalletParachainStakingSetBoundedOrderedSet> =} callback
      **/
-    candidatePool: GenericStorageQuery<Rv, () => PalletParachainStakingSetBoundedOrderedSet>;
+    candidatePool: GenericStorageQuery<() => PalletParachainStakingSetBoundedOrderedSet>;
 
     /**
      * Snapshot of collator delegation stake at the start of the round
@@ -842,7 +833,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletParachainStakingCollatorSnapshot | undefined> =} callback
      **/
     atStake: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId20Like]) => PalletParachainStakingCollatorSnapshot | undefined,
       [number, AccountId20]
     >;
@@ -854,7 +844,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId20Like]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    wasInactive: GenericStorageQuery<Rv, (arg: [number, AccountId20Like]) => [] | undefined, [number, AccountId20]>;
+    wasInactive: GenericStorageQuery<(arg: [number, AccountId20Like]) => [] | undefined, [number, AccountId20]>;
 
     /**
      * Delayed payouts
@@ -862,14 +852,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletParachainStakingDelayedPayout | undefined> =} callback
      **/
-    delayedPayouts: GenericStorageQuery<Rv, (arg: number) => PalletParachainStakingDelayedPayout | undefined, number>;
+    delayedPayouts: GenericStorageQuery<(arg: number) => PalletParachainStakingDelayedPayout | undefined, number>;
 
     /**
      * Inflation configuration
      *
      * @param {Callback<PalletParachainStakingInflationInflationInfo> =} callback
      **/
-    inflationConfig: GenericStorageQuery<Rv, () => PalletParachainStakingInflationInflationInfo>;
+    inflationConfig: GenericStorageQuery<() => PalletParachainStakingInflationInflationInfo>;
 
     /**
      * Total points awarded to collators for block production in the round
@@ -877,7 +867,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<number> =} callback
      **/
-    points: GenericStorageQuery<Rv, (arg: number) => number, number>;
+    points: GenericStorageQuery<(arg: number) => number, number>;
 
     /**
      * Points for each collator per round
@@ -885,19 +875,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[number, AccountId20Like]} arg
      * @param {Callback<number> =} callback
      **/
-    awardedPts: GenericStorageQuery<Rv, (arg: [number, AccountId20Like]) => number, [number, AccountId20]>;
+    awardedPts: GenericStorageQuery<(arg: [number, AccountId20Like]) => number, [number, AccountId20]>;
 
     /**
      * Killswitch to enable/disable marking offline feature.
      *
      * @param {Callback<boolean> =} callback
      **/
-    enableMarkingOffline: GenericStorageQuery<Rv, () => boolean>;
+    enableMarkingOffline: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuthorInherent`'s storage queries
@@ -908,19 +898,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId20 | undefined>;
+    author: GenericStorageQuery<() => AccountId20 | undefined>;
 
     /**
      * Check if the inherent was included
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentIncluded: GenericStorageQuery<Rv, () => boolean>;
+    inherentIncluded: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuthorFilter`'s storage queries
@@ -930,19 +920,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Percent> =} callback
      **/
-    eligibleRatio: GenericStorageQuery<Rv, () => Percent>;
+    eligibleRatio: GenericStorageQuery<() => Percent>;
 
     /**
      * The number of active authors that will be eligible at each height.
      *
      * @param {Callback<PalletAuthorSlotFilterNumNonZeroU32> =} callback
      **/
-    eligibleCount: GenericStorageQuery<Rv, () => PalletAuthorSlotFilterNumNonZeroU32>;
+    eligibleCount: GenericStorageQuery<() => PalletAuthorSlotFilterNumNonZeroU32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuthorMapping`'s storage queries
@@ -956,7 +946,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAuthorMappingRegistrationInfo | undefined> =} callback
      **/
     mappingWithDeposit: GenericStorageQuery<
-      Rv,
       (arg: NimbusPrimitivesNimbusCryptoPublic) => PalletAuthorMappingRegistrationInfo | undefined,
       NimbusPrimitivesNimbusCryptoPublic
     >;
@@ -968,7 +957,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<NimbusPrimitivesNimbusCryptoPublic | undefined> =} callback
      **/
     nimbusLookup: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => NimbusPrimitivesNimbusCryptoPublic | undefined,
       AccountId20
     >;
@@ -976,7 +964,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MoonbeamOrbiters`'s storage queries
@@ -989,7 +977,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId20 | undefined | undefined> =} callback
      **/
     accountLookupOverride: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => AccountId20 | undefined | undefined,
       AccountId20
     >;
@@ -1001,7 +988,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMoonbeamOrbitersCollatorPoolInfo | undefined> =} callback
      **/
     collatorsPool: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => PalletMoonbeamOrbitersCollatorPoolInfo | undefined,
       AccountId20
     >;
@@ -1011,14 +997,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForCollatorsPool: GenericStorageQuery<Rv, () => number>;
+    counterForCollatorsPool: GenericStorageQuery<() => number>;
 
     /**
      * Current round index
      *
      * @param {Callback<number> =} callback
      **/
-    currentRound: GenericStorageQuery<Rv, () => number>;
+    currentRound: GenericStorageQuery<() => number>;
 
     /**
      * If true, it forces the rotation at the next round.
@@ -1027,14 +1013,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    forceRotation: GenericStorageQuery<Rv, () => boolean>;
+    forceRotation: GenericStorageQuery<() => boolean>;
 
     /**
      * Minimum deposit required to be registered as an orbiter
      *
      * @param {Callback<bigint | undefined> =} callback
      **/
-    minOrbiterDeposit: GenericStorageQuery<Rv, () => bigint | undefined>;
+    minOrbiterDeposit: GenericStorageQuery<() => bigint | undefined>;
 
     /**
      * Store active orbiter per round and per parent collator
@@ -1043,7 +1029,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
     orbiterPerRound: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId20Like]) => AccountId20 | undefined,
       [number, AccountId20]
     >;
@@ -1054,12 +1039,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<boolean | undefined> =} callback
      **/
-    registeredOrbiter: GenericStorageQuery<Rv, (arg: AccountId20Like) => boolean | undefined, AccountId20>;
+    registeredOrbiter: GenericStorageQuery<(arg: AccountId20Like) => boolean | undefined, AccountId20>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AsyncBacking`'s storage queries
@@ -1072,12 +1057,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
      **/
-    slotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
+    slotInfo: GenericStorageQuery<() => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -1090,11 +1075,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId20Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId20
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId20Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId20>;
 
     /**
      * The announcements made by the proxy (key).
@@ -1102,16 +1083,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId20Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId20
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId20Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId20>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MaintenanceMode`'s storage queries
@@ -1122,12 +1099,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    maintenanceMode: GenericStorageQuery<Rv, () => boolean>;
+    maintenanceMode: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -1142,7 +1119,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<PalletIdentityRegistration | undefined> =} callback
      **/
-    identityOf: GenericStorageQuery<Rv, (arg: AccountId20Like) => PalletIdentityRegistration | undefined, AccountId20>;
+    identityOf: GenericStorageQuery<(arg: AccountId20Like) => PalletIdentityRegistration | undefined, AccountId20>;
 
     /**
      * Identifies the primary username of an account.
@@ -1150,7 +1127,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    usernameOf: GenericStorageQuery<Rv, (arg: AccountId20Like) => Bytes | undefined, AccountId20>;
+    usernameOf: GenericStorageQuery<(arg: AccountId20Like) => Bytes | undefined, AccountId20>;
 
     /**
      * The super-identity of an alternative "sub" identity together with its name, within that
@@ -1159,7 +1136,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<[AccountId20, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId20Like) => [AccountId20, Data] | undefined, AccountId20>;
+    superOf: GenericStorageQuery<(arg: AccountId20Like) => [AccountId20, Data] | undefined, AccountId20>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -1171,7 +1148,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<[bigint, Array<AccountId20>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId20Like) => [bigint, Array<AccountId20>], AccountId20>;
+    subsOf: GenericStorageQuery<(arg: AccountId20Like) => [bigint, Array<AccountId20>], AccountId20>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -1181,7 +1158,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * A map of the accounts who are authorized to grant usernames.
@@ -1189,7 +1166,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityAuthorityProperties | undefined> =} callback
      **/
-    authorityOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
+    authorityOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityAuthorityProperties | undefined, Bytes>;
 
     /**
      * Reverse lookup from `username` to the `AccountId` that has registered it and the provider of
@@ -1202,7 +1179,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<PalletIdentityUsernameInformation | undefined> =} callback
      **/
-    usernameInfoOf: GenericStorageQuery<Rv, (arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
+    usernameInfoOf: GenericStorageQuery<(arg: BytesLike) => PalletIdentityUsernameInformation | undefined, Bytes>;
 
     /**
      * Usernames that an authority has granted, but that the account controller has not confirmed
@@ -1216,7 +1193,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId20, number, PalletIdentityProvider] | undefined> =} callback
      **/
     pendingUsernames: GenericStorageQuery<
-      Rv,
       (arg: BytesLike) => [AccountId20, number, PalletIdentityProvider] | undefined,
       Bytes
     >;
@@ -1230,12 +1206,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BytesLike} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    unbindingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => number | undefined, Bytes>;
+    unbindingUsernames: GenericStorageQuery<(arg: BytesLike) => number | undefined, Bytes>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1248,7 +1224,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId20Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId20, FixedBytes<32>]
     >;
@@ -1256,7 +1231,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MoonbeamLazyMigrations`'s storage queries
@@ -1265,7 +1240,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Parameters`'s storage queries
@@ -1278,7 +1253,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<MoonbeamRuntimeRuntimeParamsRuntimeParametersValue | undefined> =} callback
      **/
     parameters: GenericStorageQuery<
-      Rv,
       (
         arg: MoonbeamRuntimeRuntimeParamsRuntimeParametersKey,
       ) => MoonbeamRuntimeRuntimeParamsRuntimeParametersValue | undefined,
@@ -1288,7 +1262,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EthereumChainId`'s storage queries
@@ -1299,12 +1273,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    chainId: GenericStorageQuery<Rv, () => bigint>;
+    chainId: GenericStorageQuery<() => bigint>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EVM`'s storage queries
@@ -1315,26 +1289,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H160} arg
      * @param {Callback<Bytes> =} callback
      **/
-    accountCodes: GenericStorageQuery<Rv, (arg: H160) => Bytes, H160>;
+    accountCodes: GenericStorageQuery<(arg: H160) => Bytes, H160>;
 
     /**
      *
      * @param {H160} arg
      * @param {Callback<PalletEvmCodeMetadata | undefined> =} callback
      **/
-    accountCodesMetadata: GenericStorageQuery<Rv, (arg: H160) => PalletEvmCodeMetadata | undefined, H160>;
+    accountCodesMetadata: GenericStorageQuery<(arg: H160) => PalletEvmCodeMetadata | undefined, H160>;
 
     /**
      *
      * @param {[H160, H256]} arg
      * @param {Callback<H256> =} callback
      **/
-    accountStorages: GenericStorageQuery<Rv, (arg: [H160, H256]) => H256, [H160, H256]>;
+    accountStorages: GenericStorageQuery<(arg: [H160, H256]) => H256, [H160, H256]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Ethereum`'s storage queries
@@ -1347,7 +1321,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[EthereumTransactionTransactionV3, FpRpcTransactionStatus, EthereumReceiptReceiptV4] | undefined> =} callback
      **/
     pending: GenericStorageQuery<
-      Rv,
       (arg: number) => [EthereumTransactionTransactionV3, FpRpcTransactionStatus, EthereumReceiptReceiptV4] | undefined,
       number
     >;
@@ -1357,40 +1330,40 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPending: GenericStorageQuery<Rv, () => number>;
+    counterForPending: GenericStorageQuery<() => number>;
 
     /**
      * The current Ethereum block.
      *
      * @param {Callback<EthereumBlock | undefined> =} callback
      **/
-    currentBlock: GenericStorageQuery<Rv, () => EthereumBlock | undefined>;
+    currentBlock: GenericStorageQuery<() => EthereumBlock | undefined>;
 
     /**
      * The current Ethereum receipts.
      *
      * @param {Callback<Array<EthereumReceiptReceiptV4> | undefined> =} callback
      **/
-    currentReceipts: GenericStorageQuery<Rv, () => Array<EthereumReceiptReceiptV4> | undefined>;
+    currentReceipts: GenericStorageQuery<() => Array<EthereumReceiptReceiptV4> | undefined>;
 
     /**
      * The current transaction statuses.
      *
      * @param {Callback<Array<FpRpcTransactionStatus> | undefined> =} callback
      **/
-    currentTransactionStatuses: GenericStorageQuery<Rv, () => Array<FpRpcTransactionStatus> | undefined>;
+    currentTransactionStatuses: GenericStorageQuery<() => Array<FpRpcTransactionStatus> | undefined>;
 
     /**
      *
      * @param {U256} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: U256) => H256, U256>;
+    blockHash: GenericStorageQuery<(arg: U256) => H256, U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -1401,7 +1374,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.
@@ -1409,7 +1382,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.
@@ -1417,11 +1390,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.
@@ -1432,12 +1401,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -1449,7 +1418,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageOldRequestStatus | undefined> =} callback
      **/
-    statusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
+    statusFor: GenericStorageQuery<(arg: H256) => PalletPreimageOldRequestStatus | undefined, H256>;
 
     /**
      * The request status of a given hash.
@@ -1457,19 +1426,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 `ConvictionVoting`'s storage queries
@@ -1483,7 +1452,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
      **/
     votingFor: GenericStorageQuery<
-      Rv,
       (arg: [AccountId20Like, number]) => PalletConvictionVotingVoteVoting,
       [AccountId20, number]
     >;
@@ -1496,12 +1464,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId20Like} arg
      * @param {Callback<Array<[number, bigint]>> =} callback
      **/
-    classLocksFor: GenericStorageQuery<Rv, (arg: AccountId20Like) => Array<[number, bigint]>, AccountId20>;
+    classLocksFor: GenericStorageQuery<(arg: AccountId20Like) => Array<[number, bigint]>, AccountId20>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Referenda`'s storage queries
@@ -1512,7 +1480,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.
@@ -1520,7 +1488,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
      **/
-    referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+    referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
 
     /**
      * The sorted list of referenda ready to be decided but not yet being decided, ordered by
@@ -1531,7 +1499,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.
@@ -1539,7 +1507,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.
@@ -1552,12 +1520,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
@@ -1568,12 +1536,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 `TreasuryCouncilCollective`'s storage queries
@@ -1584,7 +1552,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -1592,7 +1560,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<MoonbeamRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => MoonbeamRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => MoonbeamRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -1603,7 +1571,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId20, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId20, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId20, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -1611,33 +1579,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId20>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId20>>;
+    members: GenericStorageQuery<() => Array<AccountId20>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId20 | undefined>;
+    prime: GenericStorageQuery<() => AccountId20 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OpenTechCommitteeCollective`'s storage queries
@@ -1648,7 +1616,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, () => Array<H256>>;
+    proposals: GenericStorageQuery<() => Array<H256>>;
 
     /**
      * Actual proposal for a given hash, if it's current.
@@ -1656,7 +1624,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<MoonbeamRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => MoonbeamRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => MoonbeamRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -1667,7 +1635,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId20, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId20, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId20, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -1675,33 +1643,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId20>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId20>>;
+    members: GenericStorageQuery<() => Array<AccountId20>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId20 | undefined>;
+    prime: GenericStorageQuery<() => AccountId20 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -1715,7 +1683,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.
@@ -1726,14 +1694,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.
@@ -1743,14 +1711,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.
@@ -1758,19 +1726,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 `CrowdloanRewards`'s storage queries
@@ -1782,7 +1750,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCrowdloanRewardsRewardInfo | undefined> =} callback
      **/
     accountsPayable: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => PalletCrowdloanRewardsRewardInfo | undefined,
       AccountId20
     >;
@@ -1792,7 +1759,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    claimedRelayChainIds: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [] | undefined, FixedBytes<32>>;
+    claimedRelayChainIds: GenericStorageQuery<(arg: FixedBytes<32>) => [] | undefined, FixedBytes<32>>;
 
     /**
      *
@@ -1800,7 +1767,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletCrowdloanRewardsRewardInfo | undefined> =} callback
      **/
     unassociatedContributions: GenericStorageQuery<
-      Rv,
       (arg: FixedBytes<32>) => PalletCrowdloanRewardsRewardInfo | undefined,
       FixedBytes<32>
     >;
@@ -1809,21 +1775,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    initialized: GenericStorageQuery<Rv, () => boolean>;
+    initialized: GenericStorageQuery<() => boolean>;
 
     /**
      * Vesting block height at the initialization of the pallet
      *
      * @param {Callback<number> =} callback
      **/
-    initRelayBlock: GenericStorageQuery<Rv, () => number>;
+    initRelayBlock: GenericStorageQuery<() => number>;
 
     /**
      * Vesting block height at the initialization of the pallet
      *
      * @param {Callback<number> =} callback
      **/
-    endRelayBlock: GenericStorageQuery<Rv, () => number>;
+    endRelayBlock: GenericStorageQuery<() => number>;
 
     /**
      * Total initialized amount so far. We store this to make pallet funds == contributors reward
@@ -1831,19 +1797,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    initializedRewardAmount: GenericStorageQuery<Rv, () => bigint>;
+    initializedRewardAmount: GenericStorageQuery<() => bigint>;
 
     /**
      * Total number of contributors to aid hinting benchmarking
      *
      * @param {Callback<number> =} callback
      **/
-    totalContributors: GenericStorageQuery<Rv, () => number>;
+    totalContributors: GenericStorageQuery<() => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -1861,7 +1827,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
@@ -1873,7 +1839,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.
@@ -1882,7 +1848,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -1894,7 +1859,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1904,14 +1868,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.
@@ -1920,7 +1884,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1928,7 +1891,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
@@ -1939,7 +1902,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -1947,7 +1910,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.
@@ -1958,7 +1921,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`,
@@ -1966,7 +1929,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.
@@ -1975,7 +1938,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1987,7 +1949,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -2000,7 +1961,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]
     >;
@@ -2012,14 +1972,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.
@@ -2028,7 +1988,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId20Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId20, XcmVersionedAssetId]
     >;
@@ -2040,7 +1999,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId20Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId20
     >;
@@ -2050,7 +2008,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.
@@ -2063,7 +2021,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
@@ -2075,7 +2033,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
@@ -2086,7 +2044,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmAuthorizedAliasesEntry | undefined> =} callback
      **/
     authorizedAliases: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => PalletXcmAuthorizedAliasesEntry | undefined,
       XcmVersionedLocation
     >;
@@ -2094,7 +2051,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -2106,7 +2063,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<Rv, (arg: bigint) => PalletAssetsAssetDetails | undefined, bigint>;
+    asset: GenericStorageQuery<(arg: bigint) => PalletAssetsAssetDetails | undefined, bigint>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -2115,7 +2072,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [bigint, AccountId20Like]) => PalletAssetsAssetAccount | undefined,
       [bigint, AccountId20]
     >;
@@ -2129,7 +2085,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [bigint, AccountId20Like, AccountId20Like]) => PalletAssetsApproval | undefined,
       [bigint, AccountId20, AccountId20]
     >;
@@ -2140,7 +2095,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<Rv, (arg: bigint) => PalletAssetsAssetMetadata, bigint>;
+    metadata: GenericStorageQuery<(arg: bigint) => PalletAssetsAssetMetadata, bigint>;
 
     /**
      * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
@@ -2155,12 +2110,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint | undefined> =} callback
      **/
-    nextAssetId: GenericStorageQuery<Rv, () => bigint | undefined>;
+    nextAssetId: GenericStorageQuery<() => bigint | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmTransactor`'s storage queries
@@ -2174,7 +2129,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    indexToAccount: GenericStorageQuery<Rv, (arg: number) => AccountId20 | undefined, number>;
+    indexToAccount: GenericStorageQuery<(arg: number) => AccountId20 | undefined, number>;
 
     /**
      * Stores the transact info of a Location. This defines how much extra weight we need to
@@ -2185,7 +2140,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmTransactorRemoteTransactInfoWithMaxWeight | undefined> =} callback
      **/
     transactInfoWithWeightLimit: GenericStorageQuery<
-      Rv,
       (arg: StagingXcmV5Location) => PalletXcmTransactorRemoteTransactInfoWithMaxWeight | undefined,
       StagingXcmV5Location
     >;
@@ -2198,7 +2152,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     destinationAssetFeePerSecond: GenericStorageQuery<
-      Rv,
       (arg: StagingXcmV5Location) => bigint | undefined,
       StagingXcmV5Location
     >;
@@ -2208,12 +2161,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletXcmTransactorRelayIndicesRelayChainIndices> =} callback
      **/
-    relayIndices: GenericStorageQuery<Rv, () => PalletXcmTransactorRelayIndicesRelayChainIndices>;
+    relayIndices: GenericStorageQuery<() => PalletXcmTransactorRelayIndicesRelayChainIndices>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EthereumXcm`'s storage queries
@@ -2224,19 +2177,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<U256> =} callback
      **/
-    nonce: GenericStorageQuery<Rv, () => U256>;
+    nonce: GenericStorageQuery<() => U256>;
 
     /**
      * Whether or not Ethereum-XCM is suspended from executing
      *
      * @param {Callback<boolean> =} callback
      **/
-    ethereumXcmSuspended: GenericStorageQuery<Rv, () => boolean>;
+    ethereumXcmSuspended: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -2249,7 +2202,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -2259,7 +2211,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.
@@ -2268,7 +2220,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -2276,7 +2227,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EvmForeignAssets`'s storage queries
@@ -2290,14 +2241,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<StagingXcmV5Location | undefined> =} callback
      **/
-    assetsById: GenericStorageQuery<Rv, (arg: bigint) => StagingXcmV5Location | undefined, bigint>;
+    assetsById: GenericStorageQuery<(arg: bigint) => StagingXcmV5Location | undefined, bigint>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForAssetsById: GenericStorageQuery<Rv, () => number>;
+    counterForAssetsById: GenericStorageQuery<() => number>;
 
     /**
      * Reverse mapping of AssetsById. Mapping from a foreign asset to an asset id.
@@ -2308,7 +2259,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[bigint, PalletMoonbeamForeignAssetsAssetStatus] | undefined> =} callback
      **/
     assetsByLocation: GenericStorageQuery<
-      Rv,
       (arg: StagingXcmV5Location) => [bigint, PalletMoonbeamForeignAssetsAssetStatus] | undefined,
       StagingXcmV5Location
     >;
@@ -2320,7 +2270,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMoonbeamForeignAssetsAssetDepositDetails | undefined> =} callback
      **/
     assetsCreationDetails: GenericStorageQuery<
-      Rv,
       (arg: bigint) => PalletMoonbeamForeignAssetsAssetDepositDetails | undefined,
       bigint
     >;
@@ -2328,7 +2277,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcmWeightTrader`'s storage queries
@@ -2343,7 +2292,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[boolean, bigint] | undefined> =} callback
      **/
     supportedAssets: GenericStorageQuery<
-      Rv,
       (arg: StagingXcmV5Location) => [boolean, bigint] | undefined,
       StagingXcmV5Location
     >;
@@ -2351,7 +2299,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EmergencyParaXcm`'s storage queries
@@ -2362,12 +2310,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletEmergencyParaXcmXcmMode> =} callback
      **/
-    mode: GenericStorageQuery<Rv, () => PalletEmergencyParaXcmXcmMode>;
+    mode: GenericStorageQuery<() => PalletEmergencyParaXcmXcmMode>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -2380,7 +2328,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.
@@ -2391,12 +2339,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 `RelayStorageRoots`'s storage queries
@@ -2408,7 +2356,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    relayStorageRoot: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    relayStorageRoot: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * List of all the keys in `RelayStorageRoot`.
@@ -2416,12 +2364,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    relayStorageRootKeys: GenericStorageQuery<Rv, () => Array<number>>;
+    relayStorageRootKeys: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Randomness`'s storage queries
@@ -2433,14 +2381,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<PalletRandomnessRequestState | undefined> =} callback
      **/
-    requests: GenericStorageQuery<Rv, (arg: bigint) => PalletRandomnessRequestState | undefined, bigint>;
+    requests: GenericStorageQuery<(arg: bigint) => PalletRandomnessRequestState | undefined, bigint>;
 
     /**
      * Number of randomness requests made so far, used to generate the next request's uid
      *
      * @param {Callback<bigint> =} callback
      **/
-    requestCount: GenericStorageQuery<Rv, () => bigint>;
+    requestCount: GenericStorageQuery<() => bigint>;
 
     /**
      * Current local per-block VRF randomness
@@ -2448,28 +2396,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256 | undefined> =} callback
      **/
-    localVrfOutput: GenericStorageQuery<Rv, () => H256 | undefined>;
+    localVrfOutput: GenericStorageQuery<() => H256 | undefined>;
 
     /**
      * Relay epoch
      *
      * @param {Callback<bigint> =} callback
      **/
-    relayEpoch: GenericStorageQuery<Rv, () => bigint>;
+    relayEpoch: GenericStorageQuery<() => bigint>;
 
     /**
      * Ensures the mandatory inherent was included in the block
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    inherentIncluded: GenericStorageQuery<Rv, () => [] | undefined>;
+    inherentIncluded: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Records whether this is the first block (genesis or runtime upgrade)
      *
      * @param {Callback<[] | undefined> =} callback
      **/
-    notFirstBlock: GenericStorageQuery<Rv, () => [] | undefined>;
+    notFirstBlock: GenericStorageQuery<() => [] | undefined>;
 
     /**
      * Snapshot of randomness to fulfill all requests that are for the same raw randomness
@@ -2479,7 +2427,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletRandomnessRandomnessResult | undefined> =} callback
      **/
     randomnessResults: GenericStorageQuery<
-      Rv,
       (arg: PalletRandomnessRequestType) => PalletRandomnessRandomnessResult | undefined,
       PalletRandomnessRequestType
     >;
@@ -2490,12 +2437,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<H256> =} callback
      **/
-    previousLocalVrfOutput: GenericStorageQuery<Rv, () => H256>;
+    previousLocalVrfOutput: GenericStorageQuery<() => H256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `BridgeKusamaGrandpa`'s storage queries
@@ -2513,21 +2460,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    freeHeadersRemaining: GenericStorageQuery<Rv, () => number | undefined>;
+    freeHeadersRemaining: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Hash of the header used to bootstrap the pallet.
      *
      * @param {Callback<H256> =} callback
      **/
-    initialHash: GenericStorageQuery<Rv, () => H256>;
+    initialHash: GenericStorageQuery<() => H256>;
 
     /**
      * Hash of the best finalized header.
      *
      * @param {Callback<BpRuntimeHeaderId | undefined> =} callback
      **/
-    bestFinalized: GenericStorageQuery<Rv, () => BpRuntimeHeaderId | undefined>;
+    bestFinalized: GenericStorageQuery<() => BpRuntimeHeaderId | undefined>;
 
     /**
      * A ring buffer of imported hashes. Ordered by the insertion time.
@@ -2535,14 +2482,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<H256 | undefined> =} callback
      **/
-    importedHashes: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+    importedHashes: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
 
     /**
      * Current ring buffer position.
      *
      * @param {Callback<number> =} callback
      **/
-    importedHashesPointer: GenericStorageQuery<Rv, () => number>;
+    importedHashesPointer: GenericStorageQuery<() => number>;
 
     /**
      * Relevant fields of imported headers.
@@ -2550,14 +2497,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<BpHeaderChainStoredHeaderData | undefined> =} callback
      **/
-    importedHeaders: GenericStorageQuery<Rv, (arg: H256) => BpHeaderChainStoredHeaderData | undefined, H256>;
+    importedHeaders: GenericStorageQuery<(arg: H256) => BpHeaderChainStoredHeaderData | undefined, H256>;
 
     /**
      * The current GRANDPA Authority set.
      *
      * @param {Callback<PalletBridgeGrandpaStorageTypesStoredAuthoritySet> =} callback
      **/
-    currentAuthoritySet: GenericStorageQuery<Rv, () => PalletBridgeGrandpaStorageTypesStoredAuthoritySet>;
+    currentAuthoritySet: GenericStorageQuery<() => PalletBridgeGrandpaStorageTypesStoredAuthoritySet>;
 
     /**
      * Optional pallet owner.
@@ -2569,7 +2516,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    palletOwner: GenericStorageQuery<Rv, () => AccountId20 | undefined>;
+    palletOwner: GenericStorageQuery<() => AccountId20 | undefined>;
 
     /**
      * The current operating mode of the pallet.
@@ -2578,12 +2525,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<BpRuntimeBasicOperatingMode> =} callback
      **/
-    palletOperatingMode: GenericStorageQuery<Rv, () => BpRuntimeBasicOperatingMode>;
+    palletOperatingMode: GenericStorageQuery<() => BpRuntimeBasicOperatingMode>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `BridgeKusamaParachains`'s storage queries
@@ -2599,7 +2546,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    palletOwner: GenericStorageQuery<Rv, () => AccountId20 | undefined>;
+    palletOwner: GenericStorageQuery<() => AccountId20 | undefined>;
 
     /**
      * The current operating mode of the pallet.
@@ -2608,7 +2555,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<BpRuntimeBasicOperatingMode> =} callback
      **/
-    palletOperatingMode: GenericStorageQuery<Rv, () => BpRuntimeBasicOperatingMode>;
+    palletOperatingMode: GenericStorageQuery<() => BpRuntimeBasicOperatingMode>;
 
     /**
      * Parachains info.
@@ -2621,7 +2568,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BpParachainsParaInfo | undefined> =} callback
      **/
     parasInfo: GenericStorageQuery<
-      Rv,
       (arg: BpPolkadotCoreParachainsParaId) => BpParachainsParaInfo | undefined,
       BpPolkadotCoreParachainsParaId
     >;
@@ -2633,7 +2579,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BpParachainsParaStoredHeaderData | undefined> =} callback
      **/
     importedParaHeads: GenericStorageQuery<
-      Rv,
       (arg: [BpPolkadotCoreParachainsParaId, H256]) => BpParachainsParaStoredHeaderData | undefined,
       [BpPolkadotCoreParachainsParaId, H256]
     >;
@@ -2645,7 +2590,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256 | undefined> =} callback
      **/
     importedParaHashes: GenericStorageQuery<
-      Rv,
       (arg: [BpPolkadotCoreParachainsParaId, number]) => H256 | undefined,
       [BpPolkadotCoreParachainsParaId, number]
     >;
@@ -2653,7 +2597,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `BridgeKusamaMessages`'s storage queries
@@ -2669,7 +2613,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId20 | undefined> =} callback
      **/
-    palletOwner: GenericStorageQuery<Rv, () => AccountId20 | undefined>;
+    palletOwner: GenericStorageQuery<() => AccountId20 | undefined>;
 
     /**
      * The current operating mode of the pallet.
@@ -2678,7 +2622,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<BpMessagesMessagesOperatingMode> =} callback
      **/
-    palletOperatingMode: GenericStorageQuery<Rv, () => BpMessagesMessagesOperatingMode>;
+    palletOperatingMode: GenericStorageQuery<() => BpMessagesMessagesOperatingMode>;
 
     /**
      * Map of lane id => inbound lane data.
@@ -2687,7 +2631,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BpMessagesInboundLaneData | undefined> =} callback
      **/
     inboundLanes: GenericStorageQuery<
-      Rv,
       (arg: BpMessagesLaneHashedLaneId) => BpMessagesInboundLaneData | undefined,
       BpMessagesLaneHashedLaneId
     >;
@@ -2699,7 +2642,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BpMessagesOutboundLaneData | undefined> =} callback
      **/
     outboundLanes: GenericStorageQuery<
-      Rv,
       (arg: BpMessagesLaneHashedLaneId) => BpMessagesOutboundLaneData | undefined,
       BpMessagesLaneHashedLaneId
     >;
@@ -2710,12 +2652,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {BpMessagesMessageKey} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    outboundMessages: GenericStorageQuery<Rv, (arg: BpMessagesMessageKey) => Bytes | undefined, BpMessagesMessageKey>;
+    outboundMessages: GenericStorageQuery<(arg: BpMessagesMessageKey) => Bytes | undefined, BpMessagesMessageKey>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `BridgeXcmOverMoonriver`'s storage queries
@@ -2728,7 +2670,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BpXcmBridgeHubBridge | undefined> =} callback
      **/
     bridges: GenericStorageQuery<
-      Rv,
       (arg: BpXcmBridgeHubBridgeId) => BpXcmBridgeHubBridge | undefined,
       BpXcmBridgeHubBridgeId
     >;
@@ -2740,7 +2681,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<BpXcmBridgeHubBridgeId | undefined> =} callback
      **/
     laneToBridge: GenericStorageQuery<
-      Rv,
       (arg: BpMessagesLaneHashedLaneId) => BpXcmBridgeHubBridgeId | undefined,
       BpMessagesLaneHashedLaneId
     >;
@@ -2748,6 +2688,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
 }