Merge pull request #432

5ea2f93 wallet2: really include non canonical outputs in dust sweep (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-10-15 19:35:58 +02:00
commit e6d2460263
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -1879,7 +1879,7 @@ void wallet2::transfer_dust(size_t num_outputs, uint64_t unlock_time, uint64_t n
for (transfer_container::iterator i = m_transfers.begin(); i != m_transfers.end(); ++i) for (transfer_container::iterator i = m_transfers.begin(); i != m_transfers.end(); ++i)
{ {
const transfer_details& td = *i; const transfer_details& td = *i;
if (!td.m_spent && td.amount() < dust_policy.dust_threshold && is_transfer_unlocked(td)) if (!td.m_spent && (td.amount() < dust_policy.dust_threshold || !is_valid_decomposed_amount(td.amount())) && is_transfer_unlocked(td))
{ {
selected_transfers.push_back (i); selected_transfers.push_back (i);
money += td.amount(); money += td.amount();