Fix Digest state recovery checkpoint root - #2512
Merged
kushti merged 1 commit intoSep 8, 2026
Merged
Conversation
a-shannon
marked this pull request as ready for review
September 6, 2026 15:47
jozanek
reviewed
Sep 6, 2026
jozanek
approved these changes
Sep 7, 2026
kushti
approved these changes
Sep 7, 2026
Replay the three reviewed commits from PR ergoplatform#2512 on the release branch. Preserve the seven approved file contents and the checkpoint, startup and synchronization observation tests without importing unrelated master changes.
a-shannon
force-pushed
the
fix/digest-recovery-checkpoint
branch
from
September 8, 2026 07:17
2f005d3 to
d4a5091
Compare
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.
Digest-state recovery derives the stored version and state root from the same epoch checkpoint used to recover the context. This keeps checkpoint metadata consistent before subsequent headers are replayed. The production change is limited to the recovery caller; the adjacent recovery work in #2424 is separate.
The tests cover checkpoint recovery and reopening, actual node-view startup with later headers in history, persisted checkpoint metadata after replay, and reopening and rolling back to that checkpoint. The approved test-only synchronization support remains included, with selected-header agreement and bounded observations under the existing deadlines.
This PR now targets
v6.0.6. Commitd4a509121e4f2b0abba3db96afe9ebabf43ede72replays the three approved commits onto release basedb0f1a4299e6c2561152dc6ca07990aef5403ae2. All seven changed files have exactly the same contents as approved commit2f005d3bc00e78f6ac83e9aa3d41cd1c7629acb3, and the feature diff has the same stable patch ID. Release build configuration and dependency versions are retained. Independent review confirmed the exact port.Validation on the release branch: JDK 8 / Scala 2.12.20; all nine Digest recovery/state tests and all nine observation contracts passed, and integration sources compiled. Current release CI passed all eight checks, including node and integration tests and the three Scala versions for wallet/core. GitHub reports no merge conflicts with
v6.0.6.