@paraswap/dex-lib 2.49.2-dackieswapv3-base.0 → 2.49.2-hashflow

package/build/dex-helper/RedisBatcher.d.ts

@@ -0,0 +1,20 @@
+import { ChainableCommander } from 'ioredis';
+export declare type BatchedCmd = {
+    makeCmd: (chain: ChainableCommander) => void;
+    cb: (result: string | null) => boolean;
+};
+declare class DexlibRedisBatcher {
+    private intervalTimeMs;
+    private interval?;
+    private _lastLoggedAt;
+    private isAlreadyRunning;
+    private cmds;
+    private tmpCmds;
+    constructor(intervalTimeMs: number);
+    enable(): void;
+    disable(): void;
+    addCmd(cmd: BatchedCmd): void;
+    execute(): Promise<void>;
+}
+export declare const redisBatcher: DexlibRedisBatcher;
+export {};

package/build/dex-helper/RedisBatcher.js

@@ -0,0 +1,75 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.redisBatcher = void 0;
+const RedisWrapper_1 = __importDefault(require("./RedisWrapper"));
+const REDIS_BATCHER_INTERVAL_MS = 100;
+const LOG_PERIOD_MS = 10 * 1000;
+const logger = console;
+class DexlibRedisBatcher {
+    constructor(intervalTimeMs) {
+        this.intervalTimeMs = intervalTimeMs;
+        this._lastLoggedAt = 0;
+        this.isAlreadyRunning = false;
+        this.cmds = [];
+        this.tmpCmds = [];
+    }
+    enable() {
+        this.interval = setInterval(this.execute.bind(this), this.intervalTimeMs);
+    }
+    disable() {
+        if (this.interval) {
+            clearInterval(this.interval);
+            this.interval = undefined;
+        }
+    }
+    addCmd(cmd) {
+        this.tmpCmds.push(cmd);
+    }
+    async execute() {
+        if (this.isAlreadyRunning) {
+            return;
+        }
+        try {
+            this.isAlreadyRunning = true;
+            const cmdsCount = this.tmpCmds.length + this.cmds.length;
+            if (cmdsCount === 0) {
+                return;
+            }
+            logger.trace(`execute ${cmdsCount} cmds`);
+            this.tmpCmds.forEach(cmd => this.cmds.push(cmd));
+            this.tmpCmds.length = 0;
+            const results = await RedisWrapper_1.default.batchReadOnlyCmds(this.cmds);
+            this.cmds = this.cmds.filter((cmd, index) => {
+                if (!results) {
+                    logger.error('no results');
+                    return true;
+                }
+                const res = results[index];
+                if (!res) {
+                    logger.error('error in execute empty result');
+                    return true;
+                }
+                if (res[0]) {
+                    logger.error('error in execute, res[0] =', res[0]);
+                    return true;
+                }
+                return !cmd.cb(res[1]);
+            });
+            if (this.cmds.length && Date.now() - this._lastLoggedAt > LOG_PERIOD_MS) {
+                logger.info(`still some cmds to run ${this.cmds.length}`);
+                this._lastLoggedAt = Date.now();
+            }
+        }
+        catch (e) {
+            logger.error('error in execute:', e);
+        }
+        finally {
+            this.isAlreadyRunning = false;
+        }
+    }
+}
+exports.redisBatcher = new DexlibRedisBatcher(REDIS_BATCHER_INTERVAL_MS);
+//# sourceMappingURL=RedisBatcher.js.map

package/build/dex-helper/RedisBatcher.js.map

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

package/build/dex-helper/RedisWrapper.d.ts

