contract: Fix ability to reorganize contracts #1934
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A user observed that contextual contract validation can prevent nodes from reorganizing when a conflict occurs for contract transactions since both chains can confirm the same transaction. The original validation occurred before disconnecting the tip of the stale chain and reverting the context examined for the checks. This moves the offending code to
ConnectBlock()
so that a node disconnects the conflicting state before the validation.