@dedot/api 0.0.1-alpha.35 → 0.0.1-alpha.37

package/cjs/executor/v2/StorageQueryExecutorV2.js

@@ -40,20 +40,20 @@ class StorageQueryExecutorV2 extends StorageQueryExecutor_js_1.StorageQueryExecu
         // TODO subscribe to finalized data source
         // initialHash = this.chainHead.finalizedHash;
         // eventToListen = 'finalizedBlock';
-        const latestChanges = {};
+        const latestChanges = new Map();
         const pull = async ({ hash }) => {
             const results = await this.queryStorage(keys, hash);
             let changed = false;
             keys.forEach((key) => {
                 const newValue = results[key];
-                if (latestChanges[key] === newValue)
+                if (latestChanges.size > 0 && latestChanges.get(key) === newValue)
                     return;
                 changed = true;
-                latestChanges[key] = newValue;
+                latestChanges.set(key, newValue);
             });
             if (!changed)
                 return;
-            callback(keys.map((key) => latestChanges[key]));
+            callback(keys.map((key) => latestChanges.get(key)));
         };
         await pull(best);
         const unsub = this.chainHead.on(eventToListen, pull);

package/client/BaseSubstrateClient.d.ts

@@ -1,7 +1,8 @@
 import { BlockHash, Hash, Metadata, PortableRegistry, RuntimeVersion } from '@dedot/codecs';
 import type { JsonRpcProvider } from '@dedot/providers';
 import { type IStorage } from '@dedot/storage';
-import { GenericSubstrateApi, RpcVersion } from '@dedot/types';
+import { GenericSubstrateApi, RpcVersion, VersionedGenericSubstrateApi } from '@dedot/types';
+import type { SubstrateApi } from '../chaintypes/index.js';
 import { JsonRpcClient } from '../json-rpc/index.js';
 import type { ApiEvent, ApiOptions, ISubstrateClient, ISubstrateClientAt, JsonRpcClientOptions, MetadataKey, SubstrateRuntimeVersion } from '../types.js';
 export declare function ensurePresence<T>(value: T): NonNullable<T>;
@@ -9,7 +10,7 @@ export declare function ensurePresence<T>(value: T): NonNullable<T>;
  * @name BaseSubstrateClient
  * @description Base & shared abstraction for Substrate API Clients
  */
