[BUG] Prevent StartAll from starting mns with immature collateral

random-zebra · random-zebra · commit 7830c17c2c41 · 2020-04-09T17:50:47.000+02:00
diff --git a/src/qt/pivx/masternodeswidget.cpp b/src/qt/pivx/masternodeswidget.cpp
@@ -269,7 +269,8 @@ void MasterNodesWidget::onStartAllClicked(int type)
         inform(tr("Cannot perform Mastenodes start, wallet locked"));
         return;
     }
-    if (!checkMNsNetwork()) return;
+    if (!Params().IsRegTestNet() && !checkMNsNetwork()) return;     // skip on RegNet: so we can test even if tier two not synced
+
     if (isLoading) {
         inform(tr("Background task is being executed, please wait"));
     } else {
@@ -294,6 +295,11 @@ bool MasterNodesWidget::startAll(QString& failText, bool onlyMissing)
             continue;
         }
 
+        if(!mnModel->isMNCollateralMature(mnAlias)) {
+            amountOfMnFailed++;
+            continue;
+        }
+
         std::string strError;
         if (!startMN(mne, strError)) {
             amountOfMnFailed++;
diff --git a/src/qt/pivx/mnmodel.cpp b/src/qt/pivx/mnmodel.cpp
@@ -174,6 +174,13 @@ bool MNModel::isMNActive(QString mnAlias)
     return activeState == CMasternode::MASTERNODE_PRE_ENABLED || activeState == CMasternode::MASTERNODE_ENABLED;
 }
 
+bool MNModel::isMNCollateralMature(QString mnAlias)
+{
+    QMap<QString, std::pair<QString, CMasternode*>>::const_iterator it = nodes.find(mnAlias);
+    if (it != nodes.end()) return collateralTxAccepted.value(it.value().second->vin.prevout.hash.GetHex());
+    throw std::runtime_error(std::string("Masternode alias not found"));
+}
+
 bool MNModel::isMNsNetworkSynced()
 {
     return masternodeSync.IsSynced();
diff --git a/src/qt/pivx/mnmodel.h b/src/qt/pivx/mnmodel.h
@@ -49,6 +49,8 @@ class MNModel : public QAbstractTableModel
     bool isMNInactive(QString mnAlias);
     // Masternode is active if it's in PRE_ENABLED OR ENABLED state
     bool isMNActive(QString mnAlias);
+    // Masternode collateral has enough confirmations
+    bool isMNCollateralMature(QString mnAlias);
 
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,13 @@ bool MNModel::isMNActive(QString mnAlias)`
`174`	`174`	`return activeState == CMasternode::MASTERNODE_PRE_ENABLED \|\| activeState == CMasternode::MASTERNODE_ENABLED;`
`175`	`175`	`}`
`176`	`176`
	`177`	`+bool MNModel::isMNCollateralMature(QString mnAlias)`
	`178`	`+{`
	`179`	`+ QMap<QString, std::pair<QString, CMasternode*>>::const_iterator it = nodes.find(mnAlias);`
	`180`	`+ if (it != nodes.end()) return collateralTxAccepted.value(it.value().second->vin.prevout.hash.GetHex());`
	`181`	`+ throw std::runtime_error(std::string("Masternode alias not found"));`
	`182`	`+}`
	`183`	`+`
`177`	`184`	`bool MNModel::isMNsNetworkSynced()`
`178`	`185`	`{`
`179`	`186`	`return masternodeSync.IsSynced();`