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, 1 deletions

diff --git a/db.h b/db.h
index 0b778d5fea..29ff1994c3 100644
--- a/db.h
+++ b/db.h
@@ -14,9 +14,11 @@ class CWalletTx;
 

 extern map<string, string> mapAddressBook;

 extern CCriticalSection cs_mapAddressBook;

+extern vector<unsigned char> vchDefaultKey;

 extern bool fClient;

 

 

+

 extern unsigned int nWalletDBUpdated;

 extern DbEnv dbenv;

 

@@ -373,6 +375,7 @@ public:
 

     bool WriteDefaultKey(const vector<unsigned char>& vchPubKey)

     {

+        vchDefaultKey = vchPubKey;

         nWalletDBUpdated++;

         return Write(string("defaultkey"), vchPubKey);

     }

@@ -390,7 +393,7 @@ public:
         return Write(make_pair(string("setting"), strKey), value);

     }

 

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

+    bool LoadWallet();

 };

 

 bool LoadWallet(bool& fFirstRunRet);