@dedot/api 0.18.8 → 1.0.0

package/chaintypes/substrate/query.d.ts

@@ -1,7 +1,7 @@
 import type { AccountId32, AccountId32Like, Bytes, BytesLike, Data, Digest, FixedBytes, FixedU128, FixedU64, H160, H256, Perbill, Percent, Phase } from '@dedot/codecs';
-import type { GenericChainStorage, GenericStorageQuery, RpcVersion } from '@dedot/types';
+import type { GenericChainStorage, GenericStorageQuery } from '@dedot/types';
 import type { FrameSupportDispatchPerDispatchClass, FrameSupportPreimagesBounded, FrameSupportTokensFungibleHoldConsideration, FrameSupportTokensFungibleUnionOfNativeOrWithId, FrameSupportTokensMiscIdAmount, FrameSupportTokensMiscIdAmountRuntimeFreezeReason, FrameSystemAccountInfo, FrameSystemCodeUpgradeAuthorization, FrameSystemEventRecord, FrameSystemLastRuntimeUpgradeInfo, KitchensinkRuntimeRuntimeCall, KitchensinkRuntimeRuntimeParametersKey, KitchensinkRuntimeRuntimeParametersValue, KitchensinkRuntimeSessionKeys, PalletAllianceCid, PalletAllianceMemberRole, PalletAssetConversionPoolInfo, PalletAssetRewardsPoolInfo, PalletAssetRewardsPoolStakerInfo, PalletAssetsApproval, PalletAssetsAssetAccount, PalletAssetsAssetDetails, PalletAssetsAssetMetadata, PalletBagsListListBag, PalletBagsListListNode, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesReserveData, PalletBountiesBounty, PalletBrokerAutoRenewalRecord, PalletBrokerConfigRecord, PalletBrokerContributionRecord, PalletBrokerInstaPoolHistoryRecord, PalletBrokerLeaseRecordItem, PalletBrokerOnDemandRevenueRecord, PalletBrokerPoolIoRecord, PalletBrokerPotentialRenewalId, PalletBrokerPotentialRenewalRecord, PalletBrokerRegionId, PalletBrokerRegionRecord, PalletBrokerSaleInfoRecord, PalletBrokerScheduleItem, PalletBrokerStatusRecord, PalletChildBountiesChildBounty, PalletCollectiveVotes, PalletContractsStorageContractInfo, PalletContractsStorageDeletionQueueManager, PalletContractsWasmCodeInfo, PalletConvictionVotingVoteVoting, PalletCoreFellowshipMemberStatus, PalletCoreFellowshipParamsType, PalletCoreFellowshipWish, PalletDelegatedStakingAgentLedger, PalletDelegatedStakingDelegation, PalletDemocracyMetadataOwner, PalletDemocracyReferendumInfo, PalletDemocracyVoteThreshold, PalletDemocracyVoteVoting, PalletElectionProviderMultiPhasePhase, PalletElectionProviderMultiPhaseReadySolution, PalletElectionProviderMultiPhaseRoundSnapshot, PalletElectionProviderMultiPhaseSignedSignedSubmission, PalletElectionProviderMultiPhaseSolutionOrSnapshotSize, PalletElectionsPhragmenSeatHolder, PalletElectionsPhragmenVoter, PalletFastUnstakeUnstakeRequest, PalletGrandpaStoredPendingChange, PalletGrandpaStoredState, PalletIdentityAuthorityProperties, PalletIdentityProvider, PalletIdentityRegistrarInfo, PalletIdentityRegistration, PalletIdentityUsernameInformation, PalletImOnlineSr25519AppSr25519Public, PalletLotteryLotteryConfig, PalletMessageQueueBookState, PalletMessageQueuePage, PalletMigrationsMigrationCursor, PalletMixnetBoundedMixnode, PalletMultisigMultisig, PalletNftFractionalizationDetails, PalletNftsAttributeDeposit, PalletNftsAttributeNamespace, PalletNftsBitFlagsCollectionRole, PalletNftsCollectionConfig, PalletNftsCollectionDetails, PalletNftsCollectionMetadata, PalletNftsItemConfig, PalletNftsItemDetails, PalletNftsItemMetadata, PalletNftsPendingSwap, PalletNisBid, PalletNisReceiptRecord, PalletNisSummaryRecord, PalletNominationPoolsBondedPoolInner, PalletNominationPoolsClaimPermission, PalletNominationPoolsPoolMember, PalletNominationPoolsRewardPool, PalletNominationPoolsSubPools, PalletPreimageOldRequestStatus, PalletPreimageRequestStatus, PalletProxyAnnouncement, PalletProxyProxyDefinition, PalletRankedCollectiveMemberRecord, PalletRankedCollectiveVoteRecord, PalletRecoveryActiveRecovery, PalletRecoveryRecoveryConfig, PalletReferendaReferendumInfo, PalletReferendaReferendumInfoTally, PalletReviveStorageContractInfo, PalletReviveStorageDeletionQueueManager, PalletReviveWasmCodeInfo, PalletSalaryClaimantStatus, PalletSalaryStatusType, PalletSchedulerRetryConfig, PalletSchedulerScheduled, PalletSocietyBid, PalletSocietyCandidacy, PalletSocietyGroupParams, PalletSocietyIntakeRecord, PalletSocietyMemberRecord, PalletSocietyPayoutRecord, PalletSocietyTally, PalletSocietyVote, PalletStakingActiveEraInfo, PalletStakingEraRewardPoints, PalletStakingForcing, PalletStakingNominations, PalletStakingRewardDestination, PalletStakingSlashingSlashingSpans, PalletStakingSlashingSpanRecord, PalletStakingStakingLedger, PalletStakingUnappliedSlash, PalletStakingValidatorPrefs, PalletStateTrieMigrationMigrationLimits, PalletStateTrieMigrationMigrationTask, PalletTipsOpenTip, PalletTransactionPaymentReleases, PalletTransactionStorageTransactionInfo, PalletTreasuryProposal, PalletTreasurySpendStatus, PalletUniquesCollectionDetails, PalletUniquesCollectionMetadata, PalletUniquesItemDetails, PalletUniquesItemMetadata, PalletVestingReleases, PalletVestingVestingInfo, SpAuthorityDiscoveryAppPublic, SpConsensusBabeAppPublic, SpConsensusBabeBabeEpochConfiguration, SpConsensusBabeDigestsNextConfigDescriptor, SpConsensusBabeDigestsPreDigest, SpConsensusBeefyEcdsaCryptoPublic, SpConsensusBeefyMmrBeefyAuthoritySet, SpConsensusGrandpaAppPublic, SpConsensusSlotsSlot, SpCoreCryptoKeyTypeId, SpMixnetAppPublic, SpNposElectionsElectionScore, SpStakingExposure, SpStakingExposurePage, SpStakingOffenceOffenceDetails, SpStakingOffenceOffenceSeverity, SpStakingPagedExposureMetadata, SpWeightsWeightV2Weight } from './types.js';
-export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
+export interface ChainStorage extends GenericChainStorage {
     /**
      * Pallet `System`'s storage queries
      **/
@@ -12,63 +12,63 @@ 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.
          *
          * @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).
          *
          * @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.
          *
@@ -80,13 +80,13 @@ 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
          * of events in the `<Events<T>>` list.
@@ -102,38 +102,38 @@ 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
          * (default) if not.
          *
          * @param {Callback<boolean> =} callback
          **/
-        upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
+        upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
         /**
          * The execution phase of the block.
          *
          * @param {Callback<Phase | undefined> =} callback
          **/
-        executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
+        executionPhase: GenericStorageQuery<() => Phase | undefined>;
         /**
          * `Some` if a code upgrade has been authorized.
          *
          * @param {Callback<FrameSystemCodeUpgradeAuthorization | undefined> =} callback
          **/
-        authorizedUpgrade: GenericStorageQuery<Rv, () => FrameSystemCodeUpgradeAuthorization | undefined>;
+        authorizedUpgrade: GenericStorageQuery<() => FrameSystemCodeUpgradeAuthorization | undefined>;
         /**
          * The weight reclaimed for the extrinsic.
          *
@@ -145,11 +145,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<SpWeightsWeightV2Weight> =} callback
          **/
-        extrinsicWeightReclaimed: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight>;
+        extrinsicWeightReclaimed: GenericStorageQuery<() => SpWeightsWeightV2Weight>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Babe`'s storage queries
@@ -160,26 +160,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<bigint> =} callback
          **/
-        epochIndex: GenericStorageQuery<Rv, () => bigint>;
+        epochIndex: GenericStorageQuery<() => bigint>;
         /**
          * Current epoch authorities.
          *
          * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
          **/
-        authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+        authorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
         /**
          * The slot at which the first epoch actually started. This is 0
          * until the first block of the chain.
          *
          * @param {Callback<SpConsensusSlotsSlot> =} callback
          **/
-        genesisSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+        genesisSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
         /**
          * Current slot number.
          *
          * @param {Callback<SpConsensusSlotsSlot> =} callback
          **/
-        currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
+        currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
         /**
          * The epoch randomness for the *current* epoch.
          *
@@ -194,25 +194,25 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<FixedBytes<32>> =} callback
          **/
-        randomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+        randomness: GenericStorageQuery<() => FixedBytes<32>>;
         /**
          * Pending epoch configuration change that will be applied when the next epoch is enacted.
          *
          * @param {Callback<SpConsensusBabeDigestsNextConfigDescriptor | undefined> =} callback
          **/
-        pendingEpochConfigChange: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
+        pendingEpochConfigChange: GenericStorageQuery<() => SpConsensusBabeDigestsNextConfigDescriptor | undefined>;
         /**
          * Next epoch randomness.
          *
          * @param {Callback<FixedBytes<32>> =} callback
          **/
-        nextRandomness: GenericStorageQuery<Rv, () => FixedBytes<32>>;
+        nextRandomness: GenericStorageQuery<() => FixedBytes<32>>;
         /**
          * Next epoch authorities.
          *
          * @param {Callback<Array<[SpConsensusBabeAppPublic, bigint]>> =} callback
          **/
-        nextAuthorities: GenericStorageQuery<Rv, () => Array<[SpConsensusBabeAppPublic, bigint]>>;
+        nextAuthorities: GenericStorageQuery<() => Array<[SpConsensusBabeAppPublic, bigint]>>;
         /**
          * Randomness under construction.
          *
@@ -226,21 +226,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        segmentIndex: GenericStorageQuery<Rv, () => number>;
+        segmentIndex: GenericStorageQuery<() => number>;
         /**
          * TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay.
          *
          * @param {number} arg
          * @param {Callback<Array<FixedBytes<32>>> =} callback
          **/
-        underConstruction: GenericStorageQuery<Rv, (arg: number) => Array<FixedBytes<32>>, number>;
+        underConstruction: GenericStorageQuery<(arg: number) => Array<FixedBytes<32>>, number>;
         /**
          * Temporary value (cleared at block finalization) which is `Some`
          * if per-block initialization has already been called for current block.
          *
          * @param {Callback<SpConsensusBabeDigestsPreDigest | undefined | undefined> =} callback
          **/
-        initialized: GenericStorageQuery<Rv, () => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
+        initialized: GenericStorageQuery<() => SpConsensusBabeDigestsPreDigest | undefined | undefined>;
         /**
          * This field should always be populated during block processing unless
          * secondary plain slots are enabled (which don't contain a VRF output).
@@ -249,7 +249,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<FixedBytes<32> | undefined> =} callback
          **/
-        authorVrfRandomness: GenericStorageQuery<Rv, () => FixedBytes<32> | undefined>;
+        authorVrfRandomness: GenericStorageQuery<() => FixedBytes<32> | undefined>;
         /**
          * The block numbers when the last and current epoch have started, respectively `N-1` and
          * `N`.
@@ -259,7 +259,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<[number, number]> =} callback
          **/
-        epochStart: GenericStorageQuery<Rv, () => [number, number]>;
+        epochStart: GenericStorageQuery<() => [number, number]>;
         /**
          * How late the current block is compared to its parent.
          *
@@ -269,21 +269,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        lateness: GenericStorageQuery<Rv, () => number>;
+        lateness: GenericStorageQuery<() => number>;
         /**
          * The configuration for the current epoch. Should never be `None` as it is initialized in
          * genesis.
          *
          * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
          **/
-        epochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+        epochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
         /**
          * The configuration for the next epoch, `None` if the config will not change
          * (you can fallback to `EpochConfig` instead in that case).
          *
          * @param {Callback<SpConsensusBabeBabeEpochConfiguration | undefined> =} callback
          **/
-        nextEpochConfig: GenericStorageQuery<Rv, () => SpConsensusBabeBabeEpochConfiguration | undefined>;
+        nextEpochConfig: GenericStorageQuery<() => SpConsensusBabeBabeEpochConfiguration | undefined>;
         /**
          * A list of the last 100 skipped epochs and the corresponding session index
          * when the epoch was skipped.
@@ -296,11 +296,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<[bigint, number]>> =} callback
          **/
-        skippedEpochs: GenericStorageQuery<Rv, () => Array<[bigint, number]>>;
+        skippedEpochs: GenericStorageQuery<() => Array<[bigint, number]>>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Timestamp`'s storage queries
@@ -311,7 +311,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.
          *
@@ -320,11 +320,11 @@ 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 `Authorship`'s storage queries
@@ -335,11 +335,11 @@ 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 `Indices`'s storage queries
@@ -351,11 +351,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<[AccountId32, bigint, boolean] | undefined> =} callback
          **/
-        accounts: GenericStorageQuery<Rv, (arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
+        accounts: GenericStorageQuery<(arg: number) => [AccountId32, bigint, boolean] | undefined, number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Balances`'s storage queries
@@ -366,13 +366,13 @@ 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.
          *
@@ -402,7 +402,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.
          * NOTE: Should only be accessed when setting, changing and freeing a lock.
@@ -412,7 +412,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.
          *
@@ -421,25 +421,25 @@ 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.
          *
          * @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.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
          **/
-        freezes: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>, AccountId32>;
+        freezes: GenericStorageQuery<(arg: AccountId32Like) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>, AccountId32>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `TransactionPayment`'s storage queries
@@ -449,16 +449,16 @@ 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 `ElectionProviderMultiPhase`'s storage queries
@@ -474,13 +474,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        round: GenericStorageQuery<Rv, () => number>;
+        round: GenericStorageQuery<() => number>;
         /**
          * Current phase.
          *
          * @param {Callback<PalletElectionProviderMultiPhasePhase> =} callback
          **/
-        currentPhase: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhasePhase>;
+        currentPhase: GenericStorageQuery<() => PalletElectionProviderMultiPhasePhase>;
         /**
          * Current best solution, signed or unsigned, queued to be returned upon `elect`.
          *
@@ -488,7 +488,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletElectionProviderMultiPhaseReadySolution | undefined> =} callback
          **/
-        queuedSolution: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseReadySolution | undefined>;
+        queuedSolution: GenericStorageQuery<() => PalletElectionProviderMultiPhaseReadySolution | undefined>;
         /**
          * Snapshot data of the round.
          *
@@ -497,7 +497,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletElectionProviderMultiPhaseRoundSnapshot | undefined> =} callback
          **/
-        snapshot: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
+        snapshot: GenericStorageQuery<() => PalletElectionProviderMultiPhaseRoundSnapshot | undefined>;
         /**
          * Desired number of targets to elect for this round.
          *
@@ -506,7 +506,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        desiredTargets: GenericStorageQuery<Rv, () => number | undefined>;
+        desiredTargets: GenericStorageQuery<() => number | undefined>;
         /**
          * The metadata of the [`RoundSnapshot`]
          *
@@ -515,7 +515,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined> =} callback
          **/
-        snapshotMetadata: GenericStorageQuery<Rv, () => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
+        snapshotMetadata: GenericStorageQuery<() => PalletElectionProviderMultiPhaseSolutionOrSnapshotSize | undefined>;
         /**
          * The next index to be assigned to an incoming signed submission.
          *
@@ -529,7 +529,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        signedSubmissionNextIndex: GenericStorageQuery<Rv, () => number>;
+        signedSubmissionNextIndex: GenericStorageQuery<() => number>;
         /**
          * A sorted, bounded vector of `(score, block_number, index)`, where each `index` points to a
          * value in `SignedSubmissions`.
@@ -540,7 +540,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<[SpNposElectionsElectionScore, number, number]>> =} callback
          **/
-        signedSubmissionIndices: GenericStorageQuery<Rv, () => Array<[SpNposElectionsElectionScore, number, number]>>;
+        signedSubmissionIndices: GenericStorageQuery<() => Array<[SpNposElectionsElectionScore, number, number]>>;
         /**
          * Unchecked, signed solutions.
          *
@@ -553,7 +553,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined> =} callback
          **/
-        signedSubmissionsMap: GenericStorageQuery<Rv, (arg: number) => PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined, number>;
+        signedSubmissionsMap: GenericStorageQuery<(arg: number) => PalletElectionProviderMultiPhaseSignedSignedSubmission | undefined, number>;
         /**
          * The minimum score that each 'untrusted' solution must attain in order to be considered
          * feasible.
@@ -562,11 +562,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<SpNposElectionsElectionScore | undefined> =} callback
          **/
-        minimumUntrustedScore: GenericStorageQuery<Rv, () => SpNposElectionsElectionScore | undefined>;
+        minimumUntrustedScore: GenericStorageQuery<() => SpNposElectionsElectionScore | undefined>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Staking`'s storage queries
@@ -577,13 +577,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        validatorCount: GenericStorageQuery<Rv, () => number>;
+        validatorCount: GenericStorageQuery<() => number>;
         /**
          * Minimum number of staking participants before emergency conditions are imposed.
          *
          * @param {Callback<number> =} callback
          **/
-        minimumValidatorCount: GenericStorageQuery<Rv, () => number>;
+        minimumValidatorCount: GenericStorageQuery<() => number>;
         /**
          * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
          * easy to initialize and the performance hit is minimal (we expect no more than four
@@ -591,7 +591,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<AccountId32>> =} callback
          **/
-        invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+        invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
         /**
          * Map from all locked "stash" accounts to the controller account.
          *
@@ -600,25 +600,25 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<AccountId32 | undefined> =} callback
          **/
-        bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+        bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
         /**
          * The minimum active bond to become and maintain the role of a nominator.
          *
          * @param {Callback<bigint> =} callback
          **/
-        minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
+        minNominatorBond: GenericStorageQuery<() => bigint>;
         /**
          * The minimum active bond to become and maintain the role of a validator.
          *
          * @param {Callback<bigint> =} callback
          **/
-        minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
+        minValidatorBond: GenericStorageQuery<() => bigint>;
         /**
          * The minimum active nominator stake of the last successful election.
          *
          * @param {Callback<bigint> =} callback
          **/
-        minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
+        minimumActiveStake: GenericStorageQuery<() => bigint>;
         /**
          * The minimum amount of commission that validators can set.
          *
@@ -626,7 +626,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Perbill> =} callback
          **/
-        minCommission: GenericStorageQuery<Rv, () => Perbill>;
+        minCommission: GenericStorageQuery<() => Perbill>;
         /**
          * Map from all (unlocked) "controller" accounts to the info regarding the staking.
          *
@@ -636,7 +636,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<PalletStakingStakingLedger | undefined> =} callback
          **/
-        ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
+        ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
         /**
          * Where the reward payment should be made. Keyed by stash.
          *
@@ -645,7 +645,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<PalletStakingRewardDestination | undefined> =} callback
          **/
-        payee: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
+        payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingRewardDestination | undefined, AccountId32>;
         /**
          * The map from (wannabe) validator stash key to the preferences of that validator.
          *
@@ -654,13 +654,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<PalletStakingValidatorPrefs> =} callback
          **/
-        validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
+        validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
         /**
          * Counter for the related counted storage map
          *
          * @param {Callback<number> =} callback
          **/
-        counterForValidators: GenericStorageQuery<Rv, () => number>;
+        counterForValidators: GenericStorageQuery<() => number>;
         /**
          * The maximum validator count before we stop allowing new validators to join.
          *
@@ -668,7 +668,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+        maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
         /**
          * The map from nominator stash key to their nomination preferences, namely the validators that
          * they wish to support.
@@ -693,13 +693,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<PalletStakingNominations | undefined> =} callback
          **/
-        nominators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
+        nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
         /**
          * Counter for the related counted storage map
          *
          * @param {Callback<number> =} callback
          **/
-        counterForNominators: GenericStorageQuery<Rv, () => number>;
+        counterForNominators: GenericStorageQuery<() => number>;
         /**
          * Stakers whose funds are managed by other pallets.
          *
@@ -711,13 +711,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<[] | undefined> =} callback
          **/
-        virtualStakers: GenericStorageQuery<Rv, (arg: AccountId32Like) => [] | undefined, AccountId32>;
+        virtualStakers: GenericStorageQuery<(arg: AccountId32Like) => [] | undefined, AccountId32>;
         /**
          * Counter for the related counted storage map
          *
          * @param {Callback<number> =} callback
          **/
-        counterForVirtualStakers: GenericStorageQuery<Rv, () => number>;
+        counterForVirtualStakers: GenericStorageQuery<() => number>;
         /**
          * The maximum nominator count before we stop allowing new validators to join.
          *
@@ -725,7 +725,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
+        maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
         /**
          * The current era index.
          *
@@ -734,7 +734,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        currentEra: GenericStorageQuery<Rv, () => number | undefined>;
+        currentEra: GenericStorageQuery<() => number | undefined>;
         /**
          * The active era information, it holds index and start.
          *
@@ -743,7 +743,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletStakingActiveEraInfo | undefined> =} callback
          **/
-        activeEra: GenericStorageQuery<Rv, () => PalletStakingActiveEraInfo | undefined>;
+        activeEra: GenericStorageQuery<() => PalletStakingActiveEraInfo | undefined>;
         /**
          * The session index at which the era start for the last [`Config::HistoryDepth`] eras.
          *
@@ -753,7 +753,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<number | undefined> =} callback
          **/
-        erasStartSessionIndex: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+        erasStartSessionIndex: GenericStorageQuery<(arg: number) => number | undefined, number>;
         /**
          * Exposure of validator at era.
          *
@@ -767,7 +767,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<SpStakingExposure> =} callback
          **/
-        erasStakers: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
+        erasStakers: GenericStorageQuery<(arg: [number, AccountId32Like]) => SpStakingExposure, [number, AccountId32]>;
         /**
          * Summary of validator exposure at a given era.
          *
@@ -785,7 +785,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<SpStakingPagedExposureMetadata | undefined> =} callback
          **/
-        erasStakersOverview: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined, [
+        erasStakersOverview: GenericStorageQuery<(arg: [number, AccountId32Like]) => SpStakingPagedExposureMetadata | undefined, [
             number,
             AccountId32
         ]>;
@@ -810,7 +810,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<SpStakingExposure> =} callback
          **/
-        erasStakersClipped: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => SpStakingExposure, [
+        erasStakersClipped: GenericStorageQuery<(arg: [number, AccountId32Like]) => SpStakingExposure, [
             number,
             AccountId32
         ]>;
@@ -825,7 +825,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like, number]} arg
          * @param {Callback<SpStakingExposurePage | undefined> =} callback
          **/
