InventoryCache integration fixes

Author: IxiAngel

Spixi/Network/NetworkProtocol.cs

@@ -555,15 +555,14 @@ static void handleInventory2(byte[] data, RemoteEndpoint endpoint)
                         ulong len = reader.ReadIxiVarUInt();
                         byte[] item_bytes = reader.ReadBytes((int)len);
                         InventoryItem item = InventoryCache.decodeInventoryItem(item_bytes);
-                        if (item.type == InventoryItemTypes.transaction)
-                        {
-                            PendingTransactions.increaseReceivedCount(item.hash, endpoint.presence.wallet);
-                        }
-                        PendingInventoryItem pii = InventoryCache.Instance.add(item, endpoint);
 
-                        // First update endpoint blockheights
+                        // First update endpoint blockheights and pending transactions
                         switch (item.type)
                         {
+                            case InventoryItemTypes.transaction:
+                                PendingTransactions.increaseReceivedCount(item.hash, endpoint.presence.wallet);
+                                break;
+
                             case InventoryItemTypes.block:
                                 var iib = ((InventoryItemBlock)item);
                                 if (iib.blockNum > endpoint.blockHeight)
@@ -573,6 +572,8 @@ static void handleInventory2(byte[] data, RemoteEndpoint endpoint)
                                 break;
                         }
 
+                        PendingInventoryItem pii = InventoryCache.Instance.add(item, endpoint, false);
+
                         if (!pii.processed && pii.lastRequested == 0)
                         {
                             // first time we're seeing this inventory item
@@ -630,9 +631,8 @@ static void handleInventory2(byte[] data, RemoteEndpoint endpoint)
         static void requestNextBlock(ulong blockNum, byte[] blockHash, RemoteEndpoint endpoint)
         {
             InventoryItemBlock iib = new InventoryItemBlock(blockHash, blockNum);
-            PendingInventoryItem pii = InventoryCache.Instance.add(iib, endpoint);
-            if (!pii.processed
-                && pii.lastRequested == 0)
+            PendingInventoryItem pii = InventoryCache.Instance.add(iib, endpoint, true);
+            if (pii.lastRequested == 0)
             {
                 pii.lastRequested = Clock.getTimestamp();
                 InventoryCache.Instance.processInventoryItem(pii);