[GUI] SettingsWalletOptions: validate stake split threshold on save

random-zebra · random-zebra · commit 8299e3ee51df · 2020-05-23T13:52:23.000+02:00
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
@@ -47,6 +47,7 @@ void OptionsModel::Init()
 
     // Ensure restart flag is unset on client startup
     setRestartRequired(false);
+    setSSTChanged(false);
 
     // These are Qt-only settings:
 
@@ -379,6 +380,7 @@ bool OptionsModel::setData(const QModelIndex& index, const QVariant& value, int
         case StakeSplitThreshold:
             // Write double as qlonglong/CAmount
             setStakeSplitThreshold(static_cast<CAmount>(value.toDouble() * COIN));
+            setSSTChanged(true);
             break;
         case DisplayUnit:
             setDisplayUnit(value);
@@ -485,6 +487,23 @@ void OptionsModel::setStakeSplitThreshold(const CAmount nStakeSplitThreshold)
     }
 }
 
+/* returns default minimum value for stake split threshold as doulbe */
+double OptionsModel::getSSTMinimum() const
+{
+    return static_cast<double>(CWallet::minStakeSplitThreshold / COIN);
+}
+
+/* Verify that StakeSplitThreshold's value is either 0 or above the min. Else reset */
+bool OptionsModel::isSSTValid()
+{
+    if (pwalletMain && pwalletMain->nStakeSplitThreshold &&
+            pwalletMain->nStakeSplitThreshold < CWallet::minStakeSplitThreshold) {
+        setStakeSplitThreshold(CWallet::minStakeSplitThreshold);
+        return false;
+    }
+    return true;
+}
+
 /* Update Custom Fee value in wallet */
 void OptionsModel::setUseCustomFee(bool fUse)
 {
@@ -541,3 +560,14 @@ bool OptionsModel::isRestartRequired()
     return settings.value("fRestartRequired", false).toBool();
 }
 
+void OptionsModel::setSSTChanged(bool fChanged)
+{
+    QSettings settings;
+    return settings.setValue("fSSTChanged", fChanged);
+}
+
+bool OptionsModel::isSSTChanged()
+{
+    QSettings settings;
+    return settings.value("fSSTChanged", false).toBool();
+}
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
@@ -73,6 +73,8 @@ class OptionsModel : public QAbstractListModel
     void setDisplayUnit(const QVariant& value);
     /* Update StakeSplitThreshold's value in wallet */
     void setStakeSplitThreshold(const CAmount value);
+    double getSSTMinimum() const;
+    bool isSSTValid();
     /* Update Custom Fee value in wallet */
     void setUseCustomFee(bool fUse);
     void setCustomFeeValue(const CAmount& value);
@@ -90,6 +92,8 @@ class OptionsModel : public QAbstractListModel
     /* Restart flag helper */
     void setRestartRequired(bool fRequired);
     bool isRestartRequired();
+    void setSSTChanged(bool fChanged);
+    bool isSSTChanged();
     bool resetSettings;
 
     bool isColdStakingScreenEnabled() { return showColdStakingScreen; }
diff --git a/src/qt/pivx/settings/forms/settingswalletoptionswidget.ui b/src/qt/pivx/settings/forms/settingswalletoptionswidget.ui
@@ -124,10 +124,10 @@
           <item>
            <widget class="QDoubleSpinBox" name="spinBoxStakeSplitThreshold">
             <property name="decimals">
-             <number>3</number>
+             <number>8</number>
             </property>
             <property name="minimum">
-             <number>1</number>
+             <number>0</number>
             </property>
             <property name="maximum">
              <number>999999</number>
diff --git a/src/qt/pivx/settings/settingswalletoptionswidget.cpp b/src/qt/pivx/settings/settingswalletoptionswidget.cpp
@@ -79,6 +79,11 @@ void SettingsWalletOptionsWidget::setMapper(QDataWidgetMapper *mapper){
     mapper->addMapping(ui->lineEditPort, OptionsModel::ProxyPort);
 }
 
+void SettingsWalletOptionsWidget::setSpinBoxStakeSplitThreshold(double val)
+{
+    ui->spinBoxStakeSplitThreshold->setValue(val);
+}
+
 SettingsWalletOptionsWidget::~SettingsWalletOptionsWidget(){
     delete ui;
 }
diff --git a/src/qt/pivx/settings/settingswalletoptionswidget.h b/src/qt/pivx/settings/settingswalletoptionswidget.h
@@ -21,6 +21,7 @@ class SettingsWalletOptionsWidget : public PWidget
     ~SettingsWalletOptionsWidget();
 
     void setMapper(QDataWidgetMapper *mapper);
+    void setSpinBoxStakeSplitThreshold(double val);
 
 Q_SIGNALS:
     void saveSettings();
diff --git a/src/qt/pivx/settings/settingswidget.cpp b/src/qt/pivx/settings/settingswidget.cpp
@@ -231,8 +231,15 @@ void SettingsWidget::onResetAction()
 void SettingsWidget::onSaveOptionsClicked()
 {
     if (mapper->submit()) {
+        OptionsModel* optionsModel = this->clientModel->getOptionsModel();
+        if (optionsModel->isSSTChanged() && !optionsModel->isSSTValid()) {
+            const double stakeSplitMinimum = optionsModel->getSSTMinimum();
+            settingsWalletOptionsWidget->setSpinBoxStakeSplitThreshold(stakeSplitMinimum);
+            inform(tr("Stake Split too low, it shall be either >= %1 or equal to 0 (to disable stake splitting)").arg(stakeSplitMinimum));
+            return;
+        }
         pwalletMain->MarkDirty();
-        if (this->clientModel->getOptionsModel()->isRestartRequired()) {
+        if (optionsModel->isRestartRequired()) {
             bool fAcceptRestart = openStandardDialog(tr("Restart required"), tr("Your wallet needs to be restarted to apply the changes\n"), tr("Restart Now"), tr("Restart Later"));
 
             if (fAcceptRestart) {

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,11 @@ void SettingsWalletOptionsWidget::setMapper(QDataWidgetMapper *mapper){`
`79`	`79`	`mapper->addMapping(ui->lineEditPort, OptionsModel::ProxyPort);`
`80`	`80`	`}`
`81`	`81`
	`82`	`+void SettingsWalletOptionsWidget::setSpinBoxStakeSplitThreshold(double val)`
	`83`	`+{`
	`84`	`+ ui->spinBoxStakeSplitThreshold->setValue(val);`
	`85`	`+}`
	`86`	`+`
`82`	`87`	`SettingsWalletOptionsWidget::~SettingsWalletOptionsWidget(){`
`83`	`88`	`delete ui;`
`84`	`89`	`}`