Merge pull request #85 from nguyenphuminh/nonce-fix

Nonce fix
nguyenphuminh · Jan 13, 2024 · b7487e3 · b7487e3
2 parents 065827e + 4188fef
commit b7487e3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jechain",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "description": "Node for JeChain - an experimental smart contract blockchain network",
   "main": "./index.js",
   "scripts": {

diff --git a/src/core/txPool.js b/src/core/txPool.js
@@ -13,7 +13,7 @@ async function addTransaction(transaction, chainInfo, stateDB) {
     try {
         transaction = Transaction.deserialize(transaction);
     } catch (e) {
-        console.log(`\x1b[31mERROR\x1b[0m [${(new Date()).toISOString()}] Failed to add one transaction to pool.`);
+        console.log(`\x1b[31mERROR\x1b[0m [${(new Date()).toISOString()}] Failed to add one transaction to pool: Can not deserialize transaction.`);
 
         // If transaction can not be deserialized, it's faulty
         return;
@@ -24,7 +24,7 @@ async function addTransaction(transaction, chainInfo, stateDB) {
         await Transaction.isValid(transaction, stateDB)) || 
         BigInt(transaction.additionalData.contractGas || 0) > BigInt(BLOCK_GAS_LIMIT)
     ) {
-        console.log(`\x1b[31mERROR\x1b[0m [${(new Date()).toISOString()}] Failed to add one transaction to pool.`);
+        console.log(`\x1b[31mERROR\x1b[0m [${(new Date()).toISOString()}] Failed to add one transaction to pool: Transaction is invalid.`);
 
         return;
     }
@@ -36,13 +36,13 @@ async function addTransaction(transaction, chainInfo, stateDB) {
     const txSenderAddress = SHA256(txSenderPubkey);
 
     if (!(await stateDB.keys().all()).includes(txSenderAddress)) {
-        console.log(`\x1b[31mERROR\x1b[0m [${(new Date()).toISOString()}] Failed to add one transaction to pool.`);
+        console.log(`\x1b[31mERROR\x1b[0m [${(new Date()).toISOString()}] Failed to add one transaction to pool: Sender does not exist.`);
 
         return;
     }
 
     // Check nonce
-    let maxNonce = 0;
+    let maxNonce = deserializeState(await stateDB.get(txSenderAddress)).nonce;
 
     for (const tx of txPool) {
         const poolTxSenderPubkey = Transaction.getPubKey(transaction);
@@ -54,7 +54,7 @@ async function addTransaction(transaction, chainInfo, stateDB) {
     }
 
     if (maxNonce + 1 !== transaction.nonce) {
-        console.log(`\x1b[31mERROR\x1b[0m [${(new Date()).toISOString()}] Failed to add one transaction to pool.`);
+        console.log(`\x1b[31mERROR\x1b[0m [${(new Date()).toISOString()}] Failed to add one transaction to pool: Transaction has nonce lower than nonce in pool.`);
 
         return;
     }

diff --git a/src/node/server.js b/src/node/server.js
@@ -178,7 +178,7 @@ async function startServer(options) {
                     // This is pretty much the same as addTransaction, but we will send the transaction to other connected nodes if it's valid.
 
                     // Check nonce
-                    let maxNonce = 0;
+                    let maxNonce = deserializeState(await stateDB.get(txSenderAddress)).nonce;
 
                     for (const tx of chainInfo.transactionPool) {
                         const poolTxSenderPubkey = Transaction.getPubKey(transaction);