v1.1.0.1

Tiered masternodes fix

Author: Cropdev

cropcoin-qt.pro

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

src/clientversion.h

@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       1
 #define CLIENT_VERSION_MINOR       1
 #define CLIENT_VERSION_REVISION    0
-#define CLIENT_VERSION_BUILD       0
+#define CLIENT_VERSION_BUILD       1
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true

src/masternode.cpp

@@ -201,11 +201,15 @@ void CMasternode::Check()
     bool fAcceptable = false;
 
     if(!unitTest) {
+        uint256 hashBlock = 0;
         CTransaction tx = CTransaction();
-        if (tier == 0) {
+        GetTransaction(vin.prevout.hash, tx, hashBlock);
+        int64_t checkValue = tx.vout[vin.prevout.n].nValue;
+        if (tier >= 0) {
             BOOST_FOREACH(PAIRTYPE(const int, int) & mntier, masternodeTiers)
             {
-                if (!fAcceptable) {
+                if (!fAcceptable && (mntier.second*COIN) == checkValue) {
+                    CTransaction tx = CTransaction();
                     CTxOut vout = CTxOut((GetMNCollateral(pindexBest->nHeight, mntier.first)) * COIN,
                                          darkSendPool.collateralPubKey);
                     tx.vin.push_back(vin);
@@ -225,17 +229,7 @@ void CMasternode::Check()
                 }
             }
         }
-        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;

src/masternodeman.cpp

@@ -545,16 +545,18 @@ CMasternode* CMasternodeMan::GetCurrentMasterNode(int mod, int64_t nBlockHeight,
     int64_t wLastPaid = winner->nLastPaid;
 
     for(std::vector<CMasternode>::size_type i = 0; i != winningArea.size(); i++) {
-        LogPrintf("Winner Vector: %i - %i\n", winningArea[i].score, winningArea[i].nLastPaid);
         if (now - winningArea[i].nLastPaid > avgRewardTime) {
             if (winningArea[i].nLastPaid < wLastPaid) {
                 winner = &(winningArea[i]);
                 wLastPaid = winner->nLastPaid;
             }
         }
     }
-
-    LogPrintf("Winner MN: %i - %i\n", winner->score, winner->nLastPaid);
+    BOOST_FOREACH(CMasternode& mn, vMasternodes) {
+        if (mn.vin == winner->vin) {
+            return &mn;
+        }
+                }
     return winner;
 }
 
@@ -812,13 +814,16 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
 
         bool fAcceptable = false;
 
+        uint256 hashBlock = 0;
         CTransaction tx = CTransaction();
+        GetTransaction(vin.prevout.hash, tx, hashBlock);
+        int64_t checkValue = tx.vout[vin.prevout.n].nValue;
         int newMNTier = 0;
-        if (pmn==NULL || pmn->tier == 0) {
+        if (pmn==NULL || pmn->tier >= 0) {
             BOOST_FOREACH(PAIRTYPE(const int, int) & mntier, masternodeTiers)
             {
-                if (!fAcceptable) {
-                    //LogPrintf("MasternodeMan: Looking for acceptable inputs for tier %i\n",mntier.first);
+                if (!fAcceptable && (mntier.second*COIN) == checkValue) {
+                    CTransaction tx = CTransaction();
                     CTxOut vout = CTxOut((GetMNCollateral(pindexBest->nHeight, mntier.first)) * COIN,
                                          darkSendPool.collateralPubKey);
                     tx.vin.push_back(vin);
@@ -829,7 +834,6 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
                         fAcceptable = AcceptableInputs(mempool, tx, false, NULL);
                         if (fAcceptable) { // Update mn tier on our records
                             if (pmn != NULL) {
-                                LogPrintf("MasternodeMan: Changing masternode tier\n");
                                 pmn->UpdateTier(mntier.first);
                             }
                             else {
@@ -845,7 +849,6 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
             }
         }
         else {
-            LogPrintf("dsee - ProcessMessage 17\n");
             CTxOut vout = CTxOut((GetMNCollateral(pindexBest->nHeight, pmn->tier)) * COIN,
                                  darkSendPool.collateralPubKey);
             tx.vin.push_back(vin);

src/qt/masternodemanager.cpp

@@ -359,7 +359,7 @@ void MasternodeManager::copyPubkey()
     {
         QModelIndex index = selectedRows.at(i);
         row = index.row();
-        sData += ui->tableWidgetMasternodes->item(row, 5)->text().toStdString();
+        sData += ui->tableWidgetMasternodes->item(row, 6)->text().toStdString();
         if (i < selectedRows.count()-1)
             sData += "\n";
     }

src/wallet.cpp

@@ -3522,11 +3522,12 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int
     int payeerewardpercent = 0;
     CTxIn vin;
     int tier = 0;
+    CMasternode* winningNode = NULL;
     bool hasPayment = true;
     if(bMasterNodePayment) {
         //spork
         if(!masternodePayments.GetBlockPayee(pindexPrev->nHeight+1, payee, vin)){
-            CMasternode* winningNode = mnodeman.GetCurrentMasterNode(1, pindexBest->nHeight);
+            winningNode = mnodeman.GetCurrentMasterNode(1, pindexBest->nHeight);
             if(winningNode){
                 payee = GetScriptForDestination(winningNode->pubkey.GetID());
                 payeerewardaddress = winningNode->rewardAddress;
@@ -3538,7 +3539,7 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int
         }
         else {
             // Only used after block TIERED_MASTERNODES_START_BLOCK
-            CMasternode* winningNode = mnodeman.Find(vin);
+            winningNode = mnodeman.Find(vin);
             tier = winningNode->tier;
         }
     }