Add chainId to add/remove liquidity query outputs

balancer · Mar 12, 2024 · ed69b5f · ed69b5f
1 parent 68e783d
commit ed69b5f
Show file tree

Hide file tree

Showing 23 changed files with 67 additions and 91 deletions.
diff --git a/src/entities/addLiquidity/addLiquidityV2/composableStable/addLiquidityComposableStable.ts b/src/entities/addLiquidity/addLiquidityV2/composableStable/addLiquidityComposableStable.ts
@@ -77,8 +77,9 @@ export class AddLiquidityComposableStable implements AddLiquidityBase {
             bptOut,
             amountsIn,
             tokenInIndex: amounts.tokenInIndex,
-            bptIndex,
+            chainId: input.chainId,
             vaultVersion: 2,
+            bptIndex,
         };
     }
 

diff --git a/src/entities/addLiquidity/addLiquidityV2/weighted/addLiquidityWeighted.ts b/src/entities/addLiquidity/addLiquidityV2/weighted/addLiquidityWeighted.ts
@@ -66,6 +66,7 @@ export class AddLiquidityWeighted implements AddLiquidityBase {
             poolId: poolState.id,
             bptOut,
             amountsIn,
+            chainId: input.chainId,
             tokenInIndex: amounts.tokenInIndex,
             vaultVersion: 2,
         };

diff --git a/src/entities/addLiquidity/addLiquidityV3/index.ts b/src/entities/addLiquidity/addLiquidityV3/index.ts
@@ -79,8 +79,9 @@ export class AddLiquidityV3 implements AddLiquidityBase {
             addLiquidityKind: input.kind,
             bptOut,
             amountsIn,
-            vaultVersion: 3,
             tokenInIndex,
+            chainId: input.chainId,
+            vaultVersion: 3,
         };
 
         return output;

diff --git a/src/entities/addLiquidity/types.ts b/src/entities/addLiquidity/types.ts
@@ -46,6 +46,7 @@ export type AddLiquidityBaseQueryOutput = {
     addLiquidityKind: AddLiquidityKind;
     bptOut: TokenAmount;
     amountsIn: TokenAmount[];
+    chainId: number;
     tokenInIndex?: number;
     vaultVersion: 2 | 3;
 };
@@ -56,7 +57,6 @@ export type AddLiquidityQueryOutput =
 
 export type AddLiquidityBaseBuildCallInput = {
     slippage: Slippage;
-    chainId: number;
     wethIsEth?: boolean;
 } & AddLiquidityBaseQueryOutput;
 

diff --git a/src/entities/removeLiquidity/types.ts b/src/entities/removeLiquidity/types.ts
@@ -74,7 +74,6 @@ export type RemoveLiquidityQueryOutput =
 
 export type RemoveLiquidityBaseBuildCallInput = {
     slippage: Slippage;
-    chainId: number;
     wethIsEth?: boolean;
 } & RemoveLiquidityBaseQueryOutput;
 

