[rpc] Add abortrescan command to RPC interface.

kallewoof · furszy · commit 896520ed6a26 · 2021-03-10T19:50:06.000-03:00
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -151,6 +151,27 @@ UniValue importprivkey(const JSONRPCRequest& request)
     return NullUniValue;
 }
 
+UniValue abortrescan(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() > 0)
+        throw std::runtime_error(
+                "abortrescan\n"
+                "\nStops current wallet rescan triggered e.g. by an importprivkey call.\n"
+                "\nExamples:\n"
+                "\nImport a private key\n"
+                + HelpExampleCli("importprivkey", "\"mykey\"") +
+                "\nAbort the running wallet rescan\n"
+                + HelpExampleCli("abortrescan", "") +
+                "\nAs a JSON-RPC call\n"
+                + HelpExampleRpc("abortrescan", "")
+        );
+
+    EnsureWallet();
+    if (!pwalletMain->IsScanning() || pwalletMain->IsAbortingRescan()) return false;
+    pwalletMain->AbortRescan();
+    return true;
+}
+
 void ImportAddress(const CTxDestination& dest, const std::string& strLabel, const std::string& strPurpose);
 
 void ImportScript(const CScript& script, const std::string& strLabel, bool isRedeemScript)
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -4239,6 +4239,7 @@ UniValue rescanblockchain(const JSONRPCRequest& request)
     return response;
 }
 
+extern UniValue abortrescan(const JSONRPCRequest& request); // in rpcdump.cpp
 extern UniValue dumpprivkey(const JSONRPCRequest& request); // in rpcdump.cpp
 extern UniValue importprivkey(const JSONRPCRequest& request);
 extern UniValue importaddress(const JSONRPCRequest& request);
@@ -4259,6 +4260,7 @@ static const CRPCCommand commands[] =
     { "wallet",             "getaddressinfo",           &getaddressinfo,           true  },
     { "wallet",             "autocombinerewards",       &autocombinerewards,       false },
     { "wallet",             "abandontransaction",       &abandontransaction,       false },
+    { "wallet",             "abortrescan",              &abortrescan,              false },
     { "wallet",             "addmultisigaddress",       &addmultisigaddress,       true  },
     { "wallet",             "backupwallet",             &backupwallet,             true  },
     { "wallet",             "delegatestake",            &delegatestake,            false },
