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 branch 'master' into catchup

Browse source
This commit is contained in:
Steven Roose 2019-05-29 14:17:08 +01:00
commit 619b438dab
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
5 changed files with 11 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/validation.cpp
View file

@ -2646,7 +2646,7 @@ bool CChainState::ConnectTip(CValidationState& state, const CChainParams& chainp
// ELEMENTS: We also eject now-invalid peg-outs based on block transition if not config list set
// If config is set, this means all peg-outs have been filtered for that list already and other
// functionaries aren't matching your list. Operator should restart with no list or new matching list.
mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight, setPeginsSpent, (paklist && !g_paklist_config));
mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight, (paklist && !g_paklist_config));
disconnectpool.removeForBlock(blockConnecting.vtx);
// Update chainActive & related variables.
chainActive.SetTip(pindexNew);