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

package/astar/query.d.ts

@@ -1,21 +1,20 @@
-// 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,
   Digest,
   Phase,
-  AccountId32,
   Data,
   FixedBytes,
   FixedU128,
   BytesLike,
   H160,
   U256,
-  FixedU64,
-} from '@dedot/codecs';
+} from 'dedot/codecs';
 import type {
   FrameSystemAccountInfo,
   FrameSupportDispatchPerDispatchClass,
@@ -26,13 +25,16 @@ import type {
   PalletMultisigMultisig,
   PalletProxyProxyDefinition,
   PalletProxyAnnouncement,
-  PolkadotPrimitivesV4PersistedValidationData,
-  PolkadotPrimitivesV4UpgradeRestriction,
+  CumulusPalletParachainSystemUnincludedSegmentAncestor,
+  CumulusPalletParachainSystemUnincludedSegmentSegmentTracker,
+  PolkadotPrimitivesV6PersistedValidationData,
+  PolkadotPrimitivesV6UpgradeRestriction,
+  PolkadotPrimitivesV6UpgradeGoAhead,
   SpTrieStorageProof,
   CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot,
-  PolkadotPrimitivesV4AbridgedHostConfiguration,
+  PolkadotPrimitivesV6AbridgedHostConfiguration,
   CumulusPrimitivesParachainInherentMessageQueueChain,
-  PolkadotParachainPrimitivesId,
+  PolkadotParachainPrimitivesPrimitivesId,
   PolkadotCorePrimitivesOutboundHrmpMessage,
   SpWeightsWeightV2Weight,
   CumulusPalletParachainSystemCodeUpgradeAuthorization,
@@ -63,6 +65,11 @@ import type {
   PalletAssetsAssetAccount,
   PalletAssetsApproval,
   PalletAssetsAssetMetadata,
+  PalletPriceAggregatorValueAggregator,
+  PalletPriceAggregatorCircularBuffer,
+  OrmlOracleModuleTimestampedValue,
+  AstarPrimitivesOracleCurrencyId,
+  OrmlUtilitiesOrderedSet,
   PalletCollatorSelectionCandidateInfo,
   AstarRuntimeSessionKeys,
   SpCoreCryptoKeyTypeId,
@@ -83,22 +90,12 @@ import type {
   FpRpcTransactionStatus,
   EthereumReceiptReceiptV3,
   EthereumBlock,
-  PalletContractsWasmPrefabWasmModule,
-  PalletContractsWasmOwnerInfo,
+  PalletContractsWasmCodeInfo,
   PalletContractsStorageContractInfo,
   PalletContractsStorageDeletionQueueManager,
-  PalletDappStakingMigrationMigrationState,
-  PalletDappsStakingAccountLedger,
-  PalletDappsStakingRewardInfo,
-  PalletDappsStakingForcing,
-  PalletDappsStakingDAppInfo,
-  PalletDappsStakingEraInfo,
-  PalletDappsStakingContractStakeInfo,
-  PalletDappsStakingStakerInfo,
-  PalletDappsStakingVersion,
 } from './types';
 
-export interface ChainStorage extends GenericChainStorage {
+export interface ChainStorage<Rv extends RpcVersion> extends GenericChainStorage<Rv> {
   /**
    * Pallet `System`'s storage queries
    **/
@@ -109,28 +106,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.
@@ -138,7 +135,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).
@@ -146,28 +143,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.
@@ -180,14 +177,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
@@ -197,28 +194,28 @@ export interface ChainStorage extends GenericChainStorage {
      * allows light-clients to leverage the changes trie storage tracking mechanism and
      * in case of changes fetch the list of events of interest.
      *
-     * The value has the type `(T::BlockNumber, EventIndex)` because if we used only just
+     * The value has the type `(BlockNumberFor<T>, EventIndex)` because if we used only just
      * the `EventIndex` then in case if the topic has the same contents on the next block
      * no notification will be triggered thus the event might be lost.
      *
      * @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
@@ -226,19 +223,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 `Identity`'s storage queries
@@ -252,7 +249,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
@@ -261,7 +258,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.
@@ -273,7 +270,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
@@ -283,35 +280,38 @@ 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 `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 `Multisig`'s storage queries
@@ -323,12 +323,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 `Proxy`'s storage queries
@@ -341,7 +345,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyProxyDefinition>, bigint]> =} callback
      **/
-    proxies: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint]>;
+    proxies: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => [Array<PalletProxyProxyDefinition>, bigint],
+      AccountId32
+    >;
 
     /**
      * The announcements made by the proxy (key).
@@ -349,28 +357,56 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<[Array<PalletProxyAnnouncement>, bigint]> =} callback
      **/
-    announcements: GenericStorageQuery<(arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint]>;
+    announcements: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => [Array<PalletProxyAnnouncement>, bigint],
+      AccountId32
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `ParachainSystem`'s storage queries
    **/
   parachainSystem: {
     /**
-     * In case of a scheduled upgrade, this storage field contains the validation code to be applied.
+     * Latest included block descendants the runtime accepted. In other words, these are
+     * ancestors of the currently executing block which have not been included in the observed
+     * relay-chain state.
+     *
+     * The segment length is limited by the capacity returned from the [`ConsensusHook`] configured
+     * in the pallet.
      *
-     * As soon as the relay chain gives us the go-ahead signal, we will overwrite the [`:code`][well_known_keys::CODE]
-     * which will result the next block process with the new validation code. This concludes the upgrade process.
+     * @param {Callback<Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>> =} callback
+     **/
+    unincludedSegment: GenericStorageQuery<Rv, () => Array<CumulusPalletParachainSystemUnincludedSegmentAncestor>>;
+
+    /**
+     * Storage field that keeps track of bandwidth used by the unincluded segment along with the
+     * latest HRMP watermark. Used for limiting the acceptance of new blocks with
+     * respect to relay chain constraints.
+     *
+     * @param {Callback<CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined> =} callback
+     **/
+    aggregatedUnincludedSegment: GenericStorageQuery<
+      Rv,
+      () => CumulusPalletParachainSystemUnincludedSegmentSegmentTracker | undefined
+    >;
+
+    /**
+     * In case of a scheduled upgrade, this storage field contains the validation code to be
+     * applied.
      *
-     * [well_known_keys::CODE]: sp_core::storage::well_known_keys::CODE
+     * As soon as the relay chain gives us the go-ahead signal, we will overwrite the
+     * [`:code`][sp_core::storage::well_known_keys::CODE] which will result the next block process
+     * with the new validation code. This concludes the upgrade process.
      *
      * @param {Callback<Bytes> =} callback
      **/
-    pendingValidationCode: GenericStorageQuery<() => Bytes>;
+    pendingValidationCode: GenericStorageQuery<Rv, () => Bytes>;
 
     /**
      * Validation code that is set by the parachain and is to be communicated to collator and
@@ -381,30 +417,32 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    newValidationCode: GenericStorageQuery<() => Bytes | undefined>;
+    newValidationCode: GenericStorageQuery<Rv, () => Bytes | undefined>;
 
     /**
      * The [`PersistedValidationData`] set for this block.
      * This value is expected to be set only once per block and it's never stored
      * in the trie.
      *
-     * @param {Callback<PolkadotPrimitivesV4PersistedValidationData | undefined> =} callback
+     * @param {Callback<PolkadotPrimitivesV6PersistedValidationData | undefined> =} callback
      **/
-    validationData: GenericStorageQuery<() => PolkadotPrimitivesV4PersistedValidationData | undefined>;
+    validationData: GenericStorageQuery<Rv, () => PolkadotPrimitivesV6PersistedValidationData | undefined>;
 
     /**
      * Were the validation data set to notify the relay chain?
      *
      * @param {Callback<boolean> =} callback
      **/
-    didSetValidationCode: GenericStorageQuery<() => boolean>;
+    didSetValidationCode: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * The relay chain block number associated with the last parachain block.
      *
+     * This is updated in `on_finalize`.
+     *
      * @param {Callback<number> =} callback
      **/
-    lastRelayChainBlockNumber: GenericStorageQuery<() => number>;
+    lastRelayChainBlockNumber: GenericStorageQuery<Rv, () => number>;
 
     /**
      * An option which indicates if the relay-chain restricts signalling a validation code upgrade.
@@ -415,9 +453,20 @@ export interface ChainStorage extends GenericChainStorage {
      * relay-chain. This value is ephemeral which means it doesn't hit the storage. This value is
      * set after the inherent.
      *
-     * @param {Callback<PolkadotPrimitivesV4UpgradeRestriction | undefined> =} callback
+     * @param {Callback<PolkadotPrimitivesV6UpgradeRestriction | undefined> =} callback
      **/
-    upgradeRestrictionSignal: GenericStorageQuery<() => PolkadotPrimitivesV4UpgradeRestriction | undefined>;
+    upgradeRestrictionSignal: GenericStorageQuery<Rv, () => PolkadotPrimitivesV6UpgradeRestriction | undefined>;
+
+    /**
+     * Optional upgrade go-ahead signal from the relay-chain.
+     *
+     * This storage item is a mirror of the corresponding value for the current parachain from the
+     * relay-chain. This value is ephemeral which means it doesn't hit the storage. This value is
+     * set after the inherent.
+     *
+     * @param {Callback<PolkadotPrimitivesV6UpgradeGoAhead | undefined> =} callback
+     **/
+    upgradeGoAhead: GenericStorageQuery<Rv, () => PolkadotPrimitivesV6UpgradeGoAhead | undefined>;
 
     /**
      * The state proof for the last relay parent block.
@@ -429,7 +478,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<SpTrieStorageProof | undefined> =} callback
      **/
-    relayStateProof: GenericStorageQuery<() => SpTrieStorageProof | undefined>;
+    relayStateProof: GenericStorageQuery<Rv, () => SpTrieStorageProof | undefined>;
 
     /**
      * The snapshot of some state related to messaging relevant to the current parachain as per
@@ -443,6 +492,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined> =} callback
      **/
     relevantMessagingState: GenericStorageQuery<
+      Rv,
       () => CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot | undefined
     >;
 
@@ -454,9 +504,9 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * This data is also absent from the genesis.
      *
-     * @param {Callback<PolkadotPrimitivesV4AbridgedHostConfiguration | undefined> =} callback
+     * @param {Callback<PolkadotPrimitivesV6AbridgedHostConfiguration | undefined> =} callback
      **/
-    hostConfiguration: GenericStorageQuery<() => PolkadotPrimitivesV4AbridgedHostConfiguration | undefined>;
+    hostConfiguration: GenericStorageQuery<Rv, () => PolkadotPrimitivesV6AbridgedHostConfiguration | undefined>;
 
     /**
      * The last downward message queue chain head we have observed.
@@ -466,7 +516,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<CumulusPrimitivesParachainInherentMessageQueueChain> =} callback
      **/
-    lastDmqMqcHead: GenericStorageQuery<() => CumulusPrimitivesParachainInherentMessageQueueChain>;
+    lastDmqMqcHead: GenericStorageQuery<Rv, () => CumulusPrimitivesParachainInherentMessageQueueChain>;
 
     /**
      * The message queue chain heads we have observed per each channel incoming channel.
@@ -474,10 +524,11 @@ export interface ChainStorage extends GenericChainStorage {
      * This value is loaded before and saved after processing inbound downward messages carried
      * by the system inherent.
      *
-     * @param {Callback<Array<[PolkadotParachainPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
+     * @param {Callback<Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>> =} callback
      **/
     lastHrmpMqcHeads: GenericStorageQuery<
-      () => Array<[PolkadotParachainPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
+      Rv,
+      () => Array<[PolkadotParachainPrimitivesPrimitivesId, CumulusPrimitivesParachainInherentMessageQueueChain]>
     >;
 
     /**
@@ -487,7 +538,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    processedDownwardMessages: GenericStorageQuery<() => number>;
+    processedDownwardMessages: GenericStorageQuery<Rv, () => number>;
 
     /**
      * HRMP watermark that was set in a block.
@@ -496,7 +547,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    hrmpWatermark: GenericStorageQuery<() => number>;
+    hrmpWatermark: GenericStorageQuery<Rv, () => number>;
 
     /**
      * HRMP messages that were sent in a block.
@@ -505,7 +556,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<PolkadotCorePrimitivesOutboundHrmpMessage>> =} callback
      **/
-    hrmpOutboundMessages: GenericStorageQuery<() => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
+    hrmpOutboundMessages: GenericStorageQuery<Rv, () => Array<PolkadotCorePrimitivesOutboundHrmpMessage>>;
 
     /**
      * Upward messages that were sent in a block.
@@ -514,14 +565,21 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    upwardMessages: GenericStorageQuery<() => Array<Bytes>>;
+    upwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
 
     /**
      * Upward messages that are still pending and not yet send to the relay chain.
      *
      * @param {Callback<Array<Bytes>> =} callback
      **/
-    pendingUpwardMessages: GenericStorageQuery<() => Array<Bytes>>;
+    pendingUpwardMessages: GenericStorageQuery<Rv, () => Array<Bytes>>;
+
+    /**
+     * The factor to multiply the base delivery fee by for UMP.
+     *
+     * @param {Callback<FixedU128> =} callback
+     **/
+    upwardDeliveryFeeFactor: GenericStorageQuery<Rv, () => FixedU128>;
 
     /**
      * The number of HRMP messages we observed in `on_initialize` and thus used that number for
@@ -529,7 +587,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    announcedHrmpMessagesPerCandidate: GenericStorageQuery<() => number>;
+    announcedHrmpMessagesPerCandidate: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The weight we reserve at the beginning of the block for processing XCMP messages. This
@@ -537,7 +595,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedXcmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
+    reservedXcmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The weight we reserve at the beginning of the block for processing DMP messages. This
@@ -545,28 +603,28 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<SpWeightsWeightV2Weight | undefined> =} callback
      **/
-    reservedDmpWeightOverride: GenericStorageQuery<() => SpWeightsWeightV2Weight | undefined>;
+    reservedDmpWeightOverride: GenericStorageQuery<Rv, () => SpWeightsWeightV2Weight | undefined>;
 
     /**
      * The next authorized upgrade, if there is one.
      *
      * @param {Callback<CumulusPalletParachainSystemCodeUpgradeAuthorization | undefined> =} callback
      **/
-    authorizedUpgrade: GenericStorageQuery<() => CumulusPalletParachainSystemCodeUpgradeAuthorization | undefined>;
+    authorizedUpgrade: GenericStorageQuery<Rv, () => CumulusPalletParachainSystemCodeUpgradeAuthorization | undefined>;
 
     /**
      * A custom head data that should be returned as result of `validate_block`.
      *
-     * See [`Pallet::set_custom_validation_head_data`] for more information.
+     * See `Pallet::set_custom_validation_head_data` for more information.
      *
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    customValidationHeadData: GenericStorageQuery<() => Bytes | undefined>;
+    customValidationHeadData: GenericStorageQuery<Rv, () => Bytes | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `ParachainInfo`'s storage queries
@@ -574,14 +632,14 @@ export interface ChainStorage extends GenericChainStorage {
   parachainInfo: {
     /**
      *
-     * @param {Callback<PolkadotParachainPrimitivesId> =} callback
+     * @param {Callback<PolkadotParachainPrimitivesPrimitivesId> =} callback
      **/
-    parachainId: GenericStorageQuery<() => PolkadotParachainPrimitivesId>;
+    parachainId: GenericStorageQuery<Rv, () => PolkadotParachainPrimitivesPrimitivesId>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `TransactionPayment`'s storage queries
@@ -591,18 +649,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 `Balances`'s storage queries
@@ -613,14 +671,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.
@@ -651,7 +709,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.
@@ -660,7 +718,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.
@@ -668,7 +726,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.
@@ -676,7 +734,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.
@@ -684,12 +742,16 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<Array<PalletBalancesIdAmountRuntimeFreezeReason>> =} callback
      **/
-    freezes: GenericStorageQuery<(arg: AccountId32Like) => Array<PalletBalancesIdAmountRuntimeFreezeReason>>;
+    freezes: GenericStorageQuery<
+      Rv,
+      (arg: AccountId32Like) => Array<PalletBalancesIdAmountRuntimeFreezeReason>,
+      AccountId32
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Vesting`'s storage queries
@@ -701,7 +763,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.
@@ -710,12 +776,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 `Inflation`'s storage queries
@@ -727,26 +793,26 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletInflationInflationConfiguration> =} callback
      **/
-    activeInflationConfig: GenericStorageQuery<() => PalletInflationInflationConfiguration>;
+    activeInflationConfig: GenericStorageQuery<Rv, () => PalletInflationInflationConfiguration>;
 
     /**
      * Static inflation parameters - used to calculate active inflation configuration at certain points in time.
      *
      * @param {Callback<PalletInflationInflationParameters> =} callback
      **/
-    inflationParams: GenericStorageQuery<() => PalletInflationInflationParameters>;
+    inflationParams: GenericStorageQuery<Rv, () => PalletInflationInflationParameters>;
 
     /**
      * Flag indicating whether on the first possible opportunity, recalculation of the inflation config should be done.
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    doRecalculation: GenericStorageQuery<() => number | undefined>;
+    doRecalculation: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `DappStaking`'s storage queries
@@ -757,14 +823,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<PalletDappStakingV3ProtocolState> =} callback
      **/
-    activeProtocolState: GenericStorageQuery<() => PalletDappStakingV3ProtocolState>;
+    activeProtocolState: GenericStorageQuery<Rv, () => PalletDappStakingV3ProtocolState>;
 
     /**
      * Counter for unique dApp identifiers.
      *
      * @param {Callback<number> =} callback
      **/
-    nextDAppId: GenericStorageQuery<() => number>;
+    nextDAppId: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Map of all dApps integrated into dApp staking protocol.
@@ -776,7 +842,9 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletDappStakingV3DAppInfo | undefined> =} callback
      **/
     integratedDApps: GenericStorageQuery<
-      (arg: AstarPrimitivesDappStakingSmartContract) => PalletDappStakingV3DAppInfo | undefined
+      Rv,
+      (arg: AstarPrimitivesDappStakingSmartContract) => PalletDappStakingV3DAppInfo | undefined,
+      AstarPrimitivesDappStakingSmartContract
     >;
 
     /**
@@ -784,7 +852,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    counterForIntegratedDApps: GenericStorageQuery<() => number>;
+    counterForIntegratedDApps: GenericStorageQuery<Rv, () => number>;
 
     /**
      * General locked/staked information for each account.
@@ -792,7 +860,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<PalletDappStakingV3AccountLedger> =} callback
      **/
-    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletDappStakingV3AccountLedger>;
+    ledger: GenericStorageQuery<Rv, (arg: AccountId32Like) => PalletDappStakingV3AccountLedger, AccountId32>;
 
     /**
      * Information about how much each staker has staked for each smart contract in some period.
@@ -801,9 +869,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletDappStakingV3SingularStakingInfo | undefined> =} callback
      **/
     stakerInfo: GenericStorageQuery<
+      Rv,
       (
         arg: [AccountId32Like, AstarPrimitivesDappStakingSmartContract],
-      ) => PalletDappStakingV3SingularStakingInfo | undefined
+      ) => PalletDappStakingV3SingularStakingInfo | undefined,
+      [AccountId32, AstarPrimitivesDappStakingSmartContract]
     >;
 
     /**
@@ -812,14 +882,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletDappStakingV3ContractStakeAmount> =} callback
      **/
-    contractStake: GenericStorageQuery<(arg: number) => PalletDappStakingV3ContractStakeAmount>;
+    contractStake: GenericStorageQuery<Rv, (arg: number) => PalletDappStakingV3ContractStakeAmount, number>;
 
     /**
      * General information about the current era.
      *
      * @param {Callback<PalletDappStakingV3EraInfo> =} callback
      **/
-    currentEraInfo: GenericStorageQuery<() => PalletDappStakingV3EraInfo>;
+    currentEraInfo: GenericStorageQuery<Rv, () => PalletDappStakingV3EraInfo>;
 
     /**
      * Information about rewards for each era.
@@ -835,7 +905,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletDappStakingV3EraRewardSpan | undefined> =} callback
      **/
-    eraRewards: GenericStorageQuery<(arg: number) => PalletDappStakingV3EraRewardSpan | undefined>;
+    eraRewards: GenericStorageQuery<Rv, (arg: number) => PalletDappStakingV3EraRewardSpan | undefined, number>;
 
     /**
      * Information about period's end.
@@ -843,21 +913,21 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletDappStakingV3PeriodEndInfo | undefined> =} callback
      **/
-    periodEnd: GenericStorageQuery<(arg: number) => PalletDappStakingV3PeriodEndInfo | undefined>;
+    periodEnd: GenericStorageQuery<Rv, (arg: number) => PalletDappStakingV3PeriodEndInfo | undefined, number>;
 
     /**
      * Static tier parameters used to calculate tier configuration.
      *
      * @param {Callback<PalletDappStakingV3TierParameters> =} callback
      **/
-    staticTierParams: GenericStorageQuery<() => PalletDappStakingV3TierParameters>;
+    staticTierParams: GenericStorageQuery<Rv, () => PalletDappStakingV3TierParameters>;
 
     /**
      * Tier configuration user for current & preceding eras.
      *
      * @param {Callback<PalletDappStakingV3TiersConfiguration> =} callback
      **/
-    tierConfig: GenericStorageQuery<() => PalletDappStakingV3TiersConfiguration>;
+    tierConfig: GenericStorageQuery<Rv, () => PalletDappStakingV3TiersConfiguration>;
 
     /**
      * Information about which tier a dApp belonged to in a specific era.
@@ -865,14 +935,14 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<PalletDappStakingV3DAppTierRewards | undefined> =} callback
      **/
-    dAppTiers: GenericStorageQuery<(arg: number) => PalletDappStakingV3DAppTierRewards | undefined>;
+    dAppTiers: GenericStorageQuery<Rv, (arg: number) => PalletDappStakingV3DAppTierRewards | undefined, number>;
 
     /**
      * History cleanup marker - holds information about which DB entries should be cleaned up next, when applicable.
      *
      * @param {Callback<PalletDappStakingV3CleanupMarker> =} callback
      **/
-    historyCleanupMarker: GenericStorageQuery<() => PalletDappStakingV3CleanupMarker>;
+    historyCleanupMarker: GenericStorageQuery<Rv, () => PalletDappStakingV3CleanupMarker>;
 
     /**
      * Safeguard to prevent unwanted operations in production.
@@ -881,12 +951,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<boolean> =} callback
      **/
-    safeguard: GenericStorageQuery<() => boolean>;
+    safeguard: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Assets`'s storage queries
@@ -898,7 +968,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {bigint} arg
      * @param {Callback<PalletAssetsAssetDetails | undefined> =} callback
      **/
-    asset: GenericStorageQuery<(arg: bigint) => PalletAssetsAssetDetails | undefined>;
+    asset: GenericStorageQuery<Rv, (arg: bigint) => PalletAssetsAssetDetails | undefined, bigint>;
 
     /**
      * The holdings of a specific account for a specific asset.
@@ -906,7 +976,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[bigint, AccountId32Like]} arg
      * @param {Callback<PalletAssetsAssetAccount | undefined> =} callback
      **/
-    account: GenericStorageQuery<(arg: [bigint, AccountId32Like]) => PalletAssetsAssetAccount | undefined>;
+    account: GenericStorageQuery<
+      Rv,
+      (arg: [bigint, AccountId32Like]) => PalletAssetsAssetAccount | undefined,
+      [bigint, AccountId32]
+    >;
 
     /**
      * Approved balance transfers. First balance is the amount approved for transfer. Second
@@ -917,7 +991,9 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletAssetsApproval | undefined> =} callback
      **/
     approvals: GenericStorageQuery<
-      (arg: [bigint, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined
+      Rv,
+      (arg: [bigint, AccountId32Like, AccountId32Like]) => PalletAssetsApproval | undefined,
+      [bigint, AccountId32, AccountId32]
     >;
 
     /**
@@ -926,12 +1002,105 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {bigint} arg
      * @param {Callback<PalletAssetsAssetMetadata> =} callback
      **/
-    metadata: GenericStorageQuery<(arg: bigint) => PalletAssetsAssetMetadata>;
+    metadata: GenericStorageQuery<Rv, (arg: bigint) => PalletAssetsAssetMetadata, bigint>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery<Rv>;
+  };
+  /**
+   * Pallet `PriceAggregator`'s storage queries
+   **/
+  priceAggregator: {
+    /**
+     * Storage for the accumulated native currency price in the current block.
+     *
+     * @param {Callback<Array<FixedU128>> =} callback
+     **/
+    currentBlockValues: GenericStorageQuery<Rv, () => Array<FixedU128>>;
+
+    /**
+     * Used to store the aggregated processed block values during some time period.
+     *
+     * @param {Callback<PalletPriceAggregatorValueAggregator> =} callback
+     **/
+    intermediateValueAggregator: GenericStorageQuery<Rv, () => PalletPriceAggregatorValueAggregator>;
+
+    /**
+     * Used to store aggregated intermediate values for some time period.
+     *
+     * @param {Callback<PalletPriceAggregatorCircularBuffer> =} callback
+     **/
+    valuesCircularBuffer: GenericStorageQuery<Rv, () => PalletPriceAggregatorCircularBuffer>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery<Rv>;
+  };
+  /**
+   * Pallet `Oracle`'s storage queries
+   **/
+  oracle: {
+    /**
+     * Raw values for each oracle operators
+     *
+     * @param {[AccountId32Like, AstarPrimitivesOracleCurrencyId]} arg
+     * @param {Callback<OrmlOracleModuleTimestampedValue | undefined> =} callback
+     **/
+    rawValues: GenericStorageQuery<
+      Rv,
+      (arg: [AccountId32Like, AstarPrimitivesOracleCurrencyId]) => OrmlOracleModuleTimestampedValue | undefined,
+      [AccountId32, AstarPrimitivesOracleCurrencyId]
+    >;
+
+    /**
+     * Up to date combined value from Raw Values
+     *
+     * @param {AstarPrimitivesOracleCurrencyId} arg
+     * @param {Callback<OrmlOracleModuleTimestampedValue | undefined> =} callback
+     **/
+    values: GenericStorageQuery<
+      Rv,
+      (arg: AstarPrimitivesOracleCurrencyId) => OrmlOracleModuleTimestampedValue | undefined,
+      AstarPrimitivesOracleCurrencyId
+    >;
+
+    /**
+     * If an oracle operator has fed a value in this block
+     *
+     * @param {Callback<OrmlUtilitiesOrderedSet> =} callback
+     **/
+    hasDispatched: GenericStorageQuery<Rv, () => OrmlUtilitiesOrderedSet>;
+
+    /**
+     * Generic pallet storage query
+     **/
+    [storage: string]: GenericStorageQuery<Rv>;
+  };
+  /**
+   * Pallet `OracleMembership`'s storage queries
+   **/
+  oracleMembership: {
+    /**
+     * The current membership, stored as an ordered Vec.
+     *
+     * @param {Callback<Array<AccountId32>> =} callback
+     **/
+    members: GenericStorageQuery<Rv, () => Array<AccountId32>>;
+
+    /**
+     * The current prime member, if one exists.
+     *
+     * @param {Callback<AccountId32 | undefined> =} callback
+     **/
+    prime: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Authorship`'s storage queries
@@ -942,12 +1111,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 `CollatorSelection`'s storage queries
@@ -958,14 +1127,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<AccountId32>> =} callback
      **/
-    invulnerables: GenericStorageQuery<() => Array<AccountId32>>;
+    invulnerables: GenericStorageQuery<Rv, () => Array<AccountId32>>;
 
     /**
      * The (community, limited) collation candidates.
      *
      * @param {Callback<Array<PalletCollatorSelectionCandidateInfo>> =} callback
      **/
-    candidates: GenericStorageQuery<() => Array<PalletCollatorSelectionCandidateInfo>>;
+    candidates: GenericStorageQuery<Rv, () => Array<PalletCollatorSelectionCandidateInfo>>;
 
     /**
      * Last block authored by collator.
@@ -973,7 +1142,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<number> =} callback
      **/
-    lastAuthoredBlock: GenericStorageQuery<(arg: AccountId32Like) => number>;
+    lastAuthoredBlock: GenericStorageQuery<Rv, (arg: AccountId32Like) => number, AccountId32>;
 
     /**
      * Desired number of candidates.
@@ -982,7 +1151,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number> =} callback
      **/
-    desiredCandidates: GenericStorageQuery<() => number>;
+    desiredCandidates: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Fixed amount to deposit to become a collator.
@@ -991,19 +1160,19 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    candidacyBond: GenericStorageQuery<() => bigint>;
+    candidacyBond: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * Destination account for slashed amount.
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    slashDestination: GenericStorageQuery<() => AccountId32 | undefined>;
+    slashDestination: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Session`'s storage queries
@@ -1014,14 +1183,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
@@ -1029,7 +1198,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
@@ -1037,7 +1206,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[AccountId32, AstarRuntimeSessionKeys]>> =} callback
      **/
-    queuedKeys: GenericStorageQuery<() => Array<[AccountId32, AstarRuntimeSessionKeys]>>;
+    queuedKeys: GenericStorageQuery<Rv, () => Array<[AccountId32, AstarRuntimeSessionKeys]>>;
 
     /**
      * Indices of disabled validators.
@@ -1048,7 +1217,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.
@@ -1056,7 +1225,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {AccountId32Like} arg
      * @param {Callback<AstarRuntimeSessionKeys | undefined> =} callback
      **/
-    nextKeys: GenericStorageQuery<(arg: AccountId32Like) => AstarRuntimeSessionKeys | undefined>;
+    nextKeys: GenericStorageQuery<Rv, (arg: AccountId32Like) => AstarRuntimeSessionKeys | undefined, AccountId32>;
 
     /**
      * The owner of a key. The key is the `KeyTypeId` + the encoded key.
@@ -1064,12 +1233,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 `Aura`'s storage queries
@@ -1080,7 +1253,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.
@@ -1089,12 +1262,12 @@ 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 `AuraExt`'s storage queries
@@ -1104,17 +1277,26 @@ export interface ChainStorage extends GenericChainStorage {
      * Serves as cache for the authorities.
      *
      * The authorities in AuRa are overwritten in `on_initialize` when we switch to a new session,
-     * but we require the old authorities to verify the seal when validating a PoV. This will always
-     * be updated to the latest AuRa authorities in `on_finalize`.
+     * but we require the old authorities to verify the seal when validating a PoV. This will
+     * always be updated to the latest AuRa authorities in `on_finalize`.
      *
      * @param {Callback<Array<SpConsensusAuraSr25519AppSr25519Public>> =} callback
      **/
-    authorities: GenericStorageQuery<() => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+    authorities: GenericStorageQuery<Rv, () => Array<SpConsensusAuraSr25519AppSr25519Public>>;
+
+    /**
+     * Current slot paired with a number of authored blocks.
+     *
+     * Updated on each block initialization.
+     *
+     * @param {Callback<[SpConsensusSlotsSlot, number] | undefined> =} callback
+     **/
+    slotInfo: GenericStorageQuery<Rv, () => [SpConsensusSlotsSlot, number] | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `XcmpQueue`'s storage queries
@@ -1125,15 +1307,19 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueInboundChannelDetails>> =} callback
      **/
-    inboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueInboundChannelDetails>>;
+    inboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueInboundChannelDetails>>;
 
     /**
      * Inbound aggregate XCMP messages. It can only be one per ParaId/block.
      *
-     * @param {[PolkadotParachainPrimitivesId, number]} arg
+     * @param {[PolkadotParachainPrimitivesPrimitivesId, number]} arg
      * @param {Callback<Bytes> =} callback
      **/
-    inboundXcmpMessages: GenericStorageQuery<(arg: [PolkadotParachainPrimitivesId, number]) => Bytes>;
+    inboundXcmpMessages: GenericStorageQuery<
+      Rv,
+      (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
+      [PolkadotParachainPrimitivesPrimitivesId, number]
+    >;
 
     /**
      * The non-empty XCMP channels in order of becoming non-empty, and the index of the first
@@ -1145,30 +1331,38 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<CumulusPalletXcmpQueueOutboundChannelDetails>> =} callback
      **/
-    outboundXcmpStatus: GenericStorageQuery<() => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
+    outboundXcmpStatus: GenericStorageQuery<Rv, () => Array<CumulusPalletXcmpQueueOutboundChannelDetails>>;
 
     /**
      * The messages outbound in a given XCMP channel.
      *
-     * @param {[PolkadotParachainPrimitivesId, number]} arg
+     * @param {[PolkadotParachainPrimitivesPrimitivesId, number]} arg
      * @param {Callback<Bytes> =} callback
      **/
-    outboundXcmpMessages: GenericStorageQuery<(arg: [PolkadotParachainPrimitivesId, number]) => Bytes>;
+    outboundXcmpMessages: GenericStorageQuery<
+      Rv,
+      (arg: [PolkadotParachainPrimitivesPrimitivesId, number]) => Bytes,
+      [PolkadotParachainPrimitivesPrimitivesId, number]
+    >;
 
     /**
      * Any signal messages waiting to be sent.
      *
-     * @param {PolkadotParachainPrimitivesId} arg
+     * @param {PolkadotParachainPrimitivesPrimitivesId} arg
      * @param {Callback<Bytes> =} callback
      **/
-    signalMessages: GenericStorageQuery<(arg: PolkadotParachainPrimitivesId) => Bytes>;
+    signalMessages: GenericStorageQuery<
+      Rv,
+      (arg: PolkadotParachainPrimitivesPrimitivesId) => Bytes,
+      PolkadotParachainPrimitivesPrimitivesId
+    >;
 
     /**
      * The configuration which controls the dynamics of the outbound queue.
      *
      * @param {Callback<CumulusPalletXcmpQueueQueueConfigData> =} callback
      **/
-    queueConfig: GenericStorageQuery<() => CumulusPalletXcmpQueueQueueConfigData>;
+    queueConfig: GenericStorageQuery<Rv, () => CumulusPalletXcmpQueueQueueConfigData>;
 
     /**
      * The messages that exceeded max individual message weight budget.
@@ -1177,16 +1371,20 @@ export interface ChainStorage extends GenericChainStorage {
      * `service_overweight`.
      *
      * @param {bigint} arg
-     * @param {Callback<[PolkadotParachainPrimitivesId, number, Bytes] | undefined> =} callback
+     * @param {Callback<[PolkadotParachainPrimitivesPrimitivesId, number, Bytes] | undefined> =} callback
      **/
-    overweight: GenericStorageQuery<(arg: bigint) => [PolkadotParachainPrimitivesId, number, Bytes] | undefined>;
+    overweight: GenericStorageQuery<
+      Rv,
+      (arg: bigint) => [PolkadotParachainPrimitivesPrimitivesId, number, Bytes] | undefined,
+      bigint
+    >;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForOverweight: GenericStorageQuery<() => number>;
+    counterForOverweight: GenericStorageQuery<Rv, () => number>;
 
     /**
      * The number of overweight messages ever recorded in `Overweight`. Also doubles as the next
@@ -1194,19 +1392,31 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    overweightCount: GenericStorageQuery<() => bigint>;
+    overweightCount: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
      *
      * @param {Callback<boolean> =} callback
      **/
-    queueSuspended: GenericStorageQuery<() => boolean>;
+    queueSuspended: GenericStorageQuery<Rv, () => boolean>;
+
+    /**
+     * The factor to multiply the base delivery fee by.
+     *
+     * @param {PolkadotParachainPrimitivesPrimitivesId} arg
+     * @param {Callback<FixedU128> =} callback
+     **/
+    deliveryFeeFactor: GenericStorageQuery<
+      Rv,
+      (arg: PolkadotParachainPrimitivesPrimitivesId) => FixedU128,
+      PolkadotParachainPrimitivesPrimitivesId
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `PolkadotXcm`'s storage queries
@@ -1217,7 +1427,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    queryCounter: GenericStorageQuery<() => bigint>;
+    queryCounter: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The ongoing queries.
@@ -1225,7 +1435,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {bigint} arg
      * @param {Callback<PalletXcmQueryStatus | undefined> =} callback
      **/
-    queries: GenericStorageQuery<(arg: bigint) => PalletXcmQueryStatus | undefined>;
+    queries: GenericStorageQuery<Rv, (arg: bigint) => PalletXcmQueryStatus | undefined, bigint>;
 
     /**
      * The existing asset traps.
@@ -1236,7 +1446,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {H256} arg
      * @param {Callback<number> =} callback
      **/
-    assetTraps: GenericStorageQuery<(arg: H256) => number>;
+    assetTraps: GenericStorageQuery<Rv, (arg: H256) => number, H256>;
 
     /**
      * Default version to encode XCM when latest version of destination is unknown. If `None`,
@@ -1244,7 +1454,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<number | undefined> =} callback
      **/
-    safeXcmVersion: GenericStorageQuery<() => number | undefined>;
+    safeXcmVersion: GenericStorageQuery<Rv, () => number | undefined>;
 
     /**
      * The Latest versions that we know various locations support.
@@ -1252,7 +1462,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, XcmVersionedMultiLocation]} arg
      * @param {Callback<number | undefined> =} callback
      **/
-    supportedVersion: GenericStorageQuery<(arg: [number, XcmVersionedMultiLocation]) => number | undefined>;
+    supportedVersion: GenericStorageQuery<
+      Rv,
+      (arg: [number, XcmVersionedMultiLocation]) => number | undefined,
+      [number, XcmVersionedMultiLocation]
+    >;
 
     /**
      * All locations that we have requested version notifications from.
@@ -1260,7 +1474,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {[number, XcmVersionedMultiLocation]} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    versionNotifiers: GenericStorageQuery<(arg: [number, XcmVersionedMultiLocation]) => bigint | undefined>;
+    versionNotifiers: GenericStorageQuery<
+      Rv,
+      (arg: [number, XcmVersionedMultiLocation]) => bigint | undefined,
+      [number, XcmVersionedMultiLocation]
+    >;
 
     /**
      * The target locations that are subscribed to our version changes, as well as the most recent
@@ -1270,7 +1488,9 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<[bigint, SpWeightsWeightV2Weight, number] | undefined> =} callback
      **/
     versionNotifyTargets: GenericStorageQuery<
-      (arg: [number, XcmVersionedMultiLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined
+      Rv,
+      (arg: [number, XcmVersionedMultiLocation]) => [bigint, SpWeightsWeightV2Weight, number] | undefined,
+      [number, XcmVersionedMultiLocation]
     >;
 
     /**
@@ -1280,14 +1500,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<Array<[XcmVersionedMultiLocation, number]>> =} callback
      **/
-    versionDiscoveryQueue: GenericStorageQuery<() => Array<[XcmVersionedMultiLocation, number]>>;
+    versionDiscoveryQueue: GenericStorageQuery<Rv, () => Array<[XcmVersionedMultiLocation, number]>>;
 
     /**
      * The current migration's stage, if any.
      *
      * @param {Callback<PalletXcmVersionMigrationStage | undefined> =} callback
      **/
-    currentMigration: GenericStorageQuery<() => PalletXcmVersionMigrationStage | undefined>;
+    currentMigration: GenericStorageQuery<Rv, () => PalletXcmVersionMigrationStage | undefined>;
 
     /**
      * Fungible assets which we know are locked on a remote chain.
@@ -1296,7 +1516,9 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<PalletXcmRemoteLockedFungibleRecord | undefined> =} callback
      **/
     remoteLockedFungibles: GenericStorageQuery<
-      (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined
+      Rv,
+      (arg: [number, AccountId32Like, XcmVersionedAssetId]) => PalletXcmRemoteLockedFungibleRecord | undefined,
+      [number, AccountId32, XcmVersionedAssetId]
     >;
 
     /**
@@ -1306,7 +1528,9 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<Array<[bigint, XcmVersionedMultiLocation]> | undefined> =} callback
      **/
     lockedFungibles: GenericStorageQuery<
-      (arg: AccountId32Like) => Array<[bigint, XcmVersionedMultiLocation]> | undefined
+      Rv,
+      (arg: AccountId32Like) => Array<[bigint, XcmVersionedMultiLocation]> | undefined,
+      AccountId32
     >;
 
     /**
@@ -1314,12 +1538,12 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<boolean> =} callback
      **/
-    xcmExecutionSuspended: GenericStorageQuery<() => boolean>;
+    xcmExecutionSuspended: GenericStorageQuery<Rv, () => boolean>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `DmpQueue`'s storage queries
@@ -1330,14 +1554,14 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<CumulusPalletDmpQueueConfigData> =} callback
      **/
-    configuration: GenericStorageQuery<() => CumulusPalletDmpQueueConfigData>;
+    configuration: GenericStorageQuery<Rv, () => CumulusPalletDmpQueueConfigData>;
 
     /**
      * The page index.
      *
      * @param {Callback<CumulusPalletDmpQueuePageIndexData> =} callback
      **/
-    pageIndex: GenericStorageQuery<() => CumulusPalletDmpQueuePageIndexData>;
+    pageIndex: GenericStorageQuery<Rv, () => CumulusPalletDmpQueuePageIndexData>;
 
     /**
      * The queue pages.
@@ -1345,7 +1569,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {number} arg
      * @param {Callback<Array<[number, Bytes]>> =} callback
      **/
-    pages: GenericStorageQuery<(arg: number) => Array<[number, Bytes]>>;
+    pages: GenericStorageQuery<Rv, (arg: number) => Array<[number, Bytes]>, number>;
 
     /**
      * The overweight messages.
@@ -1353,19 +1577,19 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {bigint} arg
      * @param {Callback<[number, Bytes] | undefined> =} callback
      **/
-    overweight: GenericStorageQuery<(arg: bigint) => [number, Bytes] | undefined>;
+    overweight: GenericStorageQuery<Rv, (arg: bigint) => [number, Bytes] | undefined, bigint>;
 
     /**
      * Counter for the related counted storage map
      *
      * @param {Callback<number> =} callback
      **/
-    counterForOverweight: GenericStorageQuery<() => number>;
+    counterForOverweight: GenericStorageQuery<Rv, () => number>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `XcAssetConfig`'s storage queries
@@ -1379,7 +1603,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {bigint} arg
      * @param {Callback<XcmVersionedMultiLocation | undefined> =} callback
      **/
-    assetIdToLocation: GenericStorageQuery<(arg: bigint) => XcmVersionedMultiLocation | undefined>;
+    assetIdToLocation: GenericStorageQuery<Rv, (arg: bigint) => XcmVersionedMultiLocation | undefined, bigint>;
 
     /**
      * Mapping from an asset type to an asset id.
@@ -1389,7 +1613,11 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {XcmVersionedMultiLocation} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    assetLocationToId: GenericStorageQuery<(arg: XcmVersionedMultiLocation) => bigint | undefined>;
+    assetLocationToId: GenericStorageQuery<
+      Rv,
+      (arg: XcmVersionedMultiLocation) => bigint | undefined,
+      XcmVersionedMultiLocation
+    >;
 
     /**
      * Stores the units per second for local execution for a AssetLocation.
@@ -1400,42 +1628,53 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {XcmVersionedMultiLocation} arg
      * @param {Callback<bigint | undefined> =} callback
      **/
-    assetLocationUnitsPerSecond: GenericStorageQuery<(arg: XcmVersionedMultiLocation) => bigint | undefined>;
+    assetLocationUnitsPerSecond: GenericStorageQuery<
+      Rv,
+      (arg: XcmVersionedMultiLocation) => bigint | undefined,
+      XcmVersionedMultiLocation
+    >;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `EVM`'s storage queries
    **/
-  eVM: {
+  evm: {
     /**
      *
      * @param {H160} arg
      * @param {Callback<Bytes> =} callback
      **/
-    accountCodes: GenericStorageQuery<(arg: H160) => Bytes>;
+    accountCodes: GenericStorageQuery<Rv, (arg: H160) => Bytes, H160>;
 
     /**
      *
      * @param {H160} arg
      * @param {Callback<PalletEvmCodeMetadata | undefined> =} callback
      **/
-    accountCodesMetadata: GenericStorageQuery<(arg: H160) => PalletEvmCodeMetadata | undefined>;
+    accountCodesMetadata: GenericStorageQuery<Rv, (arg: H160) => PalletEvmCodeMetadata | undefined, H160>;
 
     /**
      *
      * @param {[H160, H256]} arg
      * @param {Callback<H256> =} callback
      **/
-    accountStorages: GenericStorageQuery<(arg: [H160, H256]) => H256>;
+    accountStorages: GenericStorageQuery<Rv, (arg: [H160, H256]) => H256, [H160, H256]>;
+
+    /**
+     *
+     * @param {H160} arg
+     * @param {Callback<[] | undefined> =} callback
+     **/
+    suicided: GenericStorageQuery<Rv, (arg: H160) => [] | undefined, H160>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Ethereum`'s storage queries
@@ -1447,6 +1686,7 @@ export interface ChainStorage extends GenericChainStorage {
      * @param {Callback<Array<[EthereumTransactionTransactionV2, FpRpcTransactionStatus, EthereumReceiptReceiptV3]>> =} callback
      **/
     pending: GenericStorageQuery<
+      Rv,
       () => Array<[EthereumTransactionTransactionV2, FpRpcTransactionStatus, EthereumReceiptReceiptV3]>
     >;
 
@@ -1455,33 +1695,33 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<EthereumBlock | undefined> =} callback
      **/
-    currentBlock: GenericStorageQuery<() => EthereumBlock | undefined>;
+    currentBlock: GenericStorageQuery<Rv, () => EthereumBlock | undefined>;
 
     /**
      * The current Ethereum receipts.
      *
      * @param {Callback<Array<EthereumReceiptReceiptV3> | undefined> =} callback
      **/
-    currentReceipts: GenericStorageQuery<() => Array<EthereumReceiptReceiptV3> | undefined>;
+    currentReceipts: GenericStorageQuery<Rv, () => Array<EthereumReceiptReceiptV3> | undefined>;
 
     /**
      * The current transaction statuses.
      *
      * @param {Callback<Array<FpRpcTransactionStatus> | undefined> =} callback
      **/
-    currentTransactionStatuses: GenericStorageQuery<() => Array<FpRpcTransactionStatus> | undefined>;
+    currentTransactionStatuses: GenericStorageQuery<Rv, () => Array<FpRpcTransactionStatus> | undefined>;
 
     /**
      *
      * @param {U256} arg
      * @param {Callback<H256> =} callback
      **/
-    blockHash: GenericStorageQuery<(arg: U256) => H256>;
+    blockHash: GenericStorageQuery<Rv, (arg: U256) => H256, U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `DynamicEvmBaseFee`'s storage queries
@@ -1491,40 +1731,32 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<U256> =} callback
      **/
