@dedot/chaintypes 0.194.0 → 0.195.0

package/astar/query.d.ts

@@ -1,6 +1,6 @@
 // Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback } from 'dedot/types';
 import type {
   AccountId32,
   AccountId32Like,
@@ -113,7 +113,7 @@ import type {
   PalletMigrationsMigrationCursor,
 } from './types.js';
 
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -124,35 +124,35 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
+    extrinsicCount: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Whether all inherents have been applied.
      *
      * @param {Callback<boolean> =} callback
      **/
-    inherentsApplied: GenericStorageQuery<Rv, () => boolean>;
+    inherentsApplied: GenericStorageQuery<() => boolean>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -160,7 +160,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).
@@ -168,28 +168,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.
@@ -202,14 +202,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
@@ -226,21 +226,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
@@ -248,26 +248,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+    executionPhase: GenericStorageQuery<() => Phase | undefined>;
 
     /**
      * `Some` if a code upgrade has been authorized.
      *
      * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -282,7 +282,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletIdentityRegistration | undefined> =} callback
      **/
-    identityOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
+    identityOf: GenericStorageQuery<(arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
 
     /**
      * Identifies the primary username of an account.
@@ -290,7 +290,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    usernameOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+    usernameOf: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
 
     /**
      * The super-identity of an alternative "sub" identity together with its name, within that
@@ -299,7 +299,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
+    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -311,7 +311,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
+    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -321,7 +321,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.
@@ -329,7 +329,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
@@ -342,7 +342,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
@@ -356,7 +356,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[AccountId32, number, PalletIdentityProvider] | undefined> =} callback
      **/
     pendingUsernames: GenericStorageQuery<
-      Rv,
       (arg: BytesLike) => [AccountId32, number, PalletIdentityProvider] | undefined,
       Bytes
     >;
@@ -370,12 +369,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 `Timestamp`'s storage queries
@@ -386,7 +385,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.
@@ -396,12 +395,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 `Multisig`'s storage queries
@@ -414,7 +413,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
     multisigs: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
       [AccountId32, FixedBytes<32>]
     >;
@@ -422,7 +420,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Proxy`'s storage queries
@@ -435,11 +433,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
-      AccountId32
-    >;
+    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint], AccountId32>;
 
     /**
      * The announcements made by the proxy (key).
@@ -447,16 +441,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
-      AccountId32
-    >;
+    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -466,7 +456,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.
@@ -474,7 +464,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.
@@ -482,11 +472,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.
@@ -497,12 +483,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
+    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
@@ -518,7 +504,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
@@ -528,7 +514,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
      **/
     aggregatedUnincludedSegment: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
     >;
 
@@ -542,7 +527,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
@@ -553,7 +538,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.
@@ -562,14 +547,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.
@@ -578,7 +563,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.
@@ -591,7 +576,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.
@@ -602,7 +587,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.
@@ -614,7 +599,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
@@ -628,7 +613,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
-      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -642,7 +626,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.
@@ -652,7 +636,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.
@@ -663,7 +647,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      Rv,
       () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
@@ -674,7 +657,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.
@@ -683,7 +666,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.
@@ -692,7 +675,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.
@@ -701,21 +684,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
@@ -723,7 +706,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
@@ -731,7 +714,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
@@ -739,7 +722,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`.
@@ -748,12 +731,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -763,12 +746,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 `TransactionPayment`'s storage queries
@@ -778,18 +761,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 `Balances`'s storage queries
@@ -800,14 +783,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.
@@ -838,7 +821,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
+    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -849,7 +832,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
+    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -859,7 +842,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
+    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -867,7 +850,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<FrameSupportTokensMiscIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
+    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -876,7 +859,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
      **/
     freezes: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>,
       AccountId32
     >;
@@ -884,7 +866,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -896,11 +878,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<
-      Rv,
-      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
-      AccountId32
-    >;
+    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined, AccountId32>;
 
     /**
      * Storage version of the pallet.
@@ -909,12 +887,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Inflation`'s storage queries
@@ -926,26 +904,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletInflationInflationConfiguration> =} callback
      **/
-    activeInflationConfig: GenericStorageQuery<Rv, () => PalletInflationInflationConfiguration>;
+    activeInflationConfig: GenericStorageQuery<() => PalletInflationInflationConfiguration>;
 
     /**
      * Static inflation parameters - used to calculate active inflation configuration at certain points in time.
      *
      * @param {Callback<PalletInflationInflationParameters> =} callback
      **/
-    inflationParams: GenericStorageQuery<Rv, () => PalletInflationInflationParameters>;
+    inflationParams: GenericStorageQuery<() => PalletInflationInflationParameters>;
 
     /**
      * Flag indicating whether on the first possible opportunity, recalculation of the inflation config should be done.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    doRecalculation: GenericStorageQuery<Rv, () => number | undefined>;
+    doRecalculation: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DappStaking`'s storage queries
@@ -956,14 +934,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletDappStakingProtocolState> =} callback
      **/
-    activeProtocolState: GenericStorageQuery<Rv, () => PalletDappStakingProtocolState>;
+    activeProtocolState: GenericStorageQuery<() => PalletDappStakingProtocolState>;
 
     /**
      * Counter for unique dApp identifiers.
      *
      * @param {Callback<number> =} callback
      **/
-    nextDAppId: GenericStorageQuery<Rv, () => number>;
+    nextDAppId: GenericStorageQuery<() => number>;
 
     /**
      * Map of all dApps integrated into dApp staking protocol.
@@ -975,7 +953,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDappStakingDAppInfo | undefined> =} callback
      **/
     integratedDApps: GenericStorageQuery<
-      Rv,
       (arg: AstarPrimitivesDappStakingSmartContract) => PalletDappStakingDAppInfo | undefined,
       AstarPrimitivesDappStakingSmartContract
     >;
@@ -985,7 +962,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForIntegratedDApps: GenericStorageQuery<Rv, () => number>;
+    counterForIntegratedDApps: GenericStorageQuery<() => number>;
 
     /**
      * General locked/staked information for each account.
@@ -993,7 +970,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDappStakingAccountLedger> =} callback
      **/
-    ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDappStakingAccountLedger, AccountId32>;
+    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletDappStakingAccountLedger, AccountId32>;
 
     /**
      * Information about how much each staker has staked for each smart contract in some period.
@@ -1002,7 +979,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletDappStakingSingularStakingInfo | undefined> =} callback
      **/
     stakerInfo: GenericStorageQuery<
-      Rv,
       (
         arg: [AccountId32Like, AstarPrimitivesDappStakingSmartContract],
       ) => PalletDappStakingSingularStakingInfo | undefined,
@@ -1015,14 +991,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDappStakingContractStakeAmount> =} callback
      **/
