X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=Novacoin%2FCBlockStore.cs;h=604df454d97c34db6896adf01a2df738115264f3;hb=9b0ad0055f7ed6f2761a58a189d35b62d51a0ee4;hp=97ce54eef0f57dfc8f0a39fd65059185a189639d;hpb=183708642533185adadd50c36470927d8dd4b914;p=NovacoinLibrary.git

diff --git a/Novacoin/CBlockStore.cs b/Novacoin/CBlockStore.cs
index 97ce54e..604df45 100644
--- a/Novacoin/CBlockStore.cs
+++ b/Novacoin/CBlockStore.cs
@@ -904,10 +904,9 @@ namespace Novacoin
                         return false; // unable to get coin age for coinstake
                     }
 
-                    int nTxSize = (tx.nTime > NetInfo.nStakeValidationSwitchTime) ? tx.Size : 0;
                     ulong nReward = tx.nValueOut - nValueIn;
 
-                    ulong nCalculatedReward = CBlock.GetProofOfStakeReward(nCoinAge, cursorBlock.nBits, tx.nTime) - CTransaction.GetMinFee(1, false, CTransaction.MinFeeMode.GMF_BLOCK, nTxSize) + CTransaction.nCent;
+                    ulong nCalculatedReward = CBlock.GetProofOfStakeReward(nCoinAge, cursorBlock.nBits, tx.nTime) - tx.GetMinFee(1, false, CTransaction.MinFeeMode.GMF_BLOCK) + CTransaction.nCent;
 
                     if (nReward > nCalculatedReward)
                     {
@@ -1135,6 +1134,8 @@ namespace Novacoin
                 var results = blockMap.Where(x => x.Value.ItemID == merkleNode.nParentBlockID).Select(x => x.Value).ToArray();
 
                 blockCursor = results[0];
+
+                return merkleNode;
             }
 
             // Nothing found.