bitcoin · jonasschnelli · Mar 3, 2018 · Mar 3, 2018 · Mar 3, 2018 · Mar 3, 2018
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -171,6 +171,7 @@ BITCOIN_CORE_H = \
   wallet/rpcwallet.h \
   wallet/wallet.h \
   wallet/walletdb.h \
+  wallet/walletmanager.h \
   wallet/walletutil.h \
   wallet/coinselection.h \
   warnings.h \
@@ -252,6 +253,7 @@ libbitcoin_wallet_a_SOURCES = \
   wallet/rpcdump.cpp \
   wallet/rpcwallet.cpp \
   wallet/wallet.cpp \
+  wallet/walletmanager.cpp \
   wallet/walletdb.cpp \
   wallet/walletutil.cpp \
   wallet/coinselection.cpp \

diff --git a/src/init.cpp b/src/init.cpp
@@ -45,6 +45,7 @@
 #include <validationinterface.h>
 #ifdef ENABLE_WALLET
 #include <wallet/init.h>
+#include <wallet/walletmanager.h>
 #endif
 #include <warnings.h>
 #include <stdint.h>
@@ -190,7 +191,7 @@ void Shutdown()
     StopRPC();
     StopHTTPServer();
 #ifdef ENABLE_WALLET
-    FlushWallets();
+    g_wallet_manager->FlushWallets();
 #endif
     StopMapPort();
 
@@ -250,7 +251,7 @@ void Shutdown()
         pblocktree.reset();
     }
 #ifdef ENABLE_WALLET
-    StopWallets();
+    g_wallet_manager->StopWallets();
 #endif
 
 #if ENABLE_ZMQ
@@ -272,7 +273,7 @@ void Shutdown()
     GetMainSignals().UnregisterBackgroundSignalScheduler();
     GetMainSignals().UnregisterWithMempoolSignals(mempool);
 #ifdef ENABLE_WALLET
-    CloseWallets();
+    g_wallet_manager->CloseWallets();
 #endif
     globalVerifyHandle.reset();
     ECC_Stop();
@@ -1592,7 +1593,7 @@ bool AppInitMain()
 
     // ********************************************************* Step 8: load wallet
 #ifdef ENABLE_WALLET
-    if (!OpenWallets())
+    if (!g_wallet_manager->OpenWallets())
         return false;
 #else
     LogPrintf("No wallet support compiled in!\n");
@@ -1743,7 +1744,7 @@ bool AppInitMain()
     uiInterface.InitMessage(_("Done loading"));
 
 #ifdef ENABLE_WALLET
-    StartWallets(scheduler);
+    g_wallet_manager->StartWallets(scheduler);
 #endif
 
     return true;

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -34,7 +34,7 @@
 #include <warnings.h>
 
 #ifdef ENABLE_WALLET
-#include <wallet/wallet.h>
+#include <wallet/walletmanager.h>
 #endif
 
 #include <stdint.h>
@@ -484,9 +484,8 @@ void BitcoinApplication::initializeResult(bool success)
 
 #ifdef ENABLE_WALLET
         bool fFirstWallet = true;
-        for (CWalletRef pwallet : vpwallets) {
+        g_wallet_manager->ForEachWallet([this, &fFirstWallet](CWallet *pwallet) {
             WalletModel * const walletModel = new WalletModel(platformStyle, pwallet, optionsModel);
-
             window->addWallet(walletModel);
             if (fFirstWallet) {
                 window->setCurrentWallet(walletModel->getWalletName());
@@ -497,7 +496,7 @@ void BitcoinApplication::initializeResult(bool success)
                              paymentServer, SLOT(fetchPaymentACK(CWallet*,const SendCoinsRecipient&,QByteArray)));
 
             m_wallet_models.push_back(walletModel);
-        }
+        });
 #endif
 
         // If -min option passed, start window minimized.

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -21,8 +21,8 @@
 #include <utilstrencodings.h>
 #ifdef ENABLE_WALLET
 #include <wallet/rpcwallet.h>
-#include <wallet/wallet.h>
 #include <wallet/walletdb.h>
+#include <wallet/walletmanager.h>
 #endif
 #include <warnings.h>
 
