fix: retry conclude_node_migration until contract reflects completion, not until tx is applied#3056
Merged
Conversation
Code ReviewNo critical issues found. The change correctly adds a post-tx verification step to The logic is sound:
Minor note (non-blocking): ✅ Approved |
kevindeforth
previously approved these changes
Apr 28, 2026
4e2520e to
1ce87fc
Compare
kevindeforth
approved these changes
Apr 29, 2026
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
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.
Work towards: #2898
retry_conclude_onboardingpreviously treated tx_sender::send returning Ok as success, but that only signals the tx was applied — NEAR rolls back state when a contract method returns Err, so a contract-side rejection (e.g. InvalidTeeRemoteAttestation racing the new node's attestation submission) silently left the migration record in place and the onboarding node waiting forever on a participant list change that would never happen.Now we verify the migration actually completed by waiting for active_migration to flip false on the local MigrationInfo watch — set when the contract removes our migration record on success — and retry the conclude tx if it doesn't.
Verified by running all tests 100 times in #3024, specifically this run: https://github.com/near/mpc/actions/runs/25051806158/job/73381273673