remove scheduler from postInitProcess, add LoadWalletFromFile and use in loadwallet rpc function

Author: jonspock

src/wallet/init.cpp

@@ -442,7 +442,7 @@ bool WalletInit::Open(const CChainParams &chainParams, const SecureString& walle
 
 void WalletInit::Start(CScheduler &scheduler) const {
     for (const std::shared_ptr<CWallet> &pwallet : GetWallets()) {
-        pwallet->postInitProcess(scheduler);
+        pwallet->postInitProcess();
     }
 }
 

src/wallet/rpcdump.cpp

@@ -87,6 +87,7 @@ bool GetWalletAddressesForKey(const Config &config, CWallet *const pwallet,
 
 static const int64_t TIMESTAMP_MIN = 0;
 
+#ifdef NOT_USED_YET
 static void RescanWallet(CWallet &wallet, const WalletRescanReserver &reserver,
                          int64_t time_begin = TIMESTAMP_MIN,
                          bool update = true) {
@@ -99,6 +100,7 @@ static void RescanWallet(CWallet &wallet, const WalletRescanReserver &reserver,
                            "Some transactions may be missing.");
     }
 }
+#endif
 
 UniValue abortrescan(const Config &config, const JSONRPCRequest &request) {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);

src/wallet/rpcwallet.cpp

@@ -3409,29 +3409,27 @@ static UniValue listwallets(const Config &config,
 }
 
 UniValue loadwallet(const Config &config, const JSONRPCRequest &request) {
-    if (request.fHelp || request.params.size() > 2 || request.params.size() < 1) {
+    if (request.fHelp || request.params.size() != 1) {
         throw std::runtime_error(
             "loadwallet \"filename\"\n"
             "\nLoads a wallet from a wallet file or directory."
             "\nNote that all wallet command-line options used when starting devaultd/DeVault-Core will be"
             "\napplied to the new wallet (eg -zapwallettxes, upgradewallet, rescan, etc).\n"
             "\nArguments:\n"
             "1. \"filename\"    (string, required) The wallet directory or .dat file.\n"
-            "2. \"password\"    (string, optional) The wallet password or empty for none.\n"
             "\nResult:\n"
             "{\n"
             "  \"name\" :    <wallet_name>,        (string) The wallet name if loaded successfully.\n"
             "  \"warning\" : <warning>,            (string) Warning message if wallet was not loaded cleanly.\n"
             "}\n"
             "\nExamples:\n" +
-            HelpExampleCli("loadwallet", "\"test.dat\" \"password\"") +
-            HelpExampleRpc("loadwallet", "\"test.dat\" \"password\""));
+            HelpExampleCli("loadwallet", "\"test.dat\"") +
+            HelpExampleRpc("loadwallet", "\"test.dat\""));
     }
 
     const CChainParams &chainParams = config.GetChainParams();
 
     std::string wallet_file = request.params[0].get_str();
-    std::string password = request.params[1].get_str();
     std::string error;
     WalletLocation location(wallet_file);
 
@@ -3446,23 +3444,13 @@ UniValue loadwallet(const Config &config, const JSONRPCRequest &request) {
                            "Wallet file verification failed: " + error);
     }
 
-    SecureString pass(password);
-
-    // Since Wallet should exist, then `words` are not used
-    std::vector<std::string> words;
-    bool use_bls = false;
-    
-    std::shared_ptr<CWallet> const wallet = CWallet::CreateWalletFromFile(
-                                                                          chainParams, location,
-                                                                          pass,
-                                                                          words,
-                                                                          use_bls);
+    std::shared_ptr<CWallet> const wallet = CWallet::LoadWalletFromFile(chainParams, location);
     if (!wallet) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Wallet loading failed.");
     }
     AddWallet(wallet);
 
-    ////    wallet->postInitProcess();
+    wallet->postInitProcess();
 
     UniValue obj(UniValue::VOBJ);
     obj.pushKV("name", wallet->GetName());

src/wallet/wallet.cpp

@@ -4754,7 +4754,7 @@ bool CWallet::Verify(const CChainParams &chainParams,
     // 2. Path to an existing directory.
     // 3. Path to a symlink to a directory.
     // 4. For backwards compatibility, the name of a data file in -walletdir.
-  // LOCK(cs_wallet); -- HACK CHECK LATER
+    // LOCK(cs_wallet);  -- not yet since static
     const fs::path &wallet_path = location.GetPath();
     fs::file_type path_type = fs::symlink_status(wallet_path).type();
 #ifdef NO_BOOST_FILESYSTEM
@@ -4840,6 +4840,16 @@ void CWallet::MarkPreSplitKeys() {
 }
 #endif
 
+std::shared_ptr<CWallet>
+CWallet::LoadWalletFromFile(const CChainParams &chainParams,
+                            const WalletLocation &location) {
+
+     auto ret = CreateWalletFromFile(chainParams, location, SecureString(""),
+                                     std::vector<std::string>(), false);
+     return ret;
+ }
+
+     
 std::shared_ptr<CWallet>
 CWallet::CreateWalletFromFile(const CChainParams &chainParams,
                               const WalletLocation &location,
@@ -5104,20 +5114,10 @@ CWallet::CreateWalletFromFile(const CChainParams &chainParams,
 
 std::atomic<bool> CWallet::fFlushScheduled(false);
 
-void CWallet::postInitProcess(CScheduler &scheduler) {
+void CWallet::postInitProcess() {
     // Add wallet transactions that aren't already in a block to mempool.
     // Do this here as mempool requires genesis block to be loaded.
     ReacceptWalletTransactions();
-
-    // Run a thread to flush wallet periodically.
-    if (!CWallet::fFlushScheduled.exchange(true)) {
-        scheduler.scheduleEvery(
-            []() {
-                MaybeCompactWalletDB();
-                return true;
-            },
-            500);
-    }
 }
 
 bool CWallet::BackupWallet(const std::string &strDest) {

src/wallet/wallet.h

@@ -1219,6 +1219,13 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface {
                        const WalletLocation &location, bool salvage_wallet,
                        std::string &error_string, std::string &warning_string);
 
+    /**
+     * Load the wallet from a file assuming it exists, returns a new CWallet instance or a null pointer
+     * in case of an error.
+     */
+    static std::shared_ptr<CWallet>
+    LoadWalletFromFile(const CChainParams &chainParams,
+                                const WalletLocation &location);
     /**
      * Initializes the wallet, returns a new CWallet instance or a null pointer
      * in case of an error.
@@ -1235,7 +1242,7 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface {
      * Gives the wallet a chance to register repetitive tasks and complete
      * post-init tasks
      */
-    void postInitProcess(CScheduler &scheduler);
+    void postInitProcess();
 
     bool BackupWallet(const std::string &strDest);