Move nWalletUnlockTime to CWallet::nRelockTime, and name timed task

unique per CWallet

Author: luke-jr

src/rpc/misc.cpp

@@ -143,7 +143,7 @@ UniValue getinfo(const JSONRPCRequest& request)
         obj.pushKV("keypoolsize", (int64_t)kpExternalSize);
     }
     if (pwallet && pwallet->IsCrypted())
-        obj.pushKV("unlocked_until", nWalletUnlockTime);
+        obj.pushKV("unlocked_until", pwallet->nRelockTime);
     obj.pushKV("paytxfee", ValueFromAmount(payTxFee.GetFeePerK()));
 #endif
     obj.pushKV("relayfee", ValueFromAmount(::minRelayTxFee.GetFeePerK()));

src/rpc/server.h

@@ -190,7 +190,6 @@ extern std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKe
 extern int ParseInt(const UniValue& o, std::string strKey);
 extern bool ParseBool(const UniValue& o, std::string strKey);
 
-extern int64_t nWalletUnlockTime;
 extern CAmount AmountFromValue(const UniValue& value);
 extern UniValue ValueFromAmount(const CAmount& amount);
 extern double GetDifficulty(const CBlockIndex* blockindex = NULL);

src/wallet/rpcwallet.cpp

@@ -34,8 +34,7 @@
 
 #include <univalue.h>
 
-int64_t nWalletUnlockTime;
-static RecursiveMutex cs_nWalletUnlockTime;
+
 
 CWallet* GetWalletForJSONRPCRequest(const JSONRPCRequest& request)
 {
@@ -3352,8 +3351,8 @@ UniValue keypoolrefill(const JSONRPCRequest& request)
 
 static void LockWallet(CWallet* pWallet)
 {
-    LOCK(cs_nWalletUnlockTime);
-    nWalletUnlockTime = 0;
+    LOCK(pWallet->cs_wallet);
+    pWallet->nRelockTime = 0;
     pWallet->fWalletUnlockStaking = false;
     pWallet->Lock();
 }
@@ -3429,7 +3428,7 @@ UniValue walletpassphrase(const JSONRPCRequest& request)
     pwallet->TopUpKeyPool();
 
     if (nSleepTime > 0) {
-        nWalletUnlockTime = GetTime () + nSleepTime;
+        pwallet->nRelockTime = GetTime () + nSleepTime;
         RPCRunLater ("lockwallet", std::bind (LockWallet, pwallet), nSleepTime);
     }
 
@@ -3520,11 +3519,8 @@ UniValue walletlock(const JSONRPCRequest& request)
     if (!pwallet->IsCrypted())
         throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an unencrypted wallet, but walletlock was called.");
 
-    {
-        LOCK(cs_nWalletUnlockTime);
-        pwallet->Lock();
-        nWalletUnlockTime = 0;
-    }
+    pwallet->Lock();
+    pwallet->nRelockTime = 0;
 
     return NullUniValue;
 }
@@ -4058,8 +4054,8 @@ UniValue getwalletinfo(const JSONRPCRequest& request)
     }
 
     if (pwallet->IsCrypted())
-        obj.pushKV("unlocked_until", nWalletUnlockTime);
-    obj.pushKV("paytxfee",      ValueFromAmount(payTxFee.GetFeePerK()));
+        obj.pushKV("unlocked_until", pwallet->nRelockTime);
+    obj.pushKV("paytxfee", ValueFromAmount(payTxFee.GetFeePerK()));
     obj.pushKV("last_processed_block", pwallet->GetLastBlockHeight());
     return obj;
 }

src/wallet/wallet.h

@@ -934,9 +934,12 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool LoadWatchOnly(const CScript& dest);
 
     //! Lock Wallet
+    //! Holds a timestamp at which point the wallet is scheduled (externally) to be relocked. Caller must arrange for actual relocking to occur via Lock().
+    int64_t nRelockTime;
     bool Lock();
     bool Unlock(const SecureString& strWalletPassphrase, bool anonimizeOnly = false);
     bool Unlock(const CKeyingMaterial& vMasterKeyIn);
+
     bool ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, const SecureString& strNewWalletPassphrase);
     bool EncryptWallet(const SecureString& strWalletPassphrase);