aboutsummaryrefslogtreecommitdiff
path: root/db.cpp
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-06-10 23:10:30 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-06-10 23:10:30 +0000
commit3b318ed09588d383e7a1d79b167e71386205db63 (patch)
tree0a34330f01acf1a2cd18f5a9f8c36ec29216a3e8 /db.cpp
parentd9dac6772f58e79cce0e2417c083547326056cc8 (diff)
automatically change displayed address whenever it receives anything,
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
Diffstat (limited to 'db.cpp')
-rw-r--r--db.cpp9
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();