monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5514

Browse source 
e4d100b wallet2: don't wait a day before using new version fees (moneromooo-monero)
This commit is contained in:
luigi1111 2019-07-24 14:00:54 -05:00
commit 7138f9d347
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet2.cpp
View file

@ -6931,7 +6931,7 @@ uint64_t wallet2::get_base_fee() const
else else
return m_light_wallet_per_kb_fee; 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) if (!use_dyn_fee)
return FEE_PER_KB; return FEE_PER_KB;
@ -6962,7 +6962,7 @@ int wallet2::get_fee_algorithm() const
return 3; return 3;
if (use_fork_rules(5, 0)) if (use_fork_rules(5, 0))
return 2; return 2;
if (use_fork_rules(3, -720 * 14)) if (use_fork_rules(3, -30 * 14))
return 1; return 1;
return 0; return 0;
} }