mirror of
https://codeberg.org/anoncontributorxmr/monero.git
synced 2024-12-24 22:27:46 +00:00
Merge pull request #5489
64983fce
wallet2: default to trying to keep 5 outputs of 2+ monero (moneromooo-monero)
This commit is contained in:
commit
efd2412e77
1 changed files with 13 additions and 3 deletions
|
@ -131,6 +131,9 @@ using namespace cryptonote;
|
||||||
#define GAMMA_SHAPE 19.28
|
#define GAMMA_SHAPE 19.28
|
||||||
#define GAMMA_SCALE (1/1.61)
|
#define GAMMA_SCALE (1/1.61)
|
||||||
|
|
||||||
|
#define DEFAULT_MIN_OUTPUT_COUNT 5
|
||||||
|
#define DEFAULT_MIN_OUTPUT_VALUE (2*COIN)
|
||||||
|
|
||||||
static const std::string MULTISIG_SIGNATURE_MAGIC = "SigMultisigPkV1";
|
static const std::string MULTISIG_SIGNATURE_MAGIC = "SigMultisigPkV1";
|
||||||
static const std::string MULTISIG_EXTRA_INFO_MAGIC = "MultisigxV1";
|
static const std::string MULTISIG_EXTRA_INFO_MAGIC = "MultisigxV1";
|
||||||
|
|
||||||
|
@ -9375,9 +9378,16 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
|
||||||
idx = pop_best_value(indices, tx.selected_transfers, true);
|
idx = pop_best_value(indices, tx.selected_transfers, true);
|
||||||
|
|
||||||
// we might not want to add it if it's a large output and we don't have many left
|
// we might not want to add it if it's a large output and we don't have many left
|
||||||
if (m_transfers[idx].amount() >= m_min_output_value) {
|
uint64_t min_output_value = m_min_output_value;
|
||||||
if (get_count_above(m_transfers, *unused_transfers_indices, m_min_output_value) < m_min_output_count) {
|
uint32_t min_output_count = m_min_output_count;
|
||||||
LOG_PRINT_L2("Second output was not strictly needed, and we're running out of outputs above " << print_money(m_min_output_value) << ", not adding");
|
if (min_output_value == 0 && min_output_count == 0)
|
||||||
|
{
|
||||||
|
min_output_value = DEFAULT_MIN_OUTPUT_VALUE;
|
||||||
|
min_output_count = DEFAULT_MIN_OUTPUT_COUNT;
|
||||||
|
}
|
||||||
|
if (m_transfers[idx].amount() >= min_output_value) {
|
||||||
|
if (get_count_above(m_transfers, *unused_transfers_indices, min_output_value) < min_output_count) {
|
||||||
|
LOG_PRINT_L2("Second output was not strictly needed, and we're running out of outputs above " << print_money(min_output_value) << ", not adding");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue