@leofcoin/chain 1.9.13 → 1.9.15

package/exports/browser/node-browser.js

@@ -1,3 +1,3 @@
-export { N as default } from './node-browser-Oq89xLSU.js';
-import './identity-B8_RBemH-Dq17MYzU.js';
+export { N as default } from './node-browser-y2adT6_R.js';
+import 'crypto';
 import './constants-V2VjIc2r.js';

package/exports/chain.js

@@ -2339,22 +2339,22 @@ class Chain extends VersionControl {
   #sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
   }
-  async #recordPeerFailure(peerId2, reason) {
-    if (!this.#peerReputations.has(peerId2)) {
-      this.#peerReputations.set(peerId2, { score: 0, failures: [] });
+  async #recordPeerFailure(peerId, reason) {
+    if (!this.#peerReputations.has(peerId)) {
+      this.#peerReputations.set(peerId, { score: 0, failures: [] });
     }
-    const rep = this.#peerReputations.get(peerId2);
+    const rep = this.#peerReputations.get(peerId);
     rep.score -= 1;
     rep.failures.push(`${Date.now()}: ${reason}`);
     if (rep.failures.length > this.#maxPeerFailures) {
       rep.failures.shift();
     }
     if (rep.score < this.#minPeerScore) {
-      console.warn(`[peer-ban] Peer ${peerId2} banned after ${rep.failures.length} failures`);
+      console.warn(`[peer-ban] Peer ${peerId} banned after ${rep.failures.length} failures`);
       try {
-        await globalThis.peernet.disconnect(peerId2);
+        await globalThis.peernet.disconnect(peerId);
       } catch (e) {
-        debug(`Failed to disconnect peer ${peerId2}`);
+        debug(`Failed to disconnect peer ${peerId}`);
       }
     }
   }
