Merged
Conversation
merge master to develop
feat(freezeV2): merge feature ‘stake 2.0’ into release v4.7.0
add stake2.0 operation tips to README.md
add some param check
fix some parameter verification problems
feat(DynamicEnergy): add dynamic energy apis for wallet
feat(DynamicEnergy): optimize estimate energy cmd parameters parse
1. update zksnark dependency
feat(zksnark): update zksnark
1. modify api.proto 2. modify smart_contract.proto 3. modify Tron.proto
…et-cli into feature/add_stake2.0 � Conflicts: � src/main/protos/api/api.proto � src/main/protos/core/Tron.proto � src/main/protos/core/contract/smart_contract.proto
feat(stake): add new protobuf
lvs007
approved these changes
Jan 16, 2023
halibobo1205
approved these changes
Jan 16, 2023
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
No description provided.