@defisaver/positions-sdk 0.0.67 → 0.0.68

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/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', 'sUSDe'];
+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/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/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', 'sUSDe'];
+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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.67",
+  "version": "0.0.68",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -19,9 +19,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.5.18",
+    "@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": {

package/src/markets/aave/marketAssets.ts

@@ -7,7 +7,7 @@ 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/src/staking/staking.ts

@@ -1,5 +1,6 @@
 import Dec from 'decimal.js';
 import Web3 from 'web3';
+import { StakeWiseSDK, Network } from '@stakewise/v3-sdk';
 import {
   CbEthContract, LidoContract, PotContract, REthContract, wstETHContract,
 } from '../contracts';
@@ -8,6 +9,7 @@ import { ContractEventLog } from '../types/contracts/generated/types';
 import { BLOCKS_IN_A_YEAR, SECONDS_PER_YEAR, AVG_BLOCK_TIME } from '../constants';
 import { multicall } from '../multicall';
 
+
 export const getStETHApr = async (web3: Web3, fromBlock = 17900000, blockNumber: 'latest' | number = 'latest') => {
   try {
     const tokenRebasedEvents: ContractEventLog<{ [key: string]: any }>[] = await LidoContract(web3, NetworkNumber.Eth).getPastEvents('TokenRebased', { fromBlock, toBlock: blockNumber });
@@ -89,7 +91,13 @@ const getWeEthApr = async () => {
   return new Dec(total).div(data.latest_aprs.length).div(100).toString();
 };
 
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe'];
+const getOsETHApy = async () => {
+  const sdk = new StakeWiseSDK({ network: Network.Mainnet });
+  const apy = await sdk.osToken.getAPY();
+  return apy;
+};
+
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH'];
 
 export const getStakingApy = (asset: string, web3: Web3, blockNumber: 'latest' | number = 'latest', fromBlock: number | undefined = undefined) => {
   try {
@@ -99,6 +107,7 @@ export const getStakingApy = (asset: string, web3: Web3, blockNumber: 'latest' |
     if (asset === 'sDAI') return getDsrApy(web3);
     if (asset === 'sUSDe') return getSUSDeApy();
     if (asset === 'weETH') return getWeEthApr();
+    if (asset === 'osETH') return getOsETHApy();
   } catch (e) {
     console.error(`Failed to fetch APY for ${asset}`);
     return '0';