fix: reorgs with forks including invalid blocks #10320
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fgimenez
added
C-bug
fgimenez
force-pushed
the
fgimenez/hive-tests-reorg-with-invalid-blocks
branch
from
755a57d to
2b7485b
Compare
fgimenez
added a commit
that referenced
this pull request
Aug 17, 2024
fgimenez
force-pushed
the
fgimenez/hive-tests-reorg-with-invalid-blocks
branch
from
2b7485b to
04bd239
Compare
Rjected
approved these changes
Aug 19, 2024
crates/engine/tree/src/tree/mod.rs
Outdated
| @@ -253,7 +264,7 @@ impl TreeState { | |||
|
|
|||
| while old_hash != current_hash { | |||
| if let Some(block) = self.blocks_by_hash.get(&old_hash) { | |||
| old_chain.push(block.clone()); | |||
| old_chain.insert(0, block.clone()); | |||
There was a problem hiding this comment.
since we seem to be only inserting at the front, it might be worth doing push and then reverse like we do with new_chain
There was a problem hiding this comment.
makes sense, done here 3f8a5bc
fgimenez
force-pushed
the
fgimenez/hive-tests-reorg-with-invalid-blocks
branch
from
d879eda to
3f8a5bc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
These changes primarily address potential reorg-related failures raised by failing hive tests.
TreeState::on_new_headincludes two fixesTreeState::is_fork: besides walking back from the given target hash and trying to find the canonical head (which would only address canonical chain extensions), it also checks walking back from the canonical head and tries to find the target hash.newPayloadcalls, both in test block creation and in theCancunPayloadFieldspassed to the callTestHarnessand refactors