aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-05-02 17:58:42 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-05-02 18:00:25 +0000
commite4d100b062555dfb476bf1e4c43260b618f2aa9f (patch)
tree01270fb4f8d5cf041882420827a3c9fe984a2f6a /src
parentMerge pull request #5486 (diff)
downloadmonero-e4d100b062555dfb476bf1e4c43260b618f2aa9f.tar.xz
wallet2: don't wait a day before using new version fees
30 blocks should be more than enough to drain the txpool of transactions made with the old fee scheme
Diffstat (limited to '')
-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 6554ef7d5..54f1496c0 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -6919,7 +6919,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;
@@ -6950,7 +6950,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;
}