diff --git a/test/lib/utils/addLiquidityHelper.ts b/test/lib/utils/addLiquidityHelper.ts
@@ -10,7 +10,6 @@ import {
     AddLiquidityUnbalancedInput,
     Address,
     BALANCER_ROUTER,
-    ChainId,
     NATIVE_ASSETS,
     PoolState,
     Slippage,
@@ -58,7 +57,6 @@ async function sdkAddLiquidity({
     let addLiquidityBuildInput: AddLiquidityBuildCallInput = {
         ...addLiquidityQueryOutput,
         slippage,
-        chainId: addLiquidityInput.chainId,
         wethIsEth: !!wethIsEth,
     };
     if (poolState.vaultVersion === 2) {
@@ -162,7 +160,6 @@ export async function doAddLiquidity(txInput: AddLiquidityTxInput) {
 }
 
 export function assertAddLiquidityUnbalanced(
-    chainId: ChainId,
     poolState: PoolState,
     addLiquidityInput: AddLiquidityUnbalancedInput,
     addLiquidityOutput: AddLiquidityOutput,
@@ -175,7 +172,11 @@ export function assertAddLiquidityUnbalanced(
 
     // Get an amount for each pool token defaulting to 0 if not provided as input (this will include BPT token if in tokenList)
     const expectedAmountsIn = poolState.tokens.map((t) => {
-        const token = new Token(chainId, t.address, t.decimals);
+        const token = new Token(
+            addLiquidityInput.chainId,
+            t.address,
+            t.decimals,
+        );
         const input = addLiquidityInput.amountsIn.find(
             (a) => a.address === t.address,
         );
@@ -196,6 +197,7 @@ export function assertAddLiquidityUnbalanced(
         poolType: poolState.type,
         addLiquidityKind: addLiquidityInput.kind,
         vaultVersion: poolState.vaultVersion,
+        chainId: addLiquidityInput.chainId,
     };
 
     const queryCheck = getCheck(addLiquidityQueryOutput, true);
@@ -226,7 +228,6 @@ export function assertAddLiquidityUnbalanced(
 }
 
 export function assertAddLiquiditySingleToken(
-    chainId: ChainId,
     poolState: PoolState,
     addLiquidityInput: AddLiquiditySingleTokenInput,
     addLiquidityOutput: AddLiquidityOutput,
@@ -240,7 +241,11 @@ export function assertAddLiquiditySingleToken(
     if (addLiquidityQueryOutput.tokenInIndex === undefined)
         throw addLiquiditySingleTokenShouldHaveTokenInIndexError;
 
-    const bptToken = new Token(chainId, poolState.address, 18);
+    const bptToken = new Token(
+        addLiquidityInput.chainId,
+        poolState.address,
+        18,
+    );
 
     const tokensWithoutBpt = poolState.tokens.filter(
         (t) => t.address !== poolState.address,
@@ -263,6 +268,7 @@ export function assertAddLiquiditySingleToken(
         poolType: poolState.type,
         addLiquidityKind: addLiquidityInput.kind,
         vaultVersion: poolState.vaultVersion,
+        chainId: addLiquidityInput.chainId,
     };
 
     const queryCheck = getCheck(addLiquidityQueryOutput, false);
@@ -300,7 +306,6 @@ export function assertAddLiquiditySingleToken(
 }
 
 export function assertAddLiquidityProportional(
-    chainId: ChainId,
     poolState: PoolState,
     addLiquidityInput: AddLiquidityProportionalInput,
     addLiquidityOutput: AddLiquidityOutput,
@@ -311,7 +316,11 @@ export function assertAddLiquidityProportional(
     const { txOutput, addLiquidityQueryOutput, addLiquidityBuildCallOutput } =
         addLiquidityOutput;
 
-    const bptToken = new Token(chainId, poolState.address, 18);
+    const bptToken = new Token(
+        addLiquidityInput.chainId,
+        poolState.address,
+        18,
+    );
 
     const expectedQueryOutput: Omit<
         AddLiquidityQueryOutput,
@@ -329,6 +338,7 @@ export function assertAddLiquidityProportional(
         poolType: poolState.type,
         addLiquidityKind: addLiquidityInput.kind,
         vaultVersion: poolState.vaultVersion,
+        chainId: addLiquidityInput.chainId,
     };
 
     const queryCheck = getCheck(addLiquidityQueryOutput, false);
@@ -354,7 +364,9 @@ export function assertAddLiquidityProportional(
     if (wethIsEth) {
         expect(
             addLiquidityOutput.addLiquidityQueryOutput.amountsIn.some((t) =>
-                t.token.isSameAddress(NATIVE_ASSETS[chainId].wrapped),
+                t.token.isSameAddress(
+                    NATIVE_ASSETS[addLiquidityInput.chainId].wrapped,
+                ),
             ),
         ).to.be.true;
     }