@paraswap/dex-lib 3.8.9-node-v20.0 → 3.8.9-trader-joe-v2.2.0

package/build/dex/index.js

@@ -93,7 +93,7 @@ const LegacyDexes = [
     dodo_v2_1.DodoV2,
     quickswap_v3_1.QuickSwapV3,
     thena_fusion_1.ThenaFusion,
-    trader_joe_v2_1_1.TraderJoeV21,
+    trader_joe_v2_1_1.TraderJoeV20,
     lido_1.Lido,
     augustus_rfq_1.AugustusRFQOrder,
     etherfi_1.EtherFi,

package/build/dex/trader-joe-v2.1/base.d.ts

@@ -0,0 +1,18 @@
+import { SwapSide } from '../../constants';
+import { AdapterExchangeParam, Address, DexExchangeParam, SimpleExchangeParam } from '../../types';
+import { IDexTxBuilder } from '../idex';
+import { IDexHelper } from '../../dex-helper';
+import { SimpleExchange } from '../simple-exchange';
+import { NumberAsString } from '@paraswap/core';
+import { AsyncOrSync } from 'ts-essentials';
+import { Interface } from '@ethersproject/abi';
+import { TraderJoeV2Data, TraderJoeV2RouterParam } from './types';
+export declare class BaseTraderJoeV2 extends SimpleExchange implements IDexTxBuilder<TraderJoeV2Data, TraderJoeV2RouterParam> {
+    protected routerAddress: string;
+    protected versionIndex: string;
+    exchangeRouterInterface: Interface;
+    constructor(dexHelper: IDexHelper, dexKey: string, routerAddress: string, versionIndex: string);
+    getAdapterParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, data: TraderJoeV2Data, side: SwapSide): AdapterExchangeParam;
+    getSimpleParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, data: TraderJoeV2Data, side: SwapSide): AsyncOrSync<SimpleExchangeParam>;
+    getDexParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: TraderJoeV2Data, side: SwapSide): DexExchangeParam;
+}

package/build/dex/trader-joe-v2.1/base.js

