@paraswap/dex-lib 2.14.7-hashflow-state-polling-dex.3 → 2.14.7-hashflow-state-polling-dex.5

package/build/dex/hashflow/constants.d.ts

@@ -1,7 +1,8 @@
 export declare const HASHFLOW_BLACKLIST_TTL_S: number;
 export declare const HASHFLOW_MM_RESTRICT_TTL_S: number;
 export declare const HASHFLOW_PRICES_CACHES_TTL_S = 3;
-export declare const HASHFLOW_MARKET_MAKERS_CACHES_TTL_S = 3;
-export declare const HASHFLOW_API_POLLING_INTERVAL_MS = 0;
+export declare const HASHFLOW_MARKET_MAKERS_CACHES_TTL_S = 30;
+export declare const HASHFLOW_API_PRICES_POLLING_INTERVAL_MS = 0;
+export declare const HASHFLOW_API_MARKET_MAKERS_POLLING_INTERVAL_MS: number;
 export declare const HASHFLOW_API_URL = "https://api.hashflow.com";
 export declare const HASHFLOW_API_CLIENT_NAME = "paraswap";

package/build/dex/hashflow/constants.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HASHFLOW_API_CLIENT_NAME = exports.HASHFLOW_API_URL = exports.HASHFLOW_API_POLLING_INTERVAL_MS = exports.HASHFLOW_MARKET_MAKERS_CACHES_TTL_S = exports.HASHFLOW_PRICES_CACHES_TTL_S = exports.HASHFLOW_MM_RESTRICT_TTL_S = exports.HASHFLOW_BLACKLIST_TTL_S = void 0;
+exports.HASHFLOW_API_CLIENT_NAME = exports.HASHFLOW_API_URL = exports.HASHFLOW_API_MARKET_MAKERS_POLLING_INTERVAL_MS = exports.HASHFLOW_API_PRICES_POLLING_INTERVAL_MS = exports.HASHFLOW_MARKET_MAKERS_CACHES_TTL_S = exports.HASHFLOW_PRICES_CACHES_TTL_S = exports.HASHFLOW_MM_RESTRICT_TTL_S = exports.HASHFLOW_BLACKLIST_TTL_S = void 0;
 // 7 days
 exports.HASHFLOW_BLACKLIST_TTL_S = 60 * 60 * 24 * 7;
 exports.HASHFLOW_MM_RESTRICT_TTL_S = 60 * 60;
 exports.HASHFLOW_PRICES_CACHES_TTL_S = 3;
-exports.HASHFLOW_MARKET_MAKERS_CACHES_TTL_S = 3;
-exports.HASHFLOW_API_POLLING_INTERVAL_MS = 0;
+exports.HASHFLOW_MARKET_MAKERS_CACHES_TTL_S = 30;
+exports.HASHFLOW_API_PRICES_POLLING_INTERVAL_MS = 0;
+exports.HASHFLOW_API_MARKET_MAKERS_POLLING_INTERVAL_MS = 28 * 1000; // 28 secs
 exports.HASHFLOW_API_URL = 'https://api.hashflow.com';
 exports.HASHFLOW_API_CLIENT_NAME = 'paraswap';
 //# sourceMappingURL=constants.js.map

package/build/dex/hashflow/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/dex/hashflow/constants.ts"],"names":[],"mappings":";;;AACA,SAAS;AACI,QAAA,wBAAwB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAE5C,QAAA,0BAA0B,GAAG,EAAE,GAAG,EAAE,CAAC;AAErC,QAAA,4BAA4B,GAAG,CAAC,CAAC;AAEjC,QAAA,mCAAmC,GAAG,CAAC,CAAC;AAExC,QAAA,gCAAgC,GAAG,CAAC,CAAC;AAErC,QAAA,gBAAgB,GAAG,0BAA0B,CAAC;AAE9C,QAAA,wBAAwB,GAAG,UAAU,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/dex/hashflow/constants.ts"],"names":[],"mappings":";;;AAAA,SAAS;AACI,QAAA,wBAAwB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAE5C,QAAA,0BAA0B,GAAG,EAAE,GAAG,EAAE,CAAC;AAErC,QAAA,4BAA4B,GAAG,CAAC,CAAC;AAEjC,QAAA,mCAAmC,GAAG,EAAE,CAAC;AAEzC,QAAA,uCAAuC,GAAG,CAAC,CAAC;AAE5C,QAAA,8CAA8C,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,UAAU;AAEtE,QAAA,gBAAgB,GAAG,0BAA0B,CAAC;AAE9C,QAAA,wBAAwB,GAAG,UAAU,CAAC"}

package/build/dex/hashflow/hashflow.d.ts

@@ -48,8 +48,8 @@ export declare class Hashflow extends SimpleExchange implements IDex<HashflowDat
         price: BigNumber;
     }[];
     computeLevelsQuote(priceLevels: PriceLevel[], reqBaseAmount?: BigNumber, reqQuoteAmount?: BigNumber): BigNumber | undefined;
