@paraswap/dex-lib 4.1.13 → 4.1.14-balv3.2

package/src/dex/balancer-v3/balancer-v3-e2e.test.ts

@@ -72,7 +72,7 @@ function testForNetwork(
   // TODO: Add any direct swap contractMethod name if it exists
   const sideToContractMethods = new Map([
     [SwapSide.SELL, [ContractMethod.swapExactAmountIn]],
-    [SwapSide.BUY, [ContractMethod.swapExactAmountOut]],
+    // [SwapSide.BUY, [ContractMethod.swapExactAmountOut]],
   ]);
 
   describe(`${network}`, () => {
@@ -80,34 +80,34 @@ function testForNetwork(
       describe(`${side}`, () => {
         contractMethods.forEach((contractMethod: ContractMethod) => {
           describe(`${contractMethod}`, () => {
-            if (testNative) {
-              it(`${nativeTokenSymbol} -> ${tokenASymbol}`, async () => {
-                await testE2E(
-                  tokens[nativeTokenSymbol],
-                  tokens[tokenASymbol],
-                  holders[nativeTokenSymbol],
-                  side === SwapSide.SELL ? nativeTokenAmount : tokenAAmount,
-                  side,
-                  dexKey,
-                  contractMethod,
-                  network,
-                  provider,
-                );
-              });
-              it(`${tokenASymbol} -> ${nativeTokenSymbol}`, async () => {
-                await testE2E(
-                  tokens[tokenASymbol],
-                  tokens[nativeTokenSymbol],
-                  holders[tokenASymbol],
-                  side === SwapSide.SELL ? tokenAAmount : nativeTokenAmount,
-                  side,
-                  dexKey,
-                  contractMethod,
-                  network,
-                  provider,
-                );
-              });
-            }
+            // if (testNative) {
+            //   it(`${nativeTokenSymbol} -> ${tokenASymbol}`, async () => {
+            //     await testE2E(
+            //       tokens[nativeTokenSymbol],
+            //       tokens[tokenASymbol],
+            //       holders[nativeTokenSymbol],
+            //       side === SwapSide.SELL ? nativeTokenAmount : tokenAAmount,
+            //       side,
+            //       dexKey,
+            //       contractMethod,
+            //       network,
+            //       provider,
+            //     );
+            //   });
+            //   it(`${tokenASymbol} -> ${nativeTokenSymbol}`, async () => {
+            //     await testE2E(
+            //       tokens[tokenASymbol],
+            //       tokens[nativeTokenSymbol],
+            //       holders[tokenASymbol],
+            //       side === SwapSide.SELL ? tokenAAmount : nativeTokenAmount,
+            //       side,
+            //       dexKey,
+            //       contractMethod,
+            //       network,
+            //       provider,
+            //     );
+            //   });
+            // }
             it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
               await testE2E(
                 tokens[tokenASymbol],
@@ -119,21 +119,22 @@ function testForNetwork(
                 contractMethod,
                 network,
                 provider,
+                { BalancerV3: ['0x0657c3467f3bf465fab59b10f1453d665abe507e'] },
               );
             });
-            it(`${tokenBSymbol} -> ${tokenASymbol}`, async () => {
-              await testE2E(
-                tokens[tokenBSymbol],
-                tokens[tokenASymbol],
-                holders[tokenBSymbol],
-                side === SwapSide.SELL ? tokenBAmount : tokenAAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-              );
-            });
+            // it(`${tokenBSymbol} -> ${tokenASymbol}`, async () => {
+            //   await testE2E(
+            //     tokens[tokenBSymbol],
+            //     tokens[tokenASymbol],
+            //     holders[tokenBSymbol],
+            //     side === SwapSide.SELL ? tokenBAmount : tokenAAmount,
+            //     side,
+            //     dexKey,
+            //     contractMethod,
+            //     network,
+            //     provider,
+            //   );
+            // });
           });
         });
       }),
@@ -345,6 +346,26 @@ describe('BalancerV3 E2E', () => {
   describe('Base', () => {
     const network = Network.BASE;
 
+    describe('FAILED_CASE', () => {
+      const tokenASymbol: string = 'WETH';
+      const tokenBSymbol: string = 'USDC';
+
+      const tokenAAmount: string = '3000000000000000';
+      const tokenBAmount: string = '100000000000000';
+      const nativeTokenAmount = '0';
+
+      testForNetwork(
+        network,
+        dexKey,
+        tokenASymbol,
+        tokenBSymbol,
+        tokenAAmount,
+        tokenBAmount,
+        nativeTokenAmount,
+        false,
+      );
+    });
+
     describe('Stable Path', () => {
       const tokenASymbol: string = 'wstETH';
       const tokenBSymbol: string = 'WETH';

package/src/dex/balancer-v3/balancer-v3-events.test.ts

@@ -293,4 +293,50 @@ describe('BalancerV3 EventPool', function () {
       },
     );
   });
+  describe('Base', function () {
+    const network = Network.BASE;
+    const dexHelper = new DummyDexHelper(network);
+    const logger = dexHelper.getLogger(dexKey);
+    let balancerV3Pool: BalancerV3EventPool;
+
+    const END_BLOCK = 27675048;
+    const BLOCKS_TO_CHECK = 1000;
+    const START_BLOCK = END_BLOCK - BLOCKS_TO_CHECK;
+
+    const vaultAddress = BalancerV3Config.BalancerV3[network].vaultAddress;
+
+    beforeEach(async () => {
+      balancerV3Pool = new BalancerV3EventPool(
+        dexKey,
+        network,
+        dexHelper,
+        logger,
+      );
+    });
+
+    describe(`Events for Vault: ${vaultAddress} blocks ${START_BLOCK} to ${END_BLOCK}`, () => {
+      for (
+        let blockNumber = START_BLOCK;
+        blockNumber <= END_BLOCK;
+        blockNumber++
+      ) {
+        it(`Check state for block ${blockNumber}`, async function () {
+          await testEventSubscriber(
+            balancerV3Pool,
+            balancerV3Pool.addressesSubscribed,
+            (_blockNumber: number) =>
+              fetchPoolState(
+                balancerV3Pool,
+                _blockNumber,
+                '0x0657c3467f3bf465fab59b10f1453d665abe507e',
+              ),
+            blockNumber,
+            `${dexKey}_${vaultAddress}`,
+            dexHelper.provider,
+            stateCompare,
+          );
+        });
+      }
+    });
+  });
 });

package/src/dex/balancer-v3/balancer-v3-pool.ts

@@ -460,6 +460,15 @@ export class BalancerV3EventPool extends StatefulEventSubscriber<PoolStateMap> {
           hookState = {
             ...poolHookState,
             amp: step.poolState.amp,
+            // TODO: Is it needed
+            // surgeThresholdPercentage:
+            //   typeof poolHookState.surgeThresholdPercentage === 'bigint'
+            //     ? poolHookState.surgeThresholdPercentage
+            //     : BigInt(poolHookState.surgeThresholdPercentage || 0),
+            // maxSurgeFeePercentage:
+            //   typeof poolHookState.maxSurgeFeePercentage === 'bigint'
+            //     ? poolHookState.maxSurgeFeePercentage
+            //     : BigInt(poolHookState.maxSurgeFeePercentage || 0),
           };
         }
       }

package/src/dex/balancer-v3/balancer-v3.ts

@@ -313,10 +313,20 @@ export class BalancerV3 extends SimpleExchange implements IDex<BalancerV3Data> {
           }
           poolPrices.push(poolExchangePrice);
         } catch (err) {
-          this.logger.error(
-            `error fetching prices for pool: ${pool.poolAddress}`,
-          );
-          this.logger.error(err);
+          const errorMessage =
+            err instanceof Error ? `error: ${err.message}` : `error: ${err}`;
+          const stack = err instanceof Error ? err.stack : '';
+          // Ignore some sort of errors
+          // minimum trade amount - https://github.com/balancer/balancer-maths/blob/main/typescript/src/vault/vault.ts#L39
+          // wrapAmountTooSmall - https://github.com/balancer/balancer-maths/blob/main/typescript/src/buffer/erc4626BufferWrapOrUnwrap.ts#L17
+          if (
+            !errorMessage.includes('TradeAmountTooSmall') &&
+            !errorMessage.includes('wrapAmountTooSmall')
+          ) {
+            this.logger.error(
+              `error fetching prices for pool: ${pool.poolAddress}, msg: ${errorMessage}, stack: ${stack}`,
+            );
+          }
         }
       }
 

package/src/dex/hashflow/config.ts

@@ -22,6 +22,9 @@ export const HashflowConfig: DexConfigMap<DexParams> = {
     [Network.OPTIMISM]: {
       routerAddress: '0xCa310B1B942A30Ff4b40a5E1b69AB4607eC79Bc1',
     },
+    [Network.BASE]: {
+      routerAddress: '0xCa310B1B942A30Ff4b40a5E1b69AB4607eC79Bc1',
+    },
   },
 };
 

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

@@ -33,16 +33,7 @@ function testForNetwork(
   const nativeTokenSymbol = NativeTokenSymbols[network];
 
   const sideToContractMethods = new Map([
-    [
-      SwapSide.SELL,
-      [
-        ContractMethod.swapExactAmountIn,
-        // ContractMethod.simpleSwap,
-        // ContractMethod.multiSwap,
-        // ContractMethod.megaSwap,
-      ],
-    ],
-    // [SwapSide.BUY, [ContractMethod.simpleBuy, ContractMethod.buy]],
+    [SwapSide.SELL, [ContractMethod.swapExactAmountIn]],
     [SwapSide.BUY, [ContractMethod.swapExactAmountOut]],
   ]);
 
@@ -298,11 +289,11 @@ describe('Hashflow E2E', () => {
   describe('Optimism', () => {
     const network = Network.OPTIMISM;
 
-    const tokenASymbol: string = 'ETH';
-    const tokenBSymbol: string = 'DAI';
+    const tokenASymbol: string = 'OP';
+    const tokenBSymbol: string = 'USDT';
 
-    const tokenAAmount: string = '10000000000000000000';
-    const tokenBAmount: string = '1000000000000000000';
+    const tokenAAmount: string = '12000000000000000000';
+    const tokenBAmount: string = '11000000';
 
     testForNetwork(
       network,
@@ -318,12 +309,33 @@ describe('Hashflow E2E', () => {
   describe('Avalanche', () => {
     const network = Network.AVALANCHE;
 
-    const tokenASymbol: string = 'AVAX';
+    const tokenASymbol: string = 'USDT';
     const tokenBSymbol: string = 'USDC';
 
-    const tokenAAmount: string = '1000000000000000000';
-    const tokenBAmount: string = '10000000';
-    const nativeTokenAmount = '1000000000000000000';
+    const tokenAAmount: string = '1100000';
+    const tokenBAmount: string = '1100000';
+    const nativeTokenAmount = '0';
+
+    testForNetwork(
+      network,
+      dexKey,
+      tokenASymbol,
+      tokenBSymbol,
+      tokenAAmount,
+      tokenBAmount,
+      nativeTokenAmount,
+      true,
+    );
+  });
+  describe('Base', () => {
+    const network = Network.BASE;
+
+    const tokenASymbol: string = 'WETH';
+    const tokenBSymbol: string = 'USDC';
+
+    const tokenAAmount: string = '1000000000000000';
+    const tokenBAmount: string = '4000000';
+    const nativeTokenAmount = '0';
 
     testForNetwork(
       network,

package/src/dex/hashflow/hashflow.ts

@@ -287,8 +287,6 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
     destToken: Token,
     side: SwapSide,
   ): bigint[] {
-    assert(levels.length > 0, 'Levels should not be empty');
-
     const outputs = new Array<BigNumber>(amounts.length).fill(BN_0);
     // FIXME: There is still case when last amount is fillable, but in between
     // we may have splits that are less than min. amount. I assume that case is very
@@ -356,11 +354,14 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
 
     for (let i = 1; i < levels.length; i++) {
       const nextLevel = levels[i]!;
-      const nextLevelDepth = nextLevel.level.minus(levels[i - 1]!.level);
+      const nextLevelDepth = nextLevel.level;
       const nextLevelQuote = quote.quoteAmount.plus(
         nextLevelDepth.multipliedBy(nextLevel.price),
       );
-      if (reqBaseAmount && reqBaseAmount.lte(nextLevel.level)) {
+      if (
+        reqBaseAmount &&
+        reqBaseAmount.lte(quote.baseAmount.plus(nextLevel.level))
+      ) {
         const baseDifference = reqBaseAmount.minus(quote.baseAmount);
         const quoteAmount = quote.quoteAmount.plus(
           baseDifference.multipliedBy(nextLevel.price),
@@ -374,7 +375,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
         return baseAmount;
       }
 
-      quote.baseAmount = nextLevel.level;
+      quote.baseAmount = quote.baseAmount.plus(nextLevel.level);
       quote.quoteAmount = nextLevelQuote;
     }
 
@@ -482,11 +483,6 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
           return null;
         }
 
-        if (firstLevelAmountBN.gt(0)) {
-          // Add zero level for price computation
-          levels.unshift({ q: '0', p: firstLevelRaw.p });
-        }
-
         const unitPrice = this.computePricesFromLevels(
           [BN_1],
           levels,

package/src/dex/woo-fi-v2/config.ts

@@ -65,7 +65,7 @@ export const WooFiV2Config: DexConfigMap<DexParams> = {
       },
     },
     [Network.BASE]: {
-      wooPPV2Address: '0xEd9e3f98bBed560e66B89AaC922E29D4596A9642',
+      wooPPV2Address: '0x5520385bFcf07Ec87C4c53A7d8d65595Dff69FA4',
       wooOracleV2Address: '0x2A375567f5E13F6bd74fDa7627Df3b1Af6BfA5a6',
       integrationHelperAddress: '0xC4E9B633685461E7B7A807D12a246C81f96F31B8',
       // USDbC

package/src/dex/woo-fi-v2/woo-fi-v2-e2e.test.ts

@@ -239,6 +239,7 @@ describe('WooFiV2 E2E', () => {
           ContractMethod.simpleSwap,
           ContractMethod.multiSwap,
           ContractMethod.megaSwap,
+          ContractMethod.swapExactAmountIn,
         ],
       ],
     ]);

package/tests/constants-e2e.ts

@@ -1206,6 +1206,10 @@ export const Tokens: {
       address: '0x6ab707aca953edaefbc4fd23ba73294241490620',
       decimals: 6,
     },
+    TRYB: {
+      address: '0x564a341df6c126f90cf3ecb92120fd7190acb401',
+      decimals: 6,
+    },
   },
   [Network.ARBITRUM]: {
     SEN: {
@@ -2065,6 +2069,7 @@ export const Holders: {
     PHAR: '0x654296D56532f62B7d91d335791d3c364a9385b5',
     stataUSDT: '', // no holders yet
     aaveUSDT: '0xB2d3ad6e99D2A043EF77e3812461Ad2D4Ae3da8B',
+    TRYB: '0x7137FdccfB6Ee406771E8F5c1B466e4d3074dd45',
   },
   [Network.ARBITRUM]: {
     SEN: '0x76d39045d856caf9bfae12ba611ca4a94449a4f1',
@@ -2181,7 +2186,7 @@ export const Holders: {
     ETH: '0xd34ea7278e6bd48defe656bbe263aef11101469c',
     MAV: '0xf977814e90da44bfa03b6295a0616a897441acec',
     USDC: '0x21bD501F86A0B5cE0907651Df3368DA905B300A9',
-    USDbC: '0x4bb6b2efe7036020ba6f02a05602546c9f25bf28',
+    USDbC: '0x989BA24cb7938C1672B1e9Cea873cf4d7629a5FE',
     DAI: '0x20f03e26968b179025f65c1f4afadfd3959c8d03',
     BAL: '0x854b004700885a61107b458f11ecc169a019b764',
     GOLD: '0x1374c25b3710758c326ee0c70ec48b595d5ccf8c',

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>