-        erasStakersPaged: GenericStorageQuery<Rv, (arg: [number, AccountId32Like, number]) => SpStakingExposurePage | undefined, [
+        erasStakersPaged: GenericStorageQuery<(arg: [number, AccountId32Like, number]) => SpStakingExposurePage | undefined, [
             number,
             AccountId32,
             number
@@ -841,7 +841,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<Array<number>> =} callback
          **/
-        claimedRewards: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
+        claimedRewards: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<number>, [number, AccountId32]>;
         /**
          * Similar to `ErasStakers`, this holds the preferences of validators.
          *
@@ -852,7 +852,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<PalletStakingValidatorPrefs> =} callback
          **/
-        erasValidatorPrefs: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs, [
+        erasValidatorPrefs: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs, [
             number,
             AccountId32
         ]>;
@@ -864,7 +864,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<bigint | undefined> =} callback
          **/
-        erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+        erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
         /**
          * Rewards for the last [`Config::HistoryDepth`] eras.
          * If reward hasn't been set or has been removed then 0 reward is returned.
@@ -872,7 +872,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<PalletStakingEraRewardPoints> =} callback
          **/
-        erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingEraRewardPoints, number>;
+        erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingEraRewardPoints, number>;
         /**
          * The total amount staked for the last [`Config::HistoryDepth`] eras.
          * If total hasn't been set or has been removed then 0 stake is returned.
@@ -880,13 +880,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<bigint> =} callback
          **/
-        erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+        erasTotalStake: GenericStorageQuery<(arg: number) => bigint, number>;
         /**
          * Mode of era forcing.
          *
          * @param {Callback<PalletStakingForcing> =} callback
          **/
-        forceEra: GenericStorageQuery<Rv, () => PalletStakingForcing>;
+        forceEra: GenericStorageQuery<() => PalletStakingForcing>;
         /**
          * Maximum staked rewards, i.e. the percentage of the era inflation that
          * is used for stake rewards.
@@ -894,7 +894,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Percent | undefined> =} callback
          **/
-        maxStakedRewards: GenericStorageQuery<Rv, () => Percent | undefined>;
+        maxStakedRewards: GenericStorageQuery<() => Percent | undefined>;
         /**
          * The percentage of the slash that is distributed to reporters.
          *
@@ -902,21 +902,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Perbill> =} callback
          **/
-        slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
+        slashRewardFraction: GenericStorageQuery<() => Perbill>;
         /**
          * The amount of currency given to reporters of a slash event which was
          * canceled by extraordinary circumstances (e.g. governance).
          *
          * @param {Callback<bigint> =} callback
          **/
-        canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
+        canceledSlashPayout: GenericStorageQuery<() => bigint>;
         /**
          * All unapplied slashes that are queued for later.
          *
          * @param {number} arg
          * @param {Callback<Array<PalletStakingUnappliedSlash>> =} callback
          **/
-        unappliedSlashes: GenericStorageQuery<Rv, (arg: number) => Array<PalletStakingUnappliedSlash>, number>;
+        unappliedSlashes: GenericStorageQuery<(arg: number) => Array<PalletStakingUnappliedSlash>, number>;
         /**
          * A mapping from still-bonded eras to the first session index of that era.
          *
@@ -925,7 +925,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<[number, number]>> =} callback
          **/
-        bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+        bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
         /**
          * All slashing events on validators, mapped by era to the highest slash proportion
          * and slash value of the era.
@@ -933,7 +933,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<[Perbill, bigint] | undefined> =} callback
          **/
-        validatorSlashInEra: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined, [
+        validatorSlashInEra: GenericStorageQuery<(arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined, [
             number,
             AccountId32
         ]>;
@@ -943,7 +943,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<bigint | undefined> =} callback
          **/
-        nominatorSlashInEra: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => bigint | undefined, [
+        nominatorSlashInEra: GenericStorageQuery<(arg: [number, AccountId32Like]) => bigint | undefined, [
             number,
             AccountId32
         ]>;
@@ -953,7 +953,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<PalletStakingSlashingSlashingSpans | undefined> =} callback
          **/
-        slashingSpans: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined, AccountId32>;
+        slashingSpans: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined, AccountId32>;
         /**
          * Records information about the maximum slash of a stash within a slashing span,
          * as well as how much reward has been paid out.
@@ -961,7 +961,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[AccountId32Like, number]} arg
          * @param {Callback<PalletStakingSlashingSpanRecord> =} callback
          **/
-        spanSlash: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord, [
+        spanSlash: GenericStorageQuery<(arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord, [
             AccountId32,
             number
         ]>;
@@ -972,7 +972,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        currentPlannedSession: GenericStorageQuery<Rv, () => number>;
+        currentPlannedSession: GenericStorageQuery<() => number>;
         /**
          * The threshold for when users can start calling `chill_other` for other validators /
          * nominators. The threshold is compared to the actual number of validators / nominators
@@ -980,11 +980,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Percent | undefined> =} callback
          **/
-        chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
+        chillThreshold: GenericStorageQuery<() => Percent | undefined>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Session`'s storage queries
@@ -995,27 +995,27 @@ 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
          * has changed in the queued validator set.
          *
          * @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
          * will be used to determine the validator's session keys.
          *
          * @param {Callback<Array<[AccountId32, KitchensinkRuntimeSessionKeys]>> =} callback
          **/
-        queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, KitchensinkRuntimeSessionKeys]>>;
+        queuedKeys: GenericStorageQuery<() => Array<[AccountId32, KitchensinkRuntimeSessionKeys]>>;
         /**
          * Indices of disabled validators.
          *
@@ -1025,28 +1025,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<[number, SpStakingOffenceOffenceSeverity]>> =} callback
          **/
-        disabledValidators: GenericStorageQuery<Rv, () => Array<[number, SpStakingOffenceOffenceSeverity]>>;
+        disabledValidators: GenericStorageQuery<() => Array<[number, SpStakingOffenceOffenceSeverity]>>;
         /**
          * The next session keys for a validator.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<KitchensinkRuntimeSessionKeys | undefined> =} callback
          **/
-        nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => KitchensinkRuntimeSessionKeys | undefined, AccountId32>;
+        nextKeys: GenericStorageQuery<(arg: AccountId32Like) => KitchensinkRuntimeSessionKeys | undefined, AccountId32>;
         /**
          * The owner of a key. The key is the `KeyTypeId` + the encoded key.
          *
          * @param {[SpCoreCryptoKeyTypeId, BytesLike]} arg
          * @param {Callback<AccountId32 | undefined> =} callback
          **/
-        keyOwner: GenericStorageQuery<Rv, (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined, [
+        keyOwner: GenericStorageQuery<(arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined, [
             SpCoreCryptoKeyTypeId,
             Bytes
         ]>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Democracy`'s storage queries
@@ -1057,13 +1057,13 @@ 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.
          *
@@ -1072,20 +1072,20 @@ 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
          * `ReferendumCount` if there isn't a unbaked referendum.
          *
          * @param {Callback<number> =} callback
          **/
-        lowestUnbaked: GenericStorageQuery<Rv, () => number>;
+        lowestUnbaked: GenericStorageQuery<() => number>;
         /**
          * Information concerning any given referendum.
          *
@@ -1094,7 +1094,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
          * have recorded. The second item is the total amount of delegations, that will be added.
@@ -1104,14 +1104,14 @@ 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
          * proposal.
          *
          * @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.
          * This happens when a referendum needs to be tabled and one of two conditions are met:
@@ -1120,7 +1120,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
          * (until when it may not be resubmitted) and who vetoed it.
@@ -1128,14 +1128,14 @@ 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.
          *
          * @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.
          * The `Hash` refers to the preimage of the `Preimages` provider which can be a JSON
@@ -1147,11 +1147,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {PalletDemocracyMetadataOwner} arg
          * @param {Callback<H256 | undefined> =} callback
          **/
-        metadataOf: GenericStorageQuery<Rv, (arg: PalletDemocracyMetadataOwner) => H256 | undefined, PalletDemocracyMetadataOwner>;
+        metadataOf: GenericStorageQuery<(arg: PalletDemocracyMetadataOwner) => H256 | undefined, PalletDemocracyMetadataOwner>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Council`'s storage queries
@@ -1162,14 +1162,14 @@ 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.
          *
          * @param {H256} arg
          * @param {Callback<KitchensinkRuntimeRuntimeCall | undefined> =} callback
          **/
-        proposalOf: GenericStorageQuery<Rv, (arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
+        proposalOf: GenericStorageQuery<(arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
         /**
          * Consideration cost created for publishing and storing a proposal.
          *
@@ -1179,36 +1179,36 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {H256} arg
          * @param {Callback<[AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined> =} callback
          **/
-        costOf: GenericStorageQuery<Rv, (arg: H256) => [AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined, H256>;
+        costOf: GenericStorageQuery<(arg: H256) => [AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined, H256>;
         /**
          * Votes on a given proposal, if it is ongoing.
          *
          * @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
@@ -1219,14 +1219,14 @@ 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.
          *
          * @param {H256} arg
          * @param {Callback<KitchensinkRuntimeRuntimeCall | undefined> =} callback
          **/
-        proposalOf: GenericStorageQuery<Rv, (arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
+        proposalOf: GenericStorageQuery<(arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
         /**
          * Consideration cost created for publishing and storing a proposal.
          *
@@ -1236,36 +1236,36 @@ 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.
          *
          * @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 `Elections`'s storage queries
@@ -1278,7 +1278,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<PalletElectionsPhragmenSeatHolder>> =} callback
          **/
-        members: GenericStorageQuery<Rv, () => Array<PalletElectionsPhragmenSeatHolder>>;
+        members: GenericStorageQuery<() => Array<PalletElectionsPhragmenSeatHolder>>;
         /**
          * The current reserved runners-up.
          *
@@ -1287,7 +1287,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<PalletElectionsPhragmenSeatHolder>> =} callback
          **/
-        runnersUp: GenericStorageQuery<Rv, () => Array<PalletElectionsPhragmenSeatHolder>>;
+        runnersUp: GenericStorageQuery<() => Array<PalletElectionsPhragmenSeatHolder>>;
         /**
          * The present candidate list. A current member or runner-up can never enter this vector
          * and is always implicitly assumed to be a candidate.
@@ -1298,13 +1298,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<[AccountId32, bigint]>> =} callback
          **/
-        candidates: GenericStorageQuery<Rv, () => Array<[AccountId32, bigint]>>;
+        candidates: GenericStorageQuery<() => Array<[AccountId32, bigint]>>;
         /**
          * The total number of vote rounds that have happened, excluding the upcoming one.
          *
          * @param {Callback<number> =} callback
          **/
-        electionRounds: GenericStorageQuery<Rv, () => number>;
+        electionRounds: GenericStorageQuery<() => number>;
         /**
          * Votes and locked stake of a particular voter.
          *
@@ -1313,11 +1313,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<PalletElectionsPhragmenVoter> =} callback
          **/
-        voting: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletElectionsPhragmenVoter, AccountId32>;
+        voting: GenericStorageQuery<(arg: AccountId32Like) => PalletElectionsPhragmenVoter, AccountId32>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `TechnicalMembership`'s storage queries
@@ -1328,17 +1328,17 @@ 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 `Grandpa`'s storage queries
@@ -1349,32 +1349,32 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletGrandpaStoredState> =} callback
          **/
-        state: GenericStorageQuery<Rv, () => PalletGrandpaStoredState>;
+        state: GenericStorageQuery<() => PalletGrandpaStoredState>;
         /**
          * Pending change: (signaled at, scheduled change).
          *
          * @param {Callback<PalletGrandpaStoredPendingChange | undefined> =} callback
          **/
-        pendingChange: GenericStorageQuery<Rv, () => PalletGrandpaStoredPendingChange | undefined>;
+        pendingChange: GenericStorageQuery<() => PalletGrandpaStoredPendingChange | undefined>;
         /**
          * next block number where we can force a change.
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        nextForced: GenericStorageQuery<Rv, () => number | undefined>;
+        nextForced: GenericStorageQuery<() => number | undefined>;
         /**
          * `true` if we are currently stalled.
          *
          * @param {Callback<[number, number] | undefined> =} callback
          **/
-        stalled: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+        stalled: GenericStorageQuery<() => [number, number] | undefined>;
         /**
          * The number of changes (both in terms of keys and underlying economic responsibilities)
          * in the "set" of Grandpa validators from genesis.
          *
          * @param {Callback<bigint> =} callback
          **/
-        currentSetId: GenericStorageQuery<Rv, () => bigint>;
+        currentSetId: GenericStorageQuery<() => bigint>;
         /**
          * A mapping from grandpa set ID to the index of the *most recent* session for which its
          * members were responsible.
@@ -1390,17 +1390,17 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {bigint} arg
          * @param {Callback<number | undefined> =} callback
          **/
-        setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+        setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
         /**
          * The current list of authorities.
          *
          * @param {Callback<Array<[SpConsensusGrandpaAppPublic, bigint]>> =} callback
          **/
-        authorities: GenericStorageQuery<Rv, () => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
+        authorities: GenericStorageQuery<() => Array<[SpConsensusGrandpaAppPublic, bigint]>>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Treasury`'s storage queries
@@ -1414,7 +1414,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        proposalCount: GenericStorageQuery<Rv, () => number>;
+        proposalCount: GenericStorageQuery<() => number>;
         /**
          * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
          * Refer to <https://github.com/paritytech/polkadot-sdk/pull/5961> for migration to `spend`.
@@ -1424,13 +1424,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<PalletTreasuryProposal | undefined> =} callback
          **/
-        proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
+        proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined, number>;
         /**
          * The amount which has been reported as inactive to Currency.
          *
          * @param {Callback<bigint> =} callback
          **/
-        deactivated: GenericStorageQuery<Rv, () => bigint>;
+        deactivated: GenericStorageQuery<() => bigint>;
         /**
          * DEPRECATED: associated with `spend_local` call and will be removed in May 2025.
          * Refer to <https://github.com/paritytech/polkadot-sdk/pull/5961> for migration to `spend`.
@@ -1439,30 +1439,30 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<number>> =} callback
          **/
-        approvals: GenericStorageQuery<Rv, () => Array<number>>;
+        approvals: GenericStorageQuery<() => Array<number>>;
         /**
          * The count of spends that have been made.
          *
          * @param {Callback<number> =} callback
          **/
-        spendCount: GenericStorageQuery<Rv, () => number>;
+        spendCount: GenericStorageQuery<() => number>;
         /**
          * Spends that have been approved and being processed.
          *
          * @param {number} arg
          * @param {Callback<PalletTreasurySpendStatus | undefined> =} callback
          **/
-        spends: GenericStorageQuery<Rv, (arg: number) => PalletTreasurySpendStatus | undefined, number>;
+        spends: GenericStorageQuery<(arg: number) => PalletTreasurySpendStatus | undefined, number>;
         /**
          * The blocknumber for the last triggered spend period.
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        lastSpendPeriod: GenericStorageQuery<Rv, () => number | undefined>;
+        lastSpendPeriod: GenericStorageQuery<() => number | undefined>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `AssetRate`'s storage queries
@@ -1476,11 +1476,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {FrameSupportTokensFungibleUnionOfNativeOrWithId} arg
          * @param {Callback<FixedU128 | undefined> =} callback
          **/
-        conversionRateToNative: GenericStorageQuery<Rv, (arg: FrameSupportTokensFungibleUnionOfNativeOrWithId) => FixedU128 | undefined, FrameSupportTokensFungibleUnionOfNativeOrWithId>;
+        conversionRateToNative: GenericStorageQuery<(arg: FrameSupportTokensFungibleUnionOfNativeOrWithId) => FixedU128 | undefined, FrameSupportTokensFungibleUnionOfNativeOrWithId>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Contracts`'s storage queries
@@ -1492,14 +1492,14 @@ 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.
          *
          * @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.
          *
@@ -1526,7 +1526,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.
          *
@@ -1535,7 +1535,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<PalletContractsStorageContractInfo | undefined> =} callback
          **/
-        contractInfoOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletContractsStorageContractInfo | undefined, AccountId32>;
+        contractInfoOf: GenericStorageQuery<(arg: AccountId32Like) => PalletContractsStorageContractInfo | undefined, AccountId32>;
         /**
          * Evicted contracts that await child trie deletion.
          *
@@ -1545,25 +1545,25 @@ 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
          * and the latest deleted contract in queue.
          *
          * @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
          * progress of the migration, enabling us to resume from the last completed position.
          *
          * @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 `Sudo`'s storage queries
@@ -1574,11 +1574,11 @@ 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 `ImOnline`'s storage queries
@@ -1599,20 +1599,20 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        heartbeatAfter: GenericStorageQuery<Rv, () => number>;
+        heartbeatAfter: GenericStorageQuery<() => number>;
         /**
          * The current set of keys that may issue a heartbeat.
          *
          * @param {Callback<Array<PalletImOnlineSr25519AppSr25519Public>> =} callback
          **/
-        keys: GenericStorageQuery<Rv, () => Array<PalletImOnlineSr25519AppSr25519Public>>;
+        keys: GenericStorageQuery<() => Array<PalletImOnlineSr25519AppSr25519Public>>;
         /**
          * For each session index, we keep a mapping of `SessionIndex` and `AuthIndex`.
          *
          * @param {[number, number]} arg
          * @param {Callback<boolean | undefined> =} callback
          **/
-        receivedHeartbeats: GenericStorageQuery<Rv, (arg: [number, number]) => boolean | undefined, [number, number]>;
+        receivedHeartbeats: GenericStorageQuery<(arg: [number, number]) => boolean | undefined, [number, number]>;
         /**
          * For each session index, we keep a mapping of `ValidatorId<T>` to the
          * number of blocks authored by the given authority.
@@ -1620,11 +1620,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<number> =} callback
          **/
-        authoredBlocks: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => number, [number, AccountId32]>;
+        authoredBlocks: GenericStorageQuery<(arg: [number, AccountId32Like]) => number, [number, AccountId32]>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `AuthorityDiscovery`'s storage queries
@@ -1635,17 +1635,17 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
          **/
-        keys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+        keys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
         /**
          * Keys of the next authority set.
          *
          * @param {Callback<Array<SpAuthorityDiscoveryAppPublic>> =} callback
          **/
-        nextKeys: GenericStorageQuery<Rv, () => Array<SpAuthorityDiscoveryAppPublic>>;
+        nextKeys: GenericStorageQuery<() => Array<SpAuthorityDiscoveryAppPublic>>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Offences`'s storage queries
@@ -1657,21 +1657,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {H256} arg
          * @param {Callback<SpStakingOffenceOffenceDetails | undefined> =} callback
          **/
-        reports: GenericStorageQuery<Rv, (arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
+        reports: GenericStorageQuery<(arg: H256) => SpStakingOffenceOffenceDetails | undefined, H256>;
         /**
          * A vector of reports of the same kind that happened at the same time slot.
          *
          * @param {[FixedBytes<16>, BytesLike]} arg
          * @param {Callback<Array<H256>> =} callback
          **/
-        concurrentReportsIndex: GenericStorageQuery<Rv, (arg: [FixedBytes<16>, BytesLike]) => Array<H256>, [
+        concurrentReportsIndex: GenericStorageQuery<(arg: [FixedBytes<16>, BytesLike]) => Array<H256>, [
             FixedBytes<16>,
             Bytes
         ]>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Historical`'s storage queries
@@ -1683,17 +1683,17 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<[H256, number] | undefined> =} callback
          **/
-        historicalSessions: GenericStorageQuery<Rv, (arg: number) => [H256, number] | undefined, number>;
+        historicalSessions: GenericStorageQuery<(arg: number) => [H256, number] | undefined, number>;
         /**
          * The range of historical sessions we store. [first, last)
          *
          * @param {Callback<[number, number] | undefined> =} callback
          **/
-        storedRange: GenericStorageQuery<Rv, () => [number, number] | undefined>;
+        storedRange: GenericStorageQuery<() => [number, number] | undefined>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `RandomnessCollectiveFlip`'s storage queries
@@ -1706,11 +1706,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<H256>> =} callback
          **/
-        randomMaterial: GenericStorageQuery<Rv, () => Array<H256>>;
+        randomMaterial: GenericStorageQuery<() => Array<H256>>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Identity`'s storage queries
@@ -1725,14 +1725,14 @@ 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.
          *
          * @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
          * context. If the account is not some other account's sub-identity, then just `None`.
@@ -1740,7 +1740,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.
          *
@@ -1751,7 +1751,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
          * special origin (likely a council motion).
@@ -1760,14 +1760,14 @@ 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.
          *
          * @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
          * the username. The `owner` value should be a key in the `UsernameOf` map, but it may not if
@@ -1779,7 +1779,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
          * that they want it. Used primarily in cases where the `AccountId` cannot provide a signature
@@ -1791,7 +1791,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {BytesLike} arg
          * @param {Callback<[AccountId32, number, PalletIdentityProvider] | undefined> =} callback
          **/
-        pendingUsernames: GenericStorageQuery<Rv, (arg: BytesLike) => [AccountId32, number, PalletIdentityProvider] | undefined, Bytes>;
+        pendingUsernames: GenericStorageQuery<(arg: BytesLike) => [AccountId32, number, PalletIdentityProvider] | undefined, Bytes>;
         /**
          * Usernames for which the authority that granted them has started the removal process by
          * unbinding them. Each unbinding username maps to its grace period expiry, which is the first
@@ -1801,11 +1801,11 @@ 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 `Society`'s storage queries
@@ -1816,52 +1816,52 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletSocietyGroupParams | undefined> =} callback
          **/
-        parameters: GenericStorageQuery<Rv, () => PalletSocietyGroupParams | undefined>;
+        parameters: GenericStorageQuery<() => PalletSocietyGroupParams | undefined>;
         /**
          * Amount of our account balance that is specifically for the next round's bid(s).
          *
          * @param {Callback<bigint> =} callback
          **/
-        pot: GenericStorageQuery<Rv, () => bigint>;
+        pot: GenericStorageQuery<() => bigint>;
         /**
          * The first member.
          *
          * @param {Callback<AccountId32 | undefined> =} callback
          **/
-        founder: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+        founder: GenericStorageQuery<() => AccountId32 | undefined>;
         /**
          * The most primary from the most recently approved rank 0 members in the society.
          *
          * @param {Callback<AccountId32 | undefined> =} callback
          **/
-        head: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+        head: GenericStorageQuery<() => AccountId32 | undefined>;
         /**
          * A hash of the rules of this society concerning membership. Can only be set once and
          * only by the founder.
          *
          * @param {Callback<H256 | undefined> =} callback
          **/
-        rules: GenericStorageQuery<Rv, () => H256 | undefined>;
+        rules: GenericStorageQuery<() => H256 | undefined>;
         /**
          * The current members and their rank. Doesn't include `SuspendedMembers`.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<PalletSocietyMemberRecord | undefined> =} callback
          **/
-        members: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
+        members: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
         /**
          * Information regarding rank-0 payouts, past and future.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<PalletSocietyPayoutRecord> =} callback
          **/
-        payouts: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyPayoutRecord, AccountId32>;
+        payouts: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyPayoutRecord, AccountId32>;
         /**
          * The number of items in `Members` currently. (Doesn't include `SuspendedMembers`.)
          *
          * @param {Callback<number> =} callback
          **/
-        memberCount: GenericStorageQuery<Rv, () => number>;
+        memberCount: GenericStorageQuery<() => number>;
         /**
          * The current items in `Members` keyed by their unique index. Keys are densely populated
          * `0..MemberCount` (does not include `MemberCount`).
@@ -1869,45 +1869,45 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<AccountId32 | undefined> =} callback
          **/
-        memberByIndex: GenericStorageQuery<Rv, (arg: number) => AccountId32 | undefined, number>;
+        memberByIndex: GenericStorageQuery<(arg: number) => AccountId32 | undefined, number>;
         /**
          * The set of suspended members, with their old membership record.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<PalletSocietyMemberRecord | undefined> =} callback
          **/
-        suspendedMembers: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
+        suspendedMembers: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyMemberRecord | undefined, AccountId32>;
         /**
          * The number of rounds which have passed.
          *
          * @param {Callback<number> =} callback
          **/
-        roundCount: GenericStorageQuery<Rv, () => number>;
+        roundCount: GenericStorageQuery<() => number>;
         /**
          * The current bids, stored ordered by the value of the bid.
          *
          * @param {Callback<Array<PalletSocietyBid>> =} callback
          **/
-        bids: GenericStorageQuery<Rv, () => Array<PalletSocietyBid>>;
+        bids: GenericStorageQuery<() => Array<PalletSocietyBid>>;
         /**
          *
          * @param {AccountId32Like} arg
          * @param {Callback<PalletSocietyCandidacy | undefined> =} callback
          **/
-        candidates: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSocietyCandidacy | undefined, AccountId32>;
+        candidates: GenericStorageQuery<(arg: AccountId32Like) => PalletSocietyCandidacy | undefined, AccountId32>;
         /**
          * The current skeptic.
          *
          * @param {Callback<AccountId32 | undefined> =} callback
          **/
-        skeptic: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
+        skeptic: GenericStorageQuery<() => AccountId32 | undefined>;
         /**
          * Double map from Candidate -> Voter -> (Maybe) Vote.
          *
          * @param {[AccountId32Like, AccountId32Like]} arg
          * @param {Callback<PalletSocietyVote | undefined> =} callback
          **/
-        votes: GenericStorageQuery<Rv, (arg: [AccountId32Like, AccountId32Like]) => PalletSocietyVote | undefined, [
+        votes: GenericStorageQuery<(arg: [AccountId32Like, AccountId32Like]) => PalletSocietyVote | undefined, [
             AccountId32,
             AccountId32
         ]>;
@@ -1917,7 +1917,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<Bytes | undefined> =} callback
          **/
-        voteClearCursor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Bytes | undefined, AccountId32>;
+        voteClearCursor: GenericStorageQuery<(arg: AccountId32Like) => Bytes | undefined, AccountId32>;
         /**
          * At the end of the claim period, this contains the most recently approved members (along with
          * their bid and round ID) who is from the most recent round with the lowest bid. They will
@@ -1925,33 +1925,33 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletSocietyIntakeRecord | undefined> =} callback
          **/
-        nextHead: GenericStorageQuery<Rv, () => PalletSocietyIntakeRecord | undefined>;
+        nextHead: GenericStorageQuery<() => PalletSocietyIntakeRecord | undefined>;
         /**
          * The number of challenge rounds there have been. Used to identify stale DefenderVotes.
          *
          * @param {Callback<number> =} callback
          **/
-        challengeRoundCount: GenericStorageQuery<Rv, () => number>;
+        challengeRoundCount: GenericStorageQuery<() => number>;
         /**
          * The defending member currently being challenged, along with a running tally of votes.
          *
          * @param {Callback<[AccountId32, AccountId32, PalletSocietyTally] | undefined> =} callback
          **/
-        defending: GenericStorageQuery<Rv, () => [AccountId32, AccountId32, PalletSocietyTally] | undefined>;
+        defending: GenericStorageQuery<() => [AccountId32, AccountId32, PalletSocietyTally] | undefined>;
         /**
          * Votes for the defender, keyed by challenge round.
          *
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<PalletSocietyVote | undefined> =} callback
          **/
-        defenderVotes: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => PalletSocietyVote | undefined, [
+        defenderVotes: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletSocietyVote | undefined, [
             number,
             AccountId32
         ]>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Recovery`'s storage queries
@@ -1963,7 +1963,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<PalletRecoveryRecoveryConfig | undefined> =} callback
          **/
-        recoverable: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined, AccountId32>;
+        recoverable: GenericStorageQuery<(arg: AccountId32Like) => PalletRecoveryRecoveryConfig | undefined, AccountId32>;
         /**
          * Active recovery attempts.
          *
@@ -1973,7 +1973,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[AccountId32Like, AccountId32Like]} arg
          * @param {Callback<PalletRecoveryActiveRecovery | undefined> =} callback
          **/
-        activeRecoveries: GenericStorageQuery<Rv, (arg: [AccountId32Like, AccountId32Like]) => PalletRecoveryActiveRecovery | undefined, [
+        activeRecoveries: GenericStorageQuery<(arg: [AccountId32Like, AccountId32Like]) => PalletRecoveryActiveRecovery | undefined, [
             AccountId32,
             AccountId32
         ]>;
@@ -1985,11 +1985,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<AccountId32 | undefined> =} callback
          **/
-        proxy: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
+        proxy: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Vesting`'s storage queries
@@ -2001,7 +2001,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.
          *
@@ -2009,11 +2009,11 @@ 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 `Scheduler`'s storage queries
@@ -2024,24 +2024,21 @@ 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.
          *
          * @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.
          *
          * @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.
          *
@@ -2051,11 +2048,11 @@ 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 `Glutton`'s storage queries
@@ -2069,7 +2066,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<FixedU64> =} callback
          **/
-        compute: GenericStorageQuery<Rv, () => FixedU64>;
+        compute: GenericStorageQuery<() => FixedU64>;
         /**
          * The proportion of the remaining `proof_size` to consume during `on_idle`.
          *
@@ -2078,7 +2075,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<FixedU64> =} callback
          **/
-        storage: GenericStorageQuery<Rv, () => FixedU64>;
+        storage: GenericStorageQuery<() => FixedU64>;
         /**
          * The proportion of the `block length` to consume on each block.
          *
@@ -2087,7 +2084,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<FixedU64> =} callback
          **/
-        length: GenericStorageQuery<Rv, () => FixedU64>;
+        length: GenericStorageQuery<() => FixedU64>;
         /**
          * Storage map used for wasting proof size.
          *
@@ -2101,17 +2098,17 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<FixedBytes<1024> | undefined> =} callback
          **/
-        trashData: GenericStorageQuery<Rv, (arg: number) => FixedBytes<1024> | undefined, number>;
+        trashData: GenericStorageQuery<(arg: number) => FixedBytes<1024> | undefined, number>;
         /**
          * The current number of entries in `TrashData`.
          *
          * @param {Callback<number> =} callback
          **/
-        trashDataCount: GenericStorageQuery<Rv, () => number>;
+        trashDataCount: GenericStorageQuery<() => number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Preimage`'s storage queries
@@ -2123,24 +2120,24 @@ 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.
          *
          * @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 `Proxy`'s storage queries
@@ -2153,18 +2150,18 @@ 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).
          *
          * @param {AccountId32Like} arg
          * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
          **/
-        announcements: GenericStorageQuery<Rv, (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
+        announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint], AccountId32>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Multisig`'s storage queries
@@ -2176,14 +2173,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[AccountId32Like, FixedBytes<32>]} arg
          * @param {Callback<PalletMultisigMultisig | undefined> =} callback
          **/
-        multisigs: GenericStorageQuery<Rv, (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined, [
+        multisigs: GenericStorageQuery<(arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined, [
             AccountId32,
             FixedBytes<32>
         ]>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Bounties`'s storage queries
@@ -2194,31 +2191,31 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        bountyCount: GenericStorageQuery<Rv, () => number>;
+        bountyCount: GenericStorageQuery<() => number>;
         /**
          * Bounties that have been made.
          *
          * @param {number} arg
          * @param {Callback<PalletBountiesBounty | undefined> =} callback
          **/
-        bounties: GenericStorageQuery<Rv, (arg: number) => PalletBountiesBounty | undefined, number>;
+        bounties: GenericStorageQuery<(arg: number) => PalletBountiesBounty | undefined, number>;
         /**
          * The description of each bounty.
          *
          * @param {number} arg
          * @param {Callback<Bytes | undefined> =} callback
          **/
-        bountyDescriptions: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+        bountyDescriptions: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
         /**
          * Bounty indices that have been approved but not yet funded.
          *
          * @param {Callback<Array<number>> =} callback
          **/
-        bountyApprovals: GenericStorageQuery<Rv, () => Array<number>>;
+        bountyApprovals: GenericStorageQuery<() => Array<number>>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Tips`'s storage queries
@@ -2232,7 +2229,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {H256} arg
          * @param {Callback<PalletTipsOpenTip | undefined> =} callback
          **/
-        tips: GenericStorageQuery<Rv, (arg: H256) => PalletTipsOpenTip | undefined, H256>;
+        tips: GenericStorageQuery<(arg: H256) => PalletTipsOpenTip | undefined, H256>;
         /**
          * Simple preimage lookup from the reason's hash to the original data. Again, has an
          * insecure enumerable hash since the key is guaranteed to be the result of a secure hash.
@@ -2240,11 +2237,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {H256} arg
          * @param {Callback<Bytes | undefined> =} callback
          **/
-        reasons: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
+        reasons: GenericStorageQuery<(arg: H256) => Bytes | undefined, H256>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Assets`'s storage queries
@@ -2256,14 +2253,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
          **/
-        asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+        asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
         /**
          * The holdings of a specific account for a specific asset.
          *
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
          **/
-        account: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined, [
+        account: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined, [
             number,
             AccountId32
         ]>;
@@ -2275,7 +2272,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like, AccountId32Like]} arg
          * @param {Callback<PalletAssetsApproval | undefined> =} callback
          **/
-        approvals: GenericStorageQuery<Rv, (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined, [
+        approvals: GenericStorageQuery<(arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined, [
             number,
             AccountId32,
             AccountId32
@@ -2286,7 +2283,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<PalletAssetsAssetMetadata> =} callback
          **/
-        metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+        metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
         /**
          * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
          * item has no effect.
@@ -2300,11 +2297,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+        nextAssetId: GenericStorageQuery<() => number | undefined>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `PoolAssets`'s storage queries
@@ -2316,14 +2313,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
          **/
-        asset: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetDetails | undefined, number>;
+        asset: GenericStorageQuery<(arg: number) => PalletAssetsAssetDetails | undefined, number>;
         /**
          * The holdings of a specific account for a specific asset.
          *
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
          **/
-        account: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined, [
+        account: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletAssetsAssetAccount | undefined, [
             number,
             AccountId32
         ]>;
@@ -2335,7 +2332,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like, AccountId32Like]} arg
          * @param {Callback<PalletAssetsApproval | undefined> =} callback
          **/
-        approvals: GenericStorageQuery<Rv, (arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined, [
+        approvals: GenericStorageQuery<(arg: [number, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined, [
             number,
             AccountId32,
             AccountId32
@@ -2346,7 +2343,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<PalletAssetsAssetMetadata> =} callback
          **/
-        metadata: GenericStorageQuery<Rv, (arg: number) => PalletAssetsAssetMetadata, number>;
+        metadata: GenericStorageQuery<(arg: number) => PalletAssetsAssetMetadata, number>;
         /**
          * The asset ID enforced for the next asset creation, if any present. Otherwise, this storage
          * item has no effect.
@@ -2360,11 +2357,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        nextAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+        nextAssetId: GenericStorageQuery<() => number | undefined>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Beefy`'s storage queries
@@ -2375,19 +2372,19 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
          **/
-        authorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+        authorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
         /**
          * The current validator set id
          *
          * @param {Callback<bigint> =} callback
          **/
-        validatorSetId: GenericStorageQuery<Rv, () => bigint>;
+        validatorSetId: GenericStorageQuery<() => bigint>;
         /**
          * Authorities set scheduled to be used with the next session
          *
          * @param {Callback<Array<SpConsensusBeefyEcdsaCryptoPublic>> =} callback
          **/
-        nextAuthorities: GenericStorageQuery<Rv, () => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
+        nextAuthorities: GenericStorageQuery<() => Array<SpConsensusBeefyEcdsaCryptoPublic>>;
         /**
          * A mapping from BEEFY set ID to the index of the *most recent* session for which its
          * members were responsible.
@@ -2403,7 +2400,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {bigint} arg
          * @param {Callback<number | undefined> =} callback
          **/
-        setIdSession: GenericStorageQuery<Rv, (arg: bigint) => number | undefined, bigint>;
+        setIdSession: GenericStorageQuery<(arg: bigint) => number | undefined, bigint>;
         /**
          * Block number where BEEFY consensus is enabled/started.
          * By changing this (through privileged `set_new_genesis()`), BEEFY consensus is effectively
@@ -2411,11 +2408,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        genesisBlock: GenericStorageQuery<Rv, () => number | undefined>;
+        genesisBlock: GenericStorageQuery<() => number | undefined>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Mmr`'s storage queries
@@ -2426,13 +2423,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<H256> =} callback
          **/
-        rootHash: GenericStorageQuery<Rv, () => H256>;
+        rootHash: GenericStorageQuery<() => H256>;
         /**
          * Current size of the MMR (number of leaves).
          *
          * @param {Callback<bigint> =} callback
          **/
-        numberOfLeaves: GenericStorageQuery<Rv, () => bigint>;
+        numberOfLeaves: GenericStorageQuery<() => bigint>;
         /**
          * Hashes of the nodes in the MMR.
          *
@@ -2442,11 +2439,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {bigint} arg
          * @param {Callback<H256 | undefined> =} callback
          **/
-        nodes: GenericStorageQuery<Rv, (arg: bigint) => H256 | undefined, bigint>;
+        nodes: GenericStorageQuery<(arg: bigint) => H256 | undefined, bigint>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `MmrLeaf`'s storage queries
@@ -2457,7 +2454,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
          **/
-        beefyAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+        beefyAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
         /**
          * Details of next BEEFY authority set.
          *
@@ -2465,11 +2462,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<SpConsensusBeefyMmrBeefyAuthoritySet> =} callback
          **/
-        beefyNextAuthorities: GenericStorageQuery<Rv, () => SpConsensusBeefyMmrBeefyAuthoritySet>;
+        beefyNextAuthorities: GenericStorageQuery<() => SpConsensusBeefyMmrBeefyAuthoritySet>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Lottery`'s storage queries
@@ -2479,26 +2476,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        lotteryIndex: GenericStorageQuery<Rv, () => number>;
+        lotteryIndex: GenericStorageQuery<() => number>;
         /**
          * The configuration for the current lottery.
          *
          * @param {Callback<PalletLotteryLotteryConfig | undefined> =} callback
          **/
-        lottery: GenericStorageQuery<Rv, () => PalletLotteryLotteryConfig | undefined>;
+        lottery: GenericStorageQuery<() => PalletLotteryLotteryConfig | undefined>;
         /**
          * Users who have purchased a ticket. (Lottery Index, Tickets Purchased)
          *
          * @param {AccountId32Like} arg
          * @param {Callback<[number, Array<[number, number]>]> =} callback
          **/
-        participants: GenericStorageQuery<Rv, (arg: AccountId32Like) => [number, Array<[number, number]>], AccountId32>;
+        participants: GenericStorageQuery<(arg: AccountId32Like) => [number, Array<[number, number]>], AccountId32>;
         /**
          * Total number of tickets sold.
          *
          * @param {Callback<number> =} callback
          **/
-        ticketsCount: GenericStorageQuery<Rv, () => number>;
+        ticketsCount: GenericStorageQuery<() => number>;
         /**
          * Each ticket's owner.
          *
@@ -2508,18 +2505,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<AccountId32 | undefined> =} callback
          **/
-        tickets: GenericStorageQuery<Rv, (arg: number) => AccountId32 | undefined, number>;
+        tickets: GenericStorageQuery<(arg: number) => AccountId32 | undefined, number>;
         /**
          * The calls stored in this pallet to be used in an active lottery if configured
          * by `Config::ValidateCall`.
          *
          * @param {Callback<Array<[number, number]>> =} callback
          **/
-        callIndices: GenericStorageQuery<Rv, () => Array<[number, number]>>;
+        callIndices: GenericStorageQuery<() => Array<[number, number]>>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Nis`'s storage queries
@@ -2534,31 +2531,31 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<[number, bigint]>> =} callback
          **/
-        queueTotals: GenericStorageQuery<Rv, () => Array<[number, bigint]>>;
+        queueTotals: GenericStorageQuery<() => Array<[number, bigint]>>;
         /**
          * The queues of bids. Indexed by duration (in `Period`s).
          *
          * @param {number} arg
          * @param {Callback<Array<PalletNisBid>> =} callback
          **/
-        queues: GenericStorageQuery<Rv, (arg: number) => Array<PalletNisBid>, number>;
+        queues: GenericStorageQuery<(arg: number) => Array<PalletNisBid>, number>;
         /**
          * Summary information over the general state.
          *
          * @param {Callback<PalletNisSummaryRecord> =} callback
          **/
-        summary: GenericStorageQuery<Rv, () => PalletNisSummaryRecord>;
+        summary: GenericStorageQuery<() => PalletNisSummaryRecord>;
         /**
          * The currently outstanding receipts, indexed according to the order of creation.
          *
          * @param {number} arg
          * @param {Callback<PalletNisReceiptRecord | undefined> =} callback
          **/
-        receipts: GenericStorageQuery<Rv, (arg: number) => PalletNisReceiptRecord | undefined, number>;
+        receipts: GenericStorageQuery<(arg: number) => PalletNisReceiptRecord | undefined, number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Uniques`'s storage queries
@@ -2570,14 +2567,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<PalletUniquesCollectionDetails | undefined> =} callback
          **/
-        class: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionDetails | undefined, number>;
+        class: GenericStorageQuery<(arg: number) => PalletUniquesCollectionDetails | undefined, number>;
         /**
          * The collection, if any, of which an account is willing to take ownership.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<number | undefined> =} callback
          **/
-        ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+        ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
         /**
          * The items held by any given account; set out this way so that items owned by a single
          * account can be enumerated.
@@ -2585,7 +2582,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[AccountId32Like, number, number]} arg
          * @param {Callback<[] | undefined> =} callback
          **/
-        account: GenericStorageQuery<Rv, (arg: [AccountId32Like, number, number]) => [] | undefined, [
+        account: GenericStorageQuery<(arg: [AccountId32Like, number, number]) => [] | undefined, [
             AccountId32,
             number,
             number
@@ -2597,28 +2594,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[AccountId32Like, number]} arg
          * @param {Callback<[] | undefined> =} callback
          **/
-        classAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
+        classAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
         /**
          * The items in existence and their ownership details.
          *
          * @param {[number, number]} arg
          * @param {Callback<PalletUniquesItemDetails | undefined> =} callback
          **/
-        asset: GenericStorageQuery<Rv, (arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
+        asset: GenericStorageQuery<(arg: [number, number]) => PalletUniquesItemDetails | undefined, [number, number]>;
         /**
          * Metadata of a collection.
          *
          * @param {number} arg
          * @param {Callback<PalletUniquesCollectionMetadata | undefined> =} callback
          **/
-        classMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
+        classMetadataOf: GenericStorageQuery<(arg: number) => PalletUniquesCollectionMetadata | undefined, number>;
         /**
          * Metadata of an item.
          *
          * @param {[number, number]} arg
          * @param {Callback<PalletUniquesItemMetadata | undefined> =} callback
          **/
-        instanceMetadataOf: GenericStorageQuery<Rv, (arg: [number, number]) => PalletUniquesItemMetadata | undefined, [
+        instanceMetadataOf: GenericStorageQuery<(arg: [number, number]) => PalletUniquesItemMetadata | undefined, [
             number,
             number
         ]>;
@@ -2628,7 +2625,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, number | undefined, BytesLike]} arg
          * @param {Callback<[Bytes, bigint] | undefined> =} callback
          **/
-        attribute: GenericStorageQuery<Rv, (arg: [number, number | undefined, BytesLike]) => [Bytes, bigint] | undefined, [
+        attribute: GenericStorageQuery<(arg: [number, number | undefined, BytesLike]) => [Bytes, bigint] | undefined, [
             number,
             number | undefined,
             Bytes
@@ -2639,7 +2636,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, number]} arg
          * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
          **/
-        itemPriceOf: GenericStorageQuery<Rv, (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined, [
+        itemPriceOf: GenericStorageQuery<(arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined, [
             number,
             number
         ]>;
@@ -2649,11 +2646,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<number | undefined> =} callback
          **/
-        collectionMaxSupply: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+        collectionMaxSupply: GenericStorageQuery<(arg: number) => number | undefined, number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Nfts`'s storage queries
@@ -2665,14 +2662,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<PalletNftsCollectionDetails | undefined> =} callback
          **/
-        collection: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionDetails | undefined, number>;
+        collection: GenericStorageQuery<(arg: number) => PalletNftsCollectionDetails | undefined, number>;
         /**
          * The collection, if any, of which an account is willing to take ownership.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<number | undefined> =} callback
          **/
-        ownershipAcceptance: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+        ownershipAcceptance: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
         /**
          * The items held by any given account; set out this way so that items owned by a single
          * account can be enumerated.
@@ -2680,7 +2677,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[AccountId32Like, number, number]} arg
          * @param {Callback<[] | undefined> =} callback
          **/
-        account: GenericStorageQuery<Rv, (arg: [AccountId32Like, number, number]) => [] | undefined, [
+        account: GenericStorageQuery<(arg: [AccountId32Like, number, number]) => [] | undefined, [
             AccountId32,
             number,
             number
@@ -2692,10 +2689,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[AccountId32Like, number]} arg
          * @param {Callback<[] | undefined> =} callback
          **/
-        collectionAccount: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => [] | undefined, [
-            AccountId32,
-            number
-        ]>;
+        collectionAccount: GenericStorageQuery<(arg: [AccountId32Like, number]) => [] | undefined, [AccountId32, number]>;
         /**
          * The items in existence and their ownership details.
          * Stores collection roles as per account.
@@ -2703,7 +2697,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<PalletNftsBitFlagsCollectionRole | undefined> =} callback
          **/
-        collectionRoleOf: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => PalletNftsBitFlagsCollectionRole | undefined, [
+        collectionRoleOf: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletNftsBitFlagsCollectionRole | undefined, [
             number,
             AccountId32
         ]>;
@@ -2713,21 +2707,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, number]} arg
          * @param {Callback<PalletNftsItemDetails | undefined> =} callback
          **/
-        item: GenericStorageQuery<Rv, (arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
+        item: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemDetails | undefined, [number, number]>;
         /**
          * Metadata of a collection.
          *
          * @param {number} arg
          * @param {Callback<PalletNftsCollectionMetadata | undefined> =} callback
          **/
-        collectionMetadataOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionMetadata | undefined, number>;
+        collectionMetadataOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionMetadata | undefined, number>;
         /**
          * Metadata of an item.
          *
          * @param {[number, number]} arg
          * @param {Callback<PalletNftsItemMetadata | undefined> =} callback
          **/
-        itemMetadataOf: GenericStorageQuery<Rv, (arg: [number, number]) => PalletNftsItemMetadata | undefined, [
+        itemMetadataOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemMetadata | undefined, [
             number,
             number
         ]>;
@@ -2737,7 +2731,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, number | undefined, PalletNftsAttributeNamespace, BytesLike]} arg
          * @param {Callback<[Bytes, PalletNftsAttributeDeposit] | undefined> =} callback
          **/
-        attribute: GenericStorageQuery<Rv, (arg: [number, number | undefined, PalletNftsAttributeNamespace, BytesLike]) => [Bytes, PalletNftsAttributeDeposit] | undefined, [
+        attribute: GenericStorageQuery<(arg: [number, number | undefined, PalletNftsAttributeNamespace, BytesLike]) => [Bytes, PalletNftsAttributeDeposit] | undefined, [
             number,
             number | undefined,
             PalletNftsAttributeNamespace,
@@ -2749,7 +2743,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, number]} arg
          * @param {Callback<[bigint, AccountId32 | undefined] | undefined> =} callback
          **/
-        itemPriceOf: GenericStorageQuery<Rv, (arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined, [
+        itemPriceOf: GenericStorageQuery<(arg: [number, number]) => [bigint, AccountId32 | undefined] | undefined, [
             number,
             number
         ]>;
@@ -2759,45 +2753,39 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, number]} arg
          * @param {Callback<Array<AccountId32>> =} callback
          **/
-        itemAttributesApprovalsOf: GenericStorageQuery<Rv, (arg: [number, number]) => Array<AccountId32>, [number, number]>;
+        itemAttributesApprovalsOf: GenericStorageQuery<(arg: [number, number]) => Array<AccountId32>, [number, number]>;
         /**
          * Stores the `CollectionId` that is going to be used for the next collection.
          * This gets incremented whenever a new collection is created.
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        nextCollectionId: GenericStorageQuery<Rv, () => number | undefined>;
+        nextCollectionId: GenericStorageQuery<() => number | undefined>;
         /**
          * Handles all the pending swaps.
          *
          * @param {[number, number]} arg
          * @param {Callback<PalletNftsPendingSwap | undefined> =} callback
          **/
-        pendingSwapOf: GenericStorageQuery<Rv, (arg: [number, number]) => PalletNftsPendingSwap | undefined, [
-            number,
-            number
-        ]>;
+        pendingSwapOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsPendingSwap | undefined, [number, number]>;
         /**
          * Config of a collection.
          *
          * @param {number} arg
          * @param {Callback<PalletNftsCollectionConfig | undefined> =} callback
          **/
-        collectionConfigOf: GenericStorageQuery<Rv, (arg: number) => PalletNftsCollectionConfig | undefined, number>;
+        collectionConfigOf: GenericStorageQuery<(arg: number) => PalletNftsCollectionConfig | undefined, number>;
         /**
          * Config of an item.
          *
          * @param {[number, number]} arg
          * @param {Callback<PalletNftsItemConfig | undefined> =} callback
          **/
-        itemConfigOf: GenericStorageQuery<Rv, (arg: [number, number]) => PalletNftsItemConfig | undefined, [
-            number,
-            number
-        ]>;
+        itemConfigOf: GenericStorageQuery<(arg: [number, number]) => PalletNftsItemConfig | undefined, [number, number]>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `NftFractionalization`'s storage queries
@@ -2809,14 +2797,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, number]} arg
          * @param {Callback<PalletNftFractionalizationDetails | undefined> =} callback
          **/
-        nftToAsset: GenericStorageQuery<Rv, (arg: [number, number]) => PalletNftFractionalizationDetails | undefined, [
+        nftToAsset: GenericStorageQuery<(arg: [number, number]) => PalletNftFractionalizationDetails | undefined, [
             number,
             number
         ]>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Salary`'s storage queries
@@ -2827,18 +2815,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletSalaryStatusType | undefined> =} callback
          **/
-        status: GenericStorageQuery<Rv, () => PalletSalaryStatusType | undefined>;
+        status: GenericStorageQuery<() => PalletSalaryStatusType | undefined>;
         /**
          * The status of a claimant.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<PalletSalaryClaimantStatus | undefined> =} callback
          **/
-        claimant: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletSalaryClaimantStatus | undefined, AccountId32>;
+        claimant: GenericStorageQuery<(arg: AccountId32Like) => PalletSalaryClaimantStatus | undefined, AccountId32>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `CoreFellowship`'s storage queries
@@ -2849,25 +2837,25 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletCoreFellowshipParamsType> =} callback
          **/
-        params: GenericStorageQuery<Rv, () => PalletCoreFellowshipParamsType>;
+        params: GenericStorageQuery<() => PalletCoreFellowshipParamsType>;
         /**
          * The status of a claimant.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<PalletCoreFellowshipMemberStatus | undefined> =} callback
          **/
-        member: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletCoreFellowshipMemberStatus | undefined, AccountId32>;
+        member: GenericStorageQuery<(arg: AccountId32Like) => PalletCoreFellowshipMemberStatus | undefined, AccountId32>;
         /**
          * Some evidence together with the desired outcome for which it was presented.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<[PalletCoreFellowshipWish, Bytes] | undefined> =} callback
          **/
-        memberEvidence: GenericStorageQuery<Rv, (arg: AccountId32Like) => [PalletCoreFellowshipWish, Bytes] | undefined, AccountId32>;
+        memberEvidence: GenericStorageQuery<(arg: AccountId32Like) => [PalletCoreFellowshipWish, Bytes] | undefined, AccountId32>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `TransactionStorage`'s storage queries
@@ -2879,48 +2867,48 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<Array<PalletTransactionStorageTransactionInfo> | undefined> =} callback
          **/
-        transactions: GenericStorageQuery<Rv, (arg: number) => Array<PalletTransactionStorageTransactionInfo> | undefined, number>;
+        transactions: GenericStorageQuery<(arg: number) => Array<PalletTransactionStorageTransactionInfo> | undefined, number>;
         /**
          * Count indexed chunks for each block.
          *
          * @param {number} arg
          * @param {Callback<number> =} callback
          **/
-        chunkCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+        chunkCount: GenericStorageQuery<(arg: number) => number, number>;
         /**
          * Storage fee per byte.
          *
          * @param {Callback<bigint | undefined> =} callback
          **/
-        byteFee: GenericStorageQuery<Rv, () => bigint | undefined>;
+        byteFee: GenericStorageQuery<() => bigint | undefined>;
         /**
          * Storage fee per transaction.
          *
          * @param {Callback<bigint | undefined> =} callback
          **/
-        entryFee: GenericStorageQuery<Rv, () => bigint | undefined>;
+        entryFee: GenericStorageQuery<() => bigint | undefined>;
         /**
          * Storage period for data in blocks. Should match `sp_storage_proof::DEFAULT_STORAGE_PERIOD`
          * for block authoring.
          *
          * @param {Callback<number> =} callback
          **/
-        storagePeriod: GenericStorageQuery<Rv, () => number>;
+        storagePeriod: GenericStorageQuery<() => number>;
         /**
          *
          * @param {Callback<Array<PalletTransactionStorageTransactionInfo>> =} callback
          **/
-        blockTransactions: GenericStorageQuery<Rv, () => Array<PalletTransactionStorageTransactionInfo>>;
+        blockTransactions: GenericStorageQuery<() => Array<PalletTransactionStorageTransactionInfo>>;
         /**
          * Was the proof checked in this block?
          *
          * @param {Callback<boolean> =} callback
          **/
-        proofChecked: GenericStorageQuery<Rv, () => boolean>;
+        proofChecked: GenericStorageQuery<() => boolean>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `VoterList`'s storage queries
@@ -2934,13 +2922,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<PalletBagsListListNode | undefined> =} callback
          **/
-        listNodes: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
+        listNodes: GenericStorageQuery<(arg: AccountId32Like) => PalletBagsListListNode | undefined, AccountId32>;
         /**
          * Counter for the related counted storage map
          *
          * @param {Callback<number> =} callback
          **/
-        counterForListNodes: GenericStorageQuery<Rv, () => number>;
+        counterForListNodes: GenericStorageQuery<() => number>;
         /**
          * A bag stored in storage.
          *
@@ -2949,11 +2937,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {bigint} arg
          * @param {Callback<PalletBagsListListBag | undefined> =} callback
          **/
-        listBags: GenericStorageQuery<Rv, (arg: bigint) => PalletBagsListListBag | undefined, bigint>;
+        listBags: GenericStorageQuery<(arg: bigint) => PalletBagsListListBag | undefined, bigint>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `StateTrieMigration`'s storage queries
@@ -2967,7 +2955,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletStateTrieMigrationMigrationTask> =} callback
          **/
-        migrationProcess: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationTask>;
+        migrationProcess: GenericStorageQuery<() => PalletStateTrieMigrationMigrationTask>;
         /**
          * The limits that are imposed on automatic migrations.
          *
@@ -2975,7 +2963,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
          **/
-        autoLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+        autoLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
         /**
          * The maximum limits that the signed migration could use.
          *
@@ -2983,11 +2971,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletStateTrieMigrationMigrationLimits | undefined> =} callback
          **/
-        signedMigrationMaxLimits: GenericStorageQuery<Rv, () => PalletStateTrieMigrationMigrationLimits | undefined>;
+        signedMigrationMaxLimits: GenericStorageQuery<() => PalletStateTrieMigrationMigrationLimits | undefined>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `ChildBounties`'s storage queries
@@ -2999,7 +2987,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        childBountyCount: GenericStorageQuery<Rv, () => number>;
+        childBountyCount: GenericStorageQuery<() => number>;
         /**
          * Number of active child bounties per parent bounty.
          * Map of parent bounty index to number of child bounties.
@@ -3007,21 +2995,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<number> =} callback
          **/
-        parentChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+        parentChildBounties: GenericStorageQuery<(arg: number) => number, number>;
         /**
          * Number of total child bounties per parent bounty, including completed bounties.
          *
          * @param {number} arg
          * @param {Callback<number> =} callback
          **/
-        parentTotalChildBounties: GenericStorageQuery<Rv, (arg: number) => number, number>;
+        parentTotalChildBounties: GenericStorageQuery<(arg: number) => number, number>;
         /**
          * Child bounties that have been added.
          *
          * @param {[number, number]} arg
          * @param {Callback<PalletChildBountiesChildBounty | undefined> =} callback
          **/
-        childBounties: GenericStorageQuery<Rv, (arg: [number, number]) => PalletChildBountiesChildBounty | undefined, [
+        childBounties: GenericStorageQuery<(arg: [number, number]) => PalletChildBountiesChildBounty | undefined, [
             number,
             number
         ]>;
@@ -3033,7 +3021,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, number]} arg
          * @param {Callback<Bytes | undefined> =} callback
          **/
-        childBountyDescriptionsV1: GenericStorageQuery<Rv, (arg: [number, number]) => Bytes | undefined, [number, number]>;
+        childBountyDescriptionsV1: GenericStorageQuery<(arg: [number, number]) => Bytes | undefined, [number, number]>;
         /**
          * The mapping of the child bounty ids from storage version `V0` to the new `V1` version.
          *
@@ -3044,18 +3032,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<[number, number] | undefined> =} callback
          **/
-        v0ToV1ChildBountyIds: GenericStorageQuery<Rv, (arg: number) => [number, number] | undefined, number>;
+        v0ToV1ChildBountyIds: GenericStorageQuery<(arg: number) => [number, number] | undefined, number>;
         /**
          * The cumulative child-bounty curator fee for each parent bounty.
          *
          * @param {number} arg
          * @param {Callback<bigint> =} callback
          **/
-        childrenCuratorFees: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
+        childrenCuratorFees: GenericStorageQuery<(arg: number) => bigint, number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Referenda`'s storage queries
@@ -3066,14 +3054,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        referendumCount: GenericStorageQuery<Rv, () => number>;
+        referendumCount: GenericStorageQuery<() => number>;
         /**
          * Information concerning any given referendum.
          *
          * @param {number} arg
          * @param {Callback<PalletReferendaReferendumInfo | undefined> =} callback
          **/
-        referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfo | undefined, number>;
+        referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfo | undefined, number>;
         /**
          * The sorted list of referenda ready to be decided but not yet being decided, ordered by
          * conviction-weighted approvals.
@@ -3083,14 +3071,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<Array<[number, bigint]>> =} callback
          **/
-        trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, bigint]>, number>;
+        trackQueue: GenericStorageQuery<(arg: number) => Array<[number, bigint]>, number>;
         /**
          * The number of referenda being decided currently.
          *
          * @param {number} arg
          * @param {Callback<number> =} callback
          **/
-        decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+        decidingCount: GenericStorageQuery<(arg: number) => number, number>;
         /**
          * The metadata is a general information concerning the referendum.
          * The `Hash` refers to the preimage of the `Preimages` provider which can be a JSON
@@ -3102,11 +3090,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<H256 | undefined> =} callback
          **/
-        metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+        metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `ConvictionVoting`'s storage queries
@@ -3119,7 +3107,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[AccountId32Like, number]} arg
          * @param {Callback<PalletConvictionVotingVoteVoting> =} callback
          **/
-        votingFor: GenericStorageQuery<Rv, (arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting, [
+        votingFor: GenericStorageQuery<(arg: [AccountId32Like, number]) => PalletConvictionVotingVoteVoting, [
             AccountId32,
             number
         ]>;
@@ -3131,11 +3119,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<Array<[number, bigint]>> =} callback
          **/
-        classLocksFor: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
+        classLocksFor: GenericStorageQuery<(arg: AccountId32Like) => Array<[number, bigint]>, AccountId32>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Whitelist`'s storage queries
@@ -3146,11 +3134,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {H256} arg
          * @param {Callback<[] | undefined> =} callback
          **/
-        whitelistedCall: GenericStorageQuery<Rv, (arg: H256) => [] | undefined, H256>;
+        whitelistedCall: GenericStorageQuery<(arg: H256) => [] | undefined, H256>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `AllianceMotion`'s storage queries
@@ -3161,14 +3149,14 @@ 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.
          *
          * @param {H256} arg
          * @param {Callback<KitchensinkRuntimeRuntimeCall | undefined> =} callback
          **/
-        proposalOf: GenericStorageQuery<Rv, (arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
+        proposalOf: GenericStorageQuery<(arg: H256) => KitchensinkRuntimeRuntimeCall | undefined, H256>;
         /**
          * Consideration cost created for publishing and storing a proposal.
          *
@@ -3178,36 +3166,36 @@ 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.
          *
          * @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 `Alliance`'s storage queries
@@ -3219,27 +3207,27 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletAllianceCid | undefined> =} callback
          **/
-        rule: GenericStorageQuery<Rv, () => PalletAllianceCid | undefined>;
+        rule: GenericStorageQuery<() => PalletAllianceCid | undefined>;
         /**
          * The current IPFS CIDs of any announcements.
          *
          * @param {Callback<Array<PalletAllianceCid>> =} callback
          **/
-        announcements: GenericStorageQuery<Rv, () => Array<PalletAllianceCid>>;
+        announcements: GenericStorageQuery<() => Array<PalletAllianceCid>>;
         /**
          * Maps members to their candidacy deposit.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<bigint | undefined> =} callback
          **/
-        depositOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+        depositOf: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
         /**
          * Maps member type to members of each type.
          *
          * @param {PalletAllianceMemberRole} arg
          * @param {Callback<Array<AccountId32>> =} callback
          **/
-        members: GenericStorageQuery<Rv, (arg: PalletAllianceMemberRole) => Array<AccountId32>, PalletAllianceMemberRole>;
+        members: GenericStorageQuery<(arg: PalletAllianceMemberRole) => Array<AccountId32>, PalletAllianceMemberRole>;
         /**
          * A set of members who gave a retirement notice. They can retire after the end of retirement
          * period stored as a future block number.
@@ -3247,24 +3235,24 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<number | undefined> =} callback
          **/
-        retiringMembers: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+        retiringMembers: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
         /**
          * The current list of accounts deemed unscrupulous. These accounts non grata cannot submit
          * candidacy.
          *
          * @param {Callback<Array<AccountId32>> =} callback
          **/
-        unscrupulousAccounts: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+        unscrupulousAccounts: GenericStorageQuery<() => Array<AccountId32>>;
         /**
          * The current list of websites deemed unscrupulous.
          *
          * @param {Callback<Array<Bytes>> =} callback
          **/
-        unscrupulousWebsites: GenericStorageQuery<Rv, () => Array<Bytes>>;
+        unscrupulousWebsites: GenericStorageQuery<() => Array<Bytes>>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `NominationPools`'s storage queries
@@ -3279,13 +3267,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<bigint> =} callback
          **/
-        totalValueLocked: GenericStorageQuery<Rv, () => bigint>;
+        totalValueLocked: GenericStorageQuery<() => bigint>;
         /**
          * Minimum amount to bond to join a pool.
          *
          * @param {Callback<bigint> =} callback
          **/
-        minJoinBond: GenericStorageQuery<Rv, () => bigint>;
+        minJoinBond: GenericStorageQuery<() => bigint>;
         /**
          * Minimum bond required to create a pool.
          *
@@ -3297,28 +3285,28 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<bigint> =} callback
          **/
-        minCreateBond: GenericStorageQuery<Rv, () => bigint>;
+        minCreateBond: GenericStorageQuery<() => bigint>;
         /**
          * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
          * pools can exist.
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        maxPools: GenericStorageQuery<Rv, () => number | undefined>;
+        maxPools: GenericStorageQuery<() => number | undefined>;
         /**
          * Maximum number of members that can exist in the system. If `None`, then the count
          * members are not bound on a system wide basis.
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
+        maxPoolMembers: GenericStorageQuery<() => number | undefined>;
         /**
          * Maximum number of members that may belong to pool. If `None`, then the count of
          * members is not bound on a per pool basis.
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
+        maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
         /**
          * The maximum commission that can be charged by a pool. Used on commission payouts to bound
          * pool commissions that are > `GlobalMaxCommission`, necessary if a future
@@ -3326,7 +3314,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Perbill | undefined> =} callback
          **/
-        globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
+        globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
         /**
          * Active members.
          *
@@ -3335,26 +3323,26 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
          **/
-        poolMembers: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined, AccountId32>;
+        poolMembers: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined, AccountId32>;
         /**
          * Counter for the related counted storage map
          *
          * @param {Callback<number> =} callback
          **/
-        counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
+        counterForPoolMembers: GenericStorageQuery<() => number>;
         /**
          * Storage for bonded pools.
          *
          * @param {number} arg
          * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
          **/
-        bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
+        bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
         /**
          * Counter for the related counted storage map
          *
          * @param {Callback<number> =} callback
          **/
-        counterForBondedPools: GenericStorageQuery<Rv, () => number>;
+        counterForBondedPools: GenericStorageQuery<() => number>;
         /**
          * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
          * claimed, the balance comes out of the reward pool. Keyed by the bonded pools account.
@@ -3362,13 +3350,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
          **/
-        rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
+        rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
         /**
          * Counter for the related counted storage map
          *
          * @param {Callback<number> =} callback
          **/
-        counterForRewardPools: GenericStorageQuery<Rv, () => number>;
+        counterForRewardPools: GenericStorageQuery<() => number>;
         /**
          * Groups of unbonding pools. Each group of unbonding pools belongs to a
          * bonded pool, hence the name sub-pools. Keyed by the bonded pools account.
@@ -3376,32 +3364,32 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
          **/
-        subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
+        subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined, number>;
         /**
          * Counter for the related counted storage map
          *
          * @param {Callback<number> =} callback
          **/
-        counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
+        counterForSubPoolsStorage: GenericStorageQuery<() => number>;
         /**
          * Metadata for the pool.
          *
          * @param {number} arg
          * @param {Callback<Bytes> =} callback
          **/
-        metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
+        metadata: GenericStorageQuery<(arg: number) => Bytes, number>;
         /**
          * Counter for the related counted storage map
          *
          * @param {Callback<number> =} callback
          **/
-        counterForMetadata: GenericStorageQuery<Rv, () => number>;
+        counterForMetadata: GenericStorageQuery<() => number>;
         /**
          * Ever increasing number of all pools created so far.
          *
          * @param {Callback<number> =} callback
          **/
-        lastPoolId: GenericStorageQuery<Rv, () => number>;
+        lastPoolId: GenericStorageQuery<() => number>;
         /**
          * A reverse lookup from the pool's account id to its id.
          *
@@ -3411,24 +3399,24 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<number | undefined> =} callback
          **/
-        reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
+        reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined, AccountId32>;
         /**
          * Counter for the related counted storage map
          *
          * @param {Callback<number> =} callback
          **/
-        counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
+        counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
         /**
          * Map from a pool member account to their opted claim permission.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
          **/
-        claimPermissions: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
+        claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission, AccountId32>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `RankedPolls`'s storage queries
@@ -3439,14 +3427,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        referendumCount: GenericStorageQuery<Rv, () => number>;
+        referendumCount: GenericStorageQuery<() => number>;
         /**
          * Information concerning any given referendum.
          *
          * @param {number} arg
          * @param {Callback<PalletReferendaReferendumInfoTally | undefined> =} callback
          **/
-        referendumInfoFor: GenericStorageQuery<Rv, (arg: number) => PalletReferendaReferendumInfoTally | undefined, number>;
+        referendumInfoFor: GenericStorageQuery<(arg: number) => PalletReferendaReferendumInfoTally | undefined, number>;
         /**
          * The sorted list of referenda ready to be decided but not yet being decided, ordered by
          * conviction-weighted approvals.
@@ -3456,14 +3444,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<Array<[number, number]>> =} callback
          **/
-        trackQueue: GenericStorageQuery<Rv, (arg: number) => Array<[number, number]>, number>;
+        trackQueue: GenericStorageQuery<(arg: number) => Array<[number, number]>, number>;
         /**
          * The number of referenda being decided currently.
          *
          * @param {number} arg
          * @param {Callback<number> =} callback
          **/
-        decidingCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+        decidingCount: GenericStorageQuery<(arg: number) => number, number>;
         /**
          * The metadata is a general information concerning the referendum.
          * The `Hash` refers to the preimage of the `Preimages` provider which can be a JSON
@@ -3475,11 +3463,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<H256 | undefined> =} callback
          **/
-        metadataOf: GenericStorageQuery<Rv, (arg: number) => H256 | undefined, number>;
+        metadataOf: GenericStorageQuery<(arg: number) => H256 | undefined, number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `RankedCollective`'s storage queries
@@ -3492,21 +3480,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<number> =} callback
          **/
-        memberCount: GenericStorageQuery<Rv, (arg: number) => number, number>;
+        memberCount: GenericStorageQuery<(arg: number) => number, number>;
         /**
          * The current members of the collective.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<PalletRankedCollectiveMemberRecord | undefined> =} callback
          **/
-        members: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletRankedCollectiveMemberRecord | undefined, AccountId32>;
+        members: GenericStorageQuery<(arg: AccountId32Like) => PalletRankedCollectiveMemberRecord | undefined, AccountId32>;
         /**
          * The index of each ranks's member into the group of members who have at least that rank.
          *
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<number | undefined> =} callback
          **/
-        idToIndex: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => number | undefined, [number, AccountId32]>;
+        idToIndex: GenericStorageQuery<(arg: [number, AccountId32Like]) => number | undefined, [number, AccountId32]>;
         /**
          * The members in the collective by index. All indices in the range `0..MemberCount` will
          * return `Some`, however a member's index is not guaranteed to remain unchanged over time.
@@ -3514,14 +3502,14 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, number]} arg
          * @param {Callback<AccountId32 | undefined> =} callback
          **/
-        indexToId: GenericStorageQuery<Rv, (arg: [number, number]) => AccountId32 | undefined, [number, number]>;
+        indexToId: GenericStorageQuery<(arg: [number, number]) => AccountId32 | undefined, [number, number]>;
         /**
          * Votes on a given proposal, if it is ongoing.
          *
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<PalletRankedCollectiveVoteRecord | undefined> =} callback
          **/
-        voting: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => PalletRankedCollectiveVoteRecord | undefined, [
+        voting: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletRankedCollectiveVoteRecord | undefined, [
             number,
             AccountId32
         ]>;
@@ -3530,11 +3518,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<Bytes | undefined> =} callback
          **/
-        votingCleanup: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
+        votingCleanup: GenericStorageQuery<(arg: number) => Bytes | undefined, number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `AssetConversion`'s storage queries
@@ -3547,7 +3535,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[FrameSupportTokensFungibleUnionOfNativeOrWithId, FrameSupportTokensFungibleUnionOfNativeOrWithId]} arg
          * @param {Callback<PalletAssetConversionPoolInfo | undefined> =} callback
          **/
-        pools: GenericStorageQuery<Rv, (arg: [FrameSupportTokensFungibleUnionOfNativeOrWithId, FrameSupportTokensFungibleUnionOfNativeOrWithId]) => PalletAssetConversionPoolInfo | undefined, [
+        pools: GenericStorageQuery<(arg: [FrameSupportTokensFungibleUnionOfNativeOrWithId, FrameSupportTokensFungibleUnionOfNativeOrWithId]) => PalletAssetConversionPoolInfo | undefined, [
             FrameSupportTokensFungibleUnionOfNativeOrWithId,
             FrameSupportTokensFungibleUnionOfNativeOrWithId
         ]>;
@@ -3557,11 +3545,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        nextPoolAssetId: GenericStorageQuery<Rv, () => number | undefined>;
+        nextPoolAssetId: GenericStorageQuery<() => number | undefined>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `FastUnstake`'s storage queries
@@ -3574,7 +3562,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletFastUnstakeUnstakeRequest | undefined> =} callback
          **/
-        head: GenericStorageQuery<Rv, () => PalletFastUnstakeUnstakeRequest | undefined>;
+        head: GenericStorageQuery<() => PalletFastUnstakeUnstakeRequest | undefined>;
         /**
          * The map of all accounts wishing to be unstaked.
          *
@@ -3583,13 +3571,13 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<bigint | undefined> =} callback
          **/
-        queue: GenericStorageQuery<Rv, (arg: AccountId32Like) => bigint | undefined, AccountId32>;
+        queue: GenericStorageQuery<(arg: AccountId32Like) => bigint | undefined, AccountId32>;
         /**
          * Counter for the related counted storage map
          *
          * @param {Callback<number> =} callback
          **/
-        counterForQueue: GenericStorageQuery<Rv, () => number>;
+        counterForQueue: GenericStorageQuery<() => number>;
         /**
          * Number of eras to check per block.
          *
@@ -3602,11 +3590,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        erasToCheckPerBlock: GenericStorageQuery<Rv, () => number>;
+        erasToCheckPerBlock: GenericStorageQuery<() => number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `MessageQueue`'s storage queries
@@ -3618,24 +3606,24 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<PalletMessageQueueBookState> =} callback
          **/
-        bookStateFor: GenericStorageQuery<Rv, (arg: number) => PalletMessageQueueBookState, number>;
+        bookStateFor: GenericStorageQuery<(arg: number) => PalletMessageQueueBookState, number>;
         /**
          * The origin at which we should begin servicing.
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        serviceHead: GenericStorageQuery<Rv, () => number | undefined>;
+        serviceHead: GenericStorageQuery<() => number | undefined>;
         /**
          * The map of page indices to pages.
          *
          * @param {[number, number]} arg
          * @param {Callback<PalletMessageQueuePage | undefined> =} callback
          **/
-        pages: GenericStorageQuery<Rv, (arg: [number, number]) => PalletMessageQueuePage | undefined, [number, number]>;
+        pages: GenericStorageQuery<(arg: [number, number]) => PalletMessageQueuePage | undefined, [number, number]>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Pov`'s storage queries
@@ -3645,77 +3633,77 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        value: GenericStorageQuery<Rv, () => number | undefined>;
+        value: GenericStorageQuery<() => number | undefined>;
         /**
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        value2: GenericStorageQuery<Rv, () => number | undefined>;
+        value2: GenericStorageQuery<() => number | undefined>;
         /**
          * A value without a MEL bound.
          *
          * @param {Callback<Bytes | undefined> =} callback
          **/
-        unboundedValue: GenericStorageQuery<Rv, () => Bytes | undefined>;
+        unboundedValue: GenericStorageQuery<() => Bytes | undefined>;
         /**
          * A value with a MEL bound of 32 byte.
          *
          * @param {Callback<Bytes | undefined> =} callback
          **/
-        boundedValue: GenericStorageQuery<Rv, () => Bytes | undefined>;
+        boundedValue: GenericStorageQuery<() => Bytes | undefined>;
         /**
          * 4MiB value.
          *
          * @param {Callback<Bytes | undefined> =} callback
          **/
-        largeValue: GenericStorageQuery<Rv, () => Bytes | undefined>;
+        largeValue: GenericStorageQuery<() => Bytes | undefined>;
         /**
          *
          * @param {Callback<Bytes | undefined> =} callback
          **/
-        largeValue2: GenericStorageQuery<Rv, () => Bytes | undefined>;
+        largeValue2: GenericStorageQuery<() => Bytes | undefined>;
         /**
          * A map with a maximum of 1M entries.
          *
          * @param {number} arg
          * @param {Callback<number | undefined> =} callback
          **/
-        map1M: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+        map1M: GenericStorageQuery<(arg: number) => number | undefined, number>;
         /**
          * A map with a maximum of 16M entries.
          *
          * @param {number} arg
          * @param {Callback<number | undefined> =} callback
          **/
-        map16M: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+        map16M: GenericStorageQuery<(arg: number) => number | undefined, number>;
         /**
          *
          * @param {[number, number]} arg
          * @param {Callback<number | undefined> =} callback
          **/
-        doubleMap1M: GenericStorageQuery<Rv, (arg: [number, number]) => number | undefined, [number, number]>;
+        doubleMap1M: GenericStorageQuery<(arg: [number, number]) => number | undefined, [number, number]>;
         /**
          *
          * @param {number} arg
          * @param {Callback<Array<number> | undefined> =} callback
          **/
-        unboundedMap: GenericStorageQuery<Rv, (arg: number) => Array<number> | undefined, number>;
+        unboundedMap: GenericStorageQuery<(arg: number) => Array<number> | undefined, number>;
         /**
          *
          * @param {number} arg
          * @param {Callback<Array<number> | undefined> =} callback
          **/
-        unboundedMap2: GenericStorageQuery<Rv, (arg: number) => Array<number> | undefined, number>;
+        unboundedMap2: GenericStorageQuery<(arg: number) => Array<number> | undefined, number>;
         /**
          *
          * @param {number} arg
          * @param {Callback<Array<number> | undefined> =} callback
          **/
-        unboundedMapTwox: GenericStorageQuery<Rv, (arg: number) => Array<number> | undefined, number>;
+        unboundedMapTwox: GenericStorageQuery<(arg: number) => Array<number> | undefined, number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `TxPause`'s storage queries
@@ -3727,11 +3715,11 @@ 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 `SafeMode`'s storage queries
@@ -3746,7 +3734,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.
          *
@@ -3756,11 +3744,11 @@ 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 `MultiBlockMigrations`'s storage queries
@@ -3773,7 +3761,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.
          *
@@ -3783,11 +3771,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;
     };
     /**
      * Pallet `Broker`'s storage queries
@@ -3798,31 +3786,31 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<PalletBrokerConfigRecord | undefined> =} callback
          **/
-        configuration: GenericStorageQuery<Rv, () => PalletBrokerConfigRecord | undefined>;
+        configuration: GenericStorageQuery<() => PalletBrokerConfigRecord | undefined>;
         /**
          * The Polkadot Core reservations (generally tasked with the maintenance of System Chains).
          *
          * @param {Callback<Array<Array<PalletBrokerScheduleItem>>> =} callback
          **/
-        reservations: GenericStorageQuery<Rv, () => Array<Array<PalletBrokerScheduleItem>>>;
+        reservations: GenericStorageQuery<() => Array<Array<PalletBrokerScheduleItem>>>;
         /**
          * The Polkadot Core legacy leases.
          *
          * @param {Callback<Array<PalletBrokerLeaseRecordItem>> =} callback
          **/
-        leases: GenericStorageQuery<Rv, () => Array<PalletBrokerLeaseRecordItem>>;
+        leases: GenericStorageQuery<() => Array<PalletBrokerLeaseRecordItem>>;
         /**
          * The current status of miscellaneous subsystems of this pallet.
          *
          * @param {Callback<PalletBrokerStatusRecord | undefined> =} callback
          **/
-        status: GenericStorageQuery<Rv, () => PalletBrokerStatusRecord | undefined>;
+        status: GenericStorageQuery<() => PalletBrokerStatusRecord | undefined>;
         /**
          * The details of the current sale, including its properties and status.
          *
          * @param {Callback<PalletBrokerSaleInfoRecord | undefined> =} callback
          **/
-        saleInfo: GenericStorageQuery<Rv, () => PalletBrokerSaleInfoRecord | undefined>;
+        saleInfo: GenericStorageQuery<() => PalletBrokerSaleInfoRecord | undefined>;
         /**
          * Records of potential renewals.
          *
@@ -3831,21 +3819,21 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {PalletBrokerPotentialRenewalId} arg
          * @param {Callback<PalletBrokerPotentialRenewalRecord | undefined> =} callback
          **/
-        potentialRenewals: GenericStorageQuery<Rv, (arg: PalletBrokerPotentialRenewalId) => PalletBrokerPotentialRenewalRecord | undefined, PalletBrokerPotentialRenewalId>;
+        potentialRenewals: GenericStorageQuery<(arg: PalletBrokerPotentialRenewalId) => PalletBrokerPotentialRenewalRecord | undefined, PalletBrokerPotentialRenewalId>;
         /**
          * The current (unassigned or provisionally assigend) Regions.
          *
          * @param {PalletBrokerRegionId} arg
          * @param {Callback<PalletBrokerRegionRecord | undefined> =} callback
          **/
-        regions: GenericStorageQuery<Rv, (arg: PalletBrokerRegionId) => PalletBrokerRegionRecord | undefined, PalletBrokerRegionId>;
+        regions: GenericStorageQuery<(arg: PalletBrokerRegionId) => PalletBrokerRegionRecord | undefined, PalletBrokerRegionId>;
         /**
          * The work we plan on having each core do at a particular time in the future.
          *
          * @param {[number, number]} arg
          * @param {Callback<Array<PalletBrokerScheduleItem> | undefined> =} callback
          **/
-        workplan: GenericStorageQuery<Rv, (arg: [number, number]) => Array<PalletBrokerScheduleItem> | undefined, [
+        workplan: GenericStorageQuery<(arg: [number, number]) => Array<PalletBrokerScheduleItem> | undefined, [
             number,
             number
         ]>;
@@ -3855,34 +3843,34 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<Array<PalletBrokerScheduleItem>> =} callback
          **/
-        workload: GenericStorageQuery<Rv, (arg: number) => Array<PalletBrokerScheduleItem>, number>;
+        workload: GenericStorageQuery<(arg: number) => Array<PalletBrokerScheduleItem>, number>;
         /**
          * Record of a single contribution to the Instantaneous Coretime Pool.
          *
          * @param {PalletBrokerRegionId} arg
          * @param {Callback<PalletBrokerContributionRecord | undefined> =} callback
          **/
-        instaPoolContribution: GenericStorageQuery<Rv, (arg: PalletBrokerRegionId) => PalletBrokerContributionRecord | undefined, PalletBrokerRegionId>;
+        instaPoolContribution: GenericStorageQuery<(arg: PalletBrokerRegionId) => PalletBrokerContributionRecord | undefined, PalletBrokerRegionId>;
         /**
          * Record of Coretime entering or leaving the Instantaneous Coretime Pool.
          *
          * @param {number} arg
          * @param {Callback<PalletBrokerPoolIoRecord> =} callback
          **/
-        instaPoolIo: GenericStorageQuery<Rv, (arg: number) => PalletBrokerPoolIoRecord, number>;
+        instaPoolIo: GenericStorageQuery<(arg: number) => PalletBrokerPoolIoRecord, number>;
         /**
          * Total InstaPool rewards for each Timeslice and the number of core parts which contributed.
          *
          * @param {number} arg
          * @param {Callback<PalletBrokerInstaPoolHistoryRecord | undefined> =} callback
          **/
-        instaPoolHistory: GenericStorageQuery<Rv, (arg: number) => PalletBrokerInstaPoolHistoryRecord | undefined, number>;
+        instaPoolHistory: GenericStorageQuery<(arg: number) => PalletBrokerInstaPoolHistoryRecord | undefined, number>;
         /**
          * Received core count change from the relay chain.
          *
          * @param {Callback<number | undefined> =} callback
          **/
-        coreCountInbox: GenericStorageQuery<Rv, () => number | undefined>;
+        coreCountInbox: GenericStorageQuery<() => number | undefined>;
         /**
          * Keeping track of cores which have auto-renewal enabled.
          *
@@ -3890,17 +3878,17 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<Array<PalletBrokerAutoRenewalRecord>> =} callback
          **/
-        autoRenewals: GenericStorageQuery<Rv, () => Array<PalletBrokerAutoRenewalRecord>>;
+        autoRenewals: GenericStorageQuery<() => Array<PalletBrokerAutoRenewalRecord>>;
         /**
          * Received revenue info from the relay chain.
          *
          * @param {Callback<PalletBrokerOnDemandRevenueRecord | undefined> =} callback
          **/
-        revenueInbox: GenericStorageQuery<Rv, () => PalletBrokerOnDemandRevenueRecord | undefined>;
+        revenueInbox: GenericStorageQuery<() => PalletBrokerOnDemandRevenueRecord | undefined>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `TasksExample`'s storage queries
@@ -3911,18 +3899,18 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<[number, number]> =} callback
          **/
-        total: GenericStorageQuery<Rv, () => [number, number]>;
+        total: GenericStorageQuery<() => [number, number]>;
         /**
          * Numbers to be added into the total.
          *
          * @param {number} arg
          * @param {Callback<number | undefined> =} callback
          **/
-        numbers: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
+        numbers: GenericStorageQuery<(arg: number) => number | undefined, number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Mixnet`'s storage queries
@@ -3934,20 +3922,20 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        currentSessionIndex: GenericStorageQuery<Rv, () => number>;
+        currentSessionIndex: GenericStorageQuery<() => number>;
         /**
          * Block in which the current session started.
          *
          * @param {Callback<number> =} callback
          **/
-        currentSessionStartBlock: GenericStorageQuery<Rv, () => number>;
+        currentSessionStartBlock: GenericStorageQuery<() => number>;
         /**
          * Authority list for the next session.
          *
          * @param {number} arg
          * @param {Callback<SpMixnetAppPublic | undefined> =} callback
          **/
-        nextAuthorityIds: GenericStorageQuery<Rv, (arg: number) => SpMixnetAppPublic | undefined, number>;
+        nextAuthorityIds: GenericStorageQuery<(arg: number) => SpMixnetAppPublic | undefined, number>;
         /**
          * Mixnode sets by session index. Only the mixnode sets for the previous, current, and next
          * sessions are kept; older sets are discarded.
@@ -3959,14 +3947,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, number]} arg
          * @param {Callback<PalletMixnetBoundedMixnode | undefined> =} callback
          **/
-        mixnodes: GenericStorageQuery<Rv, (arg: [number, number]) => PalletMixnetBoundedMixnode | undefined, [
-            number,
-            number
-        ]>;
+        mixnodes: GenericStorageQuery<(arg: [number, number]) => PalletMixnetBoundedMixnode | undefined, [number, number]>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Parameters`'s storage queries
@@ -3978,11 +3963,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {KitchensinkRuntimeRuntimeParametersKey} arg
          * @param {Callback<KitchensinkRuntimeRuntimeParametersValue | undefined> =} callback
          **/
-        parameters: GenericStorageQuery<Rv, (arg: KitchensinkRuntimeRuntimeParametersKey) => KitchensinkRuntimeRuntimeParametersValue | undefined, KitchensinkRuntimeRuntimeParametersKey>;
+        parameters: GenericStorageQuery<(arg: KitchensinkRuntimeRuntimeParametersKey) => KitchensinkRuntimeRuntimeParametersValue | undefined, KitchensinkRuntimeRuntimeParametersKey>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `PalletExampleMbms`'s storage queries
@@ -3994,11 +3979,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<bigint | undefined> =} callback
          **/
-        myMap: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
+        myMap: GenericStorageQuery<(arg: number) => bigint | undefined, number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `Revive`'s storage queries
@@ -4010,28 +3995,28 @@ 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.
          *
          * @param {H256} arg
          * @param {Callback<PalletReviveWasmCodeInfo | undefined> =} callback
          **/
-        codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletReviveWasmCodeInfo | undefined, H256>;
+        codeInfoOf: GenericStorageQuery<(arg: H256) => PalletReviveWasmCodeInfo | undefined, H256>;
         /**
          * The code associated with a given account.
          *
          * @param {H160} arg
          * @param {Callback<PalletReviveStorageContractInfo | undefined> =} callback
          **/
-        contractInfoOf: GenericStorageQuery<Rv, (arg: H160) => PalletReviveStorageContractInfo | undefined, H160>;
+        contractInfoOf: GenericStorageQuery<(arg: H160) => PalletReviveStorageContractInfo | undefined, H160>;
         /**
          * The immutable data associated with a given account.
          *
          * @param {H160} arg
          * @param {Callback<Bytes | undefined> =} callback
          **/
-        immutableDataOf: GenericStorageQuery<Rv, (arg: H160) => Bytes | undefined, H160>;
+        immutableDataOf: GenericStorageQuery<(arg: H160) => Bytes | undefined, H160>;
         /**
          * Evicted contracts that await child trie deletion.
          *
@@ -4041,14 +4026,14 @@ 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
          * and the latest deleted contract in queue.
          *
          * @param {Callback<PalletReviveStorageDeletionQueueManager> =} callback
          **/
-        deletionQueueCounter: GenericStorageQuery<Rv, () => PalletReviveStorageDeletionQueueManager>;
+        deletionQueueCounter: GenericStorageQuery<() => PalletReviveStorageDeletionQueueManager>;
         /**
          * Map a Ethereum address to its original `AccountId32`.
          *
@@ -4060,11 +4045,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {H160} arg
          * @param {Callback<AccountId32 | undefined> =} callback
          **/
-        originalAccount: GenericStorageQuery<Rv, (arg: H160) => AccountId32 | undefined, H160>;
+        originalAccount: GenericStorageQuery<(arg: H160) => AccountId32 | undefined, H160>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `DelegatedStaking`'s storage queries
@@ -4079,30 +4064,30 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {AccountId32Like} arg
          * @param {Callback<PalletDelegatedStakingDelegation | undefined> =} callback
          **/
-        delegators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined, AccountId32>;
+        delegators: GenericStorageQuery<(arg: AccountId32Like) => PalletDelegatedStakingDelegation | undefined, AccountId32>;
         /**
          * Counter for the related counted storage map
          *
          * @param {Callback<number> =} callback
          **/
-        counterForDelegators: GenericStorageQuery<Rv, () => number>;
+        counterForDelegators: GenericStorageQuery<() => number>;
         /**
          * Map of `Agent` to their `Ledger`.
          *
          * @param {AccountId32Like} arg
          * @param {Callback<PalletDelegatedStakingAgentLedger | undefined> =} callback
          **/
-        agents: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined, AccountId32>;
+        agents: GenericStorageQuery<(arg: AccountId32Like) => PalletDelegatedStakingAgentLedger | undefined, AccountId32>;
         /**
          * Counter for the related counted storage map
          *
          * @param {Callback<number> =} callback
          **/
-        counterForAgents: GenericStorageQuery<Rv, () => number>;
+        counterForAgents: GenericStorageQuery<() => number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `AssetRewards`'s storage queries
@@ -4114,7 +4099,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<PalletAssetRewardsPoolStakerInfo | undefined> =} callback
          **/
