feat: add new crate op-beacon-core #7848
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
onbjerg
added
C-debt
mattsse
requested changes
Apr 24, 2024
Comment on lines
61
to
62
| #[cfg(feature = "optimism")] | ||
| { |
There was a problem hiding this comment.
this crate is now specific to optimism,
we can remove all the cfgs here
| // Goerli and early OP exception: | ||
| // * If the network is goerli pre-merge, ignore the extradata check, since we do not | ||
| // support clique. Same goes for OP blocks below Bedrock. | ||
| if self.chain_spec.chain != Chain::goerli() && !self.chain_spec.is_optimism() { |
There was a problem hiding this comment.
this can be removed because this is expected to be used for OP
| /// | ||
| /// From yellow paper: extraData: An arbitrary byte array containing data relevant to this block. | ||
| /// This must be 32 bytes or fewer; formally Hx. | ||
| fn validate_header_extradata(header: &Header) -> Result<(), ConsensusError> { |
There was a problem hiding this comment.
let's move this to consensus-common and reuse
| } | ||
|
|
||
| if is_post_merge { | ||
| if !self.chain_spec.is_optimism() && !header.is_zero_difficulty() { |
| impl OptimismBeaconConsensus { | ||
| /// Create a new instance of [OptimismBeaconConsensus] | ||
| pub fn new(chain_spec: Arc<ChainSpec>) -> Self { | ||
| Self { chain_spec } |
There was a problem hiding this comment.
Suggested change
| Self { chain_spec } | |
| assert!(chain_spec.is_optimism(), "optimism consensus only valid for optimism chains") | |
| Self { chain_spec } |
|
@mattsse there seems to be a few conflicts again |
|
@mattsse Would changing this PR to a draft PR be better? |
mattsse
requested changes
Apr 25, 2024
Comment on lines
31
to
33
| if !chain_spec.is_optimism() { | ||
| panic!("Given chain spec is not optimism") | ||
| } |
There was a problem hiding this comment.
this panic is redundant because unreachable due to the assert, we can remove this
crates/consensus/common/src/lib.rs
Outdated
Comment on lines
20
to
24
| /// Validates the header's extradata according to the beacon consensus rules. | ||
| /// | ||
| /// From yellow paper: extraData: An arbitrary byte array containing data relevant to this block. | ||
| /// This must be 32 bytes or fewer; formally Hx. | ||
| pub fn validate_header_extradata(header: &Header) -> Result<(), ConsensusError> { |
There was a problem hiding this comment.
let's move to mod validation
|
Any updates on this? @mattsse |
mw2000
pushed a commit
to mw2000/reth
that referenced
this pull request
Jun 5, 2024
Co-authored-by: Matthias Seitz <[email protected]>
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.
Addresses #7648 and based on PR #7830 which I closed due to some conflicts