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.

Sign up for GitHub

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

Jump to bottom

Reverts #421 #435

Merged
merged 1 commit into from
Mar 25, 2025
Merged

Reverts #421 #435

merged 1 commit into from
Mar 25, 2025

Conversation

diegoximenes
Copy link
Contributor

@diegoximenes diegoximenes commented Mar 25, 2025 •
edited by joshuacolvin0
Loading

Revert #421

This reverts solves the deadlock between OffchainLabs/nitro#3001 and OffchainLabs/nitro#3033, allowing OffchainLabs/nitro#3033 to progress first

@diegoximenes
Revert "Merge pull request #421 from OffchainLabs/context_in_syncprog…
d530451 
…ressbackend"

This reverts commit e2a1a20, reversing
changes made to d18b33c.
@cla-bot cla-bot bot added the s CLA signed label Mar 25, 2025
@diegoximenes diegoximenes marked this pull request as ready for review March 25, 2025 17:49
joshuacolvin0
joshuacolvin0 approved these changes Mar 25, 2025
View reviewed changes
Copy link
Member

@joshuacolvin0 joshuacolvin0 left a comment

Choose a reason for hiding this comment

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

LGTM

@joshuacolvin0 joshuacolvin0 merged commit ee3eefa into master Mar 25, 2025
9 of 10 checks passed
@joshuacolvin0 joshuacolvin0 deleted the revert_context_in_syncprogressbackend branch March 25, 2025 18:09
@joshuacolvin0 joshuacolvin0 changed the title Reverts changes related to "Context in SyncProgressBackend" Reverts #421 Mar 25, 2025
diegoximenes added a commit that referenced this pull request Mar 25, 2025
@diegoximenes
Revert "Merge pull request #435 from OffchainLabs/revert_context_in_s…
42b0d20 
…yncprogressbackend"

This reverts commit ee3eefa, reversing
changes made to e2a1a20.
@diegoximenes diegoximenes mentioned this pull request Mar 25, 2025
Merged
eljobe added a commit that referenced this pull request Mar 26, 2025
@eljobe
Merge pull request #436 from OffchainLabs/context_in_syncprogressback…
37d142e 
…end_again

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

@joshuacolvin0 joshuacolvin0 joshuacolvin0 approved these changes

@eljobe eljobe Awaiting requested review from eljobe

Assignees
No one assigned
Labels
design-approved s CLA signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@diegoximenes @joshuacolvin0