-    contractStake: GenericStorageQuery<Rv, (arg: number) => PalletDappStakingContractStakeAmount, number>;
+    contractStake: GenericStorageQuery<(arg: number) => PalletDappStakingContractStakeAmount, number>;
 
     /**
      * General information about the current era.
      *
      * @param {Callback<PalletDappStakingEraInfo> =} callback
      **/
-    currentEraInfo: GenericStorageQuery<Rv, () => PalletDappStakingEraInfo>;
+    currentEraInfo: GenericStorageQuery<() => PalletDappStakingEraInfo>;
 
     /**
      * Information about rewards for each era.
@@ -1038,7 +1014,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDappStakingEraRewardSpan | undefined> =} callback
      **/
-    eraRewards: GenericStorageQuery<Rv, (arg: number) => PalletDappStakingEraRewardSpan | undefined, number>;
+    eraRewards: GenericStorageQuery<(arg: number) => PalletDappStakingEraRewardSpan | undefined, number>;
 
     /**
      * Information about period's end.
@@ -1046,21 +1022,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDappStakingPeriodEndInfo | undefined> =} callback
      **/
-    periodEnd: GenericStorageQuery<Rv, (arg: number) => PalletDappStakingPeriodEndInfo | undefined, number>;
+    periodEnd: GenericStorageQuery<(arg: number) => PalletDappStakingPeriodEndInfo | undefined, number>;
 
     /**
      * Static tier parameters used to calculate tier configuration.
      *
      * @param {Callback<PalletDappStakingTierParameters> =} callback
      **/
