Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-08 13:52:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8329

Browse source 
4b0785f add an option to force-update multisig key exchange under some circumstances (koe)
This commit is contained in:
luigi1111 2022-09-26 14:46:06 -05:00
commit 0a10a4f870
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
15 changed files with 244 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/wallet/wallet_rpc_server.cpp
View file

@ -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)
{