GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix AddressBook syncrhonization between a CWallet and CWalletDB

Browse source 
This problem was reported independently by laanwj in Issue #350.
This commit is contained in:
Stéphane Gimenez 2011-06-27 23:22:30 +02:00
parent d0d80170a2
commit 4d410cfce9
4 changed files with 45 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/rpc.cpp
View file

@ -332,12 +332,15 @@ Value getnewaddress(const Array& params, bool fHelp)
// Generate a new key that is added to wallet
string strAddress = PubKeyToAddress(pwalletMain->GetKeyFromKeyPool());
pwalletMain->SetAddressBookName(strAddress, strAccount);
// This could be done in the same main CS as GetKeyFromKeyPool.
CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook)
pwalletMain->SetAddressBookName(strAddress, strAccount);
return strAddress;
}
// requires cs_main, cs_mapWallet locks
// requires cs_main, cs_mapWallet, cs_mapAddressBook locks
string GetAccountAddress(string strAccount, bool bForceNew=false)
{
string strAddress;
@ -393,6 +396,7 @@ Value getaccountaddress(const Array& params, bool fHelp)
CRITICAL_BLOCK(cs_main)
CRITICAL_BLOCK(pwalletMain->cs_mapWallet)
CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook)
{
ret = GetAccountAddress(strAccount);
}
@ -431,9 +435,10 @@ Value setaccount(const Array& params, bool fHelp)
if (strAddress == GetAccountAddress(strOldAccount))
GetAccountAddress(strOldAccount, true);
}
pwalletMain->SetAddressBookName(strAddress, strAccount);
}
pwalletMain->SetAddressBookName(strAddress, strAccount);
return Value::null;
}