diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2016-10-15 16:07:18 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2016-10-15 16:07:18 +0100 |
| commit | 0eba1335be8f2acc46517a306465beda3e674156 (patch) | |
| tree | 6f970c6ebba92572d59bd9ab98f3ec4e963b9df2 /src/wallet/wallet2.cpp | |
| parent | Merge pull request #1203 (diff) | |
| download | monero-0eba1335be8f2acc46517a306465beda3e674156.tar.xz | |
wallet: fix mixup between mixin 2 and 4 before/after v5
Diffstat (limited to '')
| -rw-r--r-- | src/wallet/wallet2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 98dbc4fd6..469d90d17 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -3981,14 +3981,14 @@ uint64_t wallet2::get_num_rct_outputs() std::vector<size_t> wallet2::select_available_unmixable_outputs(bool trusted_daemon) { // request all outputs with less than 3 instances - const size_t min_mixin = use_fork_rules(5, 10) ? 2 : 4; // v5 increases min mixin from 2 to 4 + const size_t min_mixin = use_fork_rules(5, 10) ? 4 : 2; // v5 increases min mixin from 2 to 4 return select_available_outputs_from_histogram(min_mixin + 1, false, true, trusted_daemon); } //---------------------------------------------------------------------------------------------------- std::vector<size_t> wallet2::select_available_mixable_outputs(bool trusted_daemon) { // request all outputs with at least 3 instances, so we can use mixin 2 with - const size_t min_mixin = use_fork_rules(5, 10) ? 2 : 4; // v5 increases min mixin from 2 to 4 + const size_t min_mixin = use_fork_rules(5, 10) ? 4 : 2; // v5 increases min mixin from 2 to 4 return select_available_outputs_from_histogram(min_mixin + 1, true, true, trusted_daemon); } //---------------------------------------------------------------------------------------------------- |