@defisaver/positions-sdk 0.0.87 → 0.0.89

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/compoundV3/index.js

@@ -58,18 +58,10 @@ const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) =>
             coll.priceAlternative = (0, tokens_1.assetAmountInEth)(priceAlternative, 'wstETH');
             // const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
             // eslint-disable-next-line no-await-in-loop
-            coll.incentiveSupplyApy = yield (0, staking_1.getStETHApr)(defaultWeb3);
-            coll.incentiveSupplyToken = 'wstETH';
         }
-        if (coll.symbol === 'cbETH') {
-            // eslint-disable-next-line no-await-in-loop
-            coll.incentiveSupplyApy = yield (0, staking_1.getCbETHApr)(defaultWeb3);
-            coll.incentiveSupplyToken = 'cbETH';
-        }
-        if (coll.symbol === 'rETH') {
-            // eslint-disable-next-line no-await-in-loop
-            coll.incentiveSupplyApy = yield (0, staking_1.getREthApr)(defaultWeb3);
-            coll.incentiveSupplyToken = 'rETH';
+        if (staking_1.STAKING_ASSETS.includes(coll.symbol)) {
+            coll.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(coll.symbol, defaultWeb3);
+            coll.incentiveSupplyToken = coll.symbol;
         }
     }
     const base = (0, compoundHelpers_1.formatBaseData)(data[0].baseToken, network, baseAssetPrice);

package/cjs/markets/spark/marketAssets.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sparkAssetsDefaultMarket = exports.sparkAssetsDefaultMarketEth = void 0;
 const common_1 = require("../../types/common");
-exports.sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT'];
+exports.sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.sparkAssetsDefaultMarket = {
     [common_1.NetworkNumber.Eth]: exports.sparkAssetsDefaultMarketEth,

package/cjs/morphoAaveV3/index.js

@@ -216,17 +216,9 @@ const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainnetWeb3)
             isolationModeBorrowingEnabled: false,
             isFlashLoanEnabled: false,
         };
