aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet_rpc_server.cpp
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/wallet/wallet_rpc_server.cpp
parentN-1/N multisig (diff)
downloadmonero-66e34e85b1ef3e49ea9290bd69cce2974840fc32.tar.xz
add multisig core test and factor multisig building blocks
Diffstat (limited to 'src/wallet/wallet_rpc_server.cpp')
-rw-r--r--src/wallet/wallet_rpc_server.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index 472302a94..ac991d861 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -2622,22 +2622,9 @@ namespace tools
return false;
}
- // parse all multisig info
- std::unordered_set<crypto::public_key> public_keys;
- std::vector<crypto::public_key> signers(req.multisig_info.size(), crypto::null_pkey);
- for (size_t i = 0; i < req.multisig_info.size(); ++i)
- {
- if (!m_wallet->verify_extra_multisig_info(req.multisig_info[i], public_keys, signers[i]))
- {
- er.code = WALLET_RPC_ERROR_CODE_BAD_MULTISIG_INFO;
- er.message = std::string("Bad multisig_info info: ") + req.multisig_info[i];
- return false;
- }
- }
-
try
{
- if (!m_wallet->finalize_multisig(req.password, public_keys, signers))
+ if (!m_wallet->finalize_multisig(req.password, req.multisig_info))
{
er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR;
er.message = "Error calling finalize_multisig";