@@ -69,7 +69,7 @@ UniValue validateaddress(const JSONRPCRequest& request)
     {
 
 #ifdef ENABLE_WALLET
-        if (!::vpwallets.empty() && IsDeprecatedRPCEnabled("validateaddress")) {
+        if (g_wallet_manager->HasWallets() && IsDeprecatedRPCEnabled("validateaddress")) {
             ret.pushKVs(getaddressinfo(request));
         }
 #endif

diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
@@ -267,46 +267,3 @@ bool VerifyWallets()
 
     return true;
 }
-
-bool OpenWallets()
-{
-    if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
-        LogPrintf("Wallet disabled!\n");
-        return true;
-    }
-
-    for (const std::string& walletFile : gArgs.GetArgs("-wallet")) {
-        CWallet * const pwallet = CWallet::CreateWalletFromFile(walletFile, fs::absolute(walletFile, GetWalletDir()));
-        if (!pwallet) {
-            return false;
-        }
-        vpwallets.push_back(pwallet);
-    }
-
-    return true;
-}
-
-void StartWallets(CScheduler& scheduler) {
-    for (CWalletRef pwallet : vpwallets) {
-        pwallet->postInitProcess(scheduler);
-    }
-}
-
-void FlushWallets() {
-    for (CWalletRef pwallet : vpwallets) {
-        pwallet->Flush(false);
-    }
-}
-
-void StopWallets() {
-    for (CWalletRef pwallet : vpwallets) {
-        pwallet->Flush(true);
-    }
-}
-
-void CloseWallets() {
-    for (CWalletRef pwallet : vpwallets) {
-        delete pwallet;
-    }
-    vpwallets.clear();
-}
diff --git a/src/wallet/init.h b/src/wallet/init.h
@@ -25,19 +25,4 @@ void RegisterWalletRPC(CRPCTable &tableRPC);
 //  being loaded (WalletParameterInteraction forbids -salvagewallet, -zapwallettxes or -upgradewallet with multiwallet).
 bool VerifyWallets();
 
-//! Load wallet databases.
-bool OpenWallets();
-
-//! Complete startup of wallets.
-void StartWallets(CScheduler& scheduler);
-
-//! Flush all wallets in preparation for shutdown.
-void FlushWallets();
-
-//! Stop all wallets. Wallets will be flushed first.
-void StopWallets();
-
-//! Close all wallets.
-void CloseWallets();
-
 #endif // BITCOIN_WALLET_INIT_H
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -27,8 +27,8 @@
 #include <wallet/coincontrol.h>
 #include <wallet/feebumper.h>
 #include <wallet/rpcwallet.h>
-#include <wallet/wallet.h>
 #include <wallet/walletdb.h>
+#include <wallet/walletmanager.h>
 #include <wallet/walletutil.h>
 
 #include <init.h>  // For StartShutdown
@@ -43,15 +43,13 @@ CWallet *GetWalletForJSONRPCRequest(const JSONRPCRequest& request)
 {
     if (request.URI.substr(0, WALLET_ENDPOINT_BASE.size()) == WALLET_ENDPOINT_BASE) {
         // wallet endpoint was used
-        std::string requestedWallet = urlDecode(request.URI.substr(WALLET_ENDPOINT_BASE.size()));
-        for (CWalletRef pwallet : ::vpwallets) {
-            if (pwallet->GetName() == requestedWallet) {
-                return pwallet;
-            }
+        CWallet *wallet = g_wallet_manager->FindWalletByName(urlDecode(request.URI.substr(WALLET_ENDPOINT_BASE.size())));
+        if (wallet) {
+            return wallet;
         }
         throw JSONRPCError(RPC_WALLET_NOT_FOUND, "Requested wallet does not exist or is not loaded");
     }
-    return ::vpwallets.size() == 1 || (request.fHelp && ::vpwallets.size() > 0) ? ::vpwallets[0] : nullptr;
+    return g_wallet_manager->CountWallets() == 1 || (request.fHelp && g_wallet_manager->CountWallets() > 0) ? g_wallet_manager->GetWalletAtPos(0) : nullptr;
 }
 
 std::string HelpRequiringPassphrase(CWallet * const pwallet)
@@ -65,7 +63,7 @@ bool EnsureWalletIsAvailable(CWallet * const pwallet, bool avoidException)
 {
     if (pwallet) return true;
     if (avoidException) return false;
-    if (::vpwallets.empty()) {
+    if (!g_wallet_manager->HasWallets()) {
         // Note: It isn't currently possible to trigger this error because
         // wallet RPC methods aren't registered unless a wallet is loaded. But
         // this error is being kept as a precaution, because it's possible in
@@ -2845,18 +2843,19 @@ UniValue listwallets(const JSONRPCRequest& request)
 
     UniValue obj(UniValue::VARR);
 
-    for (CWalletRef pwallet : vpwallets) {
-
+    bool not_available_found = false;
+    g_wallet_manager->ForEachWallet([&not_available_found, &request,&obj](CWallet *pwallet) {
         if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
-            return NullUniValue;
+            not_available_found = true;
+            return;
         }
 
         LOCK(pwallet->cs_wallet);
 
         obj.push_back(pwallet->GetName());
-    }
+    });
 
-    return obj;
+    return not_available_found ? NullUniValue : obj;
 }
 
 UniValue resendwallettransactions(const JSONRPCRequest& request)

diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp
@@ -6,7 +6,7 @@
 
 #include <rpc/server.h>
 #include <wallet/db.h>
-#include <wallet/wallet.h>
+#include <wallet/walletmanager.h>
 
 WalletTestingSetup::WalletTestingSetup(const std::string& chainName):
     TestingSetup(chainName), m_wallet("mock", CWalletDBWrapper::CreateMock())

diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
@@ -15,6 +15,7 @@
 #include <validation.h>
 #include <wallet/coincontrol.h>
 #include <wallet/test/wallet_test_fixture.h>
+#include <wallet/walletmanager.h>
 
 #include <boost/test/unit_test.hpp>
 #include <univalue.h>
@@ -73,7 +74,7 @@ BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)
     // after.
     {
         CWallet wallet("dummy", CWalletDBWrapper::CreateDummy());
-        vpwallets.insert(vpwallets.begin(), &wallet);
+        g_wallet_manager->AddWallet(&wallet);
         UniValue keys;
         keys.setArray();
         UniValue key;
@@ -104,7 +105,7 @@ BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)
                       "downloading and rescanning the relevant blocks (see -reindex and -rescan "
                       "options).\"}},{\"success\":true}]",
                               0, oldTip->GetBlockTimeMax(), TIMESTAMP_WINDOW));
