mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-12-23 11:48:52 +00:00
Merge pull request #1125
7b09e9f
wallet: update min mixin for sweep_unmixable on v4 (moneromooo-monero)
This commit is contained in:
commit
60e527f1c2
@ -4079,13 +4079,15 @@ uint64_t wallet2::get_num_rct_outputs()
|
|||||||
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
|
||||||
return select_available_outputs_from_histogram(3, false, true, trusted_daemon);
|
const size_t min_mixin = use_fork_rules(5, 10) ? 2 : 4; // 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)
|
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
|
||||||
return select_available_outputs_from_histogram(3, true, true, trusted_daemon);
|
const size_t min_mixin = use_fork_rules(5, 10) ? 2 : 4; // v5 increases min mixin from 2 to 4
|
||||||
|
return select_available_outputs_from_histogram(min_mixin + 1, true, true, trusted_daemon);
|
||||||
}
|
}
|
||||||
//----------------------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------------------
|
||||||
std::vector<wallet2::pending_tx> wallet2::create_unmixable_sweep_transactions(bool trusted_daemon)
|
std::vector<wallet2::pending_tx> wallet2::create_unmixable_sweep_transactions(bool trusted_daemon)
|
||||||
|
Loading…
Reference in New Issue
Block a user