diff options
| author | Gregory Maxwell <[email protected]> | 2013-08-23 12:54:50 -0700 |
|---|---|---|
| committer | Gregory Maxwell <[email protected]> | 2013-08-23 12:54:50 -0700 |
| commit | 71ac5052d83fcba21a09e5e2b7ad66faea6bd42a (patch) | |
| tree | 45c6cf793ee33237699ed83d8cd12d8fdefb4a6f /src/rpcwallet.cpp | |
| parent | [QT] Don't ask for a passphrase to getnewaddress. (diff) | |
| download | discoin-71ac5052d83fcba21a09e5e2b7ad66faea6bd42a.tar.xz discoin-71ac5052d83fcba21a09e5e2b7ad66faea6bd42a.zip | |
Remove fAllowReuse from GetKeyFromPool.
With the GUI password fix this was always false.
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 d07d3408b..34bd4ffcc 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"); |