@paraswap/dex-lib 3.8.2 → 3.8.3

package/src/dex/idle-dao/idle-dao.ts

@@ -350,6 +350,7 @@ export class IdleDao extends SimpleExchange implements IDex<IdleDaoData> {
       exchangeData,
       targetExchange: swapCallee,
       returnAmountPos: side === SwapSide.SELL ? returnAmountPos : undefined,
+      skipApproval: data.fromIdleToken,
     };
   }
 

package/src/dex/simple-exchange.ts

@@ -110,12 +110,12 @@ export class SimpleExchange {
     spender?: Address,
     networkFee: NumberAsString = '0',
     preCalls?: Omit<SimpleExchangeParam, 'networkFee'>,
+    skipApproval?: boolean,
   ): Promise<SimpleExchangeParam> {
-    const approveParam = await this.getApproveSimpleParam(
-      src,
-      spender || swapCallee,
-      srcAmount,
-    );
+    const approveParam = skipApproval
+      ? { callees: [], calldata: [], values: [], networkFee: '0' }
+      : await this.getApproveSimpleParam(src, spender || swapCallee, srcAmount);
+
     const swapValue = (
       BigInt(networkFee) + (isETHAddress(src) ? BigInt(srcAmount) : 0n)
     ).toString();

package/src/dex/spark/spark-e2e.test.ts

@@ -29,9 +29,17 @@ function testForNetwork(
         ContractMethod.simpleSwap,
         ContractMethod.multiSwap,
         ContractMethod.megaSwap,
+        ContractMethod.swapExactAmountIn,
+      ],
+    ],
+    [
+      SwapSide.BUY,
+      [
+        ContractMethod.simpleBuy,
+        ContractMethod.buy,
+        ContractMethod.swapExactAmountOut,
       ],
     ],
-    [SwapSide.BUY, [ContractMethod.simpleBuy, ContractMethod.buy]],
   ]);
 
   describe(`${network}`, () => {

package/src/dex/spark/spark.ts

@@ -207,6 +207,10 @@ export class Spark
       destAmount,
       swapData,
       exchange,
+      undefined,
+      undefined,
+      undefined,
+      isSell && this.isDai(destToken),
     );
   }
 
@@ -251,6 +255,7 @@ export class Spark
             this.isDai(srcToken) ? 'shares' : 'assets',
           )
         : undefined,
+      skipApproval: isSell && this.isDai(destToken),
     };
   }
 

package/src/executor/Executor01BytecodeBuilder.ts

@@ -268,6 +268,7 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
       (!isETHAddress(swap.srcToken) ||
         (isETHAddress(swap.srcToken) && index !== 0)) &&
       !curExchangeParam.transferSrcTokenBeforeSwap &&
