instantsend: Mark blocks as conflicting when there is a CL vs IS conflict#3987

Merged

PastaPastaPasta merged 2 commits into

dashpay:developfrom

UdjinM6:is_optim_5

Feb 14, 2021

Commits on Feb 6, 2021

instantsend: Mark a block with IS-locks which conflict with txes in a CL-ed block as conflicting and not as invalid
UdjinM6
committed
tests: Tweak feature_llmq_is_cl_conflicts.py to test CL overriding a block with conflicting IS-locks
UdjinM6
committed