Improve the Collateralcheck & Fix masternode outputs

Author: limxdev

src/masternode.cpp

@@ -111,7 +111,7 @@ CMasternode::CollateralStatus CMasternode::CheckCollateral(const COutPoint& outp
     return CheckCollateral(outpoint, nHeight);
 }
 
-CMasternode::CollateralStatus CMasternode::CheckCollateral(const COutPoint& outpoint, int& nHeightRet)
+CMasternode::CollateralStatus CMasternode::CheckCollateral(const COutPoint& outpoint)
 {
     AssertLockHeld(cs_main);
 
@@ -120,17 +120,12 @@ CMasternode::CollateralStatus CMasternode::CheckCollateral(const COutPoint& outp
         return COLLATERAL_UTXO_NOT_FOUND;
     }
 
-    // FXTC BEGIN
-    nHeightRet = coin.nHeight;
-
     CMasternode cm;
-    //if(coin.out.nValue != 1000 * COIN) {
-    if(!cm.CollateralValueCheck(coin.nHeight,coin.out.nValue)) {
-    // FXTC END
+    if(coin.out.nValue != Params().GetConsensus().nMasternodeCollateralMinimum * COIN) 
+    {
         return COLLATERAL_INVALID_AMOUNT;
     }
-
-    nHeightRet = coin.nHeight;
+    
     return COLLATERAL_OK;
 }
 

src/masternode.h

@@ -205,7 +205,7 @@ class CMasternode : public masternode_info_t
     bool UpdateFromNewBroadcast(CMasternodeBroadcast& mnb, CConnman& connman);
 
     static CollateralStatus CheckCollateral(const COutPoint& outpoint);
-    static CollateralStatus CheckCollateral(const COutPoint& outpoint, int& nHeightRet);
+    static CollateralStatus CheckCollateral(const COutPoint& outpoint);
 
     // FXTC BEGIN
     bool CollateralValueCheck(int nHeight, CAmount TxValue);

src/wallet/wallet.cpp

@@ -2825,10 +2825,7 @@ void CWallet::AvailableCoins(std::vector<COutput> &vCoins, bool fOnlySafe, const
                 if (CPrivateSend::IsCollateralAmount(pcoin->tx->vout[i].nValue)) continue; // do not use collateral amounts
                 found = !CPrivateSend::IsDenominatedAmount(pcoin->tx->vout[i].nValue);
             } else if(nCoinType == ONLY_MASTERNODE_COLLATERAL) {
-                // FXTC BEGIN
-                //found = pcoin->tx->vout[i].nValue == 1000*COIN;
-                found = CMasternode::CheckCollateral(COutPoint(pcoin->GetHash(),i)) == CMasternode::COLLATERAL_OK;
-                // FXTC END
+                found = pcoin->tx->vout[i].nValue == Params().GetConsensus().nMasternodeCollateralMinimum * COIN;
             } else if(nCoinType == ONLY_PRIVATESEND_COLLATERAL) {
                 found = CPrivateSend::IsCollateralAmount(pcoin->tx->vout[i].nValue);
             } else {