mirror of
https://codeberg.org/anoncontributorxmr/monero.git
synced 2024-11-29 18:53:14 +00:00
wallet_api: move adjust_mixin call within try block
This commit is contained in:
parent
1c8e598172
commit
6914d5b914
1 changed files with 3 additions and 8 deletions
|
@ -58,7 +58,6 @@ namespace Monero {
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
// copy-pasted from simplewallet
|
// copy-pasted from simplewallet
|
||||||
static const size_t DEFAULT_MIXIN = 6;
|
|
||||||
static const int DEFAULT_REFRESH_INTERVAL_MILLIS = 1000 * 10;
|
static const int DEFAULT_REFRESH_INTERVAL_MILLIS = 1000 * 10;
|
||||||
// limit maximum refresh interval as one minute
|
// limit maximum refresh interval as one minute
|
||||||
static const int MAX_REFRESH_INTERVAL_MILLIS = 1000 * 60 * 1;
|
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;
|
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));
|
uint32_t adjusted_priority = m_wallet->adjust_priority(static_cast<uint32_t>(priority));
|
||||||
|
|
||||||
PendingTransactionImpl * transaction = new PendingTransactionImpl(*this);
|
PendingTransactionImpl * transaction = new PendingTransactionImpl(*this);
|
||||||
|
@ -1563,6 +1555,9 @@ PendingTransaction *WalletImpl::createTransactionMultDest(const std::vector<stri
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
try {
|
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) {
|
if (amount) {
|
||||||
transaction->m_pending_tx = m_wallet->create_transactions_2(dsts, fake_outs_count, 0 /* unlock_time */,
|
transaction->m_pending_tx = m_wallet->create_transactions_2(dsts, fake_outs_count, 0 /* unlock_time */,
|
||||||
adjusted_priority,
|
adjusted_priority,
|
||||||
|
|
Loading…
Reference in a new issue