-        vpwallets.erase(vpwallets.begin());
+        g_wallet_manager->DeallocWallet(0);
     }
 }
 
@@ -139,7 +140,7 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
         JSONRPCRequest request;
         request.params.setArray();
         request.params.push_back((pathTemp / "wallet.backup").string());
-        vpwallets.insert(vpwallets.begin(), &wallet);
+        g_wallet_manager->AddWallet(&wallet);
         ::dumpwallet(request);
     }
 
@@ -151,7 +152,8 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
         JSONRPCRequest request;
         request.params.setArray();
         request.params.push_back((pathTemp / "wallet.backup").string());
-        vpwallets[0] = &wallet;
+        g_wallet_manager->DeallocWallet(0);
+        g_wallet_manager->AddWallet(&wallet);
         ::importwallet(request);
 
         LOCK(wallet.cs_wallet);
@@ -165,7 +167,7 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
     }
 
     SetMockTime(0);
-    vpwallets.erase(vpwallets.begin());
+    g_wallet_manager->DeallocWallet(0);
 }
 
 // Check that GetImmatureCredit() returns a newly calculated value instead of

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -36,7 +36,6 @@
 
 #include <boost/algorithm/string/replace.hpp>
 
-std::vector<CWalletRef> vpwallets;
 /** Transaction fee set by the user */
 CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE);
 unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET;

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -31,9 +31,6 @@
 #include <utility>
 #include <vector>
 
-typedef CWallet* CWalletRef;
-extern std::vector<CWalletRef> vpwallets;
-
 /**
  * Settings
  */
@@ -1247,10 +1244,10 @@ std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key);
 class WalletRescanReserver
 {
 private:
-    CWalletRef m_wallet;
+    CWallet* m_wallet;
     bool m_could_reserve;
 public:
-    explicit WalletRescanReserver(CWalletRef w) : m_wallet(w), m_could_reserve(false) {}
+    explicit WalletRescanReserver(CWallet* w) : m_wallet(w), m_could_reserve(false) {}
 
     bool reserve()
     {

diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -14,7 +14,7 @@
 #include <sync.h>
 #include <util.h>
 #include <utiltime.h>
-#include <wallet/wallet.h>
+#include <wallet/walletmanager.h>
 
 #include <atomic>
 
@@ -748,7 +748,7 @@ void MaybeCompactWalletDB()
         return;
     }
 
-    for (CWalletRef pwallet : vpwallets) {
+    g_wallet_manager->ForEachWallet([](CWallet* pwallet) {
         CWalletDBWrapper& dbh = pwallet->GetDBHandle();
 
         unsigned int nUpdateCounter = dbh.nUpdateCounter;
@@ -763,7 +763,7 @@ void MaybeCompactWalletDB()
                 dbh.nLastFlushed = nUpdateCounter;
             }
         }
-    }
+    });
 
     fOneThread = false;
 }