Repository navigation
feat(version): merge master to 4.8.3 - #7056
Merged
CodeNinjaEvan merged 7 commits intoOct 26, 2026
Merged
CodeNinjaEvan merged 7 commits into
CodeNinjaEvan merged 7 commits into
Conversation
…ad-migration feat: improve execution consistency and storage handling
feat(version): merge release_v4.8.2.4 into master
…,version code:18835
…oyage-v4.8.2.3-4-gfa4dd52346 update a new version. version name:GreatVoyage-v4.8.2.3-4-gfa4dd52346…
halibobo1205
approved these changes
Oct 26, 2026
yanghang8612
force-pushed
the
feature/merge_master_to_4_8_3
branch
from
October 26, 2026 04:16
21e6528 to
3ee8d8f
Compare
317787106
approved these changes
Oct 26, 2026
CodeNinjaEvan
merged commit Oct 26, 2026
7a07046
into
tronprotocol:release_v4.8.3
11 of 13 checks passed
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(4e8389f159, includingGreatVoyage-v4.8.2.4) intorelease_v4.8.3, following #7010. The branch includes the latestrelease_v4.8.3changes through989f3dbb4a, including the unit-test fixes in #7060, network sync hardening in #6966, and KhaosDatabase changes in #7047.VERSION_4_8_2_4at fork version 39, and setVERSION_4_8_3andChainConstant.BLOCK_VERSIONto 40. Retain the 4.8.3 fork time and 80% witness threshold.Why are these changes required?
Keep
release_v4.8.3ahead ofmasterand inherit the 4.8.2.4 fixes. Fork version 39 belongs to 4.8.2.4, so 4.8.3 needs a distinct version to preserve its independent activation gate.This PR has been tested by:
The CI build matrix, integration smoke test, Checkstyle, and coverage gate passed on
21e6528b50before history consolidation. The consolidated commit has the identical Git tree (f258791a3a6cbd30db486353a378fbd5a04bf1f5); this update only changes commit history.Validated on JDK 17 / macOS ARM64 against that merge tree:
./gradlew clean build -x test -x :framework:generateGitPropertiespassed, including the framework, plugins, and p2p Checkstyle checks../gradlew test -x :framework:generateGitPropertiesran 4,997 tests: 4,979 passed, 16 skipped, and 2 DNS environment failures. The framework module had 4,158 tests with no failures (12 skipped).AccountIdIndexStoreTest(4),TransactionsMsgHandlerTest(25), andRelayServiceTest(11).LookUpTxtTest.testLookUpIp_nonexistentDomain_returnsNullandStartAppArgsTest.trustIpsSkipsWhatItCannotResolve. The local resolver returned198.18.0.225for a.invalidhostname; the same response was confirmed using the macOS resolver. With a temporary JVM-only hosts file, the latter test passed, while the former still received a virtual address through its public-DNS fallback. These tests and the p2p code are unchanged by this PR..github/scripts/check_math_usage.shandgit diff --checkpassed.The Git metadata generation task was excluded because its JGit version cannot resolve this Git worktree. No build configuration, dependency, or test source was changed to work around that environment issue.
Follow up
Check the refreshed CI results on the supported build matrix.
Extra details
3ee8d8fa6e, with parents989f3dbb4a(release_v4.8.3) and4e8389f159(master).