diff options
| author | Jeff Garzik <jgarzik@exmulti.com> | 2011-07-12 19:10:12 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@exmulti.com> | 2011-07-12 19:10:12 -0700 |
| commit | 0bad8e423754cae582ceb99389709953f56947bc (patch) | |
| tree | c27d3fa0eda767de7f6bd7acfcde4e05fc083b18 /src/main.cpp | |
| parent | 354f2dd09487c865f8f0d0d40f66573f764e5a96 (diff) | |
| parent | 7414733beac92ce8ba365def592d0363fb24872c (diff) | |
| download | bitcoin-0bad8e423754cae582ceb99389709953f56947bc.tar.xz | |
Merge pull request #352 from TheBlueMatt/newenc
Wallet Private Key Encryption (on CWallet)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 594f1d3bc4..6e973493a2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -55,7 +55,6 @@ int64 nHPSTimerStart; // Settings int fGenerateBitcoins = false; int64 nTransactionFee = 0; -CAddress addrIncoming; int fLimitProcessors = false; int nLimitProcessors = 1; int fMinimizeToTray = true; @@ -2213,7 +2212,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) // Keep giving the same key to the same ip until they use it if (!mapReuseKey.count(pfrom->addr.ip)) - mapReuseKey[pfrom->addr.ip] = pwalletMain->GetKeyFromKeyPool(); + mapReuseKey[pfrom->addr.ip] = pwalletMain->GetOrReuseKeyFromPool(); // Send back approval of order and pubkey to use CScript scriptPubKey; |