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

Merge 99ab3a72c5 into merged_master (Bitcoin PR #15931)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 23:10:09 +00:00
commit cfde15703a
16 changed files with 254 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/validation.cpp
View file

@ -2639,7 +2639,7 @@ bool CChainState::DisconnectTip(BlockValidationState& state, const CChainParams&
UpdateTip(pindexDelete->pprev, chainparams);
// Let wallets know transactions went from 1-confirmed to
// 0-confirmed or conflicted:
GetMainSignals().BlockDisconnected(pblock);
GetMainSignals().BlockDisconnected(pblock, pindexDelete);
return true;
}