merge master to develop #6031
Merged
merge master to develop #6031
+1,015
−44
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
Mitigate flaky tests by retrying tests when they fail.
…add_retry test(CI): add test-retry plugin for the unit test
…_version feat(version): update version to 4.7.6
This is an unstable concurrent unit test.
…stable_test test(merkle): ignore testConcurrent to make CI more stable
…oncurrent-access fix(http/metric): change endpoint variable from member to local
…d-opt feat(net) : optimize the sortPeers method
feat(net) : optimize the isIdle method
…k-opt feat(net): optimize fetch inventory message check logic
…both_have2 feat(net): set block_both_have after handling broadcast block
…ated3 feat(net): add some log for isolated2 disconnection
…ated3 feat(net): adjust disconnect strategy in isolated scene
feat(net): add transaction expiration time check before execution
…ated3 feat(net): prefer to disconnect from broadcast nodes
feat(net): add transaction expiration time check before execution
…queue_size feat(log): print transaction size from pending and repush after generating block
Bump com.google.protobuf:protobuf-java from 3.21.12 to 3.25.5 Bump io.github.tronprotocol:libp2p from 2.2.1 to 2.2.4
…bp2p feat(dependencies): update dependencies for protobuf-java
Release v4.7.6 merge to master
…version code:18372
…oyage-v4.7.5-64-g4103dfeb63 update a new version. version name:GreatVoyage-v4.7.5-64-g4103dfeb63,version code:18372
…evelop # Conflicts: # build.gradle # common/build.gradle
lvs007
approved these changes
Oct 8, 2024
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.
No description provided.