@dedot/api 0.18.3 → 0.18.5

package/cjs/client/BaseSubstrateClient.js

@@ -159,11 +159,27 @@ class BaseSubstrateClient extends index_js_2.JsonRpcClient {
             return codecs_1.$Metadata.tryDecode(this.options.metadata[key]);
         }
     }
+    /**
+     * Find metadata from cached API instances by specVersion
+     * This allows reusing metadata from previously created API instances
+     * instead of downloading it again from the network
+     */
+    findMetadataInCache(specVersion) {
+        const entries = this._apiAtCache.entries();
+        for (const [_, apiInstance] of entries) {
+            const api = apiInstance;
+            if (api?.runtimeVersion?.specVersion === specVersion) {
+                return [api.metadata, api.registry];
+            }
+        }
+        return undefined;
+    }
     async fetchMetadata(hash, runtime) {
         // First try finding metadata from the provided option
         const optionMetadata = this.getMetadataFromOptions(runtime);
         if (optionMetadata)
             return optionMetadata;
+        // Last resort: download metadata from the network
         // If there is no runtime, we assume that the node supports Metadata Api V2
         const supportedV2 = runtime ? runtime.apis[MetadataApiHash] === 2 : true;
         if (supportedV2) {

package/cjs/client/DedotClient.js

@@ -234,8 +234,15 @@ class DedotClient// prettier-end-here
         let metadata = this.metadata;
         let registry = this.registry;
         if (parentVersion && parentVersion.specVersion !== this.runtimeVersion.specVersion) {
-            metadata = await this.fetchMetadata(parentHash, parentVersion);
-            registry = new codecs_1.PortableRegistry(metadata.latest, this.options.hasher);
+            const cachedMetadata = this.findMetadataInCache(parentVersion.specVersion);
+            if (cachedMetadata) {
+                metadata = cachedMetadata[0];
+                registry = cachedMetadata[1];
+            }
+            else {
+                metadata = await this.fetchMetadata(parentHash, parentVersion);
+                registry = new codecs_1.PortableRegistry(metadata.latest, this.options.hasher);
+            }
         }
         const api = {
             rpcVersion: 'v2',

package/cjs/client/LegacyClient.js

@@ -239,8 +239,15 @@ class LegacyClient// prettier-end-here
         let metadata = this.metadata;
         let registry = this.registry;
         if (targetVersion.specVersion !== this.runtimeVersion.specVersion) {
-            metadata = await this.fetchMetadata(parentHash, targetVersion);
-            registry = new codecs_1.PortableRegistry(metadata.latest, this.options.hasher);
+            const cachedMetadata = this.findMetadataInCache(targetVersion.specVersion);
+            if (cachedMetadata) {
+                metadata = cachedMetadata[0];
+                registry = cachedMetadata[1];
+            }
+            else {
+                metadata = await this.fetchMetadata(parentHash, targetVersion);
+                registry = new codecs_1.PortableRegistry(metadata.latest, this.options.hasher);
+            }
         }
         const api = {
             rpcVersion: 'legacy',

package/cjs/extrinsic/submittable/BaseSubmittableExtrinsic.js

@@ -96,7 +96,11 @@ class BaseSubmittableExtrinsic extends codecs_1.Extrinsic {
                 deferFinalized()?.reject(e);
             });
         })
-            .catch(deferTx.reject);
+            .catch((e) => {
+            deferBestChainBlockIncluded()?.reject(e);
+            deferFinalized()?.reject(e);
+            deferTx.reject(e);
+        });
         return deferTx.promise;
     }
     #normalizeOptions(partialOptions, callback) {

package/client/BaseSubstrateClient.d.ts

@@ -35,6 +35,12 @@ export declare abstract class BaseSubstrateClient<Rv extends RpcVersion, ChainAp
     get currentMetadataKey(): string;
     protected shouldPreloadMetadata(): Promise<boolean>;
     protected getMetadataFromOptions(runtime?: SubstrateRuntimeVersion): Metadata | undefined;
