op-{supervisor|e2e}: reorg when cycle detection + fix action test single chain cycle test #15569
+33
−13
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.
Description
Depends on #15568
op-e2e action tests for single chain cycle test was wrongly implemented. The chains reorged because the executing messages pointed to wrong index, not because of cycle.
This PR fixes the
ExecTriggerFromInitTrigger
method to generate correct executing messages for creating a cycle.Tests
Fixes
TestCycleInTx
,TestCycleInBlock
to use correct log index for executing message. Also checks that speculatively generated executing messages before transaction execution for emitting initiating messages are correct, comparing after the initiating message tx inclusion.Additional context
Cycle errors were not considered as
ErrConflict
, and did not trigger reorgs. Wrap them and consider them asErrConflict
to trigger reorg.Metadata