Skip to content

fix: rebase teku master patch onto async gossip decoding - #13

Open
barnabasbusa wants to merge 1 commit into
masterfrom
bbusa/rebase-teku-master-patch
Open

barnabasbusa wants to merge 1 commit into
masterfrom
bbusa/rebase-teku-master-patch

Conversation

@barnabasbusa

Copy link
Copy Markdown

Teku #11447 (Consensys-Incorporated/teku@f23ff0a) moved SSZ decoding in Eth2TopicHandler.handleMessage onto the async runner and dropped the inner runAsync wrapper, so master.patch no longer applies (3-way conflict) and both the daily patch check and the eth-client-docker-image-builder xatu-sidecar-master teku build fail. This rebases the patch onto teku master 10e03bc, moving the GossipMessageAcceptedEvent publishing into the new processor.process(...).thenApply callback; the rest of the patch is unchanged apart from context. Verified it applies with scripts/apply-temu-patch.sh on a fresh master clone and that :plugins:xatu, :networking:eth2, :services:beaconchain and :teku compile.

@redpandabot redpandabot Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR only rewrites patches/consensys/teku/master.patch: it re-indents the Eth2TopicHandler hunk context for the async-gossip change upstream and refreshes the affected index/hunk line numbers. I fetched every modified base file from Consensys/teku at the current master 10e03bc, confirmed each old blob hash in the patch matches, and git apply --check succeeds against that exact base; the resulting files' git blob hashes also match every new hash in the patch (including Eth2TopicHandler.java → 46809d7). The functional patch content is unchanged apart from indentation, so the rebase is correct and complete.


Reviewed 1 changed file(s) @ a4792d08 — no blocking issues found.
"Ship the prototype."

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant