diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-03-08 18:47:41 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-03-08 18:47:41 +0200 |
| commit | e9f41e405f1f75533ef6e9d5adc76ba41dd29e8c (patch) | |
| tree | 33326d648cb18d70299e6d20a1028d53f10d8bdc /src/wallet | |
| parent | Merge pull request #3370 (diff) | |
| parent | Bump min ring size from 5 to 7 from v7 (diff) | |
| download | monero-e9f41e405f1f75533ef6e9d5adc76ba41dd29e8c.tar.xz | |
Merge pull request #3368
38657fd0 Bump min ring size from 5 to 7 from v7 (moneromooo-monero)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 6 |
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; } |