aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet_rpc_server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/wallet/wallet_rpc_server.cpp')
-rw-r--r--src/wallet/wallet_rpc_server.cpp23
1 files changed, 13 insertions, 10 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index 0cf75a1c4..b86ab9e5a 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -4424,7 +4424,7 @@ namespace tools
try
{
- res.n_outputs = m_wallet->import_multisig(info);
+ res.n_outputs = m_wallet->import_multisig(info, req.refresh_after_import);
}
catch (const std::exception &e)
{
@@ -4433,21 +4433,24 @@ namespace tools
return false;
}
- if (m_wallet->is_trusted_daemon())
+ if (req.refresh_after_import)
{
- try
+ if (m_wallet->is_trusted_daemon())
{
- m_wallet->rescan_spent();
+ try
+ {
+ m_wallet->rescan_spent();
+ }
+ catch (const std::exception &e)
+ {
+ er.message = std::string("Success, but failed to update spent status after import multisig info: ") + e.what();
+ }
}
- catch (const std::exception &e)
+ else
{
- er.message = std::string("Success, but failed to update spent status after import multisig info: ") + e.what();
+ er.message = "Success, but cannot update spent status after import multisig info as daemon is untrusted";
}
}
- else
- {
- er.message = "Success, but cannot update spent status after import multisig info as daemon is untrusted";
- }
return true;
}