@paraswap/dex-lib 2.42.22 → 2.42.23

package/src/config.ts

@@ -51,9 +51,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     adapterAddresses: {
       Adapter01: '0x9bE264469eF954c139Da4A45Cf76CbCC5e3A6A73',
       Adapter02: '0xFC2Ba6E830a04C25e207B8214b26d8C713F6881F',
-      Adapter03: '0xfb2a3de6c7B8c77b520E3da16021f3D8A4E93168',
+      Adapter03: '0xBAEeb4540f59d30E567a5B563CC0c4587eDd9366',
       Adapter04: '0x654dE10890f8B2C5bF54E50Af169a7E93165C416',
-      BuyAdapter: '0x1310dE2C69e9753bee19B5522bad39c5f788efd9',
+      BuyAdapter: '0x84bEF12C9931cE12662cc9F2366b6a5029E4BD29',
       BuyAdapter02: '0xA10c9a84E72d9DfF424Fe2284B6460784bed407E',
     },
     uniswapV2ExchangeRouterAddress:
@@ -165,8 +165,8 @@ const baseConfigs: { [network: number]: BaseConfig } = {
       process.env[`HASHFLOW_DISABLED_MMS_56`]?.split(',') || [],
     adapterAddresses: {
       BscAdapter01: '0xA31d9C571DF00e0F428B0bD24c34D103E8112222',
-      BscAdapter02: '0xEECA9223063bD13e8ca77ed9e39a07f2BD1923E6',
-      BscBuyAdapter: '0x301c2813e3ceb43A448a12f21551EDBcdC37F157',
+      BscAdapter02: '0x84bEF12C9931cE12662cc9F2366b6a5029E4BD29',
+      BscBuyAdapter: '0xBAEeb4540f59d30E567a5B563CC0c4587eDd9366',
     },
     rpcPollingMaxAllowedStateDelayInBlocks: 1,
     rpcPollingBlocksBackToTriggerUpdate: 1,
@@ -193,8 +193,8 @@ const baseConfigs: { [network: number]: BaseConfig } = {
       process.env[`HASHFLOW_DISABLED_MMS_137`]?.split(',') || [],
     adapterAddresses: {
       PolygonAdapter01: '0xE44769f42E1e9592f86B82f206407a8f7C84b4ed',
-      PolygonAdapter02: '0x654cD2Cf97D23059B3db4FaA38BB2b1F8351211d',
-      PolygonBuyAdapter: '0x4426a1F87Ee7e366542c58e29c02AFa2b5878b37',
+      PolygonAdapter02: '0xEECA9223063bD13e8ca77ed9e39a07f2BD1923E6',
+      PolygonBuyAdapter: '0xA10c9a84E72d9DfF424Fe2284B6460784bed407E',
     },
     uniswapV2ExchangeRouterAddress:
       '0xf3938337F7294fEf84e9B2c6D548A93F956Cc281',
@@ -224,8 +224,8 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     dexalotAuthToken: process.env.API_KEY_DEXALOT_AUTH_TOKEN || '',
     adapterAddresses: {
       AvalancheAdapter01: '0x745Ec73855CeC7249E5fF4c9DD81cc65b4D297a9',
-      AvalancheAdapter02: '0x2cdB0cDc2a9321ac2ED5b741828a5216C265Be80',
-      AvalancheBuyAdapter: '0x9Aa41A24A10af2a965A6D406b913a7Cd9C6886ea',
+      AvalancheAdapter02: '0xA10c9a84E72d9DfF424Fe2284B6460784bed407E',
+      AvalancheBuyAdapter: '0x654dE10890f8B2C5bF54E50Af169a7E93165C416',
     },
     uniswapV2ExchangeRouterAddress:
       '0x53e693c6C7FFC4446c53B205Cf513105Bf140D7b',
@@ -280,9 +280,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     hashFlowDisabledMMs:
       process.env[`HASHFLOW_DISABLED_MMS_42161`]?.split(',') || [],
     adapterAddresses: {
-      ArbitrumAdapter01: '0xD8134ACfc9c71Ab51452b5bA23A31354F4739032',
-      ArbitrumAdapter02: '0x7b0c7f946c845bb0d43ad41ece7027e1fc11bea7',
-      ArbitrumBuyAdapter: '0xEECA9223063bD13e8ca77ed9e39a07f2BD1923E6',
+      ArbitrumAdapter01: '0x369A2FDb910d432f0a07381a5E3d27572c876713',
+      ArbitrumAdapter02: '0xe9166234DFB6d3ec05C82404109C02Ca82b16c22',
+      ArbitrumBuyAdapter: '0xe53d24CD81cC81bbf271AD7B02D0d67f851D727c',
     },
     uniswapV2ExchangeRouterAddress:
       '0xB41dD984730dAf82f5C41489E21ac79D5e3B61bC',
@@ -310,8 +310,8 @@ const baseConfigs: { [network: number]: BaseConfig } = {
       process.env[`HASHFLOW_DISABLED_MMS_10`]?.split(',') || [],
 
     adapterAddresses: {
-      OptimismAdapter01: '0x3ad7f275E27AC579cA88e0b4765828242A9E8C49',
-      OptimismBuyAdapter: '0xfdDD975FE4c1af20c24A3Ad2b33e8609a62DDC73',
+      OptimismAdapter01: '0x654dE10890f8B2C5bF54E50Af169a7E93165C416',
+      OptimismBuyAdapter: '0xA10c9a84E72d9DfF424Fe2284B6460784bed407E',
     },
     uniswapV2ExchangeRouterAddress:
       '0xB41dD984730dAf82f5C41489E21ac79D5e3B61bC',
@@ -366,7 +366,7 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     hashFlowDisabledMMs: [],
     adapterAddresses: {
-      BaseAdapter01: '0x30F6B9b6485ff0B67E881f5ac80D3F1c70A4B23d',
+      BaseAdapter01: '0x654dE10890f8B2C5bF54E50Af169a7E93165C416',
       BaseBuyAdapter: '0xB11bCA7B01b425afD0743A4D77B4f593883f94C0',
     },
     uniswapV2ExchangeRouterAddress:

package/src/dex/hashflow/config.ts

@@ -1,26 +1,26 @@
-import { DexParams } from './types';
-import { DexConfigMap, AdapterMappings } from '../../types';
 import { Network, SwapSide } from '../../constants';
+import { AdapterMappings, DexConfigMap } from '../../types';
+import { DexParams } from './types';
 
 export const HashflowConfig: DexConfigMap<DexParams> = {
   Hashflow: {
     [Network.MAINNET]: {
-      routerAddress: '0xf6a94dfd0e6ea9ddfdffe4762ad4236576136613',
+      routerAddress: '0x55084eE0fEf03f14a305cd24286359A35D735151',
     },
     [Network.POLYGON]: {
-      routerAddress: '0x72550597dc0b2e0bec24e116add353599eff2e35',
+      routerAddress: '0x55084eE0fEf03f14a305cd24286359A35D735151',
     },
     [Network.BSC]: {
-      routerAddress: '0x0acffb0fb2cddd9bd35d03d359f3d899e32facc9',
+      routerAddress: '0x55084eE0fEf03f14a305cd24286359A35D735151',
     },
     [Network.ARBITRUM]: {
-      routerAddress: '0x1f772fa3bc263160ea09bb16ce1a6b8fc0fab36a',
+      routerAddress: '0x55084eE0fEf03f14a305cd24286359A35D735151',
     },
     [Network.AVALANCHE]: {
-      routerAddress: '0x64d2f9f44fe26c157d552ae7eaa613ca6587b59e',
+      routerAddress: '0x55084eE0fEf03f14a305cd24286359A35D735151',
     },
     [Network.OPTIMISM]: {
-      routerAddress: '0xb3999f658c0391d94a37f7ff328f3fec942bcadc',
+      routerAddress: '0xCa310B1B942A30Ff4b40a5E1b69AB4607eC79Bc1',
     },
   },
 };

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

@@ -1,15 +1,15 @@
 import dotenv from 'dotenv';
 dotenv.config();
 
-import { testE2E } from '../../../tests/utils-e2e';
+import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import {
-  Tokens,
   Holders,
   NativeTokenSymbols,
+  Tokens,
 } from '../../../tests/constants-e2e';
-import { Network, ContractMethod, SwapSide } from '../../constants';
-import { StaticJsonRpcProvider } from '@ethersproject/providers';
+import { testE2E } from '../../../tests/utils-e2e';
 import { generateConfig } from '../../config';
+import { ContractMethod, Network, SwapSide } from '../../constants';
 
 // Give time for rate fetcher to fill the cache
 const sleepMs = 3000;

package/src/dex/hashflow/hashflow-integration.test.ts

@@ -2,16 +2,17 @@
 import dotenv from 'dotenv';
 dotenv.config();
 
-import { DummyDexHelper } from '../../dex-helper/index';
-import { Network, SwapSide } from '../../constants';
-import { BI_POWS } from '../../bigint-constants';
-import { Hashflow } from './hashflow';
+import { Tokens } from '../../../tests/constants-e2e';
 import {
+  checkConstantPoolPrices,
   checkPoolPrices,
   checkPoolsLiquidity,
-  checkConstantPoolPrices,
+  sleep,
 } from '../../../tests/utils';
-import { Tokens } from '../../../tests/constants-e2e';
+import { BI_POWS } from '../../bigint-constants';
+import { Network, SwapSide } from '../../constants';
+import { DummyDexHelper } from '../../dex-helper/index';
+import { Hashflow } from './hashflow';
 
 async function testPricingOnNetwork(
   hashflow: Hashflow,
@@ -104,6 +105,8 @@ describe('Hashflow', function () {
     beforeAll(async () => {
       blockNumber = await dexHelper.web3Provider.eth.getBlockNumber();
       hashflow = new Hashflow(network, dexKey, dexHelper);
+      await hashflow.initializePricing(0);
+      await sleep(5000);
     });
 
     it('getPoolIdentifiers and getPricesVolume SELL', async function () {

package/src/dex/hashflow/hashflow.ts

@@ -1,62 +1,61 @@
+import { ChainId, ZERO_ADDRESS } from '@hashflow/sdk';
+import { Chain, ChainType, HashflowApi } from '@hashflow/taker-js';
 import {
-  Token,
+  MarketMakersResponse,
+  PriceLevelsResponse,
+  RfqResponse,
+} from '@hashflow/taker-js/dist/types/rest';
+import BigNumber from 'bignumber.js';
+import { Interface } from 'ethers/lib/utils';
+import { assert } from 'ts-essentials';
+import routerAbi from '../../abi/hashflow/HashflowRouter.abi.json';
+import { BI_MAX_UINT256 } from '../../bigint-constants';
+import { BN_0, BN_1, getBigNumberPow } from '../../bignumber-constants';
+import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
+import {
+  CACHE_PREFIX,
+  ETHER_ADDRESS,
+  Network,
+  SwapSide,
+} from '../../constants';
+import { IDexHelper } from '../../dex-helper/idex-helper';
+import { IDex } from '../../dex/idex';
+import {
+  AdapterExchangeParam,
   Address,
   ExchangePrices,
-  PoolPrices,
-  AdapterExchangeParam,
-  SimpleExchangeParam,
-  PoolLiquidity,
-  Logger,
   ExchangeTxInfo,
+  Logger,
   OptimalSwapExchange,
+  PoolLiquidity,
+  PoolPrices,
   PreprocessTransactionOptions,
+  SimpleExchangeParam,
+  Token,
 } from '../../types';
-import {
-  SwapSide,
-  Network,
-  ETHER_ADDRESS,
-  CACHE_PREFIX,
-} from '../../constants';
-import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import { getDexKeysWithNetwork } from '../../utils';
-import { IDex } from '../../dex/idex';
-import { IDexHelper } from '../../dex-helper/idex-helper';
-import {
-  HashflowData,
-  PriceLevel,
-  RfqError,
-  RFQType,
-  SlippageCheckError,
-} from './types';
+import { TooStrictSlippageCheckError } from '../generic-rfq/types';
 import { SimpleExchange } from '../simple-exchange';
 import { Adapters, HashflowConfig } from './config';
-import { HashflowApi } from '@hashflow/taker-js';
-import { RateFetcher } from './rate-fetcher';
-import routerAbi from '../../abi/hashflow/HashflowRouter.abi.json';
-import BigNumber from 'bignumber.js';
-import { BN_0, BN_1, getBigNumberPow } from '../../bignumber-constants';
-import { Interface } from 'ethers/lib/utils';
-import { ChainId, ZERO_ADDRESS } from '@hashflow/sdk';
-import {
-  MarketMakersResponse,
-  PriceLevelsResponse,
-  RfqResponse,
-} from '@hashflow/taker-js/dist/types/rest';
-import { assert } from 'ts-essentials';
 import {
-  HASHFLOW_BLACKLIST_TTL_S,
-  HASHFLOW_MM_RESTRICT_TTL_S,
   HASHFLOW_API_CLIENT_NAME,
-  HASHFLOW_API_URL,
-  HASHFLOW_API_PRICES_POLLING_INTERVAL_MS,
   HASHFLOW_API_MARKET_MAKERS_POLLING_INTERVAL_MS,
-  HASHFLOW_PRICES_CACHES_TTL_S,
-  HASHFLOW_MARKET_MAKERS_CACHES_TTL_S,
+  HASHFLOW_API_PRICES_POLLING_INTERVAL_MS,
+  HASHFLOW_API_URL,
+  HASHFLOW_BLACKLIST_TTL_S,
   HASHFLOW_GAS_COST,
+  HASHFLOW_MARKET_MAKERS_CACHES_TTL_S,
   HASHFLOW_MIN_SLIPPAGE_FACTOR_THRESHOLD_FOR_RESTRICTION,
+  HASHFLOW_MM_RESTRICT_TTL_S,
+  HASHFLOW_PRICES_CACHES_TTL_S,
 } from './constants';
-import { BI_MAX_UINT256 } from '../../bigint-constants';
-import { TooStrictSlippageCheckError } from '../generic-rfq/types';
+import { RateFetcher } from './rate-fetcher';
+import {
+  HashflowData,
+  PriceLevel,
+  RfqError,
+  SlippageCheckError,
+} from './types';
 
 export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
   readonly isStatePollingDex = true;
@@ -121,19 +120,21 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
           markerMakersIntervalMs:
             HASHFLOW_API_MARKET_MAKERS_POLLING_INTERVAL_MS,
           marketMakersReqParams: {
-            url: `${HASHFLOW_API_URL}/taker/v1/marketMakers`,
+            url: `${HASHFLOW_API_URL}/taker/v3/market-makers`,
             params: {
-              networkId: this.network,
+              baseChainId: this.network,
               source: HASHFLOW_API_CLIENT_NAME,
+              baseChainType: 'evm',
             },
             headers: { Authorization: this.hashFlowAuthToken },
           },
           pricesReqParams: {
-            url: `${HASHFLOW_API_URL}/taker/v2/price-levels`,
+            url: `${HASHFLOW_API_URL}/taker/v3/price-levels`,
             params: {
-              networkId: this.network,
+              baseChainId: this.network,
               source: HASHFLOW_API_CLIENT_NAME,
               marketMakers: [],
+              baseChainType: 'evm',
             },
             headers: { Authorization: this.hashFlowAuthToken },
           },
@@ -321,8 +322,8 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
     priceLevels: PriceLevel[],
   ): { level: BigNumber; price: BigNumber }[] =>
     priceLevels.map(l => ({
-      level: new BigNumber(l.level),
-      price: new BigNumber(l.price),
+      level: new BigNumber(l.q),
+      price: new BigNumber(l.p),
     }));
 
   computeLevelsQuote(
@@ -488,7 +489,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
           new BigNumber(a.toString()).dividedBy(divider),
         );
         const firstLevelRaw = levels[0];
-        const firstLevelAmountBN = new BigNumber(firstLevelRaw.level);
+        const firstLevelAmountBN = new BigNumber(firstLevelRaw.q);
 
         if (amountsRaw[amountsRaw.length - 1].lt(firstLevelAmountBN)) {
           return null;
@@ -496,7 +497,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
 
         if (firstLevelAmountBN.gt(0)) {
           // Add zero level for price computation
-          levels.unshift({ level: '0', price: firstLevelRaw.price });
+          levels.unshift({ q: '0', p: firstLevelRaw.p });
         }
 
         const unitPrice = this.computePricesFromLevels(
@@ -565,14 +566,15 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
       `${this.dexKey}-${this.network}: MM was not provided in data`,
     );
     const chainId = this.network as ChainId;
-
+    let chainType: ChainType = 'evm';
+    const chain: Chain = { chainType, chainId };
     const normalizedSrcToken = this.normalizeToken(srcToken);
     const normalizedDestToken = this.normalizeToken(destToken);
 
     let rfq: RfqResponse;
     try {
       rfq = await this.api.requestQuote({
-        chainId,
+        baseChain: chain,
         baseToken: normalizedSrcToken.address,
         quoteToken: normalizedDestToken.address,
         ...(side === SwapSide.SELL
@@ -594,7 +596,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
         )}: ${JSON.stringify(rfq)}`;
         this.logger.warn(message);
         throw new RfqError(message);
-      } else if (!rfq.quoteData) {
+      } else if (!rfq.quotes[0].quoteData) {
         const message = `${this.dexKey}-${
           this.network
         }: Failed to fetch RFQ for ${this.getPairName(
@@ -603,7 +605,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
         )}. Missing quote data`;
         this.logger.warn(message);
         throw new RfqError(message);
-      } else if (!rfq.signature) {
+      } else if (!rfq.quotes[0].signature) {
         const message = `${this.dexKey}-${
           this.network
         }: Failed to fetch RFQ for ${this.getPairName(
@@ -612,40 +614,22 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
         )}. Missing signature`;
         this.logger.warn(message);
         throw new RfqError(message);
-      } else if (!rfq.gasEstimate) {
-        const message = `${this.dexKey}-${
-          this.network
-        }: Failed to fetch RFQ for ${this.getPairName(
-          normalizedSrcToken.address,
-          normalizedDestToken.address,
-        )}. No gas estimate.`;
-        this.logger.warn(message);
-        throw new RfqError(message);
-      } else if (rfq.quoteData.rfqType !== RFQType.RFQT) {
-        const message = `${this.dexKey}-${
-          this.network
-        }: Failed to fetch RFQ for ${this.getPairName(
-          normalizedSrcToken.address,
-          normalizedDestToken.address,
-        )}. Invalid RFQ type.`;
-        this.logger.warn(message);
-        throw new RfqError(message);
       }
 
       assert(
-        rfq.quoteData.baseToken === normalizedSrcToken.address,
-        `QuoteData baseToken=${rfq.quoteData.baseToken} is different from srcToken=${normalizedSrcToken.address}`,
+        rfq.quotes[0].quoteData.baseToken === normalizedSrcToken.address,
+        `QuoteData baseToken=${rfq.quotes[0].quoteData.baseToken} is different from srcToken=${normalizedSrcToken.address}`,
       );
       assert(
-        rfq.quoteData.quoteToken === normalizedDestToken.address,
-        `QuoteData baseToken=${rfq.quoteData.quoteToken} is different from srcToken=${normalizedDestToken.address}`,
+        rfq.quotes[0].quoteData.quoteToken === normalizedDestToken.address,
+        `QuoteData baseToken=${rfq.quotes[0].quoteData.quoteToken} is different from srcToken=${normalizedDestToken.address}`,
       );
 
-      const expiryAsBigInt = BigInt(rfq.quoteData.quoteExpiry);
+      const expiryAsBigInt = BigInt(rfq.quotes[0].quoteData.quoteExpiry);
       const minDeadline = expiryAsBigInt > 0 ? expiryAsBigInt : BI_MAX_UINT256;
 
-      const baseTokenAmount = BigInt(rfq.quoteData.baseTokenAmount);
-      const quoteTokenAmount = BigInt(rfq.quoteData.quoteTokenAmount);
+      const baseTokenAmount = BigInt(rfq.quotes[0].quoteData.baseTokenAmount);
+      const quoteTokenAmount = BigInt(rfq.quotes[0].quoteData.quoteTokenAmount);
 
       const srcAmount = BigInt(optimalSwapExchange.srcAmount);
       const destAmount = BigInt(optimalSwapExchange.destAmount);
@@ -721,9 +705,8 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
           ...optimalSwapExchange,
           data: {
             mm,
-            quoteData: rfq.quoteData,
-            signature: rfq.signature,
-            gasEstimate: rfq.gasEstimate,
+            quoteData: rfq.quotes[0].quoteData,
+            signature: rfq.quotes[0].signature,
           },
         },
         { deadline: minDeadline },
@@ -818,7 +801,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
         {
           pool: quoteData.pool,
           quoteToken: quoteData.quoteToken,
-          externalAccount: quoteData.eoa ?? ZERO_ADDRESS,
+          externalAccount: quoteData.externalAccount ?? ZERO_ADDRESS,
           baseTokenAmount: quoteData.baseTokenAmount,
           quoteTokenAmount: quoteData.quoteTokenAmount,
           quoteExpiry: quoteData.quoteExpiry,
@@ -879,10 +862,10 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
     );
 
     // Encode here the transaction arguments
-    const swapData = this.routerInterface.encodeFunctionData('tradeSingleHop', [
+    const swapData = this.routerInterface.encodeFunctionData('tradeRFQT', [
       [
         quoteData.pool,
-        quoteData.eoa ?? ZERO_ADDRESS,
+        quoteData.externalAccount ?? ZERO_ADDRESS,
         quoteData.trader,
         quoteData.effectiveTrader ?? quoteData.trader,
         quoteData.baseToken,
@@ -924,7 +907,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
     levels: PriceLevel[],
     baseTokenPriceUsd: number,
   ): number => {
-    const maxLevel = new BigNumber(levels[levels.length - 1]?.level ?? '0');
+    const maxLevel = new BigNumber(levels[levels.length - 1]?.q ?? '0');
     return maxLevel.multipliedBy(baseTokenPriceUsd).toNumber();
   };
 

package/src/dex/hashflow/rate-fetcher.ts

@@ -1,14 +1,14 @@
+import { Network } from '../../constants';
 import { IDexHelper } from '../../dex-helper';
 import { Fetcher, SkippingRequest } from '../../lib/fetcher/fetcher';
 import { validateAndCast } from '../../lib/validators';
 import { Logger } from '../../types';
 import {
+  HashflowMarketMakersResponse,
   HashflowRateFetcherConfig,
   HashflowRatesResponse,
-  HashflowMarketMakersResponse,
 } from './types';
-import { pricesResponseValidator, marketMakersValidator } from './validators';
-import { Network } from '../../constants';
+import { marketMakersValidator, pricesResponseValidator } from './validators';
 
 export class RateFetcher {
   private rateFetcher: Fetcher<HashflowRatesResponse>;
@@ -30,7 +30,6 @@ export class RateFetcher {
     this.pricesCacheTTL = config.rateConfig.pricesCacheTTLSecs;
     this.marketMakersCacheKey = config.rateConfig.marketMakersCacheKey;
     this.marketMakersCacheTTL = config.rateConfig.marketMakersCacheTTLSecs;
-
     this.marketMakersFetcher = new Fetcher<HashflowMarketMakersResponse>(
       dexHelper.httpRequest,
       {
@@ -69,10 +68,9 @@ export class RateFetcher {
               );
             }
 
-            const prices = await dexHelper.httpRequest.request({
-              ...options,
-              params: { ...options.params, marketMakers: filteredMarketMakers },
-            });
+            options.params.marketMakers = filteredMarketMakers;
+
+            const prices = await dexHelper.httpRequest.request(options);
 
             return prices;
           },

package/src/dex/hashflow/types.ts

@@ -1,11 +1,10 @@
-import { QuoteData } from '@hashflow/taker-js/dist/types/common';
+import { Chain, QuoteData } from '@hashflow/taker-js/dist/types/common';
 import { RequestHeaders } from '../../dex-helper';
 
 export type HashflowData = {
   mm: string;
   quoteData?: QuoteData;
   signature?: string;
-  gasEstimate?: number;
 };
 
 export type DexParams = {
@@ -13,8 +12,8 @@ export type DexParams = {
 };
 
 export interface PriceLevel {
-  level: string;
-  price: string;
+  q: string;
+  p: string;
 }
 
 export class RfqError extends Error {}
@@ -29,7 +28,6 @@ export class SlippageCheckError extends Error {}
 export type HashflowRatesLevel = {
   pair: Record<string, string>;
   levels: Array<Record<string, string>>;
-  includesFees: boolean;
 };
 
 export type HashflowMarketMakersResponse = {
@@ -38,7 +36,8 @@ export type HashflowMarketMakersResponse = {
 
 export type HashflowRatesResponse = {
   status: string;
-  networkId: string;
+  baseChain: Chain;
+  quoteChain: Chain;
   levels: Record<string, Array<HashflowRatesLevel>>;
 };
 

package/src/dex/hashflow/validators.ts

@@ -12,17 +12,24 @@ export const levelValidator = joi.array().items(
     }),
     levels: joi.array().items(
       joi.object({
-        level: joi.string().min(1).required(),
-        price: joi.string().min(1).required(),
+        q: joi.string().min(1).required(),
+        p: joi.string().min(1).required(),
       }),
     ),
-    includesFees: joi.boolean().required(),
   }),
 );
 
 export const pricesResponseValidator = joi.object({
   status: joi.string().required(),
-  networkId: joi.number().required(),
+  // networkId: joi.number().required(),
+  baseChain: joi.object({
+    chainType: joi.string().required(),
+    chainId: joi.number().required(),
+  }),
+  quoteChain: joi.object({
+    chainType: joi.string().required(),
+    chainId: joi.number().required(),
+  }),
   levels: joi.object().pattern(joi.string().min(1), levelValidator),
 });
 

package/src/lib/fetcher/fetcher.ts

@@ -1,7 +1,7 @@
-import { IRequestWrapper } from '../../dex-helper';
+import { isFunction } from 'lodash';
 import { Logger } from 'log4js';
+import { IRequestWrapper } from '../../dex-helper';
 import { RequestConfig, Response } from '../../dex-helper/irequest-wrapper';
-import { isFunction } from 'lodash';
 
 const FETCH_TIMEOUT_MS = 10 * 1000;
 const FETCH_FAIL_MAX_ATTEMPT = 5;

package/tests/constants-e2e.ts

@@ -1178,7 +1178,7 @@ export const Holders: {
     DAI: '0x1337bedc9d22ecbe766df105c9623922a27963ec',
     WETH: '0x68F5C0A2DE713a54991E01858Fd27a3832401849',
     POPS: '0x3cbd9044aaabef08ce93a68448e093cff405ad76',
-    USDC: '0xEBb8EA128BbdFf9a1780A4902A9380022371d466',
+    USDC: '	0x9f7b6e20bc64f12adaabeb739ead802fc7765d03',
     USDT: '0xEBb8EA128BbdFf9a1780A4902A9380022371d466',
     OP: '0xEBb8EA128BbdFf9a1780A4902A9380022371d466',
     aOptWETH: '0x7B7D80C40415F744864f051B806b466e2fbB8E68',

package/tests/tenderly-simulation.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
-import axios from 'axios';
-import { Address } from '@paraswap/core';
 import { Provider } from '@ethersproject/providers';
+import { Address } from '@paraswap/core';
+import axios from 'axios';
 import { TxObject } from '../src/types';
 import { StateOverrides, StateSimulateApiOverride } from './smart-tokens';
 
@@ -76,6 +76,7 @@ export class TenderlySimulation implements TransactionSimulator {
     }
 
     try {
+      await process.nextTick(() => {}); // https://stackoverflow.com/questions/69169492/async-external-function-leaves-open-handles-jest-supertest-express
       let res = await axios.post(
         `https://api.tenderly.co/api/v1/account/${TENDERLY_ACCOUNT_ID}/project/${TENDERLY_PROJECT}/fork`,
         {
@@ -109,6 +110,7 @@ export class TenderlySimulation implements TransactionSimulator {
     };
     try {
       if (stateOverrides) {
+        await process.nextTick(() => {}); // https://stackoverflow.com/questions/69169492/async-external-function-leaves-open-handles-jest-supertest-express
         const result = await axios.post(
           `
         https://api.tenderly.co/api/v1/account/${TENDERLY_ACCOUNT_ID}/project/${TENDERLY_PROJECT}/contracts/encode-states`,
@@ -133,6 +135,7 @@ export class TenderlySimulation implements TransactionSimulator {
         );
       }
 
+      await process.nextTick(() => {}); // https://stackoverflow.com/questions/69169492/async-external-function-leaves-open-handles-jest-supertest-express
       const { data } = await axios.post(
         `https://api.tenderly.co/api/v1/account/${TENDERLY_ACCOUNT_ID}/project/${TENDERLY_PROJECT}/fork/${this.forkId}/simulate`,
         _params,

package/.vscode/launch.json

@@ -1,39 +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 Jest Tests",
-      "program": "${workspaceFolder}/node_modules/ts-node/dist/bin.js",
-      "args": [
-        "--project",
-        "tsconfig.json",
-        // "${workspaceFolder}/src/dex/algebra/scripts/validate-state.ts",
-        "${workspaceFolder}/scripts/dex-integration.ts",
-        "test",
-        "algebra"
-      ],
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      // "disableOptimisticBPs": true,
-      "runtimeArgs": ["--nolazy"],
-      "sourceMaps": true,
-      "smartStep": true,
-      "skipFiles": ["<node_internals>/**"],
-      "cwd": "${workspaceFolder}",
-      // "protocol": "inspector"
-    }
-  ]
-}

package/.vscode/settings.json

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