@defisaver/positions-sdk 1.0.2-dev → 1.0.2

package/cjs/curveUsd/index.js

@@ -79,11 +79,6 @@ const getCurveUsdGlobalData = (web3, network, selectedMarket) => __awaiter(void
             abiItem: contract.options.jsonInterface.find(({ name }) => name === 'globalData'),
             params: [selectedMarket.controllerAddress],
         },
-        {
-            target: selectedMarket.controllerAddress,
-            abiItem: (0, utils_1.getAbiItem)((0, contracts_1.getConfigContractAbi)('crvUSDwstETHController'), 'loan_discount'),
-            params: [],
-        },
     ];
     const multiRes = yield (0, multicall_1.multicall)(multicallData, web3, network);
     const data = multiRes[2][0];
@@ -101,12 +96,10 @@ const getCurveUsdGlobalData = (web3, network, selectedMarket) => __awaiter(void
         .toString();
     const bandsData = yield getAndFormatBands(web3, network, selectedMarket, data.minBand, data.maxBand);
     const leftToBorrow = new decimal_js_1.default(debtCeiling).minus(totalDebt).toString();
-    const loanDiscount = (0, tokens_1.assetAmountInEth)(multiRes[3][0], debtAsset);
     return Object.assign(Object.assign({}, data), { debtCeiling,
         totalDebt,
         ammPrice, oraclePrice: (0, tokens_1.assetAmountInEth)(data.oraclePrice, debtAsset), basePrice: (0, tokens_1.assetAmountInEth)(data.basePrice, debtAsset), minted: (0, tokens_1.assetAmountInEth)(data.minted, debtAsset), redeemed: (0, tokens_1.assetAmountInEth)(data.redeemed, debtAsset), borrowRate,
-        futureBorrowRate, bands: bandsData, leftToBorrow,
-        loanDiscount });
+        futureBorrowRate, bands: bandsData, leftToBorrow });
 });
 exports.getCurveUsdGlobalData = getCurveUsdGlobalData;
 const getStatusForUser = (bandRange, activeBand, crvUSDSupplied, collSupplied, healthPercent) => {

package/cjs/fluid/index.js

@@ -97,6 +97,10 @@ const parseMarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0,
         supplyRate: '0',
         borrowRate,
     };
+    if (staking_1.STAKING_ASSETS.includes(debtAssetData.symbol)) {
+        debtAssetData.incentiveBorrowApy = yield (0, staking_1.getStakingApy)(debtAsset.symbol, mainnetWeb3);
+        debtAssetData.incentiveBorrowToken = debtAsset.symbol;
+    }
     const assetsData = {
         [collAsset.symbol]: collAssetData,
         [debtAsset.symbol]: debtAssetData,

package/cjs/types/curveUsd.d.ts

@@ -59,7 +59,6 @@ export interface CrvUSDGlobalMarketData {
     futureBorrowRate: string;
     leftToBorrow: string;
     bands: BandData[];
-    loanDiscount: string;
 }
 export interface CrvUSDAggregatedPositionData {
     ratio: string;

package/cjs/types/fluid.d.ts

@@ -159,6 +159,8 @@ export interface FluidAssetData {
     price: string;
     incentiveSupplyApy?: string;
     incentiveSupplyToken?: string;
+    incentiveBorrowApy?: string;
+    incentiveBorrowToken?: string;
     totalSupply: string;
     totalBorrow: string;
     canBeSupplied: boolean;

package/esm/curveUsd/index.js

@@ -12,10 +12,10 @@ import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
 import { CrvUSDStatus, } from '../types';
 import { multicall } from '../multicall';
 import { NetworkNumber, } from '../types/common';
-import { CrvUSDFactoryContract, CrvUSDViewContract, getConfigContractAbi } from '../contracts';
+import { CrvUSDFactoryContract, CrvUSDViewContract } from '../contracts';
 import { getCrvUsdAggregatedData } from '../helpers/curveUsdHelpers';
 import { CrvUsdMarkets } from '../markets';
-import { getAbiItem, wethToEth } from '../services/utils';
+import { wethToEth } from '../services/utils';
 const getAndFormatBands = (web3, network, selectedMarket, _minBand, _maxBand) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = CrvUSDViewContract(web3, network);
     const minBand = parseInt(_minBand, 10);
@@ -73,11 +73,6 @@ export const getCurveUsdGlobalData = (web3, network, selectedMarket) => __awaite
             abiItem: contract.options.jsonInterface.find(({ name }) => name === 'globalData'),
             params: [selectedMarket.controllerAddress],
         },
-        {
-            target: selectedMarket.controllerAddress,
-            abiItem: getAbiItem(getConfigContractAbi('crvUSDwstETHController'), 'loan_discount'),
-            params: [],
-        },
     ];
     const multiRes = yield multicall(multicallData, web3, network);
     const data = multiRes[2][0];
@@ -95,12 +90,10 @@ export const getCurveUsdGlobalData = (web3, network, selectedMarket) => __awaite
         .toString();
     const bandsData = yield getAndFormatBands(web3, network, selectedMarket, data.minBand, data.maxBand);
     const leftToBorrow = new Dec(debtCeiling).minus(totalDebt).toString();
-    const loanDiscount = assetAmountInEth(multiRes[3][0], debtAsset);
     return Object.assign(Object.assign({}, data), { debtCeiling,
         totalDebt,
         ammPrice, oraclePrice: assetAmountInEth(data.oraclePrice, debtAsset), basePrice: assetAmountInEth(data.basePrice, debtAsset), minted: assetAmountInEth(data.minted, debtAsset), redeemed: assetAmountInEth(data.redeemed, debtAsset), borrowRate,
-        futureBorrowRate, bands: bandsData, leftToBorrow,
-        loanDiscount });
+        futureBorrowRate, bands: bandsData, leftToBorrow });
 });
 const getStatusForUser = (bandRange, activeBand, crvUSDSupplied, collSupplied, healthPercent) => {
     // if bands are equal, that can only be [0,0] which means user doesn't have loan (min number of bands is 4)

package/esm/fluid/index.js

@@ -91,6 +91,10 @@ const parseMarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0,
         supplyRate: '0',
         borrowRate,
     };
