@paraswap/dex-lib 4.0.14 → 4.0.16-fluid-restr

package/src/lib/pub-sub.ts

@@ -35,19 +35,13 @@ export class ExpStringPubSub {
     this.logger.info(`Subscribing to ${this.channel}`);
 
     this.dexHelper.cache.subscribe(this.channel, (_, msg) => {
-      const before = Date.now();
       const decodedMsg = JSON.parse(msg) as KeyValuePubSubMsg;
       this.handleSubscription(decodedMsg);
-      const after = Date.now();
-      this.logger.info(`Decoding and handling took: ${after - before}ms`);
     });
   }
 
   publish(data: Record<string, unknown>, ttl: number) {
     const expiresAt = Math.round(Date.now() / 1000) + ttl;
-    this.logger.info(
-      `Publishing keys: '${Object.keys(data)}', expiresAt: '${expiresAt}'`,
-    );
 
     this.dexHelper.cache.publish(
       this.channel,
@@ -123,20 +117,14 @@ export class ExpHashPubSub {
     this.logger.info(`Subscribing`);
 
     this.dexHelper.cache.subscribe(this.hashKey, (_, msg) => {
-      const before = Date.now();
       const decodedMsg = Utils.Parse(msg) as KeyValuePubSubMsg;
       this.handleSubscription(decodedMsg);
-      const after = Date.now();
-      this.logger.info(`Decoding and handling took: ${after - before}ms`);
     });
   }
 
   publish(data: Record<string, unknown>) {
     if (Object.keys(data).length > 0) {
       const expiresAt = Math.round(Date.now() / 1000) + this.ttl;
-      this.logger.info(
-        `Publishing keys: '${Object.keys(data)}', expiresAt: '${expiresAt}'`,
-      );
 
       this.dexHelper.cache.publish(
         this.hashKey,
@@ -147,11 +135,6 @@ export class ExpHashPubSub {
 
   handleSubscription(msg: KeyValuePubSubMsg) {
     const { expiresAt, data } = msg;
-    this.logger.info(
-      `Received subscription, keys: '${Object.keys(
-        data,
-      )}', expiresAt: '${expiresAt}'`,
-    );
 
     const now = Math.round(Date.now() / 1000);
     // calculating ttl as message might come with the delay
@@ -176,12 +159,9 @@ export class ExpHashPubSub {
     const localValue = this.localCache.get<T>(key);
 
     if (localValue !== undefined) {
-      this.logger.info(`Returning from local cache: '${key}'`);
       return localValue;
     }
 
-    this.logger.info(`Returning from external cache: '${key}'`);
-
     const value = await this.dexHelper.cache.hget(this.hashKey, key);
 
     if (value && this.ttl > 0) {

package/tests/constants-e2e.ts

@@ -446,6 +446,10 @@ export const Tokens: {
       decimals: 18,
       symbol: 'EURA',
     },
+    FLUID: {
+      address: '0x6f40d4A6237C257fff2dB00FA0510DeEECd303eb',
+      decimals: 18,
+    },
     EUROC: {
       address: '0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c',
       decimals: 6,
@@ -1703,6 +1707,7 @@ export const Holders: {
   [network: number]: { [tokenAddress: string]: Address };
 } = {
   [Network.MAINNET]: {
+    FLUID: '0x2d675D4C52a8aE117b935fF98c6F9f29A15827F0',
     USDS: '0xB1796E8f1eEcF23027c1E3C00fE303629A189d10',
     sUSDS: '0xd564B3aE673CAa49D054Bf185bD72a6853763eE7',
     SKY: '0x0ddda327A6614130CCb20bc0097313A282176A01',

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
-      }
-    }
-  ]
-}

package/build/abi/aavev3statav2/Factory.json

@@ -1,131 +0,0 @@
-[
-    {
-        "inputs": [
-            { "internalType": "contract IPool", "name": "pool", "type": "address" },
-            { "internalType": "address", "name": "proxyAdmin", "type": "address" },
-            {
-                "internalType": "contract ITransparentProxyFactory",
-                "name": "transparentProxyFactory",
-                "type": "address"
-            },
-            { "internalType": "address", "name": "stataTokenImpl", "type": "address" }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "constructor"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "underlying", "type": "address" }
-        ],
-        "name": "NotListedUnderlying",
-        "type": "error"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": false,
-                "internalType": "uint8",
-                "name": "version",
-                "type": "uint8"
-            }
-        ],
-        "name": "Initialized",
-        "type": "event"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "stataToken",
-                "type": "address"
-            },
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "underlying",
-                "type": "address"
-            }
-        ],
-        "name": "StataTokenCreated",
-        "type": "event"
-    },
-    {
-        "inputs": [],
-        "name": "POOL",
-        "outputs": [
-            { "internalType": "contract IPool", "name": "", "type": "address" }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "PROXY_ADMIN",
-        "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "STATA_TOKEN_IMPL",
-        "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "TRANSPARENT_PROXY_FACTORY",
-        "outputs": [
-            {
-                "internalType": "contract ITransparentProxyFactory",
-                "name": "",
-                "type": "address"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address[]",
-                "name": "underlyings",
-                "type": "address[]"
-            }
-        ],
-        "name": "createStataTokens",
-        "outputs": [
-            { "internalType": "address[]", "name": "", "type": "address[]" }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "underlying", "type": "address" }
-        ],
-        "name": "getStataToken",
-        "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "getStataTokens",
-        "outputs": [
-            { "internalType": "address[]", "name": "", "type": "address[]" }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "initialize",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    }
-]