aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2019-03-21 14:51:41 +0200
committerRiccardo Spagni <ric@spagni.net>2019-03-21 14:51:41 +0200
commite0a05837ba678b615cba761cd7c49e2ab3ac1586 (patch)
tree35a1ec11e53f64fea8aa5a4ae7943c18a48fe61b /src/wallet
parentdcfd5a88927f6a4a59c5fb5f7ebec9484cdf32e0 (diff)
parent5ade72818bf6d012bba02ff60f28a9965d6b674b (diff)
downloadmonzero-core-e0a05837ba678b615cba761cd7c49e2ab3ac1586.tar.gz
monzero-core-e0a05837ba678b615cba761cd7c49e2ab3ac1586.tar.xz
monzero-core-e0a05837ba678b615cba761cd7c49e2ab3ac1586.zip
Merge pull request #5270
5ade7281 Wallet API: multisig_tx_set passing bug fixed (naughtyfox)
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/api/wallet.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index 059f276e8..d7226b656 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -1489,7 +1489,9 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
pendingTxPostProcess(transaction);
if (multisig().isMultisig) {
- transaction->m_signers = m_wallet->make_multisig_tx_set(transaction->m_pending_tx).m_signers;
+ auto tx_set = m_wallet->make_multisig_tx_set(transaction->m_pending_tx);
+ transaction->m_pending_tx = tx_set.m_ptx;
+ transaction->m_signers = tx_set.m_signers;
}
} catch (const tools::error::daemon_busy&) {
// TODO: make it translatable with "tr"?