BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2009 from sipa/fixmove 

Prevent RPC 'move' from deadlocking
This commit is contained in:
Gavin Andresen 2012-11-16 08:09:41 -08:00
parent 1fefd2a5bc 4291e8feab
commit e45d39f9ee
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rpcwallet.cpp
View File

@ -573,7 +573,7 @@ Value movecmd(const Array& params, bool fHelp)
// Debit // Debit
CAccountingEntry debit; CAccountingEntry debit;
debit.nOrderPos = pwalletMain->IncOrderPosNext(); debit.nOrderPos = pwalletMain->IncOrderPosNext(&walletdb);
debit.strAccount = strFrom; debit.strAccount = strFrom;
debit.nCreditDebit = -nAmount; debit.nCreditDebit = -nAmount;
debit.nTime = nNow; debit.nTime = nNow;
@ -583,7 +583,7 @@ Value movecmd(const Array& params, bool fHelp)
// Credit // Credit
CAccountingEntry credit; CAccountingEntry credit;
credit.nOrderPos = pwalletMain->IncOrderPosNext(); credit.nOrderPos = pwalletMain->IncOrderPosNext(&walletdb);
credit.strAccount = strTo; credit.strAccount = strTo;
credit.nCreditDebit = nAmount; credit.nCreditDebit = nAmount;
credit.nTime = nNow; credit.nTime = nNow;

10
src/wallet.cpp
View File

@ -291,10 +291,14 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
return true; return true;
} }
int64 CWallet::IncOrderPosNext() int64 CWallet::IncOrderPosNext(CWalletDB *pwalletdb)
{ {
int64 nRet = nOrderPosNext; int64 nRet = nOrderPosNext++;
CWalletDB(strWalletFile).WriteOrderPosNext(++nOrderPosNext); if (pwalletdb) {
pwalletdb->WriteOrderPosNext(nOrderPosNext);
} else {
CWalletDB(strWalletFile).WriteOrderPosNext(nOrderPosNext);
}
return nRet; return nRet;
} }

2
src/wallet.h
View File

@ -149,7 +149,7 @@ public:
/** Increment the next transaction order id /** Increment the next transaction order id
@return next transaction order id @return next transaction order id
*/ */
int64 IncOrderPosNext(); int64 IncOrderPosNext(CWalletDB *pwalletdb = NULL);
typedef std::pair<CWalletTx*, CAccountingEntry*> TxPair; typedef std::pair<CWalletTx*, CAccountingEntry*> TxPair;
typedef std::multimap<int64, TxPair > TxItems; typedef std::multimap<int64, TxPair > TxItems;