-    staticTierParams: GenericStorageQuery<Rv, () => PalletDappStakingTierParameters>;
+    staticTierParams: GenericStorageQuery<() => PalletDappStakingTierParameters>;
 
     /**
      * Tier configuration user for current & preceding eras.
      *
      * @param {Callback<PalletDappStakingTiersConfiguration> =} callback
      **/
-    tierConfig: GenericStorageQuery<Rv, () => PalletDappStakingTiersConfiguration>;
+    tierConfig: GenericStorageQuery<() => PalletDappStakingTiersConfiguration>;
 
     /**
      * Information about which tier a dApp belonged to in a specific era.
@@ -1068,14 +1044,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDappStakingDAppTierRewards | undefined> =} callback
      **/
-    dAppTiers: GenericStorageQuery<Rv, (arg: number) => PalletDappStakingDAppTierRewards | undefined, number>;
+    dAppTiers: GenericStorageQuery<(arg: number) => PalletDappStakingDAppTierRewards | undefined, number>;
 
     /**
      * History cleanup marker - holds information about which DB entries should be cleaned up next, when applicable.
      *
      * @param {Callback<PalletDappStakingCleanupMarker> =} callback
      **/
-    historyCleanupMarker: GenericStorageQuery<Rv, () => PalletDappStakingCleanupMarker>;
+    historyCleanupMarker: GenericStorageQuery<() => PalletDappStakingCleanupMarker>;
 
     /**
      * Safeguard to prevent unwanted operations in production.
@@ -1084,12 +1060,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    safeguard: GenericStorageQuery<Rv, () => boolean>;
+    safeguard: GenericStorageQuery<() => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -1101,7 +1077,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.
@@ -1110,7 +1086,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
     account: GenericStorageQuery<
-      Rv,
       (arg: [bigint, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
       [bigint, AccountId32]
     >;
@@ -1124,7 +1099,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      Rv,
       (arg: [bigint, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
       [bigint, AccountId32, AccountId32]
     >;
@@ -1135,7 +1109,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
@@ -1150,12 +1124,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 `PriceAggregator`'s storage queries
@@ -1166,26 +1140,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<FixedU128>> =} callback
      **/
-    currentBlockValues: GenericStorageQuery<Rv, () => Array<FixedU128>>;
+    currentBlockValues: GenericStorageQuery<() => Array<FixedU128>>;
 
     /**
      * Used to store the aggregated processed block values during some time period.
      *
      * @param {Callback<PalletPriceAggregatorValueAggregator> =} callback
      **/
-    intermediateValueAggregator: GenericStorageQuery<Rv, () => PalletPriceAggregatorValueAggregator>;
+    intermediateValueAggregator: GenericStorageQuery<() => PalletPriceAggregatorValueAggregator>;
 
     /**
      * Used to store aggregated intermediate values for some time period.
      *
      * @param {Callback<PalletPriceAggregatorCircularBuffer> =} callback
      **/
