Market v2 custom comparator #3302
Merged
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
…exception directly
…iceStore' into market_v2_custom_comparator
# Conflicts: # actuator/src/main/java/org/tron/core/utils/ProposalUtil.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/services/RpcApiService.java # framework/src/main/java/org/tron/core/services/http/FullNodeHttpApiService.java # framework/src/main/java/org/tron/core/services/http/solidity/SolidityNodeHttpApiService.java # framework/src/main/java/org/tron/core/services/interfaceOnSolidity/RpcApiServiceOnSolidity.java # framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/solidity/HttpApiOnSolidityService.java # framework/src/main/resources/config-localtest.conf # framework/src/test/resources/config-test.conf # protocol/src/main/protos/api/api.proto
zhangwenhua-tron
approved these changes
Jul 27, 2020
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.
What does this PR do?
support DEX using the system contract.
Why are these changes required?
This PR has been tested by:
Follow up
Extra details