@defisaver/positions-sdk 0.0.84 → 0.0.86

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

@@ -35,11 +35,17 @@ export enum MorphoBlueVersions {
 
   // BASE
   MorphoBlueCbEthUSDC_860_Base = 'morphobluecbethusdc_860_base',
+  MorphoBlueWstEthEth_945_Base = 'morphobluewstetheth_945_base',
+  MorphoBlueWstEthEth_965_Base = 'morphobluewstetheth_965_base',
+  MorphoBlueWstEthUSDC_860_Base = 'morphobluewstethusdc_860_base',
+  MorphoBlueCbEthEth_965_Base = 'morphobluecbetheth_965_base',
+  MorphoBlueEthUSDC_860_Base = 'morphoblueethusdc_860_base',
 }
 
 export enum MorphoBlueOracleType {
   MARKET_RATE = 'Market rate',
   LIDO_RATE = 'Lido rate',
+  ETHENA_RATE = 'Ethena rate',
 }
 
 export interface MorphoBlueMarketData {