rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-27 01:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1016

Browse source 
3112e24 wallet: interpret 0 fee multiplier as default for sweep_all too (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-09-01 11:28:29 +02:00
commit e858c4c745
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet2.cpp
View file

@ -3468,7 +3468,7 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
return ptx_vector; return ptx_vector;
} }
std::vector<wallet2::pending_tx> wallet2::create_transactions_all(const cryptonote::account_public_address &address, const size_t fake_outs_count, const uint64_t unlock_time, const uint64_t fee_multiplier, const std::vector<uint8_t> extra, bool trusted_daemon) std::vector<wallet2::pending_tx> wallet2::create_transactions_all(const cryptonote::account_public_address &address, const size_t fake_outs_count, const uint64_t unlock_time, uint64_t fee_multiplier, const std::vector<uint8_t> extra, bool trusted_daemon)
{ {
std::vector<size_t> unused_transfers_indices; std::vector<size_t> unused_transfers_indices;
std::vector<size_t> unused_dust_indices; std::vector<size_t> unused_dust_indices;
@ -3485,6 +3485,8 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_all(const cryptono
uint64_t upper_transaction_size_limit = get_upper_tranaction_size_limit(); uint64_t upper_transaction_size_limit = get_upper_tranaction_size_limit();
const bool use_rct = use_fork_rules(4, 0); const bool use_rct = use_fork_rules(4, 0);
fee_multiplier = sanitize_fee_multiplier(fee_multiplier);
// gather all our dust and non dust outputs // gather all our dust and non dust outputs
for (size_t i = 0; i < m_transfers.size(); ++i) for (size_t i = 0; i < m_transfers.size(); ++i)
{ {