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

Add Add/Remove Liquidity #91

Merged

brunoguerios merged 244 commits into main from join

Nov 14, 2023

Member

brunoguerios commented Aug 29, 2023 •

edited

Loading

Add add/remove liquidity support (non-nested pools)
Uses balancerHelpers to query amounts in/out rather than relying on specific pool math and associated data
Tests against local Anvil (also CI update)
- Weighted Pool
- CS Pool
- Gyro Pool
API Provider added
Example added for add/remove liquidity

johngrantuk and others added 2 commits

August 3, 2023 12:13


          WIP Join implementation.

91b735b


          Initial suggestion for join implementation structure (WIP)

f297e2b

brunoguerios requested a review from johngrantuk

August 29, 2023 19:39

brunoguerios self-assigned this

johngrantuk reviewed

View reviewed changes

src/entities/join.ts Outdated Show resolved Hide resolved

johngrantuk reviewed

View reviewed changes

src/entities/join.ts Outdated Show resolved Hide resolved

johngrantuk reviewed

View reviewed changes

src/entities/pools/index.ts Outdated Show resolved Hide resolved

johngrantuk reviewed

View reviewed changes

src/entities/pools/index.ts Outdated Show resolved Hide resolved

johngrantuk reviewed

View reviewed changes

src/entities/pools/weighted/weightedJoin.ts Outdated Show resolved Hide resolved

johngrantuk reviewed

View reviewed changes

src/entities/pools/index.ts Outdated Show resolved Hide resolved

brunoguerios added 15 commits

August 30, 2023 11:26


          Minor refactor to apply code review suggestions

7e4bd2e


          Add encoders and query

6be1c05


          Refactor the code to use pool address instead of pool id

71315d2


          Fix lint errors

e264a8b


          Refactor WeightedPoolEncoder to WeightedEncoder

2c423b6


          Add decimals to tokens on PoolState

fc845e7


          Update integration test with TestClient from viem

cce91bf


          Update viem to v1.9.3

eb34419


          Add integration test (wip)

41a7d6f


          Add helpers to test

8747aa2


          Refactor test to improve readability


          Add Slippage helper class

feda776


          Expose slippage entity

dfb113f


          Add hardhat to dev dependencies so we're able to run local fork for t…

443ec16

…esting


          Add comments to test file

29fa180

danielmkm reviewed

View reviewed changes

src/entities/pools/weighted/weightedJoin.ts Outdated Show resolved Hide resolved

danielmkm reviewed

View reviewed changes

src/entities/pools/weighted/weightedJoin.ts Outdated Show resolved Hide resolved

danielmkm reviewed

View reviewed changes

src/entities/pools/weighted/weightedJoin.ts Outdated Show resolved Hide resolved

danielmkm reviewed

View reviewed changes

src/entities/pools/weighted/weightedJoin.ts Outdated Show resolved Hide resolved


          Fix encoders issues

92438bf

brunoguerios and others added 24 commits

November 10, 2023 14:34


          Refactor join into addLiquidity within tests

50c6934


          Refactor remaining comments throughout the code

e70254f


          Refactor encoders to expose addLiquidity functions instead of join

6a4dd95


          Refactor join into addLiquidity within examples and readme

cd50289


          Merge remote-tracking branch 'origin/join' into refactor-join-interface

738c08d

# Conflicts:
#	src/entities/join/types.ts
#	test/lib/utils/exitHelper.ts
#	test/lib/utils/joinHelper.ts


          Refactor ExitKind into RemoveLiquidityKind

fbb33b1


          Refactor ExitInput into RemoveLiquidityInput

c47de57


          Refactor ExitQueryResult into RemoveLiquidityQueryOutput

933ebaf


          Refactor ExitCall into RemoveLiquidityCall

2cf4d39


          Refactor PoolExit into RemoveLiquidity


          Refactor ExitBuildOutput into RemoveLiquidityOutput

b63f1b8


          Refactor encoders and other files from exit to removeLiquidity

30ea9e3


          Refactor remaining exit to removeLiquidity

26025a8


          Refactor SingleAsset to SingleToken

54b917c


          Refactor exitWithNativeAsset parameter to toNativeAsset

c82f935


          Refactor some result into output for consistency

65651a2


          Rename liquidity test files

2dfca4c


          Fix doRemoveLiquidityQuery

4e529d4


          Merge commit '4ef701db221df2062415a44fda2d8c4aeb30e0e4' into gyro-join

ec2f98a


          Renaming wrong gyro types;

1f29e68


          Merge pull request #121 from balancer/gyro-join

fab87ca


          Merge remote-tracking branch 'origin/join' into refactor-join-interface

acfd6d0

# Conflicts:
#	src/entities/addLiquidity/utils/validateInputs.ts
#	src/entities/exit/poolExit.ts
#	src/entities/join/poolJoin.ts
#	src/entities/removeLiquidity/utils/validateInputs.ts


          Refactor join into addLiquidity and exit into removeLiquidity for Gyr…

b366164

…o pools


          Merge pull request #124 from balancer/refactor-join-interface

31d244a

Refactor Join/Exit Interface to Add/Remove Liquidity

brunoguerios changed the title ~~Add Join/Exit Pool~~ Add Add/Remove Liquidity


          Merge remote-tracking branch 'origin/main' into join

bbdc8c8

# Conflicts:
#	test/gyro2Math.test.ts
#	test/gyro3Pool.test.ts
#	test/gyroEMath.test.ts
#	test/gyroEPool.test.ts
#	test/sor.test.ts
#	tsconfig.json
#	vitest.config.ts

brunoguerios merged commit 2823949 into main

3 of 4 checks passed

brunoguerios deleted the join branch

November 14, 2023 18:03

brunoguerios restored the join branch

November 14, 2023 18:11

brunoguerios deleted the join branch

November 14, 2023 18:21

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet