@defisaver/positions-sdk 2.0.15-dev-3 → 2.0.15-dev-4

package/cjs/compoundV3/index.js

@@ -60,7 +60,7 @@ const _getCompoundV3MarketsData = (provider, network, selectedMarket, defaultPro
     }
     const base = (0, compoundHelpers_1.formatBaseData)(baseTokenInfo, network, baseAssetPrice);
     const payload = {};
-    const baseObj = Object.assign(Object.assign({}, base), (0, compoundHelpers_1.getIncentiveApys)(base, compPrice));
+    const baseObj = Object.assign(Object.assign({}, base), (yield (0, compoundHelpers_1.getIncentiveApys)(base, compPrice)));
     const allAssets = [baseObj, ...colls];
     allAssets
         .sort((a, b) => {

package/cjs/helpers/compoundHelpers/index.d.ts

@@ -2,10 +2,10 @@ import { BaseAdditionalAssetData, CompoundAggregatedPositionData, CompoundMarket
 import { EthAddress, EthereumProvider, IncentiveData, NetworkNumber } from '../../types/common';
 export declare const formatMarketData: (data: any, network: NetworkNumber, baseAssetPrice: string) => CompoundV3AssetData;
 export declare const formatBaseData: (data: any, network: NetworkNumber, baseAssetPrice: string) => CompoundV3AssetData & BaseAdditionalAssetData;
-export declare const getIncentiveApys: (baseData: CompoundV3AssetData & BaseAdditionalAssetData, compPrice: string) => {
+export declare const getIncentiveApys: (baseData: CompoundV3AssetData & BaseAdditionalAssetData, compPrice: string) => Promise<{
     supplyIncentives: IncentiveData[];
     borrowIncentives: IncentiveData[];
-};
+}>;
 export declare const getCompoundV2AggregatedData: ({ usedAssets, assetsData, ...rest }: {
     usedAssets: CompoundV2UsedAssets;
     assetsData: CompoundV2AssetsData;

package/cjs/helpers/compoundHelpers/index.js

@@ -53,19 +53,28 @@ const formatBaseData = (data, network, baseAssetPrice) => {
         totalBorrow, marketLiquidity: new decimal_js_1.default(totalSupply).minus(totalBorrow).toString(), symbol: (0, utils_1.wethToEth)(assetInfo.symbol), priceInBaseAsset: (0, utils_1.getEthAmountForDecimals)(data.price, 8), price: baseAssetPrice, collateralFactor: '0', liquidationRatio: '0', canBeBorrowed: true, canBeSupplied: true, supplyCap: '0', rewardSupplySpeed: (0, utils_1.getEthAmountForDecimals)(data.baseTrackingSupplyRewardsSpeed, 15), rewardBorrowSpeed: (0, utils_1.getEthAmountForDecimals)(data.baseTrackingBorrowRewardsSpeed, 15), minDebt: (0, utils_1.getEthAmountForDecimals)(data.baseBorrowMin, assetInfo.decimals), isBase: true }));
 };
 exports.formatBaseData = formatBaseData;
-const getIncentiveApys = (baseData, compPrice) => ({
-    supplyIncentives: [{
-            token: 'COMP',
-            apy: (0, moneymarket_1.aprToApy)((100 * constants_1.SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.price / +baseData.totalSupply).toString(),
-            incentiveKind: common_1.IncentiveKind.Reward,
-            description: 'Eligible for protocol-level COMP incentives.',
-        }],
-    borrowIncentives: [{
-            token: 'COMP',
-            apy: (0, moneymarket_1.aprToApy)((100 * constants_1.SECONDS_PER_YEAR * +baseData.rewardBorrowSpeed * +compPrice) / +baseData.price / +baseData.totalBorrow).toString(),
-            incentiveKind: common_1.IncentiveKind.Reward,
-            description: 'Eligible for protocol-level COMP incentives.',
-        }],
+const getIncentiveApys = (baseData, compPrice) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({
+        supplyIncentives: [{
+                token: 'COMP',
+                apy: (0, moneymarket_1.aprToApy)((100 * constants_1.SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.price / +baseData.totalSupply).toString(),
+                incentiveKind: common_1.IncentiveKind.Reward,
+                description: 'Eligible for protocol-level COMP incentives.',
+            },
+            ...(0, utils_1.addToArrayIf)(staking_1.STAKING_ASSETS.includes(baseData.symbol), {
+                apy: yield (0, staking_1.getStakingApy)(baseData.symbol),
+                token: baseData.symbol,
+                incentiveKind: common_1.IncentiveKind.Staking,
+                description: `Native ${baseData.symbol} yield.`,
+            }),
+        ],
+        borrowIncentives: [Object.assign({ token: 'COMP', apy: (0, moneymarket_1.aprToApy)((100 * constants_1.SECONDS_PER_YEAR * +baseData.rewardBorrowSpeed * +compPrice) / +baseData.price / +baseData.totalBorrow).toString(), incentiveKind: common_1.IncentiveKind.Reward, description: 'Eligible for protocol-level COMP incentives.' }, (0, utils_1.addToArrayIf)(staking_1.STAKING_ASSETS.includes(baseData.symbol), {
+                apy: new decimal_js_1.default(yield (0, staking_1.getStakingApy)(baseData.symbol)).mul(-1).toString(),
+                token: baseData.symbol,
+                incentiveKind: common_1.IncentiveKind.Staking,
+                description: `Native ${baseData.symbol} yield.`,
+            }))],
+    });
 });
 exports.getIncentiveApys = getIncentiveApys;
 const getCompoundV2AggregatedData = (_a) => {

package/esm/compoundV3/index.js

@@ -54,7 +54,7 @@ export const _getCompoundV3MarketsData = (provider, network, selectedMarket, def
     }
     const base = formatBaseData(baseTokenInfo, network, baseAssetPrice);
     const payload = {};
-    const baseObj = Object.assign(Object.assign({}, base), getIncentiveApys(base, compPrice));
+    const baseObj = Object.assign(Object.assign({}, base), (yield getIncentiveApys(base, compPrice)));
     const allAssets = [baseObj, ...colls];
     allAssets
         .sort((a, b) => {

package/esm/helpers/compoundHelpers/index.d.ts

@@ -2,10 +2,10 @@ import { BaseAdditionalAssetData, CompoundAggregatedPositionData, CompoundMarket
 import { EthAddress, EthereumProvider, IncentiveData, NetworkNumber } from '../../types/common';
 export declare const formatMarketData: (data: any, network: NetworkNumber, baseAssetPrice: string) => CompoundV3AssetData;
 export declare const formatBaseData: (data: any, network: NetworkNumber, baseAssetPrice: string) => CompoundV3AssetData & BaseAdditionalAssetData;
-export declare const getIncentiveApys: (baseData: CompoundV3AssetData & BaseAdditionalAssetData, compPrice: string) => {
+export declare const getIncentiveApys: (baseData: CompoundV3AssetData & BaseAdditionalAssetData, compPrice: string) => Promise<{
     supplyIncentives: IncentiveData[];
     borrowIncentives: IncentiveData[];
-};
+}>;
 export declare const getCompoundV2AggregatedData: ({ usedAssets, assetsData, ...rest }: {
     usedAssets: CompoundV2UsedAssets;
     assetsData: CompoundV2AssetsData;

package/esm/helpers/compoundHelpers/index.js

@@ -21,10 +21,10 @@ var __rest = (this && this.__rest) || function (s, e) {
 import Dec from 'decimal.js';
 import { assetAmountInWei, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { CompoundVersions, } from '../../types';
-import { getEthAmountForDecimals, handleWbtcLegacy, wethToEth } from '../../services/utils';
+import { addToArrayIf, getEthAmountForDecimals, handleWbtcLegacy, wethToEth, } from '../../services/utils';
 import { BLOCKS_IN_A_YEAR, borrowOperations, SECONDS_PER_YEAR } from '../../constants';
 import { aprToApy, calcLeverageLiqPrice, calculateBorrowingAssetLimit, getAssetsTotal, isLeveragedPos, } from '../../moneymarket';
-import { calculateNetApy } from '../../staking';
+import { calculateNetApy, getStakingApy, STAKING_ASSETS } from '../../staking';
 import { IncentiveKind, NetworkNumber, } from '../../types/common';
 import { CompoundLoanInfoContractViem, CompV3ViewContractViem } from '../../contracts';
 import { getViemProvider } from '../../services/viem';
@@ -45,19 +45,28 @@ export const formatBaseData = (data, network, baseAssetPrice) => {
         totalSupply,
         totalBorrow, marketLiquidity: new Dec(totalSupply).minus(totalBorrow).toString(), symbol: wethToEth(assetInfo.symbol), priceInBaseAsset: getEthAmountForDecimals(data.price, 8), price: baseAssetPrice, collateralFactor: '0', liquidationRatio: '0', canBeBorrowed: true, canBeSupplied: true, supplyCap: '0', rewardSupplySpeed: getEthAmountForDecimals(data.baseTrackingSupplyRewardsSpeed, 15), rewardBorrowSpeed: getEthAmountForDecimals(data.baseTrackingBorrowRewardsSpeed, 15), minDebt: getEthAmountForDecimals(data.baseBorrowMin, assetInfo.decimals), isBase: true }));
 };
-export const getIncentiveApys = (baseData, compPrice) => ({
-    supplyIncentives: [{
-            token: 'COMP',
-            apy: aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.price / +baseData.totalSupply).toString(),
-            incentiveKind: IncentiveKind.Reward,
-            description: 'Eligible for protocol-level COMP incentives.',
-        }],
-    borrowIncentives: [{
-            token: 'COMP',
-            apy: aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardBorrowSpeed * +compPrice) / +baseData.price / +baseData.totalBorrow).toString(),
-            incentiveKind: IncentiveKind.Reward,
-            description: 'Eligible for protocol-level COMP incentives.',
-        }],
+export const getIncentiveApys = (baseData, compPrice) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({
+        supplyIncentives: [{
+                token: 'COMP',
+                apy: aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.price / +baseData.totalSupply).toString(),
+                incentiveKind: IncentiveKind.Reward,
+                description: 'Eligible for protocol-level COMP incentives.',
+            },
+            ...addToArrayIf(STAKING_ASSETS.includes(baseData.symbol), {
+                apy: yield getStakingApy(baseData.symbol),
+                token: baseData.symbol,
+                incentiveKind: IncentiveKind.Staking,
+                description: `Native ${baseData.symbol} yield.`,
+            }),
+        ],
+        borrowIncentives: [Object.assign({ token: 'COMP', apy: aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardBorrowSpeed * +compPrice) / +baseData.price / +baseData.totalBorrow).toString(), incentiveKind: IncentiveKind.Reward, description: 'Eligible for protocol-level COMP incentives.' }, addToArrayIf(STAKING_ASSETS.includes(baseData.symbol), {
+                apy: new Dec(yield getStakingApy(baseData.symbol)).mul(-1).toString(),
+                token: baseData.symbol,
+                incentiveKind: IncentiveKind.Staking,
+                description: `Native ${baseData.symbol} yield.`,
+            }))],
+    });
 });
 export const getCompoundV2AggregatedData = (_a) => {
     var { usedAssets, assetsData } = _a, rest = __rest(_a, ["usedAssets", "assetsData"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.0.15-dev-3",
+  "version": "2.0.15-dev-4",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/compoundV3/index.ts

@@ -70,7 +70,7 @@ export const _getCompoundV3MarketsData = async (provider: Client, network: Netwo
 
   const payload: CompoundV3AssetsData = {};
 
-  const baseObj = { ...base, ...getIncentiveApys(base, compPrice) };
+  const baseObj = { ...base, ...(await getIncentiveApys(base, compPrice)) };
   const allAssets = [baseObj, ...colls];
 
   allAssets

package/src/helpers/compoundHelpers/index.ts

@@ -3,12 +3,14 @@ import { assetAmountInWei, getAssetInfo, getAssetInfoByAddress } from '@defisave
 import {
   BaseAdditionalAssetData, CompoundAggregatedPositionData, CompoundMarketData, CompoundV2AssetsData, CompoundV2UsedAssets, CompoundV3AssetData, CompoundV3AssetsData, CompoundV3UsedAssets, CompoundVersions,
 } from '../../types';
-import { getEthAmountForDecimals, handleWbtcLegacy, wethToEth } from '../../services/utils';
+import {
+  addToArrayIf, getEthAmountForDecimals, handleWbtcLegacy, wethToEth,
+} from '../../services/utils';
 import { BLOCKS_IN_A_YEAR, borrowOperations, SECONDS_PER_YEAR } from '../../constants';
 import {
   aprToApy, calcLeverageLiqPrice, calculateBorrowingAssetLimit, getAssetsTotal, isLeveragedPos,
 } from '../../moneymarket';
-import { calculateNetApy } from '../../staking';
+import { calculateNetApy, getStakingApy, STAKING_ASSETS } from '../../staking';
 import {
   EthAddress, EthereumProvider, IncentiveData, IncentiveKind, NetworkNumber,
 } from '../../types/common';
@@ -78,24 +80,37 @@ export const formatBaseData = (data: any, network: NetworkNumber, baseAssetPrice
   });
 };
 
-export const getIncentiveApys = (
+export const getIncentiveApys = async (
   baseData: CompoundV3AssetData & BaseAdditionalAssetData,
   compPrice: string,
-): {
+): Promise<{
   supplyIncentives: IncentiveData[],
   borrowIncentives: IncentiveData[],
-} => ({
+}> => ({
   supplyIncentives: [{
     token: 'COMP',
     apy: aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.price / +baseData.totalSupply).toString(),
     incentiveKind: IncentiveKind.Reward,
     description: 'Eligible for protocol-level COMP incentives.',
-  }],
+  },
+  ...addToArrayIf(STAKING_ASSETS.includes(baseData.symbol), {
+    apy: await getStakingApy(baseData.symbol),
+    token: baseData.symbol,
+    incentiveKind: IncentiveKind.Staking,
+    description: `Native ${baseData.symbol} yield.`,
+  }),
+  ],
   borrowIncentives: [{
     token: 'COMP',
     apy: aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardBorrowSpeed * +compPrice) / +baseData.price / +baseData.totalBorrow).toString(),
     incentiveKind: IncentiveKind.Reward,
     description: 'Eligible for protocol-level COMP incentives.',
+    ...addToArrayIf(STAKING_ASSETS.includes(baseData.symbol), {
+      apy: new Dec(await getStakingApy(baseData.symbol)).mul(-1).toString(),
+      token: baseData.symbol,
+      incentiveKind: IncentiveKind.Staking,
+      description: `Native ${baseData.symbol} yield.`,
+    }),
   }],
 });