Fixes some hive test related to invalid hash #4102
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
asdacap
force-pushed
the
asdacap/fix-ancestor-invalidation
branch
2 times, most recently
from
b0d5443
to
561c5c9
Compare
MarekM25
reviewed
Jun 6, 2022
src/Nethermind/Nethermind.Merge.Plugin/Handlers/V1/NewPayloadV1Handler.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Merge.Plugin/InvalidChainTracker/InvalidChainTracker.cs
Show resolved
Hide resolved
LukaszRozmej
requested changes
Jun 7, 2022
src/Nethermind/Nethermind.Consensus/Processing/BlockchainProcessor.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Consensus/Processing/BlockchainProcessor.cs
Outdated
Show resolved
Hide resolved
Comment on lines
+121
to
+142
|
|
||
| _api.HeaderValidator = new InvalidHeaderInterceptor( | ||
| new MergeHeaderValidator(_poSSwitcher, _api.BlockTree, _api.SpecProvider, _api.SealValidator, | ||
| _api.LogManager), | ||
| _invalidChainTracker, | ||
| _api.LogManager); | ||
| _api.UnclesValidator = new MergeUnclesValidator(_poSSwitcher, _api.UnclesValidator); | ||
| _api.BlockValidator = new BlockValidator(_api.TxValidator, _api.HeaderValidator, _api.UnclesValidator, | ||
| _api.SpecProvider, _api.LogManager); | ||
| _api.BlockValidator = new InvalidBlockInterceptor( | ||
| new BlockValidator(_api.TxValidator, _api.HeaderValidator, _api.UnclesValidator, | ||
| _api.SpecProvider, _api.LogManager), | ||
| _invalidChainTracker, | ||
| _api.LogManager); | ||
| _api.HealthHintService = | ||
| new MergeHealthHintService(_api.HealthHintService, _poSSwitcher); | ||
| _mergeBlockProductionPolicy = new MergeBlockProductionPolicy(_api.BlockProductionPolicy); | ||
| _api.BlockProductionPolicy = _mergeBlockProductionPolicy; | ||
|
|
||
| _api.FinalizationManager = new MergeFinalizationManager(_blockFinalizationManager, _api.FinalizationManager, _poSSwitcher); | ||
|
|
||
| // Need to do it here because blockprocessor is not available in init | ||
| _invalidChainTracker.SetupBlockchainProcessorInterceptor(_api.BlockchainProcessor!); |
There was a problem hiding this comment.
Maybe we should add InitBlockchain to plugins that is after InitBlockchain step? @MarekM25 WDYT?
src/Nethermind/Nethermind.Merge.Plugin/InvalidChainTracker/InvalidChainTracker.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Merge.Plugin/InvalidChainTracker/InvalidChainTracker.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Merge.Plugin/InvalidChainTracker/InvalidChainTracker.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Merge.Plugin/InvalidChainTracker/InvalidChainTracker.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Merge.Plugin/InvalidChainTracker/InvalidChainTracker.cs
Show resolved
Hide resolved
| } | ||
|
|
||
| Keccak effectiveParent = parent; | ||
| BlockHeader? parentHeader = TryGetBlockHeader(parent); |
There was a problem hiding this comment.
just take in Headers in first place, they should be available in all scenarios: OnInvalidBlock(BlockHeader failedBlock, BlockHeader parent)
There was a problem hiding this comment.
Problem, sometime it does not have the parent header. Eg, in case of newPayload where it's parent is not synced or missed.
There was a problem hiding this comment.
ok, but maybe lets try resolve parent upstream then?
There was a problem hiding this comment.
Upstream - the code that is calling this code. Now with OnInvalidBlockArg I think it's not a problem to get ParentHeader from caller.
LukaszRozmej
reviewed
Jun 8, 2022
src/Nethermind/Nethermind.Merge.Plugin.Test/InvalidChainTrackerTest.cs
Outdated
Show resolved
Hide resolved
LukaszRozmej
reviewed
Jun 8, 2022
src/Nethermind/Nethermind.Merge.Plugin.Test/InvalidChainTrackerTest.cs
Outdated
Show resolved
Hide resolved
LukaszRozmej
reviewed
Jun 8, 2022
src/Nethermind/Nethermind.Merge.Plugin.Test/InvalidChainTrackerTest.cs
Outdated
Show resolved
Hide resolved
asdacap
force-pushed
the
asdacap/fix-ancestor-invalidation
branch
from
561c5c9
to
d130647
Compare
LukaszRozmej
approved these changes
Jun 8, 2022
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.
Changes:
Types of changes