@paraswap/dex-lib 3.8.22 → 3.8.23

package/src/dex/maverick-v2/maverick-v2.ts

@@ -27,9 +27,12 @@ import { MaverickV2EventPool } from './maverick-v2-pool';
 import { SUBGRAPH_TIMEOUT } from '../../constants';
 import { Interface } from '@ethersproject/abi';
 import MaverickV2PoolABI from '../../abi/maverick-v2/MaverickV2Pool.json';
+import MaverickV2RouterABI from '../../abi/maverick-v2/MaverickV2Router.json';
 import ERC20ABI from '../../abi/erc20.json';
 import { extractReturnAmountPosition } from '../../executor/utils';
-const EFFICIENCY_FACTOR = 3;
+
+const POOL_LIST_CACHE_KEY = 'maverickv2-pool-list';
+const POOL_LIST_TTL_SECONDS = 60;
 
 export class MaverickV2 extends SimpleExchange implements IDex<MaverickV2Data> {
   pools: { [key: string]: MaverickV2EventPool } = {};
@@ -52,13 +55,14 @@ export class MaverickV2 extends SimpleExchange implements IDex<MaverickV2Data> {
     protected adapters = {},
     protected config = MaverickV2Config[dexKey][network],
     protected maverickV2Iface = new Interface(MaverickV2PoolABI),
+    protected maverickV2RouterIface = new Interface(MaverickV2RouterABI),
   ) {
     super(dexHelper, dexKey);
     this.logger = dexHelper.getLogger(dexKey);
   }
 
   async initializePricing(blockNumber: number) {
-    const pools = await this._queryPoolsAPI(SUBGRAPH_TIMEOUT);
+    const pools = await this._queryPoolsAPI();
 
     await Promise.all(
       pools.map(async pool => {
@@ -97,15 +101,30 @@ export class MaverickV2 extends SimpleExchange implements IDex<MaverickV2Data> {
     return null;
   }
 
+  async getEventPools(srcToken: Token, destToken: Token) {
+    const fromToken = this.dexHelper.config.wrapETH(srcToken);
+    const toToken = this.dexHelper.config.wrapETH(destToken);
+
+    return Object.values(this.pools).filter((pool: MaverickV2EventPool) => {
+      const tokenA = pool.tokenA.address.toLowerCase();
+      const tokenB = pool.tokenB.address.toLowerCase();
+
+      const fromAddress = fromToken.address.toLowerCase();
+      const toAddress = toToken.address.toLowerCase();
+
+      return (
+        (tokenA === fromAddress && tokenB === toAddress) ||
+        (tokenA === toAddress && tokenB === fromAddress)
+      );
+    });
+  }
+
   async getPoolIdentifiers(
     srcToken: Token,
     destToken: Token,
     side: SwapSide,
     blockNumber: number,
   ): Promise<string[]> {
-    // TODO:
-    if (side === SwapSide.BUY) return [];
-
     const from = this.dexHelper.config.wrapETH(srcToken);
     const to = this.dexHelper.config.wrapETH(destToken);
 
@@ -113,25 +132,10 @@ export class MaverickV2 extends SimpleExchange implements IDex<MaverickV2Data> {
       return [];
     }
 
-    const pools = await this.getPools(from, to);
+    const pools = await this.getEventPools(from, to);
     return pools.map(pool => pool.name);
   }
 
-  async getPools(srcToken: Token, destToken: Token) {
-    srcToken = this.dexHelper.config.wrapETH(srcToken);
-    destToken = this.dexHelper.config.wrapETH(destToken);
-
-    return Object.values(this.pools).filter((pool: MaverickV2EventPool) => {
-      return (
-        (pool.tokenA.address.toLowerCase() === srcToken.address.toLowerCase() ||
-          pool.tokenA.address.toLowerCase() ===
-            destToken.address.toLowerCase()) &&
-        (pool.tokenB.address.toLowerCase() === srcToken.address.toLowerCase() ||
-          pool.tokenB.address.toLowerCase() === destToken.address.toLowerCase())
-      );
-    });
-  }
-
   async getPricesVolume(
     srcToken: Token,
     destToken: Token,
@@ -148,10 +152,7 @@ export class MaverickV2 extends SimpleExchange implements IDex<MaverickV2Data> {
         return null;
       }
 
-      // TODO:
-      if (side === SwapSide.BUY) return null;
-
-      const allPools = await this.getPools(from, to);
+      const allPools = await this.getEventPools(from, to);
 
       const allowedPools = limitPools
         ? allPools.filter(pool => limitPools.includes(pool.name))
@@ -159,11 +160,9 @@ export class MaverickV2 extends SimpleExchange implements IDex<MaverickV2Data> {
 
       if (!allowedPools.length) return null;
 
-      // const unitAmount = getBigIntPow(
-      //   side === SwapSide.BUY ? to.decimals : from.decimals,
-      // );
-
-      const unitAmount = getBigIntPow(from.decimals);
+      const unitAmount = getBigIntPow(
+        side === SwapSide.BUY ? to.decimals : from.decimals,
+      );
 
       const tasks = allowedPools.map(async (pool: MaverickV2EventPool) => {
         try {
@@ -173,8 +172,7 @@ export class MaverickV2 extends SimpleExchange implements IDex<MaverickV2Data> {
             return null;
           }
 
-          // const [unit] = pool.swap(unitAmount, from, to, side === SwapSide.BUY);
-          const [unit] = pool.swap(unitAmount, from, to, false);
+          const [unit] = pool.swap(unitAmount, from, to, side === SwapSide.BUY);
           let lastOutput = 1n;
 
           const dataList: [bigint, bigint][] = amounts.map(amount => {
@@ -182,8 +180,7 @@ export class MaverickV2 extends SimpleExchange implements IDex<MaverickV2Data> {
               return [0n, 0n];
             }
 
-            // const output = pool.swap(amount, from, to, side === SwapSide.BUY);
-            const output = pool.swap(amount, from, to, false);
+            const output = pool.swap(amount, from, to, side === SwapSide.BUY);
             lastOutput = output[0];
             return output;
           });
@@ -259,47 +256,60 @@ export class MaverickV2 extends SimpleExchange implements IDex<MaverickV2Data> {
     recipient: Address,
     data: MaverickV2Data,
     side: SwapSide,
-    _: Context,
-    executorAddress: Address,
   ): DexExchangeParam {
-    // TODO:
-    if (side === SwapSide.BUY) throw new Error(`Buy not supported`);
-
     const { pool } = data;
 
-    srcToken = this.dexHelper.config.wrapETH(srcToken);
-    destToken = this.dexHelper.config.wrapETH(destToken);
-
-    const exchangeData = this.maverickV2Iface.encodeFunctionData('swap', [
-      recipient,
-      {
-        amount: side === SwapSide.SELL ? srcAmount : destAmount,
-        tokenAIn: data.tokenA.toLowerCase() === srcToken.toLowerCase(),
-        // exactOutput: side === SwapSide.BUY,
-        exactOutput: false,
-        tickLimit:
-          data.tokenA.toLowerCase() === srcToken.toLowerCase()
-            ? BigInt(data.activeTick) + 100n
-            : BigInt(data.activeTick) - 100n,
-      },
-      '0x',
-    ]);
+    const from = this.dexHelper.config.wrapETH(srcToken);
+    const tokenAIn = data.tokenA.toLowerCase() === from.toLowerCase();
+    const tickLimit = tokenAIn
+      ? BigInt(data.activeTick) + 100n
+      : BigInt(data.activeTick) - 100n;
+
+    if (side === SwapSide.SELL) {
+      // Perform direct swap for SELL side
+
+      const exchangeData = this.maverickV2Iface.encodeFunctionData('swap', [
+        recipient,
+        {
+          amount: srcAmount,
+          tokenAIn,
+          exactOutput: false,
+          tickLimit,
+        },
+        '0x',
+      ]);
+
+      return {
+        needWrapNative: this.needWrapNative,
+        transferSrcTokenBeforeSwap: pool,
+        skipApproval: true,
+        targetExchange: pool,
+        dexFuncHasRecipient: true,
+        exchangeData,
+        returnAmountPos: extractReturnAmountPosition(
+          this.maverickV2Iface,
+          'swap',
+          'amountOut',
+        ),
+      };
+    }
+
+    // perform "exactOutputSingleMinimal" via MaverickV2's Router
+    const exchangeData = this.maverickV2RouterIface.encodeFunctionData(
+      'exactOutputSingleMinimal',
+      [recipient, pool, tokenAIn, destAmount, tickLimit],
+    );
 
     return {
       needWrapNative: this.needWrapNative,
-      transferSrcTokenBeforeSwap: pool,
-      // skipApproval: true,
-      targetExchange: pool,
+      targetExchange: this.config.routerAddress,
       dexFuncHasRecipient: true,
       exchangeData,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.maverickV2Iface,
-              'swap',
-              'amountOut',
-            )
-          : undefined,
+      returnAmountPos: extractReturnAmountPosition(
+        this.maverickV2RouterIface,
+        'exactOutputSingleMinimal',
+        'amountOut_',
+      ),
     };
   }
 
@@ -318,9 +328,11 @@ export class MaverickV2 extends SimpleExchange implements IDex<MaverickV2Data> {
     tokenAddress: Address,
     limit: number,
   ): Promise<PoolLiquidity[]> {
-    const _tokenAddress = this.dexHelper.config.wrapETH(tokenAddress);
+    const _tokenAddress = this.dexHelper.config
+      .wrapETH(tokenAddress)
+      .toLowerCase();
 
-    const pools = await this._queryPoolsAPI(SUBGRAPH_TIMEOUT);
+    const pools = await this._queryPoolsAPI();
 
     if (!pools.length) {
       this.logger.error(
@@ -329,7 +341,7 @@ export class MaverickV2 extends SimpleExchange implements IDex<MaverickV2Data> {
       return [];
     }
 
-    const filteredPools = _.filter(pools, pool => {
+    const filteredPools = pools.filter(pool => {
       return (
         pool.tokenA.address.toLowerCase() === _tokenAddress ||
         pool.tokenB.address.toLowerCase() === _tokenAddress
@@ -351,26 +363,44 @@ export class MaverickV2 extends SimpleExchange implements IDex<MaverickV2Data> {
             decimals: token.decimals,
           },
         ],
-        liquidityUSD: pool.tvl.amount * EFFICIENCY_FACTOR,
+        liquidityUSD: pool.tvl.amount,
       };
     });
 
-    return _.slice(
-      _.sortBy(labeledPools, [pool => -1 * pool.liquidityUSD]),
-      0,
-      limit,
-    );
+    const sortedPools = _.sortBy(labeledPools, [
+      pool => -1 * pool.liquidityUSD,
+    ]);
+
+    return _.slice(sortedPools, 0, limit);
   }
 
-  private async _queryPoolsAPI(
-    timeout = 30000,
-  ): Promise<PoolAPIResponse['pools'] | []> {
+  private async _queryPoolsAPI(): Promise<PoolAPIResponse['pools'] | []> {
+    let cachedPoolsJson = await this.dexHelper.cache.getAndCacheLocally(
+      this.dexKey,
+      this.network,
+      POOL_LIST_CACHE_KEY,
+      POOL_LIST_TTL_SECONDS,
+    );
+
+    if (cachedPoolsJson) return JSON.parse(cachedPoolsJson);
+
     try {
       const res = await this.dexHelper.httpRequest.get<PoolAPIResponse>(
         `${MAVERICK_API_URL}/api/v5/poolsNoBins/${this.network}`,
-        timeout,
+        SUBGRAPH_TIMEOUT,
       );
-      return res.pools || [];
+
+      const pools = res.pools || [];
+
+      await this.dexHelper.cache.setex(
+        this.dexKey,
+        this.network,
+        POOL_LIST_CACHE_KEY,
+        POOL_LIST_TTL_SECONDS,
+        JSON.stringify(pools),
+      );
+
+      return pools;
     } catch (e) {
       this.logger.error(`${this.dexKey}: can not query subgraph: `, e);
       return [];

package/src/dex/maverick-v2/types.ts

@@ -120,6 +120,7 @@ export type MaverickV2Param = {
 };
 
 export type DexParams = {
+  routerAddress: string;
   quoterAddress: string;
   poolLensAddress: string;
 };
@@ -132,6 +133,9 @@ export type PoolAPIResponse = {
     lowerTick: number;
     tickSpacing: number;
     id: string;
+    volume: {
+      amount: number;
+    };
     tokenA: {
       name: string;
       symbol: string;

package/tests/constants-e2e.ts

@@ -1248,6 +1248,10 @@ export const Tokens: {
       address: '0x6ab707aca953edaefbc4fd23ba73294241490620',
       decimals: 6,
     },
+    GHO: {
+      address: '0x7dff72693f6a4149b17e7c6314655f6a9f7c8b33',
+      decimals: 18,
+    },
   },
   [Network.OPTIMISM]: {
     DAI: {
@@ -1381,6 +1385,10 @@ export const Tokens: {
     },
   },
   [Network.BASE]: {
+    wstETH: {
+      address: `0xc1cba3fcea344f92d9239c08c0568f6f2f0ee452`,
+      decimals: 18,
+    },
     PRIME: {
       address: '0xfA980cEd6895AC314E7dE34Ef1bFAE90a5AdD21b',
       decimals: 18,
@@ -1755,6 +1763,7 @@ export const Holders: {
     stataUSDT: '0xc5042f9d9a18e95547864438455c8f05b4987399',
     aaveUSDT: '0xAfa788fab589fe61C23DF76905558f4734444D67',
     crvUSD: '0x9755e99bdb99495d3d31d953785d993c6df8552e',
+    GHO: '0xda39E48523770197EF3CbB70C1bf1cCCF9B4b1E7',
   },
   [Network.OPTIMISM]: {
     ETH: '0xF6D4E5a7c5215F91f59a95065190CCa24bf64554',

package/.idea/aws.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="accountSettings">
-    <option name="activeProfile" value="profile:default" />
-    <option name="activeRegion" value="us-east-1" />
-    <option name="recentlyUsedProfiles">
-      <list>
-        <option value="profile:default" />
-      </list>
-    </option>
-    <option name="recentlyUsedRegions">
-      <list>
-        <option value="us-east-1" />
-      </list>
-    </option>
-  </component>
-</project>

package/.idea/codeStyles/Project.xml

@@ -1,19 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <ScalaCodeStyleSettings>
-      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
-    </ScalaCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACKETS" value="true" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

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$/.idea/paraswap-dex-lib.iml" filepath="$PROJECT_DIR$/.idea/paraswap-dex-lib.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/paraswap-dex-lib.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/prettier.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myRunOnSave" value="true" />
-    <option name="myRunOnReformat" value="true" />
-  </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/build/dex/trader-joe-v2.1/trader-joe-v2.1-new.d.ts

@@ -1,7 +0,0 @@
-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

@@ -1,20 +0,0 @@
-"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

@@ -1 +0,0 @@
-{"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"}