Merge pull request #5514
e4d100b
wallet2: don't wait a day before using new version fees (moneromooo-monero)
This commit is contained in:
commit
7138f9d347
|
@ -6931,7 +6931,7 @@ uint64_t wallet2::get_base_fee() const
|
|||
else
|
||||
return m_light_wallet_per_kb_fee;
|
||||
}
|
||||
bool use_dyn_fee = use_fork_rules(HF_VERSION_DYNAMIC_FEE, -720 * 1);
|
||||
bool use_dyn_fee = use_fork_rules(HF_VERSION_DYNAMIC_FEE, -30 * 1);
|
||||
if (!use_dyn_fee)
|
||||
return FEE_PER_KB;
|
||||
|
||||
|
@ -6962,7 +6962,7 @@ int wallet2::get_fee_algorithm() const
|
|||
return 3;
|
||||
if (use_fork_rules(5, 0))
|
||||
return 2;
|
||||
if (use_fork_rules(3, -720 * 14))
|
||||
if (use_fork_rules(3, -30 * 14))
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue