@dedot/chaintypes 0.0.1-next.f5bf4fc2.1 → 0.1.0

package/aleph/query.d.ts

@@ -1,7 +1,8 @@
-// Generated by @dedot/codegen
+// Generated by dedot cli
 
-import type { GenericChainStorage, GenericStorageQuery, Callback } from '@dedot/types';
+import type { GenericChainStorage, GenericStorageQuery, Callback, RpcVersion } from 'dedot/types';
 import type {
+  AccountId32,
   AccountId32Like,
   H256,
   Bytes,
@@ -9,13 +10,12 @@ import type {
   Phase,
   FixedBytes,
   FixedU128,
-  AccountId32,
   Perbill,
   Percent,
   BytesLike,
   Data,
   Perquintill,
-} from '@dedot/codecs';
+} from 'dedot/codecs';
 import type {
   FrameSystemAccountInfo,
   FrameSupportDispatchPerDispatchClass,
@@ -66,9 +66,11 @@ import type {
   PrimitivesBanConfig,
   PrimitivesBanInfo,
   PalletCommitteeManagementCurrentAndNextSessionValidators,
+  PalletProxyProxyDefinition,
+  PalletProxyAnnouncement,
 } from './types';
 
-export interface ChainStorage extends GenericChainStorage {
+export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -79,28 +81,28 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<FrameSystemAccountInfo> =} callback
      **/
-    account: GenericStorageQuery<(arg: AccountId32Like) => FrameSystemAccountInfo>;
+    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => FrameSystemAccountInfo, AccountId32>;
 
     /**
      * Total extrinsics count for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    extrinsicCount: GenericStorageQuery<() => number | undefined>;
+    extrinsicCount: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The current weight for the block.
      *
      * @param {Callback<FrameSupportDispatchPerDispatchClass> =} callback
      **/
-    blockWeight: GenericStorageQuery<() => FrameSupportDispatchPerDispatchClass>;
+    blockWeight: GenericStorageQuery<Rv, () => FrameSupportDispatchPerDispatchClass>;
 
     /**
      * Total length (in bytes) for all extrinsics put together, for the current block.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    allExtrinsicsLen: GenericStorageQuery<() => number | undefined>;
+    allExtrinsicsLen: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * Map of block numbers to block hashes.
@@ -108,7 +110,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<(arg: number) => H256>;
+    blockHash: GenericStorageQuery<Rv, (arg: number) => H256, number>;
 
     /**
      * Extrinsics data for the current block (maps an extrinsic's index to its data).
@@ -116,28 +118,28 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    extrinsicData: GenericStorageQuery<(arg: number) => Bytes>;
+    extrinsicData: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
 
     /**
      * The current block number being processed. Set by `execute_block`.
      *
      * @param {Callback<number> =} callback
      **/
-    number: GenericStorageQuery<() => number>;
+    number: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Hash of the previous block.
      *
      * @param {Callback<H256> =} callback
      **/
-    parentHash: GenericStorageQuery<() => H256>;
+    parentHash: GenericStorageQuery<Rv, () => H256>;
 
     /**
      * Digest of the current block, also part of the block header.
      *
      * @param {Callback<Digest> =} callback
      **/
-    digest: GenericStorageQuery<() => Digest>;
+    digest: GenericStorageQuery<Rv, () => Digest>;
 
     /**
      * Events deposited for the current block.
@@ -150,14 +152,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<FrameSystemEventRecord>> =} callback
      **/
-    events: GenericStorageQuery<() => Array<FrameSystemEventRecord>>;
+    events: GenericStorageQuery<Rv, () => Array<FrameSystemEventRecord>>;
 
     /**
      * The number of events in the `Events<T>` list.
      *
      * @param {Callback<number> =} callback
      **/
-    eventCount: GenericStorageQuery<() => number>;
+    eventCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Mapping between a topic (represented by T::Hash) and a vector of indexes
@@ -174,21 +176,21 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    eventTopics: GenericStorageQuery<(arg: H256) => Array<[number, number]>>;
+    eventTopics: GenericStorageQuery<Rv, (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<() => FrameSystemLastRuntimeUpgradeInfo | undefined>;
+    lastRuntimeUpgrade: GenericStorageQuery<Rv, () => FrameSystemLastRuntimeUpgradeInfo | undefined>;
 
     /**
      * True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToU32RefCount: GenericStorageQuery<() => boolean>;
+    upgradedToU32RefCount: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
@@ -196,19 +198,19 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<boolean> =} callback
      **/
-    upgradedToTripleRefCount: GenericStorageQuery<() => boolean>;
+    upgradedToTripleRefCount: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * The execution phase of the block.
      *
      * @param {Callback<Phase | undefined> =} callback
      **/
-    executionPhase: GenericStorageQuery<() => Phase | undefined>;
+    executionPhase: GenericStorageQuery<Rv, () => Phase | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `RandomnessCollectiveFlip`'s storage queries
@@ -221,12 +223,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<H256>> =} callback
      **/
-    randomMaterial: GenericStorageQuery<() => Array<H256>>;
+    randomMaterial: GenericStorageQuery<Rv, () => Array<H256>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Scheduler`'s storage queries
@@ -236,7 +238,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    incompleteSince: GenericStorageQuery<() => number | undefined>;
+    incompleteSince: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * Items to be executed, indexed by the block number that they should be executed on.
@@ -244,7 +246,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Array<PalletSchedulerScheduled | undefined>> =} callback
      **/
-    agenda: GenericStorageQuery<(arg: number) => Array<PalletSchedulerScheduled | undefined>>;
+    agenda: GenericStorageQuery<Rv, (arg: number) => Array<PalletSchedulerScheduled | undefined>, number>;
 
     /**
      * Lookup from a name to the block number and index of the task.
@@ -255,12 +257,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {FixedBytes<32>} arg
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    lookup: GenericStorageQuery<(arg: FixedBytes<32>) => [number, number] | undefined>;
+    lookup: GenericStorageQuery<Rv, (arg: FixedBytes<32>) => [number, number] | undefined, FixedBytes<32>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Aura`'s storage queries
@@ -271,7 +273,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
 
     /**
      * The current slot of this block.
@@ -280,35 +282,38 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<SpConsensusSlotsSlot> =} callback
      **/
-    currentSlot: GenericStorageQuery<() => SpConsensusSlotsSlot>;
+    currentSlot: GenericStorageQuery<Rv, () => SpConsensusSlotsSlot>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Timestamp`'s storage queries
    **/
   timestamp: {
     /**
-     * Current time for the current block.
+     * The current time for the current block.
      *
      * @param {Callback<bigint> =} callback
      **/
-    now: GenericStorageQuery<() => bigint>;
+    now: GenericStorageQuery<Rv, () => bigint>;
 
     /**
-     * Did the timestamp get updated in this block?
+     * Whether the timestamp has been updated in this block.
+     *
+     * This value is updated to `true` upon successful submission of a timestamp by a node.
+     * It is then checked at the end of each block execution in the `on_finalize` hook.
      *
      * @param {Callback<boolean> =} callback
      **/
-    didUpdate: GenericStorageQuery<() => boolean>;
+    didUpdate: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Balances`'s storage queries
@@ -319,14 +324,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    totalIssuance: GenericStorageQuery<() => bigint>;
+    totalIssuance: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The total units of outstanding deactivated balance in the system.
      *
      * @param {Callback<bigint> =} callback
      **/
-    inactiveIssuance: GenericStorageQuery<() => bigint>;
+    inactiveIssuance: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The Balances pallet example of storing the balance of an account.
@@ -357,7 +362,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletBalancesAccountData> =} callback
      **/