@@ -0,0 +1,99 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseTraderJoeV2 = void 0;
+const constants_1 = require("../../constants");
+const simple_exchange_1 = require("../simple-exchange");
+const abi_1 = require("@ethersproject/abi");
+const TraderJoeV21Router_json_1 = __importDefault(require("../../abi/TraderJoeV21Router.json"));
+const types_1 = require("./types");
+const utils_1 = require("../../executor/utils");
+class BaseTraderJoeV2 extends simple_exchange_1.SimpleExchange {
+    constructor(dexHelper, dexKey, routerAddress, versionIndex) {
+        super(dexHelper, dexKey);
+        this.routerAddress = routerAddress;
+        this.versionIndex = versionIndex;
+        this.exchangeRouterInterface = new abi_1.Interface(TraderJoeV21Router_json_1.default);
+    }
+    getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
+        let payload = this.abiCoder.encodeParameters(['tuple(tuple(uint256[],uint8[],address[]),uint256)'], [
+            [
+                [
+                    [
+                        data.binStep, // _pairBinSteps: uint256[]
+                    ],
+                    [
+                        this.versionIndex, // _versions: uint8[]
+                    ],
+                    [
+                        data.tokenIn,
+                        data.tokenOut, // _tokenPath: address[]
+                    ],
+                ],
+                (0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)(), // _deadline: uint256
+            ],
+        ]);
+        return {
+            targetExchange: this.routerAddress,
+            payload,
+            networkFee: '0',
+        };
+    }
+    getSimpleParam(srcToken, destToken, srcAmount, destAmount, data, side) {
+        const swapFunction = side === constants_1.SwapSide.SELL
+            ? types_1.TraderJoeV2RouterFunctions.swapExactTokensForTokens
+            : types_1.TraderJoeV2RouterFunctions.swapTokensForExactTokens;
+        const swapFunctionParams = side === constants_1.SwapSide.SELL
+            ? [
+                srcAmount,
+                destAmount,
+                [[data.binStep], [this.versionIndex], [srcToken, destToken]],
+                this.augustusAddress,
+                (0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)(),
+            ]
+            : [
+                destAmount,
+                srcAmount,
+                [[data.binStep], [this.versionIndex], [srcToken, destToken]],
+                this.augustusAddress,
+                (0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)(),
+            ];
+        const swapData = this.exchangeRouterInterface.encodeFunctionData(swapFunction, swapFunctionParams);
+        return this.buildSimpleParamWithoutWETHConversion(srcToken, srcAmount, destToken, destAmount, swapData, this.routerAddress);
+    }
+    getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side) {
+        const swapFunction = side === constants_1.SwapSide.SELL
+            ? types_1.TraderJoeV2RouterFunctions.swapExactTokensForTokens
+            : types_1.TraderJoeV2RouterFunctions.swapTokensForExactTokens;
+        const placeholder = (0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)();
+        const swapFunctionParams = side === constants_1.SwapSide.SELL
+            ? [
+                srcAmount,
+                destAmount,
+                [[data.binStep], [this.versionIndex], [srcToken, destToken]],
+                recipient,
+                placeholder,
+            ]
+            : [
+                destAmount,
+                srcAmount,
+                [[data.binStep], [this.versionIndex], [srcToken, destToken]],
+                recipient,
+                placeholder,
+            ];
+        const swapData = this.exchangeRouterInterface.encodeFunctionData(swapFunction, swapFunctionParams);
+        return {
+            needWrapNative: this.needWrapNative,
+            dexFuncHasRecipient: true,
+            exchangeData: swapData,
+            targetExchange: this.routerAddress,
+            returnAmountPos: side === constants_1.SwapSide.SELL
+                ? (0, utils_1.extractReturnAmountPosition)(this.exchangeRouterInterface, swapFunction, 'amountOut')
+                : undefined,
+        };
+    }
+}
+exports.BaseTraderJoeV2 = BaseTraderJoeV2;
+//# sourceMappingURL=base.js.map

package/build/dex/trader-joe-v2.1/base.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/dex/trader-joe-v2.1/base.ts"],"names":[],"mappings":"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"}

package/build/dex/trader-joe-v2.1/config.d.ts

@@ -1,4 +1,10 @@
 import { Address } from '@paraswap/core';
+export declare const TRADERJOE_V2_0_ROUTER_ADDRESS: {
+    [network: number]: Address;
+};
 export declare const TRADERJOE_V2_1_ROUTER_ADDRESS: {
     [network: number]: Address;
 };
+export declare const TRADERJOE_V2_2_ROUTER_ADDRESS: {
+    [network: number]: Address;
+};

package/build/dex/trader-joe-v2.1/config.js

@@ -1,11 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TRADERJOE_V2_1_ROUTER_ADDRESS = void 0;
+exports.TRADERJOE_V2_2_ROUTER_ADDRESS = exports.TRADERJOE_V2_1_ROUTER_ADDRESS = exports.TRADERJOE_V2_0_ROUTER_ADDRESS = void 0;
 const constants_1 = require("../../constants");
+exports.TRADERJOE_V2_0_ROUTER_ADDRESS = {
+    [constants_1.Network.AVALANCHE]: '0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30',
+    [constants_1.Network.ARBITRUM]: '0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30',
+    [constants_1.Network.BSC]: '0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30',
+    [constants_1.Network.MAINNET]: '0x9A93a421b74F1c5755b83dD2C211614dC419C44b',
+};
 exports.TRADERJOE_V2_1_ROUTER_ADDRESS = {
     [constants_1.Network.AVALANCHE]: '0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30',
     [constants_1.Network.ARBITRUM]: '0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30',
     [constants_1.Network.BSC]: '0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30',
     [constants_1.Network.MAINNET]: '0x9A93a421b74F1c5755b83dD2C211614dC419C44b',
 };
