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 usage merging #4715

Merged

Conversation

lxcmyf
Copy link
Contributor

@lxcmyf lxcmyf commented Oct 18, 2022

What does this PR do?
Optimization for usage merging of delegated resources.
Why are these changes required?

This PR has been tested by:

  • Unit Tests
  • Manual Testing

Follow up

Extra details

zhang0125 and others added 26 commits September 15, 2022 18:20
1. stop generate engine.properties if it is not a db path
…estArchive

fix(db): fix leveldb manifest rewrite
  1. print log detail when corruption error happens
…rt-compatible-with-cpv2

fix(db): DBConvert tool compatible with CheckpointV2
net: optimize the k-bucket data structure
1. add write lock for resetDb
2. add read lock for getStats
3. disable db metric for checkpointV2 db
…ward_algo

feat(reward): add a proposal for new reward algorithm
fix: make delete operation atomic when cleaning tmp db
…jsonrpc

feat: return err code 32602 when param is not valid
…roposal

feat(reward): add config for new reward algorithm proposal
…ong-deletion

fix(db): reserve putting byte[0] in db recovery
…_unfreeze

# 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
#	common/src/main/java/org/tron/core/config/Parameter.java
#	framework/src/main/java/org/tron/core/Wallet.java
#	framework/src/main/java/org/tron/core/consensus/ProposalService.java
@halibobo1205 halibobo1205 merged commit 5145616 into tronprotocol:feature/new_unfreeze Oct 18, 2022
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.

8 participants