all: merge go-ethereum v1.16.1 #638
Conversation
0x00101010
changed the title
0x00101010
changed the title
There was a problem hiding this comment.
Great work! Changes look generally good, just a few nits. I merged the upstream 1.16.1 release against the same optimism commit as this PR ( 47ccb23 ) (but without resolving the merge-conflicts), and then diffed that against this PR, to isolate the merge-conflicts and verify the changes that were made to do the merge, and do the 3-way comparison (optimism branch, this branch, upstream).
I think next up, after some minor fixes, is to create a PR to the monorepo that pulls in this op-geth commit (alternatively, maybe @geoknee or @sebastianst can help with that?), to verify all monorepo functionality continues to work with this op-geth update, and that integration tests pass.
And one more nit: can you update the last few custom commits, squash and tidy up the commit-message to follow the regular style? Since these commits won't be squashed later (we'll merge-commit this into the optimism branch, to preserve all original upstream geth commit hashes).
And we might need another merge commit from optimism into this branch, to include the latest changes, to deconflict without redoing the merge-conflict-resolution work here.
0x00101010
force-pushed
the
merge/v1.16.1
branch
from
e3fe4c9 to
64bc7e5
Compare
eth/tracers/internal/tracetest/testdata/prestate_tracer_with_diff_mode/optimism.json
Show resolved
Hide resolved
sebastianst
changed the title
0x00101010
force-pushed
the
merge/v1.16.1
branch
from
27644f0 to
3083ebd
Compare
| return peer.ReplyReceiptsRLP(query.RequestId, response) | ||
| } | ||
|
|
||
| // ServiceGetReceiptsQuery assembles the response to a receipt query. It is | ||
| func handleGetReceipts69(backend Backend, msg Decoder, peer *Peer) error { |
There was a problem hiding this comment.
Newly added method to handle eth/69 requests, need to adjust to handle op related fields
Potentially the above handleGetReceipts68 as well, although it works in our sepolia testnet.
|
Closing in favor of #652 - thanks for the great work @0x00101010 ! |
4 participants
Description
Merges in go-ethereum v1.16.1 changes.
Corresponding monorepo PR: ethereum-optimism/optimism#16785
Cleaned-up git history PR is at #652
Additional context