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(freezeV2): optimize Stake2.0 code #5426

Merged

Conversation

lxcmyf
Copy link
Contributor

@lxcmyf lxcmyf commented Aug 15, 2023

What does this PR do?
optimize Stake2.0 code, close #5424

Why are these changes required?

This PR has been tested by:

  • Unit Tests
  • Manual Testing

Follow up

Extra details

lxcmyf and others added 6 commits April 14, 2023 13:38
…ke2_code

fix(freezeV2): optimize Stake2.0 code
…mize_stake2_code

fix(freezeV2): optimize Stake2.0 code
…_stake2_code

# Conflicts:
#	actuator/src/main/java/org/tron/core/actuator/DelegateResourceActuator.java
#	actuator/src/main/java/org/tron/core/utils/TransactionUtil.java
#	chainbase/src/main/java/org/tron/core/capsule/AccountCapsule.java
#	chainbase/src/main/java/org/tron/core/db/ResourceProcessor.java
#	framework/src/test/java/org/tron/core/actuator/DelegateResourceActuatorTest.java
#	framework/src/test/java/org/tron/core/actuator/utils/TransactionUtilTest.java
#	framework/src/test/java/stest/tron/wallet/newaddinterface2/FreezeBalance2Test.java
@lxcmyf lxcmyf force-pushed the feature/optimize_stake2_code branch 4 times, most recently from 91adb09 to de40fbf Compare August 17, 2023 11:06
@lxcmyf lxcmyf force-pushed the feature/optimize_stake2_code branch from de40fbf to f3e7964 Compare August 17, 2023 11:52
Copy link
Contributor

@yanghang8612 yanghang8612 left a comment

Choose a reason for hiding this comment

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

LGTM

@lxcmyf lxcmyf force-pushed the feature/optimize_stake2_code branch 2 times, most recently from fbbcb6e to 6df755d Compare August 23, 2023 05:39
@lxcmyf lxcmyf force-pushed the feature/optimize_stake2_code branch 3 times, most recently from 4998589 to a1c7338 Compare August 23, 2023 07:14
@lxcmyf lxcmyf force-pushed the feature/optimize_stake2_code branch from a1c7338 to f4ad50c Compare August 23, 2023 08:58
@lxcmyf lxcmyf force-pushed the feature/optimize_stake2_code branch from f4ad50c to 22b1265 Compare August 23, 2023 11:01
@halibobo1205 halibobo1205 merged commit a02fbb0 into tronprotocol:develop Aug 23, 2023
7 checks passed
@halibobo1205 halibobo1205 added this to the GreatVoyage-v4.7.3 milestone Sep 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Optimize Stake 2.0 related code
6 participants