@defisaver/positions-sdk 0.0.65 → 0.0.67

package/README.md

@@ -1,63 +1,63 @@
-# DeFi Saver Positions SDK
-
-Supported protocols: 
-- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
-- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
-- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
-- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
-- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
-- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
-- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
-- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
-- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
-- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
-- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
-
-## Setup
-Supported Node version is v10.
-
-- run `npm install` (first time)
-- run `npm run build`
-
-`build` command will generate contracts and build ejs and esm folders
-
-## How to use
-[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
-
-This is a Compound V3 example, and every other protocol is similar
-```js
-import Web3 from 'web3';
-import { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-const web3 = new Web3(provider);
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
-    1, // network
-    selectedMarket, // market object like in /src/markets/compound/index.ts
-    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    web3,
-    1, // network
-    userAddress, // EOA or DSProxy
-    '', // proxy address of the user, or just empty string if checking for EOA
-    {
-        selectedMarket, // market object as in /src/markets/compound/index.ts
-        assetsData,
-    }
-);
-```
-
-More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
+# DeFi Saver Positions SDK
+
+Supported protocols: 
+- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
+- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
+- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
+- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
+- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
+- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
+- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
+- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
+- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
+- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
+- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
+
+## Setup
+Supported Node version is v10.
+
+- run `npm install` (first time)
+- run `npm run build`
+
+`build` command will generate contracts and build ejs and esm folders
+
+## How to use
+[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
+
+This is a Compound V3 example, and every other protocol is similar
+```js
+import Web3 from 'web3';
+import { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+const web3 = new Web3(provider);
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
+    1, // network
+    selectedMarket, // market object like in /src/markets/compound/index.ts
+    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    web3,
+    1, // network
+    userAddress, // EOA or DSProxy
+    '', // proxy address of the user, or just empty string if checking for EOA
+    {
+        selectedMarket, // market object as in /src/markets/compound/index.ts
+        assetsData,
+    }
+);
+```
+
+More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)

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/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/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', 'sUSDe'];
 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/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

@@ -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/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/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', 'sUSDe'];
 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/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,40 +1,40 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "0.0.65",
-  "description": "",
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./esm/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 generate-contracts && npm run build:cjs && npm run build:esm",
-    "dev": "npm run generate-contracts && 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.5.18",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "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"
-  }
-}
+{
+  "name": "@defisaver/positions-sdk",
+  "version": "0.0.67",
+  "description": "",
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./esm/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 generate-contracts && npm run build:cjs && npm run build:esm",
+    "dev": "npm run generate-contracts && 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.5.18",
+    "@ethersproject/bignumber": "^5.7.0",
+    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
+    "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"
+  }
+}