-    account: GenericStorageQuery<(arg: AccountId32Like) => PalletBalancesAccountData>;
+    account: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletBalancesAccountData, AccountId32>;
 
     /**
      * Any liquidity locks on some account balances.
@@ -366,7 +371,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesBalanceLock>> =} callback
      **/
-    locks: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesBalanceLock>>;
+    locks: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesBalanceLock>, AccountId32>;
 
     /**
      * Named reserves on some account balances.
@@ -374,7 +379,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesReserveData>> =} callback
      **/
-    reserves: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesReserveData>>;
+    reserves: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesReserveData>, AccountId32>;
 
     /**
      * Holds on account balances.
@@ -382,7 +387,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesIdAmount>> =} callback
      **/
-    holds: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesIdAmount>>;
+    holds: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesIdAmount>, AccountId32>;
 
     /**
      * Freeze locks on account balances.
@@ -390,12 +395,12 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesIdAmount002>> =} callback
      **/
-    freezes: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesIdAmount002>>;
+    freezes: GenericStorageQuery<Rv, (arg: AccountId32Like) => Array<PalletBalancesIdAmount002>, AccountId32>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -405,18 +410,18 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<FixedU128> =} callback
      **/
-    nextFeeMultiplier: GenericStorageQuery<() => FixedU128>;
+    nextFeeMultiplier: GenericStorageQuery<Rv, () => FixedU128>;
 
     /**
      *
      * @param {Callback<PalletTransactionPaymentReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<() => PalletTransactionPaymentReleases>;
+    storageVersion: GenericStorageQuery<Rv, () => PalletTransactionPaymentReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -427,12 +432,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    author: GenericStorageQuery<() => AccountId32 | undefined>;
+    author: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Staking`'s storage queries
@@ -443,14 +448,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    validatorCount: GenericStorageQuery<() => number>;
+    validatorCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Minimum number of staking participants before emergency conditions are imposed.
      *
      * @param {Callback<number> =} callback
      **/
