VpnCoin 1.1.3.2, Fix Check Transaction MIN_TXOUT_AMOUNT bug

Bit-Net · Oct 28, 2015 · d755076 · d755076
1 parent e850d5a
commit d755076
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       1
 #define CLIENT_VERSION_MINOR       1
 #define CLIENT_VERSION_REVISION    3
-#define CLIENT_VERSION_BUILD       1
+#define CLIENT_VERSION_BUILD       2
 
 // Converts the parameter X to a string after macro replacement on X has been performed.
 // Don't merge these into one macro!

diff --git a/src/main.cpp b/src/main.cpp
@@ -547,7 +547,7 @@ int CMerkleTx::SetMerkleBranch(const CBlock* pblock)
 
 
 
-bool CTransaction::CheckTransaction() const
+bool CTransaction::CheckTransaction(bool bChkMiniValue) const
 {
     // Basic checks that don't depend on any context
     if (vin.empty())
@@ -565,7 +565,7 @@ bool CTransaction::CheckTransaction() const
         const CTxOut& txout = vout[i];
         if (txout.IsEmpty() && !IsCoinBase() && !IsCoinStake())
             return DoS(100, error("CTransaction::CheckTransaction() : txout empty for user transaction"));
-        if( nBestHeight >= NewTxFee_RewardCoinYear_Active_Height )
+        if( bChkMiniValue && (nBestHeight >= NewTxFee_RewardCoinYear_Active_Height) )
         {
             if ((!txout.IsEmpty()) && txout.nValue < MIN_TXOUT_AMOUNT)
                 return DoS(100, error("CTransaction::CheckTransaction() : txout.nValue below minimum"));

diff --git a/src/main.h b/src/main.h
@@ -695,7 +695,7 @@ class CTransaction
     bool ConnectInputs(CTxDB& txdb, MapPrevTx inputs,
                        std::map<uint256, CTxIndex>& mapTestPool, const CDiskTxPos& posThisTx,
                        const CBlockIndex* pindexBlock, bool fBlock, bool fMiner);
-    bool CheckTransaction() const;
+    bool CheckTransaction(bool bChkMiniValue = true) const;
     bool GetCoinAge(CTxDB& txdb, uint64_t& nCoinAge) const;  // ppcoin: get transaction coin age
 
 protected:

diff --git a/src/txdb-leveldb.cpp b/src/txdb-leveldb.cpp
@@ -450,6 +450,7 @@ bool CTxDB::LoadBlockIndex()
     {
         if (fRequestShutdown || pindex->nHeight < nBestHeight-nCheckDepth)
             break;
+        if( pindex->nHeight < NewTxFee_RewardCoinYear_Active_Height ) break;  // 2015.10.28 add
         CBlock block;
         if (!block.ReadFromDisk(pindex))
             return error("LoadBlockIndex() : block.ReadFromDisk failed");

diff --git a/src/walletdb.cpp b/src/walletdb.cpp
@@ -221,7 +221,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             ssKey >> hash;
             CWalletTx& wtx = pwallet->mapWallet[hash];
             ssValue >> wtx;
-            if (wtx.CheckTransaction() && (wtx.GetHash() == hash))
+            if (wtx.CheckTransaction(false) && (wtx.GetHash() == hash))
                 wtx.BindWallet(pwallet);
             else
             {