Fix OP Stack header validation / Remove snapshot from snap-synced chains #7588
+87
−18
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,43 @@ | ||
| // SPDX-FileCopyrightText: 2023 Demerzel Solutions Limited | ||
| // SPDX-License-Identifier: LGPL-3.0-only | ||
|
|
||
| using System.Diagnostics; | ||
| using System.Diagnostics.CodeAnalysis; | ||
| using Nethermind.Blockchain; | ||
| using Nethermind.Consensus; | ||
| using Nethermind.Consensus.Messages; | ||
| using Nethermind.Consensus.Validators; | ||
| using Nethermind.Core; | ||
| using Nethermind.Core.Specs; | ||
| using Nethermind.Int256; | ||
| using Nethermind.Logging; | ||
| using Nethermind.Merge.Plugin; | ||
|
|
||
| namespace Nethermind.Optimism; | ||
|
|
||
| public class PreBedrockHeaderValidator( | ||
| IBlockTree? blockTree, | ||
| ISealValidator? sealValidator, | ||
| ISpecProvider? specProvider, | ||
| ILogManager? logManager) : HeaderValidator(blockTree, sealValidator, specProvider, logManager) | ||
| { | ||
| public override bool Validate(BlockHeader header, BlockHeader? parent, bool isUncle, [NotNullWhen(false)] out string? error) | ||
| { | ||
| error = null; | ||
| return ValidateParent(header, parent, ref error); | ||
|
There was a problem hiding this comment. In the PR description you mention:
But we're not actually doing that since
Is this something in progress? Otherwise, I would expect to see something like if (header.ParentHash != parent.Hash)
{
if (_logger.IsDebug) _logger.Debug($"Parent hash mismatch in block header ({header.Hash})");
error = BlockErrorMessages.MismatchedParentHash;
return false;
} |
||
| } | ||
| } | ||
|
|
||
| public class OptimismHeaderValidator( | ||
| IPoSSwitcher poSSwitcher, | ||
| IBlockTree blockTree, | ||
| ISealValidator sealValidator, | ||
| ISpecProvider specProvider, | ||
| ILogManager logManager) | ||
| : MergeHeaderValidator( | ||
| poSSwitcher, | ||
| new PreBedrockHeaderValidator(blockTree, sealValidator, specProvider, logManager), | ||
| blockTree, specProvider, sealValidator, logManager) | ||
| { | ||
| protected override bool ValidateGasLimitRange(BlockHeader header, BlockHeader parent, IReleaseSpec spec, ref string? error) => true; | ||
| } | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| using System; | ||
| using Nethermind.Consensus; | ||
| using Nethermind.Core; | ||
| using Nethermind.Core.Crypto; | ||
| using Nethermind.Core.Specs; | ||
| using Nethermind.Int256; | ||
| using Nethermind.Optimism; | ||
|
|
||
| public class OptimismPoSSwitcher(ISpecProvider specProvider, long bedrockBlockNumber) : IPoSSwitcher | ||
| { | ||
| public UInt256? TerminalTotalDifficulty => specProvider.TerminalTotalDifficulty; | ||
|
|
||
| public UInt256? FinalTotalDifficulty => TerminalTotalDifficulty; | ||
|
|
||
| public bool TransitionFinished => true; | ||
|
|
||
| public Hash256? ConfiguredTerminalBlockHash => null; | ||
|
|
||
| public long? ConfiguredTerminalBlockNumber => null; | ||
|
|
||
| public event EventHandler TerminalBlockReached { add { } remove { } } | ||
|
|
||
| public void ForkchoiceUpdated(BlockHeader newHeadHash, Hash256 finalizedHash) { } | ||
|
|
||
| public (bool IsTerminal, bool IsPostMerge) GetBlockConsensusInfo(BlockHeader header) | ||
| { | ||
| return (header.Number == bedrockBlockNumber - 1, header.IsPostMerge = header.Number >= bedrockBlockNumber); | ||
| } | ||
|
|
||
| public bool HasEverReachedTerminalBlock() => true; | ||
|
|
||
| public bool IsPostMerge(BlockHeader header) => GetBlockConsensusInfo(header).IsPostMerge; | ||
|
|
||
| public bool TryUpdateTerminalBlock(BlockHeader header) | ||
| { | ||
| throw new NotImplementedException("Should never be called in OP Stack chains"); | ||
| } | ||
| } |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From where are we getting this value?