@defisaver/positions-sdk 0.0.65 → 0.0.66

package/.yarnrc.yml

@@ -0,0 +1 @@
+yarnPath: .yarn/releases/yarn-1.22.1.cjs

package/cjs/aaveV3/index.js

@@ -175,7 +175,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         yield Promise.all(assetsData.map((_market) => __awaiter(this, void 0, void 0, function* () {
             /* eslint-disable no-param-reassign */
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
-            if (['wstETH', 'cbETH', 'rETH', 'sDAI'].includes(_market.symbol)) {
+            if (staking_1.STAKING_ASSETS.includes(_market.symbol)) {
                 _market.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(_market.symbol, defaultWeb3);
                 _market.incentiveSupplyToken = _market.symbol;
             }

package/cjs/morphoBlue/index.js

@@ -102,7 +102,7 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
             canBeSupplied: true,
             canBeBorrowed: false,
         };
-        if (['wstETH', 'cbETH', 'rETH', 'sUSDe'].includes(collateralTokenInfo.symbol)) {
+        if (staking_1.STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
             assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collateralTokenInfo.symbol, mainnetWeb3);
             assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
         }

package/cjs/staking/staking.d.ts

@@ -5,7 +5,8 @@ export declare const getCbETHApr: (web3: Web3, blockNumber?: 'latest' | number)
 export declare const getREthApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getDsrApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getSUSDeApy: () => Promise<any>;
-export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | undefined;
+export declare const STAKING_ASSETS: string[];
+export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | "0" | undefined;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
 export declare const calculateNetApy: (usedAssets: MMUsedAssets, assetsData: MMAssetsData, isMorpho?: boolean) => {
     netApy: string;

package/cjs/staking/staking.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.getSUSDeApy = exports.getDsrApy = exports.getREthApr = exports.getCbETHApr = exports.getStETHApr = void 0;
+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 contracts_1 = require("../contracts");
 const common_1 = require("../types/common");
@@ -92,17 +92,32 @@ const getSUSDeApy = () => __awaiter(void 0, void 0, void 0, function* () {
     return data.apy;
 });
 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 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();
+});
+exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH'];
 const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
-    if (asset === 'stETH' || asset === 'wstETH')
-        return (0, exports.getStETHApr)(web3, fromBlock, blockNumber);
-    if (asset === 'cbETH')
-        return (0, exports.getCbETHApr)(web3, blockNumber);
-    if (asset === 'rETH')
-        return (0, exports.getREthApr)(web3, blockNumber);
-    if (asset === 'sDAI')
-        return (0, exports.getDsrApy)(web3);
-    if (asset === 'sUSDe')
-        return (0, exports.getSUSDeApy)();
+    try {
+        if (asset === 'stETH' || asset === 'wstETH')
+            return (0, exports.getStETHApr)(web3, fromBlock, blockNumber);
+        if (asset === 'cbETH')
+            return (0, exports.getCbETHApr)(web3, blockNumber);
+        if (asset === 'rETH')
+            return (0, exports.getREthApr)(web3, blockNumber);
+        if (asset === 'sDAI')
+            return (0, exports.getDsrApy)(web3);
+        if (asset === 'sUSDe')
+            return (0, exports.getSUSDeApy)();
+        if (asset === 'weETH')
+            return getWeEthApr();
+    }
+    catch (e) {
+        console.error(`Failed to fetch APY for ${asset}`);
+        return '0';
+    }
 };
 exports.getStakingApy = getStakingApy;
 const calculateInterestEarned = (principal, interest, type, apy = false) => {

package/esm/aaveV3/index.js

@@ -12,7 +12,7 @@ import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tok
 import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, createContractWrapper, getConfigContractAbi, getConfigContractAddress, GhoTokenContract, } from '../contracts';
 import { addToObjectIf, ethToWeth, getAbiItem, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
 import { NetworkNumber, } from '../types/common';
-import { getStakingApy } from '../staking';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { multicall } from '../multicall';
 import { getAssetsBalances } from '../assets';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
@@ -166,7 +166,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         yield Promise.all(assetsData.map((_market) => __awaiter(this, void 0, void 0, function* () {
             /* eslint-disable no-param-reassign */
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
-            if (['wstETH', 'cbETH', 'rETH', 'sDAI'].includes(_market.symbol)) {
+            if (STAKING_ASSETS.includes(_market.symbol)) {
                 _market.incentiveSupplyApy = yield getStakingApy(_market.symbol, defaultWeb3);
                 _market.incentiveSupplyToken = _market.symbol;
             }

package/esm/morphoBlue/index.js

@@ -11,7 +11,7 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { MorphoBlueViewContract, getConfigContractAbi, getConfigContractAddress, } from '../contracts';
 import { WAD, SECONDS_PER_YEAR, USD_QUOTE } from '../constants';
-import { getStakingApy } from '../staking';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { getAbiItem, wethToEth } from '../services/utils';
 import { multicall } from '../multicall';
 import { getMorphoBlueAggregatedPositionData } from '../helpers/morphoBlueHelpers';
@@ -96,7 +96,7 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
             canBeSupplied: true,
             canBeBorrowed: false,
         };
-        if (['wstETH', 'cbETH', 'rETH', 'sUSDe'].includes(collateralTokenInfo.symbol)) {
+        if (STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
             assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = yield getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
             assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
         }

package/esm/staking/staking.d.ts

@@ -5,7 +5,8 @@ export declare const getCbETHApr: (web3: Web3, blockNumber?: 'latest' | number)
 export declare const getREthApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getDsrApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getSUSDeApy: () => Promise<any>;
-export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | undefined;
+export declare const STAKING_ASSETS: string[];
+export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | "0" | undefined;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
 export declare const calculateNetApy: (usedAssets: MMUsedAssets, assetsData: MMAssetsData, isMorpho?: boolean) => {
     netApy: string;

package/esm/staking/staking.js

@@ -81,17 +81,32 @@ export const getSUSDeApy = () => __awaiter(void 0, void 0, void 0, function* ()
     const data = yield res.json();
     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 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();
+});
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH'];
 export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
-    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 === 'sDAI')
-        return getDsrApy(web3);
-    if (asset === 'sUSDe')
-        return getSUSDeApy();
+    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 === 'sDAI')
+            return getDsrApy(web3);
+        if (asset === 'sUSDe')
+            return getSUSDeApy();
+        if (asset === 'weETH')
+            return getWeEthApr();
+    }
+    catch (e) {
+        console.error(`Failed to fetch APY for ${asset}`);
+        return '0';
+    }
 };
 export const calculateInterestEarned = (principal, interest, type, apy = false) => {
     let interval = 1;

package/package.json

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

package/src/aaveV3/index.ts

@@ -26,7 +26,7 @@ import {
 import {
   Blockish, EthAddress, NetworkNumber, PositionBalances,
 } from '../types/common';
-import { calculateNetApy, getStakingApy } from '../staking';
+import {calculateNetApy, getStakingApy, STAKING_ASSETS} from '../staking';
 import { multicall } from '../multicall';
 import { IUiIncentiveDataProviderV3 } from '../types/contracts/generated/AaveUiIncentiveDataProviderV3';
 import { getAssetsBalances } from '../assets';
@@ -268,7 +268,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
   await Promise.all(assetsData.map(async (_market: AaveV3AssetData) => {
     /* eslint-disable no-param-reassign */
     const rewardForMarket: IUiIncentiveDataProviderV3.AggregatedReserveIncentiveDataStructOutput | undefined = rewardInfo?.[_market.underlyingTokenAddress as any];
-    if (['wstETH', 'cbETH', 'rETH', 'sDAI'].includes(_market.symbol)) {
+    if (STAKING_ASSETS.includes(_market.symbol)) {
       _market.incentiveSupplyApy = await getStakingApy(_market.symbol, defaultWeb3);
       _market.incentiveSupplyToken = _market.symbol;
     }

package/src/morphoBlue/index.ts

@@ -10,7 +10,7 @@ import {
   MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
 } from '../types';
 import { WAD, SECONDS_PER_YEAR, USD_QUOTE } from '../constants';
-import { getStakingApy } from '../staking';
+import {getStakingApy, STAKING_ASSETS} from '../staking';
 import { getAbiItem, wethToEth } from '../services/utils';
 import { multicall } from '../multicall';
 import { getMorphoBlueAggregatedPositionData } from '../helpers/morphoBlueHelpers';
@@ -112,7 +112,7 @@ export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber
     canBeBorrowed: false,
   };
 
-  if (['wstETH', 'cbETH', 'rETH', 'sUSDe'].includes(collateralTokenInfo.symbol)) {
+  if (STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
     assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = await getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
     assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
   }
@@ -175,4 +175,4 @@ export async function getMorphoBlueAccountData(web3: Web3, network: NetworkNumbe
     usedAssets,
     ...getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }),
   };
-}
+}

package/src/staking/staking.ts

@@ -82,12 +82,27 @@ export const getSUSDeApy = async () => {
   return data.apy;
 };
 
+const getWeEthApr = async () => {
+  const res = await fetch('https://www.etherfi.bid/api/etherfi/apr');
+  const data = await res.json();
+  const total = (data.latest_aprs as string[]).reduce((acc,apr) => new Dec(acc).add(apr).toString());
+  return new Dec(total).div(data.latest_aprs.length).div(100).toString();
+}
+
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI','weETH'];
+
 export const getStakingApy = (asset: string, web3: Web3, blockNumber: 'latest' | number = 'latest', fromBlock: number | undefined = undefined) => {
-  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 === 'sDAI') return getDsrApy(web3);
-  if (asset === 'sUSDe') return getSUSDeApy();
+  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 === 'sDAI') return getDsrApy(web3);
+    if (asset === 'sUSDe') return getSUSDeApy();
+    if (asset === 'weETH') return getWeEthApr();
+  } catch (e) {
+    console.error(`Failed to fetch APY for ${asset}`);
+    return '0';
+  }
 };
 
 export const calculateInterestEarned = (principal: string, interest: string, type: string, apy = false) => {
@@ -172,4 +187,4 @@ export const getStETHByWstETHMultiple = async (wstEthAmounts: string[] | number[
   }));
   const stEthAmounts = await multicall(calls, web3);
   return stEthAmounts.map((arr) => arr[0]);
-};
+};

package/yarn-error.log

@@ -1,64 +0,0 @@
-Arguments: 
-  /Users/stefan/.nvm/versions/node/v14.19.0/bin/node /usr/local/Cellar/yarn/1.22.19/libexec/bin/yarn.js
-
-PATH: 
-  /Users/stefan/.nvm/versions/node/v14.19.0/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Applications/VMware Fusion.app/Contents/Public:/usr/local/go/bin:/Users/stefan/WebstormProjects/defisaver-positions-sdk/node_modules/.bin:/usr/local/go
-
-Yarn version: 
-  1.22.19
-
-Node version: 
-  14.19.0
-
-Platform: 
-  darwin x64
-
-Trace: 
-  Error: incorrect data check
-      at Zlib.zlibOnError [as onerror] (zlib.js:187:17)
-
-npm manifest: 
-  {
-    "name": "defisaver-positions-sdk",
-    "version": "0.0.1",
-    "description": "",
-    "main": "./cjs/index.js",
-    "module": "./esm/src/index.js",
-    "types": "./esm/src/index.d.ts",
-    "scripts": {
-      "build:esm": "rm -rf esm && tsc -p tsconfig.json",
-      "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
-      "build": "npm run build:cjs && npm run build:esm",
-      "dev": "tsc -p tsconfig.cjs.json --watch",
-      "lint": "eslint src/ --fix",
-      "generate-contracts": "node scripts/generateContracts.js",
-      "test": "mocha tests/*",
-      "build-test": "npm run build && mocha tests/*"
-    },
-    "keywords": [],
-    "author": "",
-    "license": "ISC",
-    "dependencies": {
-      "@defisaver/tokens": "^1.4.56",
-      "decimal.js": "^10.4.3"
-    },
-    "devDependencies": {
-      "@defisaver/eslint-config": "^1.0.1",
-      "chai": "^4.3.8",
-      "dotenv": "^16.3.1",
-      "eslint": "^8.49.0",
-      "mocha": "^10.2.0",
-      "typechain": "^8.3.1",
-      "typechain-target-web3-v1-3mihai3": "^6.0.2",
-      "typescript": "^5.2.2"
-    },
-    "peerDependencies": {
-      "web3": "^1.10.2"
-    }
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
-  No lockfile