-    valuesCircularBuffer: GenericStorageQuery<Rv, () => PalletPriceAggregatorCircularBuffer>;
+    valuesCircularBuffer: GenericStorageQuery<() => PalletPriceAggregatorCircularBuffer>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Oracle`'s storage queries
@@ -1198,7 +1172,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<OrmlOracleModuleTimestampedValue | undefined> =} callback
      **/
     rawValues: GenericStorageQuery<
-      Rv,
       (arg: [AccountId32Like, AstarPrimitivesOracleCurrencyId]) => OrmlOracleModuleTimestampedValue | undefined,
       [AccountId32, AstarPrimitivesOracleCurrencyId]
     >;
@@ -1210,7 +1183,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<OrmlOracleModuleTimestampedValue | undefined> =} callback
      **/
     values: GenericStorageQuery<
-      Rv,
       (arg: AstarPrimitivesOracleCurrencyId) => OrmlOracleModuleTimestampedValue | undefined,
       AstarPrimitivesOracleCurrencyId
     >;
@@ -1220,12 +1192,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<OrmlUtilitiesOrderedSet> =} callback
      **/
-    hasDispatched: GenericStorageQuery<Rv, () => OrmlUtilitiesOrderedSet>;
+    hasDispatched: GenericStorageQuery<() => OrmlUtilitiesOrderedSet>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `OracleMembership`'s storage queries
@@ -1236,19 +1208,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The current prime member, if one exists.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -1259,12 +1231,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    author: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CollatorSelection`'s storage queries
@@ -1275,14 +1247,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The (community approved, limited) collation candidates.
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidates: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidates: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Candidates who initiated leave intent or kicked.
@@ -1290,7 +1262,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<[number, bigint] | undefined> =} callback
      **/
-    nonCandidates: GenericStorageQuery<Rv, (arg: AccountId32Like) => [number, bigint] | undefined, AccountId32>;
+    nonCandidates: GenericStorageQuery<(arg: AccountId32Like) => [number, bigint] | undefined, AccountId32>;
 
     /**
      * Last block authored by collator.
@@ -1298,7 +1270,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
+    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -1307,7 +1279,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<Rv, () => number>;
+    desiredCandidates: GenericStorageQuery<() => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -1316,14 +1288,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
+    candidacyBond: GenericStorageQuery<() => bigint>;
 
     /**
      * Destination account for slashed amount.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    slashDestination: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    slashDestination: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Pending applications to become a collator.
@@ -1331,12 +1303,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    pendingApplications: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+    pendingApplications: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1347,14 +1319,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    validators: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<Rv, () => number>;
+    currentIndex: GenericStorageQuery<() => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -1362,7 +1334,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
+    queuedChanged: GenericStorageQuery<() => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -1370,7 +1342,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<[AccountId32, AstarRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, AstarRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, AstarRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1381,7 +1353,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<Rv, () => Array<number>>;
+    disabledValidators: GenericStorageQuery<() => Array<number>>;
 
     /**
      * The next session keys for a validator.
@@ -1389,7 +1361,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<AstarRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => AstarRuntimeSessionKeys | undefined, AccountId32>;
+    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => AstarRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1398,7 +1370,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
     keyOwner: GenericStorageQuery<
-      Rv,
       (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
       [SpCoreCryptoKeyTypeId, Bytes]
     >;
@@ -1406,7 +1377,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -1417,7 +1388,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -1426,12 +1397,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `AuraExt`'s storage queries
@@ -1446,7 +1417,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * Current slot paired with a number of authored blocks.
@@ -1455,12 +1426,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 `XcmpQueue`'s storage queries
@@ -1478,7 +1449,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
@@ -1490,7 +1461,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.
@@ -1499,7 +1470,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     outboundXcmpMessages: GenericStorageQuery<
-      Rv,
       (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
       [PolkadotParachainPrimitivesPrimitivesId, number]
     >;
@@ -1511,7 +1481,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Bytes> =} callback
      **/
     signalMessages: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1521,14 +1490,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.
@@ -1537,7 +1506,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<FixedU128> =} callback
      **/
     deliveryFeeFactor: GenericStorageQuery<
-      Rv,
       (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
       PolkadotParachainPrimitivesPrimitivesId
     >;
@@ -1545,7 +1513,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
@@ -1556,7 +1524,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<Rv, () => bigint>;
+    queryCounter: GenericStorageQuery<() => bigint>;
 
     /**
      * The ongoing queries.
@@ -1564,7 +1532,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.
@@ -1575,7 +1543,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`,
@@ -1583,7 +1551,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.
@@ -1592,7 +1560,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<number | undefined> =} callback
      **/
     supportedVersion: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => number | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1604,7 +1571,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     versionNotifiers: GenericStorageQuery<
-      Rv,
       (arg: [number, XcmVersionedLocation]) => bigint | undefined,
       [number, XcmVersionedLocation]
     >;
@@ -1617,7 +1583,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]
     >;
@@ -1629,14 +1594,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.
@@ -1645,7 +1610,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
       [number, AccountId32, XcmVersionedAssetId]
     >;
@@ -1657,7 +1621,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<Array<[bigint, XcmVersionedLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => Array<[bigint, XcmVersionedLocation]> | undefined,
       AccountId32
     >;
@@ -1667,7 +1630,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.
@@ -1680,7 +1643,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
@@ -1692,12 +1655,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<StagingXcmV5Xcm | undefined> =} callback
      **/
-    recordedXcm: GenericStorageQuery<Rv, () => StagingXcmV5Xcm | undefined>;
+    recordedXcm: GenericStorageQuery<() => StagingXcmV5Xcm | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `XcAssetConfig`'s storage queries
@@ -1711,7 +1674,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {bigint} arg
      * @param {Callback<XcmVersionedLocation | undefined> =} callback
      **/
-    assetIdToLocation: GenericStorageQuery<Rv, (arg: bigint) => XcmVersionedLocation | undefined, bigint>;
+    assetIdToLocation: GenericStorageQuery<(arg: bigint) => XcmVersionedLocation | undefined, bigint>;
 
     /**
      * Mapping from an asset type to an asset id.
@@ -1721,7 +1684,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {XcmVersionedLocation} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    assetLocationToId: GenericStorageQuery<Rv, (arg: XcmVersionedLocation) => bigint | undefined, XcmVersionedLocation>;
+    assetLocationToId: GenericStorageQuery<(arg: XcmVersionedLocation) => bigint | undefined, XcmVersionedLocation>;
 
     /**
      * Stores the units per second for local execution for a AssetLocation.
@@ -1733,7 +1696,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<bigint | undefined> =} callback
      **/
     assetLocationUnitsPerSecond: GenericStorageQuery<
-      Rv,
       (arg: XcmVersionedLocation) => bigint | undefined,
       XcmVersionedLocation
     >;
@@ -1742,12 +1704,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletXcAssetConfigMigrationStep> =} callback
      **/
-    assetHubMigrationStep: GenericStorageQuery<Rv, () => PalletXcAssetConfigMigrationStep>;
+    assetHubMigrationStep: GenericStorageQuery<() => PalletXcAssetConfigMigrationStep>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MessageQueue`'s storage queries
@@ -1760,7 +1722,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueueBookState> =} callback
      **/
     bookStateFor: GenericStorageQuery<
-      Rv,
       (arg: CumulusPrimitivesCoreAggregateMessageOrigin) => PalletMessageQueueBookState,
       CumulusPrimitivesCoreAggregateMessageOrigin
     >;
@@ -1770,7 +1731,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.
@@ -1779,7 +1740,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletMessageQueuePage | undefined> =} callback
      **/
     pages: GenericStorageQuery<
-      Rv,
       (arg: [CumulusPrimitivesCoreAggregateMessageOrigin, number]) => PalletMessageQueuePage | undefined,
       [CumulusPrimitivesCoreAggregateMessageOrigin, number]
     >;
@@ -1787,7 +1747,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `EVM`'s storage queries
@@ -1798,26 +1758,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
@@ -1830,7 +1790,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<[EthereumTransactionTransactionV2, FpRpcTransactionStatus, EthereumReceiptReceiptV3] | undefined> =} callback
      **/
     pending: GenericStorageQuery<
-      Rv,
       (arg: number) => [EthereumTransactionTransactionV2, FpRpcTransactionStatus, EthereumReceiptReceiptV3] | undefined,
       number
     >;
@@ -1840,40 +1799,40 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPending: GenericStorageQuery<Rv, () => number>;
+    counterForPending: GenericStorageQuery<() => number>;
 
     /**
      * The current Ethereum block.
      *
      * @param {Callback<EthereumBlock | undefined> =} callback
      **/
-    currentBlock: GenericStorageQuery<Rv, () => EthereumBlock | undefined>;
+    currentBlock: GenericStorageQuery<() => EthereumBlock | undefined>;
 
     /**
      * The current Ethereum receipts.
      *
      * @param {Callback<Array<EthereumReceiptReceiptV3> | undefined> =} callback
      **/
-    currentReceipts: GenericStorageQuery<Rv, () => Array<EthereumReceiptReceiptV3> | undefined>;
+    currentReceipts: GenericStorageQuery<() => Array<EthereumReceiptReceiptV3> | undefined>;
 
     /**
      * The current transaction statuses.
      *
      * @param {Callback<Array<FpRpcTransactionStatus> | undefined> =} callback
      **/
-    currentTransactionStatuses: GenericStorageQuery<Rv, () => Array<FpRpcTransactionStatus> | undefined>;
+    currentTransactionStatuses: GenericStorageQuery<() => Array<FpRpcTransactionStatus> | undefined>;
 
     /**
      *
      * @param {U256} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<Rv, (arg: U256) => H256, U256>;
+    blockHash: GenericStorageQuery<(arg: U256) => H256, U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `DynamicEvmBaseFee`'s storage queries
@@ -1883,12 +1842,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<U256> =} callback
      **/
-    baseFeePerGas: GenericStorageQuery<Rv, () => U256>;
+    baseFeePerGas: GenericStorageQuery<() => U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Contracts`'s storage queries
@@ -1900,7 +1859,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
 
     /**
      * A mapping from a contract's code hash to its code info.
@@ -1908,7 +1867,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletContractsWasmCodeInfo | undefined> =} callback
      **/
