aboutsummaryrefslogtreecommitdiff
path: root/src/simplewallet
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-09-26 23:16:25 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-12-17 16:12:15 +0000
commit66e34e85b1ef3e49ea9290bd69cce2974840fc32 (patch)
tree618a7336e476189da36fb62f0df06e0fdb7b3809 /src/simplewallet
parentN-1/N multisig (diff)
downloadmonero-66e34e85b1ef3e49ea9290bd69cce2974840fc32.tar.xz
add multisig core test and factor multisig building blocks
Diffstat (limited to 'src/simplewallet')
-rw-r--r--src/simplewallet/simplewallet.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index ab09ace91..b0aec186c 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -868,22 +868,9 @@ bool simple_wallet::finalize_multisig(const std::vector<std::string> &args)
return true;
}
- // parse all multisig info
- std::unordered_set<crypto::public_key> public_keys;
- std::vector<crypto::public_key> signers(args.size(), crypto::null_pkey);
- for (size_t i = 0; i < args.size(); ++i)
- {
- if (!tools::wallet2::verify_extra_multisig_info(args[i], public_keys, signers[i]))
- {
- fail_msg_writer() << tr("Bad multisig info: ") << args[i];
- return true;
- }
- }
-
- // we have all pubkeys now
try
{
- if (!m_wallet->finalize_multisig(orig_pwd_container->password(), public_keys, signers))
+ if (!m_wallet->finalize_multisig(orig_pwd_container->password(), args))
{
fail_msg_writer() << tr("Failed to finalize multisig");
return true;