+    /**
+     * Find metadata from cached API instances by specVersion
+     * This allows reusing metadata from previously created API instances
+     * instead of downloading it again from the network
+     */
+    protected findMetadataInCache(specVersion: number): [Metadata, PortableRegistry] | undefined;
     protected fetchMetadata(hash?: BlockHash, runtime?: SubstrateRuntimeVersion): Promise<Metadata>;
     protected cleanUp(): void;
     /**

package/client/BaseSubstrateClient.js

@@ -155,11 +155,27 @@ export class BaseSubstrateClient extends JsonRpcClient {
             return $Metadata.tryDecode(this.options.metadata[key]);
         }
     }
+    /**
+     * Find metadata from cached API instances by specVersion
+     * This allows reusing metadata from previously created API instances
+     * instead of downloading it again from the network
+     */
+    findMetadataInCache(specVersion) {
+        const entries = this._apiAtCache.entries();
+        for (const [_, apiInstance] of entries) {
+            const api = apiInstance;
+            if (api?.runtimeVersion?.specVersion === specVersion) {
+                return [api.metadata, api.registry];
+            }
+        }
+        return undefined;
+    }
     async fetchMetadata(hash, runtime) {
         // First try finding metadata from the provided option
         const optionMetadata = this.getMetadataFromOptions(runtime);
         if (optionMetadata)
             return optionMetadata;
+        // Last resort: download metadata from the network
         // If there is no runtime, we assume that the node supports Metadata Api V2
         const supportedV2 = runtime ? runtime.apis[MetadataApiHash] === 2 : true;
         if (supportedV2) {

package/client/DedotClient.js

@@ -231,8 +231,15 @@ export class DedotClient// prettier-end-here
         let metadata = this.metadata;
         let registry = this.registry;
         if (parentVersion && parentVersion.specVersion !== this.runtimeVersion.specVersion) {
-            metadata = await this.fetchMetadata(parentHash, parentVersion);
-            registry = new PortableRegistry(metadata.latest, this.options.hasher);
+            const cachedMetadata = this.findMetadataInCache(parentVersion.specVersion);
+            if (cachedMetadata) {
+                metadata = cachedMetadata[0];
+                registry = cachedMetadata[1];
+            }
+            else {
+                metadata = await this.fetchMetadata(parentHash, parentVersion);
+                registry = new PortableRegistry(metadata.latest, this.options.hasher);
+            }
         }
         const api = {
             rpcVersion: 'v2',

package/client/LegacyClient.js

@@ -236,8 +236,15 @@ export class LegacyClient// prettier-end-here
         let metadata = this.metadata;
         let registry = this.registry;
         if (targetVersion.specVersion !== this.runtimeVersion.specVersion) {
-            metadata = await this.fetchMetadata(parentHash, targetVersion);
-            registry = new PortableRegistry(metadata.latest, this.options.hasher);
+            const cachedMetadata = this.findMetadataInCache(targetVersion.specVersion);
+            if (cachedMetadata) {
+                metadata = cachedMetadata[0];
+                registry = cachedMetadata[1];
+            }
+            else {
+                metadata = await this.fetchMetadata(parentHash, targetVersion);
+                registry = new PortableRegistry(metadata.latest, this.options.hasher);
+            }
         }
         const api = {
             rpcVersion: 'legacy',

package/extrinsic/submittable/BaseSubmittableExtrinsic.js

@@ -93,7 +93,11 @@ export class BaseSubmittableExtrinsic extends Extrinsic {
                 deferFinalized()?.reject(e);
             });
         })
-            .catch(deferTx.reject);
+            .catch((e) => {
+            deferBestChainBlockIncluded()?.reject(e);
+            deferFinalized()?.reject(e);
+            deferTx.reject(e);
+        });
         return deferTx.promise;
     }
     #normalizeOptions(partialOptions, callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/api",
-  "version": "0.18.3",
+  "version": "0.18.5",
   "description": "A delightful JavaScript/TypeScript client for Polkadot & Substrate",
   "author": "Thang X. Vu <thang@dedot.dev>",
   "homepage": "https://dedot.dev",
@@ -13,13 +13,13 @@
   "type": "module",
   "sideEffects": false,
   "dependencies": {
-    "@dedot/codecs": "0.18.3",
-    "@dedot/providers": "0.18.3",
-    "@dedot/runtime-specs": "0.18.3",
-    "@dedot/shape": "0.18.3",
-    "@dedot/storage": "0.18.3",
-    "@dedot/types": "0.18.3",
-    "@dedot/utils": "0.18.3"
+    "@dedot/codecs": "0.18.5",
+    "@dedot/providers": "0.18.5",
+    "@dedot/runtime-specs": "0.18.5",
+    "@dedot/shape": "0.18.5",
+    "@dedot/storage": "0.18.5",
+    "@dedot/types": "0.18.5",
+    "@dedot/utils": "0.18.5"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json",
@@ -48,7 +48,7 @@
     "node": ">=18"
   },
   "license": "Apache-2.0",
-  "gitHead": "1252671f59eeff8f17b2280a8b13925024191438",
+  "gitHead": "54b0dcfddfc775009eacd1858441b1b2b12b9cae",
   "module": "./index.js",
   "types": "./index.d.ts"
 }