@paraswap/dex-lib 2.16.3-rfq-direct.0 → 2.16.4-traderjoev2.1.0

package/src/config.ts

@@ -240,8 +240,8 @@ const baseConfigs: { [network: number]: BaseConfig } = {
       process.env[`HASHFLOW_DISABLED_MMS_250`]?.split(',') || [],
 
     adapterAddresses: {
-      FantomAdapter01: '0x66152A2a538644Ae125570De522ADEaC9E41D865',
-      FantomBuyAdapter: '0x27eb327B7255a2bF666EBB4D60AB4752dA4611b9',
+      FantomAdapter01: '0x434C1Cca4842629230067674Dd54E21a14D9FD5D',
+      FantomBuyAdapter: '0xFb8773AA4Fd02e54bbd352061D8Be1911FAa210a',
     },
     uniswapV2ExchangeRouterAddress:
       '0xAB86e2bC9ec5485a9b60E684BA6d49bf4686ACC2',

package/src/dex/generic-rfq/generic-rfq.ts

@@ -6,7 +6,6 @@ import {
   PreprocessTransactionOptions,
   Config,
   PoolLiquidity,
-  TxInfo,
 } from '../../types';
 import { Network, SwapSide } from '../../constants';
 import { IDexHelper } from '../../dex-helper';
@@ -16,19 +15,12 @@ import { ParaSwapLimitOrdersData } from '../paraswap-limit-orders/types';
 import { ONE_ORDER_GASCOST } from '../paraswap-limit-orders/constant';
 import { RateFetcher } from './rate-fetcher';
 import {
-  AugustusRFQRouterFunctions,
-  GenericRFQParam,
   PriceAndAmountBigNumber,
   RFQConfig,
   SlippageCheckError,
 } from './types';
-import { Address, NumberAsString, OptimalSwapExchange } from '@paraswap/core';
+import { OptimalSwapExchange } from '@paraswap/core';
 import { BI_MAX_UINT256 } from '../../bigint-constants';
-import { Interface } from 'ethers/lib/utils';
-import AugustusRFQRouterABI from '../../abi/AugustusRFQRouter.abi.json';
-import { IDexTxBuilder } from '../idex';
-import { isETHAddress } from '../../utils';
-import { assert } from 'ts-essentials';
 
 export const OVERORDER_BPS = 100;
 export const BPS_MAX_VALUE = 10000n;
@@ -36,15 +28,10 @@ export const BPS_MAX_VALUE = 10000n;
 export const overOrder = (amount: string, bps: number) =>
   ((BigInt(amount) * (BPS_MAX_VALUE + BigInt(bps))) / BPS_MAX_VALUE).toString();
 
-export class GenericRFQ
-  extends ParaSwapLimitOrders
-  implements IDexTxBuilder<ParaSwapLimitOrdersData, GenericRFQParam>
-{
+export class GenericRFQ extends ParaSwapLimitOrders {
   readonly isStatePollingDex = true;
   private rateFetcher: RateFetcher;
 
-  private routerInterface: Interface;
-
   public static dexKeysWithNetwork: { key: string; networks: Network[] }[] = [];
 
   static builderDexKeysWithNetwork(config: Config): void {
@@ -64,7 +51,6 @@ export class GenericRFQ
   ) {
     super(network, dexKey, dexHelper);
     this.rateFetcher = new RateFetcher(dexHelper, config, dexKey, this.logger);
-    this.routerInterface = new Interface(AugustusRFQRouterABI);
   }
 
   async initializePricing(blockNumber: number): Promise<void> {
@@ -311,58 +297,4 @@ export class GenericRFQ
       this.rateFetcher.stop();
     }
   }
-
-  getDirectParam(
-    srcToken: Address,
-    destToken: Address,
-    srcAmount: NumberAsString,
-    destAmount: NumberAsString,
-    data: ParaSwapLimitOrdersData,
-    side: SwapSide,
-    permit: string,
-    contractMethod: string,
-  ): TxInfo<GenericRFQParam> {
-    const usePermit = permit !== '0x';
-
-    assert(
-      contractMethod ===
-        (usePermit
-          ? AugustusRFQRouterFunctions.swapOnAugustusRFQWithPermit
-          : AugustusRFQRouterFunctions.swapOnAugustusRFQ),
-    );
-
-    if (data.orderInfos === null && data.orderInfos!.length === 1) {
-      throw new Error('`orderInfos` cannot be empty');
-    }
-
-    const encoder = (...params: GenericRFQParam) => {
-      return this.routerInterface.encodeFunctionData(
-        usePermit
-          ? AugustusRFQRouterFunctions.swapOnAugustusRFQWithPermit
-          : AugustusRFQRouterFunctions.swapOnAugustusRFQ,
-        params,
-      );
-    };
-
-    const wrapETH = isETHAddress(srcAmount) ? 1 : 0;
-    return {
-      params: usePermit
-        ? [
-            data.orderInfos![0].order,
-            data.orderInfos![0].signature,
-            wrapETH,
-            permit,
-          ]
-        : [data.orderInfos![0].order, data.orderInfos![0].signature, wrapETH],
-      encoder,
-      networkFee: '0',
-    };
-  }
-
-  static getDirectFunctionName(): string[] {
-    return [
-      AugustusRFQRouterFunctions.swapOnAugustusRFQ,
-      AugustusRFQRouterFunctions.swapOnAugustusRFQWithPermit,
-    ];
-  }
 }

package/src/dex/generic-rfq/types.ts

@@ -1,10 +1,7 @@
 import BigNumber from 'bignumber.js';
 import { RequestConfig } from '../../dex-helper/irequest-wrapper';
 import { Address, Token } from '../../types';
-import {
-  AugustusOrderWithString,
-  OrderInfoType,
-} from '../paraswap-limit-orders/types';
+import { AugustusOrderWithString } from '../paraswap-limit-orders/types';
 
 export type Pair = {
   base: string;
@@ -99,25 +96,3 @@ export type RFQFirmRateResponse = {
 };
 
 export class SlippageCheckError extends Error {}
-
-export enum AugustusRFQRouterFunctions {
-  swapOnAugustusRFQ = 'swapOnAugustusRFQ',
-  swapOnAugustusRFQWithPermit = 'swapOnAugustusRFQWithPermit',
-}
-
-export type SwapOnGenericRFQParam = [
-  order: OrderInfoType,
-  signature: string,
-  wrapETH: number,
-];
-
-export type SwapOnGenericRFQWithPermitParam = [
-  order: OrderInfoType,
-  signature: string,
-  wrapETH: number,
-  permit: string,
-];
-
-export type GenericRFQParam =
-  | SwapOnGenericRFQParam
-  | SwapOnGenericRFQWithPermitParam;

package/src/dex/index.ts

@@ -63,7 +63,9 @@ import { MaverickV1 } from './maverick-v1/maverick-v1';
 import { QuickSwapV3 } from './quickswap/quickswap-v3';
 import { ZyberSwapV3 } from './quickswap/zyberswap-v3';
 import { TraderJoeV2 } from './trader-joe-v2';
+import { SpiritSwapV3 } from './quickswap/spiritswap-v3';
 import { PancakeswapV3 } from './uniswap-v3/forks/pancakeswap-v3/pancakeswap-v3';
+import { TraderJoeV21 } from './trader-joe-v2.1';
 
 const LegacyDexes = [
   CurveV2,
@@ -81,7 +83,9 @@ const LegacyDexes = [
   DodoV2,
   QuickSwapV3,
   ZyberSwapV3,
+  SpiritSwapV3,
   TraderJoeV2,
+  TraderJoeV21,
   Jarvis,
   Lido,
   AugustusRFQOrder,
@@ -215,7 +219,7 @@ export class DexAdapterService {
       this.genericRFQDexKeys.add(rfqName.toLowerCase());
     });
 
-    this.directFunctionsNames = [...LegacyDexes, ...Dexes, GenericRFQ]
+    this.directFunctionsNames = [...LegacyDexes, ...Dexes]
       .flatMap(dexAdapter => {
         const _dexAdapter = dexAdapter as IGetDirectFunctionName;
         return _dexAdapter.getDirectFunctionName

package/src/dex/maverick-v1/config.ts

@@ -10,7 +10,7 @@ export const MaverickV1Config: DexConfigMap<DexParams> = {
   MaverickV1: {
     [Network.MAINNET]: {
       subgraphURL:
-        'https://gateway.thegraph.com/api/4b42aaaee3e81a3f29390e9df7010cbc/subgraphs/id/9n4uEbt1XV6DnYH7AGHJ84Gh2fpu68iwxwBKnWqVMX9G',
+        'https://api.thegraph.com/subgraphs/name/maverickprotocol/maverick-mainnet',
       routerAddress: '0x4a585e0f7c18e2c414221d6402652d5e0990e5f8',
       poolInspectorAddress: '0xaA5BF61a664109e959D69C38734d4EA7dF74e456',
     },

package/src/dex/paraswap-limit-orders/types.ts

@@ -58,18 +58,16 @@ export type DexParams = {
   rfqAddress: string;
 };
 
-export type OrderInfoType = Omit<
-  AugustusOrder,
-  'nonceAndMeta' | 'makerAmount' | 'takerAmount' | 'expiry'
-> & {
-  expiry: string;
-  nonceAndMeta: BigIntAsString;
-  makerAmount: BigIntAsString;
-  takerAmount: BigIntAsString;
-};
-
 export type OrderInfo = {
-  order: OrderInfoType;
+  order: Omit<
+    AugustusOrder,
+    'nonceAndMeta' | 'makerAmount' | 'takerAmount' | 'expiry'
+  > & {
+    expiry: string;
+    nonceAndMeta: BigIntAsString;
+    makerAmount: BigIntAsString;
+    takerAmount: BigIntAsString;
+  };
   signature: string;
   takerTokenFillAmount: BigIntAsString;
   permitTakerAsset: string;

package/src/dex/quickswap/config.ts

@@ -21,4 +21,13 @@ export const QuickSwapConfig: DexConfigMap<DexParams> = {
         '0xfa2ad44b9e39d38a7d396bb44a41ea957ac7b622c5c6afdc285728c300b3382a',
     },
   },
+  SpiritSwapV3: {
+    [Network.FANTOM]: {
+      factoryAddress: '0xC58A98644fCeee73bc2B6d349B3102627e2Ec58e',
+      router: '0x03108EDEd4902e89781839c885496c6de9D21956',
+      quoteAddress: '0xc4D1310D60A36c7d849A332Be8Dcff29603fe907',
+      initCode:
+        '0xa360004fb86ddf4cd7fe9aa67d0c6a7f7812d9069142659003dc503e1d7d241f',
+    },
+  },
 };

package/src/dex/quickswap/quickswap-e2e.test.ts

@@ -354,4 +354,98 @@ describe('QuickSwap', () => {
       });
     });
   });
+
+  describe('Fantom', () => {
+    const network = Network.FANTOM;
+    const tokens = Tokens[network];
+    const holders = Holders[network];
+    const provider = new StaticJsonRpcProvider(
+      generateConfig(network).privateHttpProvider,
+      network,
+    );
+    describe('SpiritSwapV3', () => {
+      const dexKey = 'SpiritSwapV3';
+
+      const sideToContractMethods = new Map([
+        [
+          SwapSide.SELL,
+          [
+            ContractMethod.simpleSwap,
+            ContractMethod.multiSwap,
+            ContractMethod.megaSwap,
+          ],
+        ],
+        [SwapSide.BUY, [ContractMethod.simpleBuy, ContractMethod.buy]],
+      ]);
+
+      const pairs: { name: string; sellAmount: string; buyAmount: string }[][] =
+        [
+          [
+            {
+              name: 'USDC',
+              sellAmount: '100',
+              buyAmount: '10000000000000000',
+            },
+            {
+              name: 'WFTM',
+              sellAmount: '10000000000000000',
+              buyAmount: '100',
+            },
+          ],
+          [
+            {
+              name: 'FTM',
+              sellAmount: '1000000000000000',
+              buyAmount: '100',
+            },
+            {
+              name: 'USDC',
+              sellAmount: '100',
+              buyAmount: '10000000000000000',
+            },
+          ],
+        ];
+
+      sideToContractMethods.forEach((contractMethods, side) =>
+        describe(`${side}`, () => {
+          contractMethods.forEach((contractMethod: ContractMethod) => {
+            pairs.forEach(pair => {
+              describe(`${contractMethod}`, () => {
+                it(`${pair[0].name} -> ${pair[1].name}`, async () => {
+                  await testE2E(
+                    tokens[pair[0].name],
+                    tokens[pair[1].name],
+                    holders[pair[0].name],
+                    side === SwapSide.SELL
+                      ? pair[0].sellAmount
+                      : pair[0].buyAmount,
+                    side,
+                    dexKey,
+                    contractMethod,
+                    network,
+                    provider,
+                  );
+                });
+                it(`${pair[1].name} -> ${pair[0].name}`, async () => {
+                  await testE2E(
+                    tokens[pair[1].name],
+                    tokens[pair[0].name],
+                    holders[pair[1].name],
+                    side === SwapSide.SELL
+                      ? pair[1].sellAmount
+                      : pair[1].buyAmount,
+                    side,
+                    dexKey,
+                    contractMethod,
+                    network,
+                    provider,
+                  );
+                });
+              });
+            });
+          });
+        }),
+      );
+    });
+  });
 });

