feat(freezeV2): merge feature ‘stake 2.0’ into release v4.7.0 #4838
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 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
…ture/new_tvm_unfreeze
…e_2.0 feat(freezeV2): add three interfaces for the new stake model
…e_2.0 feat(freezeV2): add one interface for new stake model
…e_2.0 feat(freezeV2): add query api to get delegate max resource size
fix(freezeV2): sort frozenV2 list
…e_2.0 feat(freezeV2): Add bandwidth cost for delegating validation
…e_2.0 # Conflicts: # actuator/src/main/java/org/tron/core/utils/ProposalUtil.java # chainbase/src/main/java/org/tron/core/capsule/DelegatedResourceCapsule.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/config/args/Args.java
…e_2.0 # 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/config/args/Args.java # framework/src/main/java/org/tron/core/consensus/ProposalService.java
fix(freezeV2): optimize stake2.0 code
…ze_delegate_index feat(freezeV2): optimize delegate index
fix(freezeV2): fix some problems
# Conflicts: # framework/src/main/java/org/tron/core/Wallet.java
zhang0125
approved these changes
Dec 13, 2022
Danyalkasiri
suggested changes
Jan 23, 2024
| FreezeBalanceV2Contract = 54; | ||
| UnfreezeBalanceV2Contract = 55; | ||
| WithdrawExpireUnfreezeContract = 56; | ||
| DelegateResourceContract = 57; |
There was a problem hiding this comment.
Suggested change
| DelegateResourceContract = 57; | |
| DelegateResourceContract = 57; |
| FreezeBalanceV2Contract = 54; | ||
| UnfreezeBalanceV2Contract = 55; | ||
| WithdrawExpireUnfreezeContract = 56; | ||
| DelegateResourceContract = 57; |
There was a problem hiding this comment.
**
Suggested change
| DelegateResourceContract = 57; | |
| DelegateResourceContract = 57; |
**
| MarketSellAssetContract = 52; | ||
| MarketCancelOrderContract = 53; | ||
| FreezeBalanceV2Contract = 54; | ||
| UnfreezeBalanceV2Contract = 55; |
There was a problem hiding this comment.
Suggested change
| UnfreezeBalanceV2Contract = 55; | |
| UnfreezeBalanceV2Contract = 55; |
| @@ -873,6 +880,13 @@ Contract and contract-related messages. | |||
| ClearABIContract = 48; | |||
| UpdateBrokerageContract = 49; | |||
| ShieldedTransferContract = 51; | |||
| MarketSellAssetContract = 52; | |||
| MarketCancelOrderContract = 53; | |||
| FreezeBalanceV2Contract = 54; | |||
There was a problem hiding this comment.
Suggested change
| FreezeBalanceV2Contract = 54; | |
| FreezeBalanceV2Contract = 54; |
| @@ -873,6 +880,13 @@ Contract and contract-related messages. | |||
| ClearABIContract = 48; | |||
| UpdateBrokerageContract = 49; | |||
| ShieldedTransferContract = 51; | |||
| MarketSellAssetContract = 52; | |||
| MarketCancelOrderContract = 53; | |||
| FreezeBalanceV2Contract = 54; | |||
| @@ -671,7 +691,7 @@ public long getTotalEnergyLimitWithFixRatio(AccountCapsule creator, AccountCapsu | |||
| long originEnergyLeft = 0; | |||
| if (consumeUserResourcePercent < VMConstant.ONE_HUNDRED) { | |||
| originEnergyLeft = rootRepository.getAccountLeftEnergyFromFreeze(creator); | |||
| if (VMConfig.allowTvmFreeze()) { | |||
| if (VMConfig.allowTvmFreeze() || VMConfig.allowTvmFreezeV2()) { | |||
There was a problem hiding this comment.
Suggested change
| if (VMConfig.allowTvmFreeze() || VMConfig.allowTvmFreezeV2()) { | |
| if (VMConfig.allowTvmFreeze() || VMConfig.allowTvmFreezeV2()) { |
Comment on lines
+553
to
+568
| if (VMConfig.allowTvmFreezeV2()) { | ||
| long now = rootRepository.getHeadSlot(); | ||
| EnergyProcessor energyProcessor = | ||
| new EnergyProcessor( | ||
| rootRepository.getDynamicPropertiesStore(), | ||
| ChainBaseManager.getInstance().getAccountStore()); | ||
| energyProcessor.updateUsage(account); | ||
| account.setLatestConsumeTimeForEnergy(now); | ||
| receipt.setCallerEnergyUsage(account.getEnergyUsage()); | ||
| receipt.setCallerEnergyWindowSize(account.getWindowSize(Common.ResourceCode.ENERGY)); | ||
| account.setEnergyUsage( | ||
| energyProcessor.increase(account, Common.ResourceCode.ENERGY, | ||
| account.getEnergyUsage(), min(leftFrozenEnergy, energyFromFeeLimit), now, now)); | ||
| receipt.setCallerEnergyMergedUsage(account.getEnergyUsage()); | ||
| rootRepository.updateAccount(account.createDbKey(), account); | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (VMConfig.allowTvmFreezeV2()) { | |
| long now = rootRepository.getHeadSlot(); | |
| EnergyProcessor energyProcessor = | |
| new EnergyProcessor( | |
| rootRepository.getDynamicPropertiesStore(), | |
| ChainBaseManager.getInstance().getAccountStore()); | |
| energyProcessor.updateUsage(account); | |
| account.setLatestConsumeTimeForEnergy(now); | |
| receipt.setCallerEnergyUsage(account.getEnergyUsage()); | |
| receipt.setCallerEnergyWindowSize(account.getWindowSize(Common.ResourceCode.ENERGY)); | |
| account.setEnergyUsage( | |
| energyProcessor.increase(account, Common.ResourceCode.ENERGY, | |
| account.getEnergyUsage(), min(leftFrozenEnergy, energyFromFeeLimit), now, now)); | |
| receipt.setCallerEnergyMergedUsage(account.getEnergyUsage()); | |
| rootRepository.updateAccount(account.createDbKey(), account); | |
| } | |
| if (VMConfig.allowTvmFreezeV2()) { | |
| long now = rootRepository.getHeadSlot(); | |
| EnergyProcessor energyProcessor = | |
| new EnergyProcessor( | |
| rootRepository.getDynamicPropertiesStore(), | |
| ChainBaseManager.getInstance().getAccountStore()); | |
| energyProcessor.updateUsage(account); | |
| account.setLatestConsumeTimeForEnergy(now); | |
| receipt.setCallerEnergyUsage(account.getEnergyUsage()); | |
| receipt.setCallerEnergyWindowSize(account.getWindowSize(Common.ResourceCode.ENERGY)); | |
| account.setEnergyUsage( | |
| energyProcessor.increase(account, Common.ResourceCode.ENERGY, | |
| account.getEnergyUsage(), min(leftFrozenEnergy, energyFromFeeLimit), now, now)); | |
| receipt.setCallerEnergyMergedUsage(account.getEnergyUsage()); | |
| rootRepository.updateAccount(account.createDbKey(), account); | |
| } |
Comment on lines
+714
to
+729
| if (VMConfig.allowTvmFreezeV2()) { | ||
| long now = rootRepository.getHeadSlot(); | ||
| EnergyProcessor energyProcessor = | ||
| new EnergyProcessor( | ||
| rootRepository.getDynamicPropertiesStore(), | ||
| ChainBaseManager.getInstance().getAccountStore()); | ||
| energyProcessor.updateUsage(creator); | ||
| creator.setLatestConsumeTimeForEnergy(now); | ||
| receipt.setOriginEnergyUsage(creator.getEnergyUsage()); | ||
| receipt.setOriginEnergyWindowSize(creator.getWindowSize(Common.ResourceCode.ENERGY)); | ||
| creator.setEnergyUsage( | ||
| energyProcessor.increase(creator, Common.ResourceCode.ENERGY, | ||
| creator.getEnergyUsage(), creatorEnergyLimit, now, now)); | ||
| receipt.setOriginEnergyMergedUsage(creator.getEnergyUsage()); | ||
| rootRepository.updateAccount(creator.createDbKey(), creator); | ||
| } |
| @@ -49,6 +52,8 @@ | |||
| import org.tron.protos.Protocol.TransactionSign; | |||
| import org.tron.protos.contract.SmartContractOuterClass.CreateSmartContract; | |||
| import org.tron.protos.contract.SmartContractOuterClass.TriggerSmartContract; | |||
| import org.tron.protos.Protocol.Transaction.Contract.ContractType; | |||
| import org.tron.protos.contract.BalanceContract.DelegateResourceContract; | |||
There was a problem hiding this comment.
http://Common.ResourceCode.ENERGY
Suggested change
| import org.tron.protos.contract.BalanceContract.DelegateResourceContract; | |
| import org.tron.protos.contract.BalanceContract.DelegateResourceContract; |
| @@ -0,0 +1,298 @@ | |||
| package org.tron.core.vm.nativecontract; | |||
There was a problem hiding this comment.
actuator/src/main/java/org/tron/core/vm/nativecontract/UnfreezeBalanceV2Processor.java
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.
What does this PR do?
Launch a new staking mechanism - stake2.0
Why are these changes required?
TIP:tronprotocol/tips#467
This PR has been tested by:
Follow up
Extra details