-    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletContractsWasmCodeInfo | undefined, H256>;
+    codeInfoOf: GenericStorageQuery<(arg: H256) => PalletContractsWasmCodeInfo | undefined, H256>;
 
     /**
      * This is a **monotonic** counter incremented on contract instantiation.
@@ -1936,7 +1895,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<bigint> =} callback
      **/
-    nonce: GenericStorageQuery<Rv, () => bigint>;
+    nonce: GenericStorageQuery<() => bigint>;
 
     /**
      * The code associated with a given account.
@@ -1947,7 +1906,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<PalletContractsStorageContractInfo | undefined> =} callback
      **/
     contractInfoOf: GenericStorageQuery<
-      Rv,
       (arg: AccountId32Like) => PalletContractsStorageContractInfo | undefined,
       AccountId32
     >;
@@ -1961,7 +1919,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    deletionQueue: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+    deletionQueue: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
 
     /**
      * A pair of monotonic counters used to track the latest contract marked for deletion
@@ -1969,7 +1927,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<PalletContractsStorageDeletionQueueManager> =} callback
      **/
-    deletionQueueCounter: GenericStorageQuery<Rv, () => PalletContractsStorageDeletionQueueManager>;
+    deletionQueueCounter: GenericStorageQuery<() => PalletContractsStorageDeletionQueueManager>;
 
     /**
      * A migration can span across multiple blocks. This storage defines a cursor to track the
@@ -1977,12 +1935,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    migrationInProgress: GenericStorageQuery<Rv, () => Bytes | undefined>;
+    migrationInProgress: GenericStorageQuery<() => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Preimage`'s storage queries
@@ -1994,7 +1952,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.
@@ -2002,19 +1960,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletPreimageRequestStatus | undefined> =} callback
      **/
