add multisig core test and factor multisig building blocks

This commit is contained in:
moneromooo-monero 2017-09-26 23:16:25 +01:00
parent f4eda44ce3
commit 66e34e85b1
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
17 changed files with 1019 additions and 127 deletions

View file

@ -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;