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

Market v2 custom comparator #3302

merged 172 commits into from Jul 27, 2020

Market v2 custom comparator #3302

merged 172 commits into from Jul 27, 2020


Copy link

What does this PR do?
support DEX using the system contract.

Why are these changes required?

This PR has been tested by:

  • Unit Tests
  • Manual Testing

Follow up

Extra details

Sean and others added 30 commits November 25, 2019 17:24
zhangwenhua-tron and others added 21 commits May 10, 2020 21:52
# Conflicts:
#	actuator/src/main/java/org/tron/core/utils/
#	common/src/main/java/org/tron/common/parameter/
#	framework/src/main/java/org/tron/core/
#	framework/src/main/java/org/tron/core/config/args/
#	framework/src/main/java/org/tron/core/services/
#	framework/src/main/java/org/tron/core/services/http/
#	framework/src/main/java/org/tron/core/services/http/solidity/
#	framework/src/main/java/org/tron/core/services/interfaceOnSolidity/
#	framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/solidity/
#	framework/src/main/resources/config-localtest.conf
#	framework/src/test/resources/config-test.conf
#	protocol/src/main/protos/api/api.proto
@sean-liu55 sean-liu55 merged commit 677168d into develop Jul 27, 2020
7 checks passed
@zhangwenhua-tron zhangwenhua-tron deleted the market_v2_custom_comparator branch July 5, 2021 05:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
None yet

Successfully merging this pull request may close these issues.

None yet

2 participants