@defisaver/positions-sdk 0.0.166 → 0.0.168

package/src/spark/index.ts

@@ -151,6 +151,14 @@ export const getSparkMarketsData = async (web3: Web3, network: NetworkNumber, se
     if (STAKING_ASSETS.includes(market.symbol)) {
       market.incentiveSupplyApy = await getStakingApy(market.symbol, mainnetWeb3);
       market.incentiveSupplyToken = market.symbol;
+      if (!market.supplyIncentives) {
+        market.supplyIncentives = [];
+      }
+
+      market.supplyIncentives.push({
+        apy: market.incentiveSupplyApy || '0',
+        token: market.symbol,
+      });
     }
 
     if (market.symbol === 'sDAI') {
@@ -159,37 +167,66 @@ export const getSparkMarketsData = async (web3: Web3, network: NetworkNumber, se
     }
 
     if (market.canBeBorrowed && market.incentiveSupplyApy) {
-      market.incentiveBorrowApy = `-${market.incentiveSupplyApy}`;
+      market.incentiveBorrowApy = market.incentiveSupplyApy;
       market.incentiveBorrowToken = market.incentiveSupplyToken;
+      if (!market.borrowIncentives) {
+        market.borrowIncentives = [];
+      }
+      market.borrowIncentives.push({
+        apy: market.incentiveBorrowApy,
+        token: market.incentiveBorrowToken!!,
+      });
     }
 
     if (!rewardForMarket) return;
-    const supplyRewardData = rewardForMarket.aIncentiveData.rewardsTokenInformation[0];
-    if (supplyRewardData) {
-      if (supplyRewardData.emissionEndTimestamp * 1000 < Date.now()) return;
-      market.incentiveSupplyToken = supplyRewardData.rewardTokenSymbol;
-      const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
-      const supplyRewardPrice = new Dec(supplyRewardData.rewardPriceFeed).div(10 ** supplyRewardData.priceFeedDecimals).toString();
-      market.incentiveSupplyApy = new Dec(supplyEmissionPerSecond).div((10 ** supplyRewardData.rewardTokenDecimals) / 100)
-        .mul(365 * 24 * 3600)
-        .mul(supplyRewardPrice)
-        .div(market.price)
-        .div(market.totalSupply)
-        .toString();
-    }
-    const borrowRewardData = rewardForMarket.vIncentiveData.rewardsTokenInformation[0];
-    if (borrowRewardData) {
-      if (borrowRewardData.emissionEndTimestamp * 1000 < Date.now()) return;
-      market.incentiveBorrowToken = borrowRewardData.rewardTokenSymbol;
-      const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
-      const supplyRewardPrice = new Dec(borrowRewardData.rewardPriceFeed).div(10 ** borrowRewardData.priceFeedDecimals).toString();
-      market.incentiveBorrowApy = new Dec(supplyEmissionPerSecond).div((10 ** borrowRewardData.rewardTokenDecimals) / 100)
-        .mul(365 * 24 * 3600)
-        .mul(supplyRewardPrice)
-        .div(market.price)
-        .div(market.totalBorrowVar)
-        .toString();
-    }
+    (rewardForMarket.aIncentiveData.rewardsTokenInformation as any[]).forEach(supplyRewardData => {
+      if (supplyRewardData) {
+        if (supplyRewardData.emissionEndTimestamp * 1000 < Date.now()) return;
+        market.incentiveSupplyToken = supplyRewardData.rewardTokenSymbol;
+        const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
+        const supplyRewardPrice = new Dec(supplyRewardData.rewardPriceFeed).div(10 ** supplyRewardData.priceFeedDecimals)
+          .toString();
+        const rewardApy = new Dec(supplyEmissionPerSecond).div((10 ** supplyRewardData.rewardTokenDecimals) / 100)
+          .mul(365 * 24 * 3600)
+          .mul(supplyRewardPrice)
+          .div(market.price)
+          .div(market.totalSupply)
+          .toString();
+        market.incentiveSupplyApy = new Dec(market.incentiveSupplyApy || '0').add(rewardApy).toString();
+
+        if (!market.supplyIncentives) {
+          market.supplyIncentives = [];
+        }
+        market.supplyIncentives.push({
+          token: supplyRewardData.rewardTokenSymbol,
+          apy: rewardApy,
+        });
+      }
+    });
+    (rewardForMarket.vIncentiveData.rewardsTokenInformation as any[]).forEach(borrowRewardData => {
+      if (borrowRewardData) {
+        if (borrowRewardData.emissionEndTimestamp * 1000 < Date.now()) return;
+        market.incentiveBorrowToken = borrowRewardData.rewardTokenSymbol;
+        const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
+        const supplyRewardPrice = new Dec(borrowRewardData.rewardPriceFeed).div(10 ** borrowRewardData.priceFeedDecimals)
+          .toString();
+        const rewardApy = new Dec(supplyEmissionPerSecond).div((10 ** borrowRewardData.rewardTokenDecimals) / 100)
+          .mul(365 * 24 * 3600)
+          .mul(supplyRewardPrice)
+          .div(market.price)
+          .div(market.totalBorrowVar)
+          .toString();
+        market.incentiveBorrowApy = new Dec(market.incentiveBorrowApy || '0').add(rewardApy).toString();
+
+        if (!market.borrowIncentives) {
+          market.borrowIncentives = [];
+        }
+        market.borrowIncentives.push({
+          token: borrowRewardData.rewardTokenSymbol,
+          apy: rewardApy,
+        });
+      }
+    });
     /* eslint-enable no-param-reassign */
   }));
 

