Repository navigation
feat(version): merge master to 4.8.3 - #7057
Closed
yanghang8612 wants to merge 6 commits into
Closed
yanghang8612 wants to merge 6 commits into
yanghang8612 wants to merge 6 commits into
Conversation
feat: improve execution consistency and storage handling
feat(version): merge release_v4.8.2.4 into master
…,version code:18835
….3-4-gfa4dd52346 update a new version. version name:GreatVoyage-v4.8.2.3-4-gfa4dd52346…
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.
What does this PR do?
Merge
master(currently4e8389f159, includingGreatVoyage-v4.8.2.4) directly intorelease_v4.8.3, using the same source and target branches as #7010.Why are these changes required?
Keep
release_v4.8.3ahead ofmasterand inherit the 4.8.2.4 storage migration fixes. Fork version 39 now belongs to 4.8.2.4, so the existing 4.8.3 fork must move to version 40 when resolving the merge.This PR has been tested by:
The prepared merge resolution in #7056 (commit
yanghang8612/java-tron@b0a9de62f5623ec11d85f261a9b36f2065551a8d) passed 104 targeted tests,:framework:lint, andgit diff --checkon JDK 17 / macOS ARM64. The Git metadata generation task was excluded due to the plugin's Git worktree compatibility issue. Those results apply to the prepared resolution; this direct-branch PR still has merge conflicts.Follow up
Resolve the merge conflicts before merging:
VERSION_4_8_2_4(39, ..., 70), changeVERSION_4_8_3to 40, and setChainConstant.BLOCK_VERSIONto 40. Retain 4.8.3's fork time and 80% witness threshold.The resolved merge commit and validation details remain available in #7056 and branch
yanghang8612:feature/merge_master_to_4_8_3as a reference for the final merge into the target branch.Extra details
master→release_v4.8.3PR.