diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-06-24 14:04:42 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-06-24 14:04:42 -0500 |
| commit | ce129599d0a32a98f305c068509bf0530571d356 (patch) | |
| tree | ae6ce60c71ee869c338f496a7cd69ff16a6ccebe /src/wallet | |
| parent | Merge pull request #7672 (diff) | |
| parent | wallet_api: move adjust_mixin call within try block (diff) | |
| download | monero-ce129599d0a32a98f305c068509bf0530571d356.tar.xz | |
Merge pull request #7739
6914d5b wallet_api: move adjust_mixin call within try block (tobtoht)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/api/wallet.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index db3049f9e..6a96d3db3 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -58,7 +58,6 @@ namespace Monero { namespace { // copy-pasted from simplewallet - static const size_t DEFAULT_MIXIN = 6; static const int DEFAULT_REFRESH_INTERVAL_MILLIS = 1000 * 10; // limit maximum refresh interval as one minute static const int MAX_REFRESH_INTERVAL_MILLIS = 1000 * 60 * 1; @@ -1491,13 +1490,6 @@ PendingTransaction *WalletImpl::createTransactionMultDest(const std::vector<stri cryptonote::address_parse_info info; - // indicates if dst_addr is integrated address (address + payment_id) - // TODO: (https://bitcointalk.org/index.php?topic=753252.msg9985441#msg9985441) - size_t fake_outs_count = mixin_count > 0 ? mixin_count : m_wallet->default_mixin(); - if (fake_outs_count == 0) - fake_outs_count = DEFAULT_MIXIN; - fake_outs_count = m_wallet->adjust_mixin(fake_outs_count); - uint32_t adjusted_priority = m_wallet->adjust_priority(static_cast<uint32_t>(priority)); PendingTransactionImpl * transaction = new PendingTransactionImpl(*this); @@ -1563,6 +1555,9 @@ PendingTransaction *WalletImpl::createTransactionMultDest(const std::vector<stri break; } try { + size_t fake_outs_count = mixin_count > 0 ? mixin_count : m_wallet->default_mixin(); + fake_outs_count = m_wallet->adjust_mixin(mixin_count); + if (amount) { transaction->m_pending_tx = m_wallet->create_transactions_2(dsts, fake_outs_count, 0 /* unlock_time */, adjusted_priority, |