[MOVE-ONLY] Move wallet RPC declarations to rpcwallet.h

based on bitcoin/bitcoin@a435632

Author: random-zebra

src/rest.cpp

@@ -16,6 +16,7 @@
 #include "utilstrencodings.h"
 #include "validation.h"
 #include "version.h"
+#include "wallet/wallet.h"
 
 #include <boost/algorithm/string.hpp>
 

src/rpc/budget.cpp

@@ -15,6 +15,9 @@
 #include "messagesigner.h"
 #include "rpc/server.h"
 #include "utilmoneystr.h"
+#ifdef ENABLE_WALLET
+#include "wallet/rpcwallet.h"
+#endif
 
 #include <univalue.h>
 

src/rpc/masternode.cpp

@@ -14,6 +14,9 @@
 #include "netbase.h"
 #include "rpc/server.h"
 #include "utilmoneystr.h"
+#ifdef ENABLE_WALLET
+#include "wallet/rpcwallet.h"
+#endif
 
 #include <univalue.h>
 

src/rpc/mining.cpp

@@ -17,6 +17,7 @@
 #include "rpc/server.h"
 #include "validationinterface.h"
 #ifdef ENABLE_WALLET
+#include "wallet/rpcwallet.h"
 #include "wallet/db.h"
 #include "wallet/wallet.h"
 #endif

src/rpc/misc.cpp

@@ -18,6 +18,7 @@
 #include "timedata.h"
 #include "util/system.h"
 #ifdef ENABLE_WALLET
+#include "wallet/rpcwallet.h"
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
 #endif

src/rpc/rawtransaction.cpp

@@ -25,6 +25,7 @@
 #ifdef ENABLE_WALLET
 #include "sapling/address.h"
 #include "sapling/key_io_sapling.h"
+#include "wallet/rpcwallet.h"
 #include "wallet/wallet.h"
 #endif
 

src/rpc/server.h

@@ -196,17 +196,6 @@ extern double GetDifficulty(const CBlockIndex* blockindex = NULL);
 extern std::string HelpExampleCli(std::string methodname, std::string args);
 extern std::string HelpExampleRpc(std::string methodname, std::string args);
 
-// Needed even with !ENABLE_WALLET, to pass (ignored) pointers around
-class CWallet;
-CWallet* GetWalletForJSONRPCRequest(const JSONRPCRequest& request);
-
-#ifdef ENABLE_WALLET
-// New code should accessing the wallet should be under the ../wallet/ directory
-std::string HelpRequiringPassphrase(CWallet* const pwallet);
-bool EnsureWalletIsAvailable(CWallet* const pwallet, bool avoidException);
-void EnsureWalletIsUnlocked(CWallet *pwallet, bool fAllowAnonOnly = false);
-#endif
-
 bool StartRPC();
 void InterruptRPC();
 void StopRPC();

src/wallet/rpcdump.cpp

@@ -15,7 +15,9 @@
 #include "util/system.h"
 #include "utilstrencodings.h"
 #include "utiltime.h"
-#include "wallet/wallet.h"
+#include "wallet/rpcwallet.h"
+#include "wallet.h"
+#include "validation.h"
 
 #include <fstream>
 #include <secp256k1.h>

src/wallet/rpcwallet.cpp

@@ -5,6 +5,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "wallet/rpcwallet.h"
+
 #include "addressbook.h"
 #include "amount.h"
 #include "base58.h"
@@ -17,21 +19,17 @@
 #include "net.h"
 #include "policy/feerate.h"
 #include "rpc/server.h"
-#include "timedata.h"
-#include "util/system.h"
-#include "utilmoneystr.h"
-#include "wallet.h"
-#include "walletdb.h"
-#include "zpivchain.h"
-
 #include "sapling/sapling_operation.h"
 #include "sapling/transaction_builder.h"
 #include "sapling/key_io_sapling.h"
-
-#include <stdint.h>
-
 #include "spork.h"
+#include "timedata.h"
+#include "utilmoneystr.h"
+#include "wallet/wallet.h"
+#include "wallet/walletdb.h"
+#include "zpivchain.h"
 
+#include <stdint.h>
 #include <univalue.h>
 
 

src/wallet/rpcwallet.h

@@ -1,12 +1,28 @@
-// Copyright (c) 2016 The Bitcoin Core developers
+// Copyright (c) 2016-2021 The Bitcoin Core developers
+// Copyright (c) 2021 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#ifndef PIVX_WALLET_RPCWALLET_H
+#define PIVX_WALLET_RPCWALLET_H
 
-#ifndef BITCOIN_WALLET_RPCWALLET_H
-#define BITCOIN_WALLET_RPCWALLET_H
+#include <string>
 
 class CRPCTable;
+class CWallet;
+class JSONRPCRequest;
 
 void RegisterWalletRPCCommands(CRPCTable &tableRPC);
 
-#endif //BITCOIN_WALLET_RPCWALLET_H
+/**
+ * Figures out what wallet, if any, to use for a JSONRPCRequest.
+ *
+ * @param[in] request JSONRPCRequest that wishes to access a wallet
+ * @return NULL if no wallet should be used, or a pointer to the CWallet
+ */
+CWallet* GetWalletForJSONRPCRequest(const JSONRPCRequest& request);
+
+std::string HelpRequiringPassphrase(CWallet* const pwallet);
+bool EnsureWalletIsAvailable(CWallet* const pwallet, bool avoidException);
+void EnsureWalletIsUnlocked(CWallet* const pwallet, bool fAllowAnonOnly = false);
+
+#endif //PIVX_WALLET_RPCWALLET_H