@ -194,7 +194,7 @@ void CWallet::SetBestChain(const CBlockLocator& loc)
bool CWallet : : SetMinVersion ( enum WalletFeature nVersion , CWalletDB * pwalletdbIn , bool fExplicit )
bool CWallet : : SetMinVersion ( enum WalletFeature nVersion , CWalletDB * pwalletdbIn , bool fExplicit )
{
{
AssertLockHeld ( cs_wallet ) ; // nWalletVersion
LOCK ( cs_wallet ) ; // nWalletVersion
if ( nWalletVersion > = nVersion )
if ( nWalletVersion > = nVersion )
return true ;
return true ;
@ -221,7 +221,7 @@ bool CWallet::SetMinVersion(enum WalletFeature nVersion, CWalletDB* pwalletdbIn,
bool CWallet : : SetMaxVersion ( int nVersion )
bool CWallet : : SetMaxVersion ( int nVersion )
{
{
AssertLockHeld ( cs_wallet ) ; // nWalletVersion, nWalletMaxVersion
LOCK ( cs_wallet ) ; // nWalletVersion, nWalletMaxVersion
// cannot downgrade below current version
// cannot downgrade below current version
if ( nWalletVersion > nVersion )
if ( nWalletVersion > nVersion )
return false ;
return false ;
@ -1623,14 +1623,17 @@ DBErrors CWallet::ZapWalletTx()
bool CWallet : : SetAddressBook ( const CTxDestination & address , const string & strName , const string & strPurpose )
bool CWallet : : SetAddressBook ( const CTxDestination & address , const string & strName , const string & strPurpose )
{
{
AssertLockHeld ( cs_wallet ) ; // mapAddressBook
bool fUpdated = false ;
{
LOCK ( cs_wallet ) ; // mapAddressBook
std : : map < CTxDestination , CAddressBookData > : : iterator mi = mapAddressBook . find ( address ) ;
std : : map < CTxDestination , CAddressBookData > : : iterator mi = mapAddressBook . find ( address ) ;
fUpdated = mi ! = mapAddressBook . end ( ) ;
mapAddressBook [ address ] . name = strName ;
mapAddressBook [ address ] . name = strName ;
if ( ! strPurpose . empty ( ) ) /* update purpose only if requested */
if ( ! strPurpose . empty ( ) ) /* update purpose only if requested */
mapAddressBook [ address ] . purpose = strPurpose ;
mapAddressBook [ address ] . purpose = strPurpose ;
}
NotifyAddressBookChanged ( this , address , strName , : : IsMine ( * this , address ) ,
NotifyAddressBookChanged ( this , address , strName , : : IsMine ( * this , address ) ,
mapAddressBook [ address ] . purpose ,
strPurpose , ( fUpdated ? CT_UPDATED : CT_NEW ) ) ;
( mi = = mapAddressBook . end ( ) ) ? CT_NEW : CT_UPDATED ) ;
if ( ! fFileBacked )
if ( ! fFileBacked )
return false ;
return false ;
if ( ! strPurpose . empty ( ) & & ! CWalletDB ( strWalletFile ) . WritePurpose ( CBitcoinAddress ( address ) . ToString ( ) , strPurpose ) )
if ( ! strPurpose . empty ( ) & & ! CWalletDB ( strWalletFile ) . WritePurpose ( CBitcoinAddress ( address ) . ToString ( ) , strPurpose ) )
@ -1640,8 +1643,8 @@ bool CWallet::SetAddressBook(const CTxDestination& address, const string& strNam
bool CWallet : : DelAddressBook ( const CTxDestination & address )
bool CWallet : : DelAddressBook ( const CTxDestination & address )
{
{
{
AssertLockHeld ( cs_wallet ) ; // mapAddressBook
LOCK ( cs_wallet ) ; // mapAddressBook
if ( fFileBacked )
if ( fFileBacked )
{
{
@ -1652,9 +1655,11 @@ bool CWallet::DelAddressBook(const CTxDestination& address)
CWalletDB ( strWalletFile ) . EraseDestData ( strAddress , item . first ) ;
CWalletDB ( strWalletFile ) . EraseDestData ( strAddress , item . first ) ;
}
}
}
}
mapAddressBook . erase ( address ) ;
mapAddressBook . erase ( address ) ;
}
NotifyAddressBookChanged ( this , address , " " , : : IsMine ( * this , address ) , " " , CT_DELETED ) ;
NotifyAddressBookChanged ( this , address , " " , : : IsMine ( * this , address ) , " " , CT_DELETED ) ;
if ( ! fFileBacked )
if ( ! fFileBacked )
return false ;
return false ;
CWalletDB ( strWalletFile ) . ErasePurpose ( CBitcoinAddress ( address ) . ToString ( ) ) ;
CWalletDB ( strWalletFile ) . ErasePurpose ( CBitcoinAddress ( address ) . ToString ( ) ) ;