Master merge to develop #5843
Merged
Master merge to develop #5843
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
fix(net): solve the problem of concurrent access to fetchBlockInfo object
feat(version): update version to 4.7.5
feat(net): optimize block message processing logic
fix(net): solve the problem of concurrent access to syncBlockToFetch object
…state in which it was opened.
feat(net): remove redundant code
feat(consensus): optimize block production logic
feat(validate): validate account creation transaction size
…imit_big_transaction_size
# Conflicts: # actuator/src/main/java/org/tron/core/utils/ProposalUtil.java # chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java # common/src/main/java/org/tron/common/parameter/CommonParameter.java # framework/src/main/java/org/tron/core/Wallet.java # framework/src/main/java/org/tron/core/consensus/ProposalService.java
…_size feat(validate): limit big transaction size
…emove_redundant_ret # Conflicts: # common/src/main/java/org/tron/core/Constant.java # framework/src/main/java/org/tron/core/db/Manager.java # framework/src/test/java/org/tron/core/db/ManagerTest.java
feat(proposal,tvm): implement TIP-653
feat(*): remove redundant ret for transaction
merge release_v4.7.5 to master
…ersion code:18306
…-44-g8720e06a6 update a new version. version name:GreatVoyage-v4.7.4-44-g8720e06a6,version code:18306
CodeNinjaEvan
approved these changes
May 30, 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.
What does this PR do?
Why are these changes required?
This PR has been tested by:
Follow up
Extra details