@defisaver/positions-sdk 0.0.165 → 0.0.166-dev

package/src/markets/spark/marketAssets.ts

@@ -1,6 +1,6 @@
 import { NetworkNumber } from '../../types/common';
 
-export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS'];
+export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC'];
 
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const sparkAssetsDefaultMarket = {

package/src/services/utils.ts

@@ -52,3 +52,6 @@ export const mapRange = (input: number | string, minInput: number | string, maxI
 // eslint-disable-next-line no-bitwise
 export const isEnabledOnBitmap = (bitmap: number, assetId: number) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
 
+export const MAXUINT:string = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
+
+export const isMaxuint = (amount: string) => compareAddresses(MAXUINT, amount);

package/src/staking/staking.ts

@@ -77,36 +77,15 @@ export const getDsrApy = async (web3: Web3, blockNumber: 'latest' | number = 'la
     .toString();
 };
 
-const getSuperOETHApy = async () => {
-  console.log('getSuperOETHApy');
-  const res = await fetch('https://origin.squids.live/origin-squid/graphql', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      query: '\n    query OTokenApy($chainId: Int!, $token: String!) {\n  oTokenApies(\n    limit: 1\n    orderBy: timestamp_DESC\n    where: {chainId_eq: $chainId, otoken_containsInsensitive: $token}\n  ) {\n    apy7DayAvg\n    apy14DayAvg\n    apy30DayAvg\n    apr\n    apy\n  }\n}\n    ',
-      variables: {
-        token: '0xdbfefd2e8460a6ee4955a68582f85708baea60a3',
-        chainId: 8453,
-      },
-    }),
-  });
-
-  const data = await res.json();
-  return new Dec(data.data.oTokenApies[0].apy).mul(100).toString();
-};
-
 const getApyFromDfsApi = async (asset: string) => {
   const res = await fetch(`https://app.defisaver.com/api/staking/apy?asset=${asset}`);
   const data = await res.json();
   return data.apy;
 };
 
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb'];
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH'];
 
 export const getStakingApy = (asset: string, web3: Web3, blockNumber: 'latest' | number = 'latest', fromBlock: number | undefined = undefined) => {
-  console.log('getStakingApy', asset, blockNumber, fromBlock);
   try {
     if (asset === 'stETH' || asset === 'wstETH') return getStETHApr(web3, fromBlock, blockNumber);
     if (asset === 'cbETH') return getCbETHApr(web3, blockNumber);
@@ -119,7 +98,6 @@ export const getStakingApy = (asset: string, web3: Web3, blockNumber: 'latest' |
     if (asset === 'ETHx') return getApyFromDfsApi('ETHx');
     if (asset === 'rsETH' || asset === 'wrsETH') return getApyFromDfsApi('rsETH');
     if (asset === 'pufETH') return getApyFromDfsApi('pufETH');
-    if (asset === 'wsuperOETHb') return getSuperOETHApy();
   } catch (e) {
     console.error(`Failed to fetch APY for ${asset}`);
     return '0';
@@ -139,7 +117,7 @@ export const calculateInterestEarned = (principal: string, interest: string, typ
     return (+principal * (1 + (+interest / 100 * interval))) - +principal;
   }
 
-  return (+principal * (((1 + (+interest / 100) / BLOCKS_IN_A_YEAR)) ** (BLOCKS_IN_A_YEAR * interval))) - +principal; // eslint-disable-line
+    return (+principal * (((1 + (+interest / 100) / BLOCKS_IN_A_YEAR)) ** (BLOCKS_IN_A_YEAR * interval))) - +principal; // eslint-disable-line
 };
 
 export const calculateNetApy = (usedAssets: MMUsedAssets, assetsData: MMAssetsData, isMorpho = false) => {

package/src/types/contracts/generated/EulerV2View.ts

@@ -0,0 +1,434 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import type BN from "bn.js";
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type {
+  Callback,
+  PayableTransactionObject,
+  NonPayableTransactionObject,
+  BlockType,
+  ContractEventLog,
+  BaseContract,
+} from "./types";
+
+export interface EventOptions {
+  filter?: object;
+  fromBlock?: BlockType;
+  topics?: string[];
+}
+
+export declare namespace EulerV2View {
+  export type LiquidityChangeParamsStruct =
+    | [string, boolean, number | string | BN, number | string | BN]
+    | {
+        vault: string;
+        isBorrowOperation: boolean;
+        liquidityAdded: number | string | BN;
+        liquidityRemoved: number | string | BN;
+      };
+
+  export type LiquidityChangeParamsStructOutputArray = [
+    string,
+    boolean,
+    string,
+    string
+  ];
+  export type LiquidityChangeParamsStructOutputStruct = {
+    vault: string;
+    isBorrowOperation: boolean;
+    liquidityAdded: string;
+    liquidityRemoved: string;
+  };
+  export type LiquidityChangeParamsStructOutput =
+    LiquidityChangeParamsStructOutputArray &
+      LiquidityChangeParamsStructOutputStruct;
+
+  export type UserCollateralInfoStruct =
+    | [
+        string,
+        boolean,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN
+      ]
+    | {
+        collateralVault: string;
+        usedInBorrow: boolean;
+        collateralAmountInUnit: number | string | BN;
+        collateralAmountInAsset: number | string | BN;
+        collateralAmountInUSD: number | string | BN;
+      };
+
+  export type UserCollateralInfoStructOutputArray = [
+    string,
+    boolean,
+    string,
+    string,
+    string
+  ];
+  export type UserCollateralInfoStructOutputStruct = {
+    collateralVault: string;
+    usedInBorrow: boolean;
+    collateralAmountInUnit: string;
+    collateralAmountInAsset: string;
+    collateralAmountInUSD: string;
+  };
+  export type UserCollateralInfoStructOutput =
+    UserCollateralInfoStructOutputArray & UserCollateralInfoStructOutputStruct;
+
+  export type UserDataStruct =
+    | [
+        string,
+        string,
+        boolean,
+        boolean,
+        string,
+        number | string | BN,
+        number | string | BN,
+        EulerV2View.UserCollateralInfoStruct[]
+      ]
+    | {
+        user: string;
+        owner: string;
+        inLockDownMode: boolean;
+        inPermitDisabledMode: boolean;
+        borrowVault: string;
+        borrowAmountInUnit: number | string | BN;
+        borrowAmountInAsset: number | string | BN;
+        collaterals: EulerV2View.UserCollateralInfoStruct[];
+      };
+
+  export type UserDataStructOutputArray = [
+    string,
+    string,
+    boolean,
+    boolean,
+    string,
+    string,
+    string,
+    EulerV2View.UserCollateralInfoStructOutput[]
+  ];
+  export type UserDataStructOutputStruct = {
+    user: string;
+    owner: string;
+    inLockDownMode: boolean;
+    inPermitDisabledMode: boolean;
+    borrowVault: string;
+    borrowAmountInUnit: string;
+    borrowAmountInAsset: string;
+    collaterals: EulerV2View.UserCollateralInfoStructOutput[];
+  };
+  export type UserDataStructOutput = UserDataStructOutputArray &
+    UserDataStructOutputStruct;
+
+  export type CollateralInfoStruct =
+    | [
+        string,
+        string,
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN
+      ]
+    | {
+        vaultAddr: string;
+        assetAddr: string;
+        vaultSymbol: string;
+        decimals: number | string | BN;
+        sharePriceInUnit: number | string | BN;
+        assetPriceInUnit: number | string | BN;
+        cash: number | string | BN;
+        totalBorrows: number | string | BN;
+        supplyCap: number | string | BN;
+        borrowLTV: number | string | BN;
+        liquidationLTV: number | string | BN;
+        initialLiquidationLTV: number | string | BN;
+        targetTimestamp: number | string | BN;
+        rampDuration: number | string | BN;
+        interestFee: number | string | BN;
+        interestRate: number | string | BN;
+      };
+
+  export type CollateralInfoStructOutputArray = [
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string
+  ];
+  export type CollateralInfoStructOutputStruct = {
+    vaultAddr: string;
+    assetAddr: string;
+    vaultSymbol: string;
+    decimals: string;
+    sharePriceInUnit: string;
+    assetPriceInUnit: string;
+    cash: string;
+    totalBorrows: string;
+    supplyCap: string;
+    borrowLTV: string;
+    liquidationLTV: string;
+    initialLiquidationLTV: string;
+    targetTimestamp: string;
+    rampDuration: string;
+    interestFee: string;
+    interestRate: string;
+  };
+  export type CollateralInfoStructOutput = CollateralInfoStructOutputArray &
+    CollateralInfoStructOutputStruct;
+
+  export type VaultInfoFullStruct =
+    | [
+        string,
+        string,
+        string,
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        EulerV2View.CollateralInfoStruct[],
+        number | string | BN,
+        number | string | BN,
+        boolean,
+        string,
+        number | string | BN,
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        string,
+        string,
+        string,
+        string,
+        number | string | BN
+      ]
+    | {
+        vaultAddr: string;
+        assetAddr: string;
+        name: string;
+        symbol: string;
+        decimals: number | string | BN;
+        totalSupplyShares: number | string | BN;
+        cash: number | string | BN;
+        totalBorrows: number | string | BN;
+        totalAssets: number | string | BN;
+        supplyCap: number | string | BN;
+        borrowCap: number | string | BN;
+        collaterals: EulerV2View.CollateralInfoStruct[];
+        maxLiquidationDiscount: number | string | BN;
+        liquidationCoolOffTime: number | string | BN;
+        badDebtSocializationEnabled: boolean;
+        unitOfAccount: string;
+        unitOfAccountInUsd: number | string | BN;
+        oracle: string;
+        assetPriceInUnit: number | string | BN;
+        sharePriceInUnit: number | string | BN;
+        interestRate: number | string | BN;
+        irm: string;
+        balanceTrackerAddress: string;
+        creator: string;
+        governorAdmin: string;
+        interestFee: number | string | BN;
+      };
+
+  export type VaultInfoFullStructOutputArray = [
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    EulerV2View.CollateralInfoStructOutput[],
+    string,
+    string,
+    boolean,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string
+  ];
+  export type VaultInfoFullStructOutputStruct = {
+    vaultAddr: string;
+    assetAddr: string;
+    name: string;
+    symbol: string;
+    decimals: string;
+    totalSupplyShares: string;
+    cash: string;
+    totalBorrows: string;
+    totalAssets: string;
+    supplyCap: string;
+    borrowCap: string;
+    collaterals: EulerV2View.CollateralInfoStructOutput[];
+    maxLiquidationDiscount: string;
+    liquidationCoolOffTime: string;
+    badDebtSocializationEnabled: boolean;
+    unitOfAccount: string;
+    unitOfAccountInUsd: string;
+    oracle: string;
+    assetPriceInUnit: string;
+    sharePriceInUnit: string;
+    interestRate: string;
+    irm: string;
+    balanceTrackerAddress: string;
+    creator: string;
+    governorAdmin: string;
+    interestFee: string;
+  };
+  export type VaultInfoFullStructOutput = VaultInfoFullStructOutputArray &
+    VaultInfoFullStructOutputStruct;
+}
+
+export interface EulerV2View extends BaseContract {
+  constructor(
+    jsonInterface: any[],
+    address?: string,
+    options?: ContractOptions
+  ): EulerV2View;
+  clone(): EulerV2View;
+  methods: {
+    USD(): NonPayableTransactionObject<string>;
+
+    feedRegistry(): NonPayableTransactionObject<string>;
+
+    fetchUsedAccounts(
+      _account: string,
+      _page: number | string | BN,
+      _perPage: number | string | BN
+    ): NonPayableTransactionObject<
+      [string, string[]] & { owner: string; accounts: string[] }
+    >;
+
+    getAaveTokenPriceInETH(
+      _tokenAddr: string
+    ): NonPayableTransactionObject<string>;
+
+    getAaveTokenPriceInUSD(
+      _tokenAddr: string
+    ): NonPayableTransactionObject<string>;
+
+    getAaveV3TokenPriceInETH(
+      _tokenAddr: string
+    ): NonPayableTransactionObject<string>;
+
+    getAaveV3TokenPriceInUSD(
+      _tokenAddr: string
+    ): NonPayableTransactionObject<string>;
+
+    getAddrForChainlinkOracle(
+      _inputTokenAddr: string
+    ): NonPayableTransactionObject<string>;
+
+    getApyAfterValuesEstimation(
+      params: EulerV2View.LiquidityChangeParamsStruct[]
+    ): NonPayableTransactionObject<string[]>;
+
+    getChainlinkPriceInETH(
+      _inputTokenAddr: string
+    ): NonPayableTransactionObject<string>;
+
+    getChainlinkPriceInUSD(
+      _inputTokenAddr: string,
+      _useFallback: boolean
+    ): NonPayableTransactionObject<string>;
+
+    getPriceInETH(_inputTokenAddr: string): NonPayableTransactionObject<string>;
+
+    getPriceInUSD(_inputTokenAddr: string): NonPayableTransactionObject<string>;
+
+    "getRoundInfo(address,uint80,address)"(
+      _inputTokenAddr: string,
+      _roundId: number | string | BN,
+      aggregator: string
+    ): NonPayableTransactionObject<
+      [string, string] & { updateTimestamp: string }
+    >;
+
+    "getRoundInfo(address,uint80)"(
+      _inputTokenAddr: string,
+      _roundId: number | string | BN
+    ): NonPayableTransactionObject<
+      [string, string] & { updateTimestamp: string }
+    >;
+
+    getSparkTokenPriceInETH(
+      _tokenAddr: string
+    ): NonPayableTransactionObject<string>;
+
+    getSparkTokenPriceInUSD(
+      _tokenAddr: string
+    ): NonPayableTransactionObject<string>;
+
+    getUserData(
+      _user: string
+    ): NonPayableTransactionObject<EulerV2View.UserDataStructOutput>;
+
+    getUsersData(
+      _users: string[]
+    ): NonPayableTransactionObject<EulerV2View.UserDataStructOutput[]>;
+
+    getVaultCollaterals(
+      _vault: string
+    ): NonPayableTransactionObject<EulerV2View.CollateralInfoStructOutput[]>;
+
+    getVaultInfoFull(
+      _vault: string
+    ): NonPayableTransactionObject<EulerV2View.VaultInfoFullStructOutput>;
+
+    getVaultsInfosFull(
+      _vaults: string[]
+    ): NonPayableTransactionObject<EulerV2View.VaultInfoFullStructOutput[]>;
+
+    getWBtcPrice(
+      _btcPrice: number | string | BN
+    ): NonPayableTransactionObject<string>;
+
+    getWStEthPrice(
+      _stEthPrice: number | string | BN
+    ): NonPayableTransactionObject<string>;
+  };
+  events: {
+    allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+  };
+}

package/src/types/contracts/generated/index.ts

@@ -29,6 +29,7 @@ export type { CompoundLoanInfo } from "./CompoundLoanInfo";
 export type { Comptroller } from "./Comptroller";
 export type { ETHPriceFeed } from "./ETHPriceFeed";
 export type { Erc20 } from "./Erc20";
+export type { EulerV2View } from "./EulerV2View";
 export type { FeedRegistry } from "./FeedRegistry";
 export type { GHO } from "./GHO";
 export type { GhoDiscountRateStrategy } from "./GhoDiscountRateStrategy";

package/src/types/euler.ts

@@ -0,0 +1,171 @@
+import {
+  MMPositionData, NetworkNumber,
+} from './common';
+
+export enum EulerV2Versions {
+  eUSDC2 = 'eUSDC-2',
+  eUSDC8 = 'eUSDC-8',
+  eWETH2 = 'eWETH-2',
+}
+
+export enum EulerV2VaultType {
+  Escrow = 'Escrow',
+  Governed = 'Governed',
+  Ungoverned = 'Ungoverned',
+}
+
+export interface EulerV2Market {
+  chainIds: NetworkNumber[],
+  label: string,
+  shortLabel: string,
+  asset: string,
+  value: EulerV2Versions,
+  secondLabel: string,
+  marketAddress: string,
+  // icon: Function,
+}
+
+export interface EulerV2PositionData extends MMPositionData {
+  ratio: string,
+  minRatio: string,
+  borrowedUsd: string,
+  borrowLimitUsd: string,
+  incentiveUsd: string,
+  totalInterestUsd: string,
+  isSubscribedToAutomation?: boolean,
+  automationResubscribeRequired?: boolean,
+}
+
+export interface EulerV2AssetData {
+  vaultAddress: string,
+  vaultSymbol: string
+  sortIndex?: number
+  liquidationRatio: string
+  cash: string
+  supplyCap: string
+  assetAddress: string
+  decimals: string
+  symbol: string
+  price: string
+  borrowCap: string
+  canBeBorrowed: boolean
+  canBeSupplied: boolean
+  incentiveSupplyApy?: string
+  incentiveSupplyToken?: string
+  totalBorrow: string
+  collateralFactor: string
+  borrowRate: string
+  supplyRate: string
+  utilization: string
+}
+
+export interface EulerV2UsedAsset {
+  isSupplied: boolean
+  isBorrowed: boolean
+  supplied: string
+  suppliedUsd: string
+  borrowed: string
+  borrowedUsd: string
+  symbol: string
+  collateral: boolean
+  vaultAddress: string
+}
+
+export interface EulerV2MarketInfoData {
+  name: string,
+  symbol: string,
+  decimals: string,
+  vaultAddress: string,
+  irm: string,
+  creator: string,
+  governorAdmin: string,
+  unitOfAccount: string,
+  unitOfAccountUsdPrice: string,
+  isInUSD: boolean,
+  oracle: string,
+  collaterals: string[],
+  isEscrow: boolean,
+  isGoverned: boolean,
+  vaultType: EulerV2VaultType,
+}
+
+export type EulerV2AssetsData = { [key: string]: EulerV2AssetData };
+export type EulerV2UsedAssets = { [key: string]: EulerV2UsedAsset };
+
+
+export interface EulerV2CollateralInfo {
+  lltv: string
+  borrowLtv: string
+  totalBorrows: string
+  cash: string
+  supplyCap: string
+}
+
+export interface EulerV2MarketData {
+  name: string
+  symbol: string
+  decimals: number
+
+  totalSupplyShares: string
+  cash: string
+  totalBorrows: string
+  totalAssets: string
+  supplyCap: string
+  borrowCap: string
+
+  collaterals: string[]
+
+  badDebtSocializationEnabled: boolean
+
+  unitOfAccount: string
+  oracle: string
+  assetPrice: string
+
+  interestRate: string
+  irm: string
+
+  creator: string
+
+  governorAdmin: string
+
+  interestFee: string
+}
+
+export interface EulerV2FullMarketData {
+  marketData: EulerV2MarketInfoData
+  assetsData: EulerV2AssetsData
+}
+
+export interface EulerV2AccountData {
+  owner: string
+  inLockDownMode: boolean
+  inPermitDisabledMode: boolean
+
+  borrowVault: string
+  borrowAmountInUnit: string
+
+  collaterals: string[] // all collaterals user has enabled on main evc contract (globally - not only collaterals for his borrow market)
+  collateralAmountsInUnit: string[] // only amounts used as collateral for his debt (empty array if no debt)
+}
+
+export interface EulerV2AggregatedPositionData {
+  suppliedUsd: string,
+  suppliedCollateralUsd: string,
+  borrowedUsd: string,
+  borrowLimitUsd: string,
+  liquidationLimitUsd: string,
+  leftToBorrowUsd: string,
+  ratio: string,
+  collRatio: string,
+  netApy: string,
+  incentiveUsd: string,
+  totalInterestUsd: string,
+  liqRatio: string,
+  liqPercent: string,
+  leveragedType: string,
+  leveragedAsset?: string,
+  leveragedLsdAssetRatio?: string,
+  liquidationPrice?: string,
+  minRatio: string,
+  minDebt: string,
+}

package/src/types/index.ts

@@ -6,4 +6,5 @@ export * from './liquity';
 export * from './maker';
 export * from './chickenBonds';
 export * from './morphoBlue';
-export * from './llamaLend';
+export * from './llamaLend';
+export * from './euler';

package/src/types/morphoBlue.ts

@@ -11,7 +11,6 @@ export enum MorphoBlueVersions {
   MorphoBlueWstEthUSDA_Exchange_Rate = 'morphobluewstethusda_exchange_rate', // wstETH/USDA
   MorphoBlueWstEthPYUSD = 'morphobluwstethpyusd', // wstETH/PYUSD
   MorphoBlueWeEthEth = 'morphoblueweetheth', // weETH/ETH
-  MorphoBlueREthEth_945 = 'morphoblueretheth_945', // rETH/ETH
   MorphoBlueWBTCPYUSD = 'morphobluewbtcpyusd', // WBTC/PYUSD
   MorphoBlueWBTCEth = 'morphobluewbtceth', // WBTC/ETH
   MorphoBlueUSDeUSDT = 'morphoblueusdeusdt', // USDe/USDT
@@ -49,7 +48,6 @@ export enum MorphoBlueVersions {
   MorphoBlueREthEth_945_Base = 'morphoblueretheth_945_base',
   MorphoBlueCbBTCEth_915_Base = 'morphobluecbbtceth_915_base',
   MorphoBlueCbBTCUSDC_860_Base = 'morphobluecbbtcusdc_860_base',
-  MorphoBlueWsuperOETHbWETH_915_Base = 'morphobluewsuperoethbweth_915_base',
 }
 
 export enum MorphoBlueOracleType {