sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5511

Browse Source 
e9c3215 [Wallet] sort pending wallet transactions before reaccepting (dexX7)
This commit is contained in:
Wladimir J. van der Laan 2015-04-29 09:49:19 +02:00
commit 23c998d811
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/wallet/wallet.cpp
View File

@ -1101,6 +1101,9 @@ void CWallet::ReacceptWalletTransactions()
if (!fBroadcastTransactions) if (!fBroadcastTransactions)
return; return;
LOCK2(cs_main, cs_wallet); LOCK2(cs_main, cs_wallet);
std::map<int64_t, CWalletTx*> mapSorted;
// Sort pending wallet transactions based on their initial wallet insertion order
BOOST_FOREACH(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet) BOOST_FOREACH(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet)
{ {
const uint256& wtxid = item.first; const uint256& wtxid = item.first;
@ -1109,13 +1112,19 @@ void CWallet::ReacceptWalletTransactions()
int nDepth = wtx.GetDepthInMainChain(); int nDepth = wtx.GetDepthInMainChain();
if (!wtx.IsCoinBase() && nDepth < 0) if (!wtx.IsCoinBase() && nDepth < 0) {
{ mapSorted.insert(std::make_pair(wtx.nOrderPos, &wtx));
// Try to add to memory pool
LOCK(mempool.cs);
wtx.AcceptToMemoryPool(false);
} }
} }
// Try to add wallet transactions to memory pool
BOOST_FOREACH(PAIRTYPE(const int64_t, CWalletTx*)& item, mapSorted)
{
CWalletTx& wtx = *(item.second);
LOCK(mempool.cs);
wtx.AcceptToMemoryPool(false);
}
} }
bool CWalletTx::RelayWalletTransaction() bool CWalletTx::RelayWalletTransaction()