@dedot/api 0.8.2-next.6cfafabd.24 → 0.9.0

package/cjs/client/BaseSubstrateClient.js

@@ -318,24 +318,19 @@ class BaseSubstrateClient extends index_js_2.JsonRpcClient {
             // Decode the value
             return entry.decodeValue(rawValue);
         };
-        // Create service directly when needed
-        let service;
-        if (this.rpcVersion === 'v2') {
-            service = new index_js_3.NewStorageQuery(this);
-        }
-        else {
-            service = new index_js_3.LegacyStorageQuery(this);
-        }
         // If a callback is provided, set up a subscription
         if (callback) {
-            return service.subscribe(keys, (results) => {
+            return this.getStorageQuery().subscribe(keys, (results) => {
                 callback(queries.map((q, i) => decodeValue(q.fn, results[keys[i]])));
             });
         }
         else {
-            const results = await service.query(keys);
+            const results = await this.getStorageQuery().query(keys);
             return queries.map((q, i) => decodeValue(q.fn, results[keys[i]]));
         }
     }
+    getStorageQuery() {
+        throw new Error('Unimplemented!');
+    }
 }
 exports.BaseSubstrateClient = BaseSubstrateClient;

package/cjs/client/DedotClient.js

@@ -7,6 +7,7 @@ const utils_1 = require("@dedot/utils");
 const index_js_1 = require("../executor/index.js");
 const index_js_2 = require("../json-rpc/index.js");
 const proxychain_js_1 = require("../proxychain.js");