-export declare abstract class BaseSubstrateClient<ChainApi extends GenericSubstrateApi = GenericSubstrateApi> extends JsonRpcClient<ChainApi, ApiEvent> implements ISubstrateClient<ChainApi> {
+export declare abstract class BaseSubstrateClient<Rv extends RpcVersion, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends JsonRpcClient<ChainApi, ApiEvent> implements ISubstrateClient<ChainApi[Rv]> {
     rpcVersion: RpcVersion;
     protected _options: ApiOptions;
     protected _registry?: PortableRegistry;
@@ -53,12 +54,12 @@ export declare abstract class BaseSubstrateClient<ChainApi extends GenericSubstr
     get registry(): PortableRegistry;
     get genesisHash(): Hash;
     get runtimeVersion(): SubstrateRuntimeVersion;
-    get consts(): ChainApi['consts'];
-    get errors(): ChainApi['errors'];
-    get events(): ChainApi['events'];
-    get query(): ChainApi['query'];
-    get call(): ChainApi['call'];
-    protected callAt(hash?: BlockHash): ChainApi['call'];
-    get tx(): ChainApi['tx'];
-    at<ChainApiAt extends GenericSubstrateApi = ChainApi>(hash: BlockHash): Promise<ISubstrateClientAt<ChainApiAt>>;
+    get consts(): ChainApi[Rv]['consts'];
+    get errors(): ChainApi[Rv]['errors'];
+    get events(): ChainApi[Rv]['events'];
+    get query(): ChainApi[Rv]['query'];
+    get call(): ChainApi[Rv]['call'];
+    protected callAt(hash?: BlockHash): ChainApi[Rv]['call'];
+    get tx(): ChainApi[Rv]['tx'];
+    at<ChainApiAt extends GenericSubstrateApi = ChainApi[Rv]>(hash: BlockHash): Promise<ISubstrateClientAt<ChainApiAt>>;
 }

package/client/DedotClient.d.ts

@@ -12,7 +12,7 @@ import { BaseSubstrateClient } from './BaseSubstrateClient.js';
  * __Unstable, use with caution.__
  */
 export declare class DedotClient<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi>// prettier-end-here
- extends BaseSubstrateClient<ChainApi[RpcV2]> {
+ extends BaseSubstrateClient<RpcV2, ChainApi> {
     #private;
     protected _chainHead?: ChainHead;
     protected _chainSpec?: ChainSpec;

package/client/LegacyClient.d.ts

@@ -43,7 +43,7 @@ import { BaseSubstrateClient } from './BaseSubstrateClient.js';
  * ```
  */
 export declare class LegacyClient<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi>// prettier-end-here
- extends BaseSubstrateClient<ChainApi[RpcLegacy]> {
+ extends BaseSubstrateClient<RpcLegacy, ChainApi> {
     #private;
     /**
      * Use factory methods (`create`, `new`) to create `Dedot` instances.

package/executor/v2/StorageQueryExecutorV2.js

@@ -37,20 +37,20 @@ export class StorageQueryExecutorV2 extends StorageQueryExecutor {
         // TODO subscribe to finalized data source
         // initialHash = this.chainHead.finalizedHash;
         // eventToListen = 'finalizedBlock';
-        const latestChanges = {};
+        const latestChanges = new Map();
         const pull = async ({ hash }) => {
             const results = await this.queryStorage(keys, hash);
             let changed = false;
             keys.forEach((key) => {
                 const newValue = results[key];
-                if (latestChanges[key] === newValue)
+                if (latestChanges.size > 0 && latestChanges.get(key) === newValue)
                     return;
                 changed = true;
-                latestChanges[key] = newValue;
+                latestChanges.set(key, newValue);
             });
             if (!changed)
                 return;
-            callback(keys.map((key) => latestChanges[key]));
+            callback(keys.map((key) => latestChanges.get(key)));
         };
         await pull(best);
         const unsub = this.chainHead.on(eventToListen, pull);

package/json-rpc/JsonRpcClient.d.ts

@@ -1,10 +1,11 @@
 import type { ConnectionStatus, JsonRpcProvider, ProviderEvent } from '@dedot/providers';
-import type { GenericSubstrateApi, RpcVersion } from '@dedot/types';
+import type { RpcVersion, VersionedGenericSubstrateApi } from '@dedot/types';
 import { EventEmitter } from '@dedot/utils';
 import type { SubstrateApi } from '../chaintypes/index.js';
 import type { IJsonRpcClient, JsonRpcClientOptions } from '../types.js';
 export declare const isJsonRpcProvider: (provider: any) => provider is JsonRpcProvider;
-export declare class JsonRpcClient<ChainApi extends GenericSubstrateApi = SubstrateApi[RpcVersion], Events extends string = ProviderEvent> extends EventEmitter<Events> implements IJsonRpcClient<ChainApi, Events> {
+export declare class JsonRpcClient<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi, // prettier-end-here
+Events extends string = ProviderEvent> extends EventEmitter<Events> implements IJsonRpcClient<ChainApi[RpcVersion], Events> {
     #private;
     constructor(options: JsonRpcClientOptions | JsonRpcProvider);
     /**
@@ -12,13 +13,13 @@ export declare class JsonRpcClient<ChainApi extends GenericSubstrateApi = Substr
      *
      * @param options
      */
-    static create<ChainApi extends GenericSubstrateApi = SubstrateApi[RpcVersion]>(options: JsonRpcClientOptions | JsonRpcProvider): Promise<JsonRpcClient<ChainApi>>;
+    static create<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi>(options: JsonRpcClientOptions | JsonRpcProvider): Promise<JsonRpcClient<ChainApi>>;
     /**
      * Alias for __JsonRpcClient.create__
      *
      * @param options
      */
-    static new<ChainApi extends GenericSubstrateApi = SubstrateApi[RpcVersion]>(options: JsonRpcClientOptions | JsonRpcProvider): Promise<JsonRpcClient<ChainApi>>;
+    static new<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi>(options: JsonRpcClientOptions | JsonRpcProvider): Promise<JsonRpcClient<ChainApi>>;
     get options(): JsonRpcClientOptions;
     /**
      * @description Check connection status of the api instance
@@ -46,5 +47,5 @@ export declare class JsonRpcClient<ChainApi extends GenericSubstrateApi = Substr
      * const result = await client.rpc.module_rpc_name();
      * ```
      */
-    get rpc(): ChainApi['rpc'];
+    get rpc(): ChainApi[RpcVersion]['rpc'];
 }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@dedot/api",
-  "version": "0.0.1-alpha.35",
+  "version": "0.0.1-alpha.37",
   "description": "A delightful JavaScript/TypeScript client for Polkadot & Substrate",
   "author": "Thang X. Vu <thang@coongcrafts.io>",
-  "homepage": "https://github.com/dedotdev/dedot",
+  "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/api",
   "repository": {
     "directory": "packages/api",
     "type": "git",
@@ -13,13 +13,13 @@
   "type": "module",
   "sideEffects": false,
   "dependencies": {
-    "@dedot/codecs": "0.0.1-alpha.35",
-    "@dedot/providers": "0.0.1-alpha.35",
-    "@dedot/runtime-specs": "0.0.1-alpha.35",
-    "@dedot/shape": "0.0.1-alpha.35",
-    "@dedot/storage": "0.0.1-alpha.35",
-    "@dedot/types": "0.0.1-alpha.35",
-    "@dedot/utils": "0.0.1-alpha.35"
+    "@dedot/codecs": "0.0.1-alpha.37",
+    "@dedot/providers": "0.0.1-alpha.37",
+    "@dedot/runtime-specs": "0.0.1-alpha.37",
+    "@dedot/shape": "0.0.1-alpha.37",
+    "@dedot/storage": "0.0.1-alpha.37",
+    "@dedot/types": "0.0.1-alpha.37",
+    "@dedot/utils": "0.0.1-alpha.37"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json",
@@ -48,7 +48,7 @@
   "devDependencies": {
     "@polkadot/types": "^12.0.1"
   },
-  "gitHead": "bf954b82ac4c8a8e1d989c0c708a099269eb4262",
+  "gitHead": "6ed023a9455476d39ef810da46928b3f05621879",
   "module": "./index.js",
   "types": "./index.d.ts"
 }