-    requestStatusFor: GenericStorageQuery<Rv, (arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
+    requestStatusFor: GenericStorageQuery<(arg: H256) => PalletPreimageRequestStatus | undefined, H256>;
 
     /**
      *
      * @param {[H256, number]} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    preimageFor: GenericStorageQuery<Rv, (arg: [H256, number]) => Bytes | undefined, [H256, number]>;
+    preimageFor: GenericStorageQuery<(arg: [H256, number]) => Bytes | undefined, [H256, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Sudo`'s storage queries
@@ -2025,12 +1983,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    key: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CouncilMembership`'s storage queries
@@ -2041,19 +1999,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The current prime member, if one exists.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TechnicalCommitteeMembership`'s storage queries
@@ -2064,19 +2022,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The current prime member, if one exists.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CommunityCouncilMembership`'s storage queries
@@ -2087,19 +2045,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The current prime member, if one exists.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Council`'s storage queries
@@ -2110,7 +2068,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.
@@ -2118,7 +2076,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<AstarRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => AstarRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => AstarRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -2129,7 +2087,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId32, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId32, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId32, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -2137,33 +2095,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TechnicalCommittee`'s storage queries
@@ -2174,7 +2132,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.
@@ -2182,7 +2140,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<AstarRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => AstarRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => AstarRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -2193,7 +2151,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId32, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId32, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId32, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -2201,33 +2159,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CommunityCouncil`'s storage queries
@@ -2238,7 +2196,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.
@@ -2246,7 +2204,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<AstarRuntimeRuntimeCall | undefined> =} callback
      **/
-    proposalOf: GenericStorageQuery<Rv, (arg: H256) => AstarRuntimeRuntimeCall | undefined, H256>;
+    proposalOf: GenericStorageQuery<(arg: H256) => AstarRuntimeRuntimeCall | undefined, H256>;
 
     /**
      * Consideration cost created for publishing and storing a proposal.
@@ -2257,7 +2215,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[AccountId32, []] | undefined> =} callback
      **/
-    costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId32, []] | undefined, H256>;
+    costOf: GenericStorageQuery<(arg: H256) => [AccountId32, []] | undefined, H256>;
 
     /**
      * Votes on a given proposal, if it is ongoing.
@@ -2265,33 +2223,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<PalletCollectiveVotes | undefined> =} callback
      **/
-    voting: GenericStorageQuery<Rv, (arg: H256) => PalletCollectiveVotes | undefined, H256>;
+    voting: GenericStorageQuery<(arg: H256) => PalletCollectiveVotes | undefined, H256>;
 
     /**
      * Proposals so far.
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * The current members of the collective. This is stored sorted (just by value).
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+    members: GenericStorageQuery<() => Array<AccountId32>>;
 
     /**
      * The prime member that helps determine the default vote behavior in case of abstentions.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+    prime: GenericStorageQuery<() => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Democracy`'s storage queries
@@ -2302,14 +2260,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    publicPropCount: GenericStorageQuery<Rv, () => number>;
+    publicPropCount: GenericStorageQuery<() => number>;
 
     /**
      * The public proposals. Unsorted. The second item is the proposal.
      *
      * @param {Callback<Array<[number, FrameSupportPreimagesBounded, AccountId32]>> =} callback
      **/
-    publicProps: GenericStorageQuery<Rv, () => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
+    publicProps: GenericStorageQuery<() => Array<[number, FrameSupportPreimagesBounded, AccountId32]>>;
 
     /**
      * Those who have locked a deposit.
@@ -2319,14 +2277,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<[Array<AccountId32>, bigint] | undefined> =} callback
      **/
