Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3794

Browse Source 
a58d9738 wallet2: consider 6 outputs or less to be unmixable from v7 (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-05-10 17:22:58 -07:00
commit 4b728d7dd4
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/wallet2.cpp
View File

@ -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) std::vector<size_t> wallet2::select_available_unmixable_outputs(bool trusted_daemon)
{ {
// request all outputs with less than 3 instances // 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); 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) 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 // 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); return select_available_outputs_from_histogram(min_mixin + 1, true, true, true, trusted_daemon);
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------