diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2022-09-26 14:55:28 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2022-09-26 14:55:28 -0500 |
| commit | a7b0c93c7db8054e833914f5de9f36a27d2f23b3 (patch) | |
| tree | a63f9c9d4358f6ba41bcb9ef9ede1f2c01607afe /src/wallet/wallet_rpc_server.cpp | |
| parent | 9885b8b0f2cb236b373f4eb0f8441036667255da (diff) | |
| parent | 1cd21bfba584fa7d886f13684f34c71931eddf4d (diff) | |
| download | monzero-core-a7b0c93c7db8054e833914f5de9f36a27d2f23b3.tar.gz monzero-core-a7b0c93c7db8054e833914f5de9f36a27d2f23b3.tar.xz monzero-core-a7b0c93c7db8054e833914f5de9f36a27d2f23b3.zip | |
Merge pull request #8582
1cd21bf add an option to force-update multisig key exchange under some circumstances (koe)
Diffstat (limited to 'src/wallet/wallet_rpc_server.cpp')
| -rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 1f0a1371f..964945175 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -4146,13 +4146,6 @@ namespace tools er.message = "This wallet is not multisig"; return false; } - - if (ready) - { - er.code = WALLET_RPC_ERROR_CODE_ALREADY_MULTISIG; - er.message = "This wallet is multisig, and already finalized"; - return false; - } CHECK_MULTISIG_ENABLED(); if (req.multisig_info.size() + 1 < total) @@ -4164,7 +4157,7 @@ namespace tools try { - res.multisig_info = m_wallet->exchange_multisig_keys(req.password, req.multisig_info); + res.multisig_info = m_wallet->exchange_multisig_keys(req.password, req.multisig_info, req.force_update_use_with_caution); m_wallet->multisig(&ready); if (ready) { |