automatically change displayed address whenever it receives anything,v0.2.10

added help and -? for daemon command line rpc commands,
only relay addr messages to 5 random nodes to save bandwidth,
started setting wtx.fFromMe flag,
trickle out tx inventory messages to protect privacy
 -- version 0.2.10

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@81 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 4 insertions, 5 deletions

diff --git a/db.cpp b/db.cpp
index 51cbb309b4..e0a672b1ee 100644
--- a/db.cpp
+++ b/db.cpp
@@ -511,9 +511,9 @@ bool LoadAddresses()
 // CWalletDB

 //

 

-bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)

+bool CWalletDB::LoadWallet()

 {

-    vchDefaultKeyRet.clear();

+    vchDefaultKey.clear();

     int nFileVersion = 0;

 

     // Modify defaults

@@ -587,7 +587,7 @@ bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
             }

             else if (strType == "defaultkey")

             {

-                ssValue >> vchDefaultKeyRet;

+                ssValue >> vchDefaultKey;

             }

             else if (strType == "version")

             {

@@ -650,8 +650,7 @@ bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
 bool LoadWallet(bool& fFirstRunRet)

 {

     fFirstRunRet = false;

-    vector<unsigned char> vchDefaultKey;

-    if (!CWalletDB("cr+").LoadWallet(vchDefaultKey))

+    if (!CWalletDB("cr+").LoadWallet())

         return false;

     fFirstRunRet = vchDefaultKey.empty();