highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Luke Dashjr
2016-09-09 07:48:10 +00:00
parent d77ad6d416
commit 2e518e313b
4 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/misc.cpp
View File

@@ -102,7 +102,7 @@ UniValue getinfo(const JSONRPCRequest& request)
obj.push_back(Pair("keypoolsize", (int)pwallet->GetKeyPoolSize()));
}
if (pwallet && pwallet->IsCrypted())
obj.push_back(Pair("unlocked_until", nWalletUnlockTime));
obj.push_back(Pair("unlocked_until", pwallet->nRelockTime));
obj.push_back(Pair("paytxfee", ValueFromAmount(payTxFee.GetFeePerK())));
#endif
obj.push_back(Pair("relayfee", ValueFromAmount(::minRelayTxFee.GetFeePerK())));