fix: wethIsEth in nested handlers (#1032)

balancer · Aug 30, 2024 · d10b72c · d10b72c
1 parent edd4e5e
commit d10b72c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/lib/modules/pool/actions/add-liquidity/handlers/NestedAddLiquidity.handler.ts b/lib/modules/pool/actions/add-liquidity/handlers/NestedAddLiquidity.handler.ts
@@ -55,6 +55,7 @@ export class NestedAddLiquidityHandler implements AddLiquidityHandler {
     slippagePercent,
     queryOutput,
     relayerApprovalSignature,
+    humanAmountsIn,
   }: NestedBuildAddLiquidityInput): Promise<TransactionConfig> {
     const addLiquidity = new AddLiquidityNested()
 
@@ -63,7 +64,7 @@ export class NestedAddLiquidityHandler implements AddLiquidityHandler {
       slippage: Slippage.fromPercentage(`${Number(slippagePercent)}`),
       accountAddress: account,
       relayerApprovalSignature,
-      wethIsEth: false, // assuming we don't want to use the native asset over the wrapped native asset for now.
+      wethIsEth: this.helpers.isNativeAssetIn(humanAmountsIn),
     })
 
     return {

diff --git a/lib/modules/pool/actions/remove-liquidity/RemoveLiquidityProvider.tsx b/lib/modules/pool/actions/remove-liquidity/RemoveLiquidityProvider.tsx
@@ -57,7 +57,7 @@ export function _useRemoveLiquidity(urlTxHash?: Hash) {
   const chain = pool.chain
   const nativeAsset = getNativeAssetToken(chain)
   const wNativeAsset = getWrappedNativeAssetToken(chain)
-  const includesWrappedNativeAsset: boolean = pool.poolTokens.some(token =>
+  const includesWrappedNativeAsset: boolean = getPoolTokens().some(token =>
     isWrappedNativeAsset(token.address as Address, chain)
   )
 

diff --git a/...dules/pool/actions/remove-liquidity/handlers/NestedProportionalRemoveLiquidity.handler.ts b/...dules/pool/actions/remove-liquidity/handlers/NestedProportionalRemoveLiquidity.handler.ts
@@ -56,6 +56,7 @@ export class NestedProportionalRemoveLiquidityHandler implements RemoveLiquidity
     account,
     slippagePercent,
     queryOutput,
+    wethIsEth,
     relayerApprovalSignature,
   }: NestedProportionalQueryRemoveLiquidityInput): Promise<TransactionConfig> {
     const removeLiquidity = new RemoveLiquidityNested()
@@ -65,7 +66,7 @@ export class NestedProportionalRemoveLiquidityHandler implements RemoveLiquidity
       slippage: Slippage.fromPercentage(`${Number(slippagePercent)}`),
       accountAddress: account,
       relayerApprovalSignature,
-      wethIsEth: false, // assuming we don't want to use the native asset over the wrapped native asset for now.
+      wethIsEth,
     })
 
     return {

diff --git a/...odules/pool/actions/remove-liquidity/handlers/NestedSingleTokenRemoveLiquidity.handler.ts b/...odules/pool/actions/remove-liquidity/handlers/NestedSingleTokenRemoveLiquidity.handler.ts
@@ -69,6 +69,7 @@ export class NestedSingleTokenRemoveLiquidityHandler implements RemoveLiquidityH
     slippagePercent,
     queryOutput,
     relayerApprovalSignature,
+    wethIsEth,
   }: NestedSingleTokenQueryRemoveLiquidityInput): Promise<TransactionConfig> {
     const removeLiquidity = new RemoveLiquidityNested()
 
@@ -77,7 +78,7 @@ export class NestedSingleTokenRemoveLiquidityHandler implements RemoveLiquidityH
       slippage: Slippage.fromPercentage(`${Number(slippagePercent)}`),
       accountAddress: account,
       relayerApprovalSignature,
-      wethIsEth: false, // assuming we don't want to use the native asset over the wrapped native asset for now.
+      wethIsEth,
     })
 
     return {

diff --git a/lib/modules/pool/actions/remove-liquidity/queries/useRemoveLiquidityBuildCallDataQuery.ts b/lib/modules/pool/actions/remove-liquidity/queries/useRemoveLiquidityBuildCallDataQuery.ts
@@ -51,7 +51,7 @@ export function useRemoveLiquidityBuildCallDataQuery({
     poolId: pool.id,
     humanBptIn: debouncedHumanBptIn,
     tokenOut: singleTokenOutAddress, // only required by SingleToken removal
-    wethIsEth, // only required by SingleToken removal
+    wethIsEth,
   }
 
   const queryKey = removeLiquidityKeys.buildCallData(params)