diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-05-10 17:22:58 -0700 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-05-10 17:22:58 -0700 |
| commit | 4b728d7dd48584987f53995a141baac4f886f017 (patch) | |
| tree | a2634302ae1ade5f3883c1381983de9c3a5e7d78 | |
| parent | Merge pull request #3775 (diff) | |
| parent | wallet2: consider 6 outputs or less to be unmixable from v7 (diff) | |
| download | monero-4b728d7dd48584987f53995a141baac4f886f017.tar.xz | |
Merge pull request #3794
a58d9738 wallet2: consider 6 outputs or less to be unmixable from v7 (moneromooo-monero)
| -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 d53ed82a9..6a37b59eb 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -8201,14 +8201,14 @@ const wallet2::transfer_details &wallet2::get_transfer_details(size_t idx) const 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(6, 10) ? 4 : 2; // v6 increases min mixin from 2 to 4 + const size_t min_mixin = use_fork_rules(7, 10) ? 6 : use_fork_rules(6, 10) ? 4 : 2; // v6 increases min mixin from 2 to 4, v7 to 6 return select_available_outputs_from_histogram(min_mixin + 1, false, true, false, 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(6, 10) ? 4 : 2; // v6 increases min mixin from 2 to 4 + const size_t min_mixin = use_fork_rules(7, 10) ? 6 : use_fork_rules(6, 10) ? 4 : 2; // v6 increases min mixin from 2 to 4, v7 to 6 return select_available_outputs_from_histogram(min_mixin + 1, true, true, true, trusted_daemon); } //---------------------------------------------------------------------------------------------------- |