@paraswap/dex-lib 3.8.9-insert-from-amount-ex03.0 → 3.8.9-node-v20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "3.8.9-insert-from-amount-ex03.0",
+  "version": "3.8.9-node-v20.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

package/src/dex/dexs.txt

@@ -0,0 +1,58 @@
+aave-v2
+aave-v3
+aave-v3-stata
+algebra
+angle-staked-stable
+angle-transmuter
+augustus-approvals.ts
+augustus-rfq.ts
+balancer-v1
+balancer-v2
+bancor
+camelot
+compound
+curve-v1
+curve-v1-factory
+curve-v1-stable-ng
+curve-v2
+dexalot
+dexs.txt
+dodo-v1
+dodo-v2.ts
+etherfi.ts
+generic-rfq
+gmx
+hashflow
+idex.ts
+idle-dao
+index.ts
+jarvis-v6
+kyberdmm
+lido
+limit-order-exchange.ts
+maker-psm
+maverick-v1
+maverick-v2
+nerve
+pancakeswap-v3
+paraswap-limit-orders
+polygon-migrator
+quick-perps
+quickswap
+simple-exchange.ts
+smoothy
+solidly
+solidly-v3
+spark
+stable-pool
+swaap-v2
+swell
+synthetix
+trader-joe-v2.1
+uniswap-v2
+uniswap-v3
+uniswap-v3.ts
+weth
+wombat
+woo-fi-v2
+wsteth

package/src/executor/Executor03BytecodeBuilder.ts

@@ -67,28 +67,13 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
     const exchangeParam = exchangeParams[exchangeParamIndex];
     const swap = priceRoute.bestRoute[0].swaps[0];
 
-    const {
-      dexFuncHasRecipient,
-      needWrapNative,
-      swappedAmountNotPresentInExchangeData,
-      specialDexFlag,
-      specialDexSupportsInsertFromAmount,
-    } = exchangeParam;
-    const isSpecialDex =
-      specialDexFlag !== undefined && specialDexFlag !== SpecialDex.DEFAULT;
-
-    const forcePreventInsertFromAmount =
-      swappedAmountNotPresentInExchangeData ||
-      (isSpecialDex && !specialDexSupportsInsertFromAmount);
+    const { dexFuncHasRecipient, needWrapNative } = exchangeParam;
 
     const needWrap = needWrapNative && isEthSrc && maybeWethCallData?.deposit;
     const needUnwrap =
       needWrapNative && isEthDest && maybeWethCallData?.withdraw;
 
-    let dexFlag = forcePreventInsertFromAmount
-      ? Flag.DONT_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP
-      : Flag.INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP; // 0 or 3
-
+    let dexFlag = Flag.DONT_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP; // 0
     let approveFlag =
       Flag.DONT_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP; // 0
 
@@ -96,21 +81,15 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
       dexFlag =
         Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP; // 5
     } else if (isEthDest && !needUnwrap) {
-      dexFlag = forcePreventInsertFromAmount
-        ? Flag.DONT_INSERT_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP // 4
-        : Flag.INSERT_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP; // 7
+      dexFlag = Flag.DONT_INSERT_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP; // 4
     } else if (isEthDest && needUnwrap) {
-      dexFlag = forcePreventInsertFromAmount
-        ? Flag.DONT_INSERT_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP // 8
-        : Flag.INSERT_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP; // 11
+      dexFlag = Flag.DONT_INSERT_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP; // 8
       // dexFlag = Flag.ZERO;
     } else if (
       !isETHAddress(swap.destToken) &&
       exchangeParams.some(param => !param.dexFuncHasRecipient)
     ) {
-      dexFlag = forcePreventInsertFromAmount
-        ? Flag.DONT_INSERT_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP // 8
-        : Flag.INSERT_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP; // 11
+      dexFlag = Flag.DONT_INSERT_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP; // 8
     }
 
     return {

package/src/generic-swap-transaction-builder.ts

@@ -7,7 +7,7 @@ import {
   OptimalSwapExchange,
   TxObject,
 } from './types';
-import { BigNumber, ethers } from 'ethers';
+import { BigNumber } from 'ethers';
 import {
   ETHER_ADDRESS,
   FEE_PERCENT_IN_BASIS_POINTS_MASK,
@@ -18,8 +18,10 @@ import {
   IS_TAKE_SURPLUS_MASK,
   IS_USER_SURPLUS_MASK,
   NULL_ADDRESS,
+  SwapSide,
 } from './constants';
 import { AbiCoder, Interface } from '@ethersproject/abi';
+import { ethers } from 'ethers';
 import AugustusV6ABI from './abi/augustus-v6/ABI.json';
 import { isETHAddress, uuidToBytes16 } from './utils';
 import {
@@ -32,7 +34,7 @@ import ERC20ABI from './abi/erc20.json';
 import { ExecutorDetector } from './executor/ExecutorDetector';
 import { ExecutorBytecodeBuilder } from './executor/ExecutorBytecodeBuilder';
 import { IDexTxBuilder } from './dex/idex';
-import { ParaSwapVersion, SwapSide } from '@paraswap/core';
+import { ParaSwapVersion } from '@paraswap/core';
 
 const {
   utils: { hexlify, hexConcat, hexZeroPad },
@@ -137,7 +139,7 @@ export class GenericSwapTransactionBuilder {
             const dexParams = await dex.getDexParam!(
               srcToken,
               destToken,
-              side === SwapSide.BUY ? se.srcAmount : srcAmount, // in other case we would not be able to make insert from amount on Ex3
+              srcAmount,
               destAmount,
               recipient,
               se.data,

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>