@paraswap/dex-lib 3.0.4 → 3.0.6-balancer-direct-fn-fix.0

package/src/config.ts

@@ -46,7 +46,7 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     nativeTokenSymbol: 'ETH',
     wrappedNativeTokenAddress: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
     hasEIP1559: true,
-    augustusAddress: '0xE4e284Eb7a312d95A7949fCA8C634164358f4492',
+    augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
     augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0xe92b586627ccA7a83dC919cc7127196d70f55a06',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',

package/src/dex/balancer-v2/balancer-v2.ts

@@ -1006,8 +1006,6 @@ export class BalancerV2
     const params = this.getBalancerParam(
       srcToken,
       destToken,
-      srcAmount,
-      destAmount,
       data,
       side,
       this.dexHelper.config.data.augustusAddress!,
@@ -1072,8 +1070,6 @@ export class BalancerV2
   public getBalancerParam(
     srcToken: string,
     destToken: string,
-    srcAmount: string,
-    destAmount: string,
     data: OptimizedBalancerV2Data,
     side: SwapSide,
     recipient: string,
@@ -1110,17 +1106,30 @@ export class BalancerV2
         path = path.reverse();
       }
 
-      const _swaps = path.map((hop, index) => ({
-        poolId: hop.pool.id,
-        assetInIndex: swapOffset + index,
-        assetOutIndex: swapOffset + index + 1,
-        amount:
+      const _swaps = path.map((hop, index) => {
+        const assetInIndex = swapOffset + index;
+        const assetOutIndex = swapOffset + index + 1;
+
+        const amount =
           (side === SwapSide.SELL && index === 0) ||
           (side === SwapSide.BUY && index === path.length - 1)
             ? swapData.amount
-            : '0',
-        userData: '0x',
-      }));
+            : '0';
+
+        if (assetInIndex < 0 || assetOutIndex < 0) {
+          const error = new Error(`Invalid indices in balancer`);
+          this.logger.error(error.message, error);
+          throw error;
+        }
+
+        return {
+          poolId: hop.pool.id,
+          assetInIndex,
+          assetOutIndex,
+          amount,
+          userData: '0x',
+        };
+      });
 
       swapOffset += path.length + 1;
 
@@ -1245,8 +1254,6 @@ export class BalancerV2
     const [, swaps, assets, funds, limits, _deadline] = this.getBalancerParam(
       srcToken,
       destToken,
-      srcAmount,
-      destAmount,
       data,
       side,
       this.dexHelper.config.data.augustusAddress!,
@@ -1316,8 +1323,6 @@ export class BalancerV2
     const balancerParams = this.getBalancerParam(
       srcToken,
       destToken,
-      fromAmount,
-      toAmount,
       data,
       side,
       this.dexHelper.config.data.augustusV6Address!,
@@ -1325,6 +1330,8 @@ export class BalancerV2
     );
 
     const swapParams: BalancerV2DirectParamV6 = [
+      fromAmount,
+      toAmount,
       quotedAmount,
       metadata,
       this.encodeBeneficiaryAndApproveFlag(beneficiary, !data.isApproved),
@@ -1388,8 +1395,6 @@ export class BalancerV2
     const params = this.getBalancerParam(
       srcToken,
       destToken,
-      srcAmount,
-      destAmount,
       data,
       side,
       this.dexHelper.config.data.augustusAddress!,
@@ -1424,8 +1429,6 @@ export class BalancerV2
     const params = this.getBalancerParam(
       srcToken,
       destToken,
-      srcAmount,
-      destAmount,
       data,
       side,
       recipient,

package/src/dex/balancer-v2/types.ts

@@ -138,6 +138,8 @@ export type BalancerV2DirectParam = [
 ];
 
 export type BalancerV2DirectParamV6 = [
+  fromAmount: NumberAsString,
+  toAmount: NumberAsString,
   quotedAmount: NumberAsString,
   metadata: string,
   beneficiaryAndApproveFlag: NumberAsString,