@paraswap/dex-lib 3.8.21 → 3.8.22-infusion

package/src/dex/infusion/types.ts

@@ -0,0 +1,60 @@
+import {
+  UniswapV2Data,
+  UniswapV2PoolOrderedParams,
+  DexParams as UniswapV2DexParams,
+  UniswapPool,
+} from '../uniswap-v2/types';
+import { UniswapV2Pair } from '../uniswap-v2/uniswap-v2';
+
+export type PoolState = {
+  reserves0: string;
+  reserves1: string;
+  feeCode: number;
+};
+
+// to calculate prices for stable pool, we need decimals of the stable tokens
+export interface InfusionPoolOrderedParams extends UniswapV2PoolOrderedParams {
+  decimalsIn: number;
+  decimalsOut: number;
+  stable: boolean;
+}
+
+export type InfusionData = UniswapV2Data & { isFeeTokenInRoute: boolean };
+
+export type InfusionPool = UniswapPool;
+
+export interface DexParams extends Omit<UniswapV2DexParams, 'feeCode'> {
+  feeCode: number;
+  stableFee?: number;
+  volatileFee?: number;
+  feeFactor?: number;
+}
+
+export interface InfusionPair extends UniswapV2Pair {
+  stable: boolean;
+}
+
+export type InfusionParam = SellOnInfusionParam | SellETHOnInfusionParam;
+
+export type SellOnInfusionParam = [
+  amountIn: string,
+  amountOutMin: string,
+  routes: {
+    from: string;
+    to: string;
+    stable: boolean;
+  }[],
+  to: string,
+  deadline: number,
+];
+
+export type SellETHOnInfusionParam = [
+  amountOutMin: string,
+  routes: {
+    from: string;
+    to: string;
+    stable: boolean;
+  }[],
+  to: string,
+  deadline: number,
+];

package/src/dex/infusion/utils/isStablePair.ts

@@ -0,0 +1,18 @@
+import { Network } from '../../../constants';
+
+export const stablecoins: Record<number, string[]> = {
+  [Network.BASE]: [
+    '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913'.toLowerCase(), // usdc
+    '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA'.toLowerCase(), // usdbc
+    '0xEB466342C4d449BC9f53A865D5Cb90586f405215'.toLowerCase(), // axelar usdc
+  ],
+};
+
+export function isStablePair(chainId: number, tokenA: string, tokenB: string) {
+  const stables = stablecoins[chainId];
+
+  return (
+    stables.includes(tokenA.toLocaleLowerCase()) &&
+    stables.includes(tokenB.toLocaleLowerCase())
+  );
+}

package/src/dex/lite-psm/lite-psm.ts

@@ -242,7 +242,7 @@ export class LitePsm
         },
         poolAddresses: [eventPool.poolConfig.psmAddress],
         exchange: this.dexKey,
-        gasCost: isSrcDai ? 80_000 : 100_000,
+        gasCost: 50000,
         poolIdentifier,
       },
     ];

package/src/dex/maker-psm/maker-psm.ts

@@ -397,7 +397,7 @@ export class MakerPsm
         },
         poolAddresses: [eventPool.poolConfig.psmAddress],
         exchange: this.dexKey,
-        gasCost: 100 * 1000, //TODO: simulate and fix the gas cost
+        gasCost: 200 * 1000,
         poolIdentifier,
       },
     ];

package/src/dex/trader-joe-v2.1/base.ts

@@ -53,18 +53,7 @@ export class BaseTraderJoeV2
       ['tuple(tuple(uint256[],uint8[],address[]),uint256)'],
       [
         [
-          [
-            [
-              data.binStep, // _pairBinSteps: uint256[]
-            ],
-            [
-              this.versionIndex, // _versions: uint8[]
-            ],
-            [
-              data.tokenIn,
-              data.tokenOut, // _tokenPath: address[]
-            ],
-          ],
+          [data.binSteps, data.versions, data.tokenPath],
           getLocalDeadlineAsFriendlyPlaceholder(), // _deadline: uint256
         ],
       ],
@@ -95,14 +84,14 @@ export class BaseTraderJoeV2
         ? [
             srcAmount,
             destAmount,
-            [[data.binStep], [this.versionIndex], [srcToken, destToken]],
+            [data.binSteps, data.versions, data.tokenPath],
             this.augustusAddress,
             getLocalDeadlineAsFriendlyPlaceholder(),
           ]
         : [
             destAmount,
             srcAmount,
-            [[data.binStep], [this.versionIndex], [srcToken, destToken]],
+            [data.binSteps, data.versions, data.tokenPath],
             this.augustusAddress,
             getLocalDeadlineAsFriendlyPlaceholder(),
           ];
@@ -143,14 +132,14 @@ export class BaseTraderJoeV2
         ? [
             srcAmount,
             destAmount,
-            [[data.binStep], [this.versionIndex], [srcToken, destToken]],
+            [data.binSteps, data.versions, data.tokenPath],
             recipient,
             placeholder,
           ]
         : [
             destAmount,
             srcAmount,
-            [[data.binStep], [this.versionIndex], [srcToken, destToken]],
+            [data.binSteps, data.versions, data.tokenPath],
             recipient,
             placeholder,
           ];

package/src/dex/trader-joe-v2.1/config.ts

@@ -2,8 +2,8 @@ import { Address } from '@paraswap/core';
 import { Network } from '../../constants';
 
 export const TRADERJOE_V2_1_ROUTER_ADDRESS: { [network: number]: Address } = {
-  [Network.AVALANCHE]: '0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30',
-  [Network.ARBITRUM]: '0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30',
+  [Network.AVALANCHE]: '0x18556da13313f3532c54711497a8fedac273220e',
+  [Network.ARBITRUM]: '0x18556da13313f3532c54711497a8fedac273220e',
   [Network.BSC]: '0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30',
   [Network.MAINNET]: '0x9A93a421b74F1c5755b83dD2C211614dC419C44b',
 };

package/src/dex/trader-joe-v2.1/types.ts

@@ -27,9 +27,9 @@ export type TraderJoeV2RouterParam =
   | TraderJoeV2RouterBuyParams;
 
 export type TraderJoeV2Data = {
-  tokenIn: string; // redundant
-  tokenOut: string; // redundant
-  binStep: string;
+  tokenPath: string[];
+  binSteps: string[];
+  versions: string[];
 };
 
 export enum TraderJoeV2RouterFunctions {

package/tests/constants-e2e.ts

@@ -1798,7 +1798,7 @@ export const Holders: {
     PRIME: '0xe3879b7359695f802d6FD56Bb76fD82C362Dafd6',
     ETH: '0xd34ea7278e6bd48defe656bbe263aef11101469c',
     MAV: '0xf977814e90da44bfa03b6295a0616a897441acec',
-    USDC: '0xaac391f166f33cdaefaa4afa6616a3bea66b694d',
+    USDC: '0x21bD501F86A0B5cE0907651Df3368DA905B300A9',
     USDbC: '0x4bb6b2efe7036020ba6f02a05602546c9f25bf28',
     DAI: '0x20f03e26968b179025f65c1f4afadfd3959c8d03',
     BAL: '0x854b004700885a61107b458f11ecc169a019b764',