@paraswap/dex-lib 4.0.6-rfq-pub-sub.3 → 4.0.6

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

@@ -37,7 +37,6 @@ import {
   ERC1271Contract,
 } from '../../lib/erc1271-utils';
 import { isContractAddress } from '../../utils';
-import { JsonPubSub, SetPubSub } from '../../lib/pub-sub';
 
 const GET_FIRM_RATE_TIMEOUT_MS = 2000;
 export const reversePrice = (price: PriceAndAmountBigNumber) =>
@@ -56,9 +55,6 @@ export class RateFetcher {
   private addressToTokenMap: Record<string, TokenWithInfo> = {};
   private pairs: PairMap = {};
 
-  private pricesPubSub: JsonPubSub;
-  private blacklistPubSub?: SetPubSub;
-
   private firmRateAuth?: (options: RequestConfig) => void;
 
   public blackListCacheKey: string;
@@ -127,9 +123,6 @@ export class RateFetcher {
       logger,
     );
 
-    this.pricesPubSub = new JsonPubSub(this.dexHelper, this.dexKey, 'prices');
-
-    this.blackListCacheKey = `${this.dexHelper.config.data.network}_${this.dexKey}_blacklist`;
     if (config.blacklistConfig) {
       this.blackListFetcher = new Fetcher<BlackListResponse>(
         dexHelper.httpRequest,
@@ -149,15 +142,9 @@ export class RateFetcher {
         config.blacklistConfig.intervalMs,
         logger,
       );
-
-      this.blacklistPubSub = new SetPubSub(
-        this.dexHelper,
-        this.dexKey,
-        'blacklist',
-        this.blackListCacheKey,
-      );
     }
 
+    this.blackListCacheKey = `${this.dexHelper.config.data.network}_${this.dexKey}_blacklist`;
     if (this.config.firmRateConfig.secret) {
       this.firmRateAuth = this.authHttp(this.config.firmRateConfig.secret);
     }
@@ -174,13 +161,6 @@ export class RateFetcher {
         this.config.maker,
       );
     }
-
-    if (this.dexHelper.config.isSlave) {
-      this.pricesPubSub.initialize();
-      if (this.blacklistPubSub) {
-        this.blacklistPubSub.initialize(this.blackListCacheKey);
-      }
-    }
   }
 
   start() {
@@ -234,22 +214,16 @@ export class RateFetcher {
     for (const address of resp.blacklist) {
       this.dexHelper.cache.sadd(this.blackListCacheKey, address.toLowerCase());
     }
-
-    if (this.blacklistPubSub) {
-      this.blacklistPubSub.publish(resp.blacklist);
-    }
   }
 
   public isBlackListed(userAddress: string) {
-    if (this.blacklistPubSub) {
-      return this.blacklistPubSub.has(userAddress.toLowerCase());
-    }
-    return false;
+    return this.dexHelper.cache.sismember(
+      this.blackListCacheKey,
+      userAddress.toLowerCase(),
+    );
   }
 
   private handleRatesResponse(resp: RatesResponse) {
-    const pubSubData: Record<string, unknown> = {};
-    const ttl = this.config.rateConfig.dataTTLS;
     const pairs = this.pairs;
 
     if (isEmpty(pairs)) return;
@@ -278,51 +252,37 @@ export class RateFetcher {
       }
 
       if (prices.bids.length) {
-        const key = `${baseToken.address}_${quoteToken.address}_bids`;
-        const value = prices.bids;
-        pubSubData[key] = value;
-
         this.dexHelper.cache.setex(
           this.dexKey,
           this.dexHelper.config.data.network,
-          key,
-          ttl,
-          JSON.stringify(value),
+          `${baseToken.address}_${quoteToken.address}_bids`,
+          this.config.rateConfig.dataTTLS,
+          JSON.stringify(prices.bids),
         );
         currentPricePairs.add(`${baseToken.address}_${quoteToken.address}`);
       }
 
       if (prices.asks.length) {
-        const key = `${baseToken.address}_${quoteToken.address}_asks`;
-        const value = prices.asks;
-        pubSubData[key] = value;
-
         this.dexHelper.cache.setex(
           this.dexKey,
           this.dexHelper.config.data.network,
-          key,
-          ttl,
-          JSON.stringify(value),
+          `${baseToken.address}_${quoteToken.address}_asks`,
+          this.config.rateConfig.dataTTLS,
+          JSON.stringify(prices.asks),
         );
         currentPricePairs.add(`${quoteToken.address}_${baseToken.address}`);
       }
     });
 
     if (currentPricePairs.size > 0) {
-      const key = `pairs`;
-      const value = Array.from(currentPricePairs);
-      pubSubData[key] = value;
-
       this.dexHelper.cache.setex(
         this.dexKey,
         this.dexHelper.config.data.network,
-        key,
-        ttl,
-        JSON.stringify(value),
+        `pairs`,
+        this.config.rateConfig.dataTTLS,
+        JSON.stringify(Array.from(currentPricePairs)),
       );
     }
-
-    this.pricesPubSub.publish(pubSubData, ttl);
   }
 
   checkHealth(): boolean {
@@ -362,13 +322,17 @@ export class RateFetcher {
   }
 
   public async getAvailablePairs(): Promise<string[]> {
-    const pairs = await this.pricesPubSub.getAndCache<string[]>(`pairs`);
+    const pairs = await this.dexHelper.cache.get(
+      this.dexKey,
+      this.dexHelper.config.data.network,
+      `pairs`,
+    );
 
     if (!pairs) {
       return [];
     }
 
-    return pairs;
+    return JSON.parse(pairs) as string[];
   }
 
   public async getOrderPrice(
@@ -378,36 +342,49 @@ export class RateFetcher {
   ): Promise<PriceAndAmountBigNumber[] | null> {
     let reversed = false;
 
-    let prices: PriceAndAmount[] | null = null;
+    let pricesAsString: string | null = null;
     if (side === SwapSide.SELL) {
-      prices = await this.pricesPubSub.getAndCache(
+      pricesAsString = await this.dexHelper.cache.get(
+        this.dexKey,
+        this.dexHelper.config.data.network,
         `${srcToken.address}_${destToken.address}_bids`,
       );
 
-      if (!prices) {
-        prices = await this.pricesPubSub.getAndCache(
+      if (!pricesAsString) {
+        pricesAsString = await this.dexHelper.cache.get(
+          this.dexKey,
+          this.dexHelper.config.data.network,
           `${destToken.address}_${srcToken.address}_asks`,
         );
         reversed = true;
       }
     } else {
-      prices = await this.pricesPubSub.getAndCache(
+      pricesAsString = await this.dexHelper.cache.get(
+        this.dexKey,
+        this.dexHelper.config.data.network,
         `${destToken.address}_${srcToken.address}_asks`,
       );
 
-      if (!prices) {
-        prices = await this.pricesPubSub.getAndCache(
+      if (!pricesAsString) {
+        pricesAsString = await this.dexHelper.cache.get(
+          this.dexKey,
+          this.dexHelper.config.data.network,
           `${srcToken.address}_${destToken.address}_bids`,
         );
         reversed = true;
       }
     }
 
-    if (!prices) {
+    if (!pricesAsString) {
       return null;
     }
 
-    let orderPrices = prices.map(price => [
+    const orderPricesAsString: PriceAndAmount[] = JSON.parse(pricesAsString);
+    if (!orderPricesAsString) {
+      return null;
+    }
+
+    let orderPrices = orderPricesAsString.map(price => [
       new BigNumber(price[0]),
       new BigNumber(price[1]),
     ]);
@@ -506,16 +483,4 @@ export class RateFetcher {
       throw e;
     }
   }
-
-  async setBlacklist(userAddress: string): Promise<boolean> {
-    await this.dexHelper.cache.hset(
-      this.blackListCacheKey,
-      userAddress.toLowerCase(),
-      'true',
-    );
-    if (this.blacklistPubSub) {
-      this.blacklistPubSub.publish([userAddress.toLowerCase()]);
-    }
-    return true;
-  }
 }

package/src/dex-helper/dummy-dex-helper.ts

@@ -43,15 +43,6 @@ class DummyCache implements ICache {
     return null;
   }
 
-  async ttl(
-    dexKey: string,
-    network: number,
-    cacheKey: string,
-  ): Promise<number> {
-    const key = `${network}_${dexKey}_${cacheKey}`.toLowerCase();
-    return this.storage[key] ? 1 : -1;
-  }
-
   async rawget(key: string): Promise<string | null> {
     return this.storage[key] ? this.storage[key] : null;
     return null;
@@ -148,10 +139,6 @@ class DummyCache implements ICache {
     return set.has(key);
   }
 
-  async smembers(setKey: string): Promise<string[]> {
-    return Array.from(this.setMap[setKey] ?? []);
-  }
-
   async hset(mapKey: string, key: string, value: string): Promise<void> {
     if (!this.hashStorage[mapKey]) this.hashStorage[mapKey] = {};
     this.hashStorage[mapKey][key] = value;

package/src/dex-helper/icache.ts

@@ -5,8 +5,6 @@ export interface ICache {
     cacheKey: string,
   ): Promise<string | null>;
 
-  ttl(dexKey: string, network: number, cacheKey: string): Promise<number>;
-
   rawget(key: string): Promise<string | null>;
 
   rawset(key: string, value: string, ttl: number): Promise<string | null>;
@@ -54,8 +52,6 @@ export interface ICache {
 
   sismember(setKey: string, key: string): Promise<boolean>;
 
-  smembers(setKey: string): Promise<string[]>;
-
   hset(mapKey: string, key: string, value: string): Promise<void>;
 
   hdel(mapKey: string, keys: string[]): Promise<number>;

package/tests/constants-e2e.ts

@@ -131,6 +131,10 @@ export const Tokens: {
       addBalance: balancesFn,
       addAllowance: allowedFn,
     },
+    INST: {
+      address: '0x6f40d4A6237C257fff2dB00FA0510DeEECd303eb',
+      decimals: 18,
+    },
     aEthUSDC: {
       address: '0x98c23e9d8f34fefb1b7bd6a91b7ff122f4e16f5c',
       decimals: 6,
@@ -1691,6 +1695,7 @@ export const Holders: {
     SKY: '0x0ddda327A6614130CCb20bc0097313A282176A01',
     MKR: '0xe9aAA7A9DDc0877626C1779AbC29993aD89A6c1f',
     ETHx: '0xFCC1A2c71F01B7f58Ed538a6B4AAa5A0724eB5A6',
+    INST: '0xe2Dd506477D4792A7E811D2E93D44CeBa82c668B',
     // Idle tokens
     AA_wstETH: '0xd7C1b48877A7dFA7D51cf1144c89C0A3F134F935',
     'AA_idle_cpPOR-USDC': '0x085c8eaccA6911fE60aE3f8FbAe5F3012E3A05Ec',

package/.vscode/launch.json

@@ -1,53 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Current",
-      "program": "${file}",
-      "preLaunchTask": "npm: build",
-      "sourceMaps": true,
-      "smartStep": true,
-      "internalConsoleOptions": "openOnSessionStart",
-      "outFiles": ["${workspaceFolder}/build/**/*.js"]
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Debug dex integration",
-      "program": "${workspaceFolder}/node_modules/ts-node/dist/bin.js",
-      "args": [
-        "--project",
-        "tsconfig.json",
-        // "${workspaceFolder}/src/dex/algebra/scripts/validate-state.ts",
-        "${workspaceFolder}/src/dex/camelot/camelot-pool-discovery.test.ts",
-        // "${workspaceFolder}/src/dex/solidly-v3/scripts/check-event-pool-event.ts",
-        // "${workspaceFolder}/scripts/dex-integration.ts",
-        "test",
-        "wombat"
-      ],
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "runtimeArgs": ["--nolazy"],
-      "sourceMaps": true,
-      "smartStep": true,
-      "skipFiles": ["<node_internals>/**"],
-      "cwd": "${workspaceFolder}"
-    },
-    {
-      "type": "node",
-      "name": "Jest file",
-      "request": "launch",
-      "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
-      // "program": "${workspaceFolder}/src/dex/camelot/scripts/validate-state.ts",
-      // "args": ["src/dex/balancer-v1/balancer-v1-e2e.test.ts"],
-      // "args": ["${relativeFile}"],
-      "args": ["${file}"],
-      "cwd": "${workspaceRoot}",
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "sourceMaps": true
-    }
-  ]
-}

package/.vscode/settings.json

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

package/.vscode/tasks.json

@@ -1,15 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "tsc: build - tsconfig.json",
-      "type": "typescript",
-      "tsconfig": "tsconfig.json",
-      "problemMatcher": ["$tsc"],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      }
-    }
-  ]
-}