fix consensus (#512)

neo-project · Dec 10, 2018 · f454e98 · f454e98
1 parent 4f97a4b
commit f454e98
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/neo/Consensus/ConsensusContext.cs b/neo/Consensus/ConsensusContext.cs
@@ -36,7 +36,7 @@ internal class ConsensusContext : IConsensusContext
 
         public int M => Validators.Length - (Validators.Length - 1) / 3;
         public Header PrevHeader => snapshot.GetHeader(PrevHash);
-        public bool ContainsTransaction(UInt256 hash) => snapshot.ContainsTransaction(hash);
+        public bool TransactionExists(UInt256 hash) => snapshot.ContainsTransaction(hash);
         public bool VerifyTransaction(Transaction tx) => tx.Verify(snapshot, Transactions.Values);
 
         public ConsensusContext(Wallet wallet)

diff --git a/neo/Consensus/ConsensusService.cs b/neo/Consensus/ConsensusService.cs
@@ -41,9 +41,13 @@ public ConsensusService(IActorRef localNode, IActorRef taskManager, IConsensusCo
 
         private bool AddTransaction(Transaction tx, bool verify)
         {
-            if (context.ContainsTransaction(tx.Hash) ||
-                (verify && !context.VerifyTransaction(tx)) ||
-                !Plugin.CheckPolicy(tx))
+            if (verify && !context.VerifyTransaction(tx))
+            {
+                Log($"Invalid transaction: {tx.Hash}{Environment.NewLine}{tx.ToArray().ToHexString()}", LogLevel.Warning);
+                RequestChangeView();
+                return false;
+            }
+            if (!Plugin.CheckPolicy(tx))
             {
                 Log($"reject tx: {tx.Hash}{Environment.NewLine}{tx.ToArray().ToHexString()}", LogLevel.Warning);
                 RequestChangeView();
@@ -197,6 +201,11 @@ private void OnPrepareRequestReceived(ConsensusPayload payload, PrepareRequest m
                 Log($"Timestamp incorrect: {payload.Timestamp}", LogLevel.Warning);
                 return;
             }
+            if (message.TransactionHashes.Any(p => context.TransactionExists(p)))
+            {
+                Log($"Invalid request: transaction already exists", LogLevel.Warning);
+                return;
+            }
             context.State |= ConsensusState.RequestReceived;
             context.Timestamp = payload.Timestamp;
             context.Nonce = message.Nonce;

diff --git a/neo/Consensus/IConsensusContext.cs b/neo/Consensus/IConsensusContext.cs
@@ -27,7 +27,7 @@ public interface IConsensusContext : IDisposable
 
         Header PrevHeader { get; }
 
-        bool ContainsTransaction(UInt256 hash);
+        bool TransactionExists(UInt256 hash);
         bool VerifyTransaction(Transaction tx);
 
         void ChangeView(byte view_number);