diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-09-29 22:11:13 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-09-29 22:19:36 +0200 |
| commit | e4130e6ae6314b7364e0411edd84f3c0fdc0b5e5 (patch) | |
| tree | 8a03c48f0a540cbf2c65eb76507c9046809137da /src | |
| parent | Merge pull request #4407 (diff) | |
| download | monero-e4130e6ae6314b7364e0411edd84f3c0fdc0b5e5.tar.xz | |
Merge pull request #4409
7a056f44 WalletAPI: multisigSignData bug fixed (naughtyfox)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/api/pending_transaction.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/wallet/api/pending_transaction.cpp b/src/wallet/api/pending_transaction.cpp index 8d200220d..913e3156f 100644 --- a/src/wallet/api/pending_transaction.cpp +++ b/src/wallet/api/pending_transaction.cpp @@ -200,7 +200,11 @@ std::string PendingTransactionImpl::multisigSignData() { throw std::runtime_error("wallet is not multisig"); } - auto cipher = m_wallet.m_wallet->save_multisig_tx(m_pending_tx); + tools::wallet2::multisig_tx_set txSet; + txSet.m_ptx = m_pending_tx; + txSet.m_signers = m_signers; + auto cipher = m_wallet.m_wallet->save_multisig_tx(txSet); + return epee::string_tools::buff_to_hex_nodelimer(cipher); } catch (const std::exception& e) { m_status = Status_Error; |