@defisaver/positions-sdk 0.0.66 → 0.0.68

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/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");
@@ -98,7 +99,12 @@ const getWeEthApr = () => __awaiter(void 0, void 0, void 0, function* () {
     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 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', 'sUSDe', 'osETH'];
 const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -113,6 +119,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/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';
@@ -87,7 +88,12 @@ const getWeEthApr = () => __awaiter(void 0, void 0, void 0, function* () {
     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'];
+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', 'sUSDe', 'osETH'];
 export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -102,6 +108,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,40 +1,41 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "0.0.66",
-  "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.68",
+  "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.22",
+    "@ethersproject/bignumber": "^5.7.0",
+    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
+    "@stakewise/v3-sdk": "^1.3.0",
+    "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"
+  }
+}