New composite router for boosted pool operations #572

MattPereira · 2025-01-25T00:19:33Z

Closes #555

Summary

Temporarily splitting composite router into boosted and nested versions
- See why here
New composite router allows for passing array of booleans that determine if token should be wrapped / unwrapped

Update 1

For proportional boosted queries, using the new tokensIn and tokensOut that are returned by composite router

Update 2

Major refactor of implementation to infer wrapUnderlying and unwrapWrapped so user only has to worry about which tokens they want to add / remove

src/entities/priceImpact/addLiquidityNested.ts

src/entities/addLiquidityBoosted/index.ts

src/entities/priceImpact/addLiquidityNested.ts

test/v3/addLiquidityBoosted/addLiquidityBoosted.integration.test.ts

johngrantuk

Just a few loose ends to tidy and a changeset to add.

test/v3/addLiquidityBoosted/addLiquidityBoosted.integration.test.ts

brunoguerios

Can you please add an add liquidity proportional test covering a scenario that was not previously supported?
I believe that will expose an issue with existing calculateProportionalAmounts helper not being able to handle these new possibilities for amountsIn combinations.

…posite-liquidity-router

MattPereira · 2025-01-28T05:36:02Z

@brunoguerios new tests for query add with single wrap and remove with single unwrap are ready for review. Also, thanks again for the assist! ❤️

src/entities/inputValidator/boosted/inputValidatorBoosted.ts

src/entities/removeLiquidityBoosted/doRemoveLiquidityProportionalQuery.ts

.changeset/red-buttons-check.md

src/entities/addLiquidityBoosted/index.ts

brunoguerios · 2025-01-28T17:52:19Z

