@paraswap/dex-lib 4.1.7-pub-sub → 4.1.8

package/src/dex/wsteth/wsteth-gas-estimation.test.ts

@@ -0,0 +1,41 @@
+/* eslint-disable no-console */
+import 'dotenv/config';
+import { testGasEstimation } from '../../../tests/utils-e2e';
+import { Tokens } from '../../../tests/constants-e2e';
+import { Network, SwapSide } from '../../constants';
+import { ContractMethodV6 } from '@paraswap/core';
+
+describe('wstETH Gas Estimation', () => {
+  const dexKey = 'wstETH';
+  const network = Network.MAINNET;
+
+  describe('swapExactAmountIn', () => {
+    const STETH = Tokens[network]['STETH'];
+    const wstETH = Tokens[network]['wstETH'];
+    const amount = 1000000000000000000n;
+
+    it('wrap', async () => {
+      await testGasEstimation(
+        network,
+        STETH,
+        wstETH,
+        amount,
+        SwapSide.SELL,
+        dexKey,
+        ContractMethodV6.swapExactAmountIn,
+      );
+    });
+
+    it('unwrap', async () => {
+      await testGasEstimation(
+        network,
+        wstETH,
+        STETH,
+        amount,
+        SwapSide.SELL,
+        dexKey,
+        ContractMethodV6.swapExactAmountIn,
+      );
+    });
+  });
+});

package/src/dex/wusdm/wusdm-gas-estimation.test.ts

@@ -0,0 +1,41 @@
+/* eslint-disable no-console */
+import 'dotenv/config';
+import { testGasEstimation } from '../../../tests/utils-e2e';
+import { Tokens } from '../../../tests/constants-e2e';
+import { Network, SwapSide } from '../../constants';
+import { ContractMethodV6 } from '@paraswap/core';
+
+describe('wUSDM Gas Estimation', () => {
+  const dexKey = 'wUSDM';
+  const network = Network.MAINNET;
+
+  describe('swapExactAmountIn', () => {
+    const wUSDM = Tokens[network]['wUSDM'];
+    const USDM = Tokens[network]['USDM'];
+    const amount = 500n;
+
+    it('deposit', async () => {
+      await testGasEstimation(
+        network,
+        USDM,
+        wUSDM,
+        amount,
+        SwapSide.SELL,
+        dexKey,
+        ContractMethodV6.swapExactAmountIn,
+      );
+    });
+
+    it('redeem', async () => {
+      await testGasEstimation(
+        network,
+        wUSDM,
+        USDM,
+        amount,
+        SwapSide.SELL,
+        dexKey,
+        ContractMethodV6.swapExactAmountIn,
+      );
+    });
+  });
+});

package/src/lib/pub-sub.ts

