Not found command (#1645)

* Not found command * Remove unused method Co-authored-by: Vitor Nazário Coelho <[email protected]>
neo-project · May 15, 2020 · b90aedf · b90aedf
1 parent 4ead80c
commit b90aedf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/neo/Network/P2P/MessageCommand.cs b/src/neo/Network/P2P/MessageCommand.cs
@@ -33,6 +33,7 @@ public enum MessageCommand : byte
         GetData = 0x28,
         [ReflectionCache(typeof(GetBlockDataPayload))]
         GetBlockData = 0x29,
+        [ReflectionCache(typeof(InvPayload))]
         NotFound = 0x2a,
         [ReflectionCache(typeof(Transaction))]
         Transaction = 0x2b,

diff --git a/src/neo/Network/P2P/RemoteNode.ProtocolHandler.cs b/src/neo/Network/P2P/RemoteNode.ProtocolHandler.cs
@@ -217,15 +217,17 @@ private void OnGetBlockDataMessageReceived(GetBlockDataPayload payload)
         /// <param name="payload">The payload containing the requested information.</param>
         private void OnGetDataMessageReceived(InvPayload payload)
         {
-            UInt256[] hashes = payload.Hashes.Where(p => sentHashes.Add(p)).ToArray();
-            foreach (UInt256 hash in hashes)
+            var notFound = new List<UInt256>();
+            foreach (UInt256 hash in payload.Hashes.Where(p => sentHashes.Add(p)))
             {
                 switch (payload.Type)
                 {
                     case InventoryType.TX:
                         Transaction tx = Blockchain.Singleton.GetTransaction(hash);
                         if (tx != null)
                             EnqueueMessage(Message.Create(MessageCommand.Transaction, tx));
+                        else
+                            notFound.Add(hash);
                         break;
                     case InventoryType.Block:
                         Block block = Blockchain.Singleton.GetBlock(hash);
@@ -241,13 +243,23 @@ private void OnGetDataMessageReceived(InvPayload payload)
                                 EnqueueMessage(Message.Create(MessageCommand.MerkleBlock, MerkleBlockPayload.Create(block, flags)));
                             }
                         }
+                        else
+                        {
+                            notFound.Add(hash);
+                        }
                         break;
                     case InventoryType.Consensus:
                         if (Blockchain.Singleton.ConsensusRelayCache.TryGet(hash, out IInventory inventoryConsensus))
                             EnqueueMessage(Message.Create(MessageCommand.Consensus, inventoryConsensus));
                         break;
                 }
             }
+
+            if (notFound.Count > 0)
+            {
+                foreach (InvPayload entry in InvPayload.CreateGroup(payload.Type, notFound.ToArray()))
+                    EnqueueMessage(Message.Create(MessageCommand.NotFound, entry));
+            }
         }
 
         /// <summary>