gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-04 08:47:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #783

Browse Source 
48d0747 wallet: better output selection for transfer/transfer_new (moneromooo-monero)
This commit is contained in:
Riccardo Spagni
2016-04-14 16:25:38 +09:00
parent 17049fa8e8 48d0747d00
commit 6bfb8799c3
6 changed files with 61 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/simplewallet/simplewallet.cpp
View File

@@ -2133,9 +2133,9 @@ bool simple_wallet::transfer_main(bool new_algorithm, const std::vector<std::str
// figure out what tx will be necessary
std::vector<tools::wallet2::pending_tx> ptx_vector;
if (new_algorithm)
ptx_vector = m_wallet->create_transactions_2(dsts, fake_outs_count, 0 /* unlock_time */, 0 /* unused fee arg*/, extra);
ptx_vector = m_wallet->create_transactions_2(dsts, fake_outs_count, 0 /* unlock_time */, 0 /* unused fee arg*/, extra, m_trusted_daemon);
else
ptx_vector = m_wallet->create_transactions(dsts, fake_outs_count, 0 /* unlock_time */, 0 /* unused fee arg*/, extra);
ptx_vector = m_wallet->create_transactions(dsts, fake_outs_count, 0 /* unlock_time */, 0 /* unused fee arg*/, extra, m_trusted_daemon);
// if more than one tx necessary, prompt user to confirm
if (m_wallet->always_confirm_transfers() || ptx_vector.size() > 1)