TrimArray() simplification

[NovacoinLibrary.git] / Novacoin / CTransaction.cs

diff --git a/Novacoin/CTransaction.cs b/Novacoin/CTransaction.cs
index c5c2b90..6d0b6eb 100644 (file)
--- a/Novacoin/CTransaction.cs
+++ b/Novacoin/CTransaction.cs
@@ -179,10 +179,17 @@ namespace Novacoin
             get
             {
                 uint nSigOps = 0;
-                foreach (var txin in vin)
+
+                if (!IsCoinBase)
                 {
-                    nSigOps += txin.scriptSig.GetSigOpCount(false);
+                    // http://lists.linuxfoundation.org/pipermail/bitcoin-dev/2012-July/001718.html
+
+                    foreach (var txin in vin)
+                    {
+                        nSigOps += txin.scriptSig.GetSigOpCount(false);
+                    }
                 }
+
                 foreach (var txout in vout)
                 {
                     nSigOps += txout.scriptPubKey.GetSigOpCount(false);
@@ -620,12 +627,6 @@ namespace Novacoin
                 // Enforce 0.01 as minimum fee for old approach or coinstake
                 nMinTxFee = nCent;
                 nMinRelayTxFee = nCent;
-
-                if (nTime < NetInfo.nStakeValidationSwitchTime)
-                {
-                    // Enforce zero size for compatibility with old blocks.
-                    nBytes = 0;
-                }
             }
 
             // Base fee is either nMinTxFee or nMinRelayTxFee