go: update op-geth to include v1.12.2 changes #7313
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
mergify
bot
added
A-op-chain-ops
tynes
approved these changes
Sep 21, 2023
|
Hey @protolambda! This PR has merge conflicts. Please fix them before continuing review. |
protolambda
force-pushed
the
op-geth-v1_12_2
branch
from
ec4baa9
to
a611b09
Compare
protolambda
force-pushed
the
op-geth-v1_12_2
branch
from
a611b09
to
00d5e53
Compare
|
Updated to include latest op-geth now that the v1.12.2 changes are merged in op-geth, and rebased on develop and resolved dependency conflicts. Should be good to go now. |
protolambda
changed the title
trianglesphere
approved these changes
Sep 22, 2023
|
This PR has been added to the merge queue, and will be merged soon. |
|
This PR is next in line to be merged, and will be merged as soon as checks pass. |
OptimismBot
added a commit
that referenced
this pull request
Sep 25, 2023
go: update op-geth to include v1.13.1 changes [depends on #7313]
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.
Description
Update op-geth to include upstream go-ethereum v1.12.2 changes.
Also update libp2p, to resolve dependency issue (quic go version conflicts with go-ethereum).
Changes:
We should update the
go.modafter merging the op-geth PR ethereum-optimism/op-geth#136 that this depends on. Currently thego.modpoints to the last commit on that PR branch, for CI to run.