+      !curExchangeParam.skipApproval &&
       curExchangeParam.approveData
     ) {
       const approveCallData = this.buildApproveCallData(
@@ -290,7 +291,8 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
           let approveWethCalldata = '0x';
           if (
             curExchangeParam.approveData &&
-            !curExchangeParam.transferSrcTokenBeforeSwap
+            !curExchangeParam.transferSrcTokenBeforeSwap &&
+            !curExchangeParam.skipApproval
           ) {
             approveWethCalldata = this.buildApproveCallData(
               curExchangeParam.approveData.target,

package/src/executor/Executor02BytecodeBuilder.ts

@@ -606,6 +606,7 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
     if (
       !isETHAddress(swap.srcToken) &&
       !curExchangeParam.transferSrcTokenBeforeSwap &&
+      !curExchangeParam.skipApproval &&
       curExchangeParam.approveData
     ) {
       const approveCallData = this.buildApproveCallData(
@@ -622,7 +623,8 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
         let approveWethCalldata = '0x';
         if (
           curExchangeParam.approveData &&
-          !curExchangeParam.transferSrcTokenBeforeSwap
+          !curExchangeParam.transferSrcTokenBeforeSwap &&
+          !curExchangeParam.skipApproval
         ) {
           approveWethCalldata = this.buildApproveCallData(
             curExchangeParam.approveData.target,

package/src/executor/Executor03BytecodeBuilder.ts

@@ -147,6 +147,7 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
     if (
       flags.dexes[index] % 4 !== 1 && // not sendEth
       !isETHAddress(swap.srcToken) &&
+      !curExchangeParam.skipApproval &&
       curExchangeParam.approveData
     ) {
       // TODO: as we give approve for MAX_UINT and approve for current targetExchange was given
@@ -163,6 +164,7 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
     if (
       maybeWethCallData?.deposit &&
       isETHAddress(swap.srcToken) &&
+      !curExchangeParam.skipApproval &&
       curExchangeParam.needWrapNative
       // do deposit only for the first path with wrapping
       // exchangeParams.findIndex(p => p.needWrapNative) === index

package/src/executor/ExecutorBytecodeBuilder.ts

@@ -358,6 +358,8 @@ export abstract class ExecutorBytecodeBuilder<S = {}, D = {}> {
     swap: OptimalSwap,
     exchangeParam: DexExchangeParam,
   ): { target: string; token: Address } | null {
+    if (exchangeParam.skipApproval) return null;
+
     const target = exchangeParam.spender || exchangeParam.targetExchange;
 
     if (

package/src/executor/executor01-bytecode-builder-e2e.test.ts

@@ -102,6 +102,31 @@ describe('Executor01ByteCodeBuilder e2e tests', () => {
     const network = Network.MAINNET;
 
     describe('SimpleSwap', () => {
+      describe('AngleStakedStableUSD', () => {
+        const dexKey = 'AngleStakedStableUSD';
+
+        const tokens = Tokens[network];
+        const holders = Holders[network];
+        const provider = new StaticJsonRpcProvider(
+          generateConfig(network).privateHttpProvider,
+          network,
+        );
+
+        it('SimpleSwap stUSD -> USDA', async () => {
+          await testE2E(
+            tokens['stUSD'],
+            tokens['USDA'],
+            holders['stUSD'],
+            '1000000000000',
+            SwapSide.SELL,
+            dexKey,
+            ContractMethod.simpleSwap,
+            network,
+            provider,
+          );
+        });
+      });
+
       describe('UniswapV3', () => {
         const dexKey = 'UniswapV3';
 

package/src/executor/executor02-bytecode-builder-e2e.test.ts

@@ -23,6 +23,35 @@ describe('Executor02ByteCodeBuilder e2e tests', () => {
     describe('SimpleSwap', () => {
       const contractMethod = ContractMethod.simpleSwap;
 
+      describe('stUSD -> USDA via Angle Staked Stable USD', () => {
+        const dexKeys = ['AngleStakedStableUSD'];
+
+        const tokenASymbol: string = 'stUSD';
+        const tokenBSymbol: string = 'USDA';
+        const tokenAAmount: string = '60000000000000000000';
+
+        const side = SwapSide.SELL;
+
+        it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
+          await testE2E(
+            tokens[tokenASymbol],
+            tokens[tokenBSymbol],
+            holders[tokenASymbol],
+            tokenAAmount,
+            side,
+            dexKeys,
+            contractMethod,
+            network,
+            provider,
+            undefined,
+            undefined,
+            undefined,
+            200,
+            2000,
+          );
+        });
+      });
+
       describe('ETH -> SUSHI via SushiSwapV3 and UniswapV3', () => {
         const dexKeys = ['SushiSwapV3', 'UniswapV3'];
 

package/src/types.ts

@@ -159,6 +159,7 @@ export type AdapterExchangeParam = {
 
 export type DexExchangeParam = {
   needWrapNative: boolean;
+  skipApproval?: boolean;
   wethAddress?: string;
   exchangeData: string;
   targetExchange: string;

package/tests/constants-e2e.ts

@@ -91,6 +91,14 @@ export const Tokens: {
       address: '0x8f8221aFbB33998d8584A2B05749bA73c37a938a',
       decimals: 18,
     },
+    eETH: {
+      address: '0x35fA164735182de50811E8e2E824cFb9B6118ac2',
+      decimals: 18,
+    },
+    weETH: {
+      address: '0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee',
+      decimals: 18,
+    },
     AMPL: {
       address: '0xd46ba6d942050d489dbd938a2c909a5d5039a161',
       decimals: 9,
@@ -483,14 +491,6 @@ export const Tokens: {
       address: '0x83f20f44975d03b1b09e64809b757c47f942beea',
       decimals: 18,
     },
-    eETH: {
-      address: '0x35fa164735182de50811e8e2e824cfb9b6118ac2',
-      decimals: 18,
-    },
-    weETH: {
-      address: '0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee',
-      decimals: 18,
-    },
     stataUSDT: {
       address: '0x862c57d48becb45583aeba3f489696d22466ca1b',
       decimals: 6,
@@ -1543,7 +1543,7 @@ export const Holders: {
     USDD: '0xf89d7b9c864f589bbf53a82105107622b35eaa40',
     alETH: '0x500a4f1280a0b63f47862d658b6c335cc939aaed',
     SHIBA: '0x73af3bcf944a6559933396c1577b257e2054d935',
-    aEthWETH: '0xfEA3F5b06D41Cb1526b9cAf8be63c5b37C475f23',
+    aEthWETH: '0x931433324E6B0b5B04E3460ef3fb3f78dda3c721',
     dUSDC: '0x2FC2F705110A7F46Ce85F701d7217EF1018f01A3',
     PSP: '0xE5E5440a1CE69C5cf67BFFA74d185e57c31b43E5',
     EUROC: '0x64AE5802620398143FC7113037769175F74825Ea',
@@ -1741,8 +1741,8 @@ export const Holders: {
     EURA: '0x6dd7b830896b56812aa667bdd14b71c8b3252f8e',
     stEUR: '0xE588611e7A2392507879E3be80531654b85C16aA',
     USDA: '0xa86ff337db9107b54862d30d1a598f8be847b05e',
-    stUSD: '0xa9ddd91249dfdd450e81e1c56ab60e1a62651701',
-    stataUSDT: '0x403D37c861fb54b8F37a3A1870aBce335954840B',
+    stUSD: '0xBa511aAd739358b2F34285f9E2d5344017b7DcaD',
+    stataUSDT: '0xc5042f9d9a18e95547864438455c8f05b4987399',
     aaveUSDT: '0xAfa788fab589fe61C23DF76905558f4734444D67',
     crvUSD: '0x9755e99bdb99495d3d31d953785d993c6df8552e',
   },
@@ -1764,9 +1764,9 @@ export const Holders: {
     rETH: '0x4c2e69e58b14de9afedfb94319519ce34e087283',
     WBTC: '0xb9c8f0d3254007ee4b98970b94544e473cd610ec',
     frxETH: '0x4d4edf8291d169f975b99914b6ab3326abb45938',
-    EURA: '0xC18dAC166eDa9538933258d21A272C1775C19c73',
+    EURA: '0x9A760aa1Fe631fD9aC0Aee0965736121c7c132cc',
     stEUR: '0xA9DdD91249DFdd450E81E1c56Ab60E1A62651701',
-    USDA: '0xC18dAC166eDa9538933258d21A272C1775C19c73',
+    USDA: '0x7dFf12833a6f0e88f610E79E11E9506848cCF187',
     stUSD: '0xC98b0729695A25152B8D5b6B95709070605A7F60',
     crvUSD: '0x528e7aF33043Da06ca3DD407626a71DbBD3173D6',
     LUSD: '0xf0a9abb11958a071e168f2ee5bcbacf1abbde9cf',

package/tests/utils-e2e.ts

@@ -475,7 +475,7 @@ export async function testE2E(
     ? new APIParaswapSDK(network, dexKeys, '')
     : new LocalParaswapSDK(network, dexKeys, '', limitOrderProvider);
 
-  if (paraswap.initializePricing) await paraswap.initializePricing();
+  await paraswap.initializePricing?.();
 
   if (sleepMs) {
     await sleep(sleepMs);

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/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/prettier.xml

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