Skip to content

Conversation

samlaf
Copy link
Collaborator

@samlaf samlaf commented Jul 11, 2025

Got Claude to go through the reverts one by one and fix the merge conflicts (still not 100% why there were conflicts). The diff with 0.9.2 is available in https://www.notion.so/eigen-labs/pr-1759-diffs-with-v0-9-2-22d13c11c3e080fea264d56a1820427e, and it consists of only a few good additions coming from PRs other than the ones reverted in here. Then fixed a few things by hand.

Why are these changes needed?

Trying to start Payments afresh. See https://linear.app/eigenlabs/project/payments-recalibration-27b0d6698b61/issues and https://www.notion.so/eigen-labs/Release-2-1-0-22413c11c3e0809ea585eafa44a3fc23?source=copy_link#22413c11c3e080728739e7e2ce126c62 for more info.

This is needed to make our 2.1.0 release, since the per-quorum reservation PRs that are being reverted here contain some racey logic on the disperser which causes tx errors. We want to rethink the architecture and properly serialize payments processing. We will likely un-revert the protobuf PR and just fix the implementation, but for now we consider cleaner to just revert everything.

Protobuf breaking changes

All the protobuf breaking changes are from per-quorum payments methods that we are removing. This is fine because those only landed on preprod which is internal to us, so these changes won't break any clients.

samlaf added 24 commits July 12, 2025 02:53
@samlaf samlaf requested a review from a team as a code owner July 11, 2025 20:59
@samlaf samlaf marked this pull request as draft July 11, 2025 20:59
Copy link

github-actions bot commented Jul 11, 2025

The latest Buf updates on your PR. Results from workflow Buf Proto / buf (pull_request).

BuildFormatLintBreakingUpdated (UTC)
✅ passed✅ passed✅ passed❌ failed (12)Jul 16, 2025, 5:27 PM

This error was likely removed by mistake during a revert conflict fix from one of the previous set of reverted PRs.
@samlaf samlaf changed the title Revert payments prs chore: revert payments prs Jul 12, 2025
Copy link
Contributor

@litt3 litt3 left a comment

Choose a reason for hiding this comment

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

As discussed offline, the following PR should be reapplied:

#1641

@samlaf
Copy link
Collaborator Author

samlaf commented Jul 15, 2025

As discussed offline, the following PR should be reapplied:

#1641

Done: 8ef9818
Decided to revert the revert instead of interactive rebasing to remove that one revert, because we were running into a bunch more downstream conflicts with the interactive rebase strategy.

@samlaf samlaf marked this pull request as ready for review July 15, 2025 06:20
@dmanc
Copy link
Contributor

dmanc commented Jul 15, 2025

We deployed to preprod environment at 20MB/s and didn't see the errors anymore.

@samlaf samlaf changed the title chore: revert payments prs chore: revert per-quorum reservation payments prs Jul 16, 2025
@samlaf samlaf merged commit 6762a74 into master Jul 16, 2025
15 of 16 checks passed
@samlaf samlaf deleted the revert-payments-prs branch July 16, 2025 18:00
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.

3 participants