@@ -2474,8 +2474,8 @@ class Chain extends VersionControl {
     const start = Date.now();
     try {
       await this.#createBlock();
-    } catch (error2) {
-      console.error(error2);
+    } catch (error) {
+      console.error(error);
     }
     const end = Date.now();
     console.log((end - start) / 1e3 + " s");
@@ -2525,6 +2525,36 @@ class Chain extends VersionControl {
     console.log("init");
     await super.init();
     console.log("super init done");
+    const peernetAny = globalThis.peernet;
+    if (typeof peernetAny.removePeer === "function" && !peernetAny.__chainRemovePeerGuardInstalled) {
+      const originalRemovePeer = peernetAny.removePeer.bind(peernetAny);
+      peernetAny.removePeer = async (peer) => {
+        if (!peer || typeof peer !== "object") {
+          debug("removePeer called with invalid peer (ignored)");
+          return;
+        }
+        const peerId = peer?.id || peer?.peerId;
+        if (!peerId || typeof peerId !== "string") {
+          debug("removePeer called with peer missing id (ignored)");
+          return;
+        }
+        const trackedPeers = Object.values(peernetAny.connections || {});
+        const isStillTracked = trackedPeers.some((trackedPeer) => {
+          const trackedId = trackedPeer?.id || trackedPeer?.peerId;
+          return trackedPeer === peer || trackedId === peerId;
+        });
+        if (!isStillTracked) {
+          debug(`removePeer called for unknown peer ${peerId} (ignored)`);
+          return;
+        }
+        try {
+          return await originalRemovePeer(peer);
+        } catch (error) {
+          debug("removePeer failed (ignored):", error?.message ?? error);
+        }
+      };
+      peernetAny.__chainRemovePeerGuardInstalled = true;
+    }
     this.#connectionMonitor.start(this.version);
     await globalThis.peernet.addRequestHandler("bw-request-message", () => {
       const bw = globalThis.peernet.client?.bw || { up: 0, down: 0 };
@@ -2532,9 +2562,11 @@ class Chain extends VersionControl {
     });
     await globalThis.peernet.addRequestHandler("transactionPool", this.#transactionPoolHandler.bind(this));
     await globalThis.peernet.addRequestHandler("version", this.#versionHandler.bind(this));
-    await globalThis.peernet.addRequestHandler("stateInfo", () => {
+    await globalThis.peernet.addRequestHandler("stateInfo", async () => {
+      const lastblock = await this.lastBlock || { index: 0, hash: "0x0", previousHash: "0x0" };
+      const values = this.machine?.states?.info || {};
       return new globalThis.peernet.protos["peernet-response"]({
-        response: new StateMessage(this.machine.states.info).encoded
+        response: new StateMessage({ lastblock, values }).encoded
       });
     });
     globalThis.peernet.subscribe("add-block", this.#addBlock.bind(this));
@@ -2590,10 +2622,10 @@ class Chain extends VersionControl {
         console.warn(`Deprecated: ${response.decoded.response} is not an Uint8Array`);
       }
       return response.decoded.response;
-    } catch (error2) {
-      const peerId2 = peer?.peerId || peer?.id || peer?.address || "unknown";
-      debug(`peernet request failed: ${request} -> ${peerId2}:`, error2?.message ?? error2);
-      throw error2;
+    } catch (error) {
+      const peerId = peer?.peerId || peer?.id || peer?.address || "unknown";
+      debug(`peernet request failed: ${request} -> ${peerId}:`, error?.message ?? error);
+      throw error;
     }
   }
   async #decodeKnownBlocksResponse(response) {
@@ -2657,8 +2689,8 @@ class Chain extends VersionControl {
         let txData;
         try {
           txData = await globalThis.peernet.get(key, "transaction");
-        } catch (error2) {
-          debug(`Failed to get transaction ${key}:`, error2?.message ?? error2);
+        } catch (error) {
+          debug(`Failed to get transaction ${key}:`, error?.message ?? error);
         }
         if (txData !== void 0) {
           transactionsToGet.push(transactionPoolStore.put(key, txData));
@@ -2667,13 +2699,23 @@ class Chain extends VersionControl {
     }
     return Promise.all(transactionsToGet);
   }
-  async #peerConnected(peerId2) {
-    debug(`peer connected: ${peerId2}`);
-    const peer = peernet.getConnection(peerId2);
+  async #peerConnected(peerId) {
+    debug(`peer connected: ${peerId}`);
+    const peer = peernet.getConnection(peerId);
     if (!peer) {
-      debug(`peer not found: ${peerId2}`);
+      debug(`peer not found: ${peerId}`);
       return;
     }
+    const peerAny = peer;
+    if (typeof peerAny.on === "function" && !peerAny.__chainErrorListenerInstalled) {
+      peerAny.on("error", async (error) => {
+        const reason = error?.message ?? String(error);
+        const peerName = peerAny?.peerId || peerAny?.id || peerAny?.address || peerId || "unknown";
+        debug(`peer error: ${peerName}:`, reason);
+        await this.#recordPeerFailure(peerId, `peer error: ${reason}`);
+      });
+      peerAny.__chainErrorListenerInstalled = true;
+    }
     if (!peer.version) {
       try {
         let versionResponse = await this.#makeRequest(peer, "version");
@@ -2686,13 +2728,13 @@ class Chain extends VersionControl {
           peer.version = versionResponse.version;
         }
         if (!peer.version || typeof peer.version !== "string") {
-          const reason = `invalid version response from peer ${peerId2}`;
+          const reason = `invalid version response from peer ${peerId}`;
           debug(reason);
-          await this.#recordPeerFailure(peerId2, reason);
+          await this.#recordPeerFailure(peerId, reason);
           return;
         }
-      } catch (error2) {
-        debug(`failed to request version from peer ${peerId2}:`, error2?.message ?? error2);
+      } catch (error) {
+        debug(`failed to request version from peer ${peerId}:`, error?.message ?? error);
         return;
       }
     }
@@ -2700,7 +2742,7 @@ class Chain extends VersionControl {
     if (!this.isVersionCompatible(peer.version)) {
       const mismatchReason = `incompatible peer version ${peer.version} (local: ${this.version})`;
       console.error(`[chain] ${mismatchReason}`);
-      await this.#recordPeerFailure(peerId2, mismatchReason);
+      await this.#recordPeerFailure(peerId, mismatchReason);
       return;
     }
     let lastBlock;
@@ -2710,22 +2752,22 @@ class Chain extends VersionControl {
       const lastBlockRaw = await this.#makeRequest(peer, "lastBlock");
       console.log(new LastBlockMessage(lastBlockRaw));
       lastBlock = new LastBlockMessage(lastBlockRaw).decoded;
-    } catch (error2) {
-      const peerName2 = peer?.peerId || peer?.id || peer?.address || peerId2 || "unknown";
-      debug(`lastBlock request failed: ${peerName2}:`, error2?.message ?? error2);
-      await this.#recordPeerFailure(peerId2, `lastBlock request failed: ${error2?.message ?? error2}`);
+    } catch (error) {
+      const peerName = peer?.peerId || peer?.id || peer?.address || peerId || "unknown";
+      debug(`lastBlock request failed: ${peerName}:`, error?.message ?? error);
+      await this.#recordPeerFailure(peerId, `lastBlock request failed: ${error?.message ?? error}`);
       return;
     }
     const localBlock = await this.lastBlock;
     const MAX_SYNC_AHEAD = 1e5;
     if (lastBlock?.index > BigInt(localBlock?.index ?? 0) + BigInt(MAX_SYNC_AHEAD)) {
-      const peerName2 = peer?.peerId || peer?.id || peer?.address || peerId2 || "unknown";
-      debug(`Peer ${peerName2} claims unreasonable block height ${lastBlock.index} (local: ${localBlock?.index ?? 0})`);
-      await this.#recordPeerFailure(peerId2, `unreasonable lastBlock index: ${lastBlock.index}`);
+      const peerName = peer?.peerId || peer?.id || peer?.address || peerId || "unknown";
+      debug(`Peer ${peerName} claims unreasonable block height ${lastBlock.index} (local: ${localBlock?.index ?? 0})`);
+      await this.#recordPeerFailure(peerId, `unreasonable lastBlock index: ${lastBlock.index}`);
       return;
     }
     if (!lastBlock || !lastBlock.hash || lastBlock.hash === "0x0") {
-      debug(`peer has no lastBlock: ${peerId2}`);
+      debug(`peer has no lastBlock: ${peerId}`);
       return;
     }
     const higherThenCurrentLocal = !localBlock?.index ? true : lastBlock.index > localBlock.index;
@@ -2736,7 +2778,7 @@ class Chain extends VersionControl {
           const knownBlocksResponse = await this.#decodeKnownBlocksResponse(knownBlocksRaw);
           if (!knownBlocksResponse) {
             debug(
-              `knownBlocks decode failed for peer ${peerId2} (non-fatal), continuing sync without prefilled wantList`
+              `knownBlocks decode failed for peer ${peerId} (non-fatal), continuing sync without prefilled wantList`
             );
           } else {
             const MAX_WANTLIST_SIZE = 1e3;
@@ -2747,11 +2789,11 @@ class Chain extends VersionControl {
               }
             }
           }
-        } catch (error2) {
-          const peerName2 = peer?.peerId || peer?.id || peer?.address || peerId2 || "unknown";
+        } catch (error) {
+          const peerName = peer?.peerId || peer?.id || peer?.address || peerId || "unknown";
           debug(
-            `knownBlocks request failed: ${peerName2} (non-fatal), continuing sync without prefilled wantList:`,
-            error2?.message ?? error2
+            `knownBlocks request failed: ${peerName} (non-fatal), continuing sync without prefilled wantList:`,
+            error?.message ?? error
           );
         }
       }
@@ -2768,28 +2810,29 @@ class Chain extends VersionControl {
       try {
         const peerTransactionPool = higherThenCurrentLocal && await this.getPeerTransactionPool(peer) || [];
         if (this.#participating && peerTransactionPool.length > 0) return this.#runEpoch();
-      } catch (error2) {
-        const peerName2 = peer?.peerId || peer?.id || peer?.address || peerId2 || "unknown";
-        debug(`transactionPool request failed: ${peerName2}:`, error2?.message ?? error2);
+      } catch (error) {
+        const peerName = peer?.peerId || peer?.id || peer?.address || peerId || "unknown";
+        debug(`transactionPool request failed: ${peerName}:`, error?.message ?? error);
       }
     }, 3e3);
     try {
       let stateInfo = await this.#makeRequest(peer, "stateInfo");
       if (stateInfo instanceof Uint8Array) {
-        stateInfo = new StateMessage(stateInfo).decoded;
+        const decodedStateInfo = new StateMessage(stateInfo).decoded;
+        stateInfo = decodedStateInfo?.values ?? decodedStateInfo;
       }
       debug(
-        `sync start with peer ${peerId2}: local=${localBlock?.index ?? -1} remote=${lastBlock?.index ?? -1} hash=${lastBlock?.hash}`
+        `sync start with peer ${peerId}: local=${localBlock?.index ?? -1} remote=${lastBlock?.index ?? -1} hash=${lastBlock?.hash}`
       );
       await this.syncChain(lastBlock);
       debug(
-        `sync finished with peer ${peerId2}: state=${this.syncState} localNow=${(await this.lastBlock)?.index ?? -1}`
+        `sync finished with peer ${peerId}: state=${this.syncState} localNow=${(await this.lastBlock)?.index ?? -1}`
       );
       this.machine.states.info = stateInfo;
-    } catch (error2) {
-      const peerName2 = peer?.peerId || peer?.id || peer?.address || peerId2 || "unknown";
-      debug(`stateInfo/syncChain failed: ${peerName2}:`, error2?.message ?? error2);
-      await this.#recordPeerFailure(peerId2, `stateInfo/syncChain failed: ${error2?.message ?? error2}`);
+    } catch (error) {
+      const peerName = peer?.peerId || peer?.id || peer?.address || peerId || "unknown";
+      debug(`stateInfo/syncChain failed: ${peerName}:`, error?.message ?? error);
+      await this.#recordPeerFailure(peerId, `stateInfo/syncChain failed: ${error?.message ?? error}`);
       return;
     }
   }
@@ -2805,19 +2848,16 @@ class Chain extends VersionControl {
     try {
       let result = await this.machine.execute(to, method, params);
       globalThis.pubsub.publish(`transaction.completed.${hash}`, { status: "fulfilled", hash });
-      debug(
-        `lastBlock request failed: ${peerName} (non-fatal), continuing sync without prefilled wantList:`,
-        error?.message ?? error
-      );
-    } catch (error2) {
+      return result || "no state change";
+    } catch (error) {
       await transactionPoolStore.delete(hash);
       try {
         globalThis.peernet.publish("invalid-transaction", hash);
       } catch (publishError) {
         debug("peernet publish failed: invalid-transaction", publishError?.message ?? publishError);
       }
-      globalThis.pubsub.publish(`transaction.completed.${hash}`, { status: "fail", hash, error: error2 });
-      throw { error: error2, hash, from, to, params, nonce };
+      globalThis.pubsub.publish(`transaction.completed.${hash}`, { status: "fail", hash, error });
+      throw { error, hash, from, to, params, nonce };
     }
   }
   async #addBlock(block) {
@@ -2828,7 +2868,6 @@ class Chain extends VersionControl {
     const existingBlockAtHeight = this.#blocks[blockIndex];
     if (existingBlockAtHeight) {
       if (existingBlockAtHeight.hash !== hash) {
-        debug(`knownBlocks decode failed for peer ${peerId} (non-fatal), continuing sync without prefilled wantList`);
         console.error(`  Local:  ${existingBlockAtHeight.hash}`);
         console.error(`  Remote: ${hash}`);
         throw new Error(`Block conflict detected at index ${blockIndex}`);
@@ -2936,10 +2975,10 @@ class Chain extends VersionControl {
         await this.updateState(blockMessage);
       }
       globalThis.pubsub.publish("block-processed", blockMessage.decoded);
-    } catch (error2) {
-      console.log(error2.hash);
+    } catch (error) {
+      console.log(error.hash);
       console.log("errrrr");
-      await transactionPoolStore.delete(error2.hash);
+      await transactionPoolStore.delete(error.hash);
     }
   }
   async participate(address) {
@@ -2957,12 +2996,12 @@ class Chain extends VersionControl {
         const transaction = await signTransaction(rawTransaction, globalThis.peernet.identity);
         try {
           await this.sendTransaction(transaction);
-        } catch (error2) {
-          console.error(error2);
+        } catch (error) {
+          console.error(error);
         }
       }
-    } catch (error2) {
-      debug("Error in participate:", error2.message);
+    } catch (error) {
+      debug("Error in participate:", error.message);
     }
     if (await this.hasTransactionToHandle() && !this.#runningEpoch && this.#participating) await this.#runEpoch();
   }
@@ -3059,9 +3098,9 @@ class Chain extends VersionControl {
               address: validator,
               bw: bw.up + bw.down
             };
-          } catch (error2) {
-            const peerId2 = peer?.peerId || peer?.id || peer?.address || "unknown";
-            debug(`bw request failed: ${peerId2}:`, error2?.message ?? error2);
+          } catch (error) {
+            const peerId = peer?.peerId || peer?.id || peer?.address || "unknown";
+            debug(`bw request failed: ${peerId}:`, error?.message ?? error);
             return null;
           }
         } else if (globalThis.peernet.selectedAccount === validator) {
@@ -3079,8 +3118,8 @@ class Chain extends VersionControl {
         }
       }
     };
-    finalizeBWAndBroadcast().catch((error2) => {
-      debug(`background BW finalization failed:`, error2?.message ?? error2);
+    finalizeBWAndBroadcast().catch((error) => {
+      debug(`background BW finalization failed:`, error?.message ?? error);
     });
     block.validators = block.validators.map((validator) => {
       validator.reward = block.fees;
@@ -3145,8 +3184,8 @@ class Chain extends VersionControl {
         debug("peernet publish failed: consensus:propose", publishError?.message ?? publishError);
       }
       await this.#castVote("prevote", hash, block.index, this.#consensusRound);
-    } catch (error2) {
-      console.log(error2);
+    } catch (error) {
+      console.log(error);
       throw new Error(`invalid block ${block}`);
     }
   }
@@ -3277,8 +3316,8 @@ class Chain extends VersionControl {
       if (globalThis.peernet && globalThis.peernet.start) {
         await globalThis.peernet.start();
       }
-    } catch (error2) {
-      console.warn("Failed to reconnect to peers:", error2.message);
+    } catch (error) {
+      console.warn("Failed to reconnect to peers:", error.message);
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.9.13",
+  "version": "1.9.15",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {
@@ -49,7 +49,7 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^29.0.2",
+    "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
@@ -69,9 +69,9 @@
     "@leofcoin/errors": "^1.0.28",
     "@leofcoin/lib": "^1.2.77",
     "@leofcoin/messages": "^1.5.2",
-    "@leofcoin/multi-wallet": "^3.1.8",
+    "@leofcoin/multi-wallet": "^3.1.9",
     "@leofcoin/networks": "^1.1.28",
-    "@leofcoin/peernet": "^1.2.20",
+    "@leofcoin/peernet": "^1.2.21",
     "@leofcoin/storage": "^3.5.38",
     "@leofcoin/utils": "^1.1.42",
     "@leofcoin/workers": "^1.5.30",