Skip to content

feat(version): merge master to 4.8.3 - #7057

Closed
yanghang8612 wants to merge 6 commits into
release_v4.8.3from
master
Closed

yanghang8612 wants to merge 6 commits into
release_v4.8.3from
master

Conversation

@yanghang8612

Copy link
Copy Markdown
Collaborator

What does this PR do?

Merge master (currently 4e8389f159, including GreatVoyage-v4.8.2.4) directly into release_v4.8.3, using the same source and target branches as #7010.

Why are these changes required?

Keep release_v4.8.3 ahead of master and 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, and git diff --check on 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:

  • Preserve VERSION_4_8_2_4(39, ..., 70), change VERSION_4_8_3 to 40, and set ChainConstant.BLOCK_VERSION to 40. Retain 4.8.3's fork time and 80% witness threshold.
  • Retain 4.8.3's strict ECDSA validation and exchange closure proposals alongside master's storage-key optimization proposal and storage migration fixes.
  • Update the VM configuration isolation tests and fork version assertions, keeping 4.8.2.4 and 4.8.3 activation independent.

The resolved merge commit and validation details remain available in #7056 and branch yanghang8612:feature/merge_master_to_4_8_3 as a reference for the final merge into the target branch.

Extra details

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants