This repository has been archived by the owner on Nov 5, 2023. It is now read-only.
[DO NOT MERGE]: Diff clabby/op-reth (with upstream merge) against upstream (main) #48
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
Remove `consensus` crate `Cargo.toml` Reduce diff
chore: upstream sync
…licts Revert "chore: upstream sync"
op-reth: Fix serialization/deserialization for Deposit Receipts
Co-authored-by: nicolas <[email protected]>
feat(node): Add Compute Pending Block Rollup CLI Option
use the parameters from the optimism config in 1559 base fee computation
op-reth: Fix reth-primitives signature tests
Revert "use the parameters from the optimism config in 1559 base fee computation"
Ensure that block execution maintains L1 compatibility with optimism feature enabled
feat: ability to forward transactions to the sequencer
Refcell/merge upstream
Revert "Refcell/merge upstream"
|
This is very wrong - a merge strategy merging upstreamed You can see that there are way more changes than should be compared to upstream |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.