aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet2.cpp
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-03-07 10:37:31 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-03-07 13:19:04 +0000
commit38657fd0e9bfe67e30aa011d8ec0585e27a3af2d (patch)
tree20d9041d28e49646d115d8176bbc486c34ac06bd /src/wallet/wallet2.cpp
parentMerge pull request #3253 (diff)
downloadmonero-38657fd0e9bfe67e30aa011d8ec0585e27a3af2d.tar.xz
Bump min ring size from 5 to 7 from v7
Diffstat (limited to 'src/wallet/wallet2.cpp')
-rw-r--r--src/wallet/wallet2.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 4a6c6fad2..d845dd896 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -5089,7 +5089,11 @@ int wallet2::get_fee_algorithm() const
//------------------------------------------------------------------------------------------------------------------------------
uint64_t wallet2::adjust_mixin(uint64_t mixin) const
{
- if (mixin < 4 && use_fork_rules(6, 10)) {
+ if (mixin < 6 && use_fork_rules(7, 10)) {
+ MWARNING("Requested ring size " << (mixin + 1) << " too low for hard fork 7, using 7");
+ mixin = 6;
+ }
+ else if (mixin < 4 && use_fork_rules(6, 10)) {
MWARNING("Requested ring size " << (mixin + 1) << " too low for hard fork 6, using 5");
mixin = 4;
}