DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Keep any existing cached witnesses when updating transactions

Browse Source
This commit is contained in:
Jack Grigg
2016-08-31 21:16:59 +12:00
parent be86b6c332
commit 0736fa14fc
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/wallet/wallet.cpp
View File

@@ -917,7 +917,16 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletD
} }
if (!wtxIn.mapNoteData.empty() && wtxIn.mapNoteData != wtx.mapNoteData) if (!wtxIn.mapNoteData.empty() && wtxIn.mapNoteData != wtx.mapNoteData)
{ {
wtx.mapNoteData = wtxIn.mapNoteData; auto tmp = wtxIn.mapNoteData;
// Ensure we keep any cached witnesses we may already have
for (const std::pair<JSOutPoint, CNoteData> nd : wtx.mapNoteData) {
if (tmp.count(nd.first) && nd.second.witnesses.size() > 0) {
tmp.at(nd.first).witnesses.assign(
nd.second.witnesses.cbegin(), nd.second.witnesses.cend());
}
}
// Now copy over the updated note data
wtx.mapNoteData = tmp;
fUpdated = true; fUpdated = true;
} }
if (wtxIn.fFromMe && wtxIn.fFromMe != wtx.fFromMe) if (wtxIn.fFromMe && wtxIn.fFromMe != wtx.fFromMe)