aboutsummaryrefslogtreecommitdiff
path: root/src/simplewallet/simplewallet.cpp
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-11-04 10:39:17 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-12-17 16:12:32 +0000
commite36f5b6021eb541d72fee4b2d5643ba42fd4d9dd (patch)
treee9ba527083a6e99dc8ed2739ca478dc20a77f6cb /src/simplewallet/simplewallet.cpp
parentwallet2: fix slow multisig unit tests with subaddress patch (diff)
downloadmonero-e36f5b6021eb541d72fee4b2d5643ba42fd4d9dd.tar.xz
Match surae's recommendation to derive multisig keys
Diffstat (limited to 'src/simplewallet/simplewallet.cpp')
-rw-r--r--src/simplewallet/simplewallet.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 98d7ea14f..145d90d91 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -60,6 +60,7 @@
#include "rapidjson/document.h"
#include "common/json_util.h"
#include "ringct/rctSigs.h"
+#include "multisig/multisig.h"
#include "wallet/wallet_args.h"
#include <stdexcept>
@@ -801,8 +802,8 @@ bool simple_wallet::make_multisig(const std::vector<std::string> &args)
}
// people may include their own, weed it out
- const crypto::secret_key local_skey = m_wallet->get_account().get_keys().m_view_secret_key;
- const crypto::public_key local_pkey = m_wallet->get_account().get_keys().m_account_address.m_spend_public_key;
+ const crypto::secret_key local_skey = cryptonote::get_multisig_blinded_secret_key(m_wallet->get_account().get_keys().m_view_secret_key);
+ const crypto::public_key local_pkey = m_wallet->get_multisig_signer_public_key(m_wallet->get_account().get_keys().m_spend_secret_key);
for (size_t i = 0; i < secret_keys.size(); ++i)
{
if (secret_keys[i] == local_skey)