@paraswap/dex-lib 2.15.2-curve-v1-issue → 2.15.3

package/src/lib/fetcher/fetcher.ts

@@ -8,13 +8,13 @@ const FETCH_FAIL_MAX_ATTEMPT = 5;
 const FETCH_FAIL_RETRY_TIMEOUT_MS = 60 * 1000;
 
 export class SkippingRequest {
-  constructor(
-    public message = '',
-  ) {}
-};
+  constructor(public message = '') {}
+}
 
 export type RequestInfo<T> = {
-  requestFunc?: (options: RequestConfig) => Promise<Response<T> | SkippingRequest>;
+  requestFunc?: (
+    options: RequestConfig,
+  ) => Promise<Response<T> | SkippingRequest>;
   requestOptions: RequestConfig;
   caster: (data: unknown) => T;
   authenticate?: (options: RequestConfig) => RequestConfig;
@@ -60,35 +60,35 @@ export class Fetcher<T> {
       return;
     }
 
-    const promises = this.requests.map<Promise<Error | Response<T> | SkippingRequest>>(
-      async (reqInfo: RequestInfoWithHandler<T>) => {
-        const info = reqInfo.info;
-        let options = info.requestOptions;
+    const promises = this.requests.map<
+      Promise<Error | Response<T> | SkippingRequest>
+    >(async (reqInfo: RequestInfoWithHandler<T>) => {
+      const info = reqInfo.info;
+      let options = info.requestOptions;
 
-        if (info.authenticate) {
-          info.authenticate(options);
-        }
+      if (info.authenticate) {
+        info.authenticate(options);
+      }
 
-        try {
-          let result;
-          if (isFunction(info.requestFunc)) {
-            result = await info.requestFunc({
-              timeout: FETCH_TIMEOUT_MS,
-              ...options,
-            });
-          } else {
-            result = await this.requestWrapper.request({
-              timeout: FETCH_TIMEOUT_MS,
-              ...options,
-            });
-          }
-
-          return result;
-        } catch (e) {
-          return e as Error;
+      try {
+        let result;
+        if (isFunction(info.requestFunc)) {
+          result = await info.requestFunc({
+            timeout: FETCH_TIMEOUT_MS,
+            ...options,
+          });
+        } else {
+          result = await this.requestWrapper.request({
+            timeout: FETCH_TIMEOUT_MS,
+            ...options,
+          });
         }
-      },
-    );
+
+        return result;
+      } catch (e) {
+        return e as Error;
+      }
+    });
     const results = await Promise.all(promises);
     const failures = results
       .map((_, i) => i)
@@ -99,7 +99,7 @@ export class Fetcher<T> {
       .filter(i => results[i] instanceof SkippingRequest);
 
     results.map(result => {
-      if(!(result instanceof Error || result instanceof SkippingRequest)) {
+      if (!(result instanceof Error || result instanceof SkippingRequest)) {
         this.logger.info(
           'Results Data:',
           JSON.stringify((result as any).data)
@@ -131,7 +131,12 @@ export class Fetcher<T> {
 
     results
       .map((_, i) => i)
-      .filter(i => !(results[i] instanceof Error || results[i] instanceof SkippingRequest))
+      .filter(
+        i =>
+          !(
+            results[i] instanceof Error || results[i] instanceof SkippingRequest
+          ),
+      )
       .forEach(i => {
         const response = results[i] as Response<T>;
         const reqInfo = this.requests[i];
@@ -143,10 +148,10 @@ export class Fetcher<T> {
           const parsedData = info.caster(response.data);
           reqInfo.handler(parsedData);
         } catch (e) {
-          this.logger.debug(
+          this.logger.info(
             `(${options.url}) received incorrect data ${JSON.stringify(
               response.data,
-            )}`,
+            ).replace(/(?:\r\n|\r|\n)/g, ' ')}`,
             e,
           );
           return;

package/tests/constants-e2e.ts

@@ -695,6 +695,8 @@ export const Tokens: {
     WETH: {
       address: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1',
       decimals: 18,
+      addBalance: _balancesFn,
+      addAllowance: _allowancesFn,
     },
     ETH: { address: ETHER_ADDRESS, decimals: 18 },
     USDC: {
@@ -704,6 +706,8 @@ export const Tokens: {
     USDT: {
       address: '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9',
       decimals: 6,
+      addBalance: _balancesFn,
+      addAllowance: _allowancesFn,
     },
     FRAX: {
       address: '0x17FC002b466eEc40DaE837Fc4bE5c67993ddBd6F',

package/tests/utils-e2e.ts

@@ -30,6 +30,7 @@ import axios from 'axios';
 import { SmartToken, StateOverrides } from './smart-tokens';
 import { GIFTER_ADDRESS } from './constants-e2e';
 import { sleep } from './utils';
+import { assert } from 'ts-essentials';
 
 export const testingEndpoint = process.env.E2E_TEST_ENDPOINT;
 
@@ -282,8 +283,8 @@ export async function testE2E(
 
 export type TestParamE2E = {
   config: Config;
-  srcToken: SmartToken;
-  destToken: SmartToken;
+  srcToken: Token | SmartToken;
+  destToken: Token | SmartToken;
   senderAddress: Address;
   thirdPartyAddress?: Address;
   _amount: string;
@@ -345,7 +346,11 @@ export async function newTestE2E({
   }
 
   if (useTenderly && adapterBytecode) {
-    const deployTx = await (ts as TenderlySimulation).simulate(
+    assert(
+      ts instanceof TenderlySimulation,
+      '`ts`  is not an instance of TenderlySimulation',
+    );
+    const deployTx = await ts.simulate(
       deployAdapterParams(adapterBytecode, network),
     );
 
@@ -360,13 +365,22 @@ export async function newTestE2E({
       'gas',
     );
 
-    const whitelistTx = await (ts as TenderlySimulation).simulate(
+    const whitelistTx = await ts.simulate(
       whiteListAdapterParams(adapterAddress, network),
     );
     expect(whitelistTx.success).toEqual(true);
   }
 
   if (useTenderly && thirdPartyAddress) {
+    assert(
+      destToken instanceof SmartToken,
+      '`destToken` is not an instance of SmartToken',
+    );
+    assert(
+      ts instanceof TenderlySimulation,
+      '`ts` is not an instance of TenderlySimulation',
+    );
+
     const stateOverrides: StateOverrides = {
       networkID: `${network}`,
       stateOverrides: {},
@@ -383,7 +397,7 @@ export async function newTestE2E({
         : (BigInt(MAX_UINT) / 4n).toString(),
     );
 
-    await (ts as TenderlySimulation).simulate(giftTx, stateOverrides);
+    await ts.simulate(giftTx, stateOverrides);
   }
 
   const useAPI = testingEndpoint && !poolIdentifiers;
@@ -402,8 +416,8 @@ export async function newTestE2E({
   }
   try {
     const priceRoute = await paraswap.getPrices(
-      srcToken.token,
-      destToken.token,
+      skipTenderly ? (srcToken as Token) : (srcToken as SmartToken).token,
+      skipTenderly ? (destToken as Token) : (destToken as SmartToken).token,
       amount,
       swapSide,
       contractMethod,
@@ -428,6 +442,19 @@ export async function newTestE2E({
     );
 
     if (useTenderly) {
+      assert(
+        srcToken instanceof SmartToken,
+        '`srcToken` is not an instance of SmartToken',
+      );
+      assert(
+        destToken instanceof SmartToken,
+        '`destToken` is not an instance of SmartToken',
+      );
+      assert(
+        ts instanceof TenderlySimulation,
+        '`ts` is not an instance of TenderlySimulation',
+      );
+
       const stateOverrides: StateOverrides = {
         networkID: `${network}`,
         stateOverrides: {},
@@ -456,10 +483,7 @@ export async function newTestE2E({
       srcToken.applyOverrides(stateOverrides);
       destToken.applyOverrides(stateOverrides);
 
-      const swapTx = await (ts as TenderlySimulation).simulate(
-        swapParams,
-        stateOverrides,
-      );
+      const swapTx = await ts.simulate(swapParams, stateOverrides);
       console.log(`${srcToken.address}_${destToken.address}_${dexKey!}`);
       // Only log gas estimate if testing against API
       if (useAPI)

package/.idea/aws.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="accountSettings">
-    <option name="activeProfile" value="profile:default" />
-    <option name="activeRegion" value="us-east-1" />
-    <option name="recentlyUsedProfiles">
-      <list>
-        <option value="profile:default" />
-      </list>
-    </option>
-    <option name="recentlyUsedRegions">
-      <list>
-        <option value="us-east-1" />
-      </list>
-    </option>
-  </component>
-</project>

package/.idea/codeStyles/Project.xml

@@ -1,19 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <ScalaCodeStyleSettings>
-      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
-    </ScalaCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACKETS" value="true" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </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/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

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,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/runConfigurations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </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>