+exports.TRADERJOE_V2_2_ROUTER_ADDRESS = {
+    [constants_1.Network.AVALANCHE]: '0x18556da13313f3532c54711497a8fedac273220e',
+    [constants_1.Network.ARBITRUM]: '0x18556da13313f3532c54711497a8fedac273220e',
+};
 //# sourceMappingURL=config.js.map

package/build/dex/trader-joe-v2.1/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dex/trader-joe-v2.1/config.ts"],"names":[],"mappings":";;;AACA,+CAA0C;AAE7B,QAAA,6BAA6B,GAAmC;IAC3E,CAAC,mBAAO,CAAC,SAAS,CAAC,EAAE,4CAA4C;IACjE,CAAC,mBAAO,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IAChE,CAAC,mBAAO,CAAC,GAAG,CAAC,EAAE,4CAA4C;IAC3D,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE,4CAA4C;CAChE,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dex/trader-joe-v2.1/config.ts"],"names":[],"mappings":";;;AACA,+CAA0C;AAE7B,QAAA,6BAA6B,GAAmC;IAC3E,CAAC,mBAAO,CAAC,SAAS,CAAC,EAAE,4CAA4C;IACjE,CAAC,mBAAO,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IAChE,CAAC,mBAAO,CAAC,GAAG,CAAC,EAAE,4CAA4C;IAC3D,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE,4CAA4C;CAChE,CAAC;AAEW,QAAA,6BAA6B,GAAmC;IAC3E,CAAC,mBAAO,CAAC,SAAS,CAAC,EAAE,4CAA4C;IACjE,CAAC,mBAAO,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IAChE,CAAC,mBAAO,CAAC,GAAG,CAAC,EAAE,4CAA4C;IAC3D,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE,4CAA4C;CAChE,CAAC;AAEW,QAAA,6BAA6B,GAAmC;IAC3E,CAAC,mBAAO,CAAC,SAAS,CAAC,EAAE,4CAA4C;IACjE,CAAC,mBAAO,CAAC,QAAQ,CAAC,EAAE,4CAA4C;CACjE,CAAC"}

package/build/dex/trader-joe-v2.1/trader-joe-v2.1-new.d.ts

@@ -0,0 +1,7 @@
+import { IDexHelper } from '../../dex-helper';
+import { BaseTraderJoeV2 } from './base';
+export declare class TraderJoeV21 extends BaseTraderJoeV2 {
+    static dexKeys: string[];
+    needWrapNative: boolean;
+    constructor(dexHelper: IDexHelper);
+}

package/build/dex/trader-joe-v2.1/trader-joe-v2.1-new.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TraderJoeV21 = void 0;
+const abi_1 = require("@ethersproject/abi");
+const TraderJoeV21Router_json_1 = __importDefault(require("../../abi/TraderJoeV21Router.json"));
+const config_1 = require("./config");
+const base_1 = require("./base");
+class TraderJoeV21 extends base_1.BaseTraderJoeV2 {
+    constructor(dexHelper) {
+        super(dexHelper, 'traderjoev2.1', config_1.TRADERJOE_V2_1_ROUTER_ADDRESS[dexHelper.config.data.network], '2');
+        this.needWrapNative = true;
+        this.exchangeRouterInterface = new abi_1.Interface(TraderJoeV21Router_json_1.default);
+    }
+}
+exports.TraderJoeV21 = TraderJoeV21;
+TraderJoeV21.dexKeys = ['traderjoev2.1'];
+//# sourceMappingURL=trader-joe-v2.1-new.js.map

