Skip to content

Commit b25d1c0

Browse files
committed
Merge pull request #3679 from laanwj/2014_02_walletpassphrase_behavior
Document new `walletpassphrase` behavior in 0.9
2 parents e7d854c + 6c0db81 commit b25d1c0

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

doc/release-notes.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,27 @@ functioning both as a server and as a RPC client. The RPC client functionality
5959
executable, 'bitcoin-cli'. The RPC client code will eventually be removed from
6060
bitcoind, but will be kept for backwards compatibility for a release or two.
6161

62+
`walletpassphrase` RPC
63+
-----------------------
64+
65+
The behavior of the `walletpassphrase` RPC when the wallet is already unlocked
66+
has changed between 0.8 and 0.9.
67+
68+
The 0.8 behavior of `walletpassphrase` is to fail when the wallet is already unlocked:
69+
70+
> walletpassphrase 1000
71+
walletunlocktime = now + 1000
72+
> walletpassphrase 10
73+
Error: Wallet is already unlocked (old unlock time stays)
74+
75+
The new behavior of `walletpassphrase` is to set a new unlock time overriding
76+
the old one:
77+
78+
> walletpassphrase 1000
79+
walletunlocktime = now + 1000
80+
> walletpassphrase 10
81+
walletunlocktime = now + 10 (overriding the old unlock time)
82+
6283
0.9.0rc1 Release notes
6384
=======================
6485

src/rpcwallet.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,6 +1574,9 @@ Value walletpassphrase(const Array& params, bool fHelp)
15741574
"\nArguments:\n"
15751575
"1. \"passphrase\" (string, required) The wallet passphrase\n"
15761576
"2. timeout (numeric, required) The time to keep the decryption key in seconds.\n"
1577+
"\nNote:\n"
1578+
"Issuing the walletpassphrase command while the wallet is already unlocked will set a new unlock\n"
1579+
"time that overrides the old one.\n"
15771580
"\nExamples:\n"
15781581
"\nunlock the wallet for 60 seconds\n"
15791582
+ HelpExampleCli("walletpassphrase", "\"my pass phrase\" 60") +

0 commit comments

Comments
 (0)