+    if (STAKING_ASSETS.includes(debtAssetData.symbol)) {
+        debtAssetData.incentiveBorrowApy = yield getStakingApy(debtAsset.symbol, mainnetWeb3);
+        debtAssetData.incentiveBorrowToken = debtAsset.symbol;
+    }
     const assetsData = {
         [collAsset.symbol]: collAssetData,
         [debtAsset.symbol]: debtAssetData,

package/esm/types/curveUsd.d.ts

@@ -59,7 +59,6 @@ export interface CrvUSDGlobalMarketData {
     futureBorrowRate: string;
     leftToBorrow: string;
     bands: BandData[];
-    loanDiscount: string;
 }
 export interface CrvUSDAggregatedPositionData {
     ratio: string;

package/esm/types/fluid.d.ts

@@ -159,6 +159,8 @@ export interface FluidAssetData {
     price: string;
     incentiveSupplyApy?: string;
     incentiveSupplyToken?: string;
+    incentiveBorrowApy?: string;
+    incentiveBorrowToken?: string;
     totalSupply: string;
     totalBorrow: string;
     canBeSupplied: boolean;

package/package.json

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

package/src/curveUsd/index.ts

@@ -8,10 +8,10 @@ import { multicall } from '../multicall';
 import {
   Blockish, EthAddress, NetworkNumber, PositionBalances,
 } from '../types/common';
-import { CrvUSDFactoryContract, CrvUSDViewContract, getConfigContractAbi } from '../contracts';
+import { CrvUSDFactoryContract, CrvUSDViewContract } from '../contracts';
 import { getCrvUsdAggregatedData } from '../helpers/curveUsdHelpers';
 import { CrvUsdMarkets } from '../markets';
-import { getAbiItem, wethToEth } from '../services/utils';
+import { wethToEth } from '../services/utils';
 
 const getAndFormatBands = async (web3: Web3, network: NetworkNumber, selectedMarket: CrvUSDMarketData, _minBand: string, _maxBand: string) => {
   const contract = CrvUSDViewContract(web3, network);
@@ -73,11 +73,6 @@ export const getCurveUsdGlobalData = async (web3: Web3, network: NetworkNumber,
       abiItem: contract.options.jsonInterface.find(({ name }) => name === 'globalData'),
       params: [selectedMarket.controllerAddress],
     },
-    {
-      target: selectedMarket.controllerAddress,
-      abiItem: getAbiItem(getConfigContractAbi('crvUSDwstETHController'), 'loan_discount'),
-      params: [],
-    },
   ];
   const multiRes = await multicall(multicallData, web3, network);
   const data = multiRes[2][0];
@@ -100,9 +95,6 @@ export const getCurveUsdGlobalData = async (web3: Web3, network: NetworkNumber,
   const bandsData = await getAndFormatBands(web3, network, selectedMarket, data.minBand, data.maxBand);
 
   const leftToBorrow = new Dec(debtCeiling).minus(totalDebt).toString();
-
-  const loanDiscount = assetAmountInEth(multiRes[3][0], debtAsset);
-
   return {
     ...data,
     debtCeiling,
@@ -116,7 +108,6 @@ export const getCurveUsdGlobalData = async (web3: Web3, network: NetworkNumber,
     futureBorrowRate,
     bands: bandsData,
     leftToBorrow,
-    loanDiscount,
   };
 };
 
@@ -236,4 +227,4 @@ export const getCurveUsdFullPositionData = async (web3: Web3, network: NetworkNu
   const marketData = await getCurveUsdGlobalData(web3, network, selectedMarket);
   const positionData = await getCurveUsdUserData(web3, network, address, selectedMarket, marketData.activeBand);
   return positionData;
-};
+};

package/src/fluid/index.ts

@@ -103,6 +103,11 @@ const parseMarketData = async (web3: Web3, data: FluidView.VaultDataStructOutput
     borrowRate,
   };
 
+  if (STAKING_ASSETS.includes(debtAssetData.symbol)) {
+    debtAssetData.incentiveBorrowApy = await getStakingApy(debtAsset.symbol, mainnetWeb3);
+    debtAssetData.incentiveBorrowToken = debtAsset.symbol;
+  }
+
   const assetsData = {
     [collAsset.symbol]: collAssetData,
     [debtAsset.symbol]: debtAssetData,

package/src/types/curveUsd.ts

@@ -65,7 +65,6 @@ export interface CrvUSDGlobalMarketData {
   futureBorrowRate: string,
   leftToBorrow: string,
   bands: BandData[],
-  loanDiscount: string;
 }
 
 export interface CrvUSDAggregatedPositionData {

package/src/types/fluid.ts

@@ -170,6 +170,8 @@ export interface FluidAssetData {
   price: string,
   incentiveSupplyApy?: string,
   incentiveSupplyToken?: string,
+  incentiveBorrowApy?: string,
+  incentiveBorrowToken?: string,
   totalSupply: string,
   totalBorrow: string,
   canBeSupplied: boolean,