package/build/dex/trader-joe-v2.1/trader-joe-v2.1-new.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trader-joe-v2.1-new.js","sourceRoot":"","sources":["../../../src/dex/trader-joe-v2.1/trader-joe-v2.1-new.ts"],"names":[],"mappings":";;;;;;AACA,4CAA6D;AAC7D,gGAAsE;AACtE,qCAAyD;AACzD,iCAAyC;AAEzC,MAAa,YAAa,SAAQ,sBAAe;IAI/C,YAAY,SAAqB;QAC/B,KAAK,CACH,SAAS,EACT,eAAe,EACf,sCAA6B,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAC5D,GAAG,CACJ,CAAC;QARJ,mBAAc,GAAG,IAAI,CAAC;QAUpB,IAAI,CAAC,uBAAuB,GAAG,IAAI,eAAS,CAC1C,iCAAuC,CACxC,CAAC;IACJ,CAAC;;AAfH,oCAgBC;AAfQ,oBAAO,GAAG,CAAC,eAAe,CAAC,CAAC"}

package/build/dex/trader-joe-v2.1/trader-joe-v2.1.d.ts

@@ -7,7 +7,7 @@ import { NumberAsString } from '@paraswap/core';
 import { AsyncOrSync } from 'ts-essentials';
 import { Interface } from '@ethersproject/abi';
 import { TraderJoeV2Data, TraderJoeV2RouterParam } from './types';