package/src/dex/quickswap/spiritswap-v3.ts

@@ -0,0 +1,19 @@
+import { IDexHelper } from '../../dex-helper';
+import _ from 'lodash';
+import { QuickSwapConfig } from './config';
+import { QuickSwapV3 } from './quickswap-v3';
+
+const config = _.pick(QuickSwapConfig, ['SpiritSwapV3']).SpiritSwapV3;
+
+export class SpiritSwapV3 extends QuickSwapV3 {
+  static dexKeys = ['spiritswapv3'];
+
+  // public static dexKeysWithNetwork
+  constructor(dexHelper: IDexHelper) {
+    super(
+      dexHelper,
+      'spiritswapv3',
+      config[dexHelper.config.data.network].router,
+    );
+  }
+}

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

@@ -0,0 +1,151 @@
+import { Network, SwapSide } from '../constants';
+import { AdapterExchangeParam, Address, 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';
+
+const TRADERJOE_V2_1_ROUTER_ADDRESS: { [network: number]: Address } = {
+  [Network.AVALANCHE]: '0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30',
+  [Network.ARBITRUM]: '0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30',
+  [Network.BSC]: '0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30',
+};
+
+type RouterPath = [
+  pairBinSteps: NumberAsString[],
+  versions: NumberAsString[],
+  tokenPath: Address[],
+];
+type TraderJoeV2RouterSellParams = [
+  _amountIn: NumberAsString,
+  _amountOutMin: NumberAsString,
+  _routerPath: RouterPath,
+  to: Address,
+  _deadline: string,
+];
+
+type TraderJoeV2RouterBuyParams = [
+  _amountOut: NumberAsString,
+  _amountInMax: NumberAsString,
+  _routerPath: RouterPath,
+  to: Address,
+  _deadline: string,
+];
+
+type TraderJoeV2RouterParam =
+  | TraderJoeV2RouterSellParams
+  | TraderJoeV2RouterBuyParams;
+
+export type TraderJoeV2Data = {
+  tokenIn: string; // redundant
+  tokenOut: string; // redundant
+  binStep: string;
+};
+
+enum TraderJoeV2RouterFunctions {
+  swapExactTokensForTokens = 'swapExactTokensForTokens',
+  swapTokensForExactTokens = 'swapTokensForExactTokens',
+}
+export class TraderJoeV21
+  extends SimpleExchange
+  implements IDexTxBuilder<TraderJoeV2Data, TraderJoeV2RouterParam>
+{
+  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];
+
+    this.exchangeRouterInterface = new Interface(
+      TraderJoeV21RouterABI as JsonFragment[],
+    );
+  }
+
+  getAdapterParam(
+    srcToken: Address,
+    destToken: Address,
+    srcAmount: NumberAsString,
+    destAmount: NumberAsString,
+    data: TraderJoeV2Data,
+    side: SwapSide,
+  ): AdapterExchangeParam {
+    const payload = this.abiCoder.encodeParameter(
+      {
+        ParentStruct: {
+          _pairBinSteps: 'uint256[]',
+          _tokenPath: 'address[]',
+          _deadline: 'uint256',
+          _mintOutAmount: 'uint256',
+        },
+      },
+      {
+        _pairBinSteps: [data.binStep],
+        _tokenPath: [data.tokenIn, data.tokenOut], // FIXME: redundant, shoot & read from contract
+        _deadline: getLocalDeadlineAsFriendlyPlaceholder(), // FIXME: more gas efficient to pass block.timestamp in adapter
+        _minOutAmount: destAmount,
+      },
+    );
+
+    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,
+    );
+  }
+}

