fixed Darksend settings

This commit is contained in:
Evan Duffield 2014-12-25 11:20:18 -07:00
parent 7604ace9be
commit 039023d9c9
5 changed files with 64 additions and 2 deletions

View File

@ -158,7 +158,52 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_2">
<property name="toolTip">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This amount acts as a threshold to turn off Darksend once it's reached. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="statusTip">
<string notr="true"/>
</property>
<property name="whatsThis">
<string notr="true"/>
</property>
<property name="accessibleName">
<string notr="true"/>
</property>
<property name="accessibleDescription">
<string notr="true"/>
</property>
<property name="text">
<string>Amount of Darkcoin to keep anonymized</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="anonymizeDarkcoin">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>2000</number>
</property>
<property name="singleStep">
<number>10</number>
</property>
<property name="value">
<number>1000</number>
</property>
</widget>
</item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
<widget class="QWidget" name="tabWallet"> <widget class="QWidget" name="tabWallet">
<attribute name="title"> <attribute name="title">

View File

@ -13,6 +13,7 @@
#include "guiutil.h" #include "guiutil.h"
#include "monitoreddatamapper.h" #include "monitoreddatamapper.h"
#include "optionsmodel.h" #include "optionsmodel.h"
#include "darksend.h"
#include "main.h" // for CTransaction::nMinTxFee and MAX_SCRIPTCHECK_THREADS #include "main.h" // for CTransaction::nMinTxFee and MAX_SCRIPTCHECK_THREADS
#include "netbase.h" #include "netbase.h"
@ -188,6 +189,12 @@ void OptionsDialog::setMapper()
mapper->addMapping(ui->unit, OptionsModel::DisplayUnit); mapper->addMapping(ui->unit, OptionsModel::DisplayUnit);
mapper->addMapping(ui->displayAddresses, OptionsModel::DisplayAddresses); mapper->addMapping(ui->displayAddresses, OptionsModel::DisplayAddresses);
mapper->addMapping(ui->thirdPartyTxUrls, OptionsModel::ThirdPartyTxUrls); mapper->addMapping(ui->thirdPartyTxUrls, OptionsModel::ThirdPartyTxUrls);
/* Darksend Rounds */
mapper->addMapping(ui->darksendRounds, OptionsModel::DarksendRounds);
mapper->addMapping(ui->anonymizeDarkcoin, OptionsModel::AnonymizeDarkcoinAmount);
} }
void OptionsDialog::enableOkButton() void OptionsDialog::enableOkButton()
@ -228,6 +235,7 @@ void OptionsDialog::on_resetButton_clicked()
void OptionsDialog::on_okButton_clicked() void OptionsDialog::on_okButton_clicked()
{ {
mapper->submit(); mapper->submit();
darkSendPool.cachedNumBlocks = 0;
accept(); accept();
} }

View File

@ -72,6 +72,15 @@ void OptionsModel::Init()
settings.setValue("fCoinControlFeatures", false); settings.setValue("fCoinControlFeatures", false);
fCoinControlFeatures = settings.value("fCoinControlFeatures", false).toBool(); fCoinControlFeatures = settings.value("fCoinControlFeatures", false).toBool();
if (!settings.contains("nDarksendRounds"))
settings.setValue("nDarksendRounds", 2);
if (!settings.contains("nAnonymizeDarkcoinAmount"))
settings.setValue("nAnonymizeDarkcoinAmount", 1000);
nDarksendRounds = settings.value("nDarksendRounds").toLongLong();
nAnonymizeDarkcoinAmount = settings.value("nAnonymizeDarkcoinAmount").toLongLong();
// These are shared with the core or have a command-line parameter // These are shared with the core or have a command-line parameter
// and we want command-line parameters to overwrite the GUI settings. // and we want command-line parameters to overwrite the GUI settings.
// //

View File

@ -42,9 +42,9 @@ public:
ThreadsScriptVerif, // int ThreadsScriptVerif, // int
DatabaseCache, // int DatabaseCache, // int
SpendZeroConfChange, // bool SpendZeroConfChange, // bool
OptionIDRowCount,
DarksendRounds, // int DarksendRounds, // int
AnonymizeDarkcoinAmount, //int AnonymizeDarkcoinAmount, //int
OptionIDRowCount,
}; };
void Init(); void Init();

View File

@ -10,7 +10,7 @@
// Name of client reported in the 'version' message. Report the same name // Name of client reported in the 'version' message. Report the same name
// for both darkcoind and darkcoin-qt, to make it harder for attackers to // for both darkcoind and darkcoin-qt, to make it harder for attackers to
// target servers or GUI users specifically. // target servers or GUI users specifically.
const std::string CLIENT_NAME("Duffield"); const std::string CLIENT_NAME("Darkcoin Core");
// Client version number // Client version number
#define CLIENT_VERSION_SUFFIX "-beta" #define CLIENT_VERSION_SUFFIX "-beta"