@leofcoin/chain 1.9.22 → 1.9.24

package/exports/browser/chain.js

@@ -4947,6 +4947,42 @@ class State extends Contract {
   get resolving() {
     return this.#resolving;
   }
+  async #resolveLastBlockMessage(result) {
+    if (result instanceof Uint8Array) {
+      try {
+        let payload = result;
+        for (let i = 0; i < 3; i += 1) {
+          try {
+            const wrapped = await new globalThis.peernet.protos["peernet-response"](payload);
+            if (wrapped?.decoded?.response === void 0) break;
+            payload = wrapped.decoded.response;
+          } catch {
+            break;
+          }
+        }
+        if (payload !== result) return this.#resolveLastBlockMessage(payload);
+        return new LastBlockMessage(result);
+      } catch {
+        const candidate = new TextDecoder().decode(result);
+        if (candidate) {
+          const blockData = await globalThis.peernet.get(candidate, "block");
+          if (blockData) return new BlockMessage(blockData);
+        }
+      }
+    }
+    if (typeof result === "string") {
+      const blockData = await globalThis.peernet.get(result, "block");
+      if (blockData) return new BlockMessage(blockData);
+    }
+    if (result && typeof result === "object") {
+      const response = result.decoded?.response ?? result.response;
+      if (response !== void 0) return this.#resolveLastBlockMessage(response);
+      if ("hash" in result && "index" in result) {
+        return new LastBlockMessage(result);
+      }
+    }
+    throw new Error(`invalid lastBlock payload: ${typeof result}`);
+  }
   get contracts() {
     return this.#machine.contracts;
   }
@@ -5386,7 +5422,7 @@ class State extends Contract {
                 }
               }
             }
-            return { result: new LastBlockMessage(result), peer };
+            return { result, peer };
           } catch (error) {
             const peerId = peer?.peerId || peer?.id || peer?.address || "unknown";
             debug$1(`lastBlock request failed: ${peerId}:`, error?.message ?? error);
@@ -5407,6 +5443,12 @@ class State extends Contract {
       throw new ResolveError("latestBlock: no responses from compatible peers");
     }
     console.log({ promises });
+    promises = await Promise.all(
+      promises.map(async (item) => ({
+        value: (await this.#resolveLastBlockMessage(item.value)).decoded,
+        peer: item.peer
+      }))
+    );
     let latest = { index: 0, hash: "0x0", previousHash: "0x0" };
     promises = promises.sort((a, b) => b.index - a.index);
     if (promises.length > 0) latest = promises[0].value;
@@ -6453,6 +6495,42 @@ class Chain extends VersionControl {
       throw error;
     }
   }
+  async #resolveLastBlockMessage(result) {
+    if (result instanceof Uint8Array) {
+      try {
+        let payload = result;
+        for (let i = 0; i < 3; i += 1) {
+          try {
+            const wrapped = await new globalThis.peernet.protos["peernet-response"](payload);
+            if (wrapped?.decoded?.response === void 0) break;
+            payload = wrapped.decoded.response;
+          } catch {
+            break;
+          }
+        }
+        if (payload !== result) return this.#resolveLastBlockMessage(payload);
+        return new LastBlockMessage(result);
+      } catch {
+        const candidate = new TextDecoder().decode(result);
+        if (candidate) {
+          const blockData = await globalThis.peernet.get(candidate, "block");
+          if (blockData) return new BlockMessage(blockData);
+        }
+      }
+    }
+    if (typeof result === "string") {
+      const blockData = await globalThis.peernet.get(result, "block");
+      if (blockData) return new BlockMessage(blockData);
+    }
+    if (result && typeof result === "object") {
+      const response = result.decoded?.response ?? result.response;
+      if (response !== void 0) return this.#resolveLastBlockMessage(response);
+      if ("hash" in result && "index" in result) {
+        return new LastBlockMessage(result);
+      }
+    }
+    throw new Error(`invalid lastBlock payload: ${typeof result}`);
+  }
   async #decodeKnownBlocksResponse(response) {
     if (!response) return null;
     if (Array.isArray(response)) {
@@ -6578,11 +6656,12 @@ class Chain extends VersionControl {
       console.log(await this.lastBlock);
       const lastBlockRaw = await this.#makeRequest(peer, "lastBlock");
       console.log("raw last block response:", lastBlockRaw);
-      if (lastBlockRaw === void 0 || lastBlockRaw === null || typeof lastBlockRaw !== "object" && !(lastBlockRaw instanceof Uint8Array)) {
+      if (lastBlockRaw === void 0 || lastBlockRaw === null) {
         throw new Error(`invalid lastBlock payload: ${typeof lastBlockRaw}`);
       }
-      console.log(new LastBlockMessage(lastBlockRaw));
-      lastBlock = new LastBlockMessage(lastBlockRaw).decoded;
+      const lastBlockMessage = await this.#resolveLastBlockMessage(lastBlockRaw);
+      console.log(lastBlockMessage);
+      lastBlock = lastBlockMessage.decoded;
     } catch (error) {
       const peerName = peer?.peerId || peer?.id || peer?.address || peerId || "unknown";
       debug(`lastBlock request failed: ${peerName}:`, error?.message ?? error);

package/exports/chain.js

@@ -1154,6 +1154,42 @@ class State extends Contract {
   get resolving() {
     return this.#resolving;
   }
+  async #resolveLastBlockMessage(result) {
+    if (result instanceof Uint8Array) {
+      try {
+        let payload = result;
+        for (let i = 0; i < 3; i += 1) {
+          try {
+            const wrapped = await new globalThis.peernet.protos["peernet-response"](payload);
+            if (wrapped?.decoded?.response === void 0) break;
+            payload = wrapped.decoded.response;
+          } catch {
+            break;
+          }
+        }
+        if (payload !== result) return this.#resolveLastBlockMessage(payload);
+        return new LastBlockMessage(result);
+      } catch {
+        const candidate = new TextDecoder().decode(result);
+        if (candidate) {
+          const blockData = await globalThis.peernet.get(candidate, "block");
+          if (blockData) return new BlockMessage(blockData);
+        }
+      }
+    }
+    if (typeof result === "string") {
+      const blockData = await globalThis.peernet.get(result, "block");
+      if (blockData) return new BlockMessage(blockData);
+    }
+    if (result && typeof result === "object") {
+      const response = result.decoded?.response ?? result.response;
+      if (response !== void 0) return this.#resolveLastBlockMessage(response);
+      if ("hash" in result && "index" in result) {
+        return new LastBlockMessage(result);
+      }
+    }
+    throw new Error(`invalid lastBlock payload: ${typeof result}`);
+  }
   get contracts() {
     return this.#machine.contracts;
   }
@@ -1593,7 +1629,7 @@ class State extends Contract {
                 }
               }
             }
-            return { result: new LastBlockMessage(result), peer };
+            return { result, peer };
           } catch (error) {
             const peerId = peer?.peerId || peer?.id || peer?.address || "unknown";
             debug$1(`lastBlock request failed: ${peerId}:`, error?.message ?? error);
@@ -1614,6 +1650,12 @@ class State extends Contract {
       throw new ResolveError("latestBlock: no responses from compatible peers");
     }
     console.log({ promises });
+    promises = await Promise.all(
+      promises.map(async (item) => ({
+        value: (await this.#resolveLastBlockMessage(item.value)).decoded,
+        peer: item.peer
+      }))
+    );
     let latest = { index: 0, hash: "0x0", previousHash: "0x0" };
     promises = promises.sort((a, b) => b.index - a.index);
     if (promises.length > 0) latest = promises[0].value;
@@ -2660,6 +2702,42 @@ class Chain extends VersionControl {
       throw error;
     }
   }
+  async #resolveLastBlockMessage(result) {
+    if (result instanceof Uint8Array) {
+      try {
+        let payload = result;
+        for (let i = 0; i < 3; i += 1) {
+          try {
+            const wrapped = await new globalThis.peernet.protos["peernet-response"](payload);
+            if (wrapped?.decoded?.response === void 0) break;
+            payload = wrapped.decoded.response;
+          } catch {
+            break;
+          }
+        }
+        if (payload !== result) return this.#resolveLastBlockMessage(payload);
+        return new LastBlockMessage(result);
+      } catch {
+        const candidate = new TextDecoder().decode(result);
+        if (candidate) {
+          const blockData = await globalThis.peernet.get(candidate, "block");
+          if (blockData) return new BlockMessage(blockData);
+        }
+      }
+    }
+    if (typeof result === "string") {
+      const blockData = await globalThis.peernet.get(result, "block");
+      if (blockData) return new BlockMessage(blockData);
+    }
+    if (result && typeof result === "object") {
+      const response = result.decoded?.response ?? result.response;
+      if (response !== void 0) return this.#resolveLastBlockMessage(response);
+      if ("hash" in result && "index" in result) {
+        return new LastBlockMessage(result);
+      }
+    }
+    throw new Error(`invalid lastBlock payload: ${typeof result}`);
+  }
   async #decodeKnownBlocksResponse(response) {
     if (!response) return null;
     if (Array.isArray(response)) {
@@ -2785,11 +2863,12 @@ class Chain extends VersionControl {
       console.log(await this.lastBlock);
       const lastBlockRaw = await this.#makeRequest(peer, "lastBlock");
       console.log("raw last block response:", lastBlockRaw);
-      if (lastBlockRaw === void 0 || lastBlockRaw === null || typeof lastBlockRaw !== "object" && !(lastBlockRaw instanceof Uint8Array)) {
+      if (lastBlockRaw === void 0 || lastBlockRaw === null) {
         throw new Error(`invalid lastBlock payload: ${typeof lastBlockRaw}`);
       }
-      console.log(new LastBlockMessage(lastBlockRaw));
-      lastBlock = new LastBlockMessage(lastBlockRaw).decoded;
+      const lastBlockMessage = await this.#resolveLastBlockMessage(lastBlockRaw);
+      console.log(lastBlockMessage);
+      lastBlock = lastBlockMessage.decoded;
     } catch (error) {
       const peerName = peer?.peerId || peer?.id || peer?.address || peerId || "unknown";
       debug(`lastBlock request failed: ${peerName}:`, error?.message ?? error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.9.22",
+  "version": "1.9.24",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {
@@ -62,19 +62,19 @@
     "tslib": "^2.8.1"
   },
   "dependencies": {
-    "@leofcoin/addresses": "^1.0.58",
-    "@leofcoin/codecs": "^1.1.2",
-    "@leofcoin/contracts": "^0.1.19",
-    "@leofcoin/crypto": "^0.2.39",
-    "@leofcoin/errors": "^1.0.28",
-    "@leofcoin/lib": "^1.2.77",
-    "@leofcoin/messages": "^1.5.2",
+    "@leofcoin/addresses": "^1.0.59",
+    "@leofcoin/codecs": "^1.1.3",
+    "@leofcoin/contracts": "^0.1.20",
+    "@leofcoin/crypto": "^0.2.40",
+    "@leofcoin/errors": "^1.0.29",
+    "@leofcoin/lib": "^1.2.78",
+    "@leofcoin/messages": "^1.5.3",
     "@leofcoin/multi-wallet": "^3.1.9",
-    "@leofcoin/networks": "^1.1.28",
+    "@leofcoin/networks": "^1.1.29",
     "@leofcoin/peernet": "^1.2.21",
     "@leofcoin/storage": "^3.5.38",
-    "@leofcoin/utils": "^1.1.42",
-    "@leofcoin/workers": "^1.5.30",
+    "@leofcoin/utils": "^1.1.43",
+    "@leofcoin/workers": "^1.5.31",
     "@vandeurenglenn/base58": "^1.1.9",
     "@vandeurenglenn/easy-worker": "^1.0.3",
     "semver": "^7.8.2"