@paraswap/dex-lib 3.8.18 → 3.8.20

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

@@ -1,180 +1,23 @@
-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 { TRADERJOE_V2_1_ROUTER_ADDRESS } from './config';
-import { extractReturnAmountPosition } from '../../executor/utils';
+import { BaseTraderJoeV2 } from './base';
 
-export class TraderJoeV21
-  extends SimpleExchange
-  implements IDexTxBuilder<TraderJoeV2Data, TraderJoeV2RouterParam>
-{
+export class TraderJoeV21 extends BaseTraderJoeV2 {
   static dexKeys = ['traderjoev2.1'];
-  protected routerAddress: string;
-  exchangeRouterInterface: Interface;
   needWrapNative = true;
 
   constructor(dexHelper: IDexHelper) {
-    super(dexHelper, 'traderjoev2.1');
-
-    this.routerAddress =
-      TRADERJOE_V2_1_ROUTER_ADDRESS[dexHelper.config.data.network];
+    super(
+      dexHelper,
+      'traderjoev2.1',
+      TRADERJOE_V2_1_ROUTER_ADDRESS[dexHelper.config.data.network],
+      '2',
+    );
 
     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[]
-            ],
-            [
-              2, // _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], ['2'], [srcToken, destToken]],
-            this.augustusAddress,
-            getLocalDeadlineAsFriendlyPlaceholder(),
-          ]
-        : [
-            destAmount,
-            srcAmount,
-            [[data.binStep], ['2'], [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], ['2'], [srcToken, destToken]],
-            recipient,
-            placeholder,
-          ]
-        : [
-            destAmount,
-            srcAmount,
-            [[data.binStep], ['2'], [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/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[],
+    );
+  }
+}

package/.vscode/launch.json

@@ -1,53 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Current",
-      "program": "${file}",
-      "preLaunchTask": "npm: build",
-      "sourceMaps": true,
-      "smartStep": true,
-      "internalConsoleOptions": "openOnSessionStart",
-      "outFiles": ["${workspaceFolder}/build/**/*.js"]
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Debug dex integration",
-      "program": "${workspaceFolder}/node_modules/ts-node/dist/bin.js",
-      "args": [
-        "--project",
-        "tsconfig.json",
-        // "${workspaceFolder}/src/dex/algebra/scripts/validate-state.ts",
-        "${workspaceFolder}/src/dex/camelot/camelot-pool-discovery.test.ts",
-        // "${workspaceFolder}/src/dex/solidly-v3/scripts/check-event-pool-event.ts",
-        // "${workspaceFolder}/scripts/dex-integration.ts",
-        "test",
-        "wombat"
-      ],
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "runtimeArgs": ["--nolazy"],
-      "sourceMaps": true,
-      "smartStep": true,
-      "skipFiles": ["<node_internals>/**"],
-      "cwd": "${workspaceFolder}"
-    },
-    {
-      "type": "node",
-      "name": "Jest file",
-      "request": "launch",
-      "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
-      // "program": "${workspaceFolder}/src/dex/camelot/scripts/validate-state.ts",
-      // "args": ["src/dex/balancer-v1/balancer-v1-e2e.test.ts"],
-      // "args": ["${relativeFile}"],
-      "args": ["${file}"],
-      "cwd": "${workspaceRoot}",
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "sourceMaps": true
-    }
-  ]
-}

package/.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}

package/.vscode/tasks.json

@@ -1,15 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "tsc: build - tsconfig.json",
-      "type": "typescript",
-      "tsconfig": "tsconfig.json",
-      "problemMatcher": ["$tsc"],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      }
-    }
-  ]
-}

package/build/abi/AaveV1_lending_pool.json

@@ -1,27 +0,0 @@
-[
-    {
-        "constant": false,
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "_reserve",
-                "type": "address"
-            },
-            {
-                "internalType": "uint256",
-                "name": "_amount",
-                "type": "uint256"
-            },
-            {
-                "internalType": "uint16",
-                "name": "_referralCode",
-                "type": "uint16"
-            }
-        ],
-        "name": "deposit",
-        "outputs": [],
-        "payable": true,
-        "stateMutability": "payable",
-        "type": "function"
-    }
-]