diff options
| author | koe <ukoe@protonmail.com> | 2022-05-14 17:07:47 -0500 |
|---|---|---|
| committer | koe <ukoe@protonmail.com> | 2022-09-21 12:38:35 -0500 |
| commit | 4b0785f1c9a6c6d960749938d64420403d70d8c2 (patch) | |
| tree | 673f718ebb0b0790d7a4b118936303ae7b8bb15c /src/wallet/wallet_rpc_server.cpp | |
| parent | Merge pull request #8435 (diff) | |
| download | monero-4b0785f1c9a6c6d960749938d64420403d70d8c2.tar.xz | |
add an option to force-update multisig key exchange under some circumstances
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 7ec5fc7a1..4cb837d38 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) { |