mirror of
https://github.com/Retropex/bitcoin.git
synced 2025-05-12 19:20:42 +02:00
Qt/Options: Configure blockmintxfee using rwconf
This commit is contained in:
parent
dc03e92c4e
commit
d15608edce
@ -320,6 +320,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>")));
|
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 kvB."));
|
||||||
|
|
||||||
blockmaxsize = new QSpinBox(tabMining);
|
blockmaxsize = new QSpinBox(tabMining);
|
||||||
blockmaxsize->setMinimum(1);
|
blockmaxsize->setMinimum(1);
|
||||||
blockmaxsize->setMaximum((MAX_BLOCK_SERIALIZED_SIZE - 1000) / 1000);
|
blockmaxsize->setMaximum((MAX_BLOCK_SERIALIZED_SIZE - 1000) / 1000);
|
||||||
@ -604,6 +607,7 @@ void OptionsDialog::setMapper()
|
|||||||
|
|
||||||
/* Mining tab */
|
/* Mining tab */
|
||||||
|
|
||||||
|
mapper->addMapping(blockmintxfee, OptionsModel::blockmintxfee);
|
||||||
mapper->addMapping(blockmaxsize, OptionsModel::blockmaxsize);
|
mapper->addMapping(blockmaxsize, OptionsModel::blockmaxsize);
|
||||||
mapper->addMapping(blockprioritysize, OptionsModel::blockprioritysize);
|
mapper->addMapping(blockprioritysize, OptionsModel::blockprioritysize);
|
||||||
mapper->addMapping(blockmaxweight, OptionsModel::blockmaxweight);
|
mapper->addMapping(blockmaxweight, OptionsModel::blockmaxweight);
|
||||||
|
@ -116,6 +116,7 @@ private:
|
|||||||
QSpinBox *datacarriersize;
|
QSpinBox *datacarriersize;
|
||||||
BitcoinAmountField *dustrelayfee;
|
BitcoinAmountField *dustrelayfee;
|
||||||
|
|
||||||
|
BitcoinAmountField *blockmintxfee;
|
||||||
QSpinBox *blockmaxsize, *blockprioritysize, *blockmaxweight;
|
QSpinBox *blockmaxsize, *blockprioritysize, *blockmaxweight;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -673,6 +673,12 @@ QVariant OptionsModel::getOption(OptionID option, const std::string& suffix) con
|
|||||||
return qlonglong(node().mempool().m_opts.max_datacarrier_bytes.value_or(0));
|
return qlonglong(node().mempool().m_opts.max_datacarrier_bytes.value_or(0));
|
||||||
case dustrelayfee:
|
case dustrelayfee:
|
||||||
return qlonglong(node().mempool().m_opts.dust_relay_feerate_floor.GetFeePerK());
|
return qlonglong(node().mempool().m_opts.dust_relay_feerate_floor.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:
|
case blockmaxsize:
|
||||||
return qlonglong(gArgs.GetIntArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE) / 1000);
|
return qlonglong(gArgs.GetIntArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE) / 1000);
|
||||||
case blockprioritysize:
|
case blockprioritysize:
|
||||||
@ -1179,6 +1185,13 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value, const std::
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case blockmintxfee:
|
||||||
|
if (changed()) {
|
||||||
|
std::string strNv = FormatMoney(value.toLongLong());
|
||||||
|
gArgs.ForceSetArg("-blockmintxfee", strNv);
|
||||||
|
gArgs.ModifyRWConfigFile("blockmintxfee", strNv);
|
||||||
|
}
|
||||||
|
break;
|
||||||
case blockmaxsize:
|
case blockmaxsize:
|
||||||
case blockprioritysize:
|
case blockprioritysize:
|
||||||
case blockmaxweight:
|
case blockmaxweight:
|
||||||
|
@ -97,6 +97,7 @@ public:
|
|||||||
rejectbaremultisig, // bool
|
rejectbaremultisig, // bool
|
||||||
datacarriersize,
|
datacarriersize,
|
||||||
dustrelayfee,
|
dustrelayfee,
|
||||||
|
blockmintxfee,
|
||||||
blockmaxsize,
|
blockmaxsize,
|
||||||
blockprioritysize,
|
blockprioritysize,
|
||||||
blockmaxweight,
|
blockmaxweight,
|
||||||
|
Loading…
Reference in New Issue
Block a user