@paraswap/dex-lib 2.14.7 → 2.15.1

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

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RateFetcher = void 0;
+const fetcher_1 = require("../../lib/fetcher/fetcher");
+const validators_1 = require("../../lib/validators");
+const validators_2 = require("./validators");
+class RateFetcher {
+    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.Fetcher(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.Fetcher(dexHelper.httpRequest, {
+            info: {
+                requestOptions: config.rateConfig.pricesReqParams,
+                requestFunc: async (options) => {
+                    const { filterMarketMakers, getCachedMarketMakers } = config.rateConfig;
+                    const cachedMarketMakers = (await getCachedMarketMakers()) || [];
+                    const filteredMarketMakers = await filterMarketMakers(cachedMarketMakers);
+                    if (filteredMarketMakers.length === 0) {
+                        return new fetcher_1.SkippingRequest(`${dexKey}-${network}: got ${filteredMarketMakers.length} market makers.`);
+                    }
+                    const prices = await dexHelper.httpRequest.request({
+                        ...options,
+                        params: { ...options.params, marketMakers: filteredMarketMakers },
+                    });
+                    return prices;
+                },
+                caster: (data) => {
+                    return (0, validators_1.validateAndCast)(data, validators_2.pricesResponseValidator);
+                },
+            },
+            handler: this.handleRatesResponse.bind(this),
+        }, config.rateConfig.pricesIntervalMs, logger);
+    }
+    start() {
+        this.marketMakersFetcher.startPolling();
+        this.rateFetcher.startPolling();
+    }
+    stop() {
+        this.marketMakersFetcher.stopPolling();
+        this.rateFetcher.stopPolling();
+    }
+    handleMarketMakersResponse(resp) {
+        const { marketMakers } = resp;
+        this.dexHelper.cache.rawset(this.marketMakersCacheKey, JSON.stringify(marketMakers), this.marketMakersCacheTTL);
+    }
+    handleRatesResponse(resp) {
+        const { levels } = resp;
+        this.dexHelper.cache.rawset(this.pricesCacheKey, JSON.stringify(levels), this.pricesCacheTTL);
+    }
+}
+exports.RateFetcher = RateFetcher;
+//# sourceMappingURL=rate-fetcher.js.map

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

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

@@ -1,4 +1,5 @@
 import { QuoteData } from '@hashflow/taker-js/dist/types/common';
+import { RequestHeaders } from '../../dex-helper';
 export declare type HashflowData = {
     mm: string;
     quoteData?: QuoteData;
@@ -20,3 +21,38 @@ export declare enum RFQType {
 }
 export declare class SlippageCheckError extends Error {
 }
+export declare type HashflowRatesLevel = {
+    pair: Record<string, string>;
+    levels: Array<Record<string, string>>;
+    includesFees: boolean;
+};
+export declare type HashflowMarketMakersResponse = {
+    marketMakers: string[];
+};
+export declare type HashflowRatesResponse = {
+    status: string;
+    networkId: string;
+    levels: Record<string, Array<HashflowRatesLevel>>;
+};
+export declare type HashflowRateFetcherConfig = {
+    rateConfig: {
+        marketMakersReqParams: {
+            url: string;
+            headers?: RequestHeaders;
+            params?: any;
+        };
+        pricesReqParams: {
+            url: string;
+            headers?: RequestHeaders;
+            params?: any;
+        };
+        pricesIntervalMs: number;
+        markerMakersIntervalMs: number;
+        getCachedMarketMakers: () => Promise<string[] | null>;
+        filterMarketMakers: (makers: string[]) => Promise<string[]>;
+        pricesCacheKey: string;
+        marketMakersCacheKey: string;
+        pricesCacheTTLSecs: number;
+        marketMakersCacheTTLSecs: number;
+    };
+};

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/hashflow/types.ts"],"names":[],"mappings":";;;AAkBA,MAAa,QAAS,SAAQ,KAAK;CAAG;AAAtC,4BAAsC;AAEtC,IAAY,OAGX;AAHD,WAAY,OAAO;IACjB,qCAAQ,CAAA;IACR,qCAAQ,CAAA;AACV,CAAC,EAHW,OAAO,GAAP,eAAO,KAAP,eAAO,QAGlB;AAED,MAAa,kBAAmB,SAAQ,KAAK;CAAG;AAAhD,gDAAgD"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/hashflow/types.ts"],"names":[],"mappings":";;;AAmBA,MAAa,QAAS,SAAQ,KAAK;CAAG;AAAtC,4BAAsC;AAEtC,IAAY,OAGX;AAHD,WAAY,OAAO;IACjB,qCAAQ,CAAA;IACR,qCAAQ,CAAA;AACV,CAAC,EAHW,OAAO,GAAP,eAAO,KAAP,eAAO,QAGlB;AAED,MAAa,kBAAmB,SAAQ,KAAK;CAAG;AAAhD,gDAAgD"}

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