@@ -11,104 +11,6 @@ type KeyValuePubSubMsg = {
 
 type SetPubSubMsg = string[];
 
-export class ExpKeyValuePubSub {
-  channel: string;
-  network: Network;
-  localCache: NodeCache = new NodeCache();
-  logPrefix = 'ExpKeyValuePubSub';
-
-  logger: Logger;
-
-  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}`);
-
-    this.dexHelper.cache.subscribe(this.channel, (_, msg) => {
-      const decodedMsg = JSON.parse(msg) as KeyValuePubSubMsg;
-      this.logger.info(`${this.logPrefix} Received msg: '${msg}'`);
-      this.handleSubscription(decodedMsg);
-    });
-  }
-
-  publish(data: Record<string, unknown>, ttl: number) {
-    const expiresAt = Math.round(Date.now() / 1000) + ttl;
-    this.logger.info(
-      `${this.logPrefix} Publishing msg: '${JSON.stringify({
-        expiresAt,
-        data,
-      })}'`,
-    );
-    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.localCache.set(key, data[key], ttl);
-      }
-    } else {
-      this.logger.error('Message has expired', {
-        now,
-        expiresAt,
-        diffInSeconds: now - expiresAt,
-        keys: Object.keys(data),
-      });
-    }
-  }
-
-  async getAndCache<T>(key: string): Promise<T | null> {
-    const localValue = this.localCache.get<T>(key);
-
-    this.logger.info(
-      `${this.logPrefix} Getting and caching key: ${key}, localValue: ${localValue}`,
-    );
-
-    if (localValue) {
-      return localValue;
-    }
-
-    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) {
-      const parsedValue = JSON.parse(value);
-      this.localCache.set(key, parsedValue, ttl);
-      return parsedValue;
-    }
-
-    if (this.defaultValue && this.defaultTTL && this.defaultTTL > 0) {
-      this.localCache.set(key, this.defaultValue, this.defaultTTL);
-      return this.defaultValue;
-    }
-
-    return null;
-  }
-}
-
 export class ExpStringPubSub {
   channel: string;
   network: Network;
@@ -276,7 +178,6 @@ export class NonExpSetPubSub {
   channel: string;
   network: Network;
   set = new Set<string>();
-  logPrefix = 'NonExpSetPubSub';
 
   logger: Logger;
 
@@ -292,9 +193,7 @@ export class NonExpSetPubSub {
   }
 
   async initializeAndSubscribe(initialSet: string[]) {
-    this.logger.info(
-      `${this.logPrefix} initializeAndSubscribe with ${initialSet}`,
-    );
+    this.logger.info(`initializeAndSubscribe with ${initialSet}`);
 
     for (const member of initialSet) {
       this.set.add(member);
@@ -308,22 +207,19 @@ export class NonExpSetPubSub {
 
     this.dexHelper.cache.subscribe(this.channel, (_, msg) => {
       const decodedMsg = JSON.parse(msg) as SetPubSubMsg;
-      this.logger.info(
-        `${this.logPrefix} Received subscription msg: '${decodedMsg}'`,
-      );
       this.handleSubscription(decodedMsg);
     });
   }
 
   publish(msg: SetPubSubMsg) {
     if (msg.length > 0) {
-      this.logger.info(`${this.logPrefix} Publishing msg: '${msg}'`);
+      this.logger.info(`Publishing msg: '${msg}'`);
       this.dexHelper.cache.publish(this.channel, JSON.stringify(msg));
     }
   }
 
   handleSubscription(set: SetPubSubMsg) {
-    this.logger.info(`${this.logPrefix} Received subscription msg: '${set}'`);
+    this.logger.info(`Received subscription msg: '${set}'`);
 
     for (const key of set) {
       this.set.add(key);

package/tests/constants-e2e.ts

@@ -591,6 +591,14 @@ export const Tokens: {
       decimals: 6,
       symbol: 'USUALM',
     },
+    stataEthWETH: {
+      address: '0x252231882FB38481497f3C767469106297c8d93b',
+      decimals: 18,
+    },
+    waEthWETH: {
+      address: '0x0bfc9d54Fc184518A81162F8fB99c2eACa081202',
+      decimals: 18,
+    },
   },
   [Network.POLYGON]: {
     jGBP: {

package/tests/tenderly-simulation-new.test.ts

@@ -0,0 +1,151 @@
+import { ethers } from 'ethers';
+import { TenderlySimulatorNew } from './tenderly-simulation-new';
+
+describe('Tenderly', () => {
+  const tenderly = TenderlySimulatorNew.getInstance();
+  const USDC = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';
+  const USDT = '0xdac17f958d2ee523a2206206994597c13d831ec7';
+  const account = '0x89f53c184ed91cd333fdec0eceeddcaea0cc28cf';
+  const spender = '0x6a000f20005980200259b80c5102003040001068';
+
+  describe('calculateAddressBalanceSlot', () => {
+    it('should calculate account balance storage slot', () => {
+      const balanceOfSlot = ethers.utils.defaultAbiCoder.encode(['uint'], [9]); // usdc's `balanceOf` mapping slot
+      // https://dashboard.tenderly.co/paraswap/paraswap/simulator/d7964910-d8ce-446b-a347-c4f1da1acead/debugger?trace=0.2.0.0
+      const expected =
+        '0x8cef03c2b7574a38d9a9e8dd69980240d41d70485643f407de33055936c48f97';
+      const calculated = tenderly.calculateAddressBalanceSlot(
+        balanceOfSlot,
+        account,
+      );
+      // assert
+      expect(calculated).toEqual(expected);
+    });
+  });
+
+  describe('calculateAddressAllowanceSlots', () => {
+    it('should calculate account balance storage slot', () => {
+      const allowanceSlot = ethers.utils.defaultAbiCoder.encode(['uint'], [10]); // usdc's `allowance` mapping slot
+      // https://dashboard.tenderly.co/paraswap/paraswap/simulator/e2a6cad1-4a82-4ba7-8c3e-ef097315542c/debugger?trace=0.2.0
+      const expected =
+        '0x371a34ab690ce2826b137a25bfdaf43d0b93c819878de2df8877f1fb50ffb206';
+      const calculated = tenderly.calculateAddressAllowanceSlot(
+        allowanceSlot,
+        account,
+        spender,
+      );
+      // assert
+      expect(calculated).toEqual(expected);
+    });
+  });
+
+  describe('buildBalanceOfSimulationRequest', () => {
+    it('should build `balanceOf` simulation request', () => {
+      const request = tenderly.buildBalanceOfSimulationRequest(
+        1,
+        USDC,
+        account,
+      );
+
+      const expectedCallData = ethers.utils.hexConcat([
+        '0x70a08231', // selector
+        ethers.utils.defaultAbiCoder.encode(['address'], [account]),
+      ]);
+
+      expect(request.data).toEqual(expectedCallData);
+    });
+  });
+
+  describe('buildAllowanceSimulationRequest', () => {
+    it('should build `allowance` simulation request', () => {
+      const request = tenderly.buildAllowanceSimulationRequest(
+        1,
+        USDC,
+        account,
+        spender,
+      );
+
+      const expectedCallData = ethers.utils.hexConcat([
+        '0xdd62ed3e', // selector
+        ethers.utils.defaultAbiCoder.encode(
+          ['address', 'address'],
+          [account, spender],
+        ),
+      ]);
+      // assert
+      expect(request.data).toEqual(expectedCallData);
+    });
+  });
+
+  describe('findTokenBalanceOfSlot', () => {
+    it('should find Mainnet USDC `balanceOf` storage slot', async () => {
+      const expectedSlot = ethers.utils.defaultAbiCoder.encode(['uint'], [9]);
+      const foundSlot = await tenderly.findTokenBalanceOfSlot(1, USDC);
+      // assert
+      expect(foundSlot.slot).toEqual(expectedSlot);
+    });
+
+    it('should find Mainnet USDT `balanceOf` storage slot', async () => {
+      const expectedSlot = ethers.utils.defaultAbiCoder.encode(['uint'], [2]);
+      const foundSlot = await tenderly.findTokenBalanceOfSlot(1, USDT);
+      // assert
+      expect(foundSlot.slot).toEqual(expectedSlot);
+    });
+
+    it('should find Mainnet stETH `balanceOf` storage slot', async () => {
+      const expectedSlot = ethers.utils.defaultAbiCoder.encode(['uint'], [0]);
+      const foundSlot = await tenderly.findTokenBalanceOfSlot(
+        1,
+        '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84', // Lido's `stETH`
+      );
+      // assert
+      expect(foundSlot.slot).toEqual(expectedSlot);
+    });
+
+    it('should find Mainnet aEthDai `balanceOf` storage slot', async () => {
+      const expectedSlot = ethers.utils.defaultAbiCoder.encode(['uint'], [52]);
+      const foundSlot = await tenderly.findTokenBalanceOfSlot(
+        1,
+        '0x018008bfb33d285247A21d44E50697654f754e63', // Aave's `aEthDai`
+      );
+      // assert
+      expect(foundSlot.slot).toEqual(expectedSlot);
+    });
+  });
+
+  describe('findTokenAllowanceSlot', () => {
+    it('should find Mainnet USDC `allowance` storage slot', async () => {
+      const expectedSlot = ethers.utils.defaultAbiCoder.encode(['uint'], [10]);
+      const foundSlot = await tenderly.findTokenAllowanceSlot(1, USDC);
+      // assert
+      expect(foundSlot.slot).toEqual(expectedSlot);
+    });
+
+    it('should find Mainnet USDT `allowance` storage slot', async () => {
+      const expectedSlot = ethers.utils.defaultAbiCoder.encode(['uint'], [5]);
+      const foundSlot = await tenderly.findTokenAllowanceSlot(1, USDT);
+      // assert
+      expect(foundSlot.slot).toEqual(expectedSlot);
+    });
+
+    it('should find Mainnet stETH `allowance` storage slot', async () => {
+      const expectedSlot = ethers.utils.defaultAbiCoder.encode(['uint'], [1]);
+      const foundSlot = await tenderly.findTokenAllowanceSlot(
+        1,
+        '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84', // Lido's `stETH`
+      );
+      // assert
+      expect(foundSlot.slot).toEqual(expectedSlot);
+    });
+
+    it('should find Mainnet aEthDai `allowance` storage slot', async () => {
+      const expectedSlot = ethers.utils.defaultAbiCoder.encode(['uint'], [53]);
+      const foundSlot = await tenderly.findTokenAllowanceSlot(
+        1,
+        '0x018008bfb33d285247A21d44E50697654f754e63', // Aave's `aEthDai`
+      );
+      // assert
+      expect(foundSlot.slot).toEqual(expectedSlot);
+    });
+  });
+});