@leofcoin/chain 1.9.20 → 1.9.21

package/exports/browser/chain.js

@@ -5137,7 +5137,11 @@ class State extends Contract {
     let index = this.#blockHashMap.get(hash);
     let localHash = "0x0";
     try {
-      localHash = await globalThis.stateStore.get("lastBlock");
+      const rawLocalHash = await globalThis.stateStore.get("lastBlock");
+      if (rawLocalHash) {
+        const decoded = JSON.parse(new TextDecoder().decode(rawLocalHash));
+        localHash = typeof decoded === "string" ? decoded : decoded?.hash ?? "0x0";
+      }
     } catch (error) {
       debug$1("no local state found");
     }
@@ -5367,10 +5371,21 @@ class State extends Contract {
         compatiblePeerCount += 1;
         const task = async () => {
           try {
-            const result = await peer.request(node.encoded);
+            let result = await peer.request(node.encoded);
             const resultType = result instanceof Uint8Array ? `bytes:${result.length}` : typeof result;
             debug$1(`lastBlock result type: ${resultType}`);
             console.log({ result });
+            if (result instanceof Uint8Array) {
+              for (let i = 0; i < 3; i += 1) {
+                try {
+                  const wrapped = await new globalThis.peernet.protos["peernet-response"](result);
+                  if (wrapped?.decoded?.response === void 0) break;
+                  result = wrapped.decoded.response;
+                } catch {
+                  break;
+                }
+              }
+            }
             return { result: new LastBlockMessage(result), peer };
           } catch (error) {
             const peerId = peer?.peerId || peer?.id || peer?.address || "unknown";
@@ -5447,6 +5462,9 @@ class State extends Contract {
    */
   async #loadBlocks(blocks) {
     this.#chainState = "loading";
+    if (blocks.some((block) => !block)) {
+      throw new Error("missing block data during load; chain resolution incomplete");
+    }
     const poolTransactionKeys = new Set(await globalThis.transactionPoolStore.keys());
     debug$1(`pool transactions: ${poolTransactionKeys.size}`);
     debug$1(`loading ${blocks.length} blocks`);
@@ -6385,22 +6403,21 @@ class Chain extends VersionControl {
       if (response === void 0 || response === null) return response;
       const normalizeResponse = async (payload) => {
         if (payload === void 0 || payload === null) return payload;
-        if (payload && typeof payload === "object") {
-          if ("decoded" in payload && payload?.decoded && "response" in payload.decoded) {
-            return normalizeResponse(payload.decoded.response);
-          }
-          if ("response" in payload) {
-            return normalizeResponse(payload.response);
-          }
-        }
         if (payload instanceof Uint8Array || typeof Buffer !== "undefined" && Buffer.isBuffer(payload)) {
-          const bytes = payload instanceof Uint8Array ? payload : new Uint8Array(payload);
-          try {
-            const wrapped = await new globalThis.peernet.protos["peernet-response"](bytes);
-            if (wrapped?.decoded?.response !== void 0) {
-              return wrapped.decoded.response;
+          let bytes = payload instanceof Uint8Array ? payload : new Uint8Array(payload);
+          for (let i = 0; i < 3; i += 1) {
+            try {
+              const wrapped = await new globalThis.peernet.protos["peernet-response"](bytes);
+              if (wrapped?.decoded?.response === void 0) break;
+              const next = wrapped.decoded.response;
+              if (next instanceof Uint8Array || typeof Buffer !== "undefined" && Buffer.isBuffer(next)) {
+                bytes = next instanceof Uint8Array ? next : new Uint8Array(next);
+                continue;
+              }
+              return normalizeResponse(next);
+            } catch {
+              break;
             }
-          } catch {
           }
           try {
             return JSON.parse(new TextDecoder().decode(bytes));
@@ -6408,6 +6425,16 @@ class Chain extends VersionControl {
             return bytes;
           }
         }
+        if (payload && typeof payload === "object") {
+          const objectPayload = payload;
+          const decoded = objectPayload.decoded;
+          if ("decoded" in objectPayload && decoded && "response" in decoded) {
+            return normalizeResponse(decoded.response);
+          }
+          if ("response" in objectPayload) {
+            return normalizeResponse(objectPayload.response);
+          }
+        }
         if (typeof payload === "string") {
           try {
             return JSON.parse(payload);
@@ -6475,8 +6502,19 @@ class Chain extends VersionControl {
     let transactionsInPool = await this.#makeRequest(peer, "transactionPool");
     console.log("raw response for request transactionPool:", transactionsInPool);
     if (transactionsInPool instanceof Uint8Array) {
-      debug("transactionPool response must be decoded array payload");
-      return [];
+      try {
+        transactionsInPool = JSON.parse(new TextDecoder().decode(transactionsInPool));
+      } catch {
+        debug("transactionPool response must be decoded array payload");
+        return [];
+      }
+    }
+    if (typeof transactionsInPool === "string") {
+      try {
+        transactionsInPool = JSON.parse(transactionsInPool);
+      } catch {
+        return [];
+      }
     }
     if (!Array.isArray(transactionsInPool)) return [];
     const localTransactions = new Set(await globalThis.transactionPoolStore.keys());
@@ -6561,9 +6599,9 @@ class Chain extends VersionControl {
       debug(`peer has no lastBlock: ${peerId}`);
       return;
     }
-    const higherThenCurrentLocal = !localBlock?.index ? true : lastBlock.index > localBlock.index;
+    const higherThenCurrentLocal = localBlock?.index == null ? true : lastBlock.index > localBlock.index;
     if (lastBlock) {
-      if (!this.lastBlock || higherThenCurrentLocal) {
+      if (!localBlock || higherThenCurrentLocal) {
         try {
           const knownBlocksRaw = await this.#makeRequest(peer, "knownBlocks");
           const knownBlocksResponse = await this.#decodeKnownBlocksResponse(knownBlocksRaw);
@@ -6591,9 +6629,8 @@ class Chain extends VersionControl {
     }
     if (this.wantList.length > 0) {
       const promises = await Promise.allSettled(this.wantList.map((hash) => peernet.get(hash, "block")));
-      for (let i = 0; i < promises.length; i++) {
-        const result = promises[i];
-        if (result.status === "fulfilled") this.wantList.splice(i, 1);
+      for (let i = promises.length - 1; i >= 0; i -= 1) {
+        if (promises[i].status === "fulfilled") this.wantList.splice(i, 1);
       }
       if (this.wantList.length === 0) await this.triggerSync();
     }

package/exports/chain.js

@@ -1343,7 +1343,11 @@ class State extends Contract {
     let index = this.#blockHashMap.get(hash);
     let localHash = "0x0";
     try {
-      localHash = await globalThis.stateStore.get("lastBlock");
+      const rawLocalHash = await globalThis.stateStore.get("lastBlock");
+      if (rawLocalHash) {
+        const decoded = JSON.parse(new TextDecoder().decode(rawLocalHash));
+        localHash = typeof decoded === "string" ? decoded : decoded?.hash ?? "0x0";
+      }
     } catch (error) {
       debug$1("no local state found");
     }
@@ -1573,10 +1577,21 @@ class State extends Contract {
         compatiblePeerCount += 1;
         const task = async () => {
           try {
-            const result = await peer.request(node.encoded);
+            let result = await peer.request(node.encoded);
             const resultType = result instanceof Uint8Array ? `bytes:${result.length}` : typeof result;
             debug$1(`lastBlock result type: ${resultType}`);
             console.log({ result });
+            if (result instanceof Uint8Array) {
+              for (let i = 0; i < 3; i += 1) {
+                try {
+                  const wrapped = await new globalThis.peernet.protos["peernet-response"](result);
+                  if (wrapped?.decoded?.response === void 0) break;
+                  result = wrapped.decoded.response;
+                } catch {
+                  break;
+                }
+              }
+            }
             return { result: new LastBlockMessage(result), peer };
           } catch (error) {
             const peerId = peer?.peerId || peer?.id || peer?.address || "unknown";
@@ -1653,6 +1668,9 @@ class State extends Contract {
    */
   async #loadBlocks(blocks) {
     this.#chainState = "loading";
+    if (blocks.some((block) => !block)) {
+      throw new Error("missing block data during load; chain resolution incomplete");
+    }
     const poolTransactionKeys = new Set(await globalThis.transactionPoolStore.keys());
     debug$1(`pool transactions: ${poolTransactionKeys.size}`);
     debug$1(`loading ${blocks.length} blocks`);
@@ -2591,22 +2609,21 @@ class Chain extends VersionControl {
       if (response === void 0 || response === null) return response;
       const normalizeResponse = async (payload) => {
         if (payload === void 0 || payload === null) return payload;
-        if (payload && typeof payload === "object") {
-          if ("decoded" in payload && payload?.decoded && "response" in payload.decoded) {
-            return normalizeResponse(payload.decoded.response);
-          }
-          if ("response" in payload) {
-            return normalizeResponse(payload.response);
-          }
-        }
         if (payload instanceof Uint8Array || typeof Buffer !== "undefined" && Buffer.isBuffer(payload)) {
-          const bytes = payload instanceof Uint8Array ? payload : new Uint8Array(payload);
-          try {
-            const wrapped = await new globalThis.peernet.protos["peernet-response"](bytes);
-            if (wrapped?.decoded?.response !== void 0) {
-              return wrapped.decoded.response;
+          let bytes = payload instanceof Uint8Array ? payload : new Uint8Array(payload);
+          for (let i = 0; i < 3; i += 1) {
+            try {
+              const wrapped = await new globalThis.peernet.protos["peernet-response"](bytes);
+              if (wrapped?.decoded?.response === void 0) break;
+              const next = wrapped.decoded.response;
+              if (next instanceof Uint8Array || typeof Buffer !== "undefined" && Buffer.isBuffer(next)) {
+                bytes = next instanceof Uint8Array ? next : new Uint8Array(next);
+                continue;
+              }
+              return normalizeResponse(next);
+            } catch {
+              break;
             }
-          } catch {
           }
           try {
             return JSON.parse(new TextDecoder().decode(bytes));
@@ -2614,6 +2631,16 @@ class Chain extends VersionControl {
             return bytes;
           }
         }
+        if (payload && typeof payload === "object") {
+          const objectPayload = payload;
+          const decoded = objectPayload.decoded;
+          if ("decoded" in objectPayload && decoded && "response" in decoded) {
+            return normalizeResponse(decoded.response);
+          }
+          if ("response" in objectPayload) {
+            return normalizeResponse(objectPayload.response);
+          }
+        }
         if (typeof payload === "string") {
           try {
             return JSON.parse(payload);
@@ -2681,8 +2708,19 @@ class Chain extends VersionControl {
     let transactionsInPool = await this.#makeRequest(peer, "transactionPool");
     console.log("raw response for request transactionPool:", transactionsInPool);
     if (transactionsInPool instanceof Uint8Array) {
-      debug("transactionPool response must be decoded array payload");
-      return [];
+      try {
+        transactionsInPool = JSON.parse(new TextDecoder().decode(transactionsInPool));
+      } catch {
+        debug("transactionPool response must be decoded array payload");
+        return [];
+      }
+    }
+    if (typeof transactionsInPool === "string") {
+      try {
+        transactionsInPool = JSON.parse(transactionsInPool);
+      } catch {
+        return [];
+      }
     }
     if (!Array.isArray(transactionsInPool)) return [];
     const localTransactions = new Set(await globalThis.transactionPoolStore.keys());
@@ -2767,9 +2805,9 @@ class Chain extends VersionControl {
       debug(`peer has no lastBlock: ${peerId}`);
       return;
     }
-    const higherThenCurrentLocal = !localBlock?.index ? true : lastBlock.index > localBlock.index;
+    const higherThenCurrentLocal = localBlock?.index == null ? true : lastBlock.index > localBlock.index;
     if (lastBlock) {
-      if (!this.lastBlock || higherThenCurrentLocal) {
+      if (!localBlock || higherThenCurrentLocal) {
         try {
           const knownBlocksRaw = await this.#makeRequest(peer, "knownBlocks");
           const knownBlocksResponse = await this.#decodeKnownBlocksResponse(knownBlocksRaw);
@@ -2797,9 +2835,8 @@ class Chain extends VersionControl {
     }
     if (this.wantList.length > 0) {
       const promises = await Promise.allSettled(this.wantList.map((hash) => peernet.get(hash, "block")));
-      for (let i = 0; i < promises.length; i++) {
-        const result = promises[i];
-        if (result.status === "fulfilled") this.wantList.splice(i, 1);
+      for (let i = promises.length - 1; i >= 0; i -= 1) {
+        if (promises[i].status === "fulfilled") this.wantList.splice(i, 1);
       }
       if (this.wantList.length === 0) await this.triggerSync();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.9.20",
+  "version": "1.9.21",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {