Home Original page

feat(freezeV2): optimize delegate resource lock period by lxcmyf · Pull Request #5255 · tronprotocol/java-tron

Conversation

@lxcmyf

What does this PR do?
optimize delegate resource lock period
Why are these changes required?

This PR has been tested by:

  • Unit Tests
  • Manual Testing

Follow up

Extra details

jiangyuanshu and others added 9 commits

March 13, 2023 11:58
feat(branch): master merge into develop
…_develop

merge release_v4.7.2 into develop

@codecov-commenter

halibobo1205

forfreeday

# 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