Merge pull request #1425

c5c45ca6 wallet: bring forward use of the dynamic fee (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-12-12 22:38:05 +02:00
commit 67844f826e
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -3186,7 +3186,7 @@ uint64_t wallet2::get_dynamic_per_kb_fee_estimate()
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
uint64_t wallet2::get_per_kb_fee() uint64_t wallet2::get_per_kb_fee()
{ {
bool use_dyn_fee = use_fork_rules(HF_VERSION_DYNAMIC_FEE, -720 * 14); bool use_dyn_fee = use_fork_rules(HF_VERSION_DYNAMIC_FEE, -720 * 1);
if (!use_dyn_fee) if (!use_dyn_fee)
return FEE_PER_KB; return FEE_PER_KB;
try try