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

package/cjs/client/BaseSubstrateClient.js

@@ -197,9 +197,12 @@ class BaseSubstrateClient extends index_js_2.JsonRpcClient {
         await this._localCache?.clear();
     }
     async doConnect() {
+        // @ts-ignore
         this.on('connected', this.onConnected);
+        // @ts-ignore
         this.on('disconnected', this.onDisconnected);
         return new Promise((resolve) => {
+            // @ts-ignore
             this.once('ready', () => {
                 resolve(this);
             });
@@ -212,6 +215,7 @@ class BaseSubstrateClient extends index_js_2.JsonRpcClient {
     async initialize() {
         await this.initializeLocalCache();
         await this.doInitialize();
+        // @ts-ignore
         this.emit('ready');
     }
     async doInitialize() {
@@ -318,24 +322,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
@@ -84,6 +85,11 @@ class DedotClient// prettier-end-here
         }
         await this.setupMetadata(metadata);
         this.subscribeRuntimeUpgrades();
+        // relegate events
+        this.chainHead.on('newBlock', (...args) => this.emit('newBlock', ...args));
+        this.chainHead.on('bestBlock', (...args) => this.emit('bestBlock', ...args));
+        this.chainHead.on('finalizedBlock', (...args) => this.emit('finalizedBlock', ...args));
+        this.chainHead.on('bestChainChanged', (...args) => this.emit('bestChainChanged', ...args));
     }
     /**
      * Ref: https://github.com/paritytech/polkadot-sdk/blob/bbd51ce867967f71657b901f1a956ad4f75d352e/substrate/frame/system/src/lib.rs#L909-L913
@@ -183,5 +189,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
 /**
@@ -137,8 +138,13 @@ class LegacyClient// prettier-end-here
         if (!this.#runtimeSubscriptionUnsub) {
             return;
         }
-        await this.#runtimeSubscriptionUnsub();
-        this.#runtimeSubscriptionUnsub = undefined;
+        try {
+            await this.#runtimeSubscriptionUnsub();
+            this.#runtimeSubscriptionUnsub = undefined;
+        }
+        catch {
+            // ignore
+        }
     }
     #subscribeUpdates() {
         this.#subscribeRuntimeUpgrades();
@@ -250,5 +256,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/extrinsic/submittable/SubmittableExtrinsicV2.js

@@ -163,8 +163,8 @@ class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic_js_1.BaseSubmittab
             status: { type: 'Broadcasting' },
             txHash,
         }));
-        const stopBestBlockTrackingFn = api.chainHead.on('bestBlock', checkBestBlockIncluded);
-        const stopFinalizedBlockTrackingFn = api.chainHead.on('finalizedBlock', checkFinalizedBlockIncluded);
+        const stopBestBlockTrackingFn = api.on('bestBlock', checkBestBlockIncluded);
+        const stopFinalizedBlockTrackingFn = api.on('finalizedBlock', checkFinalizedBlockIncluded);
         const stopTracking = () => {
             stopBestBlockTrackingFn();
             stopFinalizedBlockTrackingFn();

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/cjs/storage/NewStorageQuery.js

@@ -24,7 +24,7 @@ class NewStorageQuery extends BaseStorageQuery_js_1.BaseStorageQuery {
      */
     async query(keys, at) {
         // Query storage using ChainHead API
-        const storageQueries = keys.map(key => ({ type: 'value', key }));
+        const storageQueries = keys.map((key) => ({ type: 'value', key }));
         // Use the provided block hash or skip it in tests
         const rawResults = at
             ? await this.client.chainHead.storage(storageQueries, undefined, at)
@@ -32,7 +32,7 @@ class NewStorageQuery extends BaseStorageQuery_js_1.BaseStorageQuery {
         // 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
         rawResults.forEach((result) => {
             results[result.key] = result.value ?? undefined;
@@ -54,7 +54,7 @@ class NewStorageQuery extends BaseStorageQuery_js_1.BaseStorageQuery {
         // Function to pull storage values and call the callback if there are changes
         const pull = async ({ hash }) => {
             // Query storage using ChainHead API
-            const storageQueries = keys.map(key => ({ type: 'value', key }));
+            const storageQueries = keys.map((key) => ({ type: 'value', key }));
             const rawResults = await this.client.chainHead.storage(storageQueries, undefined, hash);
             let changed = false;
             // Create a map for easy lookup
@@ -76,7 +76,7 @@ class NewStorageQuery extends BaseStorageQuery_js_1.BaseStorageQuery {
         // Initial pull
         await pull(best);
         // Subscribe to best block events
-        const unsub = this.client.chainHead.on('bestBlock', pull);
+        const unsub = this.client.on('bestBlock', pull);
         return async () => {
             unsub();
         };

package/client/BaseSubstrateClient.d.ts

@@ -5,13 +5,14 @@ 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>;
 /**
  * @name BaseSubstrateClient
  * @description Base & shared abstraction for Substrate API Clients
  */
-export declare abstract class BaseSubstrateClient<Rv extends RpcVersion, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends JsonRpcClient<ChainApi, ApiEvent> implements ISubstrateClient<ChainApi[Rv]> {
+export declare abstract class BaseSubstrateClient<Rv extends RpcVersion, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi, Events extends string = ApiEvent> extends JsonRpcClient<ChainApi, Events> implements ISubstrateClient<ChainApi[Rv], Events> {
     rpcVersion: RpcVersion;
     protected _options: ApiOptions;
     protected _registry?: PortableRegistry;
@@ -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.';
@@ -193,9 +193,12 @@ export class BaseSubstrateClient extends JsonRpcClient {
         await this._localCache?.clear();
     }
     async doConnect() {
+        // @ts-ignore
         this.on('connected', this.onConnected);
+        // @ts-ignore
         this.on('disconnected', this.onDisconnected);
         return new Promise((resolve) => {
+            // @ts-ignore
             this.once('ready', () => {
                 resolve(this);
             });
@@ -208,6 +211,7 @@ export class BaseSubstrateClient extends JsonRpcClient {
     async initialize() {
         await this.initializeLocalCache();
         await this.doInitialize();
+        // @ts-ignore
         this.emit('ready');
     }
     async doInitialize() {
@@ -314,23 +318,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,9 +1,10 @@
 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 type { ApiOptions, ISubstrateClientAt, TxBroadcaster } from '../types.js';
+import { BaseStorageQuery } from '../storage/index.js';
+import type { ApiOptions, DedotClientEvent, ISubstrateClientAt, TxBroadcaster } from '../types.js';
 import { BaseSubstrateClient } from './BaseSubstrateClient.js';
 /**
  * @name DedotClient
@@ -12,7 +13,7 @@ import { BaseSubstrateClient } from './BaseSubstrateClient.js';
  * __Unstable, use with caution.__
  */
 export declare class DedotClient<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi>// prettier-end-here
- extends BaseSubstrateClient<RpcV2, ChainApi> {
+ extends BaseSubstrateClient<RpcV2, ChainApi, DedotClientEvent> {
     #private;
     protected _chainHead?: ChainHead;
     protected _chainSpec?: ChainSpec;
@@ -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
@@ -81,6 +82,11 @@ export class DedotClient// prettier-end-here
         }
         await this.setupMetadata(metadata);
         this.subscribeRuntimeUpgrades();
+        // relegate events
+        this.chainHead.on('newBlock', (...args) => this.emit('newBlock', ...args));
+        this.chainHead.on('bestBlock', (...args) => this.emit('bestBlock', ...args));
+        this.chainHead.on('finalizedBlock', (...args) => this.emit('finalizedBlock', ...args));
+        this.chainHead.on('bestChainChanged', (...args) => this.emit('bestChainChanged', ...args));
     }
     /**
      * Ref: https://github.com/paritytech/polkadot-sdk/blob/bbd51ce867967f71657b901f1a956ad4f75d352e/substrate/frame/system/src/lib.rs#L909-L913
@@ -180,4 +186,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
 /**
@@ -134,8 +135,13 @@ export class LegacyClient// prettier-end-here
         if (!this.#runtimeSubscriptionUnsub) {
             return;
         }
-        await this.#runtimeSubscriptionUnsub();
-        this.#runtimeSubscriptionUnsub = undefined;
+        try {
+            await this.#runtimeSubscriptionUnsub();
+            this.#runtimeSubscriptionUnsub = undefined;
+        }
+        catch {
+            // ignore
+        }
     }
     #subscribeUpdates() {
         this.#subscribeRuntimeUpgrades();
@@ -247,4 +253,7 @@ export class LegacyClient// prettier-end-here
         this.#apiAtCache[hash] = api;
         return api;
     }
+    getStorageQuery() {
+        return new LegacyStorageQuery(this);
+    }
 }

package/extrinsic/submittable/SubmittableExtrinsicV2.js

@@ -160,8 +160,8 @@ export class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic {
             status: { type: 'Broadcasting' },
             txHash,
         }));
-        const stopBestBlockTrackingFn = api.chainHead.on('bestBlock', checkBestBlockIncluded);
-        const stopFinalizedBlockTrackingFn = api.chainHead.on('finalizedBlock', checkFinalizedBlockIncluded);
+        const stopBestBlockTrackingFn = api.on('bestBlock', checkBestBlockIncluded);
+        const stopFinalizedBlockTrackingFn = api.on('finalizedBlock', checkFinalizedBlockIncluded);
         const stopTracking = () => {
             stopBestBlockTrackingFn();
             stopFinalizedBlockTrackingFn();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/api",
-  "version": "0.8.2-next.6cfafabd.24+6cfafab",
+  "version": "0.9.1",
   "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.1",
+    "@dedot/providers": "0.9.1",
+    "@dedot/runtime-specs": "0.9.1",
+    "@dedot/shape": "0.9.1",
+    "@dedot/storage": "0.9.1",
+    "@dedot/types": "0.9.1",
+    "@dedot/utils": "0.9.1"
   },
   "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": "9329cadcd2062d0f10dc1d8f700d8ade25214199",
   "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) {

package/storage/NewStorageQuery.js

@@ -21,7 +21,7 @@ export class NewStorageQuery extends BaseStorageQuery {
      */
     async query(keys, at) {
         // Query storage using ChainHead API
-        const storageQueries = keys.map(key => ({ type: 'value', key }));
+        const storageQueries = keys.map((key) => ({ type: 'value', key }));
         // Use the provided block hash or skip it in tests
         const rawResults = at
             ? await this.client.chainHead.storage(storageQueries, undefined, at)
@@ -29,7 +29,7 @@ export class NewStorageQuery extends BaseStorageQuery {
         // 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
         rawResults.forEach((result) => {
             results[result.key] = result.value ?? undefined;
@@ -51,7 +51,7 @@ export class NewStorageQuery extends BaseStorageQuery {
         // Function to pull storage values and call the callback if there are changes
         const pull = async ({ hash }) => {
             // Query storage using ChainHead API
-            const storageQueries = keys.map(key => ({ type: 'value', key }));
+            const storageQueries = keys.map((key) => ({ type: 'value', key }));
             const rawResults = await this.client.chainHead.storage(storageQueries, undefined, hash);
             let changed = false;
             // Create a map for easy lookup
@@ -73,7 +73,7 @@ export class NewStorageQuery extends BaseStorageQuery {
         // Initial pull
         await pull(best);
         // Subscribe to best block events
-        const unsub = this.client.chainHead.on('bestBlock', pull);
+        const unsub = this.client.on('bestBlock', pull);
         return async () => {
             unsub();
         };

package/types.d.ts

@@ -1,3 +1,4 @@
+import { ChainHeadEvent } from '@dedot/api/json-rpc';
 import { BlockHash, Hash, Metadata, PortableRegistry } from '@dedot/codecs';
 import type { ConnectionStatus, JsonRpcProvider, ProviderEvent } from '@dedot/providers';
 import type { AnyShape } from '@dedot/shape';
@@ -61,6 +62,7 @@ export interface ApiOptions extends JsonRpcClientOptions {
     signer?: InjectedSigner;
 }
 export type ApiEvent = ProviderEvent | 'ready' | 'runtimeUpgraded';
+export type DedotClientEvent = ApiEvent | ChainHeadEvent;
 export interface SubstrateRuntimeVersion {
     specName: string;
     implName: string;