+const index_js_3 = require("../storage/index.js");
 const BaseSubstrateClient_js_1 = require("./BaseSubstrateClient.js");
 /**
  * @name DedotClient
@@ -183,5 +184,8 @@ class DedotClient// prettier-end-here
         this.#apiAtCache[hash] = api;
         return api;
     }
+    getStorageQuery() {
+        return new index_js_3.NewStorageQuery(this);
+    }
 }
 exports.DedotClient = DedotClient;

package/cjs/client/LegacyClient.js

@@ -4,6 +4,7 @@ exports.LegacyClient = void 0;
 const codecs_1 = require("@dedot/codecs");
 const index_js_1 = require("../executor/index.js");
 const proxychain_js_1 = require("../proxychain.js");
+const index_js_2 = require("../storage/index.js");
 const BaseSubstrateClient_js_1 = require("./BaseSubstrateClient.js");
 const KEEP_ALIVE_INTERVAL = 10_000; // in ms
 /**
@@ -250,5 +251,8 @@ class LegacyClient// prettier-end-here
         this.#apiAtCache[hash] = api;
         return api;
     }
+    getStorageQuery() {
+        return new index_js_2.LegacyStorageQuery(this);
+    }
 }
 exports.LegacyClient = LegacyClient;

package/cjs/storage/LegacyStorageQuery.js

@@ -23,14 +23,15 @@ class LegacyStorageQuery extends BaseStorageQuery_js_1.BaseStorageQuery {
      * @returns Promise resolving to a record mapping storage keys to their values
      */
     async query(keys, at) {
+        const client = this.client;
         // Query storage at the specified block or current block
         const changeSets = at
-            ? await this.client.rpc.state_queryStorageAt(keys, at)
-            : await this.client.rpc.state_queryStorageAt(keys);
+            ? await client.rpc.state_queryStorageAt(keys, at)
+            : await client.rpc.state_queryStorageAt(keys);
         // Create a map of key -> value for easy lookup
         const results = {};
         // Initialize all keys with undefined
-        keys.forEach(key => results[key] = undefined);
+        keys.forEach((key) => (results[key] = undefined));
         // Update with actual values from the response
         if (changeSets && changeSets.length > 0) {
             changeSets[0].changes.forEach(([key, value]) => {
@@ -50,9 +51,10 @@ class LegacyStorageQuery extends BaseStorageQuery_js_1.BaseStorageQuery {
         // Track the latest changes for each key
         const lastChanges = {};
         // Initialize all keys with undefined
-        keys.forEach(key => lastChanges[key] = undefined);
+        keys.forEach((key) => (lastChanges[key] = undefined));
         // Subscribe to storage changes
-        return this.client.rpc.state_subscribeStorage(keys, (changeSet) => {
+        const client = this.client;
+        return client.rpc.state_subscribeStorage(keys, (changeSet) => {
             // Update the latest changes
             changeSet.changes.forEach(([key, value]) => {
                 if (lastChanges[key] !== value) {

package/client/BaseSubstrateClient.d.ts

@@ -5,6 +5,7 @@ import { Callback, GenericStorageQuery, GenericSubstrateApi, InjectedSigner, Que
 import { Deferred } from '@dedot/utils';
 import type { SubstrateApi } from '../chaintypes/index.js';
 import { JsonRpcClient } from '../json-rpc/index.js';
+import { BaseStorageQuery } from '../storage/index.js';
 import type { ApiEvent, ApiOptions, ISubstrateClient, ISubstrateClientAt, JsonRpcClientOptions, MetadataKey, SubstrateRuntimeVersion } from '../types.js';
 export declare function ensurePresence<T>(value: T): NonNullable<T>;
 /**
@@ -104,4 +105,5 @@ export declare abstract class BaseSubstrateClient<Rv extends RpcVersion, ChainAp
     }, callback: Callback<{
         [K in keyof Fns]: QueryFnResult<Fns[K]>;
     }>): Promise<Unsub>;
+    protected getStorageQuery(): BaseStorageQuery<RpcVersion>;
 }

package/client/BaseSubstrateClient.js

@@ -4,7 +4,7 @@ import { calcRuntimeApiHash, deferred, ensurePresence as _ensurePresence, u8aToH
 import { ConstantExecutor, ErrorExecutor, EventExecutor } from '../executor/index.js';
 import { isJsonRpcProvider, JsonRpcClient } from '../json-rpc/index.js';
 import { newProxyChain } from '../proxychain.js';
-import { LegacyStorageQuery, NewStorageQuery, QueryableStorage } from '../storage/index.js';
+import { QueryableStorage } from '../storage/index.js';
 const SUPPORTED_METADATA_VERSIONS = [15, 14];
 const MetadataApiHash = calcRuntimeApiHash('Metadata'); // 0x37e397fc7c91f5e4
 const MESSAGE = 'Make sure to call `.connect()` method first before using the API interfaces.';
@@ -314,23 +314,18 @@ export class BaseSubstrateClient extends JsonRpcClient {
             // Decode the value
             return entry.decodeValue(rawValue);
         };
-        // Create service directly when needed
-        let service;
-        if (this.rpcVersion === 'v2') {
-            service = new NewStorageQuery(this);
-        }
-        else {
-            service = new LegacyStorageQuery(this);
-        }
         // If a callback is provided, set up a subscription
         if (callback) {
-            return service.subscribe(keys, (results) => {
+            return this.getStorageQuery().subscribe(keys, (results) => {
                 callback(queries.map((q, i) => decodeValue(q.fn, results[keys[i]])));
             });
         }
         else {
-            const results = await service.query(keys);
+            const results = await this.getStorageQuery().query(keys);
             return queries.map((q, i) => decodeValue(q.fn, results[keys[i]]));
         }
     }
+    getStorageQuery() {
+        throw new Error('Unimplemented!');
+    }
 }

package/client/DedotClient.d.ts

@@ -1,8 +1,9 @@
 import { BlockHash } from '@dedot/codecs';
 import type { JsonRpcProvider } from '@dedot/providers';
-import { GenericSubstrateApi, RpcV2, VersionedGenericSubstrateApi } from '@dedot/types';
+import { GenericSubstrateApi, RpcV2, RpcVersion, VersionedGenericSubstrateApi } from '@dedot/types';
 import type { SubstrateApi } from '../chaintypes/index.js';
 import { ChainHead, ChainSpec, PinnedBlock } from '../json-rpc/index.js';
+import { BaseStorageQuery } from '../storage/index.js';
 import type { ApiOptions, ISubstrateClientAt, TxBroadcaster } from '../types.js';
 import { BaseSubstrateClient } from './BaseSubstrateClient.js';
 /**
@@ -58,4 +59,5 @@ export declare class DedotClient<ChainApi extends VersionedGenericSubstrateApi =
      * @param hash
      */
     at<ChainApiAt extends GenericSubstrateApi = ChainApi[RpcV2]>(hash: BlockHash): Promise<ISubstrateClientAt<ChainApiAt>>;
+    protected getStorageQuery(): BaseStorageQuery<RpcVersion>;
 }

package/client/DedotClient.js

@@ -1,9 +1,10 @@
 import { $H256, PortableRegistry } from '@dedot/codecs';
 import { u32 } from '@dedot/shape';
 import { assert, concatU8a, noop, twox64Concat, u8aToHex, xxhashAsU8a } from '@dedot/utils';
-import { ConstantExecutor, ErrorExecutor, EventExecutor, RuntimeApiExecutorV2, StorageQueryExecutorV2, TxExecutorV2 } from '../executor/index.js';
+import { ConstantExecutor, ErrorExecutor, EventExecutor, RuntimeApiExecutorV2, StorageQueryExecutorV2, TxExecutorV2, } from '../executor/index.js';
 import { ChainHead, ChainSpec, Transaction, TransactionWatch } from '../json-rpc/index.js';
 import { newProxyChain } from '../proxychain.js';
+import { NewStorageQuery } from '../storage/index.js';
 import { BaseSubstrateClient, ensurePresence } from './BaseSubstrateClient.js';
 /**
  * @name DedotClient
@@ -180,4 +181,7 @@ export class DedotClient// prettier-end-here
         this.#apiAtCache[hash] = api;
         return api;
     }
+    getStorageQuery() {
+        return new NewStorageQuery(this);
+    }
 }

package/client/LegacyClient.d.ts

@@ -1,7 +1,8 @@
 import { BlockHash } from '@dedot/codecs';
 import type { JsonRpcProvider } from '@dedot/providers';
-import { GenericSubstrateApi, RpcLegacy, VersionedGenericSubstrateApi } from '@dedot/types';
+import { GenericSubstrateApi, RpcLegacy, RpcVersion, VersionedGenericSubstrateApi } from '@dedot/types';
 import type { SubstrateApi } from '../chaintypes/index.js';
+import { BaseStorageQuery } from '../storage/index.js';
 import type { ApiOptions, ISubstrateClientAt } from '../types.js';
 import { BaseSubstrateClient } from './BaseSubstrateClient.js';
 /**
@@ -129,4 +130,5 @@ export declare class LegacyClient<ChainApi extends VersionedGenericSubstrateApi
      * @param hash
      */
     at<ChainApiAt extends GenericSubstrateApi = ChainApi[RpcLegacy]>(hash: BlockHash): Promise<ISubstrateClientAt<ChainApiAt>>;
+    protected getStorageQuery(): BaseStorageQuery<RpcVersion>;
 }

package/client/LegacyClient.js

@@ -1,6 +1,7 @@
 import { PortableRegistry } from '@dedot/codecs';
 import { ConstantExecutor, ErrorExecutor, EventExecutor, RuntimeApiExecutor, StorageQueryExecutor, TxExecutor, } from '../executor/index.js';
 import { newProxyChain } from '../proxychain.js';
+import { LegacyStorageQuery } from '../storage/index.js';
 import { BaseSubstrateClient } from './BaseSubstrateClient.js';
 const KEEP_ALIVE_INTERVAL = 10_000; // in ms
 /**
@@ -247,4 +248,7 @@ export class LegacyClient// prettier-end-here
         this.#apiAtCache[hash] = api;
         return api;
     }
+    getStorageQuery() {
+        return new LegacyStorageQuery(this);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/api",
-  "version": "0.8.2-next.6cfafabd.24+6cfafab",
+  "version": "0.9.0",
   "description": "A delightful JavaScript/TypeScript client for Polkadot & Substrate",
   "author": "Thang X. Vu <thang@coongcrafts.io>",
   "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/api",
@@ -13,13 +13,13 @@
   "type": "module",
   "sideEffects": false,
   "dependencies": {
-    "@dedot/codecs": "0.8.2-next.6cfafabd.24+6cfafab",
-    "@dedot/providers": "0.8.2-next.6cfafabd.24+6cfafab",
-    "@dedot/runtime-specs": "0.8.2-next.6cfafabd.24+6cfafab",
-    "@dedot/shape": "0.8.2-next.6cfafabd.24+6cfafab",
-    "@dedot/storage": "0.8.2-next.6cfafabd.24+6cfafab",
-    "@dedot/types": "0.8.2-next.6cfafabd.24+6cfafab",
-    "@dedot/utils": "0.8.2-next.6cfafabd.24+6cfafab"
+    "@dedot/codecs": "0.9.0",
+    "@dedot/providers": "0.9.0",
+    "@dedot/runtime-specs": "0.9.0",
+    "@dedot/shape": "0.9.0",
+    "@dedot/storage": "0.9.0",
+    "@dedot/types": "0.9.0",
+    "@dedot/utils": "0.9.0"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json",
@@ -48,7 +48,7 @@
     "node": ">=18"
   },
   "license": "Apache-2.0",
-  "gitHead": "6cfafabd52dbc7e5bd3ded135e9617fc412bba2b",
+  "gitHead": "cebae55a3525e2c9bcdd70322027855a594a287d",
   "module": "./index.js",
   "types": "./index.d.ts"
 }

package/storage/LegacyStorageQuery.js

@@ -20,14 +20,15 @@ export class LegacyStorageQuery extends BaseStorageQuery {
      * @returns Promise resolving to a record mapping storage keys to their values
      */
     async query(keys, at) {
+        const client = this.client;
         // Query storage at the specified block or current block
         const changeSets = at
-            ? await this.client.rpc.state_queryStorageAt(keys, at)
-            : await this.client.rpc.state_queryStorageAt(keys);
+            ? await client.rpc.state_queryStorageAt(keys, at)
+            : await client.rpc.state_queryStorageAt(keys);
         // Create a map of key -> value for easy lookup
         const results = {};
         // Initialize all keys with undefined
-        keys.forEach(key => results[key] = undefined);
+        keys.forEach((key) => (results[key] = undefined));
         // Update with actual values from the response
         if (changeSets && changeSets.length > 0) {
             changeSets[0].changes.forEach(([key, value]) => {
@@ -47,9 +48,10 @@ export class LegacyStorageQuery extends BaseStorageQuery {
         // Track the latest changes for each key
         const lastChanges = {};
         // Initialize all keys with undefined
-        keys.forEach(key => lastChanges[key] = undefined);
+        keys.forEach((key) => (lastChanges[key] = undefined));
         // Subscribe to storage changes
-        return this.client.rpc.state_subscribeStorage(keys, (changeSet) => {
+        const client = this.client;
+        return client.rpc.state_subscribeStorage(keys, (changeSet) => {
             // Update the latest changes
             changeSet.changes.forEach(([key, value]) => {
                 if (lastChanges[key] !== value) {