@@ -0,0 +1,4 @@
+import joi from 'joi';
+export declare const levelValidator: joi.ArraySchema<any[]>;
+export declare const pricesResponseValidator: joi.ObjectSchema<any>;
+export declare const marketMakersValidator: joi.ObjectSchema<any>;

package/build/dex/hashflow/validators.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.marketMakersValidator = exports.pricesResponseValidator = exports.levelValidator = void 0;
+const joi_1 = __importDefault(require("joi"));
+exports.levelValidator = joi_1.default.array().items(joi_1.default.object({
+    pair: joi_1.default.object({
+        baseTokenName: joi_1.default.string().min(1).required(),
+        quoteTokenName: joi_1.default.string().min(1).required(),
+        baseToken: joi_1.default.string().min(1).required(),
+        quoteToken: joi_1.default.string().min(1).required(),
+        baseTokenDecimals: joi_1.default.number().min(1).required(),
+        quoteTokenDecimals: joi_1.default.number().min(1).required(),
+    }),
+    levels: joi_1.default.array().items(joi_1.default.object({
+        level: joi_1.default.string().min(1).required(),
+        price: joi_1.default.string().min(1).required(),
+    })),
+    includesFees: joi_1.default.boolean().required(),
+}));
+exports.pricesResponseValidator = joi_1.default.object({
+    status: joi_1.default.string().required(),
+    networkId: joi_1.default.number().required(),
+    levels: joi_1.default.object().pattern(joi_1.default.string().min(1), exports.levelValidator),
+});
+exports.marketMakersValidator = joi_1.default.object({
+    marketMakers: joi_1.default.array().items(joi_1.default.string().min(1).required()),
+});
+//# sourceMappingURL=validators.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/dex/hashflow/validators.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AAET,QAAA,cAAc,GAAG,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,aAAG,CAAC,MAAM,CAAC;IACzD,IAAI,EAAE,aAAG,CAAC,MAAM,CAAC;QACf,aAAa,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QAC7C,cAAc,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QAC9C,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QACzC,UAAU,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QAC1C,iBAAiB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QACjD,kBAAkB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;KACnD,CAAC;IACF,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,aAAG,CAAC,MAAM,CAAC;QACnC,KAAK,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QACrC,KAAK,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;KACtC,CAAC,CAAC;IACH,YAAY,EAAE,aAAG,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CACvC,CAAC,CAAC,CAAC;AAES,QAAA,uBAAuB,GAAG,aAAG,CAAC,MAAM,CAAC;IAChD,MAAM,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,MAAM,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,sBAAc,CAAC;CAClE,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,aAAG,CAAC,MAAM,CAAC;IAC9C,YAAY,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;CAChE,CAAC,CAAC"}

package/build/lib/fetcher/fetcher.d.ts

@@ -1,7 +1,12 @@
 import { IRequestWrapper } from '../../dex-helper';
 import { Logger } from 'log4js';
