Sml #787
Open
Sml #787
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
…hielded_trc20 add APIs for shielded TRC20 transaction
…RC20_contract # Conflicts: # src/main/java/org/tron/walletcli/Client.java # src/main/java/org/tron/walletcli/WalletApiWrapper.java # src/main/java/org/tron/walletserver/GrpcClient.java # src/main/java/org/tron/walletserver/WalletApi.java # src/main/protos/api/api.proto
…shielded_TRC20_contract subtree pull from protocol's develop branch
…d_TRC20_contract Feature/shielded trc20 contract
…d_TRC20_contract add a demo for scanning notes
…ate_jline_version feat: update jline version
update the readme style
…_change_fee_limit decrease fee_limit when triggering the shielded contract
…lded_4.0 Release vm shielded 4.0
Merge master into develop branch
feat(merge): merge release_v4.7.4 into master
feat(merge): master into develop
…efactor feat(dependency): update dependencies
feat(dependency): update dependency for security
feat(merge): merge release_v4.7.5 into master
Master merge to develop
Refactor StringUtils.isContains
…dle6 * update gradle to 6.4 and protobufVersion,grpcVersion * reorg gradle * update gradle config * revert some changes ---------
Refactor StringUtils.isContains
…tobufVersion feat(dependency): update protobufVersion to 3.25.5
feat(merge): merge release_v4.7.6 into master
feat(merge): merge master into develop
feat(doc): update README.md
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.
Mareklazar:develop