src/entities/addLiquidityBoosted/index.ts

        switch (input.kind) {
            case AddLiquidityKind.Unbalanced: {
+                // Use poolState to add token index to amountsIn
+                const tokensIn = input.amountsIn.map((amountIn) => {


It feels like a lot of this tokensIn logic is repeated within unbalanced and proportional implementations. Do you think it's worth extracting/reusing?

given we're in a bit of a tight schedule, we can leave this refactor to be done in a new (low-priority) PR

yup I agree on both notes 👍

…l tokens

brunoguerios

I like this solution a lot better 😃 👏
Thanks for following up on the requested changes!
There is one detail on the priceImpact side of things that I'd like to double check, but other than that it LGTM! ✅

src/entities/addLiquidityBoosted/index.ts

src/entities/priceImpact/addLiquidityUnbalancedBoosted.ts

brunoguerios · 2025-01-29T12:30:13Z

src/entities/utils/boostedPoolHelpers.ts

+ *   }
+ * }
+ */
+export function buildPoolStateTokenMap(


Nice helper 👏

hook up new composite router for boosted operations

0fa2dcd

MattPereira commented Jan 25, 2025

View reviewed changes

src/entities/priceImpact/addLiquidityNested.ts Outdated Show resolved Hide resolved

fix: type complaint

2ae3ba2

MattPereira requested review from johngrantuk, mkflow27 and brunoguerios January 25, 2025 00:32

MattPereira marked this pull request as ready for review January 25, 2025 00:33

MattPereira changed the title ~~New composite router for boosted operations~~ New composite router for boosted pool operations Jan 25, 2025

patch: fix type error by extending AddLiquidity class

e8e5abc

MattPereira commented Jan 25, 2025

View reviewed changes

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

johngrantuk reviewed Jan 27, 2025

View reviewed changes

src/entities/priceImpact/addLiquidityNested.ts Outdated Show resolved Hide resolved

johngrantuk reviewed Jan 27, 2025

View reviewed changes

test/v3/addLiquidityBoosted/addLiquidityBoosted.integration.test.ts Outdated Show resolved Hide resolved

johngrantuk requested changes Jan 27, 2025

View reviewed changes

brunoguerios reviewed Jan 27, 2025

View reviewed changes

test/v3/addLiquidityBoosted/addLiquidityBoosted.integration.test.ts Outdated Show resolved Hide resolved

MattPereira added 2 commits January 27, 2025 07:41

move block num for all sepolia tests

27ae6de

update AddLiquidityTxInput types

5c9543b

brunoguerios requested changes Jan 27, 2025

View reviewed changes

MattPereira and others added 7 commits January 27, 2025 11:22

refactor tests to use helpers

796a571

Merge branch 'main' of https://github.com/balancer/b-sdk into new-com…

330b175

…posite-liquidity-router

Fix add liquidity boosted tests

fcd259e

add tests for proportional query and unbalanced add with only one wrap

5112024

fix boosted add liquidity input validator

0944a3e

fix types for PriceImpact.addLiquidityNested

9dc084d

add tests for remove with only one unwrap

12d5255

MattPereira requested review from johngrantuk and brunoguerios January 28, 2025 05:33

add changeset

187fac2

johngrantuk reviewed Jan 28, 2025

View reviewed changes

src/entities/inputValidator/boosted/inputValidatorBoosted.ts Show resolved Hide resolved

johngrantuk reviewed Jan 28, 2025

View reviewed changes

src/entities/removeLiquidityBoosted/doRemoveLiquidityProportionalQuery.ts Outdated Show resolved Hide resolved

johngrantuk reviewed Jan 28, 2025

View reviewed changes

.changeset/red-buttons-check.md Outdated Show resolved Hide resolved

johngrantuk approved these changes Jan 28, 2025

View reviewed changes

brunoguerios reviewed Jan 28, 2025

View reviewed changes

src/entities/addLiquidityBoosted/index.ts Show resolved Hide resolved

MattPereira added 2 commits January 28, 2025 08:54

update changeset to major

cdbb902

fix tokens returned by unbalanced query and add test

f3fbdc1

brunoguerios reviewed Jan 28, 2025

View reviewed changes

MattPereira added 6 commits January 28, 2025 15:25

infer wrapUnderlying instead of requiring it as user input

6c6a261

fix partial boosted test

ab1df90

infer unwrapWrapped for remove liquidity boosted

347aded

fix unbalanced add liquidity boosted with fewer than total num of poo…

512547c

…l tokens

refactor for readability

10cbf6c

add comments

c75286d

MattPereira requested review from brunoguerios and johngrantuk January 29, 2025 06:00

brunoguerios approved these changes Jan 29, 2025

View reviewed changes

brunoguerios added 2 commits January 29, 2025 11:56

Refactor types as Address

ab82723

Add extra input validation

15626ee

brunoguerios merged commit 9c43fcb into main Jan 29, 2025
4 checks passed

brunoguerios deleted the new-composite-liquidity-router branch January 29, 2025 15:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New composite router for boosted pool operations #572

New composite router for boosted pool operations #572

MattPereira commented Jan 25, 2025 •

edited

Loading

johngrantuk left a comment

brunoguerios left a comment

MattPereira commented Jan 28, 2025 •

edited

Loading

brunoguerios Jan 28, 2025

brunoguerios Jan 28, 2025

MattPereira Jan 28, 2025

brunoguerios left a comment

brunoguerios Jan 29, 2025

New composite router for boosted pool operations #572

New composite router for boosted pool operations #572

Conversation

MattPereira commented Jan 25, 2025 • edited Loading

Summary

Update 1

Update 2

johngrantuk left a comment

Choose a reason for hiding this comment

brunoguerios left a comment

Choose a reason for hiding this comment

MattPereira commented Jan 28, 2025 • edited Loading

brunoguerios Jan 28, 2025

Choose a reason for hiding this comment

brunoguerios Jan 28, 2025

Choose a reason for hiding this comment

MattPereira Jan 28, 2025

Choose a reason for hiding this comment

brunoguerios left a comment

Choose a reason for hiding this comment

brunoguerios Jan 29, 2025

Choose a reason for hiding this comment

MattPereira commented Jan 25, 2025 •

edited

Loading

MattPereira commented Jan 28, 2025 •

edited

Loading