feat(freezeV2): optimize delegate resource lock period#5255
Merged
halibobo1205 merged 12 commits intotronprotocol:release_v4.7.2from Jun 2, 2023
Merged
feat(freezeV2): optimize delegate resource lock period#5255halibobo1205 merged 12 commits intotronprotocol:release_v4.7.2from
halibobo1205 merged 12 commits intotronprotocol:release_v4.7.2from
Conversation
feat(branch): master merge into develop
…_develop merge release_v4.7.2 into develop
d79822b to
1ea67dd
Compare
Codecov Report
❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more. @@ Coverage Diff @@
## release_v4.7.2 #5255 +/- ##
====================================================
- Coverage 60.64% 60.64% -0.01%
- Complexity 9073 9086 +13
====================================================
Files 837 837
Lines 49697 49755 +58
Branches 5531 5541 +10
====================================================
+ Hits 30141 30172 +31
- Misses 17188 17205 +17
- Partials 2368 2378 +10
... and 7 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
b30fd81 to
83a3b9b
Compare
halibobo1205
approved these changes
Jun 2, 2023
forfreeday
approved these changes
Jun 2, 2023
# 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
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
5 participants
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?
optimize delegate resource lock period
Why are these changes required?
This PR has been tested by:
Follow up
Extra details