-    getMarketMakers(): Promise<MarketMakersResponse['marketMakers']>;
-    getLevelsWithCache(): Promise<PriceLevelsResponse['levels']>;
+    getCachedMarketMakers(): Promise<MarketMakersResponse['marketMakers'] | null>;
+    getCachedLevels(): Promise<PriceLevelsResponse['levels'] | null>;
     normalizeToken(token: Token): Token;
     getPricesVolume(srcToken: Token, destToken: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[]): Promise<null | ExchangePrices<HashflowData>>;
     preProcessTransaction(optimalSwapExchange: OptimalSwapExchange<HashflowData>, srcToken: Token, destToken: Token, side: SwapSide, options: PreprocessTransactionOptions): Promise<[OptimalSwapExchange<HashflowData>, ExchangeTxInfo]>;

package/build/dex/hashflow/hashflow.js

@@ -43,7 +43,6 @@ const sdk_1 = require("@hashflow/sdk");
 const ts_essentials_1 = require("ts-essentials");
 const constants_2 = require("./constants");
 const bigint_constants_1 = require("../../bigint-constants");
-const HASHFLOW_ASYNC_CALL_TIMEOUT = 150;
 class Hashflow extends simple_exchange_1.SimpleExchange {
     constructor(network, dexKey, dexHelper, adapters = config_1.Adapters[network] || {}, routerAddress = config_1.HashflowConfig['Hashflow'][network]
         .routerAddress, routerInterface = new utils_2.Interface(HashflowRouter_abi_json_1.default)) {
@@ -85,19 +84,28 @@ class Hashflow extends simple_exchange_1.SimpleExchange {
     }
     async initializePricing(blockNumber) {
         if (!this.dexHelper.config.isSlave) {
-            this.rateFetcher = new rate_fetcher_1.RateFetcher(this.dexHelper, this.dexKey, this.logger, {
+            this.rateFetcher = new rate_fetcher_1.RateFetcher(this.dexHelper, this.dexKey, this.network, this.logger, {
                 rateConfig: {
-                    intervalMs: constants_2.HASHFLOW_API_POLLING_INTERVAL_MS,
+                    pricesIntervalMs: constants_2.HASHFLOW_API_PRICES_POLLING_INTERVAL_MS,
+                    markerMakersIntervalMs: constants_2.HASHFLOW_API_MARKET_MAKERS_POLLING_INTERVAL_MS,
                     marketMakersReqParams: {
                         url: `${constants_2.HASHFLOW_API_URL}/taker/v1/marketMakers`,
-                        params: { networkId: this.network, source: constants_2.HASHFLOW_API_CLIENT_NAME },
+                        params: {
+                            networkId: this.network,
+                            source: constants_2.HASHFLOW_API_CLIENT_NAME,
+                        },
                         headers: { Authorization: this.hashFlowAuthToken },
                     },
                     pricesReqParams: {
                         url: `${constants_2.HASHFLOW_API_URL}/taker/v2/price-levels`,
-                        params: { networkId: this.network, source: constants_2.HASHFLOW_API_CLIENT_NAME, marketMakers: [] },
+                        params: {
+                            networkId: this.network,
+                            source: constants_2.HASHFLOW_API_CLIENT_NAME,
+                            marketMakers: [],
+                        },
                         headers: { Authorization: this.hashFlowAuthToken },
                     },
+                    getCachedMarketMakers: this.getCachedMarketMakers.bind(this),
                     filterMarketMakers: this.getFilteredMarketMakers.bind(this),
                     pricesCacheKey: this.pricesCacheKey,
                     pricesCacheTTLSecs: constants_2.HASHFLOW_PRICES_CACHES_TTL_S,
@@ -124,7 +132,7 @@ class Hashflow extends simple_exchange_1.SimpleExchange {
         if (normalizedSrcToken.address === normalizedDestToken.address) {
             return [];
         }
-        const levels = await this.getLevelsWithCache();
+        const levels = (await this.getCachedLevels()) || {};
         const makers = Object.keys(levels);
         return makers
             .filter(m => {
@@ -233,19 +241,19 @@ class Hashflow extends simple_exchange_1.SimpleExchange {
         }
         return undefined;
     }
-    async getMarketMakers() {
+    async getCachedMarketMakers() {
         const cachedMarketMakers = await this.dexHelper.cache.rawget(this.marketMakersCacheKey);
         if (cachedMarketMakers) {
             return JSON.parse(cachedMarketMakers);
         }
-        return [];
+        return null;
     }
-    async getLevelsWithCache() {
+    async getCachedLevels() {
         const cachedLevels = await this.dexHelper.cache.rawget(this.pricesCacheKey);
         if (cachedLevels) {
             return JSON.parse(cachedLevels);
         }
-        return {};
+        return null;
     }
     // Hashflow protocol for native token expects 0x00000... instead of 0xeeeee...
     normalizeToken(token) {
@@ -266,7 +274,7 @@ class Hashflow extends simple_exchange_1.SimpleExchange {
         const pools = limitPools ??
             (await this.getPoolIdentifiers(srcToken, destToken, side, blockNumber));
         const marketMakersToUse = pools.map(p => p.split(`${prefix}_`).pop());
-        const levelsMap = await this.getLevelsWithCache();
+        const levelsMap = (await this.getCachedLevels()) || {};
         Object.keys(levelsMap).forEach(mmKey => {
             if (!marketMakersToUse.includes(mmKey)) {
                 delete levelsMap[mmKey];
@@ -317,7 +325,7 @@ class Hashflow extends simple_exchange_1.SimpleExchange {
         const normalizedDestToken = this.normalizeToken(destToken);
         let rfq;
         try {
-            rfq = await utils_1.Utils.timeoutPromise(this.api.requestQuote({
+            rfq = await this.api.requestQuote({
                 chainId,
                 baseToken: normalizedSrcToken.address,
                 quoteToken: normalizedDestToken.address,
@@ -329,7 +337,7 @@ class Hashflow extends simple_exchange_1.SimpleExchange {
                 wallet: this.augustusAddress.toLowerCase(),
                 effectiveTrader: options.txOrigin.toLowerCase(),
                 marketMakers: [mm],
-            }), HASHFLOW_ASYNC_CALL_TIMEOUT, 'Hashflow: requestQuote timeout');
+            });
             if (rfq.status !== 'success') {
                 const message = `${this.dexKey}-${this.network}: Failed to fetch RFQ for ${this.getPairName(normalizedSrcToken.address, normalizedDestToken.address)}: ${JSON.stringify(rfq)}`;
                 this.logger.warn(message);
@@ -504,9 +512,9 @@ class Hashflow extends simple_exchange_1.SimpleExchange {
     }
     async getTopPoolsForToken(tokenAddress, limit) {
         const _tokenAddress = tokenAddress.toLowerCase();
-        const makers = await this.getMarketMakers();
+        const makers = (await this.getCachedMarketMakers()) || [];
         const filteredMakers = await this.getFilteredMarketMakers(makers);
-        const pLevels = await this.getLevelsWithCache();
+        const pLevels = (await this.getCachedLevels()) || {};
         let baseToken = undefined;
         // TODO: Improve efficiency of this part. Quite inefficient way to determine
         // Token address and decimals. But since it is not called frequently, not worth

package/build/dex/hashflow/hashflow.js.map

@@ -1 +1 @@
-{"version":3,"file":"hashflow.js","sourceRoot":"","sources":["../../../src/dex/hashflow/hashflow.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hashflow.js","sourceRoot":"","sources":["../../../src/dex/hashflow/hashflow.ts"],"names":[],"mappings":"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"}

package/build/dex/hashflow/rate-fetcher.d.ts

@@ -1,16 +1,19 @@
 import { IDexHelper } from '../../dex-helper';
 import { Logger } from '../../types';
 import { HashflowRateFetcherConfig } from './types';
+import { Network } from '../../constants';
 export declare class RateFetcher {
     private dexHelper;
     private dexKey;
+    private network;
     private logger;
     private rateFetcher;
     private pricesCacheKey;
     private pricesCacheTTL;
+    private marketMakersFetcher;
     private marketMakersCacheKey;
     private marketMakersCacheTTL;
-    constructor(dexHelper: IDexHelper, dexKey: string, logger: Logger, config: HashflowRateFetcherConfig);
+    constructor(dexHelper: IDexHelper, dexKey: string, network: Network, logger: Logger, config: HashflowRateFetcherConfig);
     start(): void;
     stop(): void;
     private handleMarketMakersResponse;

package/build/dex/hashflow/rate-fetcher.js

@@ -8,25 +8,34 @@ const fetcher_1 = __importDefault(require("../../lib/fetcher/fetcher"));
 const validators_1 = require("../../lib/validators");
 const validators_2 = require("./validators");
 class RateFetcher {
-    constructor(dexHelper, dexKey, logger, config) {
+    constructor(dexHelper, dexKey, network, logger, config) {
         this.dexHelper = dexHelper;
         this.dexKey = dexKey;
+        this.network = network;
         this.logger = logger;
         this.pricesCacheKey = config.rateConfig.pricesCacheKey;
         this.pricesCacheTTL = config.rateConfig.pricesCacheTTLSecs;
         this.marketMakersCacheKey = config.rateConfig.marketMakersCacheKey;
         this.marketMakersCacheTTL = config.rateConfig.marketMakersCacheTTLSecs;
+        this.marketMakersFetcher = new fetcher_1.default(dexHelper.httpRequest, {
+            info: {
+                requestOptions: config.rateConfig.marketMakersReqParams,
+                caster: (data) => {
+                    return (0, validators_1.validateAndCast)(data, validators_2.marketMakersValidator);
+                },
+            },
+            handler: this.handleMarketMakersResponse.bind(this),
+        }, config.rateConfig.markerMakersIntervalMs, logger);
         this.rateFetcher = new fetcher_1.default(dexHelper.httpRequest, {
             info: {
                 requestOptions: config.rateConfig.pricesReqParams,
                 requestFunc: async (options) => {
-                    const marketMakersResponse = await dexHelper.httpRequest.request({
-                        ...config.rateConfig.marketMakersReqParams,
-                    });
-                    const parsedData = (0, validators_1.validateAndCast)(marketMakersResponse.data, validators_2.marketMakersValidator);
-                    this.handleMarketMakersResponse(parsedData);
-                    const { marketMakers } = parsedData;
-                    const filteredMarketMakers = await config.rateConfig.filterMarketMakers(marketMakers);
+                    const { filterMarketMakers, getCachedMarketMakers } = config.rateConfig;
+                    const cachedMarketMakers = (await getCachedMarketMakers()) || [];
+                    const filteredMarketMakers = await filterMarketMakers(cachedMarketMakers);
+                    if (filteredMarketMakers.length === 0) {
+                        return Promise.reject(new Error(`${dexKey}-${network}: got ${filteredMarketMakers.length} market makers. Skipping pricing request.`));
+                    }
                     const prices = await dexHelper.httpRequest.request({
                         ...options,
                         params: { ...options.params, marketMakers: filteredMarketMakers },
@@ -38,12 +47,14 @@ class RateFetcher {
                 },
             },
             handler: this.handleRatesResponse.bind(this),
-        }, config.rateConfig.intervalMs, logger);
+        }, config.rateConfig.pricesIntervalMs, logger);
     }
     start() {
+        this.marketMakersFetcher.startPolling();
         this.rateFetcher.startPolling();
     }
     stop() {
+        this.marketMakersFetcher.stopPolling();
         this.rateFetcher.stopPolling();
     }
     handleMarketMakersResponse(resp) {
@@ -55,7 +66,8 @@ class RateFetcher {
         this.dexHelper.cache.rawset(this.pricesCacheKey, JSON.stringify(levels), this.pricesCacheTTL);
     }
     checkHealth() {
-        return this.rateFetcher.lastFetchSucceeded;
+        return (this.marketMakersFetcher.lastFetchSucceeded &&
+            this.rateFetcher.lastFetchSucceeded);
     }
 }
 exports.RateFetcher = RateFetcher;

package/build/dex/hashflow/rate-fetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"rate-fetcher.js","sourceRoot":"","sources":["../../../src/dex/hashflow/rate-fetcher.ts"],"names":[],"mappings":";;;;;;AACA,wEAAgD;AAChD,qDAAuD;AAGvD,6CAA8E;AAE9E,MAAa,WAAW;IAOtB,YACU,SAAqB,EACrB,MAAc,EACd,MAAc,EACtB,MAAiC;QAHzB,cAAS,GAAT,SAAS,CAAY;QACrB,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAQ;QAGtB,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC;QACvD,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC3D,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC;QACnE,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,UAAU,CAAC,wBAAwB,CAAC;QAEvE,IAAI,CAAC,WAAW,GAAG,IAAI,iBAAO,CAC5B,SAAS,CAAC,WAAW,EACrB;YACE,IAAI,EAAE;gBACJ,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe;gBACjD,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;oBAC7B,MAAM,oBAAoB,GAAI,MAAM,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC;wBAChE,GAAG,MAAM,CAAC,UAAU,CAAC,qBAAqB;qBAC3C,CAAC,CAAC;oBACH,MAAM,UAAU,GAAG,IAAA,4BAAe,EAA+B,oBAAoB,CAAC,IAAI,EAAE,kCAAqB,CAAC,CAAC;oBACnH,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC;oBAC5C,MAAM,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC;oBACpC,MAAM,oBAAoB,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;oBAEtF,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC;wBACjD,GAAG,OAAO;wBACV,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE;qBAClE,CAAC,CAAA;oBAEF,OAAO,MAAM,CAAC;gBAChB,CAAC;gBACD,MAAM,EAAE,CAAC,IAAa,EAAE,EAAE;oBACxB,OAAO,IAAA,4BAAe,EAAwB,IAAI,EAAE,oCAAuB,CAAC,CAAC;gBAC/E,CAAC;aACF;YACD,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC;SAC7C,EACD,MAAM,CAAC,UAAU,CAAC,UAAU,EAC5B,MAAM,CACP,CAAC;IACJ,CAAC;IAED,KAAK;QACH,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;IAClC,CAAC;IAED,IAAI;QACF,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;IACjC,CAAC;IAEO,0BAA0B,CAAC,IAAkC;QACnE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAClH,CAAC;IAEO,mBAAmB,CAAC,IAA2B;QACrD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IAC/F,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC;IAC7C,CAAC;CACF;AAvED,kCAuEC"}
+{"version":3,"file":"rate-fetcher.js","sourceRoot":"","sources":["../../../src/dex/hashflow/rate-fetcher.ts"],"names":[],"mappings":"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"}

package/build/dex/hashflow/types.d.ts

@@ -46,7 +46,9 @@ export declare type HashflowRateFetcherConfig = {
             headers?: RequestHeaders;
             params?: any;
         };
-        intervalMs: number;
+        pricesIntervalMs: number;
+        markerMakersIntervalMs: number;
+        getCachedMarketMakers: () => Promise<string[] | null>;
         filterMarketMakers: (makers: string[]) => Promise<string[]>;
         pricesCacheKey: string;
         marketMakersCacheKey: string;

package/build/lib/fetcher/fetcher.js

@@ -62,7 +62,9 @@ class Fetcher {
             .map((_, i) => i)
             .filter(i => results[i] instanceof Error);
         results.map(result => {
-            this.logger.info('Results Data:', JSON.stringify(result.data, null, 4).substring(0, 500));
+            if (!(result instanceof Error)) {
+                this.logger.info('Results Data:', JSON.stringify(result.data, null, 4).substring(0, 500));
+            }
         });
         failures.forEach(i => {
             this.logger.warn(`failed polling ${this.requests[i].info.requestOptions.url} ${results[i]}`);

package/build/lib/fetcher/fetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetcher.js","sourceRoot":"","sources":["../../../src/lib/fetcher/fetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetcher.js","sourceRoot":"","sources":["../../../src/lib/fetcher/fetcher.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "2.14.7-hashflow-state-polling-dex.3",
+  "version": "2.14.7-hashflow-state-polling-dex.5",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

package/src/dex/hashflow/constants.ts

@@ -1,4 +1,3 @@
-
 // 7 days
 export const HASHFLOW_BLACKLIST_TTL_S = 60 * 60 * 24 * 7;
 
@@ -6,9 +5,11 @@ export const HASHFLOW_MM_RESTRICT_TTL_S = 60 * 60;
 
 export const HASHFLOW_PRICES_CACHES_TTL_S = 3;
 
-export const HASHFLOW_MARKET_MAKERS_CACHES_TTL_S = 3;
+export const HASHFLOW_MARKET_MAKERS_CACHES_TTL_S = 30;
+
+export const HASHFLOW_API_PRICES_POLLING_INTERVAL_MS = 0;
 
-export const HASHFLOW_API_POLLING_INTERVAL_MS = 0;
+export const HASHFLOW_API_MARKET_MAKERS_POLLING_INTERVAL_MS = 28 * 1000; // 28 secs
 
 export const HASHFLOW_API_URL = 'https://api.hashflow.com';
 

package/src/dex/hashflow/hashflow.ts

@@ -18,7 +18,7 @@ import {
   CACHE_PREFIX,
 } from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
-import { getDexKeysWithNetwork, Utils } from '../../utils';
+import { getDexKeysWithNetwork } from '../../utils';
 import { IDex } from '../../dex/idex';
 import { IDexHelper } from '../../dex-helper/idex-helper';
 import {
@@ -29,10 +29,7 @@ import {
   SlippageCheckError,
 } from './types';
 import { SimpleExchange } from '../simple-exchange';
-import {
-  Adapters,
-  HashflowConfig
-} from './config';
+import { Adapters, HashflowConfig } from './config';
 import { HashflowApi } from '@hashflow/taker-js';
 import { RateFetcher } from './rate-fetcher';
 import routerAbi from '../../abi/hashflow/HashflowRouter.abi.json';
@@ -51,14 +48,13 @@ import {
   HASHFLOW_MM_RESTRICT_TTL_S,
   HASHFLOW_API_CLIENT_NAME,
   HASHFLOW_API_URL,
-  HASHFLOW_API_POLLING_INTERVAL_MS,
+  HASHFLOW_API_PRICES_POLLING_INTERVAL_MS,
+  HASHFLOW_API_MARKET_MAKERS_POLLING_INTERVAL_MS,
   HASHFLOW_PRICES_CACHES_TTL_S,
   HASHFLOW_MARKET_MAKERS_CACHES_TTL_S,
 } from './constants';
 import { BI_MAX_UINT256 } from '../../bigint-constants';
 
-const HASHFLOW_ASYNC_CALL_TIMEOUT = 150;
-
 export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
   readonly isStatePollingDex = true;
   readonly hasConstantPriceLargeAmounts = false;
@@ -97,7 +93,11 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
     );
 
     this.hashFlowAuthToken = token;
-    this.api = new HashflowApi('taker', HASHFLOW_API_CLIENT_NAME, this.hashFlowAuthToken);
+    this.api = new HashflowApi(
+      'taker',
+      HASHFLOW_API_CLIENT_NAME,
+      this.hashFlowAuthToken,
+    );
 
     this.pricesCacheKey = `${this.dexHelper.config.data.network}_${this.dexKey}_prices`;
     this.marketMakersCacheKey = `${this.dexHelper.config.data.network}_${this.dexKey}_mms`;
@@ -109,26 +109,42 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
 
   async initializePricing(blockNumber: number): Promise<void> {
     if (!this.dexHelper.config.isSlave) {
-      this.rateFetcher = new RateFetcher(this.dexHelper, this.dexKey, this.logger, {
-        rateConfig: {
-          intervalMs: HASHFLOW_API_POLLING_INTERVAL_MS,
-          marketMakersReqParams: {
-            url: `${HASHFLOW_API_URL}/taker/v1/marketMakers`,
-            params: { networkId: this.network, source: HASHFLOW_API_CLIENT_NAME },
-            headers: { Authorization: this.hashFlowAuthToken },
-          },
-          pricesReqParams: {
-            url: `${HASHFLOW_API_URL}/taker/v2/price-levels`,
-            params: { networkId: this.network, source: HASHFLOW_API_CLIENT_NAME, marketMakers: [] },
-            headers: { Authorization: this.hashFlowAuthToken },
+      this.rateFetcher = new RateFetcher(
+        this.dexHelper,
+        this.dexKey,
+        this.network,
+        this.logger,
+        {
+          rateConfig: {
+            pricesIntervalMs: HASHFLOW_API_PRICES_POLLING_INTERVAL_MS,
+            markerMakersIntervalMs:
+              HASHFLOW_API_MARKET_MAKERS_POLLING_INTERVAL_MS,
+            marketMakersReqParams: {
+              url: `${HASHFLOW_API_URL}/taker/v1/marketMakers`,
+              params: {
+                networkId: this.network,
+                source: HASHFLOW_API_CLIENT_NAME,
+              },
+              headers: { Authorization: this.hashFlowAuthToken },
+            },
+            pricesReqParams: {
+              url: `${HASHFLOW_API_URL}/taker/v2/price-levels`,
+              params: {
+                networkId: this.network,
+                source: HASHFLOW_API_CLIENT_NAME,
+                marketMakers: [],
+              },
+              headers: { Authorization: this.hashFlowAuthToken },
+            },
+            getCachedMarketMakers: this.getCachedMarketMakers.bind(this),
+            filterMarketMakers: this.getFilteredMarketMakers.bind(this),
+            pricesCacheKey: this.pricesCacheKey,
+            pricesCacheTTLSecs: HASHFLOW_PRICES_CACHES_TTL_S,
+            marketMakersCacheKey: this.marketMakersCacheKey,
+            marketMakersCacheTTLSecs: HASHFLOW_MARKET_MAKERS_CACHES_TTL_S,
           },
-          filterMarketMakers: this.getFilteredMarketMakers.bind(this),
-          pricesCacheKey: this.pricesCacheKey,
-          pricesCacheTTLSecs: HASHFLOW_PRICES_CACHES_TTL_S,
-          marketMakersCacheKey: this.marketMakersCacheKey,
-          marketMakersCacheTTLSecs: HASHFLOW_MARKET_MAKERS_CACHES_TTL_S,
         },
-      });
+      );
 
       this.rateFetcher.start();
     }
@@ -169,7 +185,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
       return [];
     }
 
-    const levels = await this.getLevelsWithCache();
+    const levels = (await this.getCachedLevels()) || {};
     const makers = Object.keys(levels);
 
     return makers
@@ -191,7 +207,9 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
   }
 
   private async getFilteredMarketMakers(makers: string[]): Promise<string[]> {
-    const cachedRestrictionUnparsed = await this.dexHelper.cache.hgetAll(this.runtimeMMsRestrictHashMapKey);
+    const cachedRestrictionUnparsed = await this.dexHelper.cache.hgetAll(
+      this.runtimeMMsRestrictHashMapKey,
+    );
 
     const runtimeRestrictedMMs = this.parseCacheRestrictionAndExpiryIfNeeded(
       cachedRestrictionUnparsed,
@@ -355,24 +373,30 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
     return undefined;
   }
 
-  async getMarketMakers(): Promise<MarketMakersResponse['marketMakers']> {
-    const cachedMarketMakers = await this.dexHelper.cache.rawget(this.marketMakersCacheKey);
+  async getCachedMarketMakers(): Promise<
+    MarketMakersResponse['marketMakers'] | null
+  > {
+    const cachedMarketMakers = await this.dexHelper.cache.rawget(
+      this.marketMakersCacheKey,
+    );
 
-    if(cachedMarketMakers) {
-      return JSON.parse(cachedMarketMakers) as MarketMakersResponse['marketMakers'];
+    if (cachedMarketMakers) {
+      return JSON.parse(
+        cachedMarketMakers,
+      ) as MarketMakersResponse['marketMakers'];
     }
 
-    return [];
+    return null;
   }
 
-  async getLevelsWithCache(): Promise<PriceLevelsResponse['levels']> {
+  async getCachedLevels(): Promise<PriceLevelsResponse['levels'] | null> {
     const cachedLevels = await this.dexHelper.cache.rawget(this.pricesCacheKey);
 
-    if(cachedLevels) {
+    if (cachedLevels) {
       return JSON.parse(cachedLevels) as PriceLevelsResponse['levels'];
     }
 
-    return {};
+    return null;
   }
 
   // Hashflow protocol for native token expects 0x00000... instead of 0xeeeee...
@@ -412,7 +436,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
 
     const marketMakersToUse = pools.map(p => p.split(`${prefix}_`).pop());
 
-    const levelsMap = await this.getLevelsWithCache();
+    const levelsMap = (await this.getCachedLevels()) || {};
 
     Object.keys(levelsMap).forEach(mmKey => {
       if (!marketMakersToUse.includes(mmKey)) {
@@ -517,23 +541,19 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
 
     let rfq: RfqResponse;
     try {
-      rfq = await Utils.timeoutPromise(
-        this.api.requestQuote({
-          chainId,
-          baseToken: normalizedSrcToken.address,
-          quoteToken: normalizedDestToken.address,
-          ...(side === SwapSide.SELL
-            ? {
-                baseTokenAmount: optimalSwapExchange.srcAmount,
-              }
-            : { quoteTokenAmount: optimalSwapExchange.destAmount }),
-          wallet: this.augustusAddress.toLowerCase(),
-          effectiveTrader: options.txOrigin.toLowerCase(),
-          marketMakers: [mm],
-        }),
-        HASHFLOW_ASYNC_CALL_TIMEOUT,
-        'Hashflow: requestQuote timeout',
-      );
+      rfq = await this.api.requestQuote({
+        chainId,
+        baseToken: normalizedSrcToken.address,
+        quoteToken: normalizedDestToken.address,
+        ...(side === SwapSide.SELL
+          ? {
+              baseTokenAmount: optimalSwapExchange.srcAmount,
+            }
+          : { quoteTokenAmount: optimalSwapExchange.destAmount }),
+        wallet: this.augustusAddress.toLowerCase(),
+        effectiveTrader: options.txOrigin.toLowerCase(),
+        marketMakers: [mm],
+      });
 
       if (rfq.status !== 'success') {
         const message = `${this.dexKey}-${
@@ -847,9 +867,9 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
   ): Promise<PoolLiquidity[]> {
     const _tokenAddress = tokenAddress.toLowerCase();
 
-    const makers = await this.getMarketMakers();
+    const makers = (await this.getCachedMarketMakers()) || [];
     const filteredMakers = await this.getFilteredMarketMakers(makers);
-    const pLevels = await this.getLevelsWithCache();
+    const pLevels = (await this.getCachedLevels()) || {};
 
     let baseToken: Token | undefined = undefined;
     // TODO: Improve efficiency of this part. Quite inefficient way to determine
@@ -905,7 +925,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
   }
 
   releaseResources(): void {
-    if(this.rateFetcher) {
+    if (this.rateFetcher) {
       this.rateFetcher.stop();
     }
   }

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

@@ -2,19 +2,27 @@ import { IDexHelper } from '../../dex-helper';
 import Fetcher from '../../lib/fetcher/fetcher';
 import { validateAndCast } from '../../lib/validators';
 import { Logger } from '../../types';
-import { HashflowRateFetcherConfig, HashflowRatesResponse, HashflowMarketMakersResponse } from './types';
+import {
+  HashflowRateFetcherConfig,
+  HashflowRatesResponse,
+  HashflowMarketMakersResponse,
+} from './types';
 import { pricesResponseValidator, marketMakersValidator } from './validators';
+import { Network } from '../../constants';
 
 export class RateFetcher {
   private rateFetcher: Fetcher<HashflowRatesResponse>;
   private pricesCacheKey: string;
   private pricesCacheTTL: number;
+
+  private marketMakersFetcher: Fetcher<HashflowMarketMakersResponse>;
   private marketMakersCacheKey: string;
   private marketMakersCacheTTL: number;
 
   constructor(
     private dexHelper: IDexHelper,
     private dexKey: string,
+    private network: Network,
     private logger: Logger,
     config: HashflowRateFetcherConfig,
   ) {
@@ -23,57 +31,98 @@ export class RateFetcher {
     this.marketMakersCacheKey = config.rateConfig.marketMakersCacheKey;
     this.marketMakersCacheTTL = config.rateConfig.marketMakersCacheTTLSecs;
 
+    this.marketMakersFetcher = new Fetcher<HashflowMarketMakersResponse>(
+      dexHelper.httpRequest,
+      {
+        info: {
+          requestOptions: config.rateConfig.marketMakersReqParams,
+          caster: (data: unknown) => {
+            return validateAndCast<HashflowMarketMakersResponse>(
+              data,
+              marketMakersValidator,
+            );
+          },
+        },
+        handler: this.handleMarketMakersResponse.bind(this),
+      },
+      config.rateConfig.markerMakersIntervalMs,
+      logger,
+    );
+
     this.rateFetcher = new Fetcher<HashflowRatesResponse>(
       dexHelper.httpRequest,
       {
         info: {
           requestOptions: config.rateConfig.pricesReqParams,
-          requestFunc: async (options) => {
-            const marketMakersResponse =  await dexHelper.httpRequest.request({
-              ...config.rateConfig.marketMakersReqParams,
-            });
-            const parsedData = validateAndCast<HashflowMarketMakersResponse>(marketMakersResponse.data, marketMakersValidator);
-            this.handleMarketMakersResponse(parsedData);
-            const { marketMakers } = parsedData;
-            const filteredMarketMakers = await config.rateConfig.filterMarketMakers(marketMakers);
+          requestFunc: async options => {
+            const { filterMarketMakers, getCachedMarketMakers } =
+              config.rateConfig;
+
+            const cachedMarketMakers = (await getCachedMarketMakers()) || [];
+            const filteredMarketMakers = await filterMarketMakers(
+              cachedMarketMakers,
+            );
+            if (filteredMarketMakers.length === 0) {
+              return Promise.reject(
+                new Error(
+                  `${dexKey}-${network}: got ${filteredMarketMakers.length} market makers. Skipping pricing request.`,
+                ),
+              );
+            }
 
             const prices = await dexHelper.httpRequest.request({
               ...options,
               params: { ...options.params, marketMakers: filteredMarketMakers },
-            })
+            });
 
             return prices;
           },
           caster: (data: unknown) => {
-            return validateAndCast<HashflowRatesResponse>(data, pricesResponseValidator);
+            return validateAndCast<HashflowRatesResponse>(
+              data,
+              pricesResponseValidator,
+            );
           },
         },
         handler: this.handleRatesResponse.bind(this),
       },
-      config.rateConfig.intervalMs,
+      config.rateConfig.pricesIntervalMs,
       logger,
     );
   }
 
   start() {
+    this.marketMakersFetcher.startPolling();
     this.rateFetcher.startPolling();
   }
 
   stop() {
+    this.marketMakersFetcher.stopPolling();
     this.rateFetcher.stopPolling();
   }
 
   private handleMarketMakersResponse(resp: HashflowMarketMakersResponse): void {
     const { marketMakers } = resp;
-    this.dexHelper.cache.rawset(this.marketMakersCacheKey, JSON.stringify(marketMakers), this.marketMakersCacheTTL);
+    this.dexHelper.cache.rawset(
+      this.marketMakersCacheKey,
+      JSON.stringify(marketMakers),
+      this.marketMakersCacheTTL,
+    );
   }
 
   private handleRatesResponse(resp: HashflowRatesResponse): void {
     const { levels } = resp;
-    this.dexHelper.cache.rawset(this.pricesCacheKey, JSON.stringify(levels), this.pricesCacheTTL)
+    this.dexHelper.cache.rawset(
+      this.pricesCacheKey,
+      JSON.stringify(levels),
+      this.pricesCacheTTL,
+    );
   }
 
   checkHealth(): boolean {
-    return this.rateFetcher.lastFetchSucceeded;
+    return (
+      this.marketMakersFetcher.lastFetchSucceeded &&
+      this.rateFetcher.lastFetchSucceeded
+    );
   }
 }

package/src/dex/hashflow/types.ts

@@ -39,7 +39,7 @@ export type HashflowMarketMakersResponse = {
 export type HashflowRatesResponse = {
   status: string;
   networkId: string;
-  levels: Record<string, Array<HashflowRatesLevel>>
+  levels: Record<string, Array<HashflowRatesLevel>>;
 };
 
 export type HashflowRateFetcherConfig = {
@@ -48,17 +48,19 @@ export type HashflowRateFetcherConfig = {
       url: string;
       headers?: RequestHeaders;
       params?: any;
-    }
+    };
     pricesReqParams: {
       url: string;
       headers?: RequestHeaders;
       params?: any;
-    },
-    intervalMs: number;
+    };
+    pricesIntervalMs: number;
+    markerMakersIntervalMs: number;
+    getCachedMarketMakers: () => Promise<string[] | null>;
     filterMarketMakers: (makers: string[]) => Promise<string[]>;
     pricesCacheKey: string;
     marketMakersCacheKey: string;
     pricesCacheTTLSecs: number;
     marketMakersCacheTTLSecs: number;
-  },
+  };
 };

package/src/lib/fetcher/fetcher.ts

@@ -89,10 +89,12 @@ export default class Fetcher<T> {
       .filter(i => results[i] instanceof Error);
 
     results.map(result => {
-      this.logger.info(
-        'Results Data:',
-        JSON.stringify((result as any).data, null, 4).substring(0, 500),
-      );
+      if(!(result instanceof Error)) {
+        this.logger.info(
+          'Results Data:',
+          JSON.stringify((result as any).data, null, 4).substring(0, 500),
+        );
+      }
     });
     failures.forEach(i => {
       this.logger.warn(