aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-07-24 14:00:54 -0500
committerluigi1111 <luigi1111w@gmail.com>2019-07-24 14:00:54 -0500
commit7138f9d3476a6e07e272c3647034b9fc0bc8b4df (patch)
tree186e25b8f5629f2a3fde2b753d5d6bdac9a25add
parentMerge pull request #5513 (diff)
parentwallet2: don't wait a day before using new version fees (diff)
downloadmonero-7138f9d3476a6e07e272c3647034b9fc0bc8b4df.tar.xz
Merge pull request #5514
e4d100b wallet2: don't wait a day before using new version fees (moneromooo-monero)
-rw-r--r--src/wallet/wallet2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 3d842ad9e..308727657 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -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;
}