From 5fb54210a68612ebcc47b2b12048d192a529d3d7 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Thu, 6 Jul 2017 11:16:40 +0100 Subject: [wallet] Move wallet init functions into WalletInit class. --- src/init.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index 5c5d1ee79..839793295 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -190,7 +190,7 @@ void Shutdown() StopRPC(); StopHTTPServer(); #ifdef ENABLE_WALLET - FlushWallets(); + WalletInit::Flush(); #endif StopMapPort(); @@ -250,7 +250,7 @@ void Shutdown() pblocktree.reset(); } #ifdef ENABLE_WALLET - StopWallets(); + WalletInit::Stop(); #endif #if ENABLE_ZMQ @@ -272,7 +272,7 @@ void Shutdown() GetMainSignals().UnregisterBackgroundSignalScheduler(); GetMainSignals().UnregisterWithMempoolSignals(mempool); #ifdef ENABLE_WALLET - CloseWallets(); + WalletInit::Close(); #endif globalVerifyHandle.reset(); ECC_Stop(); @@ -416,7 +416,7 @@ std::string HelpMessage(HelpMessageMode mode) " " + _("Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway")); #ifdef ENABLE_WALLET - strUsage += GetWalletHelpString(showDebug); + strUsage += WalletInit::GetHelpString(showDebug); #endif #if ENABLE_ZMQ @@ -1092,8 +1092,7 @@ bool AppInitParameterInteraction() nBytesPerSigOp = gArgs.GetArg("-bytespersigop", nBytesPerSigOp); #ifdef ENABLE_WALLET - if (!WalletParameterInteraction()) - return false; + if (!WalletInit::ParameterInteraction()) return false; #endif fIsBareMultisigStd = gArgs.GetBoolArg("-permitbaremultisig", DEFAULT_PERMIT_BAREMULTISIG); @@ -1258,7 +1257,7 @@ bool AppInitMain() */ RegisterAllCoreRPCCommands(tableRPC); #ifdef ENABLE_WALLET - RegisterWalletRPC(tableRPC); + WalletInit::RegisterRPC(tableRPC); #endif /* Start the RPC server already. It will be started in "warmup" mode @@ -1277,8 +1276,7 @@ bool AppInitMain() // ********************************************************* Step 5: verify wallet database integrity #ifdef ENABLE_WALLET - if (!VerifyWallets()) - return false; + if (!WalletInit::Verify()) return false; #endif // ********************************************************* Step 6: network initialization // Note that we absolutely cannot open any actual connections @@ -1598,8 +1596,7 @@ bool AppInitMain() // ********************************************************* Step 8: load wallet #ifdef ENABLE_WALLET - if (!OpenWallets()) - return false; + if (!WalletInit::Open()) return false; #else LogPrintf("No wallet support compiled in!\n"); #endif @@ -1749,7 +1746,7 @@ bool AppInitMain() uiInterface.InitMessage(_("Done loading")); #ifdef ENABLE_WALLET - StartWallets(scheduler); + WalletInit::Start(scheduler); #endif return true; -- cgit v1.2.3 From 49baa4a462193d8d82b51d464740aa5f1114edf1 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Wed, 21 Feb 2018 11:38:53 -0500 Subject: [wallet] Use global g_wallet_init_interface to init/destroy the wallet. This commit creates a global g_wallet_init_interface, which is created in bitcoind and bitcoin-qt. g_wallet_init_interface is used to init and destroy the wallet. This removes the dependency from init.cpp on the wallet library. --- src/init.cpp | 57 +++++++++++++++++++++++++-------------------------------- 1 file changed, 25 insertions(+), 32 deletions(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index 839793295..cee1eeaf1 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -43,10 +43,8 @@ #include #include #include -#ifdef ENABLE_WALLET -#include -#endif #include +#include #include #include #include @@ -74,6 +72,7 @@ static const bool DEFAULT_STOPAFTERBLOCKIMPORT = false; std::unique_ptr g_connman; std::unique_ptr peerLogic; +std::unique_ptr g_wallet_init_interface; #if ENABLE_ZMQ static CZMQNotificationInterface* pzmqNotificationInterface = nullptr; @@ -189,9 +188,9 @@ void Shutdown() StopREST(); StopRPC(); StopHTTPServer(); -#ifdef ENABLE_WALLET - WalletInit::Flush(); -#endif + if (g_wallet_init_interface) { + g_wallet_init_interface->Flush(); + } StopMapPort(); // Because these depend on each-other, we make sure that neither can be @@ -249,9 +248,9 @@ void Shutdown() pcoinsdbview.reset(); pblocktree.reset(); } -#ifdef ENABLE_WALLET - WalletInit::Stop(); -#endif + if (g_wallet_init_interface) { + g_wallet_init_interface->Stop(); + } #if ENABLE_ZMQ if (pzmqNotificationInterface) { @@ -271,9 +270,10 @@ void Shutdown() UnregisterAllValidationInterfaces(); GetMainSignals().UnregisterBackgroundSignalScheduler(); GetMainSignals().UnregisterWithMempoolSignals(mempool); -#ifdef ENABLE_WALLET - WalletInit::Close(); -#endif + if (g_wallet_init_interface) { + g_wallet_init_interface->Close(); + } + g_wallet_init_interface.reset(); globalVerifyHandle.reset(); ECC_Stop(); LogPrintf("%s: done\n", __func__); @@ -415,9 +415,9 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-whitelist=", _("Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.") + " " + _("Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway")); -#ifdef ENABLE_WALLET - strUsage += WalletInit::GetHelpString(showDebug); -#endif + if (g_wallet_init_interface) { + strUsage += g_wallet_init_interface->GetHelpString(showDebug); + } #if ENABLE_ZMQ strUsage += HelpMessageGroup(_("ZeroMQ notification options:")); @@ -1091,9 +1091,7 @@ bool AppInitParameterInteraction() return InitError(strprintf("acceptnonstdtxn is not currently supported for %s chain", chainparams.NetworkIDString())); nBytesPerSigOp = gArgs.GetArg("-bytespersigop", nBytesPerSigOp); -#ifdef ENABLE_WALLET - if (!WalletInit::ParameterInteraction()) return false; -#endif + if (g_wallet_init_interface && !g_wallet_init_interface->ParameterInteraction()) return false; fIsBareMultisigStd = gArgs.GetBoolArg("-permitbaremultisig", DEFAULT_PERMIT_BAREMULTISIG); fAcceptDatacarrier = gArgs.GetBoolArg("-datacarrier", DEFAULT_ACCEPT_DATACARRIER); @@ -1256,9 +1254,9 @@ bool AppInitMain() * available in the GUI RPC console even if external calls are disabled. */ RegisterAllCoreRPCCommands(tableRPC); -#ifdef ENABLE_WALLET - WalletInit::RegisterRPC(tableRPC); -#endif + if (g_wallet_init_interface) { + g_wallet_init_interface->RegisterRPC(tableRPC); + } /* Start the RPC server already. It will be started in "warmup" mode * and not really process calls already (but it will signify connections @@ -1275,9 +1273,8 @@ bool AppInitMain() int64_t nStart; // ********************************************************* Step 5: verify wallet database integrity -#ifdef ENABLE_WALLET - if (!WalletInit::Verify()) return false; -#endif + if (g_wallet_init_interface && !g_wallet_init_interface->Verify()) return false; + // ********************************************************* Step 6: network initialization // Note that we absolutely cannot open any actual connections // until the very end ("start node") as the UTXO/block state @@ -1595,11 +1592,7 @@ bool AppInitMain() fFeeEstimatesInitialized = true; // ********************************************************* Step 8: load wallet -#ifdef ENABLE_WALLET - if (!WalletInit::Open()) return false; -#else - LogPrintf("No wallet support compiled in!\n"); -#endif + if (g_wallet_init_interface && !g_wallet_init_interface->Open()) return false; // ********************************************************* Step 9: data directory maintenance @@ -1745,9 +1738,9 @@ bool AppInitMain() SetRPCWarmupFinished(); uiInterface.InitMessage(_("Done loading")); -#ifdef ENABLE_WALLET - WalletInit::Start(scheduler); -#endif + if (g_wallet_init_interface) { + g_wallet_init_interface->Start(scheduler); + } return true; } -- cgit v1.2.3 From c7ec5243892c38f9f77781b0e24a237942e7c776 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Tue, 27 Mar 2018 15:35:54 -0400 Subject: [wallet] Add dummy wallet init class --- src/init.cpp | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index cee1eeaf1..0d83cd903 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -188,9 +188,7 @@ void Shutdown() StopREST(); StopRPC(); StopHTTPServer(); - if (g_wallet_init_interface) { - g_wallet_init_interface->Flush(); - } + g_wallet_init_interface->Flush(); StopMapPort(); // Because these depend on each-other, we make sure that neither can be @@ -248,9 +246,7 @@ void Shutdown() pcoinsdbview.reset(); pblocktree.reset(); } - if (g_wallet_init_interface) { - g_wallet_init_interface->Stop(); - } + g_wallet_init_interface->Stop(); #if ENABLE_ZMQ if (pzmqNotificationInterface) { @@ -270,9 +266,7 @@ void Shutdown() UnregisterAllValidationInterfaces(); GetMainSignals().UnregisterBackgroundSignalScheduler(); GetMainSignals().UnregisterWithMempoolSignals(mempool); - if (g_wallet_init_interface) { - g_wallet_init_interface->Close(); - } + g_wallet_init_interface->Close(); g_wallet_init_interface.reset(); globalVerifyHandle.reset(); ECC_Stop(); @@ -415,9 +409,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-whitelist=", _("Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.") + " " + _("Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway")); - if (g_wallet_init_interface) { - strUsage += g_wallet_init_interface->GetHelpString(showDebug); - } + strUsage += g_wallet_init_interface->GetHelpString(showDebug); #if ENABLE_ZMQ strUsage += HelpMessageGroup(_("ZeroMQ notification options:")); @@ -1091,7 +1083,7 @@ bool AppInitParameterInteraction() return InitError(strprintf("acceptnonstdtxn is not currently supported for %s chain", chainparams.NetworkIDString())); nBytesPerSigOp = gArgs.GetArg("-bytespersigop", nBytesPerSigOp); - if (g_wallet_init_interface && !g_wallet_init_interface->ParameterInteraction()) return false; + if (!g_wallet_init_interface->ParameterInteraction()) return false; fIsBareMultisigStd = gArgs.GetBoolArg("-permitbaremultisig", DEFAULT_PERMIT_BAREMULTISIG); fAcceptDatacarrier = gArgs.GetBoolArg("-datacarrier", DEFAULT_ACCEPT_DATACARRIER); @@ -1254,9 +1246,7 @@ bool AppInitMain() * available in the GUI RPC console even if external calls are disabled. */ RegisterAllCoreRPCCommands(tableRPC); - if (g_wallet_init_interface) { - g_wallet_init_interface->RegisterRPC(tableRPC); - } + g_wallet_init_interface->RegisterRPC(tableRPC); /* Start the RPC server already. It will be started in "warmup" mode * and not really process calls already (but it will signify connections @@ -1273,7 +1263,7 @@ bool AppInitMain() int64_t nStart; // ********************************************************* Step 5: verify wallet database integrity - if (g_wallet_init_interface && !g_wallet_init_interface->Verify()) return false; + if (!g_wallet_init_interface->Verify()) return false; // ********************************************************* Step 6: network initialization // Note that we absolutely cannot open any actual connections @@ -1592,7 +1582,7 @@ bool AppInitMain() fFeeEstimatesInitialized = true; // ********************************************************* Step 8: load wallet - if (g_wallet_init_interface && !g_wallet_init_interface->Open()) return false; + if (!g_wallet_init_interface->Open()) return false; // ********************************************************* Step 9: data directory maintenance @@ -1738,9 +1728,7 @@ bool AppInitMain() SetRPCWarmupFinished(); uiInterface.InitMessage(_("Done loading")); - if (g_wallet_init_interface) { - g_wallet_init_interface->Start(scheduler); - } + g_wallet_init_interface->Start(scheduler); return true; } -- cgit v1.2.3