package/src/staking/staking.ts

@@ -7,9 +7,10 @@ import { MMAssetsData, MMUsedAssets, NetworkNumber } from '../types/common';
 import { ContractEventLog } from '../types/contracts/generated/types';
 import { BLOCKS_IN_A_YEAR, SECONDS_PER_YEAR, AVG_BLOCK_TIME } from '../constants';
 import { multicall } from '../multicall';
+import { aprToApy } from '../moneymarket';
 
 
-export const getStETHApr = async (web3: Web3, fromBlock = 17900000, blockNumber: 'latest' | number = 'latest') => {
+export const getStETHApy = async (web3: Web3, fromBlock = 17900000, blockNumber: 'latest' | number = 'latest') => {
   try {
     const tokenRebasedEvents: ContractEventLog<{ [key: string]: any }>[] = await LidoContract(web3, NetworkNumber.Eth).getPastEvents('TokenRebased', { fromBlock, toBlock: blockNumber });
     tokenRebasedEvents.sort((a, b) => b.blockNumber - a.blockNumber); // sort from highest to lowest block number
@@ -21,17 +22,16 @@ export const getStETHApr = async (web3: Web3, fromBlock = 17900000, blockNumber:
         .div(event.timeElapsed.toString()).mul(100)
         .toNumber();
     });
-    return aprs.reduce((a, b) => a + b, 0) / aprs.length;
+    return aprToApy(aprs.reduce((a, b) => a + b, 0) / aprs.length);
   } catch (e) {
     console.warn('Failed to fetch stETH APY from events, falling back to Lido API');
     const res = await fetch('https://eth-api.lido.fi/v1/protocol/steth/apr/sma');
     const data = await res.json();
-    return data.data.smaApr;
+    return aprToApy(data.data.smaApr);
   }
 };
 
