@paraswap/dex-lib 3.8.16 → 3.8.17-insert-amount-solidly-v3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "3.8.16",
+  "version": "3.8.17-insert-amount-solidly-v3.1",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

package/src/dex/dexs.txt

@@ -0,0 +1,58 @@
+aave-v2
+aave-v3
+aave-v3-stata
+algebra
+angle-staked-stable
+angle-transmuter
+augustus-approvals.ts
+augustus-rfq.ts
+balancer-v1
+balancer-v2
+bancor
+camelot
+compound
+curve-v1
+curve-v1-factory
+curve-v1-stable-ng
+curve-v2
+dexalot
+dexs.txt
+dodo-v1
+dodo-v2.ts
+etherfi.ts
+generic-rfq
+gmx
+hashflow
+idex.ts
+idle-dao
+index.ts
+jarvis-v6
+kyberdmm
+lido
+limit-order-exchange.ts
+maker-psm
+maverick-v1
+maverick-v2
+nerve
+pancakeswap-v3
+paraswap-limit-orders
+polygon-migrator
+quick-perps
+quickswap
+simple-exchange.ts
+smoothy
+solidly
+solidly-v3
+spark
+stable-pool
+swaap-v2
+swell
+synthetix
+trader-joe-v2.1
+uniswap-v2
+uniswap-v3
+uniswap-v3.ts
+weth
+wombat
+woo-fi-v2
+wsteth

package/src/dex/index.ts

@@ -66,7 +66,9 @@ 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 { TraderJoeV21 } from './trader-joe-v2.1/trader-joe-v2.1-new';
+import { TraderJoeV22 } from './trader-joe-v2.1/trader-joe-v2.2';
 import { PancakeswapV3 } from './pancakeswap-v3/pancakeswap-v3';
 import { Algebra } from './algebra/algebra';
 import { AngleTransmuter } from './angle-transmuter/angle-transmuter';
@@ -94,7 +96,9 @@ const LegacyDexes = [
   DodoV2,
   QuickSwapV3,
   ThenaFusion,
+  TraderJoeV20,
   TraderJoeV21,
+  TraderJoeV22,
   Lido,
   AugustusRFQOrder,
   EtherFi,

package/src/dex/solidly-v3/solidly-v3.ts

@@ -49,6 +49,7 @@ import { Contract } from 'web3-eth-contract';
 import { AbiItem } from 'web3-utils';
 import { TickMath } from './contract-math/TickMath';
 import { OnPoolCreatedCallback, SolidlyV3Factory } from './solidly-v3-factory';
+import { SpecialDex } from '../../executor/types';
 
 type PoolPairsInfo = {
   token0: Address;
@@ -727,6 +728,12 @@ export class SolidlyV3
       exchangeData: swapData,
       targetExchange: data.poolAddress,
       returnAmountPos: undefined,
+      ...(side === SwapSide.BUY
+        ? {
+            specialDexSupportsInsertFromAmount: true,
+            specialDexFlag: SpecialDex.BUY_ON_SOLIDLY_V3,
+          }
+        : {}),
     };
   }
 

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[],
+    );
+  }
+}

package/src/executor/types.ts

@@ -24,6 +24,7 @@ export enum SpecialDex {
   SWAP_ON_DYSTOPIA_UNISWAP_V2_FORK_WITH_FEE = 8,
   SWAP_ON_AUGUSTUS_RFQ = 9, // swapOnAugustusRFQ
   EXECUTE_VERTICAL_BRANCHING = 10, // execute vertical branching
+  BUY_ON_SOLIDLY_V3 = 11,
 }
 
 export enum Executors {

package/src/generic-swap-transaction-builder.ts

@@ -251,9 +251,20 @@ export class GenericSwapTransactionBuilder {
       [
         priceRoute.srcToken,
         priceRoute.destToken,
-        isSell ? priceRoute.srcAmount : minMaxAmount,
-        isSell ? minMaxAmount : priceRoute.destAmount,
-        isSell ? priceRoute.destAmount : priceRoute.srcAmount,
+        // TODO: temporary artificially increase total amounts by 10% to test insert from amount
+        (
+          (BigInt(isSell ? priceRoute.srcAmount : minMaxAmount) * 11n) /
+          10n
+        ).toString(),
+        (
+          (BigInt(isSell ? minMaxAmount : priceRoute.destAmount) * 11n) /
+          10n
+        ).toString(),
+        (
+          (BigInt(isSell ? priceRoute.destAmount : priceRoute.srcAmount) *
+            11n) /
+          10n
+        ).toString(),
         hexConcat([
           hexZeroPad(uuidToBytes16(uuid), 16),
           hexZeroPad(hexlify(priceRoute.blockNumber), 16),