@@ -0,0 +1,37 @@
+import { Redis } from 'ioredis';
+interface Pool<T> extends Array<T> {
+    next: () => T;
+}
+export declare class DexlibRedisWrapper {
+    static MAX_SCORE_VALUE: number;
+    private redisMasterUrl;
+    private redisSlavesUrl;
+    masterPool: Pool<Redis>;
+    slavesPool: Pool<Redis>;
+    connect(redisMasterUrl?: string, redisSlavesUrl?: string, connectionPerPool?: number): Promise<void>;
+    private _checkConnected;
+    checkConnected(): void;
+    close(): Promise<void>;
+    get(key: string): Promise<string | null>;
+    set(key: string, value: string): Promise<"OK">;
+    setex(key: string, seconds: number, value: string): Promise<"OK">;
+    incrWithTTLSec(key: string, ttlSec: number): Promise<number>;
+    sismember(set: string, key: string): Promise<number>;
+    publish(channel: string, value: string): Promise<number>;
+    subscribe(channel: string, cb: (channel: string, message: string) => void): Promise<unknown>;
+    del(key: string): Promise<number>;
+    zremrangebyscore(key: string, min: number, max: number): Promise<number>;
+    zadd(key: string, bulkItemsToAdd: (number | string)[], option?: 'NX'): Promise<number>;
+    zrem(key: string, membersKeys: string[]): Promise<number>;
+    zscore(key: string, member: string): Promise<string | null>;
+    hset(mapKey: string, mappings: Record<string, string>): Promise<number | undefined>;
+    hdel(mapKey: string, keys: string[]): Promise<number>;
+    hget(keyMap: string, key: string): Promise<string | null>;
+    hmget(keyMap: string, keys: string[]): Promise<(string | null)[]>;
+    hgetAll(keyMap: string): Promise<Record<string, string>>;
+    zrangebyscore(key: string, min: number, max: number, isWithScores?: boolean): Promise<string[]>;
+    zcount(key: string, min: number, max: number): Promise<number>;
+    sadd(set: string, keys: string[], ttl?: number): Promise<number | [error: Error | null, result: unknown][] | null>;
+}
+declare const _default: DexlibRedisWrapper;
+export default _default;

package/build/dex-helper/RedisWrapper.js

