diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-04-13 16:29:13 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-04-13 16:29:13 -0500 |
| commit | 2f41a6aecf970f18c06ed7a656214bfe32652a33 (patch) | |
| tree | c499f97be2a842285320c5d141f56c46a4e200ad /src | |
| parent | 61bb6d359f97750dff842602eb60d3f7352c91bb (diff) | |
| parent | f53af12e026263e212c7c1e3fb21bd25f5234046 (diff) | |
| download | monzero-gui-2f41a6aecf970f18c06ed7a656214bfe32652a33.tar.gz monzero-gui-2f41a6aecf970f18c06ed7a656214bfe32652a33.tar.xz monzero-gui-2f41a6aecf970f18c06ed7a656214bfe32652a33.zip | |
Merge pull request #3390
f53af12 Wallet: fix transfer with Qt 5.12 (selsta)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libwalletqt/Wallet.cpp | 14 | ||||
| -rw-r--r-- | src/libwalletqt/Wallet.h | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index e9700143..2c9e26d7 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -535,7 +535,7 @@ void Wallet::pauseRefresh() PendingTransaction *Wallet::createTransaction( const QVector<QString> &destinationAddresses, const QString &payment_id, - const QVector<quint64> &amounts, + const QVector<QString> &destinationAmounts, quint32 mixin_count, PendingTransaction::Priority priority) { @@ -543,11 +543,15 @@ PendingTransaction *Wallet::createTransaction( for (const auto &address : destinationAddresses) { destinations.push_back(address.toStdString()); } + std::vector<uint64_t> amounts; + for (const auto &amount : destinationAmounts) { + amounts.push_back(Monero::Wallet::amountFromString(amount.toStdString())); + } std::set<uint32_t> subaddr_indices; Monero::PendingTransaction *ptImpl = m_walletImpl->createTransactionMultDest( destinations, payment_id.toStdString(), - std::vector<uint64_t>(amounts.begin(), amounts.end()), + amounts, mixin_count, static_cast<Monero::PendingTransaction::Priority>(priority), currentSubaddressAccount(), @@ -559,12 +563,12 @@ PendingTransaction *Wallet::createTransaction( void Wallet::createTransactionAsync( const QVector<QString> &destinationAddresses, const QString &payment_id, - const QVector<quint64> &amounts, + const QVector<QString> &destinationAmounts, quint32 mixin_count, PendingTransaction::Priority priority) { - m_scheduler.run([this, destinationAddresses, payment_id, amounts, mixin_count, priority] { - PendingTransaction *tx = createTransaction(destinationAddresses, payment_id, amounts, mixin_count, priority); + m_scheduler.run([this, destinationAddresses, payment_id, destinationAmounts, mixin_count, priority] { + PendingTransaction *tx = createTransaction(destinationAddresses, payment_id, destinationAmounts, mixin_count, priority); emit transactionCreated(tx, destinationAddresses, payment_id, mixin_count); }); } diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h index 237ef853..319b2a14 100644 --- a/src/libwalletqt/Wallet.h +++ b/src/libwalletqt/Wallet.h @@ -220,7 +220,7 @@ public: Q_INVOKABLE void createTransactionAsync( const QVector<QString> &destinationAddresses, const QString &payment_id, - const QVector<quint64> &amounts, + const QVector<QString> &destinationAmounts, quint32 mixin_count, PendingTransaction::Priority priority); @@ -421,7 +421,7 @@ private: PendingTransaction *createTransaction( const QVector<QString> &destinationAddresses, const QString &payment_id, - const QVector<quint64> &amounts, + const QVector<QString> &destinationAmounts, quint32 mixin_count, PendingTransaction::Priority priority); |