-    minimumValidatorCount: GenericStorageQuery<() => number>;
+    minimumValidatorCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
@@ -459,7 +464,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      * Map from all locked "stash" accounts to the controller account.
@@ -469,28 +474,28 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    bonded: GenericStorageQuery<(arg: AccountId32Like) => AccountId32 | undefined>;
+    bonded: GenericStorageQuery<Rv, (arg: AccountId32Like) => AccountId32 | undefined, AccountId32>;
 
     /**
      * The minimum active bond to become and maintain the role of a nominator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minNominatorBond: GenericStorageQuery<() => bigint>;
+    minNominatorBond: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The minimum active bond to become and maintain the role of a validator.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minValidatorBond: GenericStorageQuery<() => bigint>;
+    minValidatorBond: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The minimum active nominator stake of the last successful election.
      *
      * @param {Callback<bigint> =} callback
      **/
-    minimumActiveStake: GenericStorageQuery<() => bigint>;
+    minimumActiveStake: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The minimum amount of commission that validators can set.
@@ -499,7 +504,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Perbill> =} callback
      **/
-    minCommission: GenericStorageQuery<() => Perbill>;
+    minCommission: GenericStorageQuery<Rv, () => Perbill>;
 
     /**
      * Map from all (unlocked) "controller" accounts to the info regarding the staking.
@@ -507,7 +512,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingStakingLedger | undefined> =} callback
      **/
-    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingStakingLedger | undefined>;
+    ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingStakingLedger | undefined, AccountId32>;
 
     /**
      * Where the reward payment should be made. Keyed by stash.
@@ -517,7 +522,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingRewardDestination> =} callback
      **/
-    payee: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingRewardDestination>;
+    payee: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingRewardDestination, AccountId32>;
 
     /**
      * The map from (wannabe) validator stash key to the preferences of that validator.
@@ -527,14 +532,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
-    validators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingValidatorPrefs>;
+    validators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingValidatorPrefs, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForValidators: GenericStorageQuery<() => number>;
+    counterForValidators: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The maximum validator count before we stop allowing new validators to join.
@@ -543,14 +548,15 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxValidatorsCount: GenericStorageQuery<() => number | undefined>;
+    maxValidatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The map from nominator stash key to their nomination preferences, namely the validators that
      * they wish to support.
      *
      * Note that the keys of this storage map might become non-decodable in case the
-     * [`Config::MaxNominations`] configuration is decreased. In this rare case, these nominators
+     * account's [`NominationsQuota::MaxNominations`] configuration is decreased.
+     * In this rare case, these nominators
      * are still existent in storage, their key is correct and retrievable (i.e. `contains_key`
      * indicates that they exist), but their value cannot be decoded. Therefore, the non-decodable
      * nominators will effectively not-exist, until they re-submit their preferences such that it
@@ -568,14 +574,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingNominations | undefined> =} callback
      **/
-    nominators: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingNominations | undefined>;
+    nominators: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletStakingNominations | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForNominators: GenericStorageQuery<() => number>;
+    counterForNominators: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The maximum nominator count before we stop allowing new validators to join.
@@ -584,7 +590,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxNominatorsCount: GenericStorageQuery<() => number | undefined>;
+    maxNominatorsCount: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The current era index.
@@ -594,7 +600,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    currentEra: GenericStorageQuery<() => number | undefined>;
+    currentEra: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The active era information, it holds index and start.
@@ -604,7 +610,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletStakingActiveEraInfo | undefined> =} callback
      **/
-    activeEra: GenericStorageQuery<() => PalletStakingActiveEraInfo | undefined>;
+    activeEra: GenericStorageQuery<Rv, () => PalletStakingActiveEraInfo | undefined>;
 
     /**
      * The session index at which the era start for the last `HISTORY_DEPTH` eras.
@@ -615,7 +621,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    erasStartSessionIndex: GenericStorageQuery<(arg: number) => number | undefined>;
+    erasStartSessionIndex: GenericStorageQuery<Rv, (arg: number) => number | undefined, number>;
 
     /**
      * Exposure of validator at era.
@@ -628,7 +634,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<PalletStakingExposure> =} callback
      **/
-    erasStakers: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletStakingExposure>;
+    erasStakers: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => PalletStakingExposure,
+      [number, AccountId32]
+    >;
 
     /**
      * Clipped Exposure of validator at era.
@@ -646,7 +656,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<PalletStakingExposure> =} callback
      **/
-    erasStakersClipped: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletStakingExposure>;
+    erasStakersClipped: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => PalletStakingExposure,
+      [number, AccountId32]
+    >;
 
     /**
      * Similar to `ErasStakers`, this holds the preferences of validators.
@@ -658,7 +672,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<PalletStakingValidatorPrefs> =} callback
      **/
-    erasValidatorPrefs: GenericStorageQuery<(arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs>;
+    erasValidatorPrefs: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => PalletStakingValidatorPrefs,
+      [number, AccountId32]
+    >;
 
     /**
      * The total validator era payout for the last `HISTORY_DEPTH` eras.
@@ -668,7 +686,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    erasValidatorReward: GenericStorageQuery<(arg: number) => bigint | undefined>;
+    erasValidatorReward: GenericStorageQuery<Rv, (arg: number) => bigint | undefined, number>;
 
     /**
      * Rewards for the last `HISTORY_DEPTH` eras.
@@ -677,7 +695,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletStakingEraRewardPoints> =} callback
      **/
-    erasRewardPoints: GenericStorageQuery<(arg: number) => PalletStakingEraRewardPoints>;
+    erasRewardPoints: GenericStorageQuery<Rv, (arg: number) => PalletStakingEraRewardPoints, number>;
 
     /**
      * The total amount staked for the last `HISTORY_DEPTH` eras.
@@ -686,14 +704,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<bigint> =} callback
      **/
-    erasTotalStake: GenericStorageQuery<(arg: number) => bigint>;
+    erasTotalStake: GenericStorageQuery<Rv, (arg: number) => bigint, number>;
 
     /**
      * Mode of era forcing.
      *
      * @param {Callback<PalletStakingForcing> =} callback
      **/
-    forceEra: GenericStorageQuery<() => PalletStakingForcing>;
+    forceEra: GenericStorageQuery<Rv, () => PalletStakingForcing>;
 
     /**
      * The percentage of the slash that is distributed to reporters.
@@ -702,7 +720,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Perbill> =} callback
      **/
-    slashRewardFraction: GenericStorageQuery<() => Perbill>;
+    slashRewardFraction: GenericStorageQuery<Rv, () => Perbill>;
 
     /**
      * The amount of currency given to reporters of a slash event which was
@@ -710,7 +728,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    canceledSlashPayout: GenericStorageQuery<() => bigint>;
+    canceledSlashPayout: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * All unapplied slashes that are queued for later.
@@ -718,7 +736,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Array<PalletStakingUnappliedSlash>> =} callback
      **/
-    unappliedSlashes: GenericStorageQuery<(arg: number) => Array<PalletStakingUnappliedSlash>>;
+    unappliedSlashes: GenericStorageQuery<Rv, (arg: number) => Array<PalletStakingUnappliedSlash>, number>;
 
     /**
      * A mapping from still-bonded eras to the first session index of that era.
@@ -728,7 +746,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[number, number]>> =} callback
      **/
-    bondedEras: GenericStorageQuery<() => Array<[number, number]>>;
+    bondedEras: GenericStorageQuery<Rv, () => Array<[number, number]>>;
 
     /**
      * All slashing events on validators, mapped by era to the highest slash proportion
@@ -737,7 +755,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<[Perbill, bigint] | undefined> =} callback
      **/
-    validatorSlashInEra: GenericStorageQuery<(arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined>;
+    validatorSlashInEra: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => [Perbill, bigint] | undefined,
+      [number, AccountId32]
+    >;
 
     /**
      * All slashing events on nominators, mapped by era to the highest slash value of the era.
@@ -745,7 +767,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, AccountId32Like]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    nominatorSlashInEra: GenericStorageQuery<(arg: [number, AccountId32Like]) => bigint | undefined>;
+    nominatorSlashInEra: GenericStorageQuery<
+      Rv,
+      (arg: [number, AccountId32Like]) => bigint | undefined,
+      [number, AccountId32]
+    >;
 
     /**
      * Slashing spans for stash accounts.
@@ -753,7 +779,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletStakingSlashingSlashingSpans | undefined> =} callback
      **/
-    slashingSpans: GenericStorageQuery<(arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined>;
+    slashingSpans: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => PalletStakingSlashingSlashingSpans | undefined,
+      AccountId32
+    >;
 
     /**
      * Records information about the maximum slash of a stash within a slashing span,
@@ -762,7 +792,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[AccountId32Like, number]} arg
      * @param {Callback<PalletStakingSlashingSpanRecord> =} callback
      **/
-    spanSlash: GenericStorageQuery<(arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord>;
+    spanSlash: GenericStorageQuery<
+      Rv,
+      (arg: [AccountId32Like, number]) => PalletStakingSlashingSpanRecord,
+      [AccountId32, number]
+    >;
 
     /**
      * The last planned session scheduled by the session pallet.
@@ -771,7 +805,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    currentPlannedSession: GenericStorageQuery<() => number>;
+    currentPlannedSession: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Indices of validators that have offended in the active era and whether they are currently
@@ -786,7 +820,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[number, boolean]>> =} callback
      **/
-    offendingValidators: GenericStorageQuery<() => Array<[number, boolean]>>;
+    offendingValidators: GenericStorageQuery<Rv, () => Array<[number, boolean]>>;
 
     /**
      * The threshold for when users can start calling `chill_other` for other validators /
@@ -795,12 +829,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Percent | undefined> =} callback
      **/
-    chillThreshold: GenericStorageQuery<() => Percent | undefined>;
+    chillThreshold: GenericStorageQuery<Rv, () => Percent | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `History`'s storage queries
@@ -812,19 +846,19 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<[H256, number] | undefined> =} callback
      **/
-    historicalSessions: GenericStorageQuery<(arg: number) => [H256, number] | undefined>;
+    historicalSessions: GenericStorageQuery<Rv, (arg: number) => [H256, number] | undefined, number>;
 
     /**
      * The range of historical sessions we store. [first, last)
      *
      * @param {Callback<[number, number] | undefined> =} callback
      **/
-    storedRange: GenericStorageQuery<() => [number, number] | undefined>;
+    storedRange: GenericStorageQuery<Rv, () => [number, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -835,14 +869,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    validators: GenericStorageQuery<() => Array<AccountId32>>;
+    validators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      * Current index of the session.
      *
      * @param {Callback<number> =} callback
      **/
-    currentIndex: GenericStorageQuery<() => number>;
+    currentIndex: GenericStorageQuery<Rv, () => number>;
 
     /**
      * True if the underlying economic identities or weighting behind the validators
@@ -850,7 +884,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<boolean> =} callback
      **/
-    queuedChanged: GenericStorageQuery<() => boolean>;
+    queuedChanged: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * The queued keys for the next session. When the next session begins, these keys
@@ -858,7 +892,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[AccountId32, AlephRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, AlephRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, AlephRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -869,7 +903,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    disabledValidators: GenericStorageQuery<() => Array<number>>;
+    disabledValidators: GenericStorageQuery<Rv, () => Array<number>>;
 
     /**
      * The next session keys for a validator.
@@ -877,7 +911,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<AlephRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => AlephRuntimeSessionKeys | undefined>;
+    nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => AlephRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -885,12 +919,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[SpCoreCryptoKeyTypeId, BytesLike]} arg
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    keyOwner: GenericStorageQuery<(arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined>;
+    keyOwner: GenericStorageQuery<
+      Rv,
+      (arg: [SpCoreCryptoKeyTypeId, BytesLike]) => AccountId32 | undefined,
+      [SpCoreCryptoKeyTypeId, Bytes]
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Aleph`'s storage queries
@@ -900,57 +938,57 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<PrimitivesAppPublic>> =} callback
      **/
-    authorities: GenericStorageQuery<() => Array<PrimitivesAppPublic>>;
+    authorities: GenericStorageQuery<Rv, () => Array<PrimitivesAppPublic>>;
 
     /**
      *
      * @param {Callback<Array<PrimitivesAppPublic>> =} callback
      **/
-    nextAuthorities: GenericStorageQuery<() => Array<PrimitivesAppPublic>>;
+    nextAuthorities: GenericStorageQuery<Rv, () => Array<PrimitivesAppPublic>>;
 
     /**
      * Set of account ids that will be used as authorities in the next session
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    nextFinalityCommittee: GenericStorageQuery<() => Array<AccountId32>>;
+    nextFinalityCommittee: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      *
      * @param {Callback<PrimitivesAppPublic | undefined> =} callback
      **/
-    emergencyFinalizer: GenericStorageQuery<() => PrimitivesAppPublic | undefined>;
+    emergencyFinalizer: GenericStorageQuery<Rv, () => PrimitivesAppPublic | undefined>;
 
     /**
      *
      * @param {Callback<PrimitivesAppPublic | undefined> =} callback
      **/
-    queuedEmergencyFinalizer: GenericStorageQuery<() => PrimitivesAppPublic | undefined>;
+    queuedEmergencyFinalizer: GenericStorageQuery<Rv, () => PrimitivesAppPublic | undefined>;
 
     /**
      *
      * @param {Callback<PrimitivesAppPublic | undefined> =} callback
      **/
-    nextEmergencyFinalizer: GenericStorageQuery<() => PrimitivesAppPublic | undefined>;
+    nextEmergencyFinalizer: GenericStorageQuery<Rv, () => PrimitivesAppPublic | undefined>;
 
     /**
      * Current finality version.
      *
      * @param {Callback<number> =} callback
      **/
-    finalityVersion: GenericStorageQuery<() => number>;
+    finalityVersion: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Scheduled finality version change.
      *
      * @param {Callback<PrimitivesVersionChange | undefined> =} callback
      **/
-    finalityScheduledVersionChange: GenericStorageQuery<() => PrimitivesVersionChange | undefined>;
+    finalityScheduledVersionChange: GenericStorageQuery<Rv, () => PrimitivesVersionChange | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Elections`'s storage queries
@@ -961,35 +999,35 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PrimitivesCommitteeSeats> =} callback
      **/
-    committeeSize: GenericStorageQuery<() => PrimitivesCommitteeSeats>;
+    committeeSize: GenericStorageQuery<Rv, () => PrimitivesCommitteeSeats>;
 
     /**
      * Desired size of a committee in effect from a new era.
      *
      * @param {Callback<PrimitivesCommitteeSeats> =} callback
      **/
-    nextEraCommitteeSize: GenericStorageQuery<() => PrimitivesCommitteeSeats>;
+    nextEraCommitteeSize: GenericStorageQuery<Rv, () => PrimitivesCommitteeSeats>;
 
     /**
      * Next era's list of reserved validators.
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    nextEraReservedValidators: GenericStorageQuery<() => Array<AccountId32>>;
+    nextEraReservedValidators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      * Current era's list of reserved validators.
      *
      * @param {Callback<PrimitivesEraValidators> =} callback
      **/
-    currentEraValidators: GenericStorageQuery<() => PrimitivesEraValidators>;
+    currentEraValidators: GenericStorageQuery<Rv, () => PrimitivesEraValidators>;
 
     /**
      * Next era's list of non reserved validators.
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    nextEraNonReservedValidators: GenericStorageQuery<() => Array<AccountId32>>;
+    nextEraNonReservedValidators: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      * Openness of the elections, whether we allow all candidates that bonded enough tokens or
@@ -997,12 +1035,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PrimitivesElectionOpenness> =} callback
      **/
-    openness: GenericStorageQuery<() => PrimitivesElectionOpenness>;
+    openness: GenericStorageQuery<Rv, () => PrimitivesElectionOpenness>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Treasury`'s storage queries
@@ -1013,7 +1051,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    proposalCount: GenericStorageQuery<() => number>;
+    proposalCount: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Proposals that have been made.
@@ -1021,26 +1059,26 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletTreasuryProposal | undefined> =} callback
      **/
-    proposals: GenericStorageQuery<(arg: number) => PalletTreasuryProposal | undefined>;
+    proposals: GenericStorageQuery<Rv, (arg: number) => PalletTreasuryProposal | undefined, number>;
 
     /**
      * The amount which has been reported as inactive to Currency.
      *
      * @param {Callback<bigint> =} callback
      **/
-    deactivated: GenericStorageQuery<() => bigint>;
+    deactivated: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * Proposal indices that have been approved but not yet awarded.
      *
      * @param {Callback<Array<number>> =} callback
      **/
-    approvals: GenericStorageQuery<() => Array<number>>;
+    approvals: GenericStorageQuery<Rv, () => Array<number>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -1052,7 +1090,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletVestingVestingInfo> | undefined> =} callback
      **/
-    vesting: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined>;
+    vesting: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => Array<PalletVestingVestingInfo> | undefined,
+      AccountId32
+    >;
 
     /**
      * Storage version of the pallet.
@@ -1061,12 +1103,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletVestingReleases> =} callback
      **/
-    storageVersion: GenericStorageQuery<() => PalletVestingReleases>;
+    storageVersion: GenericStorageQuery<Rv, () => PalletVestingReleases>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Multisig`'s storage queries
@@ -1078,12 +1120,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[AccountId32Like, FixedBytes<32>]} arg
      * @param {Callback<PalletMultisigMultisig | undefined> =} callback
      **/
-    multisigs: GenericStorageQuery<(arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined>;
+    multisigs: GenericStorageQuery<
+      Rv,
+      (arg: [AccountId32Like, FixedBytes<32>]) => PalletMultisigMultisig | undefined,
+      [AccountId32, FixedBytes<32>]
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Sudo`'s storage queries
@@ -1094,12 +1140,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<() => AccountId32 | undefined>;
+    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Contracts`'s storage queries
@@ -1111,7 +1157,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined>;
+    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
 
     /**
      * A mapping from a contract's code hash to its code info.
@@ -1119,7 +1165,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<PalletContractsWasmCodeInfo | undefined> =} callback
      **/
-    codeInfoOf: GenericStorageQuery<(arg: H256) => PalletContractsWasmCodeInfo | undefined>;
+    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletContractsWasmCodeInfo | undefined, H256>;
 
     /**
      * This is a **monotonic** counter incremented on contract instantiation.
@@ -1147,7 +1193,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    nonce: GenericStorageQuery<() => bigint>;
+    nonce: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The code associated with a given account.
@@ -1157,7 +1203,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletContractsStorageContractInfo | undefined> =} callback
      **/
-    contractInfoOf: GenericStorageQuery<(arg: AccountId32Like) => PalletContractsStorageContractInfo | undefined>;
+    contractInfoOf: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => PalletContractsStorageContractInfo | undefined,
+      AccountId32
+    >;
 
     /**
      * Evicted contracts that await child trie deletion.
@@ -1168,7 +1218,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    deletionQueue: GenericStorageQuery<(arg: number) => Bytes | undefined>;
+    deletionQueue: GenericStorageQuery<Rv, (arg: number) => Bytes | undefined, number>;
 
     /**
      * A pair of monotonic counters used to track the latest contract marked for deletion
@@ -1176,7 +1226,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletContractsStorageDeletionQueueManager> =} callback
      **/
-    deletionQueueCounter: GenericStorageQuery<() => PalletContractsStorageDeletionQueueManager>;
+    deletionQueueCounter: GenericStorageQuery<Rv, () => PalletContractsStorageDeletionQueueManager>;
 
     /**
      * A migration can span across multiple blocks. This storage defines a cursor to track the
@@ -1184,12 +1234,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    migrationInProgress: GenericStorageQuery<() => Bytes | undefined>;
+    migrationInProgress: GenericStorageQuery<Rv, () => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `NominationPools`'s storage queries
@@ -1200,7 +1250,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    minJoinBond: GenericStorageQuery<() => bigint>;
+    minJoinBond: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * Minimum bond required to create a pool.
@@ -1213,7 +1263,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    minCreateBond: GenericStorageQuery<() => bigint>;
+    minCreateBond: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * Maximum number of nomination pools that can exist. If `None`, then an unbounded number of
@@ -1221,7 +1271,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPools: GenericStorageQuery<() => number | undefined>;
+    maxPools: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * Maximum number of members that can exist in the system. If `None`, then the count
@@ -1229,7 +1279,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembers: GenericStorageQuery<() => number | undefined>;
+    maxPoolMembers: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * Maximum number of members that may belong to pool. If `None`, then the count of
@@ -1237,7 +1287,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    maxPoolMembersPerPool: GenericStorageQuery<() => number | undefined>;
+    maxPoolMembersPerPool: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The maximum commission that can be charged by a pool. Used on commission payouts to bound
@@ -1246,7 +1296,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Perbill | undefined> =} callback
      **/
-    globalMaxCommission: GenericStorageQuery<() => Perbill | undefined>;
+    globalMaxCommission: GenericStorageQuery<Rv, () => Perbill | undefined>;
 
     /**
      * Active members.
@@ -1256,14 +1306,18 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsPoolMember | undefined> =} callback
      **/
-    poolMembers: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined>;
+    poolMembers: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => PalletNominationPoolsPoolMember | undefined,
+      AccountId32
+    >;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForPoolMembers: GenericStorageQuery<() => number>;
+    counterForPoolMembers: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Storage for bonded pools.
@@ -1271,14 +1325,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsBondedPoolInner | undefined> =} callback
      **/
-    bondedPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsBondedPoolInner | undefined>;
+    bondedPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsBondedPoolInner | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForBondedPools: GenericStorageQuery<() => number>;
+    counterForBondedPools: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Reward pools. This is where there rewards for each pool accumulate. When a members payout is
@@ -1287,14 +1341,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsRewardPool | undefined> =} callback
      **/
-    rewardPools: GenericStorageQuery<(arg: number) => PalletNominationPoolsRewardPool | undefined>;
+    rewardPools: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsRewardPool | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForRewardPools: GenericStorageQuery<() => number>;
+    counterForRewardPools: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Groups of unbonding pools. Each group of unbonding pools belongs to a
@@ -1303,14 +1357,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletNominationPoolsSubPools | undefined> =} callback
      **/
-    subPoolsStorage: GenericStorageQuery<(arg: number) => PalletNominationPoolsSubPools | undefined>;
+    subPoolsStorage: GenericStorageQuery<Rv, (arg: number) => PalletNominationPoolsSubPools | undefined, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForSubPoolsStorage: GenericStorageQuery<() => number>;
+    counterForSubPoolsStorage: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Metadata for the pool.
@@ -1318,21 +1372,21 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Bytes> =} callback
      **/
-    metadata: GenericStorageQuery<(arg: number) => Bytes>;
+    metadata: GenericStorageQuery<Rv, (arg: number) => Bytes, number>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForMetadata: GenericStorageQuery<() => number>;
+    counterForMetadata: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Ever increasing number of all pools created so far.
      *
      * @param {Callback<number> =} callback
      **/
-    lastPoolId: GenericStorageQuery<() => number>;
+    lastPoolId: GenericStorageQuery<Rv, () => number>;
 
     /**
      * A reverse lookup from the pool's account id to its id.
@@ -1343,14 +1397,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    reversePoolIdLookup: GenericStorageQuery<(arg: AccountId32Like) => number | undefined>;
+    reversePoolIdLookup: GenericStorageQuery<Rv, (arg: AccountId32Like) => number | undefined, AccountId32>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForReversePoolIdLookup: GenericStorageQuery<() => number>;
+    counterForReversePoolIdLookup: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Map from a pool member account to their opted claim permission.
@@ -1358,12 +1412,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletNominationPoolsClaimPermission> =} callback
      **/
-    claimPermissions: GenericStorageQuery<(arg: AccountId32Like) => PalletNominationPoolsClaimPermission>;
+    claimPermissions: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => PalletNominationPoolsClaimPermission,
+      AccountId32
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Identity`'s storage queries
@@ -1377,7 +1435,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletIdentityRegistration | undefined> =} callback
      **/
-    identityOf: GenericStorageQuery<(arg: AccountId32Like) => PalletIdentityRegistration | undefined>;
+    identityOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletIdentityRegistration | undefined, AccountId32>;
 
     /**
      * The super-identity of an alternative "sub" identity together with its name, within that
@@ -1386,7 +1444,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<[AccountId32, Data] | undefined> =} callback
      **/
-    superOf: GenericStorageQuery<(arg: AccountId32Like) => [AccountId32, Data] | undefined>;
+    superOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [AccountId32, Data] | undefined, AccountId32>;
 
     /**
      * Alternative "sub" identities of this account.
@@ -1398,7 +1456,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<[bigint, Array<AccountId32>]> =} callback
      **/
-    subsOf: GenericStorageQuery<(arg: AccountId32Like) => [bigint, Array<AccountId32>]>;
+    subsOf: GenericStorageQuery<Rv, (arg: AccountId32Like) => [bigint, Array<AccountId32>], AccountId32>;
 
     /**
      * The set of registrars. Not expected to get very big as can only be added through a
@@ -1408,12 +1466,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<PalletIdentityRegistrarInfo | undefined>> =} callback
      **/
-    registrars: GenericStorageQuery<() => Array<PalletIdentityRegistrarInfo | undefined>>;
+    registrars: GenericStorageQuery<Rv, () => Array<PalletIdentityRegistrarInfo | undefined>>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `CommitteeManagement`'s storage queries
@@ -1423,7 +1481,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Perquintill> =} callback
      **/
-    lenientThreshold: GenericStorageQuery<() => Perquintill>;
+    lenientThreshold: GenericStorageQuery<Rv, () => Perquintill>;
 
     /**
      * A lookup how many blocks a validator produced.
@@ -1431,21 +1489,21 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    sessionValidatorBlockCount: GenericStorageQuery<(arg: AccountId32Like) => number>;
+    sessionValidatorBlockCount: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Total possible reward per validator for the current era.
      *
      * @param {Callback<PalletCommitteeManagementValidatorTotalRewards | undefined> =} callback
      **/
-    validatorEraTotalReward: GenericStorageQuery<() => PalletCommitteeManagementValidatorTotalRewards | undefined>;
+    validatorEraTotalReward: GenericStorageQuery<Rv, () => PalletCommitteeManagementValidatorTotalRewards | undefined>;
 
     /**
      * Current era config for ban functionality, see [`BanConfig`]
      *
      * @param {Callback<PrimitivesBanConfig> =} callback
      **/
-    banConfig: GenericStorageQuery<() => PrimitivesBanConfig>;
+    banConfig: GenericStorageQuery<Rv, () => PrimitivesBanConfig>;
 
     /**
      * A lookup for a number of underperformance sessions for a given validator
@@ -1453,7 +1511,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    underperformedValidatorSessionCount: GenericStorageQuery<(arg: AccountId32Like) => number>;
+    underperformedValidatorSessionCount: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Validators to be removed from non reserved list in the next era
@@ -1461,7 +1519,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PrimitivesBanInfo | undefined> =} callback
      **/
-    banned: GenericStorageQuery<(arg: AccountId32Like) => PrimitivesBanInfo | undefined>;
+    banned: GenericStorageQuery<Rv, (arg: AccountId32Like) => PrimitivesBanInfo | undefined, AccountId32>;
 
     /**
      * SessionValidators in the current session.
@@ -1469,12 +1527,47 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletCommitteeManagementCurrentAndNextSessionValidators> =} callback
      **/
     currentAndNextSessionValidatorsStorage: GenericStorageQuery<
+      Rv,
       () => PalletCommitteeManagementCurrentAndNextSessionValidators
     >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
+  };
+  /**
+   * Pallet `Proxy`'s storage queries
+   **/
+  proxy: {
+    /**
+     * The set of account proxies. Maps the account which has delegated to the accounts
+     * which are being delegated to, together with the amount held on deposit.
+     *
+     * @param {AccountId32Like} arg
+     * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
+     **/
+    proxies: GenericStorageQuery<
+      Rv,
+      (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
+    >;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery<Rv>;
   };
 }