[GUI][Model] Enforce required depth for mn collaterals

random-zebra · random-zebra · commit bdb13c8edb00 · 2020-03-09T11:10:37.000+01:00
Notify the user about the required confirmations
(MASTERNODE_MIN_CONFIRMATIONS) after masternode creation and when trying
to start too early.
Consider MNModel::WAS_COLLATERAL_ACCEPTED only when the tx has the
required depth.
diff --git a/src/qt/pivx/masternodeswidget.cpp b/src/qt/pivx/masternodeswidget.cpp
@@ -208,16 +208,17 @@ bool MasterNodesWidget::checkMNsNetwork()
 void MasterNodesWidget::onEditMNClicked()
 {
     if (walletModel) {
-        if (!checkMNsNetwork()) return;
+        if (!Params().IsRegTestNet() && !checkMNsNetwork()) return;     // skip on RegNet: so we can test even if tier two not synced
         if (index.sibling(index.row(), MNModel::WAS_COLLATERAL_ACCEPTED).data(Qt::DisplayRole).toBool()) {
             // Start MN
             QString strAlias = this->index.data(Qt::DisplayRole).toString();
             if (ask(tr("Start Masternode"), tr("Are you sure you want to start masternode %1?\n").arg(strAlias))) {
                 if (!verifyWalletUnlocked()) return;
                 startAlias(strAlias);
             }
-        }else {
-            inform(tr("Cannot start masternode, the collateral transaction has not been accepted by the network.\nPlease wait few more minutes."));
+        } else {
+            inform(tr("Cannot start masternode, the collateral transaction has not been confirmed by the network yet.\n"
+                    "Please wait few more minutes (masternode collaterals require %1 confirmations).").arg(MASTERNODE_MIN_CONFIRMATIONS));
         }
     }
 }
diff --git a/src/qt/pivx/masternodewizarddialog.cpp b/src/qt/pivx/masternodewizarddialog.cpp
@@ -335,7 +335,7 @@ bool MasterNodeWizardDialog::createMN()
                 COutPoint collateralOut(walletTx->GetHash(), indexOut);
                 walletModel->lockCoin(collateralOut);
 
-                returnStr = tr("Master node created!");
+                returnStr = tr("Master node created! Wait %1 confirmations before starting it.").arg(MASTERNODE_MIN_CONFIRMATIONS);
                 return true;
             } else{
                 returnStr = tr("masternode.conf file doesn't exists");
diff --git a/src/qt/pivx/mnmodel.cpp b/src/qt/pivx/mnmodel.cpp
@@ -39,7 +39,7 @@ void MNModel::updateMNList()
             {
                 LOCK2(cs_main, pwalletMain->cs_wallet);
                 const CWalletTx *walletTx = pwalletMain->GetWalletTx(txHash);
-                if (walletTx && walletTx->GetDepthInMainChain() > 0) {
+                if (walletTx && walletTx->GetDepthInMainChain() >= MASTERNODE_MIN_CONFIRMATIONS) {
                     txAccepted = true;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -208,16 +208,17 @@ bool MasterNodesWidget::checkMNsNetwork()`
`208`	`208`	`void MasterNodesWidget::onEditMNClicked()`
`209`	`209`	`{`
`210`	`210`	`if (walletModel) {`
`211`		`- if (!checkMNsNetwork()) return;`
	`211`	`+ if (!Params().IsRegTestNet() && !checkMNsNetwork()) return; // skip on RegNet: so we can test even if tier two not synced`
`212`	`212`	`if (index.sibling(index.row(), MNModel::WAS_COLLATERAL_ACCEPTED).data(Qt::DisplayRole).toBool()) {`
`213`	`213`	`// Start MN`
`214`	`214`	`QString strAlias = this->index.data(Qt::DisplayRole).toString();`
`215`	`215`	`if (ask(tr("Start Masternode"), tr("Are you sure you want to start masternode %1?\n").arg(strAlias))) {`
`216`	`216`	`if (!verifyWalletUnlocked()) return;`
`217`	`217`	`startAlias(strAlias);`
`218`	`218`	`}`
`219`		`- }else {`
`220`		`- inform(tr("Cannot start masternode, the collateral transaction has not been accepted by the network.\nPlease wait few more minutes."));`
	`219`	`+ } else {`
	`220`	`+ inform(tr("Cannot start masternode, the collateral transaction has not been confirmed by the network yet.\n"`
	`221`	`+ "Please wait few more minutes (masternode collaterals require %1 confirmations).").arg(MASTERNODE_MIN_CONFIRMATIONS));`
`221`	`222`	`}`
`222`	`223`	`}`
`223`	`224`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ void MNModel::updateMNList()`
`39`	`39`	`{`
`40`	`40`	`LOCK2(cs_main, pwalletMain->cs_wallet);`
`41`	`41`	`const CWalletTx *walletTx = pwalletMain->GetWalletTx(txHash);`
`42`		`- if (walletTx && walletTx->GetDepthInMainChain() > 0) {`
	`42`	`+ if (walletTx && walletTx->GetDepthInMainChain() >= MASTERNODE_MIN_CONFIRMATIONS) {`
`43`	`43`	`txAccepted = true;`
`44`	`44`	`}`
`45`	`45`	`}`