remerge v2.5.6-stable #2141
Merged
remerge v2.5.6-stable #2141
Conversation
This file contains 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
go-algorand 2.5.5-beta
go-algorand 2.5.5-stable
Ensure local delta does not have entries with empty key-value stores
Fix for empty accounts stored in DB after app clear state or app removal
Delete empty entries, update merkleTrie hashes.
Improve error test conditions during database migration 4.
Fix accessing int64 atomic variables on arm32, by aligning variables on 64-bit aligned address.
#2095) roundCowState now has compatibility mode accountIdx param is propagated from logic to GetKey/SetKey/DelKey Logic: - store account index for used in GetKey for this app - in SetKey/DelKey use store either the index from GetKey if exist or a current account index - if in compatibility mode, BuildEvalDelta uses indices mentioned above otherwise it calculates account index using `txn.Accounts`
go-algorand 2.5.6-beta
go-algorand 2.5.6-stable
|
Why do we do this if files don't change? Is it to keep the commit history or something? |
Yes. It ensures that the branches do not diverge and share a lineage. If there are fixes downstream, they may also be captured here, though that is less common. |
algobarb
approved these changes
May 7, 2021
egieseke
approved these changes
May 7, 2021
tsachiherman
pushed a commit
to tsachiherman/go-algorand
that referenced
this pull request
Jul 7, 2021
…ge-2-5-6 remerge v2.5.6-stable
PhearZero
pushed a commit
to PhearNet/crypto
that referenced
this pull request
Jan 17, 2025
…ge-2-5-6 remerge v2.5.6-stable
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.
Summary
Finishing re-merge of v2.5.6-stable release.
Test Plan
Standard integration testing. Changes should commits only, no file changes.