package/src/dex/uniswap-v3/config.ts

@@ -141,4 +141,8 @@ export const Adapters: Record<number, AdapterMappings> = {
     [SwapSide.SELL]: [{ name: 'OptimismAdapter01', index: 3 }],
     [SwapSide.BUY]: [{ name: 'OptimismBuyAdapter', index: 2 }],
   },
+  [Network.FANTOM]: {
+    [SwapSide.SELL]: [{ name: 'FantomAdapter01', index: 11 }],
+    [SwapSide.BUY]: [{ name: 'FantomBuyAdapter', index: 3 }],
+  },
 };

package/tests/constants-e2e.ts

@@ -904,7 +904,7 @@ export const Holders: {
   [Network.FANTOM]: {
     DAI: '0x370f4b2dcf75c94d8d4450b493661a9c6170d0b5',
     FTM: '0x431e81E5dfB5A24541b5Ff8762bDEF3f32F96354',
-    WFTM: '0x431e81E5dfB5A24541b5Ff8762bDEF3f32F96354',
+    WFTM: '0x3e923747ca2675e096d812c3b24846ac39aed645',
     USDC: '0xe48793b1533b351ae184e1c3119d0955dde7b330',
     FUSDT: '0x9ade1c17d25246c405604344f89E8F23F8c1c632',
     POPS: '0x4b78b52e7de4d8b7d367297cb8a87c1875a9d591',
@@ -913,7 +913,7 @@ export const Holders: {
     MIM: '0xbcab7d083cf6a01e0dda9ed7f8a02b47d125e682',
     FRAX: '0x4423ac71f53ca92e2f2be5917a9c2468e7412f4a',
     nETH: '0x16b658270ac50c0063940ed287c401b3df7ccf70',
-    WETH: '0x4ad64fd7ca6d6150614179b9bce4094bc18f29cb',
+    WETH: '0x7b7b957c284c2c227c980d6e2f804311947b84d0',
     SPIRIT: '0x0d0707963952f2fba59dd06f2b425ace40b492fe',
     wBOMB: '0x28aa4f9ffe21365473b64c161b566c3cdead0108',
     TOR: '0x70de4b5ed310fd93da3c0bae824fb99cb4d44dd8',

package/tests/utils-e2e.ts

@@ -468,7 +468,7 @@ export async function newTestE2E({
           .addAllowance(
             senderAddress,
             config.tokenTransferProxyAddress,
-            MAX_UINT,
+            amount.toString(),
           );
       } else {
         srcToken
@@ -476,7 +476,7 @@ export async function newTestE2E({
           .addAllowance(
             senderAddress,
             config.tokenTransferProxyAddress,
-            MAX_UINT,
+            (BigInt(MAX_UINT) / 8n).toString(),
           );
       }
 

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/paraswap-dex-lib.iml" filepath="$PROJECT_DIR$/paraswap-dex-lib.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

package/.vscode/launch.json

@@ -1,21 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Launch Program",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "program": "${workspaceFolder}/build/index.js",
-            "preLaunchTask": "tsc: build - tsconfig.json",
-            "outFiles": [
-                "${workspaceFolder}/build/**/*.js"
-            ]
-        }
-    ]
-}