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.

Sign up for GitHub

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

Jump to bottom

Feat AMM #604

Merged
merged 104 commits into from
Mar 13, 2023
Merged

Feat AMM #604

merged 104 commits into from
Mar 13, 2023

Conversation

peterslany
Copy link
Contributor

Merge AMM branch back into master.

peterslany and others added 30 commits January 13, 2023 14:09
@peterslany
wip: feat(amm): initial methods
d5ba331
@peterslany
wip: feat(amm): start working on router
03cced6
@peterslany
wip: feat(amm): complete recursive search for best trading path, crea…
50cf899 
…te trade class
@peterslany
wip: feat(amm): complete stable pool and middle price computation, ad…
3f00c87 
…d file structure
@peterslany
refactor: cleanup
f3a3751
@peterslany
feat(amm): add AMM to main api
0bf729e
@peterslany
wip: feat(amm): add stable pool
1fb4afd
@peterslany
fix: fix imports
b87c532
@peterslany
wip: feat(amm): stable pools
b6a1b30
@peterslany
wip: feat(amm): stable pool
94086ba
@peterslany
feat(amm): finalize trading pairs for stable pool
1fe7637
@peterslany
feat(amm): define methods to get all pool data
ffbb560
@peterslany
wip: feat(amm): initial methods
c84e31f
@peterslany
wip: feat(amm): start working on router
413fda1
@peterslany
wip: feat(amm): complete recursive search for best trading path, crea…
f48571a 
…te trade class
@peterslany
chore: fix imports
7b8193e
@peterslany
refactor: update according to code review
c638c79
@peterslany
Merge pull request #525 from peterslany/peter/amm-feat-pools-and-swap
e59fe3a 
WIP Peter/amm feat pools and swap
@peterslany
chore: update types
f836570
@peterslany
chore: cleanup
722b093
@peterslany
fix: rename lib LpToken -> LpCurrency
3f6fa63
@peterslany
Merge pull request #537 from peterslany/peter/amm-fix-lptoken-name
eeea777 
fix: rename lib LpToken -> LpCurrency
@peterslany
feat(amm): add swap extrinsic
e1edfa1
@peterslany
fix: wait for tx inclusion only
5621a19
@peterslany
refactor: move currency factories out from parachain modules
15a09f2
@peterslany
wip: refactor currencies
bbfe73b
@peterslany
feat(amm): add lp token currencies and refactor currencyIdToMonetaryC…
9949484 
…urrency
@peterslany
refactor: strenghten types
8d80e7a
@peterslany
Merge pull request #539 from peterslany/peter/amm-feat-swap-extrinsic
30730c9 
feat(amm): add swap extrinsic
@peterslany
Merge branch 'wip-feat-amm' into peter/amm-feat-add-lptoken-currency-…
2e3ffe4 
…support
bvotteler
bvotteler reviewed Mar 8, 2023
View reviewed changes
Copy link
Contributor

@bvotteler bvotteler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good for the most part. Left comments on the points needing clarification.

Expecting quite a few changes around the tests in particular once master is merged back in.

package.json Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
scripts/docker-setup.sh Outdated Show resolved Hide resolved
src/parachain/amm.ts Outdated Show resolved Hide resolved
src/parachain/amm/liquidity-pool/stable.ts Outdated Show resolved Hide resolved
src/utils/loans.ts Outdated Show resolved Hide resolved
test/unit/parachain/loans.test.ts Show resolved Hide resolved
test/unit/utils/rewards.test.ts Outdated Show resolved Hide resolved
gregdhill
gregdhill reviewed Mar 9, 2023
View reviewed changes
Copy link
Member

@gregdhill gregdhill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should be able to remove most of the path finding code once this is merged: interlay/interbtc#944

test/utils/helpers.ts Outdated Show resolved Hide resolved
src/parachain/amm/liquidity-pool/stable.ts Outdated Show resolved Hide resolved
src/parachain/loans.ts Outdated Show resolved Hide resolved
src/parachain/amm.ts Show resolved Hide resolved
src/utils/currency.ts Show resolved Hide resolved
@peterslany peterslany mentioned this pull request Mar 9, 2023
Closed
bvotteler
bvotteler reviewed Mar 9, 2023
View reviewed changes
Copy link
Contributor

@bvotteler bvotteler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just a few smaller things to clarify.

package.json Outdated Show resolved Hide resolved
src/parachain/rewards.ts Show resolved Hide resolved
src/utils/constants.ts Show resolved Hide resolved
src/utils/currency.ts Show resolved Hide resolved
src/utils/rewards.ts Show resolved Hide resolved
gregdhill
gregdhill reviewed Mar 10, 2023
View reviewed changes
test/utils/helpers.ts Outdated Show resolved Hide resolved
daniel-savu and others added 12 commits March 10, 2023 14:40
bvotteler
bvotteler approved these changes Mar 13, 2023
View reviewed changes
Copy link
Contributor

@bvotteler bvotteler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@peterslany peterslany merged commit f7bfaf3 into master Mar 13, 2023
@peterslany peterslany deleted the wip-feat-amm branch March 13, 2023 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bvotteler bvotteler bvotteler approved these changes

@gregdhill gregdhill Awaiting requested review from gregdhill

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@peterslany @gregdhill @bvotteler @daniel-savu