-    baseFeePerGas: GenericStorageQuery<() => U256>;
+    baseFeePerGas: GenericStorageQuery<Rv, () => U256>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
   /**
    * Pallet `Contracts`'s storage queries
    **/
   contracts: {
     /**
-     * A mapping from an original code hash to the original code, untouched by instrumentation.
+     * A mapping from a contract's code hash to its code.
      *
      * @param {H256} arg
      * @param {Callback<Bytes | undefined> =} callback
      **/
-    pristineCode: GenericStorageQuery<(arg: H256) => Bytes | undefined>;
+    pristineCode: GenericStorageQuery<Rv, (arg: H256) => Bytes | undefined, H256>;
 
     /**
-     * A mapping between an original code hash and instrumented wasm code, ready for execution.
+     * A mapping from a contract's code hash to its code info.
      *
      * @param {H256} arg
-     * @param {Callback<PalletContractsWasmPrefabWasmModule | undefined> =} callback
+     * @param {Callback<PalletContractsWasmCodeInfo | undefined> =} callback
      **/
-    codeStorage: GenericStorageQuery<(arg: H256) => PalletContractsWasmPrefabWasmModule | undefined>;
-
-    /**
-     * A mapping between an original code hash and its owner information.
-     *
-     * @param {H256} arg
-     * @param {Callback<PalletContractsWasmOwnerInfo | undefined> =} callback
-     **/
-    ownerInfoOf: GenericStorageQuery<(arg: H256) => PalletContractsWasmOwnerInfo | undefined>;
+    codeInfoOf: GenericStorageQuery<Rv, (arg: H256) => PalletContractsWasmCodeInfo | undefined, H256>;
 
     /**
      * This is a **monotonic** counter incremented on contract instantiation.
@@ -1552,7 +1784,7 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<bigint> =} callback
      **/
-    nonce: GenericStorageQuery<() => bigint>;
+    nonce: GenericStorageQuery<Rv, () => bigint>;
 
     /**
      * The code associated with a given account.
@@ -1562,7 +1794,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.
@@ -1573,7 +1809,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
@@ -1581,18 +1817,20 @@ 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
+     * progress of the migration, enabling us to resume from the last completed position.
      *
      * @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 `Sudo`'s storage queries
@@ -1603,157 +1841,11 @@ export interface ChainStorage extends GenericChainStorage {
      *
      * @param {Callback<AccountId32 | undefined> =} callback
      **/
-    key: GenericStorageQuery<() => AccountId32 | undefined>;
-
-    /**
-     * Generic pallet storage query
-     **/
-    [storage: string]: GenericStorageQuery;
-  };
-  /**
-   * Pallet `StaticPriceProvider`'s storage queries
-   **/
-  staticPriceProvider: {
-    /**
-     * Current active native currency price.
-     *
-     * @param {Callback<FixedU64> =} callback
-     **/
-    activePrice: GenericStorageQuery<() => FixedU64>;
-
-    /**
-     * Generic pallet storage query
-     **/
-    [storage: string]: GenericStorageQuery;
-  };
-  /**
-   * Pallet `DappStakingMigration`'s storage queries
-   **/
-  dappStakingMigration: {
-    /**
-     * Used to store the current migration state.
-     *
-     * @param {Callback<PalletDappStakingMigrationMigrationState> =} callback
-     **/
-    migrationStateStorage: GenericStorageQuery<() => PalletDappStakingMigrationMigrationState>;
-
-    /**
-     * Generic pallet storage query
-     **/
-    [storage: string]: GenericStorageQuery;
-  };
-  /**
-   * Pallet `DappsStaking`'s storage queries
-   **/
-  dappsStaking: {
-    /**
-     * Denotes whether pallet is disabled (in maintenance mode) or not
-     *
-     * @param {Callback<boolean> =} callback
-     **/
-    palletDisabled: GenericStorageQuery<() => boolean>;
-
-    /**
-     * Denotes whether pallet decommissioning has started or not.
-     *
-     * @param {Callback<boolean> =} callback
-     **/
-    decommissionStarted: GenericStorageQuery<() => boolean>;
-
-    /**
-     * General information about the staker (non-smart-contract specific).
-     *
-     * @param {AccountId32Like} arg
-     * @param {Callback<PalletDappsStakingAccountLedger> =} callback
-     **/
-    ledger: GenericStorageQuery<(arg: AccountId32Like) => PalletDappsStakingAccountLedger>;
-
-    /**
-     * The current era index.
-     *
-     * @param {Callback<number> =} callback
-     **/
-    currentEra: GenericStorageQuery<() => number>;
-
-    /**
-     * Accumulator for block rewards during an era. It is reset at every new era
-     *
-     * @param {Callback<PalletDappsStakingRewardInfo> =} callback
-     **/
-    blockRewardAccumulator: GenericStorageQuery<() => PalletDappsStakingRewardInfo>;
-
-    /**
-     * Mode of era forcing.
-     *
-     * @param {Callback<PalletDappsStakingForcing> =} callback
-     **/
-    forceEra: GenericStorageQuery<() => PalletDappsStakingForcing>;
-
-    /**
-     * Stores the block number of when the next era starts
-     *
-     * @param {Callback<number> =} callback
-     **/
-    nextEraStartingBlock: GenericStorageQuery<() => number>;
-
-    /**
-     * Simple map where developer account points to their smart contract
-     *
-     * @param {AccountId32Like} arg
-     * @param {Callback<AstarPrimitivesDappStakingSmartContract | undefined> =} callback
-     **/
-    registeredDevelopers: GenericStorageQuery<
-      (arg: AccountId32Like) => AstarPrimitivesDappStakingSmartContract | undefined
-    >;
-
-    /**
-     * Simple map where smart contract points to basic info about it (e.g. developer address, state)
-     *
-     * @param {AstarPrimitivesDappStakingSmartContract} arg
-     * @param {Callback<PalletDappsStakingDAppInfo | undefined> =} callback
-     **/
-    registeredDapps: GenericStorageQuery<
-      (arg: AstarPrimitivesDappStakingSmartContract) => PalletDappsStakingDAppInfo | undefined
-    >;
-
-    /**
-     * General information about an era like TVL, total staked value, rewards.
-     *
-     * @param {number} arg
-     * @param {Callback<PalletDappsStakingEraInfo | undefined> =} callback
-     **/
-    generalEraInfo: GenericStorageQuery<(arg: number) => PalletDappsStakingEraInfo | undefined>;
-
-    /**
-     * Staking information about contract in a particular era.
-     *
-     * @param {[AstarPrimitivesDappStakingSmartContract, number]} arg
-     * @param {Callback<PalletDappsStakingContractStakeInfo | undefined> =} callback
-     **/
-    contractEraStake: GenericStorageQuery<
-      (arg: [AstarPrimitivesDappStakingSmartContract, number]) => PalletDappsStakingContractStakeInfo | undefined
-    >;
-
-    /**
-     * Info about stakers stakes on particular contracts.
-     *
-     * @param {[AccountId32Like, AstarPrimitivesDappStakingSmartContract]} arg
-     * @param {Callback<PalletDappsStakingStakerInfo> =} callback
-     **/
-    generalStakerInfo: GenericStorageQuery<
-      (arg: [AccountId32Like, AstarPrimitivesDappStakingSmartContract]) => PalletDappsStakingStakerInfo
-    >;
-
-    /**
-     * Stores the current pallet storage version.
-     *
-     * @param {Callback<PalletDappsStakingVersion> =} callback
-     **/
-    storageVersion: GenericStorageQuery<() => PalletDappsStakingVersion>;
+    key: GenericStorageQuery<Rv, () => AccountId32 | undefined>;
 
     /**
      * Generic pallet storage query
      **/
-    [storage: string]: GenericStorageQuery;
+    [storage: string]: GenericStorageQuery<Rv>;
   };
 }