diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-17 12:11:13 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-17 12:11:13 -0500 |
| commit | b25d1c05095f51ba9bcfe5fc61f619fe5d95a866 (patch) | |
| tree | 06ca2f8a9d954c6249d112107d3ac1b2c6d31557 | |
| parent | e7d854c8ba0065f788e3089a7a5d56277a06313c (diff) | |
| parent | 6c0db81c09b7602bd9d5bb6ccda20366b768f8bf (diff) | |
| download | bitcoin-b25d1c05095f51ba9bcfe5fc61f619fe5d95a866.tar.xz | |
Merge pull request #3679 from laanwj/2014_02_walletpassphrase_behavior
Document new `walletpassphrase` behavior in 0.9
| -rw-r--r-- | doc/release-notes.md | 21 | ||||
| -rw-r--r-- | src/rpcwallet.cpp | 3 |
2 files changed, 24 insertions, 0 deletions
diff --git a/doc/release-notes.md b/doc/release-notes.md index 40bb26e28e..8bf0b50bc0 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -59,6 +59,27 @@ functioning both as a server and as a RPC client. The RPC client functionality executable, 'bitcoin-cli'. The RPC client code will eventually be removed from bitcoind, but will be kept for backwards compatibility for a release or two. +`walletpassphrase` RPC +----------------------- + +The behavior of the `walletpassphrase` RPC when the wallet is already unlocked +has changed between 0.8 and 0.9. + +The 0.8 behavior of `walletpassphrase` is to fail when the wallet is already unlocked: + + > walletpassphrase 1000 + walletunlocktime = now + 1000 + > walletpassphrase 10 + Error: Wallet is already unlocked (old unlock time stays) + +The new behavior of `walletpassphrase` is to set a new unlock time overriding +the old one: + + > walletpassphrase 1000 + walletunlocktime = now + 1000 + > walletpassphrase 10 + walletunlocktime = now + 10 (overriding the old unlock time) + 0.9.0rc1 Release notes ======================= diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 38c669a1f6..3b0c84e49e 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -1574,6 +1574,9 @@ Value walletpassphrase(const Array& params, bool fHelp) "\nArguments:\n" "1. \"passphrase\" (string, required) The wallet passphrase\n" "2. timeout (numeric, required) The time to keep the decryption key in seconds.\n" + "\nNote:\n" + "Issuing the walletpassphrase command while the wallet is already unlocked will set a new unlock\n" + "time that overrides the old one.\n" "\nExamples:\n" "\nunlock the wallet for 60 seconds\n" + HelpExampleCli("walletpassphrase", "\"my pass phrase\" 60") + |