diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -27,8 +27,6 @@ #include #include -#include - #include /** @@ -111,7 +109,7 @@ } static UniValue generateBlocks(const Config &config, - boost::shared_ptr coinbaseScript, + std::shared_ptr coinbaseScript, int nGenerate, uint64_t nMaxTries, bool keepScript) { static const int nInnerLoopCount = 0x100000; @@ -197,7 +195,7 @@ nMaxTries = request.params[1].get_int(); } - boost::shared_ptr coinbaseScript; + std::shared_ptr coinbaseScript; GetMainSignals().ScriptForMining(coinbaseScript); // If the keypool is exhausted, no script is returned at all. Catch this. @@ -251,7 +249,7 @@ "Error: Invalid address"); } - boost::shared_ptr coinbaseScript(new CReserveScript()); + std::shared_ptr coinbaseScript(new CReserveScript()); coinbaseScript->reserveScript = GetScriptForDestination(address.Get()); return generateBlocks(config, coinbaseScript, nGenerate, nMaxTries, false); diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -19,7 +19,6 @@ #include // for to_upper() #include #include -#include #include #include diff --git a/src/validationinterface.h b/src/validationinterface.h --- a/src/validationinterface.h +++ b/src/validationinterface.h @@ -6,10 +6,10 @@ #ifndef BITCOIN_VALIDATIONINTERFACE_H #define BITCOIN_VALIDATIONINTERFACE_H -#include -#include #include +#include + class CBlock; class CBlockIndex; struct CBlockLocator; @@ -43,7 +43,7 @@ virtual void ResendWalletTransactions(int64_t nBestBlockTime, CConnman *connman) {} virtual void BlockChecked(const CBlock &, const CValidationState &) {} - virtual void GetScriptForMining(boost::shared_ptr &){}; + virtual void GetScriptForMining(std::shared_ptr &){}; virtual void ResetRequestCount(const uint256 &hash){}; virtual void NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr &block){}; @@ -90,7 +90,7 @@ boost::signals2::signal BlockChecked; /** Notifies listeners that a key for mining is required (coinbase) */ - boost::signals2::signal &)> + boost::signals2::signal &)> ScriptForMining; /** Notifies listeners that a block has been successfully mined */ boost::signals2::signal BlockFound; diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -28,7 +28,6 @@ #include #include -#include #include extern CWallet *pwalletMain; @@ -940,7 +939,7 @@ } } - void GetScriptForMining(boost::shared_ptr &script) override; + void GetScriptForMining(std::shared_ptr &script) override; void ResetRequestCount(const uint256 &hash) override { LOCK(cs_wallet); mapRequestCount[hash] = 0; diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3703,8 +3703,8 @@ } } -void CWallet::GetScriptForMining(boost::shared_ptr &script) { - boost::shared_ptr rKey(new CReserveKey(this)); +void CWallet::GetScriptForMining(std::shared_ptr &script) { + std::shared_ptr rKey(new CReserveKey(this)); CPubKey pubkey; if (!rKey->GetReservedKey(pubkey)) { return;