@@ -0,0 +1,165 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DexlibRedisWrapper = void 0;
+const ioredis_1 = __importDefault(require("ioredis"));
+const logger = console;
+const IOREDIS_OPTION = {
+    enableAutoPipelining: true,
+    lazyConnect: true,
+    stringNumbers: true,
+};
+function makePool(url, connectionPerPool) {
+    const pool = Array.apply(null, new Array(connectionPerPool)).map(() => new ioredis_1.default(url, IOREDIS_OPTION));
+    const lastIdx = pool.length - 1;
+    pool.idx = 0;
+    pool.next = () => {
+        const n = pool[pool.idx];
+        pool.idx = pool.idx === lastIdx ? 0 : pool.idx + 1;
+        return n;
+    };
+    return pool;
+}
+class DexlibRedisWrapper {
+    constructor() {
+        this.redisMasterUrl = '';
+        this.redisSlavesUrl = '';
+    }
+    async connect(redisMasterUrl = 'redis://localhost:32768', redisSlavesUrl = 'redis://localhost:32768', connectionPerPool = 5) {
+        this.redisMasterUrl = redisMasterUrl;
+        this.redisSlavesUrl = redisSlavesUrl;
+        this.masterPool = makePool(redisMasterUrl, connectionPerPool);
+        this.slavesPool = makePool(redisSlavesUrl, connectionPerPool);
+        try {
+            logger.info(`Connecting to REDIS... ${this.redisMasterUrl}`);
+            await Promise.all([...this.masterPool, ...this.slavesPool].map(redis => redis.connect()));
+            logger.info('Connected to REDIS');
+        }
+        catch (e) {
+            logger.error(`Connecting to REDIS ${e}`);
+            throw e;
+        }
+    }
+    _checkConnected(redis) {
+        if (redis.status !== 'ready') {
+            throw new Error('Redis connection down!');
+        }
+    }
+    checkConnected() {
+        this.masterPool.forEach(this._checkConnected);
+        this.slavesPool.forEach(this._checkConnected);
+    }
+    async close() {
+        try {
+            logger.info('Closing REDIS...');
+            await Promise.all([...this.masterPool, ...this.slavesPool].map(redis => redis.quit()));
+            logger.info('Closed REDIS');
+        }
+        catch (e) {
+            logger.error(`Closing REDIS ${e}`);
+            throw e;
+        }
+    }
+    async get(key) {
+        return this.slavesPool.next().get(key);
+    }
+    set(key, value) {
+        return this.masterPool.next().set(key, value);
+    }
+    setex(key, seconds, value) {
+        return this.masterPool.next().setex(key, seconds, value);
+    }
+    async incrWithTTLSec(key, ttlSec) {
+        const results = await this.masterPool
+            .next()
+            .multi()
+            .incr(key)
+            .expire(key, ttlSec)
+            .exec();
+        if (!results || results[0] === null) {
+            throw new Error(`incrWithTTLSec failed`);
+        }
+        return parseInt(results[0][1], 10);
+    }
+    async sismember(set, key) {
+        const res = await this.masterPool.next().sismember(set, key);
+        return typeof res === 'number' ? res : parseInt(res, 10);
+    }
+    publish(channel, value) {
+        return this.masterPool.next().publish(channel, value);
+    }
+    subscribe(channel, cb) {
+        const redis = new ioredis_1.default(this.redisSlavesUrl, IOREDIS_OPTION);
+        redis.on('error', (error) => {
+            logger.error(`redis_subscribe_error(${channel}): ${error}`);
+        });
+        redis.on('connect', () => logger.info(`Redis_subscriber_connected(${channel})`));
+        redis.on('message', cb);
+        return redis.subscribe(channel);
+    }
+    async del(key) {
+        return this.masterPool.next().del(key);
+    }
+    async zremrangebyscore(key, min, max) {
+        return this.masterPool.next().zremrangebyscore(key, min, max);
+    }
+    async zadd(key, bulkItemsToAdd, option) {
+        return option === undefined
+            ? this.masterPool.next().zadd(key, ...bulkItemsToAdd)
+            : this.masterPool.next().zadd(key, option, ...bulkItemsToAdd);
+    }
+    async zrem(key, membersKeys) {
+        return this.masterPool.next().zrem(key, membersKeys);
+    }
+    async zscore(key, member) {
+        return this.slavesPool.next().zscore(key, member);
+    }
+    async hset(mapKey, mappings) {
+        if (!Object.keys(mappings).length) {
+            return;
+        }
+        return this.masterPool.next().hset(mapKey, mappings);
+    }
+    async hdel(mapKey, keys) {
+        if (keys.length === 0) {
+            return 0;
+        }
+        return this.masterPool.next().hdel(mapKey, ...keys);
+    }
+    async hget(keyMap, key) {
+        return this.slavesPool.next().hget(keyMap, key);
+    }
+    async hmget(keyMap, keys) {
+        return this.slavesPool.next().hmget(keyMap, ...keys);
+    }
+    async hgetAll(keyMap) {
+        return this.slavesPool.next().hgetall(keyMap);
+    }
+    async zrangebyscore(key, min, max, isWithScores = false) {
+        return isWithScores
+            ? this.slavesPool.next().zrangebyscore(key, min, max, 'WITHSCORES')
+            : this.slavesPool.next().zrangebyscore(key, min, max);
+    }
+    async zcount(key, min, max) {
+        return this.slavesPool.next().zcount(key, min, max);
+    }
+    async sadd(set, keys, ttl) {
+        if (ttl) {
+            return this.masterPool
+                .next()
+                .multi()
+                .sadd(set, keys)
+                .expire(set, ttl)
+                .exec();
+        }
+        else {
+            return this.masterPool.next().sadd(set, keys);
+        }
+    }
+}
+exports.DexlibRedisWrapper = DexlibRedisWrapper;
+DexlibRedisWrapper.MAX_SCORE_VALUE = 9007199254740991;
+exports.default = new DexlibRedisWrapper();
+//# sourceMappingURL=RedisWrapper.js.map

package/build/dex-helper/RedisWrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RedisWrapper.js","sourceRoot":"","sources":["../../src/dex-helper/RedisWrapper.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAuD;AAEvD,MAAM,MAAM,GAAG,OAAO,CAAC;AAEvB,MAAM,cAAc,GAAiB;IACnC,oBAAoB,EAAE,IAAI;IAC1B,WAAW,EAAE,IAAI;IACjB,aAAa,EAAE,IAAI;CACpB,CAAC;AAMF,SAAS,QAAQ,CACf,GAAW,EACX,iBAAyB;IAEzB,MAAM,IAAI,GAAQ,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,CACnE,GAAG,EAAE,CAAC,IAAI,iBAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CACvC,CAAC;IACF,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAChC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;IACb,IAAI,CAAC,IAAI,GAAG,GAAG,EAAE;QACf,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;QACnD,OAAO,CAAC,CAAC;IACX,CAAC,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAa,kBAAkB;IAA/B;QAGU,mBAAc,GAAW,EAAE,CAAC;QAC5B,mBAAc,GAAW,EAAE,CAAC;IA0LtC,CAAC;IAnLC,KAAK,CAAC,OAAO,CACX,iBAAyB,yBAAyB,EAClD,iBAAyB,yBAAyB,EAClD,oBAA4B,CAAC;QAE7B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QAErC,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;QAC9D,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;QAC9D,IAAI;YACF,MAAM,CAAC,IAAI,CAAC,0BAA0B,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;YAC7D,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CACvE,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;SACnC;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC;YACzC,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAEO,eAAe,CAAC,KAAY;QAClC,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC3C;IACH,CAAC;IAED,cAAc;QACZ,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI;YACF,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAChC,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CACpE,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SAC7B;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;YACnC,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,KAAa;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,GAAW,EAAE,OAAe,EAAE,KAAa;QAC/C,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,MAAc;QAC9C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU;aAClC,IAAI,EAAE;aACN,KAAK,EAAE;aACP,IAAI,CAAC,GAAG,CAAC;aACT,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC;aACnB,IAAI,EAAE,CAAC;QAEV,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;SAC1C;QACD,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAW,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAW,EAAE,GAAW;QACtC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAE7D,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAa,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,OAAO,CAAC,OAAe,EAAE,KAAa;QACpC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACxD,CAAC;IAED,SAAS,CAAC,OAAe,EAAE,EAA8C;QACvE,MAAM,KAAK,GAAG,IAAI,iBAAO,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;QAC/D,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAa,EAAE,EAAE;YAClC,MAAM,CAAC,KAAK,CAAC,yBAAyB,OAAO,MAAM,KAAK,EAAE,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CACvB,MAAM,CAAC,IAAI,CAAC,8BAA8B,OAAO,GAAG,CAAC,CACtD,CAAC;QACF,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACxB,OAAO,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,GAAW,EACX,GAAW,EACX,GAAW;QAEX,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,IAAI,CACR,GAAW,EACX,cAAmC,EACnC,MAAa;QAEb,OAAO,MAAM,KAAK,SAAS;YACzB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,CAAC;YACrD,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAW,EAAE,WAAqB;QAC3C,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,MAAc;QACtC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,QAAgC;QACzD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE;YACjC,OAAO;SACR;QAED,OAAO,IAAI,CAAC,UAAW,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,IAAc;QACvC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO,CAAC,CAAC;SACV;QAED,OAAO,IAAI,CAAC,UAAW,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,GAAW;QACpC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,IAAc;QACxC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,GAAW,EACX,GAAW,EACX,GAAW,EACX,YAAY,GAAG,KAAK;QAEpB,OAAO,YAAY;YACjB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC;YACnE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,GAAW,EAAE,GAAW;QAChD,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAW,EAAE,IAAc,EAAE,GAAY;QAClD,IAAI,GAAG,EAAE;YACP,OAAO,IAAI,CAAC,UAAU;iBACnB,IAAI,EAAE;iBACN,KAAK,EAAE;iBACP,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC;iBACf,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;iBAChB,IAAI,EAAE,CAAC;SACX;aAAM;YACL,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;SAC/C;IACH,CAAC;;AA7LH,gDA8LC;AA7LQ,kCAAe,GAAG,gBAAgB,CAAC;AA+L5C,kBAAe,IAAI,kBAAkB,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "2.49.2-dackieswapv3-base.0",
+  "version": "2.49.2-hashflow",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

package/src/dex/hashflow/constants.ts

@@ -20,3 +20,35 @@ export const HASHFLOW_GAS_COST = 100_000;
 
 export const HASHFLOW_MIN_SLIPPAGE_FACTOR_THRESHOLD_FOR_RESTRICTION =
   new BigNumber('0.001');
+
+export const RESTRICT_79_TTL_MS = 60 * 30 * 1000; // 30 mins
+export const RESTRICT_SLIPPAGE_TTL_MS = 60 * 30 * 1000; // 30 mins
+export const RESTRICT_84_TTL_MS = 60 * 10 * 1000; // 10 mins
+export const RESTRICT_76_TTL_MS = 60 * 30 * 1000; // 30 mins
+export const RESTRICT_82_TTL_MS = 60 * 30 * 1000; // 30 mins
+export const RESTRICT_42_TTL_MS = 60 * 60 * 1000; // 60 mins
+export const RESTRICT_85_TTL_MS = 60 * 20 * 1000; // 20 mins
+export const RESTRICT_74_TTL_MS = 60 * 20 * 1000; // 20 mins
+export const RESTRICT_UNKNOWN_TTL_MS = 60 * 60 * 1000; // 30 mins
+export const RESTRICT_MISSING_QUOTE_DATA_TTL_MS = 60 * 10 * 1000; // 10 mins
+export const RESTRICT_MISSING_SIGNATURE_TTL_MS = 60 * 10 * 1000; // 10 mins
+
+export const UNKNOWN_ERROR_CODE = 'UNKNOWN';
+
+export const ERROR_CODE_TO_RESTRICT_TTL = {
+  '79': RESTRICT_79_TTL_MS, // {"code":79,"message":"Below minimum amount"}
+  SLIPPAGE: RESTRICT_SLIPPAGE_TTL_MS, // Error: Hashflow-56: too much slippage on quote SELL quoteTokenAmount 800317519410129900 / destAmount 848781022570196154 < 0.995
+  '84': RESTRICT_84_TTL_MS, // {"code":84,"message":"Rate Limit"}
+  '76': RESTRICT_76_TTL_MS, // {"code":76,"message":"Exceeds supported amounts"}
+  '82': RESTRICT_82_TTL_MS, // {"code":82,"message":"No maker supports this request"}
+  '42': RESTRICT_42_TTL_MS, // {"code":42,"message":"Unknown error"}
+  '85': RESTRICT_85_TTL_MS, // {"code":85,"message":"Markets too volatile"}
+  '74': RESTRICT_74_TTL_MS, // {"code":74,"message":"No maker could quote"}
+  MISSING_QUOTE_DATA: RESTRICT_MISSING_QUOTE_DATA_TTL_MS, //  missing quote data
+  MISSING_SIGNATURE_DATA: RESTRICT_MISSING_SIGNATURE_TTL_MS, // missing signature
+  [UNKNOWN_ERROR_CODE]: RESTRICT_UNKNOWN_TTL_MS, // unknown error
+};
+
+// not actually consecutive, meaning is if the error appeared > CONSECUTIVE_ERROR_THRESHOLD times within CONSECUTIVE_ERROR_TIMESPAN_MS ms -> restrict mm for ERROR_CODE_TO_RESTRICT_TTL[errorCode] ms
+export const CONSECUTIVE_ERROR_TIMESPAN_MS = 60 * 60 * 1000; // 1 hour
+export const CONSECUTIVE_ERROR_THRESHOLD = 3;

package/src/dex/hashflow/hashflow.ts

@@ -33,11 +33,14 @@ import {
   SimpleExchangeParam,
   Token,
 } from '../../types';
-import { getDexKeysWithNetwork } from '../../utils';
+import { getDexKeysWithNetwork, Utils } from '../../utils';
 import { TooStrictSlippageCheckError } from '../generic-rfq/types';
 import { SimpleExchange } from '../simple-exchange';
 import { Adapters, HashflowConfig } from './config';
 import {
+  CONSECUTIVE_ERROR_THRESHOLD,
+  CONSECUTIVE_ERROR_TIMESPAN_MS,
+  ERROR_CODE_TO_RESTRICT_TTL,
   HASHFLOW_API_CLIENT_NAME,
   HASHFLOW_API_MARKET_MAKERS_POLLING_INTERVAL_MS,
   HASHFLOW_API_PRICES_POLLING_INTERVAL_MS,
@@ -48,9 +51,12 @@ import {
   HASHFLOW_MIN_SLIPPAGE_FACTOR_THRESHOLD_FOR_RESTRICTION,
   HASHFLOW_MM_RESTRICT_TTL_S,
   HASHFLOW_PRICES_CACHES_TTL_S,
+  UNKNOWN_ERROR_CODE,
 } from './constants';
 import { RateFetcher } from './rate-fetcher';
 import {
+  CacheErrorCodesData,
+  ErrorCode,
   HashflowData,
   PriceLevel,
   RfqError,
@@ -69,6 +75,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
   private hashFlowAuthToken: string;
   private disabledMMs: Set<string>;
   private runtimeMMsRestrictHashMapKey: string;
+  private runtimeMMsRestrictHashMapErrorCodesKey: string;
 
   private pricesCacheKey: string;
   private marketMakersCacheKey: string;
@@ -108,6 +115,8 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
     this.disabledMMs = new Set(dexHelper.config.data.hashFlowDisabledMMs);
     this.runtimeMMsRestrictHashMapKey =
       `${CACHE_PREFIX}_${this.dexKey}_${this.network}_restricted_mms`.toLowerCase();
+    this.runtimeMMsRestrictHashMapErrorCodesKey =
+      `${CACHE_PREFIX}_${this.dexKey}_${this.network}_restricted_mms_error_codes`.toLowerCase();
 
     this.rateFetcher = new RateFetcher(
       this.dexHelper,
@@ -595,7 +604,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
           normalizedDestToken.address,
         )}: ${JSON.stringify(rfq)}`;
         this.logger.warn(message);
-        throw new RfqError(message);
+        throw new RfqError(message, `${rfq?.error?.code}` as ErrorCode);
       } else if (!rfq.quotes[0].quoteData) {
         const message = `${this.dexKey}-${
           this.network
@@ -604,7 +613,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
           normalizedDestToken.address,
         )}. Missing quote data`;
         this.logger.warn(message);
-        throw new RfqError(message);
+        throw new RfqError(message, 'MISSING_QUOTE_DATA');
       } else if (!rfq.quotes[0].signature) {
         const message = `${this.dexKey}-${
           this.network
@@ -613,7 +622,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
           normalizedDestToken.address,
         )}. Missing signature`;
         this.logger.warn(message);
-        throw new RfqError(message);
+        throw new RfqError(message, 'MISSING_SIGNATURE_DATA');
       }
 
       assert(
@@ -729,7 +738,13 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
           this.logger.warn(
             `${this.dexKey}-${this.network} MM unknown preprocess transaction error: ${e}`,
           );
-          await this.restrictMM(mm);
+          const code =
+            e instanceof RfqError || e instanceof SlippageCheckError
+              ? e?.code || UNKNOWN_ERROR_CODE
+              : UNKNOWN_ERROR_CODE;
+          await this.restrictMM(mm, code).catch(err =>
+            this.logger.warn(`Failed to restrict MM ${mm}: ${err}`),
+          );
         }
       }
 
@@ -737,24 +752,121 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
     }
   }
 
-  async restrictMM(mm: string): Promise<void> {
-    this.logger.warn(
-      `${this.dexKey}-${this.network}: ${mm} was restricted for ${HASHFLOW_MM_RESTRICT_TTL_S} sec. due to fails`,
-    );
-
-    // We use timestamp for creation date to later discern if it already expired or not
-    await this.dexHelper.cache.hset(
-      this.runtimeMMsRestrictHashMapKey,
+  async restrictMM(mm: string, errorCode: ErrorCode): Promise<void> {
+    const errorCodesRaw = await this.dexHelper.cache.hget(
+      this.runtimeMMsRestrictHashMapErrorCodesKey,
       mm,
-      Date.now().toString(),
     );
 
-    // Expiry cache because it has levels for blacklisted MM
-    this.dexHelper.cache.del(this.dexKey, this.network, 'levels').catch(e => {
-      this.logger.error(
-        `${this.dexKey}-${this.network}: Failed to delete levels cache: ${e.message}`,
+    const errorCodes: CacheErrorCodesData = Utils.Parse(errorCodesRaw) || {};
+
+    const error = errorCodes?.[errorCode];
+
+    if (
+      !error ||
+      error.addedDatetimeMS + CONSECUTIVE_ERROR_TIMESPAN_MS < Date.now()
+    ) {
+      this.logger.warn(
+        `${this.dexKey}-${this.network}: First encounter of error code=${errorCode} for ${mm} OR error ocurred outside of threshold, setting up counter`,
       );
-    });
+      const data: CacheErrorCodesData = {
+        ...errorCodes,
+        [errorCode]: {
+          count: 1,
+          addedDatetimeMS: Date.now(),
+        },
+      };
+      await this.dexHelper.cache.hset(
+        this.runtimeMMsRestrictHashMapErrorCodesKey,
+        mm,
+        Utils.Serialize(data),
+      );
+      return;
+    } else {
+      const restrictTTLMs =
+        ERROR_CODE_TO_RESTRICT_TTL[errorCode] ||
+        ERROR_CODE_TO_RESTRICT_TTL[UNKNOWN_ERROR_CODE];
+
+      if (error.count + 1 > CONSECUTIVE_ERROR_THRESHOLD) {
+        this.logger.warn(
+          `${this.dexKey}-${this.network}: ${mm} was restricted for ${
+            restrictTTLMs / 1000
+          } sec. due to ${errorCode} happening ${
+            error.count + 1
+          } times within last ${Math.floor(
+            CONSECUTIVE_ERROR_TIMESPAN_MS / 1000 / 60,
+          )} minutes`,
+        );
+
+        // date added is checked against HASHFLOW_MM_RESTRICT_TTL_S, as a hack we set a date so that it's checked against specific ttls based on error type to not change parsing logic for mms
+        // Example: ttl for a particular error is 20 minutes (< default 60 minutes)
+        //
+        // Meaning we need to set `addedDatetimeMS` for restrict hash as Date.now() + 40 minutes (diff between default restrict ttl=1h and particular error restrict ttl = 20 minutes). So the `addedDatetimeMS` is in the future, and after 20 minutes mm will not be considered as restricted
+        //
+        //
+        // Example 2: ttl for a particular error is 80 minutes (> default 60 minutes)
+        //
+        // Meaning we need to set `addedDatetimeMS` for restrict hash as Date.now() - 20 minutes, then after an hour (default) it'll still be 20 minutes left for restriction to be cleared
+
+        const defaultRestrictTTLMS = Math.floor(
+          HASHFLOW_MM_RESTRICT_TTL_S * 1000,
+        );
+        const dateModifierMS =
+          defaultRestrictTTLMS > restrictTTLMs
+            ? defaultRestrictTTLMS - restrictTTLMs
+            : -(restrictTTLMs - defaultRestrictTTLMS);
+
+        const date = (Date.now() + dateModifierMS).toString();
+
+        // We use timestamp for creation date to later discern if it already expired or not
+        await this.dexHelper.cache.hset(
+          this.runtimeMMsRestrictHashMapKey,
+          mm,
+          date,
+        );
+
+        // resetting error count
+        const data: CacheErrorCodesData = {
+          ...errorCodes,
+          [errorCode]: {
+            count: 1,
+            addedDatetimeMS: Date.now(),
+          },
+        };
+        await this.dexHelper.cache.hset(
+          this.runtimeMMsRestrictHashMapErrorCodesKey,
+          mm,
+          Utils.Serialize(data),
+        );
+
+        // Expiry cache because it has levels for blacklisted MM
+        await this.dexHelper.cache
+          .del(this.dexKey, this.network, 'levels')
+          .catch(e => {
+            this.logger.error(
+              `${this.dexKey}-${this.network}: Failed to delete levels cache: ${e.message}`,
+            );
+          });
+        return;
+      } else {
+        const newCount = +error.count + 1;
+        this.logger.warn(
+          `${this.dexKey}-${this.network}: ${mm} Error with code: ${errorCode} happened ${newCount} times (below or equal to the limit: ${CONSECUTIVE_ERROR_THRESHOLD}), updating counter`,
+        );
+        const data: CacheErrorCodesData = {
+          ...errorCodes,
+          [errorCode]: {
+            count: newCount,
+            addedDatetimeMS: error.addedDatetimeMS, // initial date stays
+          },
+        };
+        await this.dexHelper.cache.hset(
+          this.runtimeMMsRestrictHashMapErrorCodesKey,
+          mm,
+          Utils.Serialize(data),
+        );
+      }
+    }
   }
 
   getCalldataGasCost(poolPrices: PoolPrices<HashflowData>): number | number[] {

package/src/dex/hashflow/types.ts

@@ -1,5 +1,6 @@
 import { Chain, QuoteData } from '@hashflow/taker-js/dist/types/common';
 import { RequestHeaders } from '../../dex-helper';
+import { ERROR_CODE_TO_RESTRICT_TTL, UNKNOWN_ERROR_CODE } from './constants';
 
 export type HashflowData = {
   mm: string;
@@ -16,14 +17,22 @@ export interface PriceLevel {
   p: string;
 }
 
-export class RfqError extends Error {}
+export class RfqError extends Error {
+  code: ErrorCode;
+  constructor(message: string, code: ErrorCode = UNKNOWN_ERROR_CODE) {
+    super(message);
+    this.code = code;
+  }
+}
 
 export enum RFQType {
   RFQT = 0,
   RFQM = 1,
 }
 
-export class SlippageCheckError extends Error {}
+export class SlippageCheckError extends Error {
+  code: ErrorCode = 'SLIPPAGE';
+}
 
 export type HashflowRatesLevel = {
   pair: Record<string, string>;
@@ -63,3 +72,12 @@ export type HashflowRateFetcherConfig = {
     marketMakersCacheTTLSecs: number;
   };
 };
+
+export type ErrorCode = keyof typeof ERROR_CODE_TO_RESTRICT_TTL;
+
+export type CacheErrorCodesData = {
+  [code in ErrorCode]: {
+    addedDatetimeMS: number;
+    count: number;
+  } | null;
+};

package/src/dex/index.ts

@@ -85,6 +85,7 @@ import { Dexalot } from './dexalot/dexalot';
 import { Smardex } from './smardex/smardex';
 import { Wombat } from './wombat/wombat';
 import { Swell } from './swell/swell';
+import { PharaohV1 } from './solidly/forks-override/pharaohV1';
 import { EtherFi } from './etherfi';
 
 const LegacyDexes = [
@@ -168,6 +169,7 @@ const Dexes = [
   Smardex,
   Wombat,
   Swell,
+  PharaohV1,
 ];
 
 export type LegacyDexConstructor = new (dexHelper: IDexHelper) => IDexTxBuilder<

package/src/dex/pancakeswap-v3/config.ts

@@ -69,22 +69,6 @@ export const PancakeswapV3Config: DexConfigMap<DexParams> = {
         'https://api.studio.thegraph.com/query/45376/exchange-v3-base/version/latest',
     },
   },
-  DackieSwapV3: {
-    [Network.BASE]: {
-      factory: '0x3D237AC6D2f425D2E890Cc99198818cc1FA48870',
-      quoter: '0x4fDBD73aD4B1DDde594BF05497C15f76308eFfb9',
-      deployer: '0x4f205D69834f9B101b9289F7AFFAc9B77B3fF9b7',
-      router: '0x4030ebafeb76e5fc848891076dfe315993800ba5',
-      supportedFees: [10000n, 2500n, 500n, 100n],
-      stateMulticall: '0xeBF40A40CA3D4310Bf53048F48e860656e1D7C81',
-      uniswapMulticall: '0x091e99cb1C49331a94dD62755D168E941AbD0693',
-      chunksCount: 10,
-      initRetryFrequency: 10,
-      initHash: `0x6ce8eb472fa82df5469c6ab6d485f17c3ad13c8cd7af59b3d4a8026c5ce0f7e2`,
-      subgraphURL:
-        'https://api.studio.thegraph.com/query/50473/exchange-clmm/version/latest',
-    },
-  },
 };
 
 export const Adapters: Record<number, AdapterMappings> = {