v1.1.0.0

Author: Cropdev

cropcoin-qt.pro

@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = cropcoin-qt
-VERSION = 1.0.0.3
+VERSION = 1.1.0.0
 INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
 QT += network printsupport
 DEFINES += ENABLE_WALLET

src/activemasternode.cpp

@@ -206,10 +206,12 @@ bool CActiveMasternode::Dseep(CTxIn vin, CService service, CKey keyMasternode, C
     CMasternode* pmn = mnodeman.Find(vin);
     if(pmn != NULL)
     {
-        if(stop)
+        if(stop) {
             mnodeman.Remove(pmn->vin);
-        else
+        }
+        else{
             pmn->UpdateLastSeen();
+        }
     } else {
     	// Seems like we are trying to send a ping while the masternode is not registered in the network
     	retErrorMessage = "Darksend Masternode List doesn't include our masternode, Shutting down masternode pinging service! " + vin.ToString();
@@ -438,7 +440,7 @@ vector<COutput> CActiveMasternode::SelectCoinsMasternode()
     // Filter
     BOOST_FOREACH(const COutput& out, vCoins)
     {
-        if(out.tx->vout[out.i].nValue == GetMNCollateral(pindexBest->nHeight)*COIN) { //exactly
+        if (IsMNCollateralValid(out.tx->vout[out.i].nValue, pindexBest->nHeight)) {
         	filteredCoins.push_back(out);
         }
     }
@@ -460,7 +462,7 @@ vector<COutput> CActiveMasternode::SelectCoinsMasternodeForPubKey(std::string co
     // Filter
     BOOST_FOREACH(const COutput& out, vCoins)
     {
-        if(out.tx->vout[out.i].scriptPubKey == scriptPubKey && out.tx->vout[out.i].nValue == GetMNCollateral(pindexBest->nHeight)*COIN) { //exactly
+        if(out.tx->vout[out.i].scriptPubKey == scriptPubKey && IsMNCollateralValid(out.tx->vout[out.i].nValue, pindexBest->nHeight)) { //exactly
         	filteredCoins.push_back(out);
         }
     }
@@ -473,6 +475,7 @@ bool CActiveMasternode::EnableHotColdMasterNode(CTxIn& newVin, CService& newServ
     if(!fMasterNode) return false;
 
     status = MASTERNODE_REMOTELY_ENABLED;
+    notCapableReason = "Successfully started masternode.";
 
     //The values below are needed for signing dseep messages going forward
     this->vin = newVin;

src/clientversion.h

@@ -7,9 +7,9 @@
 
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       1
-#define CLIENT_VERSION_MINOR       0
+#define CLIENT_VERSION_MINOR       1
 #define CLIENT_VERSION_REVISION    0
-#define CLIENT_VERSION_BUILD       3
+#define CLIENT_VERSION_BUILD       0
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true

src/darksend.cpp

@@ -2100,12 +2100,13 @@ bool CDarkSendSigner::IsVinAssociatedWithPubkey(CTxIn& vin, CPubKey& pubkey){
     //if(GetTransaction(vin.prevout.hash, txVin, hash, true)){
     if(GetTransaction(vin.prevout.hash, txVin, hash)){
         BOOST_FOREACH(CTxOut out, txVin.vout){
-            if(out.nValue == GetMNCollateral(pindexBest->nHeight)*COIN){
-                if(out.scriptPubKey == payee2) return true;
+            if( IsMNCollateralValid(out.nValue, pindexBest->nHeight) ){
+                if(out.scriptPubKey == payee2) {
+                    return true;
+                }
             }
         }
     }
-
     return false;
 }
 

src/kernel.cpp

@@ -129,11 +129,10 @@ bool ComputeNextStakeModifier(const CBlockIndex* pindexPrev, uint64_t& nStakeMod
 
     // Sort candidate blocks by timestamp
     vector<pair<int64_t, uint256> > vSortedByTimestamp;
-    
     if (pindexPrev->nTime > FORK_TIME)
-		vSortedByTimestamp.reserve(64 * nModifierInterval / TARGET_SPACING_NEW);
-	else
-		vSortedByTimestamp.reserve(64 * nModifierInterval / TARGET_SPACING);
+        vSortedByTimestamp.reserve(64 * nModifierInterval / TARGET_SPACING_NEW);
+    else
+        vSortedByTimestamp.reserve(64 * nModifierInterval / TARGET_SPACING);
 
     int64_t nSelectionInterval = GetStakeModifierSelectionInterval();
     int64_t nSelectionIntervalStart = (pindexPrev->GetBlockTime() / nModifierInterval) * nModifierInterval - nSelectionInterval;

src/main.cpp

@@ -110,6 +110,28 @@ struct CMainSignals {
 } g_signals;
 }
 
+bool IsMNCollateralValid(int64_t value, int nHeight) {
+    if (nHeight < TIERED_MASTERNODES_START_BLOCK) {
+        return value == 5000*COIN;
+    } else {
+    // Using BOOST_FOREACH for concistency with the rest of the code, everything should be using a plain for from c++ 11 or 17
+    BOOST_FOREACH(PAIRTYPE(const int, int)& mntier, masternodeTiers)
+        {
+            if (value == (mntier.second)*COIN)
+            return true;
+        }
+    }
+    return false;
+}
+
+int64_t GetMNCollateral(int nHeight, int tier) {
+    if (nHeight < TIERED_MASTERNODES_START_BLOCK) {
+        return 5000;
+    } else {
+        return masternodeTiers[tier];
+    }
+}
+
 void RegisterWallet(CWalletInterface* pwalletIn) {
     g_signals.SyncTransaction.connect(boost::bind(&CWalletInterface::SyncTransaction, pwalletIn, _1, _2, _3));
     g_signals.EraseTransaction.connect(boost::bind(&CWalletInterface::EraseFromWallet, pwalletIn, _1));
@@ -1368,6 +1390,33 @@ int64_t GetProofOfWorkReward(int nHeight, int64_t nFees)
     return nSubsidy + nFees;
 }
 
+// Checks if a given reward present in a block is valid
+bool IsPOSRewardValid(int64_t value, int64_t nFees) {
+    int nHeight = pindexBest->nHeight+1;
+    if (nHeight < 20000) {
+        return value == (25*COIN + nFees);
+    }
+    else {
+        if (nHeight < TIERED_MASTERNODES_START_BLOCK) {
+            return value == (120*COIN + nFees);
+        }
+        else {
+            // Using BOOST_FOREACH for concistency with the rest of the code
+            BOOST_FOREACH(PAIRTYPE(const int, int)& tier, masternodeTierRewards)
+            {
+                if (value == (tier.second*COIN + POS_REWARD_TIERED_MN*COIN + nFees))
+                    return true;
+            }
+            // The case of a wallet staking with no mns up
+            if (value ==  POS_REWARD_TIERED_MN*COIN + nFees) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+
 // miner's coin stake reward
 int64_t GetProofOfStakeReward(const CBlockIndex* pindexPrev, int64_t nCoinAge, int64_t nFees)
 {
@@ -1376,15 +1425,11 @@ int64_t GetProofOfStakeReward(const CBlockIndex* pindexPrev, int64_t nCoinAge, i
     if (pindexBest->nHeight+1 > 1 && pindexBest->nHeight+1 <= 20000) {
         nSubsidy = 25 * COIN;
     }
-    else if (pindexBest->nHeight+1 > 20000 && pindexBest->nHeight+1 <= 540000)
+    else if (pindexBest->nHeight+1 > 20000 && pindexBest->nHeight+1 < TIERED_MASTERNODES_START_BLOCK)
     {
         nSubsidy = 120 * COIN;
     }
-    else if (pindexBest->nHeight+1 > 540000)    
-    {
-        nSubsidy = 20 * COIN;
-    }
-    
+   
     return nSubsidy + nFees;
 }
 
@@ -1403,9 +1448,9 @@ unsigned int GetNextTargetRequired(const CBlockIndex* pindexLast, bool fProofOfS
     CBigNum bnTargetLimit = fProofOfStake ? GetProofOfStakeLimit(pindexLast->nHeight) : Params().ProofOfWorkLimit();
 
     unsigned int nTargetTemp = TARGET_SPACING;
-	if (pindexLast->nTime > FORK_TIME)
-		nTargetTemp = TARGET_SPACING_NEW;
-    
+    if (pindexLast->nTime > FORK_TIME)
+        nTargetTemp = TARGET_SPACING_NEW;
+
     if (pindexLast == NULL)
         return bnTargetLimit.GetCompact(); // genesis block
 
@@ -1976,10 +2021,8 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
         if (!vtx[1].GetCoinAge(txdb, pindex->pprev, nCoinAge))
             return error("ConnectBlock() : %s unable to get coin age for coinstake", vtx[1].GetHash().ToString());
 
-        int64_t nCalculatedStakeReward = GetProofOfStakeReward(pindex->pprev, nCoinAge, nFees);
-
-        if (nStakeReward > nCalculatedStakeReward)
-            return DoS(100, error("ConnectBlock() : coinstake pays too much(actual=%d vs calculated=%d)", nStakeReward, nCalculatedStakeReward));
+        if (!IsPOSRewardValid(nStakeReward, nFees))
+            return DoS(100, error("ConnectBlock() : coinstake pays too much(actual=%d)", nStakeReward));
     }
 
     // ppcoin: track money supply and mint amount info
@@ -2692,6 +2735,20 @@ bool CBlock::AcceptBlock()
                 pnode->PushInventory(CInv(MSG_BLOCK, hash));
     }
 
+    // Record masternode payment
+    if (IsProofOfStake()) {
+        CScript payee;
+        for (int i = vtx[1].vout.size(); i--> 0; ) {
+            payee = vtx[1].vout[i].scriptPubKey;
+            break;
+        }
+        CTxDestination address1;
+        ExtractDestination(payee, address1);
+        CCropCoincoinAddress address2(address1);
+
+        mnodeman.RecordMasternodePayment(payee, nTime, PROTOCOL_VERSION);
+    }
+
     return true;
 }
 

src/main.h

@@ -75,7 +75,8 @@ inline int64_t FutureDrift(int64_t nTime) { return nTime + DRIFT; }
 /** "reject" message codes **/
 static const unsigned char REJECT_INVALID = 0x10;
 
-inline int64_t GetMNCollateral(int nHeight) { return nHeight>=33333 ? 5000 : 2500; }
+int64_t GetMNCollateral(int nHeight, int tier);
+bool IsPOSRewardValid(int64_t value, int64_t nFees);
 
 extern CScript COINBASE_FLAGS;
 extern CCriticalSection cs_main;
@@ -119,6 +120,8 @@ class CTxIndex;
 class CWalletInterface;
 struct CNodeStateStats;
 
+/** Check a given amount to see if it matches any of the masternode tiers */
+bool IsMNCollateralValid(int64_t, int nHeight);
 /** Register a wallet to receive updates from core */
 void RegisterWallet(CWalletInterface* pwalletIn);
 /** Unregister a wallet from core */
@@ -329,7 +332,10 @@ class CTransaction
         {
             nValueOut += txout.nValue;
             if (!MoneyRange(txout.nValue) || !MoneyRange(nValueOut))
+            {
+                LogPrintf("OUT OF RANGE - txout.nValue: %i - nValueOut %i", txout.nValue, nValueOut);
                 throw std::runtime_error("CTransaction::GetValueOut() : value out of range");
+            }
         }
         return nValueOut;
     }

src/masternode-payments.cpp

@@ -42,6 +42,7 @@ void ProcessMessageMasternodePayments(CNode* pfrom, std::string& strCommand, CDa
 
         LOCK(cs_masternodepayments);
 
+        LogPrintf("MasternodePayments: declare winner");
         //this is required in litemode
         CMasternodePaymentWinner winner;
         vRecv >> winner;
@@ -88,6 +89,7 @@ void ProcessMessageMasternodePayments(CNode* pfrom, std::string& strCommand, CDa
 
 bool CMasternodePayments::CheckSignature(CMasternodePaymentWinner& winner)
 {
+    LogPrintf("MasternodePayments: check signature");
     //note: need to investigate why this is failing
     std::string strMessage = winner.vin.ToString().c_str() + boost::lexical_cast<std::string>(winner.nBlockHeight) + winner.payee.ToString();
     std::string strPubKey = strMainPubKey ;
@@ -135,9 +137,9 @@ uint64_t CMasternodePayments::CalculateScore(uint256 blockHash, CTxIn& vin)
     uint256 n3 = Hash(BEGIN(vin.prevout.hash), END(vin.prevout.hash));
     uint256 n4 = n3 > n2 ? (n3 - n2) : (n2 - n3);
 
-    //printf(" -- CMasternodePayments CalculateScore() n2 = %d \n", n2.Get64());
-    //printf(" -- CMasternodePayments CalculateScore() n3 = %d \n", n3.Get64());
-    //printf(" -- CMasternodePayments CalculateScore() n4 = %d \n", n4.Get64());
+//    printf(" -- CMasternodePayments CalculateScore() n2 = %d \n", n2.Get64());
+//    printf(" -- CMasternodePayments CalculateScore() n3 = %d \n", n3.Get64());
+//    printf(" -- CMasternodePayments CalculateScore() n4 = %d \n", n4.Get64());
 
     return n4.Get64();
 }

src/masternode.cpp

@@ -90,6 +90,7 @@ CMasternode::CMasternode()
     //mark last paid as current for new entries
     nLastPaid = GetAdjustedTime();
     isPortOpen = true;
+    tier = 0;
 }
 
 CMasternode::CMasternode(const CMasternode& other)
@@ -117,8 +118,9 @@ CMasternode::CMasternode(const CMasternode& other)
     nScanningErrorCount = other.nScanningErrorCount;
     nLastScanningErrorBlockHeight = other.nLastScanningErrorBlockHeight;
     nLastPaid = other.nLastPaid;
-    nLastPaid = GetAdjustedTime();
     isPortOpen = other.isPortOpen;
+    tier = other.tier;
+    score = other.score;
 }
 
 CMasternode::CMasternode(CService newAddr, CTxIn newVin, CPubKey newPubkey, std::vector<unsigned char> newSig, int64_t newSigTime, CPubKey newPubkey2, int protocolVersionIn, CScript newRewardAddress, int newRewardPercentage)
@@ -146,6 +148,10 @@ CMasternode::CMasternode(CService newAddr, CTxIn newVin, CPubKey newPubkey, std:
     nScanningErrorCount = 0;
     nLastScanningErrorBlockHeight = 0;
     isPortOpen = true;
+    tier = 1;
+    score = 0;
+    // On new additions set last paid to now
+    nLastPaid = GetAdjustedTime();
 }
 
 //
@@ -192,14 +198,45 @@ void CMasternode::Check()
         return;
     }
 
-    if(!unitTest){
-        CValidationState state;
-        CTransaction tx = CTransaction();
-        CTxOut vout = CTxOut((GetMNCollateral(pindexBest->nHeight)-1)*COIN, darkSendPool.collateralPubKey);
-        tx.vin.push_back(vin);
-        tx.vout.push_back(vout);
+    bool fAcceptable = false;
 
-	if(!AcceptableInputs(mempool, tx, false, NULL)){
+    if(!unitTest) {
+        CTransaction tx = CTransaction();
+        if (tier == 0) {
+            BOOST_FOREACH(PAIRTYPE(const int, int) & mntier, masternodeTiers)
+            {
+                if (!fAcceptable) {
+                    CTxOut vout = CTxOut((GetMNCollateral(pindexBest->nHeight, mntier.first)) * COIN,
+                                         darkSendPool.collateralPubKey);
+                    tx.vin.push_back(vin);
+                    tx.vout.push_back(vout);
+                    {
+                        TRY_LOCK(cs_main, lockMain);
+                        if (!lockMain) return;
+                        fAcceptable = AcceptableInputs(mempool, tx, false, NULL);
+                        if (fAcceptable) { // Update mn tier on our records
+                            tier = (mntier.first);
+                        }
+                        else {
+                            tx.vin.pop_back();
+                            tx.vout.pop_back();
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            CTxOut vout = CTxOut((GetMNCollateral(pindexBest->nHeight, tier)) * COIN,
+                                 darkSendPool.collateralPubKey);
+            tx.vin.push_back(vin);
+            tx.vout.push_back(vout);
+            {
+                TRY_LOCK(cs_main, lockMain);
+                if (!lockMain) return;
+                fAcceptable = AcceptableInputs(mempool, tx, false, NULL);
+            }
+        }
+        if (!fAcceptable) {
             activeState = MASTERNODE_VIN_SPENT;
             return;
         }