-    depositOf: GenericStorageQuery<Rv, (arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
+    depositOf: GenericStorageQuery<(arg: number) => [Array<AccountId32>, bigint] | undefined, number>;
 
     /**
      * The next free referendum index, aka the number of referenda started so far.
      *
      * @param {Callback<number> =} callback
      **/
-    referendumCount: GenericStorageQuery<Rv, () => number>;
+    referendumCount: GenericStorageQuery<() => number>;
 
     /**
      * The lowest referendum index representing an unbaked referendum. Equal to
@@ -2334,7 +2292,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    lowestUnbaked: GenericStorageQuery<Rv, () => number>;
+    lowestUnbaked: GenericStorageQuery<() => number>;
 
     /**
      * Information concerning any given referendum.
@@ -2344,7 +2302,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletDemocracyReferendumInfo | undefined> =} callback
      **/
-    referendumInfoOf: GenericStorageQuery<Rv, (arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
+    referendumInfoOf: GenericStorageQuery<(arg: number) => PalletDemocracyReferendumInfo | undefined, number>;
 
     /**
      * All votes for a particular voter. We store the balance for the number of votes that we
@@ -2355,7 +2313,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDemocracyVoteVoting> =} callback
      **/
-    votingOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
+    votingOf: GenericStorageQuery<(arg: AccountId32Like) => PalletDemocracyVoteVoting, AccountId32>;
 
     /**
      * True if the last referendum tabled was submitted externally. False if it was a public
@@ -2363,7 +2321,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<boolean> =} callback
      **/
-    lastTabledWasExternal: GenericStorageQuery<Rv, () => boolean>;
+    lastTabledWasExternal: GenericStorageQuery<() => boolean>;
 
     /**
      * The referendum to be tabled whenever it would be valid to table an external proposal.
@@ -2373,10 +2331,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<[FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined> =} callback
      **/
-    nextExternal: GenericStorageQuery<
-      Rv,
-      () => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined
-    >;
+    nextExternal: GenericStorageQuery<() => [FrameSupportPreimagesBounded, PalletDemocracyVoteThreshold] | undefined>;
 
     /**
      * A record of who vetoed what. Maps proposal hash to a possible existent block number
@@ -2385,7 +2340,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<[number, Array<AccountId32>] | undefined> =} callback
      **/
-    blacklist: GenericStorageQuery<Rv, (arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
+    blacklist: GenericStorageQuery<(arg: H256) => [number, Array<AccountId32>] | undefined, H256>;
 
     /**
      * Record of all proposals that have been subject to emergency cancellation.
@@ -2393,7 +2348,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {H256} arg
      * @param {Callback<boolean> =} callback
      **/
-    cancellations: GenericStorageQuery<Rv, (arg: H256) => boolean, H256>;
+    cancellations: GenericStorageQuery<(arg: H256) => boolean, H256>;
 
     /**
      * General information concerning any proposal or referendum.
@@ -2407,7 +2362,6 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {Callback<H256 | undefined> =} callback
      **/
     metadataOf: GenericStorageQuery<
-      Rv,
       (arg: PalletDemocracyMetadataOwner) => H256 | undefined,
       PalletDemocracyMetadataOwner
     >;
@@ -2415,7 +2369,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -2426,7 +2380,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * Proposals that have been made.
@@ -2434,26 +2388,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * Proposal indices that have been approved but not yet awarded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `CommunityTreasury`'s storage queries
@@ -2464,7 +2418,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<Rv, () => number>;
+    proposalCount: GenericStorageQuery<() => number>;
 
     /**
      * Proposals that have been made.
@@ -2472,26 +2426,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<Rv, () => bigint>;
+    deactivated: GenericStorageQuery<() => bigint>;
 
     /**
      * Proposal indices that have been approved but not yet awarded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<Rv, () => Array<number>>;
+    approvals: GenericStorageQuery<() => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `SafeMode`'s storage queries
@@ -2506,7 +2460,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    enteredUntil: GenericStorageQuery<Rv, () => number | undefined>;
+    enteredUntil: GenericStorageQuery<() => number | undefined>;
 
     /**
      * Holds the reserve that was taken from an account at a specific block number.
@@ -2517,12 +2471,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    deposits: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => bigint | undefined, [AccountId32, number]>;
+    deposits: GenericStorageQuery<(arg: [AccountId32Like, number]) => bigint | undefined, [AccountId32, number]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `TxPause`'s storage queries
@@ -2534,12 +2488,12 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
      * @param {[BytesLike, BytesLike]} arg
      * @param {Callback<[] | undefined> =} callback
      **/
-    pausedCalls: GenericStorageQuery<Rv, (arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
+    pausedCalls: GenericStorageQuery<(arg: [BytesLike, BytesLike]) => [] | undefined, [Bytes, Bytes]>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery<Rv>;
+    [storage: string]: GenericStorageQuery;
   };
   /**
    * Pallet `MultiBlockMigrations`'s storage queries
@@ -2552,7 +2506,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.
@@ -2563,11 +2517,11 @@ 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;
   };
 }