Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-18 17:47:59 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4253

Browse source 
be001326 remove obsolete daemon selection of fake outs and old tx construction (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-09-14 12:54:25 +02:00
commit 239a7e10ff
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
16 changed files with 18 additions and 955 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/simplewallet/simplewallet.cpp
View file

@ -445,7 +445,7 @@ namespace
LOG_ERROR("RPC error: " << e.to_string());
fail_msg_writer() << tr("RPC error: ") << e.what();
}
catch (const tools::error::get_random_outs_error &e)
catch (const tools::error::get_outs_error &e)
{
fail_msg_writer() << tr("failed to get random outputs to mix: ") << e.what();
}
@ -4921,15 +4921,12 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
unlock_block = bc_height + locked_blocks;
ptx_vector = m_wallet->create_transactions_2(dsts, fake_outs_count, unlock_block /* unlock_time */, priority, extra, m_current_subaddress_account, subaddr_indices);
break;
default:
LOG_ERROR("Unknown transfer method, using default");
/* FALLTHRU */
case TransferNew:
ptx_vector = m_wallet->create_transactions_2(dsts, fake_outs_count, 0 /* unlock_time */, priority, extra, m_current_subaddress_account, subaddr_indices);
break;
default:
LOG_ERROR("Unknown transfer method, using original");
/* FALLTHRU */
case TransferOriginal:
ptx_vector = m_wallet->create_transactions(dsts, fake_outs_count, 0 /* unlock_time */, priority, extra);
break;
}
if (ptx_vector.empty())