Sync Emurgo fork with Anastasia-Labs/proof-tool main - #1
Merged
Merged
Conversation
…t-ceremony-browser-recovery Harden mainnet ceremony and browser proof recovery
Accept upstream MSM worker timeout model (5m inactivity + 20m absolute) and drop Emurgo's hard 5m asyncWorkerReplyTimeout change, which upstream superseded in the ceremony/browser recovery work. Co-authored-by: Cursor <cursoragent@cursor.com>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
main(7dacb1d) into the Emurgo fork.internal/msmengine/async_contract.goby keeping upstream MSM recovery timeouts and discarding Emurgo commitd722792(worker limit 5m), which only raisedasyncWorkerReplyTimeoutfrom 2m to a hard 5m.asyncWorkerInactivityTimeout = 5m+asyncWorkerAbsoluteTimeout = 20m(with progress-aware wait / retries from the mainnet ceremony browser recovery work).Conflict resolution
upstream/maininto Emurgomain: took theirs (upstream) forasync_contract.go.upstream/mainfor that path; MSM package matches upstream timeout constants.Test plan
internal/msmengine/async_contract.gomatches upstream (no Emurgo-only hard 5m constant)mainMade with Cursor