@defisaver/positions-sdk 0.0.83 → 0.0.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.83",
+  "version": "0.0.85",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -22,7 +22,6 @@
     "@defisaver/tokens": "^1.5.23",
     "@ethersproject/bignumber": "^5.7.0",
     "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "@stakewise/v3-sdk": "^1.3.0",
     "decimal.js": "^10.4.3"
   },
   "devDependencies": {

package/src/aaveV2/index.ts

@@ -7,7 +7,7 @@ import {
 import { calculateNetApy, getStETHApr } from '../staking';
 import { ethToWeth, wethToEth, wethToEthByAddress } from '../services/utils';
 import { AaveLoanInfoV2Contract, createContractWrapper } from '../contracts';
-import { calculateBorrowingAssetLimit } from '../moneymarket';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import {
   AaveMarketInfo, AaveV2AssetData, AaveV2AssetsData, AaveV2PositionData, AaveV2UsedAsset, AaveV2UsedAssets,
 } from '../types';
@@ -26,9 +26,9 @@ export const getAaveV2MarketsData = async (web3: Web3, network: NetworkNumber, s
     .map((market, i) => ({
       symbol: selectedMarket.assets[i],
       underlyingTokenAddress: market.underlyingTokenAddress,
-      supplyRate: new Dec(market.supplyRate.toString()).div(1e25).toString(),
-      borrowRate: new Dec(market.borrowRateVariable.toString()).div(1e25).toString(),
-      borrowRateStable: new Dec(market.borrowRateStable.toString()).div(1e25).toString(),
+      supplyRate: aprToApy(new Dec(market.supplyRate.toString()).div(1e25).toString()),
+      borrowRate: aprToApy(new Dec(market.borrowRateVariable.toString()).div(1e25).toString()),
+      borrowRateStable: aprToApy(new Dec(market.borrowRateStable.toString()).div(1e25).toString()),
       collateralFactor: new Dec(market.collateralFactor.toString()).div(10000).toString(),
       liquidationRatio: new Dec(market.liquidationRatio.toString()).div(10000).toString(),
       marketLiquidity: assetAmountInEth(new Dec(market.totalSupply.toString())
@@ -173,7 +173,7 @@ export const getAaveV2AccountData = async (web3: Web3, network: NetworkNumber, a
       suppliedUsd: new Dec(supplied).mul(assetsData[asset].price).toString(),
       isSupplied,
       collateral: enabledAsCollateral,
-      stableBorrowRate: new Dec(tokenInfo.stableBorrowRate).div(1e25).toString(),
+      stableBorrowRate: aprToApy(new Dec(tokenInfo.stableBorrowRate).div(1e25).toString()),
       borrowedStable,
       borrowedVariable,
       borrowedUsdStable: new Dec(borrowedStable).mul(assetsData[asset].price).toString(),

package/src/aaveV3/index.ts

@@ -30,7 +30,7 @@ import { calculateNetApy, getStakingApy, STAKING_ASSETS } from '../staking';
 import { multicall } from '../multicall';
 import { IUiIncentiveDataProviderV3 } from '../types/contracts/generated/AaveUiIncentiveDataProviderV3';
 import { getAssetsBalances } from '../assets';
-import { calculateBorrowingAssetLimit } from '../moneymarket';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import {
   aaveAnyGetAggregatedPositionData,
   aaveV3IsInIsolationMode,
@@ -206,7 +206,6 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
       if (new Dec(marketLiquidity).lt(0)) {
         marketLiquidity = '0';
       }
-
       return ({
         nativeAsset,
         ...addToObjectIf(nativeAsset, {
@@ -225,10 +224,10 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
         isolationModeTotalDebt: new Dec(tokenMarket.isolationModeTotalDebt).div(100).toString(),
         assetId: Number(tokenMarket.assetId),
         underlyingTokenAddress: tokenMarket.underlyingTokenAddress,
-        supplyRate: new Dec(tokenMarket.supplyRate.toString()).div(1e25).toString(),
-        borrowRate: new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).toString(),
-        borrowRateDiscounted: nativeAsset ? new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0',
-        borrowRateStable: new Dec(tokenMarket.borrowRateStable.toString()).div(1e25).toString(),
+        supplyRate: aprToApy(new Dec(tokenMarket.supplyRate.toString()).div(1e25).toString()),
+        borrowRate: aprToApy(new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).toString()),
+        borrowRateDiscounted: aprToApy(nativeAsset ? new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0'),
+        borrowRateStable: aprToApy(new Dec(tokenMarket.borrowRateStable.toString()).div(1e25).toString()),
         collateralFactor: new Dec(tokenMarket.collateralFactor.toString()).div(10000).toString(),
         liquidationRatio: new Dec(tokenMarket.liquidationRatio.toString()).div(10000).toString(),
         marketLiquidity,
@@ -500,8 +499,8 @@ export const getAaveV3AccountData = async (web3: Web3, network: NetworkNumber, a
       suppliedUsd: new Dec(supplied).mul(assetsData[asset].price).toString(),
       isSupplied,
       collateral: enabledAsCollateral,
-      stableBorrowRate: new Dec(tokenInfo.stableBorrowRate).div(1e25).toString(),
-      discountedBorrowRate: new Dec(assetsData[asset].borrowRate).mul(1 - parseFloat(discountRateOnBorrow)).toString(),
+      stableBorrowRate: aprToApy(new Dec(tokenInfo.stableBorrowRate).div(1e25).toString()),
+      discountedBorrowRate: aprToApy(new Dec(assetsData[asset].borrowRate).mul(1 - parseFloat(discountRateOnBorrow)).toString()),
       borrowedStable,
       borrowedVariable,
       borrowedUsdStable: new Dec(borrowedStable).mul(assetsData[asset].price).toString(),

package/src/markets/morphoBlue/index.ts

@@ -230,6 +230,21 @@ export const MORPHO_BLUE_EZETH_ETH = (networkId: NetworkNumber = NetworkNumber.E
   marketId: '0x49bb2d114be9041a787432952927f6f144f05ad3e83196a7d062f374ee11d0ee',
   protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_MKR_USDC = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [1],
+  label: 'Morpho Blue',
+  shortLabel: 'MKR/USDC',
+  value: MorphoBlueVersions.MorphoBlueMKRUSDC,
+  url: 'mkrusdc',
+  loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+  collateralToken: '0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2',
+  oracle: '0x6686788B4315A4F93d822c1Bf73910556FCe2d5a',
+  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+  lltv: 0.77,
+  marketId: '0x97bb820669a19ba5fa6de964a466292edd67957849f9631eb8b830c382f58b7f',
+  protocolName: 'morpho-blue',
+});
 // wstETH/WETH
 export const MORPHO_BLUE_WSTETH_ETH_945 = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
   chainIds: [1],
@@ -434,6 +449,7 @@ export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
   [MorphoBlueVersions.MorphoBlueSUSDeUSDT]: MORPHO_BLUE_SUSDE_USDT(networkId),
   [MorphoBlueVersions.MorphoBlueSDAIEth]: MORPHO_BLUE_SDAI_ETH(networkId),
   [MorphoBlueVersions.MorphoBlueEzEthEth]: MORPHO_BLUE_EZETH_ETH(networkId),
+  [MorphoBlueVersions.MorphoBlueMKRUSDC]: MORPHO_BLUE_MKR_USDC(networkId),
   // wstETH/WETH
   [MorphoBlueVersions.MorphoBlueWstEthEth_945]: MORPHO_BLUE_WSTETH_ETH_945(networkId),
   [MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE(networkId),

package/src/moneymarket/moneymarketCommonService.ts

@@ -73,4 +73,4 @@ export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {
   };
 };
 
-export const aprToApy = (interest: string | number, frequency = BLOCKS_IN_A_YEAR) => ((1 + (+interest / 100) / frequency) ** frequency - 1) * 100; // eslint-disable-line
+export const aprToApy = (interest:string | number, frequency = BLOCKS_IN_A_YEAR) => new Dec(interest).div(100).div(frequency).plus(1).pow(frequency).minus(1).times(100).toString();

package/src/morphoAaveV2/index.ts

@@ -11,7 +11,7 @@ import {
   AavePositionData,
   AaveVersions, MorphoAaveV2AssetData, MorphoAaveV2AssetsData, MorphoAaveV2MarketData, MorphoAaveV2PositionData,
 } from '../types';
-import { calculateBorrowingAssetLimit } from '../moneymarket';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import { EMPTY_AAVE_DATA } from '../aaveV3';
 import { aaveAnyGetAggregatedPositionData } from '../helpers/aaveHelpers';
 import { getEthPrice } from '../services/priceService';
@@ -39,8 +39,8 @@ export const getMorphoAaveV2MarketsData = async (web3: Web3, network: NetworkNum
 
     const morphoReward = morphoRewardsData?.markets?.[aaveInfo.aTokenAddress.toLowerCase()];
 
-    const supplyRateP2P = new Dec(market.p2pSupplyRate).div(1e25).toString();
-    const borrowRateP2P = new Dec(market.p2pBorrowRate).div(1e25).toString();
+    const supplyRateP2P = aprToApy(new Dec(market.p2pSupplyRate).div(1e25).toString());
+    const borrowRateP2P = aprToApy(new Dec(market.p2pBorrowRate).div(1e25).toString());
     const hasDelta = new Dec(borrowRateP2P).minus(supplyRateP2P).gte(0.3);
 
     return {
@@ -51,9 +51,9 @@ export const getMorphoAaveV2MarketsData = async (web3: Web3, network: NetworkNum
       priceInEth: new Dec(aaveInfo.price).div(1e18).toString(),
       price: new Dec(aaveInfo.price).div(1e18).times(ethPrice).toString(),
 
-      supplyRate: new Dec(market.poolSupplyRate).div(1e25).toString(),
+      supplyRate: aprToApy(new Dec(market.poolSupplyRate).div(1e25).toString()),
       supplyRateP2P,
-      borrowRate: new Dec(market.poolBorrowRate).div(1e25).toString(),
+      borrowRate: aprToApy(new Dec(market.poolBorrowRate).div(1e25).toString()),
       borrowRateP2P,
 
       totalSupply: assetAmountInEth(aaveInfo.totalSupply, symbol),
@@ -216,8 +216,8 @@ export const getMorphoAaveV2AccountData = async (web3: Web3, network: NetworkNum
       borrowedUsdVariable: borrowedUsd,
       isSupplied: new Dec(supplied).gt(0),
       isBorrowed: new Dec(borrowed).gt(0),
-      supplyRate: new Dec(market.userSupplyRate).div(1e25).toString(),
-      borrowRate: new Dec(market.userBorrowRate).div(1e25).toString(),
+      supplyRate: aprToApy(new Dec(market.userSupplyRate).div(1e25).toString()),
+      borrowRate: aprToApy(new Dec(market.userBorrowRate).div(1e25).toString()),
       limit: '0',
 
       collateral: true, // Morpho doesn't have all these, keeping it for compatability

package/src/morphoAaveV3/index.ts

@@ -24,7 +24,7 @@ import {
   MorphoAaveV3AssetData, MorphoAaveV3AssetsData, MorphoAaveV3MarketData, MorphoAaveV3MarketInfo, MorphoAaveV3PositionData,
 } from '../types';
 import { getDsrApy } from '../services/dsrService';
-import { calculateBorrowingAssetLimit } from '../moneymarket';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import { EMPTY_AAVE_DATA } from '../aaveV3';
 import { aaveAnyGetAggregatedPositionData } from '../helpers/aaveHelpers';
 import { MORPHO_AAVE_V3_ETH } from '../markets/aave';
@@ -229,9 +229,9 @@ export const getMorphoAaveV3MarketsData = async (web3: Web3, network: NetworkNum
       underlyingTokenAddress: address,
       price: new Dec(marketData.price.toString()).div(1e8).toString(), // is actually price in USD
 
-      supplyRate: new Dec(marketData.supplyRate.toString()).div(1e25).toString(),
+      supplyRate: aprToApy(new Dec(marketData.supplyRate.toString()).div(1e25).toString()),
       supplyRateP2P: marketData.p2pSupplyAPY,
-      borrowRate: new Dec(marketData.borrowRateVariable.toString()).div(1e25).toString(),
+      borrowRate: aprToApy(new Dec(marketData.borrowRateVariable.toString()).div(1e25).toString()),
       borrowRateP2P: marketData.p2pBorrowAPY,
       totalSupply: assetAmountInEth(marketData.totalSupply.toString(), symbol),
       totalBorrow: assetAmountInEth(marketData.totalBorrow.toString(), symbol),
@@ -617,4 +617,4 @@ export const getMorphoAaveV3FullPositionData = async (web3: Web3, network: Netwo
   const marketData = await getMorphoAaveV3MarketsData(web3, network, market, mainnetWeb3);
   const positionData = await getMorphoAaveV3AccountData(web3, network, address, marketData.assetsData, delegator, market);
   return positionData;
-};
+};

package/src/spark/index.ts

@@ -29,7 +29,7 @@ import {
 } from '../types';
 import { multicall } from '../multicall';
 import { sparkGetAggregatedPositionData, sparkIsInIsolationMode } from '../helpers/sparkHelpers';
-import { calculateBorrowingAssetLimit } from '../moneymarket';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import { SPARK_V1 } from '../markets/spark';
 
 export const sparkEmodeCategoriesMapping = (extractedState: { assetsData: SparkAssetsData }, usedAssets: SparkUsedAssets) => {
@@ -110,9 +110,9 @@ export const getSparkMarketsData = async (web3: Web3, network: NetworkNumber, se
         isolationModeTotalDebt: new Dec(market.isolationModeTotalDebt).div(100).toString(),
         assetId: Number(market.assetId),
         underlyingTokenAddress: market.underlyingTokenAddress,
-        supplyRate: new Dec(market.supplyRate.toString()).div(1e25).toString(),
-        borrowRate: new Dec(market.borrowRateVariable.toString()).div(1e25).toString(),
-        borrowRateStable: new Dec(market.borrowRateStable.toString()).div(1e25).toString(),
+        supplyRate: aprToApy(new Dec(market.supplyRate.toString()).div(1e25).toString()),
+        borrowRate: aprToApy(new Dec(market.borrowRateVariable.toString()).div(1e25).toString()),
+        borrowRateStable: aprToApy(new Dec(market.borrowRateStable.toString()).div(1e25).toString()),
         collateralFactor: new Dec(market.collateralFactor.toString()).div(10000).toString(),
         liquidationRatio: new Dec(market.liquidationRatio.toString()).div(10000).toString(),
         marketLiquidity,
@@ -374,7 +374,7 @@ export const getSparkAccountData = async (web3: Web3, network: NetworkNumber, ad
       suppliedUsd: new Dec(supplied).mul(assetsData[asset].price).toString(),
       isSupplied,
       collateral: enabledAsCollateral,
-      stableBorrowRate: new Dec(tokenInfo.stableBorrowRate).div(1e25).toString(),
+      stableBorrowRate: aprToApy(new Dec(tokenInfo.stableBorrowRate).div(1e25).toString()),
       borrowedStable,
       borrowedVariable,
       borrowedUsdStable: new Dec(borrowedStable).mul(assetsData[asset].price).toString(),
@@ -431,4 +431,4 @@ export const getSparkFullPositionData = async (web3: Web3, network: NetworkNumbe
   const marketData = await getSparkMarketsData(web3, network, market, mainnetWeb3);
   const positionData = await getSparkAccountData(web3, network, address, { assetsData: marketData.assetsData, selectedMarket: market });
   return positionData;
-};
+};

package/src/staking/staking.ts

@@ -1,6 +1,5 @@
 import Dec from 'decimal.js';
 import Web3 from 'web3';
-import { StakeWiseSDK, Network } from '@stakewise/v3-sdk';
 import {
   CbEthContract, LidoContract, PotContract, REthContract, wstETHContract,
 } from '../contracts';
@@ -78,25 +77,13 @@ export const getDsrApy = async (web3: Web3, blockNumber: 'latest' | number = 'la
     .toString();
 };
 
-export const getSUSDeApy = async () => {
-  const res = await fetch('https://app.defisaver.com/api/staking/apy?asset=sUSDe');
+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;
-};
-
-const getWeEthApr = async () => {
-  const res = await fetch('https://app.defisaver.com/api/staking/apy?asset=weETH');
-  const data = await res.json();
-  return data.apy;
-};
-
-const getOsETHApy = async () => {
-  const sdk = new StakeWiseSDK({ network: Network.Mainnet });
-  const apy = await sdk.osToken.getAPY();
-  return apy;
-};
+}
 
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH'];
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH'];
 
 export const getStakingApy = (asset: string, web3: Web3, blockNumber: 'latest' | number = 'latest', fromBlock: number | undefined = undefined) => {
   try {
@@ -104,9 +91,10 @@ export const getStakingApy = (asset: string, web3: Web3, blockNumber: 'latest' |
     if (asset === 'cbETH') return getCbETHApr(web3, blockNumber);
     if (asset === 'rETH') return getREthApr(web3, blockNumber);
     if (asset === 'sDAI') return getDsrApy(web3);
-    if (asset === 'sUSDe') return getSUSDeApy();
-    if (asset === 'weETH') return getWeEthApr();
-    if (asset === 'osETH') return getOsETHApy();
+    if (asset === 'sUSDe') return getApyFromDfsApi('sUSDe');
+    if (asset === 'weETH') return getApyFromDfsApi('weETH');
+    if (asset === 'ezETH') return getApyFromDfsApi('ezETH')
+    if (asset === 'osETH') return getApyFromDfsApi('osETH');
   } catch (e) {
     console.error(`Failed to fetch APY for ${asset}`);
     return '0';

package/src/types/morphoBlue.ts

@@ -17,6 +17,7 @@ export enum MorphoBlueVersions {
   MorphoBlueSUSDeUSDT = 'morphobluesusdeusdt', // sUSDe/USDT
   MorphoBlueSDAIEth = 'morphobluesdaieth', // sDAI/ETH
   MorphoBlueEzEthEth = 'morphoblueezetheth', // ezETH/ETH
+  MorphoBlueMKRUSDC = 'morphobluemkrusdc', // MKR/USDC
   // wstETH/WETH
   MorphoBlueWstEthEth_945 = 'morphobluewstetheth_945',
   MorphoBlueWstEthEth_945_Exchange_Rate = 'morphobluewstetheth_945_exchange_rate',