@paraswap/dex-lib 2.47.4 → 2.47.5

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

@@ -5,15 +5,15 @@ import {
   AdapterExchangeParam,
   Address,
   ExchangePrices,
-  ExchangeTxInfo,
   Log,
   Logger,
+  TxInfo,
+  PreprocessTransactionOptions,
+  ExchangeTxInfo,
   PoolLiquidity,
   PoolPrices,
-  PreprocessTransactionOptions,
   SimpleExchangeParam,
   Token,
-  TxInfo,
 } from '../../types';
 import {
   ETHER_ADDRESS,
@@ -29,14 +29,12 @@ import { StablePool } from './pools/stable/StablePool';
 import { WeightedPool } from './pools/weighted/WeightedPool';
 import { PhantomStablePool } from './pools/phantom-stable/PhantomStablePool';
 import { LinearPool } from './pools/linear/LinearPool';
-import { Gyro3Pool } from './pools/gyro/Gyro3Pool';
-import { GyroEPool } from './pools/gyro/GyroEPool';
 import VaultABI from '../../abi/balancer-v2/vault.json';
 import DirectSwapABI from '../../abi/DirectSwap.json';
 import { StatefulEventSubscriber } from '../../stateful-event-subscriber';
 import {
-  getBigIntPow,
   getDexKeysWithNetwork,
+  getBigIntPow,
   uuidToBytes16,
 } from '../../utils';
 import { IDex } from '../../dex/idex';
@@ -46,12 +44,12 @@ import {
   BalancerPoolTypes,
   BalancerSwap,
   BalancerV2Data,
-  BalancerV2DirectParam,
   OptimizedBalancerV2Data,
   PoolState,
   PoolStateCache,
   PoolStateMap,
   SubgraphPoolAddressDictionary,
+  BalancerV2DirectParam,
   SubgraphPoolBase,
   SwapTypes,
 } from './types';
@@ -59,7 +57,7 @@ import {
   getLocalDeadlineAsFriendlyPlaceholder,
   SimpleExchange,
 } from '../simple-exchange';
-import { Adapters, BalancerConfig } from './config';
+import { BalancerConfig, Adapters } from './config';
 import {
   getAllPoolsUsedInPaths,
   isSameAddress,
@@ -93,8 +91,6 @@ const enabledPoolTypes = [
   BalancerPoolTypes.SiloLinear,
   BalancerPoolTypes.TetuLinear,
   BalancerPoolTypes.YearnLinear,
-  BalancerPoolTypes.GyroE,
-  BalancerPoolTypes.Gyro3,
 ];
 
 const disabledPoolIds = [
@@ -190,15 +186,12 @@ const fetchAllPools = `query ($count: Int) {
     id
     address
     poolType
-    poolTypeVersion
     tokens (orderBy: index) {
       address
       decimals
     }
     mainIndex
     wrappedIndex
-
-    root3Alpha
   }
 }`;
 // skipping low liquidity composableStablePool (0xbd482ffb3e6e50dc1c437557c3bea2b68f3683ee0000000000000000000003c6) with oracle issues. Experimental.
@@ -231,23 +224,12 @@ export class BalancerV2EventPool extends StatefulEventSubscriber<PoolStateMap> {
   } = {};
 
   pools: {
-    [type: string]:
-      | WeightedPool
-      | StablePool
-      | LinearPool
-      | PhantomStablePool
-      | Gyro3Pool
-      | GyroEPool;
+    [type: string]: WeightedPool | StablePool | LinearPool | PhantomStablePool;
   };
 
   public allPools: SubgraphPoolBase[] = [];
   vaultDecoder: (log: Log) => any;
 
-  buySupportedPoolTypes: BalancerPoolTypes[] = [
-    BalancerPoolTypes.Weighted,
-    BalancerPoolTypes.GyroE,
-  ];
-
   eventSupportedPoolTypes: BalancerPoolTypes[] = [
     BalancerPoolTypes.Stable,
     BalancerPoolTypes.Weighted,
@@ -305,8 +287,6 @@ export class BalancerV2EventPool extends StatefulEventSubscriber<PoolStateMap> {
       true,
     );
     const linearPool = new LinearPool(this.vaultAddress, this.vaultInterface);
-    const gyro3Pool = new Gyro3Pool(this.vaultAddress, this.vaultInterface);
-    const gyroEPool = new GyroEPool(this.vaultAddress, this.vaultInterface);
 
     this.pools = {};
     this.pools[BalancerPoolTypes.Weighted] = weightedPool;
@@ -328,10 +308,6 @@ export class BalancerV2EventPool extends StatefulEventSubscriber<PoolStateMap> {
     this.pools[BalancerPoolTypes.BeefyLinear] = linearPool;
     // Beets uses "Linear" generically for all linear pool types
     this.pools[BalancerPoolTypes.Linear] = linearPool;
-
-    this.pools[BalancerPoolTypes.Gyro3] = gyro3Pool;
-    this.pools[BalancerPoolTypes.GyroE] = gyroEPool;
-
     this.vaultDecoder = (log: Log) => this.vaultInterface.parseLog(log);
     this.addressesSubscribed = [vaultAddress];
 
@@ -387,6 +363,9 @@ export class BalancerV2EventPool extends StatefulEventSubscriber<PoolStateMap> {
       return allPools;
     }
 
+    this.logger.info(
+      `Fetching ${this.parentName}_${this.network} Pools from subgraph`,
+    );
     const variables = {
       count: MAX_POOL_CNT,
     };
@@ -422,7 +401,6 @@ export class BalancerV2EventPool extends StatefulEventSubscriber<PoolStateMap> {
     this.logger.info(
       `Got ${allPools.length} ${this.parentName}_${this.network} pools from subgraph`,
     );
-
     return allPools;
   }
 
@@ -486,7 +464,7 @@ export class BalancerV2EventPool extends StatefulEventSubscriber<PoolStateMap> {
     }
 
     if (
-      !this.buySupportedPoolTypes.includes(subgraphPool.poolType) &&
+      subgraphPool.poolType !== BalancerPoolTypes.Weighted &&
       side === SwapSide.BUY
     ) {
       return null;
@@ -824,7 +802,6 @@ export class BalancerV2
       }
 
       const allPools = this.getPoolsWithTokenPair(_from, _to);
-
       const allowedPools = limitPools
         ? allPools.filter(({ address }) =>
             limitPools.includes(`${this.dexKey}_${address.toLowerCase()}`),
@@ -876,85 +853,72 @@ export class BalancerV2
 
       const poolPrices = allowedPools
         .map((pool: SubgraphPoolBase) => {
-          try {
-            const poolAddress = pool.address.toLowerCase();
-
-            const path = poolGetPathForTokenInOut(
-              _from.address,
-              _to.address,
-              pool,
-              this.poolAddressMap,
-              side,
-            );
+          const poolAddress = pool.address.toLowerCase();
+
+          const path = poolGetPathForTokenInOut(
+            _from.address,
+            _to.address,
+            pool,
+            this.poolAddressMap,
+            side,
+          );
 
-            let pathAmounts = amounts;
-            let resOut: { unit: bigint; prices: bigint[] } | null = null;
-
-            for (let i = 0; i < path.length; i++) {
-              const poolAddress = path[i].pool.address.toLowerCase();
-              const poolState = (eventPoolStates[poolAddress] ||
-                nonEventPoolStates[poolAddress]) as PoolState | undefined;
-              if (!poolState) {
-                this.logger.error(
-                  `Unable to find the poolState ${poolAddress}`,
-                );
-                return null;
-              }
-
-              const unitVolume = getBigIntPow(
-                (side === SwapSide.SELL ? path[i].tokenIn : path[i].tokenOut)
-                  .decimals,
-              );
-
-              const res = this.eventPools.getPricesPool(
-                path[i].tokenIn,
-                path[i].tokenOut,
-                path[i].pool,
-                poolState,
-                pathAmounts,
-                unitVolume,
-                side,
-              );
-
-              if (!res) {
-                return null;
-              }
-
-              pathAmounts = res.prices;
-
-              if (i === path.length - 1) {
-                resOut = res;
-              }
-            }
+          let pathAmounts = amounts;
+          let resOut: { unit: bigint; prices: bigint[] } | null = null;
 
-            if (!resOut) {
+          for (let i = 0; i < path.length; i++) {
+            const poolAddress = path[i].pool.address.toLowerCase();
+            const poolState = (eventPoolStates[poolAddress] ||
+              nonEventPoolStates[poolAddress]) as PoolState | undefined;
+            if (!poolState) {
+              this.logger.error(`Unable to find the poolState ${poolAddress}`);
               return null;
             }
 
-            return {
-              unit: resOut.unit,
-              prices: resOut.prices,
-              data: {
-                poolId: pool.id,
-              },
-              poolAddresses: [poolAddress],
-              exchange: this.dexKey,
-              gasCost:
-                STABLE_GAS_COST + VARIABLE_GAS_COST_PER_CYCLE * path.length,
-              poolIdentifier: `${this.dexKey}_${poolAddress}`,
-            };
-
-            // TODO: re-check what should be the current block time stamp
-          } catch (e) {
-            this.logger.warn(
-              `Error_getPrices ${from.symbol || from.address}, ${
-                to.symbol || to.address
-              }, ${side}, ${pool.address}:`,
-              e,
+            const unitVolume = getBigIntPow(
+              (side === SwapSide.SELL ? path[i].tokenIn : path[i].tokenOut)
+                .decimals,
+            );
+
+            const res = this.eventPools.getPricesPool(
+              path[i].tokenIn,
+              path[i].tokenOut,
+              path[i].pool,
+              poolState,
+              pathAmounts,
+              unitVolume,
+              side,
             );
 
-            return;
+            if (!res) {
+              return null;
+            }
+
+            pathAmounts = res.prices;
+
+            if (i === path.length - 1) {
+              resOut = res;
+            }
+          }
+
+          if (!resOut) {
+            return null;
           }
+
+          return {
+            unit: resOut.unit,
+            prices: resOut.prices,
+            data: {
+              poolId: pool.id,
+            },
+            poolAddresses: [poolAddress],
+            exchange: this.dexKey,
+            gasCost:
+              STABLE_GAS_COST + VARIABLE_GAS_COST_PER_CYCLE * path.length,
+            poolIdentifier: `${this.dexKey}_${poolAddress}`,
+          };
+
+          // TODO: re-check what should be the current block time stamp
         })
         .filter(p => !!p);
       return poolPrices as ExchangePrices<BalancerV2Data>;

package/src/dex/balancer-v2/types.ts

@@ -1,6 +1,5 @@
 import { NumberAsString } from '@paraswap/core';
 import { Address } from '../../types';
-import { DerivedGyroEParams, GyroEParams } from '@balancer-labs/sor';
 
 // These should match the Balancer Pool types available on Subgraph
 export enum BalancerPoolTypes {
@@ -21,8 +20,6 @@ export enum BalancerPoolTypes {
   SiloLinear = 'SiloLinear',
   TetuLinear = 'TetuLinear',
   YearnLinear = 'YearnLinear',
-  Gyro3 = 'Gyro3',
-  GyroE = 'GyroE',
 }
 
 export type TokenState = {
@@ -35,10 +32,6 @@ export type PoolState = {
   tokens: {
     [address: string]: TokenState;
   };
-  tokenRates?: bigint[];
-  rateProviders?: string[];
-  gyroParams?: GyroEParams;
-  gyroDerivedParams?: DerivedGyroEParams;
   swapFee: bigint;
   orderedTokens: string[];
   rate?: bigint;
@@ -78,31 +71,12 @@ export interface SubgraphPoolBase {
   id: string;
   address: string;
   poolType: BalancerPoolTypes;
-  poolTypeVersion: number;
   tokens: SubgraphToken[];
   tokensMap: { [tokenAddress: string]: SubgraphToken };
   mainIndex: number;
   wrappedIndex: number;
 
   mainTokens: SubgraphMainToken[];
-
-  // gyro3
-  root3Alpha: string;
-  // gyroE
-  alpha: string;
-  beta: string;
-  c: string;
-  s: string;
-  lambda: string;
-  tauAlphaX: string;
-  tauAlphaY: string;
-  tauBetaX: string;
-  tauBetaY: string;
-  u: string;
-  v: string;
-  w: string;
-  z: string;
-  dSq: string;
 }
 
 export type BalancerSwapV2 = {

package/src/dex/balancer-v2/utils.ts

@@ -1,6 +1,5 @@
 import { getAddress } from '@ethersproject/address';
 import { Interface, Result } from '@ethersproject/abi';
-import { parseFixed, BigNumber } from '@ethersproject/bignumber';
 import { getBigIntPow } from '../../utils';
 import { BI_POWS } from '../../bigint-constants';
 import { SwapSide } from '../../constants';
@@ -20,21 +19,6 @@ interface BalancerPathHop {
   tokenOut: SubgraphToken;
 }
 
-/**
- * Parses a fixed-point decimal string into a BigNumber. If we do not have enough decimals to express the number, we truncate it.
- * @param value
- * @param decimals
- * @returns BigNumber
- */
-export function safeParseFixed(value: string, decimals = 0): BigNumber {
-  const [integer, fraction] = value.split('.');
-  if (!fraction) {
-    return parseFixed(value, decimals);
-  }
-  const safeValue = integer + '.' + fraction.slice(0, decimals);
-  return parseFixed(safeValue, decimals);
-}
-
 export const isSameAddress = (address1: string, address2: string): boolean =>
   getAddress(address1) === getAddress(address2);
 

package/src/dex/hashflow/hashflow.ts

@@ -714,7 +714,7 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
     } catch (e) {
       if (
         e instanceof Error &&
-        e.message.endsWith('User is restricted from using Hashflow')
+        e.message?.toLowerCase().includes('user is restricted')
       ) {
         this.logger.warn(
           `${this.dexKey}-${this.network}: Encountered restricted user=${options.txOrigin}. Adding to local blacklist cache`,
@@ -726,6 +726,9 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
             `${this.dexKey}-${this.network}: Market Maker ${mm} failed to build transaction on side ${side} with too strict slippage. Skipping restriction`,
           );
         } else {
+          this.logger.warn(
+            `${this.dexKey}-${this.network} MM unknown preprocess transaction error: ${e}`,
+          );
           await this.restrictMM(mm);
         }
       }

package/src/dex/synthetix/synthetix-state.ts

@@ -407,7 +407,7 @@ export class SynthetixState {
       Address,
       bigint,
       bigint,
-      ...Address[],
+      ...Address[]
     ];
 
     const [
@@ -437,7 +437,7 @@ export class SynthetixState {
       Address,
       Address,
       bigint,
-      ...string[],
+      ...string[]
     ];
 
     _require(

package/tests/constants-e2e.ts

@@ -41,14 +41,6 @@ export const Tokens: {
       addBalance: balancesFn,
       addAllowance: allowedFn,
     },
-    R: {
-      address: '0x183015a9ba6ff60230fdeadc3f43b3d788b13e21',
-      decimals: 18,
-    },
-    sDAI: {
-      address: '0x83f20f44975d03b1b09e64809b757c47f942beea',
-      decimals: 18,
-    },
     CUSDC: {
       address: '0x39AA39c021dfbaE8faC545936693aC917d5E7563',
       decimals: 8,
@@ -343,10 +335,6 @@ export const Tokens: {
       address: '0x455e53CBB86018Ac2B8092FdCd39d8444aFFC3F6',
       decimals: 19,
     },
-    GYD: {
-      address: '0xe07f9d810a48ab5c3c914ba3ca53af14e4491e8a',
-      decimals: 18,
-    },
   },
   [Network.ROPSTEN]: {
     DAI: {
@@ -477,22 +465,10 @@ export const Tokens: {
       address: '0xa3fa99a148fa48d14ed51d610c367c61876997f1',
       decimals: 18,
     },
-    BUSD: {
-      address: '0x9C9e5fD8bbc25984B178FdCE6117Defa39d2db39',
-      decimals: 18,
-    },
-    TUSD: {
-      address: '0x2e1ad108ff1d8c782fcbbb89aad783ac49586756',
-      decimals: 18,
-    },
     SDEX: {
       address: '0x6899fAcE15c14348E1759371049ab64A3a06bFA6',
       decimals: 18,
     },
-    MATICX: {
-      address: '0xfa68fb4628dff1028cfec22b4162fccd0d45efb6',
-      decimals: 18,
-    },
   },
   [Network.FANTOM]: {
     FTM: { address: ETHER_ADDRESS, decimals: 18 },
@@ -1055,8 +1031,6 @@ export const Holders: {
     WETH: '0x2fEb1512183545f48f6b9C5b4EbfCaF49CfCa6F3',
     USDT: '0x8A446971dbB112f3be15bc38C14D44B94D9E94b9',
     XAUT: '0xc4e161e8d8a4bc4ac762ab33a28bbac5474203d7',
-    R: '0xBfe4c9D3235475C138a61f62e9e72FaD94A3303b',
-    sDAI: '0x8846163Fedc6b881526A6B48321601b474D40923',
     CVX: '0x0aCA67Fa70B142A3b9bF2eD89A81B40ff85dACdC',
     MIM: '0xa046a8660e66d178ee07ec97c585eeb6aa18c26c',
     AnkETH: '0xF7260D4ADc48fEefd5a19a9Eb23f9747CeE15C92',