@dedot/api 0.17.1-next.9d03d21b.3 → 0.18.0

package/cjs/client/DedotClient.js

@@ -186,24 +186,42 @@ class DedotClient// prettier-end-here
         const cached = this._apiAtCache.get(hash);
         if (cached)
             return cached;
-        let targetVersion;
+        let parentVersion;
+        let parentHash;
         // Try to get block info from ChainHead first (for pinned blocks)
         const targetBlock = this.chainHead.findBlock(hash);
         if (targetBlock) {
-            targetVersion = targetBlock.runtime;
-            if (!targetVersion) {
-                // fallback to fetching on-chain runtime if we can't find it in the block
-                targetVersion = this.toSubstrateRuntimeVersion(await this.callAt(hash).core.version());
+            if (hash === this.genesisHash) {
+                parentHash = hash;
+                parentVersion = targetBlock.runtime;
+            }
+            else {
+                parentHash = targetBlock.parent;
+                const parentBlock = this.chainHead.findBlock(parentHash);
+                parentVersion = parentBlock?.runtime;
+            }
+            // fallback to fetching on-chain runtime if we can't find it in the block
+            if (!parentVersion) {
+                parentVersion = this.toSubstrateRuntimeVersion(await this.callAt(parentHash).core.version());
             }
         }
         else {
             // Block not pinned, try via Archive fallback if supported
             if (this._archive && (await this._archive.supported())) {
                 try {
+                    if (hash === this.genesisHash) {
+                        parentHash = hash;
+                    }
+                    else {
+                        const rawHeader = await this._archive.header(hash);
+                        (0, utils_1.assert)(rawHeader, `Header for block ${hash} not found`);
+                        const header = codecs_1.$Header.tryDecode(rawHeader);
+                        parentHash = header.parentHash;
+                    }
                     // Fetch runtime version via Archive
-                    const runtimeRaw = await this._archive.call('Core_version', '0x', hash);
+                    const runtimeRaw = await this._archive.call('Core_version', '0x', parentHash);
                     (0, utils_1.assert)(runtimeRaw, 'Runtime Version Not Found');
-                    targetVersion = this.toSubstrateRuntimeVersion(codecs_1.$RuntimeVersion.tryDecode(runtimeRaw));
+                    parentVersion = this.toSubstrateRuntimeVersion(codecs_1.$RuntimeVersion.tryDecode(runtimeRaw));
                 }
                 catch (error) {
                     throw new utils_1.DedotError(`Unable to fetch runtime version for block ${hash}: ${error}`);
@@ -215,8 +233,8 @@ class DedotClient// prettier-end-here
         }
         let metadata = this.metadata;
         let registry = this.registry;
-        if (targetVersion && targetVersion.specVersion !== this.runtimeVersion.specVersion) {
-            metadata = await this.fetchMetadata(hash, targetVersion);
+        if (parentVersion && parentVersion.specVersion !== this.runtimeVersion.specVersion) {
+            metadata = await this.fetchMetadata(parentHash, parentVersion);
             registry = new codecs_1.PortableRegistry(metadata.latest, this.options.hasher);
         }
         const api = {
@@ -224,7 +242,7 @@ class DedotClient// prettier-end-here
             atBlockHash: hash,
             options: this.options,
             genesisHash: this.genesisHash,
-            runtimeVersion: targetVersion,
+            runtimeVersion: parentVersion,
             metadata,
             registry,
             rpc: this.rpc,

package/cjs/client/LegacyClient.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LegacyClient = void 0;
 const codecs_1 = require("@dedot/codecs");
+const utils_1 = require("@dedot/utils");
 const index_js_1 = require("../executor/index.js");
 const proxychain_js_1 = require("../proxychain.js");
 const index_js_2 = require("../storage/index.js");
@@ -233,11 +234,12 @@ class LegacyClient// prettier-end-here
         const cached = this._apiAtCache.get(hash);
         if (cached)
             return cached;
-        const targetVersion = await this.#getRuntimeVersion(hash);
+        const parentHash = await this.#findParentHash(hash);
+        const targetVersion = await this.#getRuntimeVersion(parentHash);
         let metadata = this.metadata;
         let registry = this.registry;
         if (targetVersion.specVersion !== this.runtimeVersion.specVersion) {
-            metadata = await this.fetchMetadata(hash, targetVersion);
+            metadata = await this.fetchMetadata(parentHash, targetVersion);
             registry = new codecs_1.PortableRegistry(metadata.latest, this.options.hasher);
         }
         const api = {
@@ -265,5 +267,15 @@ class LegacyClient// prettier-end-here
     getStorageQuery() {
         return new index_js_2.LegacyStorageQuery(this);
     }
+    async #findParentHash(hash) {
+        if (hash === this.genesisHash) {
+            return this.genesisHash;
+        }
+        else {
+            const header = await this.rpc.chain_getHeader(hash);
+            (0, utils_1.assert)(header, `Header for ${hash} not found`);
+            return header.parentHash;
+        }
+    }
 }
 exports.LegacyClient = LegacyClient;

package/cjs/extrinsic/submittable/SubmittableExtrinsicV2.js

@@ -22,6 +22,15 @@ class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic_js_1.BaseSubmittab
         const txHash = this.hash;
         // validate the transaction
         // https://github.com/paritytech/json-rpc-interface-spec/issues/55#issuecomment-1609011150
+        // ensure at least 2 finalized blocks, this is to make sure the api.at can find the parent hash & block to fetch runtime
+        while (true) {
+            const block = await this.client.chainHead.finalizedBlock();
+            const parentBlock = this.client.chainHead.findBlock(block.parent);
+            if (parentBlock) {
+                break;
+            }
+            await (0, utils_1.waitFor)(100);
+        }
         const finalizedHash = await this.client.chainHead.finalizedHash();
         const validateTx = async (hash) => {
             const apiAt = await api.at(hash);

package/client/DedotClient.js

@@ -1,4 +1,4 @@
-import { $H256, $RuntimeVersion, PortableRegistry } from '@dedot/codecs';
+import { $H256, $Header, $RuntimeVersion, PortableRegistry } from '@dedot/codecs';
 import { u32 } from '@dedot/shape';
 import { assert, concatU8a, DedotError, noop, twox64Concat, u8aToHex, xxhashAsU8a } from '@dedot/utils';
 import { ConstantExecutor, ErrorExecutor, EventExecutor, RuntimeApiExecutorV2, StorageQueryExecutorV2, TxExecutorV2, ViewFunctionExecutorV2, } from '../executor/index.js';
@@ -183,24 +183,42 @@ export class DedotClient// prettier-end-here
         const cached = this._apiAtCache.get(hash);
         if (cached)
             return cached;
-        let targetVersion;
+        let parentVersion;
+        let parentHash;
         // Try to get block info from ChainHead first (for pinned blocks)
         const targetBlock = this.chainHead.findBlock(hash);
         if (targetBlock) {
-            targetVersion = targetBlock.runtime;
-            if (!targetVersion) {
-                // fallback to fetching on-chain runtime if we can't find it in the block
-                targetVersion = this.toSubstrateRuntimeVersion(await this.callAt(hash).core.version());
+            if (hash === this.genesisHash) {
+                parentHash = hash;
+                parentVersion = targetBlock.runtime;
+            }
+            else {
+                parentHash = targetBlock.parent;
+                const parentBlock = this.chainHead.findBlock(parentHash);
+                parentVersion = parentBlock?.runtime;
+            }
+            // fallback to fetching on-chain runtime if we can't find it in the block
+            if (!parentVersion) {
+                parentVersion = this.toSubstrateRuntimeVersion(await this.callAt(parentHash).core.version());
             }
         }
         else {
             // Block not pinned, try via Archive fallback if supported
             if (this._archive && (await this._archive.supported())) {
                 try {
+                    if (hash === this.genesisHash) {
+                        parentHash = hash;
+                    }
+                    else {
+                        const rawHeader = await this._archive.header(hash);
+                        assert(rawHeader, `Header for block ${hash} not found`);
+                        const header = $Header.tryDecode(rawHeader);
+                        parentHash = header.parentHash;
+                    }
                     // Fetch runtime version via Archive
-                    const runtimeRaw = await this._archive.call('Core_version', '0x', hash);
+                    const runtimeRaw = await this._archive.call('Core_version', '0x', parentHash);
                     assert(runtimeRaw, 'Runtime Version Not Found');
-                    targetVersion = this.toSubstrateRuntimeVersion($RuntimeVersion.tryDecode(runtimeRaw));
+                    parentVersion = this.toSubstrateRuntimeVersion($RuntimeVersion.tryDecode(runtimeRaw));
                 }
                 catch (error) {
                     throw new DedotError(`Unable to fetch runtime version for block ${hash}: ${error}`);
@@ -212,8 +230,8 @@ export class DedotClient// prettier-end-here
         }
         let metadata = this.metadata;
         let registry = this.registry;
-        if (targetVersion && targetVersion.specVersion !== this.runtimeVersion.specVersion) {
-            metadata = await this.fetchMetadata(hash, targetVersion);
+        if (parentVersion && parentVersion.specVersion !== this.runtimeVersion.specVersion) {
+            metadata = await this.fetchMetadata(parentHash, parentVersion);
             registry = new PortableRegistry(metadata.latest, this.options.hasher);
         }
         const api = {
@@ -221,7 +239,7 @@ export class DedotClient// prettier-end-here
             atBlockHash: hash,
             options: this.options,
             genesisHash: this.genesisHash,
-            runtimeVersion: targetVersion,
+            runtimeVersion: parentVersion,
             metadata,
             registry,
             rpc: this.rpc,

package/client/LegacyClient.js

@@ -1,4 +1,5 @@
 import { PortableRegistry } from '@dedot/codecs';
+import { assert } from '@dedot/utils';
 import { ConstantExecutor, ErrorExecutor, EventExecutor, RuntimeApiExecutor, StorageQueryExecutor, TxExecutor, ViewFunctionExecutor, } from '../executor/index.js';
 import { newProxyChain } from '../proxychain.js';
 import { LegacyStorageQuery } from '../storage/index.js';
@@ -230,11 +231,12 @@ export class LegacyClient// prettier-end-here
         const cached = this._apiAtCache.get(hash);
         if (cached)
             return cached;
-        const targetVersion = await this.#getRuntimeVersion(hash);
+        const parentHash = await this.#findParentHash(hash);
+        const targetVersion = await this.#getRuntimeVersion(parentHash);
         let metadata = this.metadata;
         let registry = this.registry;
         if (targetVersion.specVersion !== this.runtimeVersion.specVersion) {
-            metadata = await this.fetchMetadata(hash, targetVersion);
+            metadata = await this.fetchMetadata(parentHash, targetVersion);
             registry = new PortableRegistry(metadata.latest, this.options.hasher);
         }
         const api = {
@@ -262,4 +264,14 @@ export class LegacyClient// prettier-end-here
     getStorageQuery() {
         return new LegacyStorageQuery(this);
     }
+    async #findParentHash(hash) {
+        if (hash === this.genesisHash) {
+            return this.genesisHash;
+        }
+        else {
+            const header = await this.rpc.chain_getHeader(hash);
+            assert(header, `Header for ${hash} not found`);
+            return header.parentHash;
+        }
+    }
 }

package/extrinsic/submittable/SubmittableExtrinsicV2.js

@@ -1,4 +1,4 @@
-import { AsyncQueue, noop } from '@dedot/utils';
+import { AsyncQueue, noop, waitFor } from '@dedot/utils';
 import { BaseSubmittableExtrinsic } from './BaseSubmittableExtrinsic.js';
 import { SubmittableResult } from './SubmittableResult.js';
 import { InvalidTxError } from './errors.js';
@@ -19,6 +19,15 @@ export class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic {
         const txHash = this.hash;
         // validate the transaction
         // https://github.com/paritytech/json-rpc-interface-spec/issues/55#issuecomment-1609011150
+        // ensure at least 2 finalized blocks, this is to make sure the api.at can find the parent hash & block to fetch runtime
+        while (true) {
+            const block = await this.client.chainHead.finalizedBlock();
+            const parentBlock = this.client.chainHead.findBlock(block.parent);
+            if (parentBlock) {
+                break;
+            }
+            await waitFor(100);
+        }
         const finalizedHash = await this.client.chainHead.finalizedHash();
         const validateTx = async (hash) => {
             const apiAt = await api.at(hash);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/api",
-  "version": "0.17.1-next.9d03d21b.3+9d03d21b",
+  "version": "0.18.0",
   "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.17.1-next.9d03d21b.3+9d03d21b",
-    "@dedot/providers": "0.17.1-next.9d03d21b.3+9d03d21b",
-    "@dedot/runtime-specs": "0.17.1-next.9d03d21b.3+9d03d21b",
-    "@dedot/shape": "0.17.1-next.9d03d21b.3+9d03d21b",
-    "@dedot/storage": "0.17.1-next.9d03d21b.3+9d03d21b",
-    "@dedot/types": "0.17.1-next.9d03d21b.3+9d03d21b",
-    "@dedot/utils": "0.17.1-next.9d03d21b.3+9d03d21b"
+    "@dedot/codecs": "0.18.0",
+    "@dedot/providers": "0.18.0",
+    "@dedot/runtime-specs": "0.18.0",
+    "@dedot/shape": "0.18.0",
+    "@dedot/storage": "0.18.0",
+    "@dedot/types": "0.18.0",
+    "@dedot/utils": "0.18.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": "9d03d21b0b652b14222301b64682940047514172",
+  "gitHead": "32395b356a4febaac0d52506742947c916ac9895",
   "module": "./index.js",
   "types": "./index.d.ts"
 }