Beacon reorgs during the sync #4243
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
…-fix' into merge/testing # Conflicts: # src/Nethermind/Nethermind.Merge.Plugin/Synchronization/MergeBlockDownloader.cs
# Conflicts: # src/Nethermind/Nethermind.Runner/configs/ropsten.cfg # src/Nethermind/Nethermind.Runner/configs/sepolia.cfg
# Conflicts: # src/Nethermind/Nethermind.Merge.Plugin/Synchronization/MergeBlockDownloader.cs # src/Nethermind/Nethermind.Runner/configs/ropsten.cfg # src/Nethermind/Nethermind.Runner/configs/sepolia.cfg
# Conflicts: # src/Nethermind/Nethermind.Blockchain/BlockTree.cs # src/Nethermind/Nethermind.Core/BlockInfo.cs # src/Nethermind/Nethermind.Merge.Plugin.Test/BlockTreeTests.ChainLevelHelper.cs # src/Nethermind/Nethermind.Merge.Plugin.Test/BlockTreeTests.cs # src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.Synchronization.cs # src/Nethermind/Nethermind.Merge.Plugin/Synchronization/ChainLevelHelper.cs
asdacap
approved these changes
Jul 22, 2022
| limit: | ||
| description: 'Limit for hive tests' | ||
| required: false | ||
| type: string | ||
| hive: |
| bool fillBeaconBlock = options.ContainsFlag(BlockTreeSuggestOptions.FillBeaconBlock); | ||
| bool setAsMain = options.ContainsFlag(BlockTreeSuggestOptions.ForceSetAsMain) || | ||
| !options.ContainsFlag(BlockTreeSuggestOptions.ForceDontSetAsMain) && !shouldProcess; | ||
|
|
||
| if (_logger.IsTrace) _logger.Trace($"Suggesting a new block. BestSuggestedBlock {BestSuggestedBody}, BestSuggestedBlock TD {BestSuggestedBody?.TotalDifficulty}, Block TD {block?.TotalDifficulty}, Head: {Head}, Head TD: {Head?.TotalDifficulty}, Block {block?.ToString(Block.Format.FullHashAndNumber)}. ShouldProcess: {shouldProcess}, TryProcessKnownBlock: {fillBeaconBlock}, SetAsMain {setAsMain}"); | ||
| if (_logger.IsTrace) |
There was a problem hiding this comment.
You and @LukaszRozmej seems to keep switching style. Can you sync your IDE or try not to change.
| MoveToBeaconMainChain = 32, | ||
|
|
||
| BeaconBlockInsert = TotalDifficultyNotNeeded | BeaconInsert | MoveToBeaconMainChain | NotOnMainChain | ||
| BeaconHeaderMetadata = 2, |
There was a problem hiding this comment.
np: Can you use a verb for this, like MarkBeaconHeaderMetadata
| { | ||
| int processingQueueCount = _processingQueue.Count; | ||
| if (!blockInfo.IsBeaconMainChain && blockInfo.IsBeaconInfo) |
There was a problem hiding this comment.
To clarify, this mean it have blocks from NP that is not marked as main? What does this mean? Can you add comment?
| } | ||
| BlockInfo predecessorInfo = _blockTree.GetInfo(predecessor.Number, predecessor.GetOrCalculateHash()).Info; | ||
| predecessorInfo.BlockNumber = predecessor.Number; | ||
| if (predecessorInfo.IsBeaconMainChain) break; |
There was a problem hiding this comment.
What is the difference from IsBeaconMainChain then just main chain?
There was a problem hiding this comment.
BeaconMainChain wasn't validated. It just new payloads from CL clients.
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.
Draft for discussion with @LukaszRozmej