Refactor types as Address

balancer · Jan 29, 2025 · ab82723 · ab82723
1 parent c75286d
commit ab82723
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 39 deletions.
diff --git a/src/entities/addLiquidityBoosted/index.ts b/src/entities/addLiquidityBoosted/index.ts
@@ -153,7 +153,7 @@ export class AddLiquidityBoostedV3 {
                     );
 
                 amountsIn = tokensIn.map((t, i) => {
-                    const tokenInAddress = t.toLowerCase() as `0x${string}`;
+                    const tokenInAddress = t.toLowerCase() as Address;
                     const { decimals } = poolStateTokenMap[tokenInAddress];
                     const token = new Token(
                         input.chainId,

diff --git a/src/entities/inputValidator/boosted/inputValidatorBoosted.ts b/src/entities/inputValidator/boosted/inputValidatorBoosted.ts
@@ -1,3 +1,4 @@
+import { Address } from 'viem';
 import { PoolStateWithUnderlyings } from '@/entities/types';
 import { InputValidatorBase } from '../inputValidatorBase';
 import { AddLiquidityKind } from '@/entities/addLiquidity/types';
@@ -23,11 +24,7 @@ export class InputValidatorBoosted extends InputValidatorBase {
                 .filter(Boolean);
 
             addLiquidityInput.amountsIn.forEach((a) => {
-                if (
-                    !poolTokens.includes(
-                        a.address.toLowerCase() as `0x${string}`,
-                    )
-                ) {
+                if (!poolTokens.includes(a.address.toLowerCase() as Address)) {
                     throw new Error(
                         `Address ${a.address} is not contained in the pool's parent or child tokens.`,
                     );

diff --git a/test/v3/addLiquidityBoosted/addLiquidityBoosted.integration.test.ts b/test/v3/addLiquidityBoosted/addLiquidityBoosted.integration.test.ts
@@ -107,7 +107,7 @@ describe('Boosted AddLiquidity', () => {
         await setTokenBalances(
             client,
             testAddress,
-            [USDT.address, USDC.address] as Address[],
+            [USDT.address, USDC.address],
             [USDT.slot, USDC.slot] as number[],
             [
                 parseUnits('1000', USDT.decimals),
@@ -135,7 +135,7 @@ describe('Boosted AddLiquidity', () => {
         await approveSpenderOnTokens(
             client,
             testAddress,
-            [USDT.address, USDC.address, stataUSDT.address] as Address[],
+            [USDT.address, USDC.address, stataUSDT.address],
             PERMIT2[chainId],
         );
 
@@ -508,8 +508,8 @@ describe('Boosted AddLiquidity', () => {
                     await sendTransactionGetBalances(
                         [
                             addLiquidityQueryOutput.bptOut.token.address,
-                            USDC.address as `0x${string}`,
-                            USDT.address as `0x${string}`,
+                            USDC.address,
+                            USDT.address,
                         ],
                         client,
                         testAddress,
@@ -570,7 +570,7 @@ describe('Boosted AddLiquidity', () => {
                     });
 
                 const addLiquidityBuildCallOutput =
-                    await addLiquidityBoosted.buildCallWithPermit2(
+                    addLiquidityBoosted.buildCallWithPermit2(
                         addLiquidityBuildInput,
                         permit2,
                     );
@@ -579,8 +579,8 @@ describe('Boosted AddLiquidity', () => {
                     await sendTransactionGetBalances(
                         [
                             addLiquidityQueryOutput.bptOut.token.address,
-                            USDC.address as `0x${string}`,
-                            USDT.address as `0x${string}`,
+                            USDC.address,
+                            USDT.address,
                         ],
                         client,
                         testAddress,
@@ -618,16 +618,8 @@ describe('Boosted AddLiquidity', () => {
                 // make sure to pass Tokens in correct order. Same as poolTokens but as underlyings instead
                 assertTokenMatch(
                     [
-                        new Token(
-                            111555111,
-                            USDC.address as Address,
-                            USDC.decimals,
-                        ),
-                        new Token(
-                            111555111,
-                            USDT.address as Address,
-                            USDT.decimals,
-                        ),
+                        new Token(111555111, USDC.address, USDC.decimals),
+                        new Token(111555111, USDT.address, USDT.decimals),
                     ],
                     addLiquidityBuildCallOutput.maxAmountsIn.map(
                         (a) => a.token,

diff --git a/test/v3/addLiquidityBuffer/addLiquidityBuffer.integration.test.ts b/test/v3/addLiquidityBuffer/addLiquidityBuffer.integration.test.ts
@@ -140,10 +140,7 @@ describe('Buffer AddLiquidity', () => {
 
             const { transactionReceipt, balanceDeltas } =
                 await sendTransactionGetBalances(
-                    [
-                        stataUSDC.address as `0x${string}`,
-                        USDC.address as `0x${string}`,
-                    ],
+                    [stataUSDC.address, USDC.address],
                     client,
                     testAddress,
                     addLiquidityBufferBuildCallOutput.to,

diff --git a/test/v3/removeLiquidityBoosted/removeLiquidityBoosted.integration.test.ts b/test/v3/removeLiquidityBoosted/removeLiquidityBoosted.integration.test.ts
@@ -199,11 +199,7 @@ describe('remove liquidity boosted proportional', () => {
 
             const { transactionReceipt, balanceDeltas } =
                 await sendTransactionGetBalances(
-                    [
-                        boostedPool_USDC_USDT.address,
-                        USDC.address as `0x${string}`,
-                        USDT.address as `0x${string}`,
-                    ],
+                    [boostedPool_USDC_USDT.address, USDC.address, USDT.address],
                     client,
                     testAddress,
                     removeLiquidityBuildCallOutput.to,
@@ -293,8 +289,8 @@ describe('remove liquidity boosted proportional', () => {
                 await sendTransactionGetBalances(
                     [
                         boostedPool_USDC_USDT.address,
-                        USDC.address as `0x${string}`,
-                        stataUSDT.address as `0x${string}`,
+                        USDC.address,
+                        stataUSDT.address,
                     ],
                     client,
                     testAddress,
@@ -397,11 +393,7 @@ describe('remove liquidity boosted proportional', () => {
 
             const { transactionReceipt, balanceDeltas } =
                 await sendTransactionGetBalances(
-                    [
-                        boostedPool_USDC_USDT.address,
-                        USDC.address as `0x${string}`,
-                        USDT.address as `0x${string}`,
-                    ],
+                    [boostedPool_USDC_USDT.address, USDC.address, USDT.address],
                     client,
                     testAddress,
                     removeLiquidityBuildCallOutput.to,