diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-11-01 11:24:54 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-11-01 11:24:54 +0200 |
commit | 32b46c594bc85264b38491b08e7683075b261f15 (patch) | |
tree | fb2314c65470eb2312495e811f1b8489d5e4fc5a /src/wallet/api/wallet.cpp | |
parent | Merge pull request #2659 (diff) | |
parent | fix libwallet api test after api change (diff) | |
download | monero-32b46c594bc85264b38491b08e7683075b261f15.tar.xz |
Merge pull request #2703
d0463312 fix libwallet api test after api change (Jaquee)
a46c1eed Wallet2: Don't throw when subaddress label doesn't exist (Jaquee)
086b7db2 Wallet API: default values for account and subaddr index (Jaquee)
Diffstat (limited to 'src/wallet/api/wallet.cpp')
-rw-r--r-- | src/wallet/api/wallet.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index db7e60cd7..8f7befc8c 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -1044,8 +1044,7 @@ void WalletImpl::setSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex // - confirmed_transfer_details) PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const string &payment_id, optional<uint64_t> amount, uint32_t mixin_count, - uint32_t subaddr_account, std::set<uint32_t> subaddr_indices, - PendingTransaction::Priority priority) + PendingTransaction::Priority priority, uint32_t subaddr_account, std::set<uint32_t> subaddr_indices) { clearStatus(); |