-        poolStakers: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => PalletAssetRewardsPoolStakerInfo | undefined, [
+        poolStakers: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletAssetRewardsPoolStakerInfo | undefined, [
             number,
             AccountId32
         ]>;
@@ -4124,7 +4109,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<PalletAssetRewardsPoolInfo | undefined> =} callback
          **/
-        pools: GenericStorageQuery<Rv, (arg: number) => PalletAssetRewardsPoolInfo | undefined, number>;
+        pools: GenericStorageQuery<(arg: number) => PalletAssetRewardsPoolInfo | undefined, number>;
         /**
          * The cost associated with storing pool information on-chain which was incurred by the pool
          * creator.
@@ -4134,7 +4119,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {number} arg
          * @param {Callback<[AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined> =} callback
          **/
-        poolCost: GenericStorageQuery<Rv, (arg: number) => [AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined, number>;
+        poolCost: GenericStorageQuery<(arg: number) => [AccountId32, FrameSupportTokensFungibleHoldConsideration] | undefined, number>;
         /**
          * Stores the [`PoolId`] to use for the next pool.
          *
@@ -4142,11 +4127,11 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          *
          * @param {Callback<number> =} callback
          **/
-        nextPoolId: GenericStorageQuery<Rv, () => number>;
+        nextPoolId: GenericStorageQuery<() => number>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
     /**
      * Pallet `AssetsFreezer`'s storage queries
@@ -4158,7 +4143,7 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>> =} callback
          **/
-        freezes: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>, [
+        freezes: GenericStorageQuery<(arg: [number, AccountId32Like]) => Array<FrameSupportTokensMiscIdAmountRuntimeFreezeReason>, [
             number,
             AccountId32
         ]>;
@@ -4168,13 +4153,10 @@ export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage
          * @param {[number, AccountId32Like]} arg
          * @param {Callback<bigint | undefined> =} callback
          **/
-        frozenBalances: GenericStorageQuery<Rv, (arg: [number, AccountId32Like]) => bigint | undefined, [
-            number,
-            AccountId32
-        ]>;
+        frozenBalances: GenericStorageQuery<(arg: [number, AccountId32Like]) => bigint | undefined, [number, AccountId32]>;
         /**
          * Generic pallet storage query
          **/
-        [storage: string]: GenericStorageQuery<Rv>;
+        [storage: string]: GenericStorageQuery;
     };
 }