Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(TVM): support for new freeze #4727

Merged

Conversation

yanghang8612
Copy link
Contributor

No description provided.

zhang0125 and others added 30 commits August 29, 2022 15:21
    1. add UNFREEZE_DELAY_DAYS proposal
    2. add new freeze/unfreeze actuator

    Closes #
1. add delegate resource contract
2. add undelegate resource contract
3. add test cases for delegate and undelegate resource
yanghang8612 and others added 27 commits October 20, 2022 19:18
# Conflicts:
#	actuator/src/main/java/org/tron/core/actuator/UnfreezeBalanceV2Actuator.java
#	actuator/src/main/java/org/tron/core/utils/ProposalUtil.java
#	chainbase/src/main/java/org/tron/core/capsule/AccountCapsule.java
#	chainbase/src/main/java/org/tron/core/db/ResourceProcessor.java
#	chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java
#	framework/src/main/java/org/tron/core/consensus/ProposalService.java
Copy link
Collaborator

@CodeNinjaEvan CodeNinjaEvan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@yanghang8612 yanghang8612 merged commit 2d2b5b0 into tronprotocol:release_v4.6.0 Oct 20, 2022
@Mohsenkoomatso
Copy link

Rtfd15398

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants