Browse Source

Merge pull request #383 from sipa/syncdefault

Fix synchronization of default key
pull/1/head
Jeff Garzik 11 years ago
parent
commit
e94010b239
  1. 2
      src/ui.cpp
  2. 24
      src/wallet.cpp
  3. 1
      src/wallet.h

2
src/ui.cpp

@ -240,7 +240,7 @@ void SetDefaultReceivingAddress(const string& strAddress) @@ -240,7 +240,7 @@ void SetDefaultReceivingAddress(const string& strAddress)
return;
if (!mapPubKeys.count(hash160))
return;
CWalletDB(pwalletMain->strWalletFile).WriteDefaultKey(mapPubKeys[hash160]);
pwalletMain->SetDefaultKey(mapPubKeys[hash160]);
pframeMain->m_textCtrlAddress->SetValue(strAddress);
}
}

24
src/wallet.cpp

@ -98,14 +98,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn) @@ -98,14 +98,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn)
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
{
if (txout.scriptPubKey == scriptDefaultKey)
{
if (!fFileBacked)
continue;
CWalletDB walletdb(strWalletFile);
vchDefaultKey = GetKeyFromKeyPool();
walletdb.WriteDefaultKey(vchDefaultKey);
walletdb.WriteName(PubKeyToAddress(vchDefaultKey), "");
}
SetDefaultKey(GetKeyFromKeyPool());
}
// Notify UI
@ -967,10 +960,9 @@ bool CWallet::LoadWallet(bool& fFirstRunRet) @@ -967,10 +960,9 @@ bool CWallet::LoadWallet(bool& fFirstRunRet)
// Create new default key
RandAddSeedPerfmon();
vchDefaultKey = GetKeyFromKeyPool();
SetDefaultKey(GetKeyFromKeyPool());
if (!SetAddressBookName(PubKeyToAddress(vchDefaultKey), ""))
return false;
CWalletDB(strWalletFile).WriteDefaultKey(vchDefaultKey);
}
CreateThread(ThreadFlushWalletDB, &strWalletFile);
@ -1022,6 +1014,17 @@ bool CWallet::GetTransaction(const uint256 &hashTx, CWalletTx& wtx) @@ -1022,6 +1014,17 @@ bool CWallet::GetTransaction(const uint256 &hashTx, CWalletTx& wtx)
return false;
}
bool CWallet::SetDefaultKey(const std::vector<unsigned char> &vchPubKey)
{
if (fFileBacked)
{
if (!CWalletDB(strWalletFile).WriteDefaultKey(vchPubKey))
return false;
}
vchDefaultKey = vchPubKey;
return true;
}
bool GetWalletFile(CWallet* pwallet, string &strWalletFileOut)
{
if (!pwallet->fFileBacked)
@ -1133,3 +1136,4 @@ void CReserveKey::ReturnKey() @@ -1133,3 +1136,4 @@ void CReserveKey::ReturnKey()
nIndex = -1;
vchPubKey.clear();
}

1
src/wallet.h

@ -176,6 +176,7 @@ public: @@ -176,6 +176,7 @@ public:
bool GetTransaction(const uint256 &hashTx, CWalletTx& wtx);
bool SetDefaultKey(const std::vector<unsigned char> &vchPubKey);
};

Loading…
Cancel
Save