Use std::shared_ptr instead of boost::shared_ptr in ScriptForMining

xanimo · Apr 1, 2024 · f2ac8a0 · f2ac8a0
1 parent e6167c1
commit f2ac8a0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -242,7 +242,7 @@ UniValue generatetoaddress(const JSONRPCRequest& request)
     if (!address.IsValid())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Error: Invalid address");
 
-    std::shared_ptr<CReserveScript> coinbaseScript(new CReserveScript());
+    std::shared_ptr<CReserveScript> coinbaseScript = std::make_shared<CReserveScript>();
     coinbaseScript->reserveScript = GetScriptForDestination(address.Get());
 
     return generateBlocks(coinbaseScript, nGenerate, nMaxTries, false, nMineAuxPow);

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3495,7 +3495,7 @@ void CWallet::UpdatedTransaction(const uint256 &hashTx)
 
 void CWallet::GetScriptForMining(std::shared_ptr<CReserveScript> &script)
 {
-    std::shared_ptr<CReserveKey> rKey(new CReserveKey(this));
+    std::shared_ptr<CReserveKey> rKey = std::make_shared<CReserveKey>(this);
     CPubKey pubkey;
     if (!rKey->GetReservedKey(pubkey))
         return;

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -32,8 +32,6 @@
 #include <utility>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-
 extern CWallet* pwalletMain;
 
 /**
@@ -674,6 +672,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     TxItems wtxOrdered;
 
     int64_t nOrderPosNext;
+    std::map<uint256, int> mapRequestCount;
 
     std::map<CTxDestination, CAddressBookData> mapAddressBook;
 
@@ -883,8 +882,18 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     void UpdatedTransaction(const uint256 &hashTx) override;
 
-    void GetScriptForMining(std::shared_ptr<CReserveScript> &script) override;
+    void Inventory(const uint256 &hash) override
+    {
+        {
+            LOCK(cs_wallet);
+            std::map<uint256, int>::iterator mi = mapRequestCount.find(hash);
+            if (mi != mapRequestCount.end())
+                (*mi).second++;
+        }
+    }
 
+    void GetScriptForMining(std::shared_ptr<CReserveScript> &script) override;
+
     unsigned int GetKeyPoolSize()
     {
         AssertLockHeld(cs_wallet); // setKeyPool