@defisaver/positions-sdk 0.0.69 → 0.0.70

package/cjs/aaveV3/index.js

@@ -140,7 +140,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
             if (nativeAsset && facilitatorsList && discountRate && minDiscountTokenBalance && minGhoBalanceForDiscount && ghoDiscountedPerDiscountToken) {
                 const facilitatorBucket = yield ghoContract.methods.getFacilitatorBucket(facilitatorsList[0]).call();
                 const availableFacilitatorCap = (0, tokens_1.assetAmountInEth)(new decimal_js_1.default(facilitatorBucket[0]).sub(facilitatorBucket[1]).toString(), 'GHO');
-                borrowCap = decimal_js_1.default.min(borrowCap, availableFacilitatorCap).toString();
+                borrowCap = decimal_js_1.default.min(borrowCap, (0, tokens_1.assetAmountInEth)(facilitatorBucket[0], 'GHO')).toString();
                 discountRateOnBorrow = (0, exports.aaveV3CalculateDiscountRate)(tokenMarket.totalBorrow.toString(), '3160881469228662060510133', // stkAAVE total supply
                 discountRate, minDiscountTokenBalance, minGhoBalanceForDiscount, ghoDiscountedPerDiscountToken);
             }

package/cjs/markets/aave/marketAssets.js

@@ -7,7 +7,7 @@ exports.morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WBTC',
 exports.morphoAaveV3AssetEthMarket = [
     'ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT',
 ];
-exports.aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH'];
+exports.aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH'];
 exports.aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
 ];

package/cjs/markets/llamaLend/index.js

@@ -44,7 +44,7 @@ const getLlamaLendMarketData = (market, network = 1) => (0, exports.LlamaLendMar
 exports.getLlamaLendMarketData = getLlamaLendMarketData;
 const getLlamaLendMarketFromControllerAddress = (controllerAddress, network) => {
     const markets = (0, exports.LlamaLendMarkets)(network);
-    const market = Object.values(markets).find((market) => market.controllerAddress === controllerAddress);
+    const market = Object.values(markets).find((tempMarket) => tempMarket.controllerAddress === controllerAddress);
     if (!market)
         throw new Error('Market not found');
     return market;

package/cjs/staking/staking.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = exports.getSUSDeApy = exports.getDsrApy = exports.getREthApr = exports.getCbETHApr = exports.getStETHApr = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const v3_sdk_1 = require("@stakewise/v3-sdk");
 const contracts_1 = require("../contracts");
 const common_1 = require("../types/common");
 const constants_1 = require("../constants");
@@ -93,12 +94,16 @@ const getSUSDeApy = () => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.getSUSDeApy = getSUSDeApy;
 const getWeEthApr = () => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield fetch('https://www.etherfi.bid/api/etherfi/apr');
+    const res = yield fetch('https://app.defisaver.com/api/staking/apy?asset=weETH');
     const data = yield res.json();
-    const total = data.latest_aprs.reduce((acc, apr) => new decimal_js_1.default(acc).add(apr).toString());
-    return new decimal_js_1.default(total).div(data.latest_aprs.length).div(100).toString();
+    return data.apy;
+});
+const getOsETHApy = () => __awaiter(void 0, void 0, void 0, function* () {
+    const sdk = new v3_sdk_1.StakeWiseSDK({ network: v3_sdk_1.Network.Mainnet });
+    const apy = yield sdk.osToken.getAPY();
+    return apy;
 });
-exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH'];
+exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH'];
 const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -113,6 +118,8 @@ const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefine
             return (0, exports.getSUSDeApy)();
         if (asset === 'weETH')
             return getWeEthApr();
+        if (asset === 'osETH')
+            return getOsETHApy();
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);

