diff options
| author | Gregory Maxwell <greg@xiph.org> | 2013-08-28 11:20:09 -0700 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2013-08-28 11:20:09 -0700 |
| commit | 1ef0067eab27b9101641b28acc177038e3dae11d (patch) | |
| tree | 5115dbf26fe82b3e1a2567e2ead8ca74339ed5cf /src/rpcwallet.cpp | |
| parent | bb7d0fc12fcfbb2a91e39cb49f2a0873344dbae0 (diff) | |
| parent | 71ac5052d83fcba21a09e5e2b7ad66faea6bd42a (diff) | |
| download | bitcoin-1ef0067eab27b9101641b28acc177038e3dae11d.tar.xz | |
Merge pull request #2904 from gmaxwell/newaddr-no-passphrase
[QT] Don't ask for a passphrase to getnewaddress.
Diffstat (limited to 'src/rpcwallet.cpp')
| -rw-r--r-- | src/rpcwallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index d07d3408b9..34bd4ffccf 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -110,7 +110,7 @@ Value getnewaddress(const Array& params, bool fHelp) // Generate a new key that is added to wallet CPubKey newKey; - if (!pwalletMain->GetKeyFromPool(newKey, false)) + if (!pwalletMain->GetKeyFromPool(newKey)) throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first"); CKeyID keyID = newKey.GetID(); @@ -148,7 +148,7 @@ CBitcoinAddress GetAccountAddress(string strAccount, bool bForceNew=false) // Generate a new key if (!account.vchPubKey.IsValid() || bForceNew || bKeyUsed) { - if (!pwalletMain->GetKeyFromPool(account.vchPubKey, false)) + if (!pwalletMain->GetKeyFromPool(account.vchPubKey)) throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first"); pwalletMain->SetAddressBook(account.vchPubKey.GetID(), strAccount, "receive"); |