-import { RequestConfig } from '../../dex-helper/irequest-wrapper';
+import { RequestConfig, Response } from '../../dex-helper/irequest-wrapper';
+export declare class SkippingRequest {
+    message: string;
+    constructor(message?: string);
+}
 export declare type RequestInfo<T> = {
+    requestFunc?: (options: RequestConfig) => Promise<Response<T> | SkippingRequest>;
     requestOptions: RequestConfig;
     caster: (data: unknown) => T;
     authenticate?: (options: RequestConfig) => RequestConfig;
@@ -11,7 +16,7 @@ export declare type RequestInfoWithHandler<T> = {
     info: RequestInfo<T>;
     handler: (data: T) => void;
 };
-export default class Fetcher<T> {
+export declare class Fetcher<T> {
     private requestWrapper;
     private pollIntervalMs;
     private logger;

package/build/lib/fetcher/fetcher.js

@@ -1,8 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Fetcher = exports.SkippingRequest = void 0;
+const lodash_1 = require("lodash");
 const FETCH_TIMEOUT_MS = 10 * 1000;
 const FETCH_FAIL_MAX_ATTEMPT = 5;
 const FETCH_FAIL_RETRY_TIMEOUT_MS = 60 * 1000;
+class SkippingRequest {
+    constructor(message = '') {
+        this.message = message;
+    }
+}
+exports.SkippingRequest = SkippingRequest;
+;
 class Fetcher {
     constructor(requestWrapper, requestsInfo, pollIntervalMs, logger) {
         this.requestWrapper = requestWrapper;
@@ -37,10 +46,19 @@ class Fetcher {
                 info.authenticate(options);
             }
             try {
-                const result = await this.requestWrapper.request({
-                    timeout: FETCH_TIMEOUT_MS,
-                    ...options,
-                });
+                let result;
+                if ((0, lodash_1.isFunction)(info.requestFunc)) {
+                    result = await info.requestFunc({
+                        timeout: FETCH_TIMEOUT_MS,
+                        ...options,
+                    });
+                }
+                else {
+                    result = await this.requestWrapper.request({
+                        timeout: FETCH_TIMEOUT_MS,
+                        ...options,
+                    });
+                }
                 return result;
             }
             catch (e) {
@@ -51,13 +69,19 @@ class Fetcher {
         const failures = results
             .map((_, i) => i)
             .filter(i => results[i] instanceof Error);
-        results
-            .filter(result => !(result instanceof Error))
-            .map(result => {
-            debugger;
-            this.logger.info('Results Data:', JSON.stringify(result.data)
-                .replace(/(?:\r\n|\r|\n)/g, ' ')
-                .substring(0, 1000));
+        const skipped = results
+            .map((_, i) => i)
+            .filter(i => results[i] instanceof SkippingRequest);
+        results.map(result => {
+            if (!(result instanceof Error || result instanceof SkippingRequest)) {
+                this.logger.info('Results Data:', JSON.stringify(result.data)
+                    .replace(/(?:\r\n|\r|\n)/g, ' ')
+                    .substring(0, 1000));
+            }
+        });
+        skipped.forEach(i => {
+            const skippedRes = results[i];
+            this.logger.warn(`skipped request ${this.requests[i].info.requestOptions.url} ${skippedRes.message}`);
         });
         failures.forEach(i => {
             this.logger.warn(`failed polling ${this.requests[i].info.requestOptions.url} ${results[i]}`);
@@ -71,7 +95,7 @@ class Fetcher {
         }
         results
             .map((_, i) => i)
-            .filter(i => !(results[i] instanceof Error))
+            .filter(i => !(results[i] instanceof Error || results[i] instanceof SkippingRequest))
             .forEach(i => {
             const response = results[i];
             const reqInfo = this.requests[i];
@@ -106,5 +130,5 @@ class Fetcher {
         return !this.stop;
     }
 }
-exports.default = Fetcher;
+exports.Fetcher = Fetcher;
 //# sourceMappingURL=fetcher.js.map

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":";;;AAGA,mCAAoC;AAEpC,MAAM,gBAAgB,GAAG,EAAE,GAAG,IAAI,CAAC;AACnC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AACjC,MAAM,2BAA2B,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9C,MAAa,eAAe;IAC1B,YACS,UAAU,EAAE;QAAZ,YAAO,GAAP,OAAO,CAAK;IAClB,CAAC;CACL;AAJD,0CAIC;AAAA,CAAC;AAeF,MAAa,OAAO;IAMlB,YACU,cAA+B,EACvC,YAAqE,EAC7D,cAAsB,EACtB,MAAc;QAHd,mBAAc,GAAd,cAAc,CAAiB;QAE/B,mBAAc,GAAd,cAAc,CAAQ;QACtB,WAAM,GAAN,MAAM,CAAQ;QARjB,uBAAkB,GAAY,KAAK,CAAC;QACnC,gBAAW,GAAG,CAAC,CAAC;QAChB,SAAI,GAAY,IAAI,CAAC;QAQ3B,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAC/B,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC;SAC9B;aAAM;YACL,IAAI,CAAC,QAAQ,GAAG,CAAC,YAAY,CAAC,CAAC;SAChC;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,QAAiB,KAAK;QAChC,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE;YAChC,OAAO;SACR;QAED,IAAI,IAAI,CAAC,WAAW,IAAI,sBAAsB,EAAE;YAC9C,IAAI,CAAC,WAAW,EAAE,CAAC;YAEnB,UAAU,CAAC,GAAG,EAAE;gBACd,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;YACvB,CAAC,EAAE,2BAA2B,CAAC,CAAC;YAChC,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAChC,KAAK,EAAE,OAAkC,EAAE,EAAE;YAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAC1B,IAAI,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC;YAElC,IAAI,IAAI,CAAC,YAAY,EAAE;gBACrB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;aAC5B;YAED,IAAI;gBACF,IAAI,MAAM,CAAC;gBACX,IAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,WAAW,CAAC,EAAE;oBAChC,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;wBAC9B,OAAO,EAAE,gBAAgB;wBACzB,GAAG,OAAO;qBACX,CAAC,CAAC;iBACJ;qBAAM;oBACL,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;wBACzC,OAAO,EAAE,gBAAgB;wBACzB,GAAG,OAAO;qBACX,CAAC,CAAC;iBACJ;gBAED,OAAO,MAAM,CAAC;aACf;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAU,CAAC;aACnB;QACH,CAAC,CACF,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,OAAO;aACrB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAChB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC;QAE5C,MAAM,OAAO,GAAG,OAAO;aACpB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAChB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,eAAe,CAAC,CAAC;QAEtD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACnB,IAAG,CAAC,CAAC,MAAM,YAAY,KAAK,IAAI,MAAM,YAAY,eAAe,CAAC,EAAE;gBAClE,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,eAAe,EACf,IAAI,CAAC,SAAS,CAAE,MAAc,CAAC,IAAI,CAAC;qBACjC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC;qBAC/B,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,CACtB,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAClB,MAAM,UAAU,GAAG,OAAO,CAAC,CAAC,CAAoB,CAAC;YACjD,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,mBAAmB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE,CACpF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,kBAAkB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAC3E,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,QAAQ,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE;YACtC,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;YAChC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC;SACvB;aAAM;YACL,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;SAChC;QAED,OAAO;aACJ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAChB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,YAAY,eAAe,CAAC,CAAC;aACpF,OAAO,CAAC,CAAC,CAAC,EAAE;YACX,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAgB,CAAC;YAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAC1B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC;YAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,GAAG,qBAAqB,CAAC,CAAC;YAExD,IAAI;gBACF,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC9C,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;aAC7B;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,IAAI,OAAO,CAAC,GAAG,6BAA6B,IAAI,CAAC,SAAS,CACxD,QAAQ,CAAC,IAAI,CACd,EAAE,EACH,CAAC,CACF,CAAC;gBACF,OAAO;aACR;QACH,CAAC,CAAC,CAAC;QACL,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAEvD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,OAAO;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAI,CAAC,CAAC;IAC9D,CAAC;IAED,YAAY;QACV,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,WAAW;QACT,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,SAAS;QACP,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;IACpB,CAAC;CACF;AArJD,0BAqJC"}

package/build/lib/validators.d.ts

@@ -0,0 +1,7 @@
+import joi from 'joi';
+export declare class ValidationError extends Error {
+    readonly rawMessage: string;
+    readonly key?: string;
+    constructor(message: string, key?: string);
+}
+export declare const validateAndCast: <T>(value: unknown, schema: joi.Schema, name?: string | undefined) => T;

package/build/lib/validators.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateAndCast = exports.ValidationError = void 0;
+class ValidationError extends Error {
+    constructor(message, key) {
+        super(key !== undefined ? `'${key}': ${message}` : message);
+        this.rawMessage = message;
+        this.key = key;
+    }
+}
+exports.ValidationError = ValidationError;
+const validateAndCast = (value, schema, name) => {
+    const { error, value: parsed } = schema.validate(value);
+    if (error !== undefined) {
+        let message;
+        if (name) {
+            message = `"${name}" ${error.message.slice(error.message.indexOf('must'))}`;
+        }
+        else {
+            message = error.message;
+        }
+        throw new ValidationError(message);
+    }
+    return parsed;
+};
+exports.validateAndCast = validateAndCast;
+//# sourceMappingURL=validators.js.map

package/build/lib/validators.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../src/lib/validators.ts"],"names":[],"mappings":";;;AAEA,MAAa,eAAgB,SAAQ,KAAK;IAKxC,YAAY,OAAe,EAAE,GAAY;QACvC,KAAK,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;QAC1B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;CACF;AAVD,0CAUC;AAEM,MAAM,eAAe,GAAG,CAC7B,KAAc,EACd,MAAkB,EAClB,IAAa,EACV,EAAE;IACL,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExD,IAAI,KAAK,KAAK,SAAS,EAAE;QACvB,IAAI,OAAO,CAAC;QACZ,IAAI,IAAI,EAAE;YACR,OAAO,GAAG,IAAI,IAAI,KAAK,KAAK,CAAC,OAAO,CAAC,KAAK,CACxC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAC9B,EAAE,CAAC;SACL;aAAM;YACL,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;SACzB;QACD,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC;KACpC;IACD,OAAO,MAAW,CAAC;AACrB,CAAC,CAAC;AAnBW,QAAA,eAAe,mBAmB1B"}

package/package.json

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

package/src/dex/generic-rfq/fetch-mm-api.ts

@@ -5,7 +5,7 @@ import Web3 from 'web3';
 import { generateConfig } from '../../config';
 import { DummyRequestWrapper } from '../../dex-helper/dummy-dex-helper';
 import { RequestConfig } from '../../dex-helper/irequest-wrapper';
-import Fetcher from '../../lib/fetcher/fetcher';
+import { Fetcher } from '../../lib/fetcher/fetcher';
 import { getLogger } from '../../lib/log4js';
 import { MultiWrapper } from '../../lib/multi-wrapper';
 import { genericRFQAuthHttp } from './security';
@@ -23,11 +23,11 @@ import {
   pairsResponseValidator,
   pricesResponse,
   tokensResponseValidator,
-  validateAndCast,
 } from './validators';
 import MultiV2Abi from '../../abi/multi-v2.json';
 import { AbiItem } from 'web3-utils';
 import { checkOrder } from './utils';
+import { validateAndCast } from '../../lib/validators';
 
 const network = 1;
 

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

@@ -5,15 +5,9 @@ import { ethers } from 'ethers';
 import { Network, ContractMethod, SwapSide, MAX_UINT } from '../../constants';
 import { generateConfig } from '../../config';
 import { newTestE2E, getEnv } from '../../../tests/utils-e2e';
-import {
-  SmartTokens,
-  GENERIC_ADDR1,
-  Tokens,
-} from '../../../tests/constants-e2e';
+import { SmartTokens, GENERIC_ADDR1 } from '../../../tests/constants-e2e';
 import { RFQConfig } from './types';
 import { testConfig } from './e2e-test-config';
-import { SmartToken } from '../../../tests/smart-tokens';
-import { Token } from '../../types';
 
 const PK_KEY = process.env.TEST_PK_KEY;
 
@@ -91,32 +85,22 @@ const dexKey = 'YOUR_NAME';
 describe(`GenericRFQ ${dexKey} E2E`, () => {
   for (const [_network, testCases] of Object.entries(testConfig)) {
     const network = parseInt(_network, 10);
-    const tokens = Tokens[network];
     const smartTokens = SmartTokens[network];
     const config = generateConfig(network);
 
     config.rfqConfigs[dexKey] = buildConfigForGenericRFQ();
     describe(`${Network[network]}`, () => {
       for (const testCase of testCases) {
-        let srcToken: Token | SmartToken, destToken: Token | SmartToken;
-
-        if (SKIP_TENDERLY) {
-          srcToken = tokens[testCase.srcToken];
-          destToken = tokens[testCase.destToken];
-        } else {
-          if (!smartTokens.hasOwnProperty(testCase.srcToken)) {
-            throw new Error(
-              `Please add "addBalance" and "addAllowance" functions for ${testCase.srcToken} on ${Network[network]} (in constants-e2e.ts).`,
-            );
-          }
-          if (!smartTokens.hasOwnProperty(testCase.destToken)) {
-            throw new Error(
-              `Please add "addBalance" and "addAllowance" functions for ${testCase.destToken} on ${Network[network]} (in constants-e2e.ts).`,
-            );
-          }
-          srcToken = smartTokens[testCase.srcToken];
-          destToken = smartTokens[testCase.destToken];
+        if (!smartTokens.hasOwnProperty(testCase.srcToken)) {
+          throw new Error(`Please add "addBalance" and "addAllowance" functions for ${testCase.srcToken} on ${Network[network]} (in constants-e2e.ts).`);
+        }
+        if (!smartTokens.hasOwnProperty(testCase.destToken)){ 
+          throw new Error(`Please add "addBalance" and "addAllowance" functions for ${testCase.destToken} on ${Network[network]} (in constants-e2e.ts).`);
+        }
+        const srcToken = smartTokens[testCase.srcToken];
+        const destToken = smartTokens[testCase.destToken];
 
+        if (!SKIP_TENDERLY) {
           srcToken.addBalance(testAccount.address, MAX_UINT);
           srcToken.addAllowance(
             testAccount.address,

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

@@ -3,7 +3,7 @@ import { SwapSide } from '@paraswap/core';
 import { BN_1 } from '../../bignumber-constants';
 import { IDexHelper } from '../../dex-helper';
 import { RequestConfig } from '../../dex-helper/irequest-wrapper';
-import Fetcher from '../../lib/fetcher/fetcher';
+import { Fetcher } from '../../lib/fetcher/fetcher';
 
 import { Logger, Address, Token } from '../../types';
 import { OrderInfo } from '../paraswap-limit-orders/types';
@@ -28,17 +28,16 @@ import {
   pairsResponseValidator,
   pricesResponse,
   tokensResponseValidator,
-  validateAndCast,
 } from './validators';
 import { genericRFQAuthHttp } from './security';
-
-const GET_FIRM_RATE_TIMEOUT_MS = 2000;
+import { validateAndCast } from '../../lib/validators';
 import {
   createERC1271Contract,
   ERC1271Contract,
 } from '../../lib/erc1271-utils';
 import { isContractAddress } from '../../utils';
 
+const GET_FIRM_RATE_TIMEOUT_MS = 2000;
 export const reversePrice = (price: PriceAndAmountBigNumber) =>
   [
     BN_1.dividedBy(price[0]),
@@ -60,7 +59,7 @@ export class RateFetcher {
   public blackListCacheKey: string;
 
   private authHttp: (
-    secet: RFQSecret,
+    secret: RFQSecret,
   ) => (options: RequestConfig) => RequestConfig;
 
   private verifierContract?: ERC1271Contract;

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

@@ -1,11 +1,11 @@
 import {
-  validateAndCast,
   tokensResponseValidator,
   pairsResponseValidator,
   pricesResponse,
   blacklistResponseValidator,
   firmRateResponseValidator,
 } from './validators';
+import { validateAndCast } from '../../lib/validators';
 
 describe('GenericRFQ Validator test', () => {
   describe('GenericRFQ Tokens Test', () => {

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

@@ -4,18 +4,6 @@ import * as ethers from 'ethers';
 
 const tokensType = ['ERC20'];
 
-export class ValidationError extends Error {
-  readonly rawMessage: string;
-
-  readonly key?: string;
-
-  constructor(message: string, key?: string) {
-    super(key !== undefined ? `'${key}': ${message}` : message);
-    this.rawMessage = message;
-    this.key = key;
-  }
-}
-
 export const tokenValidator = joi.object({
   symbol: joi.string().min(1).required(),
   name: joi.string().min(1).required(),
@@ -120,27 +108,6 @@ export const pricesResponse = joi.object({
     ),
 });
 
-export const validateAndCast = <T>(
-  value: unknown,
-  schema: joi.Schema,
-  name?: string,
-): T => {
-  const { error, value: parsed } = schema.validate(value);
-
-  if (error !== undefined) {
-    let message;
-    if (name) {
-      message = `"${name}" ${error.message.slice(
-        error.message.indexOf('must'),
-      )}`;
-    } else {
-      message = error.message;
-    }
-    throw new ValidationError(message);
-  }
-  return parsed as T;
-};
-
 export const addressSchema = joi.string().custom((value, helpers) => {
   if (ethers.utils.isAddress(value)) {
     return value.toLowerCase();

package/src/dex/hashflow/constants.ts

@@ -1,6 +1,16 @@
-export const PRICE_LEVELS_TTL_SECONDS = 1;
-
 // 7 days
 export const HASHFLOW_BLACKLIST_TTL_S = 60 * 60 * 24 * 7;
 
 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 = 30;
+
+export const HASHFLOW_API_PRICES_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';
+
+export const HASHFLOW_API_CLIENT_NAME = 'paraswap';