@leofcoin/chain 1.10.20 → 1.10.21

package/README.md

@@ -6,4 +6,21 @@
 
 - reachedOneZeroZero
 
+## Pending transaction propagation
+
+Transactions enter the local pending pool before canonical confirmation. Peers
+relay newly accepted transaction bytes using the existing `add-transaction`
+topic; duplicate and already-confirmed entries are not relayed again.
+
+On compatible peer reconnection, pending pools are reconciled even at equal
+block heights. Missing bodies are fetched from `transactionPool`, checked against
+their advertised hash, and admitted through the normal signature-validation and
+pending-nonce path. Unavailable or invalid entries are logged without preventing
+recovery of the remaining entries.
+
+Pool admission and pubsub publication are not validator acknowledgements.
+`sendTransaction().wait` resolves only after canonical block inclusion. Deploy
+the updated chain runtime to intermediate nodes and validators as well as the
+browser to enable relay and reconnect recovery throughout the network.
+
 <a rel="license" href="http://creativecommons.org/licenses/by-nc/4.0/"><img alt="Creative Commons Licence" style="border-width:0" src="https://i.creativecommons.org/l/by-nc/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc/4.0/">Creative Commons Attribution-NonCommercial 4.0 International License</a>.

package/exports/browser/chain.js

@@ -3164,7 +3164,7 @@ class Transaction extends Protocol {
       await globalThis.transactionPoolStore.put(hash, message.encoded);
       this.addPendingNonce(message.decoded.from, message.decoded.nonce);
       try {
-        peernet.publish("add-transaction", message.encoded);
+        await peernet.publish("add-transaction", message.encoded);
       } catch (publishError) {
         console.warn("peernet publish failed: add-transaction", publishError?.message ?? publishError);
       }
@@ -6077,39 +6077,29 @@ class Chain extends VersionControl {
   }
   async getPeerTransactionPool(peer) {
     let transactionsInPool = await this.#makeRequest(peer, "transactionPool");
-    console.log("raw response for request transactionPool:", transactionsInPool);
     if (transactionsInPool instanceof Uint8Array) {
-      try {
-        transactionsInPool = JSON.parse(new TextDecoder().decode(transactionsInPool));
-      } catch {
-        debug("transactionPool response must be decoded array payload");
-        return [];
-      }
+      transactionsInPool = new TextDecoder().decode(transactionsInPool);
     }
     if (typeof transactionsInPool === "string") {
-      try {
-        transactionsInPool = JSON.parse(transactionsInPool);
-      } catch {
-        return [];
-      }
+      transactionsInPool = JSON.parse(transactionsInPool);
     }
-    if (!Array.isArray(transactionsInPool)) return [];
-    const localTransactions = new Set(await globalThis.transactionPoolStore.keys());
-    const transactionsToGet = [];
-    for (const key of transactionsInPool) {
-      if (!localTransactions.has(key)) {
-        let txData;
-        try {
-          txData = await globalThis.peernet.get(key, "transaction");
-        } catch (error) {
-          debug(`Failed to get transaction ${key}:`, error?.message ?? error);
-        }
-        if (txData !== void 0) {
-          transactionsToGet.push(transactionPoolStore.put(key, txData));
-        }
+    if (!Array.isArray(transactionsInPool) || transactionsInPool.some((hash) => typeof hash !== "string")) {
+      throw new Error("transactionPool response must be an array of transaction hashes");
+    }
+    const recovered = [];
+    for (const hash of new Set(transactionsInPool)) {
+      if (await globalThis.transactionPoolStore.has(hash)) continue;
+      if (await globalThis.transactionStore.has(hash)) continue;
+      try {
+        const txData = await globalThis.peernet.get(hash, "transactionPool");
+        if (txData === void 0) throw new Error("pending transaction body unavailable");
+        const transaction = await resolveTransactionReference(hash, txData);
+        recovered.push(await this.#sendTransaction(transaction));
+      } catch (error) {
+        debug(`Failed to recover transaction ${hash}:`, error?.message ?? error);
       }
     }
-    return Promise.all(transactionsToGet);
+    return recovered;
   }
   async #peerConnected(peerId) {
     if (typeof peerId !== "string" || !peerId.trim() || peerId === "undefined") {
@@ -6177,6 +6167,14 @@ class Chain extends VersionControl {
       await this.#recordPeerFailure(peerId, `unreasonable lastBlock index: ${lastBlock.index}`);
       return;
     }
+    setTimeout(async () => {
+      try {
+        await this.getPeerTransactionPool(peer);
+      } catch (error) {
+        const peerName = peer?.peerId || peer?.id || peer?.address || peerId || "unknown";
+        debug(`transactionPool request failed: ${peerName}:`, error?.message ?? error);
+      }
+    }, 3e3);
     if (!lastBlock || !lastBlock.hash || lastBlock.hash === "0x0") {
       debug(`peer has no lastBlock: ${peerId}`);
       return;
@@ -6216,15 +6214,6 @@ class Chain extends VersionControl {
       }
       if (this.wantList.length === 0) await this.triggerSync();
     }
-    setTimeout(async () => {
-      try {
-        const peerTransactionPool = higherThenCurrentLocal && await this.getPeerTransactionPool(peer) || [];
-        if (this.#participating && peerTransactionPool.length > 0) return this.#runEpoch();
-      } 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) {
@@ -6601,18 +6590,32 @@ class Chain extends VersionControl {
     await this.validateTransactionSignature(transaction);
     let hash;
     try {
+      hash = await transaction.hash();
+      if (await globalThis.transactionStore.has(hash)) return hash;
+      const alreadyPending = await globalThis.transactionPoolStore.has(hash);
       hash = await enqueueTransaction(transaction, {
         putToPool: (txHash, data) => globalThis.transactionPoolStore.put(txHash, data),
         hasInPool: (txHash) => globalThis.transactionPoolStore.has(txHash),
         hasInStore: (txHash) => globalThis.transactionStore.has(txHash),
         addPendingNonce: (address, nonce) => this.addPendingNonce(address, nonce)
       });
-      if (this.#participating && !this.#runningEpoch) this.#runEpoch();
+      if (!alreadyPending) {
+        try {
+          await globalThis.peernet.publish("add-transaction", transaction.encoded);
+        } catch (publishError) {
+          debug("peernet publish failed: add-transaction relay", publishError?.message ?? publishError);
+        }
+      }
+      if (this.#participating && !this.#runningEpoch) {
+        void this.#runEpoch().catch((error) => {
+          debug("transaction epoch scheduling failed:", error?.message ?? error);
+        });
+      }
       return hash;
     } catch (e) {
       if (hash) {
         try {
-          globalThis.peernet.publish("invalid-transaction", hash);
+          await globalThis.peernet.publish("invalid-transaction", hash);
         } catch (publishError) {
           debug("peernet publish failed: invalid-transaction", publishError?.message ?? publishError);
         }
@@ -6630,7 +6633,7 @@ class Chain extends VersionControl {
     const event = await super.sendTransaction(transactionMessage);
     await this.#sendTransaction(transactionMessage.encoded);
     try {
-      globalThis.peernet.publish("send-transaction", transactionMessage.encoded);
+      await globalThis.peernet.publish("send-transaction", transactionMessage.encoded);
     } catch (publishError) {
       debug("peernet publish failed: send-transaction", publishError?.message ?? publishError);
     }

package/exports/chain.js

@@ -266,7 +266,7 @@ class Transaction extends Protocol {
       await globalThis.transactionPoolStore.put(hash, message.encoded);
       this.addPendingNonce(message.decoded.from, message.decoded.nonce);
       try {
-        peernet.publish("add-transaction", message.encoded);
+        await peernet.publish("add-transaction", message.encoded);
       } catch (publishError) {
         console.warn("peernet publish failed: add-transaction", publishError?.message ?? publishError);
       }
@@ -2960,39 +2960,29 @@ class Chain extends VersionControl {
   }
   async getPeerTransactionPool(peer) {
     let transactionsInPool = await this.#makeRequest(peer, "transactionPool");
-    console.log("raw response for request transactionPool:", transactionsInPool);
     if (transactionsInPool instanceof Uint8Array) {
-      try {
-        transactionsInPool = JSON.parse(new TextDecoder().decode(transactionsInPool));
-      } catch {
-        debug("transactionPool response must be decoded array payload");
-        return [];
-      }
+      transactionsInPool = new TextDecoder().decode(transactionsInPool);
     }
     if (typeof transactionsInPool === "string") {
-      try {
-        transactionsInPool = JSON.parse(transactionsInPool);
-      } catch {
-        return [];
-      }
+      transactionsInPool = JSON.parse(transactionsInPool);
     }
-    if (!Array.isArray(transactionsInPool)) return [];
-    const localTransactions = new Set(await globalThis.transactionPoolStore.keys());
-    const transactionsToGet = [];
-    for (const key of transactionsInPool) {
-      if (!localTransactions.has(key)) {
-        let txData;
-        try {
-          txData = await globalThis.peernet.get(key, "transaction");
-        } catch (error) {
-          debug(`Failed to get transaction ${key}:`, error?.message ?? error);
-        }
-        if (txData !== void 0) {
-          transactionsToGet.push(transactionPoolStore.put(key, txData));
-        }
+    if (!Array.isArray(transactionsInPool) || transactionsInPool.some((hash) => typeof hash !== "string")) {
+      throw new Error("transactionPool response must be an array of transaction hashes");
+    }
+    const recovered = [];
+    for (const hash of new Set(transactionsInPool)) {
+      if (await globalThis.transactionPoolStore.has(hash)) continue;
+      if (await globalThis.transactionStore.has(hash)) continue;
+      try {
+        const txData = await globalThis.peernet.get(hash, "transactionPool");
+        if (txData === void 0) throw new Error("pending transaction body unavailable");
+        const transaction = await resolveTransactionReference(hash, txData);
+        recovered.push(await this.#sendTransaction(transaction));
+      } catch (error) {
+        debug(`Failed to recover transaction ${hash}:`, error?.message ?? error);
       }
     }
-    return Promise.all(transactionsToGet);
+    return recovered;
   }
   async #peerConnected(peerId) {
     if (typeof peerId !== "string" || !peerId.trim() || peerId === "undefined") {
@@ -3060,6 +3050,14 @@ class Chain extends VersionControl {
       await this.#recordPeerFailure(peerId, `unreasonable lastBlock index: ${lastBlock.index}`);
       return;
     }
+    setTimeout(async () => {
+      try {
+        await this.getPeerTransactionPool(peer);
+      } catch (error) {
+        const peerName = peer?.peerId || peer?.id || peer?.address || peerId || "unknown";
+        debug(`transactionPool request failed: ${peerName}:`, error?.message ?? error);
+      }
+    }, 3e3);
     if (!lastBlock || !lastBlock.hash || lastBlock.hash === "0x0") {
       debug(`peer has no lastBlock: ${peerId}`);
       return;
@@ -3099,15 +3097,6 @@ class Chain extends VersionControl {
       }
       if (this.wantList.length === 0) await this.triggerSync();
     }
-    setTimeout(async () => {
-      try {
-        const peerTransactionPool = higherThenCurrentLocal && await this.getPeerTransactionPool(peer) || [];
-        if (this.#participating && peerTransactionPool.length > 0) return this.#runEpoch();
-      } 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) {
@@ -3484,18 +3473,32 @@ class Chain extends VersionControl {
     await this.validateTransactionSignature(transaction);
     let hash;
     try {
+      hash = await transaction.hash();
+      if (await globalThis.transactionStore.has(hash)) return hash;
+      const alreadyPending = await globalThis.transactionPoolStore.has(hash);
       hash = await enqueueTransaction(transaction, {
         putToPool: (txHash, data) => globalThis.transactionPoolStore.put(txHash, data),
         hasInPool: (txHash) => globalThis.transactionPoolStore.has(txHash),
         hasInStore: (txHash) => globalThis.transactionStore.has(txHash),
         addPendingNonce: (address, nonce) => this.addPendingNonce(address, nonce)
       });
-      if (this.#participating && !this.#runningEpoch) this.#runEpoch();
+      if (!alreadyPending) {
+        try {
+          await globalThis.peernet.publish("add-transaction", transaction.encoded);
+        } catch (publishError) {
+          debug("peernet publish failed: add-transaction relay", publishError?.message ?? publishError);
+        }
+      }
+      if (this.#participating && !this.#runningEpoch) {
+        void this.#runEpoch().catch((error) => {
+          debug("transaction epoch scheduling failed:", error?.message ?? error);
+        });
+      }
       return hash;
     } catch (e) {
       if (hash) {
         try {
-          globalThis.peernet.publish("invalid-transaction", hash);
+          await globalThis.peernet.publish("invalid-transaction", hash);
         } catch (publishError) {
           debug("peernet publish failed: invalid-transaction", publishError?.message ?? publishError);
         }
@@ -3513,7 +3516,7 @@ class Chain extends VersionControl {
     const event = await super.sendTransaction(transactionMessage);
     await this.#sendTransaction(transactionMessage.encoded);
     try {
-      globalThis.peernet.publish("send-transaction", transactionMessage.encoded);
+      await globalThis.peernet.publish("send-transaction", transactionMessage.encoded);
     } catch (publishError) {
       debug("peernet publish failed: send-transaction", publishError?.message ?? publishError);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.10.20",
+  "version": "1.10.21",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {
@@ -81,10 +81,10 @@
     "@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",
+    "@rollup/plugin-typescript": "^12.3.1",
     "@types/semver": "^7.8.0",
     "@vandeurenglenn/debug": "^1.4.0",
-    "rollup": "^4.64.12",
+    "rollup": "^4.65.0",
     "rollup-plugin-esbuild": "^6.2.1",
     "rollup-plugin-modify": "^3.0.0",
     "tape": "^5.10.3",
@@ -99,14 +99,14 @@
     "@leofcoin/contracts": "^0.1.27",
     "@leofcoin/crypto": "^0.2.41",
     "@leofcoin/errors": "^1.0.30",
-    "@leofcoin/lib": "^1.3.15",
+    "@leofcoin/lib": "^1.3.16",
     "@leofcoin/messages": "^1.6.5",
     "@leofcoin/multi-wallet": "^3.1.11",
     "@leofcoin/networks": "^1.1.31",
-    "@leofcoin/peernet": "^3.0.0",
+    "@leofcoin/peernet": "^3.1.0",
     "@leofcoin/storage": "^3.5.38",
     "@leofcoin/utils": "^1.1.45",
-    "@leofcoin/workers": "^1.5.40",
+    "@leofcoin/workers": "^1.5.42",
     "@vandeurenglenn/base58": "^1.1.9",
     "@vandeurenglenn/easy-worker": "^1.0.3",
     "@vandeurenglenn/typed-array-utils": "^1.2.0",