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

Implement Hybrid Router #1307

Merged
merged 33 commits into from
Apr 12, 2024
Merged

Implement Hybrid Router #1307

merged 33 commits into from
Apr 12, 2024

Conversation

Chralt98
Copy link
Member

@Chralt98 Chralt98 commented Apr 8, 2024

What does it do?

It implements a router that manages the neo-swaps AMM and the order book for executing buy and sell trades.

What important points should reviewers know?

The following PRs were incorporated into this PR:

#1274
#1275
#1276
#1277
#1278
#1279
#1288
#1293
#1294

Is there something left for follow-up PRs?

What alternative implementations were considered?

Are there relevant PRs or issues?

References

Chralt98 and others added 10 commits March 5, 2024 13:04
* switch to AmmCdaHybrid enum field

* Update zrml/parimutuel/src/tests/buy.rs

Co-authored-by: Malte Kliemann <mail@maltekliemann.com>

* Update zrml/parimutuel/src/tests/claim.rs

Co-authored-by: Malte Kliemann <mail@maltekliemann.com>

* Update zrml/parimutuel/src/tests/refund.rs

Co-authored-by: Malte Kliemann <mail@maltekliemann.com>

* Update storage version to 11 and add MigrateScoringRuleAmmCdaHybrid

* Update primitives/src/market.rs

* update migration

---------

Co-authored-by: Malte Kliemann <mail@maltekliemann.com>
* glue everything together

* add hybrid router to configuration

* fix tests

* fix conditional tests
…1293)

* add event info

* use slice as function parameter

* update test amm amount out of event

* fix order book tests

* update documentation

* removed dependency
…ok errors (#1294)

* add event info

* use slice as function parameter

* update test amm amount out of event

* wip

* handle soft and hard failure

* add order book soft failure

* fix clippy

* fix CI

* remove swaps pallet dependency
@Chralt98 Chralt98 added the s:in-progress The pull requests is currently being worked on label Apr 8, 2024
@Chralt98 Chralt98 self-assigned this Apr 8, 2024
Copy link
Contributor

mergify bot commented Apr 8, 2024

This pull request is now in conflicts. Could you fix it @Chralt98? 🙏

@mergify mergify bot added s:revision-needed The pull requests must be revised and removed s:in-progress The pull requests is currently being worked on labels Apr 8, 2024
@mergify mergify bot added s:in-progress The pull requests is currently being worked on and removed s:revision-needed The pull requests must be revised labels Apr 8, 2024
@sea212 sea212 added this to the v0.5.2 milestone Apr 9, 2024
Chralt98 and others added 2 commits April 9, 2024 16:10
* wip

* use asset conversions

* adapt hybrid router to new asset system

* apply review suggestions

* fmt
@Chralt98 Chralt98 added s:review-needed The pull request requires reviews and removed s:in-progress The pull requests is currently being worked on s:review-needed The pull request requires reviews labels Apr 9, 2024
@Chralt98 Chralt98 added s:review-needed The pull request requires reviews and removed s:in-progress The pull requests is currently being worked on labels Apr 11, 2024
@Chralt98 Chralt98 added s:in-progress The pull requests is currently being worked on and removed s:review-needed The pull request requires reviews labels Apr 12, 2024
@Chralt98 Chralt98 added s:review-needed The pull request requires reviews and removed s:in-progress The pull requests is currently being worked on labels Apr 12, 2024
@Chralt98 Chralt98 requested a review from sea212 April 12, 2024 08:23
@maltekliemann maltekliemann added s:accepted This pull request is ready for merge and removed s:review-needed The pull request requires reviews labels Apr 12, 2024
@mergify mergify bot merged commit dc7e7f9 into main Apr 12, 2024
25 checks passed
@mergify mergify bot deleted the chralt98-amm-cda-release branch April 12, 2024 10:20
@sea212 sea212 added i:spec-changed ⚠️ Implies change in spec version i:transactions-changed ⚠️ Implies change in transaction version labels Apr 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
i:spec-changed ⚠️ Implies change in spec version i:transactions-changed ⚠️ Implies change in transaction version s:accepted This pull request is ready for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants