[zPIV] mints coin control dialog min accumulation mature text removed + re mint change checkbox not visible anymore.

furszy · furszy · commit 262d5e7fce41 · 2019-05-23T13:30:11.000+02:00
diff --git a/src/qt/privacydialog.cpp b/src/qt/privacydialog.cpp
@@ -109,6 +109,8 @@ PrivacyDialog::PrivacyDialog(QWidget* parent) : QDialog(parent, Qt::WindowSystem
     if(!settings.contains("fDenomsSectionMinimized"))
         settings.setValue("fDenomsSectionMinimized", true);
     minimizeDenomsSection(settings.value("fDenomsSectionMinimized").toBool());
+
+    ui->checkBoxMintChange->setVisible(false);
 }
 
 PrivacyDialog::~PrivacyDialog()
@@ -343,7 +345,7 @@ void PrivacyDialog::sendzPIV()
     }
 
     // Convert change to zPIV
-    bool fMintChange = ui->checkBoxMintChange->isChecked();
+    bool fMintChange = false;// ui->checkBoxMintChange->isChecked();
 
     // Persist minimize change setting
     fMinimizeChange = ui->checkBoxMinimizeChange->isChecked();
diff --git a/src/qt/zpivcontroldialog.cpp b/src/qt/zpivcontroldialog.cpp
@@ -80,7 +80,7 @@ void ZPivControlDialog::updateList()
 
     //populate rows with mint info
     int nBestHeight = chainActive.Height();
-    map<CoinDenomination, int> mapMaturityHeight = GetMintMaturityHeight();
+    //map<CoinDenomination, int> mapMaturityHeight = GetMintMaturityHeight();
     for (const CMintMeta& mint : setMints) {
         // assign this mint to the correct denomination in the tree view
         libzerocoin::CoinDenomination denom = mint.denom;
@@ -123,9 +123,10 @@ void ZPivControlDialog::updateList()
         }
 
         // check for maturity
-        bool isMature = false;
-        if (mapMaturityHeight.count(mint.denom))
-            isMature = mint.nHeight < mapMaturityHeight.at(denom);
+        // Always mature, public spends doesn't require any new accumulation.
+        bool isMature = true;
+        //if (mapMaturityHeight.count(mint.denom))
+        //    isMature = mint.nHeight < mapMaturityHeight.at(denom);
 
         // disable selecting this mint if it is not spendable - also display a reason why
         bool fSpendable = isMature && nConfirmations >= Params().Zerocoin_MintRequiredConfirmations() && mint.isSeedCorrect;

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,8 @@ PrivacyDialog::PrivacyDialog(QWidget* parent) : QDialog(parent, Qt::WindowSystem`
`109`	`109`	`if(!settings.contains("fDenomsSectionMinimized"))`
`110`	`110`	`settings.setValue("fDenomsSectionMinimized", true);`
`111`	`111`	`minimizeDenomsSection(settings.value("fDenomsSectionMinimized").toBool());`
	`112`	`+`
	`113`	`+ ui->checkBoxMintChange->setVisible(false);`
`112`	`114`	`}`
`113`	`115`
`114`	`116`	`PrivacyDialog::~PrivacyDialog()`
`@@ -343,7 +345,7 @@ void PrivacyDialog::sendzPIV()`
`343`	`345`	`}`
`344`	`346`
`345`	`347`	`// Convert change to zPIV`
`346`		`- bool fMintChange = ui->checkBoxMintChange->isChecked();`
	`348`	`+ bool fMintChange = false;// ui->checkBoxMintChange->isChecked();`
`347`	`349`
`348`	`350`	`// Persist minimize change setting`
`349`	`351`	`fMinimizeChange = ui->checkBoxMinimizeChange->isChecked();`