-
-export const getCbETHApr = async (web3: Web3, blockNumber: 'latest' | number = 'latest') => {
+export const getCbETHApy = async (web3: Web3, blockNumber: 'latest' | number = 'latest') => {
   let currentBlock = blockNumber;
   if (blockNumber === 'latest') currentBlock = await web3.eth.getBlockNumber();
   const blockDiff = 6 * 24 * 60 * 60 / AVG_BLOCK_TIME;
@@ -45,11 +45,11 @@ export const getCbETHApr = async (web3: Web3, blockNumber: 'latest' | number = '
     .mul(BLOCKS_IN_A_YEAR / blockDiff)
     .mul(100)
     .toString();
-  return apr;
+  return aprToApy(apr);
 };
 
 
-export const getREthApr = async (web3: Web3, blockNumber: 'latest' | number = 'latest') => {
+export const getREthApy = async (web3: Web3, blockNumber: 'latest' | number = 'latest') => {
   let currentBlock = blockNumber;
   if (blockNumber === 'latest') currentBlock = await web3.eth.getBlockNumber();
   const blockDiff = 8 * 24 * 60 * 60 / AVG_BLOCK_TIME;
@@ -64,7 +64,7 @@ export const getREthApr = async (web3: Web3, blockNumber: 'latest' | number = 'l
     .mul(100)
     .toString();
 
-  return apr;
+  return aprToApy(apr);
 };
 
 export const getDsrApy = async (web3: Web3, blockNumber: 'latest' | number = 'latest') => {
@@ -84,7 +84,6 @@ export const getSsrApy = async () => {
 };
 
 const getSuperOETHApy = async () => {
-  console.log('getSuperOETHApy');
   const res = await fetch('https://origin.squids.live/origin-squid/graphql', {
     method: 'POST',
     headers: {
@@ -106,17 +105,20 @@ const getSuperOETHApy = async () => {
 const getApyFromDfsApi = async (asset: string) => {
   const res = await fetch(`https://app.defisaver.com/api/staking/apy?asset=${asset}`);
   const data = await res.json();
+  // if our server returns apr, transform it into apy
+  if (['weETH'].includes(asset)) {
+    return aprToApy(data.apy);
+  }
   return data.apy;
 };
 
 export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
 
 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);
-    if (asset === 'rETH') return getREthApr(web3, blockNumber);
+    if (asset === 'stETH' || asset === 'wstETH') return getStETHApy(web3, fromBlock, blockNumber);
+    if (asset === 'cbETH') return getCbETHApy(web3, blockNumber);
+    if (asset === 'rETH') return getREthApy(web3, blockNumber);
     if (asset === 'sDAI') return getDsrApy(web3);
     if (asset === 'sUSDe') return getApyFromDfsApi('sUSDe');
     if (asset === 'weETH') return getApyFromDfsApi('weETH');

package/src/types/aave.ts

@@ -84,6 +84,11 @@ export interface AaveV2AssetData extends AaveAssetData {
 export interface MorphoAaveV2AssetData extends AaveV2AssetData {
 }
 
+export interface IncentiveData {
+  token: string,
+  apy: string,
+}
+
 export interface AaveV3AssetData extends AaveAssetData {
   isIsolated: boolean,
   isSiloed: boolean,
@@ -99,6 +104,8 @@ export interface AaveV3AssetData extends AaveAssetData {
   isPaused: boolean,
   isFlashLoanEnabled: boolean,
   assetId: string | null,
+  supplyIncentives?: IncentiveData[];
+  borrowIncentives?: IncentiveData[];
 }
 
 export type EModeCategoriesData = Record<number, EModeCategoryData>;

package/src/types/spark.ts

@@ -1,6 +1,7 @@
 import {
   MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
 } from './common';
+import { IncentiveData } from './aave';
 
 export enum SparkVersions {
   SparkV1 = 'v1default',
@@ -55,6 +56,8 @@ export interface SparkAssetData extends MMAssetData {
   eModeCategory: number,
   eModeCategoryData: SparkEModeCategoryData,
   liquidationRatio: string,
+  supplyIncentives?: IncentiveData[];
+  borrowIncentives?: IncentiveData[];
 }
 
 export interface SparkAssetsData {
@@ -125,4 +128,4 @@ export interface SparkPositionData extends MMPositionData {
   isInIsolationMode: boolean,
   isInSiloedMode: boolean,
   eModeCategories: { [key: number]: SparkEModeCategoryDataMapping },
-}
+}