Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go: update op-geth to include v1.12.2 changes #7313

Merged
merged 3 commits into from
Sep 22, 2023
Merged

Conversation

protolambda
Copy link
Contributor

@protolambda protolambda commented Sep 20, 2023

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:

  • minor typing fixes:
    • RPC attach no longer returns an error
    • node iterator constructor now returns an error
    • geth now needs a block number when committing the state to DB
    • suicide->selfdestruct rename in DB interface, and addition of support for future L1 upgrade selfdestruct functionality change
    • nil blobs data args when constructing execution payload
    • txpool AddLocal changed, can now add-local synchronously, good for testing stability.
  • libp2p: (edit: this was split out into go: update libp2p to fix Go 1.21 build #7333 )
    • one generic type changed
    • pstoreds was deprecated, but no good replacement is available yet. Added comment lines to disable lint on this import.

We should update the go.mod after merging the op-geth PR ethereum-optimism/op-geth#136 that this depends on. Currently the go.mod points to the last commit on that PR branch, for CI to run.

@mergify mergify bot added A-op-chain-ops Area: op-chain-ops A-op-e2e Area: op-e2e A-op-node Area: op-node A-op-program Area: op-program A-op-wheel Area: op-wheel labels Sep 20, 2023
@protolambda protolambda requested a review from a team as a code owner September 20, 2023 13:45
@mergify mergify bot added the A-pkg-contracts-bedrock Area: packages/contracts-bedrock label Sep 20, 2023
@mergify
Copy link
Contributor

mergify bot commented Sep 21, 2023

Hey @protolambda! This PR has merge conflicts. Please fix them before continuing review.

@mergify mergify bot added the S-conflict Status: A conflict is present label Sep 21, 2023
@mergify mergify bot removed the S-conflict Status: A conflict is present label Sep 22, 2023
@protolambda
Copy link
Contributor Author

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 protolambda changed the title go: update op-geth to include v1.12.2 changes, and update libp2p go: update op-geth to include v1.12.2 changes Sep 22, 2023
@OptimismBot OptimismBot merged commit 99d0ef1 into develop Sep 22, 2023
7 checks passed
@OptimismBot OptimismBot deleted the op-geth-v1_12_2 branch September 22, 2023 19:33
@mergify
Copy link
Contributor

mergify bot commented Sep 22, 2023

This PR has been added to the merge queue, and will be merged soon.

@mergify mergify bot added the S-on-merge-train Status: This PR is in the merge queue label Sep 22, 2023
@mergify
Copy link
Contributor

mergify bot commented Sep 22, 2023

This PR is next in line to be merged, and will be merged as soon as checks pass.

@mergify mergify bot removed the S-on-merge-train Status: This PR is in the merge queue label Sep 22, 2023
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
Labels
A-op-chain-ops Area: op-chain-ops A-op-e2e Area: op-e2e A-op-node Area: op-node A-op-program Area: op-program A-op-wheel Area: op-wheel A-pkg-contracts-bedrock Area: packages/contracts-bedrock
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants