merge master to develop #5771
Merged
merge master to develop #5771
+2,545
−1,633
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
1. add ClearABIServletTest 2. add CreateAccountServletTest 3. CreateAssetIssueServletTest
…ter (tronprotocol#5660) * feat(log): catch ContractExeException in createShieldedContractParameters
merge release_4.7.3.1
…oyage-v4.7.3-5-g788136ebe feat(version): update a new version. version name:GreatVoyage-v4.7.3-5-g788136ebe
* feat(db):optimize cache settings (tronprotocol#5659) * feat(lite):optimize DbLite tool (tronprotocol#5658)
…ts (tronprotocol#5654) * feat(db): optimize calculation services for reward when the service starts * feat(log): change log from error to warn for merkle root mismatch
…case feat(LiteFullNode): remove LiteFullNodeTool
…74version feat(version): update version
Co-authored-by: morgan.peng <morgan.p@qq.com>
tronprotocol#5688) * fix(api):fix the bug of determine if get scale factor succeed * fix(api):fix bug of isShieldedTRC20NoteSpent
…sion feat(dependency): update libp2p version to test-v2.2.2
…date feat(dependency): update libp2p version to 2.2.1
…#5703) * fix(pbft): fix the concurrent access issue of srPbftMessage
feat(dependency): update libp2p version to test-v2.2.3
* remove useNewRewardAlgorithmFromStart * code clear * exit when the calculation task gets an exception * tools: add `db root` to calculate the data root * make reward-vi root configurable * fix race-condition for Merkel root calculation * optimize proposal design
…rotocol#5751) * feat(param): modify the default value of maxUnsolidifiedBlocks
feat(net): optimize block processing logic
# Conflicts: # framework/src/main/java/org/tron/program/Version.java # framework/src/test/java/org/tron/core/db/ManagerTest.java
Merge remote-tracking branch 'upstream/master' into release_v4.7.4
merge release v4.7.4 to master
…,version code:18260
…oyage-v4.7.3.1-78-ge84a9e778 update a new version. version name:GreatVoyage-v4.7.3.1-78-ge84a9e778,version code:18260
# Conflicts: # framework/src/main/java/org/tron/program/Version.java # framework/src/test/java/org/tron/core/db/ManagerTest.java
forfreeday
approved these changes
Mar 15, 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.