@paraswap/dex-lib 4.1.9 → 4.1.10-pubsub

package/src/lib/pub-sub.ts

@@ -11,6 +11,151 @@ type KeyValuePubSubMsg = {
 
 type SetPubSubMsg = string[];
 
+export class ExpKeyValuePubSub {
+  channel: string;
+  network: Network;
+  localCache: NodeCache = new NodeCache();
+
+  logger: Logger;
+
+  private localCacheHits = 0;
+  private localCacheMisses = 0;
+  private redisCacheHits = 0;
+  private redisCacheMisses = 0;
+  private cacheLogInterval = parseInt(
+    process.env.CACHE_LOG_INTERVAL || '1000',
+    10,
+  );
+
+  constructor(
+    private dexHelper: IDexHelper,
+    private dexKey: string,
+    channel: string,
+    private defaultValue?: any,
+    private defaultTTL?: number,
+  ) {
+    this.network = this.dexHelper.config.data.network;
+    this.channel = `${this.network}_${this.dexKey}_${channel}`;
+
+    this.logger = this.dexHelper.getLogger(`ExpKeyValuePubSub_${this.channel}`);
+  }
+
+  subscribe() {
+    this.logger.info(
+      `Subscribing to ${this.channel} with isSlave=${this.dexHelper.config.isSlave}`,
+    );
+
+    this.dexHelper.cache.subscribe(this.channel, (_, msg) => {
+      try {
+        const decodedMsg = JSON.parse(msg) as KeyValuePubSubMsg;
+        this.handleSubscription(decodedMsg);
+      } catch (error: any) {
+        this.logger.error(
+          `Failed to process pub/sub message: ${error?.message}`,
+          {
+            channel: this.channel,
+            messagePreview: msg.substring(0, 100),
+          },
+        );
+      }
+    });
+  }
+
+  publish(data: Record<string, unknown>, ttl: number) {
+    const expiresAt = Math.round(Date.now() / 1000) + ttl;
+    this.logger.debug(
+      `Publishing to ${this.channel} with keys: ${Object.keys(data).join(
+        ', ',
+      )}, TTL: ${ttl}`,
+    );
+    this.dexHelper.cache.publish(
+      this.channel,
+      JSON.stringify({ expiresAt, data }),
+    );
+  }
+
+  handleSubscription(msg: KeyValuePubSubMsg) {
+    const { expiresAt, data } = msg;
+
+    const now = Math.round(Date.now() / 1000);
+    // calculating ttl as message might come with the delay
+    const ttl = expiresAt - now;
+
+    if (ttl > 0) {
+      const keys = Object.keys(data);
+      for (const key of keys) {
+        this.logger.debug(`Setting local cache for ${key} with TTL ${ttl}`);
+        this.localCache.set(key, data[key], ttl);
+      }
+    } else {
+      this.logger.error('Message has expired', {
+        now,
+        expiresAt,
+        diffInSeconds: now - expiresAt,
+        keys: Object.keys(data),
+        channel: this.channel,
+      });
+    }
+  }
+
+  async getAndCache<T>(key: string): Promise<T | null> {
+    const localValue = this.localCache.get<T>(key);
+
+    if (localValue) {
+      this.localCacheHits++;
+      if (this.localCacheHits % this.cacheLogInterval === 0) {
+        this.logger.info(
+          `Cache stats for ${this.channel}: local hits=${this.localCacheHits}, local misses=${this.localCacheMisses}, redis hits=${this.redisCacheHits}, redis misses=${this.redisCacheMisses}`,
+        );
+      }
+      return localValue;
+    }
+
+    this.localCacheMisses++;
+    const cacheKey = `${this.dexKey}_${this.network}_${key}`;
+
+    this.logger.debug(`Cache miss for ${cacheKey} in local cache`);
+
+    try {
+      const [value, ttl] = await Promise.all([
+        this.dexHelper.cache.get(this.dexKey, this.network, key),
+        this.dexHelper.cache.ttl(this.dexKey, this.network, key),
+      ]);
+
+      if (value && ttl > 0) {
+        this.redisCacheHits++;
+        this.logger.debug(`Redis cache hit for ${cacheKey} with TTL ${ttl}`);
+        const parsedValue = JSON.parse(value);
+        this.localCache.set(key, parsedValue, ttl);
+        return parsedValue;
+      } else if (value) {
+        this.redisCacheMisses++;
+        this.logger.warn(
+          `Redis cache hit for ${cacheKey} but TTL is ${ttl} (expired)`,
+        );
+      } else {
+        this.redisCacheMisses++;
+        this.logger.debug(`Redis cache miss for ${cacheKey}`);
+      }
+
+      if (this.defaultValue && this.defaultTTL && this.defaultTTL > 0) {
+        this.logger.debug(
+          `Using default value for ${cacheKey} with TTL ${this.defaultTTL}`,
+        );
+        this.localCache.set(key, this.defaultValue, this.defaultTTL);
+        return this.defaultValue;
+      }
+
+      return null;
+    } catch (error: any) {
+      this.logger.error(
+        `Error fetching from Redis for ${cacheKey}: ${error.message}`,
+      );
+      return null;
+    }
+  }
+}
+
 export class ExpStringPubSub {
   channel: string;
   network: Network;
@@ -193,8 +338,6 @@ export class NonExpSetPubSub {
   }
 
   async initializeAndSubscribe(initialSet: string[]) {
-    this.logger.info(`initializeAndSubscribe with ${initialSet}`);
-
     for (const member of initialSet) {
       this.set.add(member);
     }
@@ -213,14 +356,11 @@ export class NonExpSetPubSub {
 
   publish(msg: SetPubSubMsg) {
     if (msg.length > 0) {
-      this.logger.info(`Publishing msg: '${msg}'`);
       this.dexHelper.cache.publish(this.channel, JSON.stringify(msg));
     }
   }
 
   handleSubscription(set: SetPubSubMsg) {
-    this.logger.info(`Received subscription msg: '${set}'`);
-
     for (const key of set) {
       this.set.add(key);
     }

package/tests/constants-e2e.ts

@@ -1411,6 +1411,14 @@ export const Tokens: {
       address: '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85',
       decimals: 6,
     },
+    stataUSDC: {
+      address: '0x41B334E9F2C0ED1f30fD7c351874a6071C53a78E',
+      decimals: 6,
+    },
+    aOptUSDCn: {
+      address: '0x38d693cE1dF5AaDF7bC62595A37D667aD57922e5',
+      decimals: 6,
+    },
     USDT: {
       address: '0x94b008aA00579c1307B0EF2c499aD98a8ce58e58',
       decimals: 6,
@@ -2093,6 +2101,7 @@ export const Holders: {
     POPS: '0x3cbd9044aaabef08ce93a68448e093cff405ad76',
     USDCe: '0xdecc0c09c3b5f6e92ef4184125d5648a66e35298',
     USDC: '0x8aF3827a41c26C7F32C81E93bb66e837e0210D5c',
+    aOptUSDCn: '0x38d693cE1dF5AaDF7bC62595A37D667aD57922e5',
     USDT: '0xf977814e90da44bfa03b6295a0616a897441acec',
     OP: '0xEBb8EA128BbdFf9a1780A4902A9380022371d466',
     aOptWETH: '0x7B7D80C40415F744864f051B806b466e2fbB8E68',
@@ -2112,6 +2121,7 @@ export const Holders: {
     LUSD: '0xf0a9abb11958a071e168f2ee5bcbacf1abbde9cf',
     GRAI: '0x92b051204816DC4fbA7AC1A68a2cf319A9a387CB',
     stataUSDT: '0xd55263b84685Ced7e10a77607C7fFD763D495B6e',
+    stataUSDC: '0x450C01300B83bE379113256038b4Dd3b45d23B5e',
     aaveUSDT: '0x1Fd458C52fEb7Bb35097ebd9566DB6C269341FDD',
     tBTC: '0xf7b4531e52211CC44379102F719cad29411dB053',
     PSTAKE: '0xc45398444B83183b2018e0224B3D332b42D492Af',

package/tests/utils-e2e.ts

@@ -490,7 +490,6 @@ export async function testE2E(
   }
 
   if (paraswap.dexHelper?.replaceProviderWithRPC) {
-    console.log('ts.rpcURL: ', ts.rpcURL);
     paraswap.dexHelper?.replaceProviderWithRPC(ts.rpcURL);
   }
 

package/.idea/codeStyles/Project.xml

@@ -1,59 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/paraswap-dex-lib.iml" filepath="$PROJECT_DIR$/.idea/paraswap-dex-lib.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/paraswap-dex-lib.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/prettier.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-    <option name="myRunOnSave" value="true" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

package/scripts/get-uniswap-v3-dexes.ts

@@ -1,64 +0,0 @@
-import { UniswapV3Config } from '../src/dex/uniswap-v3/config';
-import { PancakeswapV3Config } from '../src/dex/pancakeswap-v3/config';
-import { constructSimpleSDK } from '@paraswap/sdk';
-import { ParaSwapVersion } from '@paraswap/core';
-import axios from 'axios';
-
-const main = async () => {
-  const network = 1;
-  const userAddress = '0x75C94990D2Ad92D8da4E0a238d872D09ec16706E';
-  const srcToken = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48';
-  const destToken = '0xdAC17F958D2ee523a2206206994597C13D831ec7';
-  const amount = '1000000'
-  const partner = 'paraswap.io';
-  const prodSdk = constructSimpleSDK({
-    version: ParaSwapVersion.V6,
-    chainId: network,
-    axios,
-  });
-
-  const ordersSdk = constructSimpleSDK({
-    version: ParaSwapVersion.V6,
-    chainId: network,
-    axios,
-    apiURL:
-      'https://api.orders.paraswap.io'
-  })
-
-  const priceRoute = await prodSdk.swap.getRate({
-    srcToken,
-    destToken,
-    amount,
-    options: {
-      partner
-    }
-  })
-
-  console.log(priceRoute);
-
-  const txOrders = await ordersSdk.swap.buildTx({
-    priceRoute,
-    srcToken,
-    destToken,
-    userAddress,
-    srcAmount: amount,
-    slippage: 50,
-    partner
-  })
-
-  const txProd = await prodSdk.swap.buildTx({
-    priceRoute,
-    srcToken,
-    destToken,
-    userAddress,
-    srcAmount: amount,
-    slippage: 50,
-    partner
-  })
-
-  console.log();
-  console.log(txOrders);
-  console.log(txProd);
-
-}
-main().catch(console.log)