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

[WIP] Add b-sdk for trade queries #333

Merged

franzns merged 91 commits into v3-canary from sor-v2

Dec 8, 2023

Contributor

johngrantuk commented May 8, 2023 •

edited

Loading

Initial work to complete Phase1 in this Notion

Add new endpoints to query swap result (best of SORV1 vs V2):
- sorGetSwaps - Beets (return formatted for existing Beets service)
- sorGetCowSwaps - Balancer (return formatted for existing Balancer/CowSwap API)
Add @balancer/sdk dependency for sorV2. (Needs updates for Fantom see below)
Add Gyro pool fields required for swap maths (Note: Gyro pools must be deleted/refreshed to get new values from SG)

TODO:

Gyro mainnet versioning is broken on SG which breaks SOR maths. A PR with fix is here
Gyro3 type needs updated once this PR is merged (fix: Add missing gyro3 to SupportedRawPoolTypes. balancer/b-sdk#92), see TODO: modules/sor/sorV2/sorV2.service.ts
Fantom:
- b-sdk MulticallV3 update (to fix pool fetch issues) needs merged: drop in replacement for pool data via multicall balancer/b-sdk#90
- b-sdk PR to add chain needs merged: chore: Add Fantom config balancer/b-sdk#69

johngrantuk added 4 commits

May 3, 2023 13:58


          Basic addition of b-sdk.

d90b321


          Uses pools from Prisma db.

8f62a6c


          Add TradeResults Prisma for recording results.

298eba2


          Update SOR service to have placeholders for compare, etc.

56b4a8d

johngrantuk commented

View reviewed changes

modules/sor/sorV1/sorV1.service.ts Outdated Show resolved Hide resolved

johngrantuk commented

View reviewed changes

modules/sor/sorV2/sorV2.service.ts Outdated Show resolved Hide resolved

johngrantuk commented

View reviewed changes

modules/sor/sorV2/sorV2.service.ts Outdated Show resolved Hide resolved

johngrantuk commented

View reviewed changes

modules/sor/sorV2/sorV2.service.ts Outdated Show resolved Hide resolved

johngrantuk commented

View reviewed changes

modules/sor/sor.service.ts Outdated Show resolved Hide resolved

johngrantuk requested review from franzns and danielmkm

May 8, 2023 14:58


          Add placeholder for SORV1 service call to make more obvious.

1de2adc

franzns reviewed

View reviewed changes

modules/sor/sorV2/sorV2.service.ts Outdated Show resolved Hide resolved

franzns reviewed

View reviewed changes

modules/sor/sorV2/sorV2.service.ts Outdated Show resolved Hide resolved

franzns reviewed

View reviewed changes

modules/sor/sorV2/sorV2.service.ts Outdated Show resolved Hide resolved

franzns reviewed

View reviewed changes

modules/sor/sorV2/sorV2.service.ts Outdated Show resolved Hide resolved

johngrantuk added 3 commits

May 9, 2023 10:22


          Move SOR_QUERIES in to temp file as only used there and can potential…

…ly remove.


          Update Phantom/Composable pool comments.

3884a90


          Add pool ids to ignore in to network config.

4e539c0

danielmkm reviewed

View reviewed changes

modules/sor/sor.prisma Outdated Show resolved Hide resolved

modules/sor/sorV1/sorV1.service.ts Outdated Show resolved Hide resolved

modules/sor/sor.gql Outdated Show resolved Hide resolved

johngrantuk added 10 commits

May 10, 2023 13:36


          WIP SORv1 API query.

8b2ae68


          Use cache for pools.

92d269c


          Query API (Currently Balancers) for SORV1.

1f9bcff


          Add basic compare, WIP.

1725a25


          Remove Prisma trade result in favour of cloudwatch implementation.

5c3b6aa


          Find best and log result via cloudwatch.

243d855


          Change response to be in API format. Use generated types.

5cc1667


          Remove temp.

be6bcfa


          Implement mapResultToCowSwap.

a01a9fb


          Compare correctly for ExactOut.

554a26e

franzns reviewed

View reviewed changes

modules/beethoven/balancer-sor.service.ts Show resolved Hide resolved

franzns and others added 17 commits

September 18, 2023 15:45


          Merge branch 'v3-canary' into sor-v2

a22b7dc


          Merge branch 'v3-canary' into sor-v2

9aef5d0


          formatting and output

c7d44b7


          adding cloudwatch metrics

ca4865d


          logging

0aca520


          chore: Bump b-sdk.

caca5e3


          chore: Add Gyro3 to mapRawPoolType.

026bf85


          fix: Handle amount scaling correctly across various services by using…

33e39d5

… TokenAmounts.


          chore: Remove debug statements.

d5f7af5


          fix: For Balancer resolver use raw scale for swapAmount.

54d90d2


          Merge branch 'v3-canary' into sor-v2

b7e3bff


          chain aware SOR queries

d99f22f


          gyro pool data updates

23aad1b


          excluding unsupported pools

056c178


          sor metrics

14f2393


          sor bench logging

920600c


          last review and styling

d12e892

Contributor

gmbronco commented Nov 21, 2023

Both queries, sorGetSwaps and sorGetCowSwaps, will retrieve the optimal path from either V1 or V2.

Would you have any particular test cases in mind for testing these queries?

gmbronco added 4 commits

November 21, 2023 21:18


          updating b-sdk

f256592


          Merge branch 'v3-canary' into sor-v2

f7ac2dd


          prettier


          V2 options

c62793e

gmbronco force-pushed the sor-v2 branch from a4e1d69 to c62793e Compare

December 7, 2023 15:08

gmbronco added 4 commits

December 7, 2023 16:29


          Merge branch 'v3-canary' into sor-v2

22abdd7


          node18 in github action

61cec2b


          sor args cleaup

b50d476


          less profiling

0aa8c08

franzns merged commit be0630c into v3-canary

1 check passed

franzns deleted the sor-v2 branch

December 8, 2023 11:35

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

Labels

None yet