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/wallet.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/wallet.cpp')
-rw-r--r-- | src/wallet.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index ddfd71efda..7a3855c025 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -493,7 +493,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn) if (txout.scriptPubKey == scriptDefaultKey) { CPubKey newDefaultKey; - if (GetKeyFromPool(newDefaultKey, false)) + if (GetKeyFromPool(newDefaultKey)) { SetDefaultKey(newDefaultKey); SetAddressBook(vchDefaultKey.GetID(), "", "receive"); @@ -1647,7 +1647,7 @@ void CWallet::ReturnKey(int64 nIndex) printf("keypool return %"PRI64d"\n", nIndex); } -bool CWallet::GetKeyFromPool(CPubKey& result, bool fAllowReuse) +bool CWallet::GetKeyFromPool(CPubKey& result) { int64 nIndex = 0; CKeyPool keypool; @@ -1656,11 +1656,6 @@ bool CWallet::GetKeyFromPool(CPubKey& result, bool fAllowReuse) ReserveKeyFromKeyPool(nIndex, keypool); if (nIndex == -1) { - if (fAllowReuse && vchDefaultKey.IsValid()) - { - result = vchDefaultKey; - return true; - } if (IsLocked()) return false; result = GenerateNewKey(); return true; |