Cache Transaction.Size

src/neo/Ledger/PoolItem.cs

@@ -26,11 +26,17 @@ internal class PoolItem : IComparable<PoolItem>
         /// </summary>
         public DateTime LastBroadcastTimestamp;
 
+        /// <summary>
+        /// Cache Tx's FeePerByte to avoid recompute when comparing
+        /// </summary>
+        public long TxFeePerByteCache;
+
         internal PoolItem(Transaction tx)
         {
             Tx = tx;
             Timestamp = TimeProvider.Current.UtcNow;
             LastBroadcastTimestamp = Timestamp;
+            TxFeePerByteCache = tx.FeePerByte;
         }
 
         public int CompareTo(Transaction otherTx)
@@ -48,7 +54,12 @@ public int CompareTo(Transaction otherTx)
         public int CompareTo(PoolItem otherItem)
         {
             if (otherItem == null) return 1;
-            return CompareTo(otherItem.Tx);
+            if (otherItem.Tx == null) return 1;
+            int ret = TxFeePerByteCache.CompareTo(otherItem.TxFeePerByteCache);
+            if (ret != 0) return ret;
+            ret = Tx.NetworkFee.CompareTo(otherItem.Tx.NetworkFee);
+            if (ret != 0) return ret;
+            return otherItem.Tx.Hash.CompareTo(Tx.Hash);
         }
     }
 }

src/neo/Network/P2P/Payloads/Transaction.cs

@@ -74,16 +74,28 @@ public UInt256 Hash
             sizeof(long) +  //NetworkFee
             sizeof(uint);   //ValidUntilBlock
 
-        public int Size => HeaderSize +
-            Attributes.GetVarSize() +   //Attributes
-            Cosigners.GetVarSize() +    //Cosigners
-            Script.GetVarSize() +       //Script
-            Witnesses.GetVarSize();     //Witnesses
+        /// <summary>
+        /// Assigned when tx is deserialized
+        /// </summary>
+        private int _size;
+        public int Size
+        {
+            get
+            {
+                return _size == 0 ? HeaderSize +
+                  Attributes.GetVarSize() +   //Attributes
+                  Cosigners.GetVarSize() +    //Cosigners
+                  Script.GetVarSize() +       //Script
+                  Witnesses.GetVarSize()      //Witnesses
+                  : _size;
+            }
+        }
 
         void ISerializable.Deserialize(BinaryReader reader)
         {
             DeserializeUnsigned(reader);
             Witnesses = reader.ReadSerializableArray<Witness>();
+            _size = (int)reader.BaseStream.Position;
         }
 
         public void DeserializeUnsigned(BinaryReader reader)

tests/neo.UnitTests/Ledger/UT_PoolItem.cs

@@ -67,11 +67,11 @@ public void PoolItem_CompareTo_Hash()
                 PoolItem pitem1 = new PoolItem(tx1);
                 PoolItem pitem2 = new PoolItem(tx2);
 
-                // pitem2 < pitem1 (fee) => -1
-                pitem2.CompareTo(pitem1).Should().Be(-1);
+                // pitem2.tx.Hash < pitem1.tx.Hash => 1 descending order
+                pitem2.CompareTo(pitem1).Should().Be(1);
 
-                // pitem1 > pitem2  (fee) => 1
-                pitem1.CompareTo(pitem2).Should().Be(1);
+                // pitem2.tx.Hash > pitem1.tx.Hash => -1 descending order
+                pitem1.CompareTo(pitem2).Should().Be(-1);
             }
         }
 
@@ -96,7 +96,7 @@ public Transaction GenerateTxWithFirstByteOfHashGreaterThanOrEqualTo(byte firstH
             do
             {
                 tx = GenerateTx(networkFee, size);
-            } while (tx.Hash >= new UInt256(TestUtils.GetByteArray(32, firstHashByte)));
+            } while (tx.Hash < new UInt256(TestUtils.GetByteArray(32, firstHashByte)));
 
             return tx;
         }
@@ -107,7 +107,7 @@ public Transaction GenerateTxWithFirstByteOfHashLessThanOrEqualTo(byte firstHash
             do
             {
                 tx = GenerateTx(networkFee, size);
-            } while (tx.Hash <= new UInt256(TestUtils.GetByteArray(32, firstHashByte)));
+            } while (tx.Hash > new UInt256(TestUtils.GetByteArray(32, firstHashByte)));
 
             return tx;
         }