Fix nonce validation bug

planetarium · Jun 4, 2019 · 0b89584 · 0b89584
1 parent 36821ff
commit 0b89584
Showing 1 changed file with 26 additions and 14 deletions.
diff --git a/Libplanet/Blockchain/BlockChain.cs b/Libplanet/Blockchain/BlockChain.cs
@@ -368,20 +368,7 @@ bool render
                 HashDigest<SHA256>? tip =
                     Store.IndexBlockHash(Id.ToString(), -1);
 
-                foreach (Transaction<T> tx in block.Transactions)
-                {
-                    Address signer = tx.Signer;
-                    long nonce = Store.GetTxNonce(Id.ToString(), signer);
-
-                    if (!nonce.Equals(tx.Nonce))
-                    {
-                        throw new InvalidTxNonceException(
-                            tx.Id,
-                            nonce,
-                            tx.Nonce,
-                            "Transaction nonce is invalid.");
-                    }
-                }
+                ValidateNonce(block);
 
                 evaluations = block.Evaluate(
                     currentTime,
@@ -423,6 +410,31 @@ bool render
             }
         }
 
+        internal void ValidateNonce(Block<T> block)
+        {
+            var nonces = new Dictionary<Address, long>();
+            foreach (Transaction<T> tx in block.Transactions)
+            {
+                Address signer = tx.Signer;
+                if (!nonces.TryGetValue(signer, out long nonce))
+                {
+                    nonce =
+                        Store.GetTxNonce(Id.ToString(), signer);
+                }
+
+                if (!nonce.Equals(tx.Nonce))
+                {
+                    throw new InvalidTxNonceException(
+                        tx.Id,
+                        nonce,
+                        tx.Nonce,
+                        "Transaction nonce is invalid.");
+                }
+
+                nonces[signer] = nonce + 1;
+            }
+        }
+
         internal HashDigest<SHA256> FindBranchPoint(BlockLocator locator)
         {
             try