[master-2.x] Add try-catch when receive a new tx (#2066)

* fix tx.verify * format * fix * catch tx.verify exception to avoid state state influence * add RelayResultReason.Error Co-authored-by: Tommo-L <luchuan@neo.org> Co-authored-by: Shargon <shargon@gmail.com>
neo-project · Nov 20, 2020 · 6e7c32a · 6e7c32a
1 parent 05c02ef
commit 6e7c32a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/neo/Ledger/Blockchain.cs b/neo/Ledger/Blockchain.cs
@@ -393,20 +393,26 @@ private void OnNewHeaders(Header[] headers)
 
         private RelayResultReason OnNewTransaction(Transaction transaction)
         {
-            if (transaction.Type == TransactionType.MinerTransaction)
-                return RelayResultReason.Invalid;
-            if (ContainsTransaction(transaction.Hash))
-                return RelayResultReason.AlreadyExists;
-            if (!MemPool.CanTransactionFitInPool(transaction))
-                return RelayResultReason.OutOfMemory;
-            if (!transaction.Verify(currentSnapshot, MemPool.GetVerifiedTransactions()))
-                return RelayResultReason.Invalid;
-            if (!Plugin.CheckPolicy(transaction))
-                return RelayResultReason.PolicyFail;
-
-            if (!MemPool.TryAdd(transaction.Hash, transaction))
-                return RelayResultReason.OutOfMemory;
+            try
+            {
+                if (transaction.Type == TransactionType.MinerTransaction)
+                    return RelayResultReason.Invalid;
+                if (ContainsTransaction(transaction.Hash))
+                    return RelayResultReason.AlreadyExists;
+                if (!MemPool.CanTransactionFitInPool(transaction))
+                    return RelayResultReason.OutOfMemory;
+                if (!transaction.Verify(currentSnapshot, MemPool.GetVerifiedTransactions()))
+                    return RelayResultReason.Invalid;
+                if (!Plugin.CheckPolicy(transaction))
+                    return RelayResultReason.PolicyFail;
 
+                if (!MemPool.TryAdd(transaction.Hash, transaction))
+                    return RelayResultReason.OutOfMemory;
+            }
+            catch
+            {
+                return RelayResultReason.Error;
+            }
             system.LocalNode.Tell(new LocalNode.RelayDirectly { Inventory = transaction });
             return RelayResultReason.Succeed;
         }

diff --git a/neo/Ledger/RelayResultReason.cs b/neo/Ledger/RelayResultReason.cs
@@ -8,6 +8,7 @@ public enum RelayResultReason : byte
         UnableToVerify,
         Invalid,
         PolicyFail,
-        Unknown
+        Unknown,
+        Error
     }
 }