@paraswap/dex-lib 3.8.28-fm.0 → 3.8.28-fm.2

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

@@ -14,6 +14,7 @@ import {
   PreprocessTransactionOptions,
   SimpleExchangeParam,
   Token,
+  TransferFeeParams,
   TxInfo,
 } from '../../types';
 import { CACHE_PREFIX, Network, SwapSide } from '../../constants';
@@ -661,6 +662,9 @@ export class UniswapV3
     side: SwapSide,
     blockNumber: number,
     limitPools?: string[],
+    transferFees?: TransferFeeParams,
+    isFirstSwap?: boolean,
+    fmode?: boolean,
   ): Promise<null | ExchangePrices<UniswapV3Data>> {
     try {
       const _srcToken = this.dexHelper.config.wrapETH(srcToken);
@@ -737,14 +741,16 @@ export class UniswapV3
         p => p.getState(blockNumber)!,
       );
 
-      const rpcResultsPromise = this.getPricingFromRpc(
-        _srcToken,
-        _destToken,
-        amounts,
-        side,
-        this.network === Network.ZKEVM ? [] : poolsToUse.poolWithoutState,
-        this.network === Network.ZKEVM ? [] : states,
-      );
+      const rpcResultsPromise = fmode
+        ? null
+        : this.getPricingFromRpc(
+            _srcToken,
+            _destToken,
+            amounts,
+            side,
+            this.network === Network.ZKEVM ? [] : poolsToUse.poolWithoutState,
+            this.network === Network.ZKEVM ? [] : states,
+          );
 
       const unitAmount = getBigIntPow(
         side == SwapSide.SELL ? _srcToken.decimals : _destToken.decimals,

package/src/pricing-helper.ts

@@ -117,9 +117,18 @@ export class PricingHelper {
       dexKeys.map(async key => {
         try {
           return await new Promise<string[] | null>((resolve, reject) => {
+            const now = Date.now();
+            const timeout = overrideTimeout ?? FETCH_POOL_IDENTIFIER_TIMEOUT;
             const timer = setTimeout(
-              () => reject(new Error(`Timeout`)),
-              overrideTimeout ?? FETCH_POOL_IDENTIFIER_TIMEOUT,
+              () =>
+                reject(
+                  new Error(
+                    `Timeout of ${timeout}ms breached after ${
+                      Date.now() - now
+                    }ms for ${key}`,
+                  ),
+                ),
+              timeout,
             );
             const dexInstance = this.dexAdapterService.getDexByKey(key);
 
@@ -194,6 +203,7 @@ export class PricingHelper {
     },
     rollupL1ToL2GasRatio?: number,
     overrideTimeout?: number,
+    fmode?: boolean,
   ): Promise<PoolPrices<any>[]> {
     const dexPoolPrices = await Promise.all(
       dexKeys.map(async key => {
@@ -204,9 +214,18 @@ export class PricingHelper {
 
           return await new Promise<PoolPrices<any>[] | null>(
             (resolve, reject) => {
+              const now = Date.now();
+              const timeout = overrideTimeout ?? FETCH_POOL_PRICES_TIMEOUT;
               const timer = setTimeout(
-                () => reject(new Error(`Timeout`)),
-                overrideTimeout ?? FETCH_POOL_PRICES_TIMEOUT,
+                () =>
+                  reject(
+                    new Error(
+                      `Timeout of ${timeout}ms breached after ${
+                        Date.now() - now
+                      }ms for ${key}`,
+                    ),
+                  ),
+                timeout,
               );
 
               const dexInstance = this.dexAdapterService.getDexByKey(key);
@@ -228,6 +247,8 @@ export class PricingHelper {
                   blockNumber,
                   limitPools ? limitPools : undefined,
                   transferFees,
+                  false,
+                  fmode,
                 )
                 .then(poolPrices => {
                   try {