Always mark conflicting blocks with BLOCK_CONFLICT_CHAINLOCK flag#3924

Merged

PastaPastaPasta merged 4 commits intodashpay:developfrom

UdjinM6:moreaccclflag

Jan 16, 2021

Commits on Jan 10, 2021

More accurate handling of the BLOCK_CONFLICT_CHAINLOCK flag
UdjinM6
committed

Commits on Jan 11, 2021

Update test/functional/feature_llmq_chainlocks.py

UdjinM6
and
thephez
authored

Commits on Jan 15, 2021

tests: make sure that previous tip on the reorged node is marked conflicting after chainlock
UdjinM6
committed
Apply suggestions from code review

UdjinM6
and
xdustinface
authored