-        if (symbol === 'wstETH') {
-            data.incentiveSupplyApy = yield (0, staking_1.getStETHApr)(mainnetWeb3);
-            data.incentiveSupplyToken = symbol;
-        }
-        if (symbol === 'cbETH' && !(0, utils_1.isLayer2Network)(network)) {
-            data.incentiveSupplyApy = yield (0, staking_1.getCbETHApr)(mainnetWeb3);
-            data.incentiveSupplyToken = symbol;
-        }
-        if (symbol === 'rETH') {
-            data.incentiveSupplyApy = yield (0, staking_1.getREthApr)(mainnetWeb3);
-            data.incentiveSupplyToken = symbol;
+        if (staking_1.STAKING_ASSETS.includes(data.symbol)) {
+            data.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(data.symbol, mainnetWeb3);
+            data.incentiveSupplyToken = data.symbol;
         }
         if (data.symbol === 'sDAI') {
             data.incentiveSupplyApy = yield (0, dsrService_1.getDsrApy)(web3, network);

package/cjs/spark/index.js

@@ -126,17 +126,9 @@ const getSparkMarketsData = (web3, network, selectedMarket, mainnetWeb3) => __aw
     yield Promise.all(assetsData.map((market) => __awaiter(void 0, void 0, void 0, function* () {
         /* eslint-disable no-param-reassign */
         const rewardForMarket = rewardInfo[market.underlyingTokenAddress];
-        if (market.symbol === 'wstETH') {
-            market.incentiveSupplyApy = yield (0, staking_1.getStETHApr)(mainnetWeb3);
-            market.incentiveSupplyToken = 'wstETH';
-        }
-        if (market.symbol === 'cbETH' && !(0, utils_1.isLayer2Network)(network)) {
-            market.incentiveSupplyApy = yield (0, staking_1.getCbETHApr)(mainnetWeb3);
-            market.incentiveSupplyToken = 'cbETH';
-        }
-        if (market.symbol === 'rETH') {
-            market.incentiveSupplyApy = yield (0, staking_1.getREthApr)(mainnetWeb3);
-            market.incentiveSupplyToken = 'rETH';
+        if (staking_1.STAKING_ASSETS.includes(market.symbol)) {
+            market.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(market.symbol, mainnetWeb3);
+            market.incentiveSupplyToken = market.symbol;
         }
         if (market.symbol === 'sDAI') {
             market.incentiveSupplyApy = yield (0, dsrService_1.getDsrApy)(web3, network);

package/esm/compoundV3/index.js

@@ -11,7 +11,7 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo, getAssetInfoByAddress, } from '@defisaver/tokens';
 import { CompV3ViewContract } from '../contracts';
 import { multicall } from '../multicall';
-import { getCbETHApr, getREthApr, getStETHApr, getStETHByWstETHMultiple, getWstETHByStETH, } from '../staking';
+import { getStakingApy, getStETHByWstETHMultiple, getWstETHByStETH, STAKING_ASSETS, } from '../staking';
 import { wethToEth } from '../services/utils';
 import { ZERO_ADDRESS } from '../constants';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
@@ -52,18 +52,10 @@ export const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultW
             coll.priceAlternative = assetAmountInEth(priceAlternative, 'wstETH');
             // const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
             // eslint-disable-next-line no-await-in-loop
-            coll.incentiveSupplyApy = yield getStETHApr(defaultWeb3);
-            coll.incentiveSupplyToken = 'wstETH';
         }
-        if (coll.symbol === 'cbETH') {
-            // eslint-disable-next-line no-await-in-loop
-            coll.incentiveSupplyApy = yield getCbETHApr(defaultWeb3);
-            coll.incentiveSupplyToken = 'cbETH';
-        }
-        if (coll.symbol === 'rETH') {
-            // eslint-disable-next-line no-await-in-loop
-            coll.incentiveSupplyApy = yield getREthApr(defaultWeb3);
-            coll.incentiveSupplyToken = 'rETH';
+        if (STAKING_ASSETS.includes(coll.symbol)) {
+            coll.incentiveSupplyApy = yield getStakingApy(coll.symbol, defaultWeb3);
+            coll.incentiveSupplyToken = coll.symbol;
         }
     }
     const base = formatBaseData(data[0].baseToken, network, baseAssetPrice);

package/esm/markets/spark/marketAssets.js

@@ -1,5 +1,5 @@
 import { NetworkNumber } from '../../types/common';
-export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT'];
+export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const sparkAssetsDefaultMarket = {
     [NetworkNumber.Eth]: sparkAssetsDefaultMarketEth,

package/esm/morphoAaveV3/index.js

@@ -13,10 +13,10 @@ import PoolInterestRates from '@morpho-org/morpho-aave-v3-sdk/lib/maths/PoolInte
 import P2PInterestRates from '@morpho-org/morpho-aave-v3-sdk/lib/maths/P2PInterestRates';
 import { BigNumber } from '@ethersproject/bignumber';
 import Dec from 'decimal.js';
-import { ethToWeth, ethToWethByAddress, getAbiItem, isLayer2Network, wethToEthByAddress, } from '../services/utils';
+import { ethToWeth, ethToWethByAddress, getAbiItem, wethToEthByAddress, } from '../services/utils';
 import { createContractWrapper, getConfigContractAbi, getConfigContractAddress, } from '../contracts';
 import { multicall } from '../multicall';
-import { getCbETHApr, getREthApr, getStETHApr } from '../staking';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { getDsrApy } from '../services/dsrService';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import { EMPTY_AAVE_DATA } from '../aaveV3';
@@ -210,17 +210,9 @@ export const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainne
             isolationModeBorrowingEnabled: false,
             isFlashLoanEnabled: false,
         };
-        if (symbol === 'wstETH') {
-            data.incentiveSupplyApy = yield getStETHApr(mainnetWeb3);
-            data.incentiveSupplyToken = symbol;
-        }
-        if (symbol === 'cbETH' && !isLayer2Network(network)) {
-            data.incentiveSupplyApy = yield getCbETHApr(mainnetWeb3);
-            data.incentiveSupplyToken = symbol;
-        }
-        if (symbol === 'rETH') {
-            data.incentiveSupplyApy = yield getREthApr(mainnetWeb3);
-            data.incentiveSupplyToken = symbol;
+        if (STAKING_ASSETS.includes(data.symbol)) {
+            data.incentiveSupplyApy = yield getStakingApy(data.symbol, mainnetWeb3);
+            data.incentiveSupplyToken = data.symbol;
         }
         if (data.symbol === 'sDAI') {
             data.incentiveSupplyApy = yield getDsrApy(web3, network);

package/esm/spark/index.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
-import { ethToWeth, getAbiItem, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
-import { calculateNetApy, getCbETHApr, getREthApr, getStETHApr, } from '../staking';
+import { ethToWeth, getAbiItem, wethToEth, wethToEthByAddress, } from '../services/utils';
+import { calculateNetApy, getStakingApy, STAKING_ASSETS, } from '../staking';
 import { getDsrApy } from '../services/dsrService';
 import { SparkIncentiveDataProviderContract, SparkViewContract, getConfigContractAbi, createContractWrapper, } from '../contracts';
 import { multicall } from '../multicall';
@@ -119,17 +119,9 @@ export const getSparkMarketsData = (web3, network, selectedMarket, mainnetWeb3)
     yield Promise.all(assetsData.map((market) => __awaiter(void 0, void 0, void 0, function* () {
         /* eslint-disable no-param-reassign */
         const rewardForMarket = rewardInfo[market.underlyingTokenAddress];
-        if (market.symbol === 'wstETH') {
-            market.incentiveSupplyApy = yield getStETHApr(mainnetWeb3);
-            market.incentiveSupplyToken = 'wstETH';
-        }
-        if (market.symbol === 'cbETH' && !isLayer2Network(network)) {
-            market.incentiveSupplyApy = yield getCbETHApr(mainnetWeb3);
-            market.incentiveSupplyToken = 'cbETH';
-        }
-        if (market.symbol === 'rETH') {
-            market.incentiveSupplyApy = yield getREthApr(mainnetWeb3);
-            market.incentiveSupplyToken = 'rETH';
+        if (STAKING_ASSETS.includes(market.symbol)) {
+            market.incentiveSupplyApy = yield getStakingApy(market.symbol, mainnetWeb3);
+            market.incentiveSupplyToken = market.symbol;
         }
         if (market.symbol === 'sDAI') {
             market.incentiveSupplyApy = yield getDsrApy(web3, network);

package/package.json

@@ -1,40 +1,40 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "0.0.87",
-  "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.23",
-    "@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.89",
+  "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.23",
+    "@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"
+  }
+}