Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-12 19:20:42 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt/Options: Configure blockmintxfee using rwconf

Browse Source
This commit is contained in:
Luke Dashjr 2017-02-08 01:09:28 +00:00
parent 43dc306389
commit f58d281cde
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/optionsdialog.cpp
View File

@ -316,6 +316,9 @@ OptionsDialog::OptionsDialog(QWidget* parent, bool enableWallet)
verticalLayout_Mining->addWidget(new QLabel(tr("<strong>Note that mining is heavily influenced by the settings on the Mempool tab.</strong>")));
blockmintxfee = new BitcoinAmountField(tabMining);
CreateOptionUI(verticalLayout_Mining, blockmintxfee, tr("Only mine transactions paying a fee of at least %s per kB."));
blockmaxsize = new QSpinBox(tabMining);
blockmaxsize->setMinimum(1);
blockmaxsize->setMaximum((MAX_BLOCK_SERIALIZED_SIZE - 1000) / 1000);
@ -592,6 +595,7 @@ void OptionsDialog::setMapper()
/* Mining tab */
mapper->addMapping(blockmintxfee, OptionsModel::blockmintxfee);
mapper->addMapping(blockmaxsize, OptionsModel::blockmaxsize);
mapper->addMapping(blockprioritysize, OptionsModel::blockprioritysize);
mapper->addMapping(blockmaxweight, OptionsModel::blockmaxweight);

1
src/qt/optionsdialog.h
View File

@ -116,6 +116,7 @@ private:
QSpinBox *datacarriersize;
BitcoinAmountField *dustrelayfee;
BitcoinAmountField *blockmintxfee;
QSpinBox *blockmaxsize, *blockprioritysize, *blockmaxweight;
};

13
src/qt/optionsmodel.cpp
View File

@ -648,6 +648,12 @@ QVariant OptionsModel::getOption(OptionID option, const std::string& suffix) con
return qlonglong(node().mempool().m_max_datacarrier_bytes.value_or(0));
case dustrelayfee:
return qlonglong(node().mempool().m_dust_relay_feerate.GetFeePerK());
case blockmintxfee:
if (gArgs.IsArgSet("-blockmintxfee")) {
return qlonglong(ParseMoney(gArgs.GetArg("-blockmintxfee", "")).value_or(0));
} else {
return qlonglong(DEFAULT_BLOCK_MIN_TX_FEE);
}
case blockmaxsize:
return qlonglong(gArgs.GetIntArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE) / 1000);
case blockprioritysize:
@ -1147,6 +1153,13 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value, const std::
node().mempool().m_dust_relay_feerate = CFeeRate(nNv);
}
break;
case blockmintxfee:
if (changed()) {
std::string strNv = FormatMoney(value.toLongLong());
gArgs.ForceSetArg("-blockmintxfee", strNv);
gArgs.ModifyRWConfigFile("blockmintxfee", strNv);
}
break;
case blockmaxsize:
case blockprioritysize:
case blockmaxweight:

1
src/qt/optionsmodel.h
View File

@ -97,6 +97,7 @@ public:
rejectbaremultisig, // bool
datacarriersize,
dustrelayfee,
blockmintxfee,
blockmaxsize,
blockprioritysize,
blockmaxweight,