-export declare class TraderJoeV21 extends SimpleExchange implements IDexTxBuilder<TraderJoeV2Data, TraderJoeV2RouterParam> {
+export declare class TraderJoeV20 extends SimpleExchange implements IDexTxBuilder<TraderJoeV2Data, TraderJoeV2RouterParam> {
     static dexKeys: string[];
     protected routerAddress: string;
     exchangeRouterInterface: Interface;

package/build/dex/trader-joe-v2.1/trader-joe-v2.1.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TraderJoeV21 = void 0;
+exports.TraderJoeV20 = void 0;
 const constants_1 = require("../../constants");
 const simple_exchange_1 = require("../simple-exchange");
 const abi_1 = require("@ethersproject/abi");
@@ -11,12 +11,12 @@ const TraderJoeV21Router_json_1 = __importDefault(require("../../abi/TraderJoeV2
 const types_1 = require("./types");
 const config_1 = require("./config");
 const utils_1 = require("../../executor/utils");
-class TraderJoeV21 extends simple_exchange_1.SimpleExchange {
+class TraderJoeV20 extends simple_exchange_1.SimpleExchange {
     constructor(dexHelper) {
-        super(dexHelper, 'traderjoev2.1');
+        super(dexHelper, 'traderjoev2.0');
         this.needWrapNative = true;
         this.routerAddress =
-            config_1.TRADERJOE_V2_1_ROUTER_ADDRESS[dexHelper.config.data.network];
+            config_1.TRADERJOE_V2_0_ROUTER_ADDRESS[dexHelper.config.data.network];
         this.exchangeRouterInterface = new abi_1.Interface(TraderJoeV21Router_json_1.default);
     }
     getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
@@ -97,6 +97,6 @@ class TraderJoeV21 extends simple_exchange_1.SimpleExchange {
         };
     }
 }
-exports.TraderJoeV21 = TraderJoeV21;
-TraderJoeV21.dexKeys = ['traderjoev2.1'];
+exports.TraderJoeV20 = TraderJoeV20;
+TraderJoeV20.dexKeys = ['traderjoev2.0'];
 //# sourceMappingURL=trader-joe-v2.1.js.map

package/build/dex/trader-joe-v2.1/trader-joe-v2.2.d.ts

@@ -0,0 +1,7 @@
+import { IDexHelper } from '../../dex-helper';
+import { BaseTraderJoeV2 } from './base';
+export declare class TraderJoeV22 extends BaseTraderJoeV2 {
+    static dexKeys: string[];
+    needWrapNative: boolean;
+    constructor(dexHelper: IDexHelper);
+}

package/build/dex/trader-joe-v2.1/trader-joe-v2.2.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TraderJoeV22 = void 0;
+const abi_1 = require("@ethersproject/abi");
+const TraderJoeV21Router_json_1 = __importDefault(require("../../abi/TraderJoeV21Router.json"));
+const config_1 = require("./config");
+const base_1 = require("./base");
+class TraderJoeV22 extends base_1.BaseTraderJoeV2 {
+    constructor(dexHelper) {
+        super(dexHelper, 'traderjoev2.2', config_1.TRADERJOE_V2_2_ROUTER_ADDRESS[dexHelper.config.data.network], '3');
+        this.needWrapNative = true;
+        this.exchangeRouterInterface = new abi_1.Interface(TraderJoeV21Router_json_1.default);
+    }
+}
+exports.TraderJoeV22 = TraderJoeV22;
+TraderJoeV22.dexKeys = ['traderjoev2.2'];
+//# sourceMappingURL=trader-joe-v2.2.js.map

package/build/dex/trader-joe-v2.1/trader-joe-v2.2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trader-joe-v2.2.js","sourceRoot":"","sources":["../../../src/dex/trader-joe-v2.1/trader-joe-v2.2.ts"],"names":[],"mappings":";;;;;;AACA,4CAA6D;AAC7D,gGAAsE;AACtE,qCAAyD;AACzD,iCAAyC;AAEzC,MAAa,YAAa,SAAQ,sBAAe;IAI/C,YAAY,SAAqB;QAC/B,KAAK,CACH,SAAS,EACT,eAAe,EACf,sCAA6B,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAC5D,GAAG,CACJ,CAAC;QARJ,mBAAc,GAAG,IAAI,CAAC;QAUpB,IAAI,CAAC,uBAAuB,GAAG,IAAI,eAAS,CAC1C,iCAAuC,CACxC,CAAC;IACJ,CAAC;;AAfH,oCAgBC;AAfQ,oBAAO,GAAG,CAAC,eAAe,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "3.8.9-node-v20.0",
+  "version": "3.8.9-trader-joe-v2.2.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

package/src/dex/index.ts

@@ -66,7 +66,7 @@ import { MaverickV2 } from './maverick-v2/maverick-v2';
 import { QuickSwapV3 } from './quickswap/quickswap-v3';
 import { ThenaFusion } from './quickswap/thena-fusion';
 import { SwaapV2 } from './swaap-v2/swaap-v2';
-import { TraderJoeV21 } from './trader-joe-v2.1/trader-joe-v2.1';
+import { TraderJoeV20 } from './trader-joe-v2.1/trader-joe-v2.1';
 import { PancakeswapV3 } from './pancakeswap-v3/pancakeswap-v3';
 import { Algebra } from './algebra/algebra';
 import { AngleTransmuter } from './angle-transmuter/angle-transmuter';
@@ -92,7 +92,7 @@ const LegacyDexes = [
   DodoV2,
   QuickSwapV3,
   ThenaFusion,
-  TraderJoeV21,
+  TraderJoeV20,
   Lido,
   AugustusRFQOrder,
   EtherFi,

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

@@ -0,0 +1,178 @@
+import { SwapSide } from '../../constants';
+import {
+  AdapterExchangeParam,
+  Address,
+  DexExchangeParam,
+  SimpleExchangeParam,
+} from '../../types';
+import { IDexTxBuilder } from '../idex';
+import { IDexHelper } from '../../dex-helper';
+import {
+  getLocalDeadlineAsFriendlyPlaceholder,
+  SimpleExchange,
+} from '../simple-exchange';
+import { NumberAsString } from '@paraswap/core';
+import { AsyncOrSync } from 'ts-essentials';
+import { Interface, JsonFragment } from '@ethersproject/abi';
+import TraderJoeV21RouterABI from '../../abi/TraderJoeV21Router.json';
+import {
+  TraderJoeV2Data,
+  TraderJoeV2RouterFunctions,
+  TraderJoeV2RouterParam,
+} from './types';
+import { extractReturnAmountPosition } from '../../executor/utils';
+
+export class BaseTraderJoeV2
+  extends SimpleExchange
+  implements IDexTxBuilder<TraderJoeV2Data, TraderJoeV2RouterParam>
+{
+  exchangeRouterInterface: Interface;
+
+  constructor(
+    dexHelper: IDexHelper,
+    dexKey: string,
+    protected routerAddress: string,
+    protected versionIndex: string,
+  ) {
+    super(dexHelper, dexKey);
+
+    this.exchangeRouterInterface = new Interface(
+      TraderJoeV21RouterABI as JsonFragment[],
+    );
+  }
+
+  getAdapterParam(
+    srcToken: Address,
+    destToken: Address,
+    srcAmount: NumberAsString,
+    destAmount: NumberAsString,
+    data: TraderJoeV2Data,
+    side: SwapSide,
+  ): AdapterExchangeParam {
+    let payload = this.abiCoder.encodeParameters(
+      ['tuple(tuple(uint256[],uint8[],address[]),uint256)'],
+      [
+        [
+          [
+            [
+              data.binStep, // _pairBinSteps: uint256[]
+            ],
+            [
+              this.versionIndex, // _versions: uint8[]
+            ],
+            [
+              data.tokenIn,
+              data.tokenOut, // _tokenPath: address[]
+            ],
+          ],
+          getLocalDeadlineAsFriendlyPlaceholder(), // _deadline: uint256
+        ],
+      ],
+    );
+
+    return {
+      targetExchange: this.routerAddress,
+      payload,
+      networkFee: '0',
+    };
+  }
+
+  getSimpleParam(
+    srcToken: Address,
+    destToken: Address,
+    srcAmount: NumberAsString,
+    destAmount: NumberAsString,
+    data: TraderJoeV2Data,
+    side: SwapSide,
+  ): AsyncOrSync<SimpleExchangeParam> {
+    const swapFunction =
+      side === SwapSide.SELL
+        ? TraderJoeV2RouterFunctions.swapExactTokensForTokens
+        : TraderJoeV2RouterFunctions.swapTokensForExactTokens;
+
+    const swapFunctionParams: TraderJoeV2RouterParam =
+      side === SwapSide.SELL
+        ? [
+            srcAmount,
+            destAmount,
+            [[data.binStep], [this.versionIndex], [srcToken, destToken]],
+            this.augustusAddress,
+            getLocalDeadlineAsFriendlyPlaceholder(),
+          ]
+        : [
+            destAmount,
+            srcAmount,
+            [[data.binStep], [this.versionIndex], [srcToken, destToken]],
+            this.augustusAddress,
+            getLocalDeadlineAsFriendlyPlaceholder(),
+          ];
+
+    const swapData = this.exchangeRouterInterface.encodeFunctionData(
+      swapFunction,
+      swapFunctionParams,
+    );
+
+    return this.buildSimpleParamWithoutWETHConversion(
+      srcToken,
+      srcAmount,
+      destToken,
+      destAmount,
+      swapData,
+      this.routerAddress,
+    );
+  }
+
+  getDexParam(
+    srcToken: Address,
+    destToken: Address,
+    srcAmount: NumberAsString,
+    destAmount: NumberAsString,
+    recipient: Address,
+    data: TraderJoeV2Data,
+    side: SwapSide,
+  ): DexExchangeParam {
+    const swapFunction =
+      side === SwapSide.SELL
+        ? TraderJoeV2RouterFunctions.swapExactTokensForTokens
+        : TraderJoeV2RouterFunctions.swapTokensForExactTokens;
+
+    const placeholder = getLocalDeadlineAsFriendlyPlaceholder();
+
+    const swapFunctionParams: TraderJoeV2RouterParam =
+      side === SwapSide.SELL
+        ? [
+            srcAmount,
+            destAmount,
+            [[data.binStep], [this.versionIndex], [srcToken, destToken]],
+            recipient,
+            placeholder,
+          ]
+        : [
+            destAmount,
+            srcAmount,
+            [[data.binStep], [this.versionIndex], [srcToken, destToken]],
+            recipient,
+            placeholder,
+          ];
+
+    const swapData = this.exchangeRouterInterface.encodeFunctionData(
+      swapFunction,
+      swapFunctionParams,
+    );
+
+    return {
+      needWrapNative: this.needWrapNative,
+      dexFuncHasRecipient: true,
+      exchangeData: swapData,
+      targetExchange: this.routerAddress,
+      returnAmountPos:
+        side === SwapSide.SELL
+          ? extractReturnAmountPosition(
+              this.exchangeRouterInterface,
+              swapFunction,
+              'amountOut',
+            )
+          : undefined,
+    };
+  }
+}

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

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

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

@@ -0,0 +1,23 @@
+import { IDexHelper } from '../../dex-helper';
+import { Interface, JsonFragment } from '@ethersproject/abi';
+import TraderJoeV21RouterABI from '../../abi/TraderJoeV21Router.json';
+import { TRADERJOE_V2_1_ROUTER_ADDRESS } from './config';
+import { BaseTraderJoeV2 } from './base';
+
+export class TraderJoeV21 extends BaseTraderJoeV2 {
+  static dexKeys = ['traderjoev2.1'];
+  needWrapNative = true;
+
+  constructor(dexHelper: IDexHelper) {
+    super(
+      dexHelper,
+      'traderjoev2.1',
+      TRADERJOE_V2_1_ROUTER_ADDRESS[dexHelper.config.data.network],
+      '2',
+    );
+
+    this.exchangeRouterInterface = new Interface(
+      TraderJoeV21RouterABI as JsonFragment[],
+    );
+  }
+}

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

@@ -20,23 +20,23 @@ import {
   TraderJoeV2RouterFunctions,
   TraderJoeV2RouterParam,
 } from './types';
-import { TRADERJOE_V2_1_ROUTER_ADDRESS } from './config';
+import { TRADERJOE_V2_0_ROUTER_ADDRESS } from './config';
 import { extractReturnAmountPosition } from '../../executor/utils';
 
-export class TraderJoeV21
+export class TraderJoeV20
   extends SimpleExchange
   implements IDexTxBuilder<TraderJoeV2Data, TraderJoeV2RouterParam>
 {
-  static dexKeys = ['traderjoev2.1'];
+  static dexKeys = ['traderjoev2.0'];
   protected routerAddress: string;
   exchangeRouterInterface: Interface;
   needWrapNative = true;
 
   constructor(dexHelper: IDexHelper) {
-    super(dexHelper, 'traderjoev2.1');
+    super(dexHelper, 'traderjoev2.0');
 
     this.routerAddress =
-      TRADERJOE_V2_1_ROUTER_ADDRESS[dexHelper.config.data.network];
+      TRADERJOE_V2_0_ROUTER_ADDRESS[dexHelper.config.data.network];
 
     this.exchangeRouterInterface = new Interface(
       TraderJoeV21RouterABI as JsonFragment[],

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

@@ -0,0 +1,23 @@
+import { IDexHelper } from '../../dex-helper';
+import { Interface, JsonFragment } from '@ethersproject/abi';
+import TraderJoeV21RouterABI from '../../abi/TraderJoeV21Router.json';
+import { TRADERJOE_V2_2_ROUTER_ADDRESS } from './config';
+import { BaseTraderJoeV2 } from './base';
+
+export class TraderJoeV22 extends BaseTraderJoeV2 {
+  static dexKeys = ['traderjoev2.2'];
+  needWrapNative = true;
+
+  constructor(dexHelper: IDexHelper) {
+    super(
+      dexHelper,
+      'traderjoev2.2',
+      TRADERJOE_V2_2_ROUTER_ADDRESS[dexHelper.config.data.network],
+      '3',
+    );
+
+    this.exchangeRouterInterface = new Interface(
+      TraderJoeV21RouterABI as JsonFragment[],
+    );
+  }
+}