package/cjs/types/llamaLend.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LlamaLendStatus = exports.LlamaLendVersions = exports.LLVersionsArb = exports.LLVersionsEth = void 0;
 var LLVersionsEth;
 (function (LLVersionsEth) {
-    //long only
+    // long only
     LLVersionsEth["LLWstethCrvusd"] = "llamaLendwstETHcrvUSD";
     LLVersionsEth["LLSusdeCrvusd"] = "llamaLendsUSDecrvUSD";
     // long and short crv
@@ -18,7 +18,7 @@ var LLVersionsEth;
 })(LLVersionsEth || (exports.LLVersionsEth = LLVersionsEth = {}));
 var LLVersionsArb;
 (function (LLVersionsArb) {
-    //long only
+    // long only
     LLVersionsArb["LLArbCrvusd"] = "llamaLendArbcrvUSD";
     LLVersionsArb["LLFxnCrvusd"] = "llamaLendFXNcrvUSD";
     LLVersionsArb["LLWbtcCrvusd"] = "llamaLendWBTCcrvUSD";

package/esm/aaveV3/index.js

@@ -131,7 +131,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
             if (nativeAsset && facilitatorsList && discountRate && minDiscountTokenBalance && minGhoBalanceForDiscount && ghoDiscountedPerDiscountToken) {
                 const facilitatorBucket = yield ghoContract.methods.getFacilitatorBucket(facilitatorsList[0]).call();
                 const availableFacilitatorCap = assetAmountInEth(new Dec(facilitatorBucket[0]).sub(facilitatorBucket[1]).toString(), 'GHO');
-                borrowCap = Dec.min(borrowCap, availableFacilitatorCap).toString();
+                borrowCap = Dec.min(borrowCap, assetAmountInEth(facilitatorBucket[0], 'GHO')).toString();
                 discountRateOnBorrow = aaveV3CalculateDiscountRate(tokenMarket.totalBorrow.toString(), '3160881469228662060510133', // stkAAVE total supply
                 discountRate, minDiscountTokenBalance, minGhoBalanceForDiscount, ghoDiscountedPerDiscountToken);
             }

package/esm/markets/aave/marketAssets.js

@@ -4,7 +4,7 @@ export const morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WB
 export const morphoAaveV3AssetEthMarket = [
     'ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT',
 ];
-export const aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH'];
+export const aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH'];
 export const aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
 ];

package/esm/markets/llamaLend/index.js

@@ -28,7 +28,7 @@ export const LlamaLendMarkets = (networkId) => ({
 export const getLlamaLendMarketData = (market, network = 1) => LlamaLendMarkets(network)[market];
 export const getLlamaLendMarketFromControllerAddress = (controllerAddress, network) => {
     const markets = LlamaLendMarkets(network);
-    const market = Object.values(markets).find((market) => market.controllerAddress === controllerAddress);
+    const market = Object.values(markets).find((tempMarket) => tempMarket.controllerAddress === controllerAddress);
     if (!market)
         throw new Error('Market not found');
     return market;

package/esm/staking/staking.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
+import { StakeWiseSDK, Network } from '@stakewise/v3-sdk';
 import { CbEthContract, LidoContract, PotContract, REthContract, wstETHContract, } from '../contracts';
 import { NetworkNumber } from '../types/common';
 import { BLOCKS_IN_A_YEAR, SECONDS_PER_YEAR, AVG_BLOCK_TIME } from '../constants';
@@ -82,12 +83,16 @@ export const getSUSDeApy = () => __awaiter(void 0, void 0, void 0, function* ()
     return data.apy;
 });
 const getWeEthApr = () => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield fetch('https://www.etherfi.bid/api/etherfi/apr');
+    const res = yield fetch('https://app.defisaver.com/api/staking/apy?asset=weETH');
     const data = yield res.json();
-    const total = data.latest_aprs.reduce((acc, apr) => new Dec(acc).add(apr).toString());
-    return new Dec(total).div(data.latest_aprs.length).div(100).toString();
+    return data.apy;
+});
+const getOsETHApy = () => __awaiter(void 0, void 0, void 0, function* () {
+    const sdk = new StakeWiseSDK({ network: Network.Mainnet });
+    const apy = yield sdk.osToken.getAPY();
+    return apy;
 });
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH'];
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH'];
 export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -102,6 +107,8 @@ export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = u
             return getSUSDeApy();
         if (asset === 'weETH')
             return getWeEthApr();
+        if (asset === 'osETH')
+            return getOsETHApy();
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);

package/esm/types/llamaLend.js

@@ -1,6 +1,6 @@
 export var LLVersionsEth;
 (function (LLVersionsEth) {
-    //long only
+    // long only
     LLVersionsEth["LLWstethCrvusd"] = "llamaLendwstETHcrvUSD";
     LLVersionsEth["LLSusdeCrvusd"] = "llamaLendsUSDecrvUSD";
     // long and short crv
@@ -15,7 +15,7 @@ export var LLVersionsEth;
 })(LLVersionsEth || (LLVersionsEth = {}));
 export var LLVersionsArb;
 (function (LLVersionsArb) {
-    //long only
+    // long only
     LLVersionsArb["LLArbCrvusd"] = "llamaLendArbcrvUSD";
     LLVersionsArb["LLFxnCrvusd"] = "llamaLendFXNcrvUSD";
     LLVersionsArb["LLWbtcCrvusd"] = "llamaLendWBTCcrvUSD";

package/package.json

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

package/src/aaveV3/index.ts

@@ -183,7 +183,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
         const facilitatorBucket = await ghoContract.methods.getFacilitatorBucket(facilitatorsList[0]).call();
         const availableFacilitatorCap = assetAmountInEth(new Dec(facilitatorBucket[0]).sub(facilitatorBucket[1]).toString(), 'GHO');
 
-        borrowCap = Dec.min(borrowCap, availableFacilitatorCap).toString();
+        borrowCap = Dec.min(borrowCap, assetAmountInEth(facilitatorBucket[0],'GHO')).toString();
 
         discountRateOnBorrow = aaveV3CalculateDiscountRate(
           tokenMarket.totalBorrow.toString(),

package/src/staking/staking.ts

@@ -85,7 +85,7 @@ export const getSUSDeApy = async () => {
 };
 
 const getWeEthApr = async () => {
-  const res = await fetch('hhttps://app.defisaver.com/api/staking/apy?asset=weETH');
+  const res = await fetch('https://app.defisaver.com/api/staking/apy?asset=weETH');
   const data = await res.json();
   return data.apy;
 };