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 #323

Browse Source 
2952ffd wallet2: use the same exponential splitting for normal txes (moneromooo-monero)
7c8d3be wallet2: try to split dust sweep txs exponentially (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-06-20 22:40:12 +02:00
commit 2716a7592b
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wallet/wallet2.cpp
View File

@ -1146,10 +1146,12 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions(std::vector<crypto
for(attempt_count = 1; ;attempt_count++) for(attempt_count = 1; ;attempt_count++)
{ {
auto split_values = split_amounts(dsts, attempt_count); size_t num_tx = 0.5 + pow(1.7,attempt_count-1);
auto split_values = split_amounts(dsts, num_tx);
// Throw if split_amounts comes back with a vector of size different than it should // Throw if split_amounts comes back with a vector of size different than it should
if (split_values.size() != attempt_count) if (split_values.size() != num_tx)
{ {
throw std::runtime_error("Splitting transactions returned a number of potential tx not equal to what was requested"); throw std::runtime_error("Splitting transactions returned a number of potential tx not equal to what was requested");
} }
@ -1357,13 +1359,14 @@ std::vector<wallet2::pending_tx> wallet2::create_dust_sweep_transactions()
for(attempt_count = 1; ;attempt_count++) for(attempt_count = 1; ;attempt_count++)
{ {
size_t num_outputs_per_tx = (num_dust_outputs + attempt_count - 1) / attempt_count; size_t num_tx = 0.5 + pow(1.7,attempt_count-1);
size_t num_outputs_per_tx = (num_dust_outputs + num_tx - 1) / num_tx;
std::vector<pending_tx> ptx_vector; std::vector<pending_tx> ptx_vector;
try try
{ {
// for each new tx // for each new tx
for (size_t i=0; i<attempt_count;++i) for (size_t i=0; i<num_tx;++i)
{ {
cryptonote::transaction tx; cryptonote::transaction tx;
pending_tx ptx; pending_tx ptx;