@leofcoin/chain 1.9.2 → 1.9.3

package/exports/browser/chain.js

@@ -3912,11 +3912,25 @@ class Transaction extends Protocol {
         return Number(nonce);
     }
     async validateNonce(address, nonce) {
-        const previousNonce = await this.getNonce(address);
-        if (previousNonce > nonce)
-            throw new Error(`a transaction with a higher nonce already exists`);
-        if (previousNonce === nonce)
+        // Compare only against the COMMITTED nonce (accountsStore), not the pool max.
+        // The pool may hold many future nonces from batch sends — rejecting lower nonces
+        // because a higher one is already queued would break concurrent batch submission.
+        let committedNonce;
+        try {
+            if (await globalThis.accountsStore.has(address)) {
+                const raw = await globalThis.accountsStore.get(address);
+                committedNonce = Number(new TextDecoder().decode(raw));
+            }
+            else {
+                committedNonce = await this.#getNonceFallback(address);
+            }
+        }
+        catch {
+            committedNonce = 0;
+        }
+        if (committedNonce >= nonce)
             throw new Error(`a transaction with the same nonce already exists`);
+        // Only reject exact duplicates already in the pool (not "higher nonce" rejections)
         let transactions = await globalThis.transactionPoolStore.values();
         transactions = await this.promiseTransactions(transactions);
         transactions = transactions.filter((tx) => tx.decoded.from === address);
@@ -5607,6 +5621,8 @@ class State extends Contract {
     }
     async #getLatestBlock() {
         let promises = [];
+        const connectedPeers = Object.values(globalThis.peernet.connections || {}).filter((peer) => peer.connected);
+        let compatiblePeerCount = 0;
         let data = await new globalThis.peernet.protos['peernet-request']({
             request: 'lastBlock'
         });
@@ -5614,15 +5630,8 @@ class State extends Contract {
         for (const id in globalThis.peernet.connections) {
             // @ts-ignore
             const peer = globalThis.peernet.connections[id];
-            // CRITICAL FIX: Use semver comparison (major.minor) not exact match
-            const isVersionCompatible = () => {
-                if (!peer.version || !this.version)
-                    return false;
-                const [peerMajor, peerMinor] = peer.version.split('.');
-                const [localMajor, localMinor] = this.version.split('.');
-                return peerMajor === localMajor && peerMinor === localMinor;
-            };
-            if (peer.connected && isVersionCompatible()) {
+            if (peer.connected && this.isVersionCompatible(peer.version)) {
+                compatiblePeerCount += 1;
                 const task = async () => {
                     try {
                         const result = await peer.request(node.encoded);
@@ -5639,9 +5648,15 @@ class State extends Contract {
                 promises.push(task());
             }
         }
+        if (connectedPeers.length > 0 && compatiblePeerCount === 0) {
+            throw new ResolveError(`latestBlock: no compatible peers found for local version ${this.version} among ${connectedPeers.length} connected peers`);
+        }
         // @ts-ignore
         console.log({ promises });
         promises = (await this.promiseRequests(promises));
+        if (compatiblePeerCount > 0 && promises.length === 0) {
+            throw new ResolveError('latestBlock: no responses from compatible peers');
+        }
         console.log({ promises });
         let latest = { index: 0, hash: '0x0', previousHash: '0x0' };
         promises = promises.sort((a, b) => b.index - a.index);
@@ -5656,15 +5671,7 @@ class State extends Contract {
                 throw new Error('invalid block @getLatestBlock');
             latest = { ...message.decoded, hash };
             const peer = promises[0].peer;
-            // CRITICAL FIX: Check version compatibility using semver
-            const isVersionCompatible = () => {
-                if (!peer.version || !this.version)
-                    return false;
-                const [peerMajor, peerMinor] = peer.version.split('.');
-                const [localMajor, localMinor] = this.version.split('.');
-                return peerMajor === localMajor && peerMinor === localMinor;
-            };
-            if (peer.connected && isVersionCompatible()) {
+            if (peer.connected && this.isVersionCompatible(peer.version)) {
                 let data = await new globalThis.peernet.protos['peernet-request']({
                     request: 'knownBlocks'
                 });
@@ -5812,7 +5819,7 @@ class State extends Contract {
         if (this.#chainSyncing)
             return false;
         // Check if we have any connected peers with the same version
-        const compatiblePeers = Object.values(globalThis.peernet.connections || {}).filter((peer) => peer.connected && peer.version === this.version);
+        const compatiblePeers = Object.values(globalThis.peernet.connections || {}).filter((peer) => peer.connected && this.isVersionCompatible(peer.version));
         if (compatiblePeers.length === 0) {
             debug$1('No compatible peers available for sync');
             return false;
@@ -5828,7 +5835,7 @@ class State extends Contract {
     async #waitForPeers(timeoutMs = 30000) {
         return new Promise((resolve) => {
             const checkPeers = () => {
-                const peers = Object.values(globalThis.peernet.connections || {}).filter((peer) => peer.connected && peer.version === this.version);
+                const peers = Object.values(globalThis.peernet.connections || {}).filter((peer) => peer.connected && this.isVersionCompatible(peer.version));
                 if (peers.length > 0) {
                     resolve(true);
                 }
@@ -6862,6 +6869,36 @@ class Chain extends VersionControl {
     async #peerConnected(peerId) {
         debug(`peer connected: ${peerId}`);
         const peer = peernet.getConnection(peerId);
+        if (!peer) {
+            debug(`peer not found: ${peerId}`);
+            return;
+        }
+        if (!peer.version) {
+            try {
+                let versionResponse = await this.#makeRequest(peer, 'version');
+                if (versionResponse instanceof Uint8Array) {
+                    const decoded = new TextDecoder().decode(versionResponse);
+                    try {
+                        versionResponse = JSON.parse(decoded);
+                    }
+                    catch {
+                        versionResponse = decoded;
+                    }
+                }
+                if (typeof versionResponse === 'string') {
+                    peer.version = versionResponse;
+                }
+                else if (versionResponse &&
+                    typeof versionResponse === 'object' &&
+                    typeof versionResponse.version === 'string') {
+                    peer.version = versionResponse.version;
+                }
+            }
+            catch (error) {
+                debug(`failed to request version from peer ${peerId}:`, error?.message ?? error);
+                return;
+            }
+        }
         debug(`peer connected with version ${peer.version}`);
         if (!this.isVersionCompatible(peer.version)) {
             debug(`versions don't match`);

package/exports/chain.js

@@ -154,11 +154,25 @@ class Transaction extends Protocol {
         return Number(nonce);
     }
     async validateNonce(address, nonce) {
-        const previousNonce = await this.getNonce(address);
-        if (previousNonce > nonce)
-            throw new Error(`a transaction with a higher nonce already exists`);
-        if (previousNonce === nonce)
+        // Compare only against the COMMITTED nonce (accountsStore), not the pool max.
+        // The pool may hold many future nonces from batch sends — rejecting lower nonces
+        // because a higher one is already queued would break concurrent batch submission.
+        let committedNonce;
+        try {
+            if (await globalThis.accountsStore.has(address)) {
+                const raw = await globalThis.accountsStore.get(address);
+                committedNonce = Number(new TextDecoder().decode(raw));
+            }
+            else {
+                committedNonce = await this.#getNonceFallback(address);
+            }
+        }
+        catch {
+            committedNonce = 0;
+        }
+        if (committedNonce >= nonce)
             throw new Error(`a transaction with the same nonce already exists`);
+        // Only reject exact duplicates already in the pool (not "higher nonce" rejections)
         let transactions = await globalThis.transactionPoolStore.values();
         transactions = await this.promiseTransactions(transactions);
         transactions = transactions.filter((tx) => tx.decoded.from === address);
@@ -1709,6 +1723,8 @@ class State extends Contract {
     }
     async #getLatestBlock() {
         let promises = [];
+        const connectedPeers = Object.values(globalThis.peernet.connections || {}).filter((peer) => peer.connected);
+        let compatiblePeerCount = 0;
         let data = await new globalThis.peernet.protos['peernet-request']({
             request: 'lastBlock'
         });
@@ -1716,15 +1732,8 @@ class State extends Contract {
         for (const id in globalThis.peernet.connections) {
             // @ts-ignore
             const peer = globalThis.peernet.connections[id];
-            // CRITICAL FIX: Use semver comparison (major.minor) not exact match
-            const isVersionCompatible = () => {
-                if (!peer.version || !this.version)
-                    return false;
-                const [peerMajor, peerMinor] = peer.version.split('.');
-                const [localMajor, localMinor] = this.version.split('.');
-                return peerMajor === localMajor && peerMinor === localMinor;
-            };
-            if (peer.connected && isVersionCompatible()) {
+            if (peer.connected && this.isVersionCompatible(peer.version)) {
+                compatiblePeerCount += 1;
                 const task = async () => {
                     try {
                         const result = await peer.request(node.encoded);
@@ -1741,9 +1750,15 @@ class State extends Contract {
                 promises.push(task());
             }
         }
+        if (connectedPeers.length > 0 && compatiblePeerCount === 0) {
+            throw new ResolveError(`latestBlock: no compatible peers found for local version ${this.version} among ${connectedPeers.length} connected peers`);
+        }
         // @ts-ignore
         console.log({ promises });
         promises = (await this.promiseRequests(promises));
+        if (compatiblePeerCount > 0 && promises.length === 0) {
+            throw new ResolveError('latestBlock: no responses from compatible peers');
+        }
         console.log({ promises });
         let latest = { index: 0, hash: '0x0', previousHash: '0x0' };
         promises = promises.sort((a, b) => b.index - a.index);
@@ -1758,15 +1773,7 @@ class State extends Contract {
                 throw new Error('invalid block @getLatestBlock');
             latest = { ...message.decoded, hash };
             const peer = promises[0].peer;
-            // CRITICAL FIX: Check version compatibility using semver
-            const isVersionCompatible = () => {
-                if (!peer.version || !this.version)
-                    return false;
-                const [peerMajor, peerMinor] = peer.version.split('.');
-                const [localMajor, localMinor] = this.version.split('.');
-                return peerMajor === localMajor && peerMinor === localMinor;
-            };
-            if (peer.connected && isVersionCompatible()) {
+            if (peer.connected && this.isVersionCompatible(peer.version)) {
                 let data = await new globalThis.peernet.protos['peernet-request']({
                     request: 'knownBlocks'
                 });
@@ -1914,7 +1921,7 @@ class State extends Contract {
         if (this.#chainSyncing)
             return false;
         // Check if we have any connected peers with the same version
-        const compatiblePeers = Object.values(globalThis.peernet.connections || {}).filter((peer) => peer.connected && peer.version === this.version);
+        const compatiblePeers = Object.values(globalThis.peernet.connections || {}).filter((peer) => peer.connected && this.isVersionCompatible(peer.version));
         if (compatiblePeers.length === 0) {
             debug$1('No compatible peers available for sync');
             return false;
@@ -1930,7 +1937,7 @@ class State extends Contract {
     async #waitForPeers(timeoutMs = 30000) {
         return new Promise((resolve) => {
             const checkPeers = () => {
-                const peers = Object.values(globalThis.peernet.connections || {}).filter((peer) => peer.connected && peer.version === this.version);
+                const peers = Object.values(globalThis.peernet.connections || {}).filter((peer) => peer.connected && this.isVersionCompatible(peer.version));
                 if (peers.length > 0) {
                     resolve(true);
                 }
@@ -2964,6 +2971,36 @@ class Chain extends VersionControl {
     async #peerConnected(peerId) {
         debug(`peer connected: ${peerId}`);
         const peer = peernet.getConnection(peerId);
+        if (!peer) {
+            debug(`peer not found: ${peerId}`);
+            return;
+        }
+        if (!peer.version) {
+            try {
+                let versionResponse = await this.#makeRequest(peer, 'version');
+                if (versionResponse instanceof Uint8Array) {
+                    const decoded = new TextDecoder().decode(versionResponse);
+                    try {
+                        versionResponse = JSON.parse(decoded);
+                    }
+                    catch {
+                        versionResponse = decoded;
+                    }
+                }
+                if (typeof versionResponse === 'string') {
+                    peer.version = versionResponse;
+                }
+                else if (versionResponse &&
+                    typeof versionResponse === 'object' &&
+                    typeof versionResponse.version === 'string') {
+                    peer.version = versionResponse.version;
+                }
+            }
+            catch (error) {
+                debug(`failed to request version from peer ${peerId}:`, error?.message ?? error);
+                return;
+            }
+        }
         debug(`peer connected with version ${peer.version}`);
         if (!this.isVersionCompatible(peer.version)) {
             debug(`versions don't match`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {
@@ -61,18 +61,18 @@
     "tslib": "^2.8.1"
   },
   "dependencies": {
-    "@leofcoin/addresses": "^1.0.55",
-    "@leofcoin/contracts": "^0.1.16",
+    "@leofcoin/addresses": "^1.0.56",
+    "@leofcoin/contracts": "^0.1.17",
     "@leofcoin/crypto": "^0.2.37",
-    "@leofcoin/errors": "^1.0.25",
-    "@leofcoin/lib": "^1.2.74",
-    "@leofcoin/messages": "^1.4.40",
+    "@leofcoin/errors": "^1.0.26",
+    "@leofcoin/lib": "^1.2.75",
+    "@leofcoin/messages": "^1.4.41",
     "@leofcoin/multi-wallet": "^3.1.8",
-    "@leofcoin/networks": "^1.1.25",
+    "@leofcoin/networks": "^1.1.26",
     "@leofcoin/peernet": "^1.2.17",
     "@leofcoin/storage": "^3.5.38",
-    "@leofcoin/utils": "^1.1.40",
-    "@leofcoin/workers": "^1.5.27",
+    "@leofcoin/utils": "^1.1.41",
+    "@leofcoin/workers": "^1.5.28",
     "@vandeurenglenn/base58": "^1.1.9",
     "@vandeurenglenn/easy-worker": "^1.0.3",
     "semver": "^7.7.4"