@defisaver/positions-sdk 0.0.166-dev → 0.0.166-dev2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (22) hide show
  1. package/cjs/markets/compound/marketsAssets.js +3 -3
  2. package/cjs/markets/morphoBlue/index.d.ts +4 -0
  3. package/cjs/markets/morphoBlue/index.js +36 -1
  4. package/cjs/markets/spark/marketAssets.js +1 -1
  5. package/cjs/staking/staking.d.ts +1 -0
  6. package/cjs/staking/staking.js +31 -2
  7. package/cjs/types/morphoBlue.d.ts +3 -1
  8. package/cjs/types/morphoBlue.js +2 -0
  9. package/esm/markets/compound/marketsAssets.js +3 -3
  10. package/esm/markets/morphoBlue/index.d.ts +4 -0
  11. package/esm/markets/morphoBlue/index.js +33 -0
  12. package/esm/markets/spark/marketAssets.js +1 -1
  13. package/esm/staking/staking.d.ts +1 -0
  14. package/esm/staking/staking.js +29 -1
  15. package/esm/types/morphoBlue.d.ts +3 -1
  16. package/esm/types/morphoBlue.js +2 -0
  17. package/package.json +10 -5
  18. package/src/markets/compound/marketsAssets.ts +3 -3
  19. package/src/markets/morphoBlue/index.ts +37 -0
  20. package/src/markets/spark/marketAssets.ts +1 -1
  21. package/src/staking/staking.ts +31 -2
  22. package/src/types/morphoBlue.ts +2 -0
package/cjs/markets/compound/marketsAssets.js CHANGED
@@ -7,7 +7,7 @@ exports.compoundV2CollateralAssets = [
7
7
  'cETH', 'cDAI', 'cBAT', 'cZRX', 'cUSDC', 'cWBTC Legacy', 'cWBTC', 'cUSDT',
8
8
  'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
9
9
  ].map((symbol) => (0, tokens_1.getAssetInfo)(symbol));
10
- exports.v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'rswETH'];
10
+ exports.v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC'];
11
11
  exports.v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH', 'ezETH'];
12
12
  exports.v3USDCCollAssetsBase = ['ETH', 'cbETH', 'wstETH', 'cbBTC'];
13
13
  exports.v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC', 'wstETH'];
@@ -26,7 +26,7 @@ exports.v3USDCeCollAssets = {
26
26
  [common_1.NetworkNumber.Arb]: exports.v3USDCeCollAssetsArb,
27
27
  [common_1.NetworkNumber.Base]: [],
28
28
  };
29
- exports.v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH'];
29
+ exports.v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH', 'tBTC'];
30
30
  exports.v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC'];
31
31
  exports.v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC', 'rsETH', 'ezETH', 'USDC', 'USDT'];
32
32
  exports.v3ETHCollAssetsOpt = ['rETH', 'wstETH', 'WBTC', 'ezETH', 'USDC', 'USDT', 'weETH', 'wrsETH'];
@@ -45,7 +45,7 @@ exports.v3USDbCCollAssets = {
45
45
  [common_1.NetworkNumber.Arb]: [],
46
46
  [common_1.NetworkNumber.Base]: exports.v3USDbCCollAssetsBase,
47
47
  };
48
- exports.v3USDTCollAssetsEth = ['ETH', 'WBTC', 'wstETH', 'COMP', 'UNI', 'LINK', 'cbBTC'];
48
+ exports.v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC'];
49
49
  exports.v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
50
50
  exports.v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP', 'wstETH'];
51
51
  // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
package/cjs/markets/morphoBlue/index.d.ts CHANGED
@@ -30,6 +30,7 @@ export declare const MORPHO_BLUE_USDE_DAI_770: (networkId?: NetworkNumber) => Mo
30
30
  export declare const MORPHO_BLUE_USDE_DAI_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
31
31
  export declare const MORPHO_BLUE_USDE_DAI_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
32
32
  export declare const MORPHO_BLUE_USDE_DAI_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
33
+ export declare const MORPHO_BLUE_RETH_ETH_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
33
34
  export declare const MORPHO_BLUE_CBETH_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
34
35
  export declare const MORPHO_BLUE_WSTETH_ETH_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
35
36
  export declare const MORPHO_BLUE_WSTETH_ETH_965_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -41,6 +42,7 @@ export declare const MORPHO_BLUE_RETH_USDC_860_BASE: (networkId?: NetworkNumber)
41
42
  export declare const MORPHO_BLUE_RETH_ETH_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
42
43
  export declare const MORPHO_BLUE_CBBTC_ETH_915_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
43
44
  export declare const MORPHO_BLUE_CBBTC_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
45
+ export declare const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
44
46
  export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
45
47
  readonly morphobluewstethusdc: MorphoBlueMarketData;
46
48
  readonly morphobluesdaiusdc: MorphoBlueMarketData;
@@ -61,6 +63,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
61
63
  readonly morphobluetbtcusdc: MorphoBlueMarketData;
62
64
  readonly morphobluecbbtceth: MorphoBlueMarketData;
63
65
  readonly morphobluecbbtcusdc: MorphoBlueMarketData;
66
+ readonly morphoblueretheth_945: MorphoBlueMarketData;
64
67
  readonly morphobluewstetheth_945: MorphoBlueMarketData;
65
68
  readonly morphobluewstetheth_945_exchange_rate: MorphoBlueMarketData;
66
69
  readonly morphobluewstetheth_965_exchange_rate: MorphoBlueMarketData;
@@ -79,6 +82,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
79
82
  readonly morphoblueretheth_945_base: MorphoBlueMarketData;
80
83
  readonly morphobluecbbtceth_915_base: MorphoBlueMarketData;
81
84
  readonly morphobluecbbtcusdc_860_base: MorphoBlueMarketData;
85
+ readonly morphobluewsuperoethbweth_915_base: MorphoBlueMarketData;
82
86
  readonly morphobluecbetheth_945_base: MorphoBlueMarketData;
83
87
  readonly morphobluecbetheth_965_base: MorphoBlueMarketData;
84
88
  readonly morphobluewstetheth_945_base: MorphoBlueMarketData;
package/cjs/markets/morphoBlue/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.MORPHO_BLUE_CBBTC_USDC_860_BASE = exports.MORPHO_BLUE_CBBTC_ETH_915_BASE = exports.MORPHO_BLUE_RETH_ETH_945_BASE = exports.MORPHO_BLUE_RETH_USDC_860_BASE = exports.MORPHO_BLUE_ETH_USDC_860_BASE = exports.MORPHO_BLUE_CBETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE = exports.MORPHO_BLUE_WSTETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_USDC_860_BASE = exports.MORPHO_BLUE_USDE_DAI_945 = exports.MORPHO_BLUE_USDE_DAI_915 = exports.MORPHO_BLUE_USDE_DAI_860 = exports.MORPHO_BLUE_USDE_DAI_770 = exports.MORPHO_BLUE_SUSDE_DAI_945 = exports.MORPHO_BLUE_SUSDE_DAI_915 = exports.MORPHO_BLUE_SUSDE_DAI_860 = exports.MORPHO_BLUE_SUSDE_DAI_770 = exports.MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945 = exports.MORPHO_BLUE_CBBTC_USDC_860 = exports.MORPHO_BLUE_CBBTC_ETH_915 = exports.MORPHO_BLUE_TBTC_USDC = exports.MORPHO_BLUE_MKR_USDC = exports.MORPHO_BLUE_EZETH_ETH = exports.MORPHO_BLUE_SDAI_ETH = exports.MORPHO_BLUE_SUSDE_USDT = exports.MORPHO_BLUE_USDE_USDT = exports.MORPHO_BLUE_WEETH_ETH = exports.MORPHO_BLUE_WSTETH_PYUSD = exports.MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_USDT = exports.MORPHO_BLUE_WBTC_ETH = exports.MORPHO_BLUE_WBTC_PYUSD = exports.MORPHO_BLUE_WBTC_USDT = exports.MORPHO_BLUE_ETH_USDC = exports.MORPHO_BLUE_WBTC_USDC = exports.MORPHO_BLUE_SDAI_USDC = exports.MORPHO_BLUE_WSTETH_USDC = void 0;
3
+ exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = exports.MORPHO_BLUE_CBBTC_USDC_860_BASE = exports.MORPHO_BLUE_CBBTC_ETH_915_BASE = exports.MORPHO_BLUE_RETH_ETH_945_BASE = exports.MORPHO_BLUE_RETH_USDC_860_BASE = exports.MORPHO_BLUE_ETH_USDC_860_BASE = exports.MORPHO_BLUE_CBETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE = exports.MORPHO_BLUE_WSTETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_USDC_860_BASE = exports.MORPHO_BLUE_RETH_ETH_945 = exports.MORPHO_BLUE_USDE_DAI_945 = exports.MORPHO_BLUE_USDE_DAI_915 = exports.MORPHO_BLUE_USDE_DAI_860 = exports.MORPHO_BLUE_USDE_DAI_770 = exports.MORPHO_BLUE_SUSDE_DAI_945 = exports.MORPHO_BLUE_SUSDE_DAI_915 = exports.MORPHO_BLUE_SUSDE_DAI_860 = exports.MORPHO_BLUE_SUSDE_DAI_770 = exports.MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945 = exports.MORPHO_BLUE_CBBTC_USDC_860 = exports.MORPHO_BLUE_CBBTC_ETH_915 = exports.MORPHO_BLUE_TBTC_USDC = exports.MORPHO_BLUE_MKR_USDC = exports.MORPHO_BLUE_EZETH_ETH = exports.MORPHO_BLUE_SDAI_ETH = exports.MORPHO_BLUE_SUSDE_USDT = exports.MORPHO_BLUE_USDE_USDT = exports.MORPHO_BLUE_WEETH_ETH = exports.MORPHO_BLUE_WSTETH_PYUSD = exports.MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_USDT = exports.MORPHO_BLUE_WBTC_ETH = exports.MORPHO_BLUE_WBTC_PYUSD = exports.MORPHO_BLUE_WBTC_USDT = exports.MORPHO_BLUE_ETH_USDC = exports.MORPHO_BLUE_WBTC_USDC = exports.MORPHO_BLUE_SDAI_USDC = exports.MORPHO_BLUE_WSTETH_USDC = void 0;
4
4
  const utils_1 = require("../../services/utils");
5
5
  const types_1 = require("../../types");
6
6
  const common_1 = require("../../types/common");
@@ -487,6 +487,22 @@ const MORPHO_BLUE_USDE_DAI_945 = (networkId = common_1.NetworkNumber.Eth) => ({
487
487
  protocolName: 'morpho-blue',
488
488
  });
489
489
  exports.MORPHO_BLUE_USDE_DAI_945 = MORPHO_BLUE_USDE_DAI_945;
490
+ const MORPHO_BLUE_RETH_ETH_945 = (networkId = common_1.NetworkNumber.Eth) => ({
491
+ chainIds: [1],
492
+ label: 'Morpho',
493
+ shortLabel: 'rETH/ETH',
494
+ value: types_1.MorphoBlueVersions.MorphoBlueREthEth_945,
495
+ url: 'retheth-3c83f77b',
496
+ loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
497
+ collateralToken: '0xae78736Cd615f374D3085123A210448E74Fc6393',
498
+ oracle: '0x1b4A3F92e5Fffd1d35A98751c9FE4472483579bB',
499
+ oracleType: types_1.MorphoBlueOracleType.MARKET_RATE,
500
+ irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
501
+ lltv: 0.945,
502
+ marketId: '0x3c83f77bde9541f8d3d82533b19bbc1f97eb2f1098bb991728acbfbede09cc5d',
503
+ protocolName: 'morpho-blue',
504
+ });
505
+ exports.MORPHO_BLUE_RETH_ETH_945 = MORPHO_BLUE_RETH_ETH_945;
490
506
  // BASE
491
507
  const MORPHO_BLUE_CBETH_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
492
508
  chainIds: [common_1.NetworkNumber.Base],
@@ -664,6 +680,22 @@ const MORPHO_BLUE_CBBTC_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth)
664
680
  protocolName: 'morpho-blue',
665
681
  });
666
682
  exports.MORPHO_BLUE_CBBTC_USDC_860_BASE = MORPHO_BLUE_CBBTC_USDC_860_BASE;
683
+ const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
684
+ chainIds: [common_1.NetworkNumber.Base],
685
+ label: 'Morpho',
686
+ shortLabel: 'wsuperOETHb/WETH',
687
+ value: types_1.MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base,
688
+ url: 'wsuperoethbweth-144bf18d',
689
+ loanToken: '0x4200000000000000000000000000000000000006',
690
+ collateralToken: '0x7FcD174E80f264448ebeE8c88a7C4476AAF58Ea6',
691
+ oracle: '0x28C964c985fe84736fAdc7Cf0bBd58B54bc7CF93',
692
+ oracleType: types_1.MorphoBlueOracleType.MARKET_RATE,
693
+ irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
694
+ lltv: 0.915,
695
+ marketId: '0x144bf18d6bf4c59602548a825034f73bf1d20177fc5f975fc69d5a5eba929b45',
696
+ protocolName: 'morpho-blue',
697
+ });
698
+ exports.MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE;
667
699
  const MorphoBlueMarkets = (networkId) => ({
668
700
  [types_1.MorphoBlueVersions.MorphoBlueWstEthUSDC]: (0, exports.MORPHO_BLUE_WSTETH_USDC)(networkId),
669
701
  [types_1.MorphoBlueVersions.MorphoBlueSDAIUSDC]: (0, exports.MORPHO_BLUE_SDAI_USDC)(networkId),
@@ -684,6 +716,7 @@ const MorphoBlueMarkets = (networkId) => ({
684
716
  [types_1.MorphoBlueVersions.MorphoBlueTBTCUSDC]: (0, exports.MORPHO_BLUE_TBTC_USDC)(networkId),
685
717
  [types_1.MorphoBlueVersions.MorphoBlueCbBTCEth_915]: (0, exports.MORPHO_BLUE_CBBTC_ETH_915)(networkId),
686
718
  [types_1.MorphoBlueVersions.MorphoBlueCbBTCUSDC_860]: (0, exports.MORPHO_BLUE_CBBTC_USDC_860)(networkId),
719
+ [types_1.MorphoBlueVersions.MorphoBlueREthEth_945]: (0, exports.MORPHO_BLUE_RETH_ETH_945)(networkId),
687
720
  // wstETH/WETH
688
721
  [types_1.MorphoBlueVersions.MorphoBlueWstEthEth_945]: (0, exports.MORPHO_BLUE_WSTETH_ETH_945)(networkId),
689
722
  [types_1.MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: (0, exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE)(networkId),
@@ -706,6 +739,8 @@ const MorphoBlueMarkets = (networkId) => ({
706
739
  [types_1.MorphoBlueVersions.MorphoBlueREthEth_945_Base]: (0, exports.MORPHO_BLUE_RETH_ETH_945_BASE)(networkId),
707
740
  [types_1.MorphoBlueVersions.MorphoBlueCbBTCEth_915_Base]: (0, exports.MORPHO_BLUE_CBBTC_ETH_915_BASE)(networkId),
708
741
  [types_1.MorphoBlueVersions.MorphoBlueCbBTCUSDC_860_Base]: (0, exports.MORPHO_BLUE_CBBTC_USDC_860_BASE)(networkId),
742
+ // wsuperOETHb/WETH Base
743
+ [types_1.MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base]: (0, exports.MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE)(networkId),
709
744
  // cbETH/WETH Base
710
745
  [types_1.MorphoBlueVersions.MorphoBlueCbEthEth_945_Base]: (0, exports.MORPHO_BLUE_CBETH_ETH_945_BASE)(networkId),
711
746
  [types_1.MorphoBlueVersions.MorphoBlueCbEthEth_965_Base]: (0, exports.MORPHO_BLUE_CBETH_ETH_965_BASE)(networkId),
package/cjs/markets/spark/marketAssets.js CHANGED
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.sparkAssetsDefaultMarket = exports.sparkAssetsDefaultMarketEth = void 0;
4
4
  const common_1 = require("../../types/common");
5
- exports.sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC'];
5
+ exports.sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS'];
6
6
  // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
7
7
  exports.sparkAssetsDefaultMarket = {
8
8
  [common_1.NetworkNumber.Eth]: exports.sparkAssetsDefaultMarketEth,
package/cjs/staking/staking.d.ts CHANGED
@@ -4,6 +4,7 @@ export declare const getStETHApr: (web3: Web3, fromBlock?: number, blockNumber?:
4
4
  export declare const getCbETHApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
5
5
  export declare const getREthApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
6
6
  export declare const getDsrApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
7
+ export declare const getSsrApy: () => Promise<string>;
7
8
  export declare const STAKING_ASSETS: string[];
8
9
  export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | "0" | undefined;
9
10
  export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
package/cjs/staking/staking.js CHANGED
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
12
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = exports.getDsrApy = exports.getREthApr = exports.getCbETHApr = exports.getStETHApr = void 0;
15
+ exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = exports.getSsrApy = exports.getDsrApy = exports.getREthApr = exports.getCbETHApr = exports.getStETHApr = void 0;
16
16
  const decimal_js_1 = __importDefault(require("decimal.js"));
17
17
  const contracts_1 = require("../contracts");
18
18
  const common_1 = require("../types/common");
@@ -86,13 +86,38 @@ const getDsrApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, vo
86
86
  .toString();
87
87
  });
88
88
  exports.getDsrApy = getDsrApy;
89
+ const getSsrApy = () => __awaiter(void 0, void 0, void 0, function* () {
90
+ const res = yield fetch('https://app.defisaver.com/api/sky/data');
91
+ const data = yield res.json();
92
+ return new decimal_js_1.default(data.data.skyData[0].sky_savings_rate_apy).mul(100).toString();
93
+ });
94
+ exports.getSsrApy = getSsrApy;
95
+ const getSuperOETHApy = () => __awaiter(void 0, void 0, void 0, function* () {
96
+ console.log('getSuperOETHApy');
97
+ const res = yield fetch('https://origin.squids.live/origin-squid/graphql', {
98
+ method: 'POST',
99
+ headers: {
100
+ 'Content-Type': 'application/json',
101
+ },
102
+ body: JSON.stringify({
103
+ query: '\n query OTokenApy($chainId: Int!, $token: String!) {\n oTokenApies(\n limit: 1\n orderBy: timestamp_DESC\n where: {chainId_eq: $chainId, otoken_containsInsensitive: $token}\n ) {\n apy7DayAvg\n apy14DayAvg\n apy30DayAvg\n apr\n apy\n }\n}\n ',
104
+ variables: {
105
+ token: '0xdbfefd2e8460a6ee4955a68582f85708baea60a3',
106
+ chainId: 8453,
107
+ },
108
+ }),
109
+ });
110
+ const data = yield res.json();
111
+ return new decimal_js_1.default(data.data.oTokenApies[0].apy).mul(100).toString();
112
+ });
89
113
  const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function* () {
90
114
  const res = yield fetch(`https://app.defisaver.com/api/staking/apy?asset=${asset}`);
91
115
  const data = yield res.json();
92
116
  return data.apy;
93
117
  });
94
- exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH'];
118
+ exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
95
119
  const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
120
+ console.log('getStakingApy', asset, blockNumber, fromBlock);
96
121
  try {
97
122
  if (asset === 'stETH' || asset === 'wstETH')
98
123
  return (0, exports.getStETHApr)(web3, fromBlock, blockNumber);
@@ -116,6 +141,10 @@ const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefine
116
141
  return getApyFromDfsApi('rsETH');
117
142
  if (asset === 'pufETH')
118
143
  return getApyFromDfsApi('pufETH');
144
+ if (asset === 'wsuperOETHb')
145
+ return getSuperOETHApy();
146
+ if (asset === 'sUSDS')
147
+ return (0, exports.getSsrApy)();
119
148
  }
120
149
  catch (e) {
121
150
  console.error(`Failed to fetch APY for ${asset}`);
package/cjs/types/morphoBlue.d.ts CHANGED
@@ -9,6 +9,7 @@ export declare enum MorphoBlueVersions {
9
9
  MorphoBlueWstEthUSDA_Exchange_Rate = "morphobluewstethusda_exchange_rate",
10
10
  MorphoBlueWstEthPYUSD = "morphobluwstethpyusd",
11
11
  MorphoBlueWeEthEth = "morphoblueweetheth",
12
+ MorphoBlueREthEth_945 = "morphoblueretheth_945",
12
13
  MorphoBlueWBTCPYUSD = "morphobluewbtcpyusd",
13
14
  MorphoBlueWBTCEth = "morphobluewbtceth",
14
15
  MorphoBlueUSDeUSDT = "morphoblueusdeusdt",
@@ -40,7 +41,8 @@ export declare enum MorphoBlueVersions {
40
41
  MorphoBlueREthUSDC_860_Base = "morphobluerethusdc_860_base",
41
42
  MorphoBlueREthEth_945_Base = "morphoblueretheth_945_base",
42
43
  MorphoBlueCbBTCEth_915_Base = "morphobluecbbtceth_915_base",
43
- MorphoBlueCbBTCUSDC_860_Base = "morphobluecbbtcusdc_860_base"
44
+ MorphoBlueCbBTCUSDC_860_Base = "morphobluecbbtcusdc_860_base",
45
+ MorphoBlueWsuperOETHbWETH_915_Base = "morphobluewsuperoethbweth_915_base"
44
46
  }
45
47
  export declare enum MorphoBlueOracleType {
46
48
  MARKET_RATE = "Market rate",
package/cjs/types/morphoBlue.js CHANGED
@@ -13,6 +13,7 @@ var MorphoBlueVersions;
13
13
  MorphoBlueVersions["MorphoBlueWstEthUSDA_Exchange_Rate"] = "morphobluewstethusda_exchange_rate";
14
14
  MorphoBlueVersions["MorphoBlueWstEthPYUSD"] = "morphobluwstethpyusd";
15
15
  MorphoBlueVersions["MorphoBlueWeEthEth"] = "morphoblueweetheth";
16
+ MorphoBlueVersions["MorphoBlueREthEth_945"] = "morphoblueretheth_945";
16
17
  MorphoBlueVersions["MorphoBlueWBTCPYUSD"] = "morphobluewbtcpyusd";
17
18
  MorphoBlueVersions["MorphoBlueWBTCEth"] = "morphobluewbtceth";
18
19
  MorphoBlueVersions["MorphoBlueUSDeUSDT"] = "morphoblueusdeusdt";
@@ -49,6 +50,7 @@ var MorphoBlueVersions;
49
50
  MorphoBlueVersions["MorphoBlueREthEth_945_Base"] = "morphoblueretheth_945_base";
50
51
  MorphoBlueVersions["MorphoBlueCbBTCEth_915_Base"] = "morphobluecbbtceth_915_base";
51
52
  MorphoBlueVersions["MorphoBlueCbBTCUSDC_860_Base"] = "morphobluecbbtcusdc_860_base";
53
+ MorphoBlueVersions["MorphoBlueWsuperOETHbWETH_915_Base"] = "morphobluewsuperoethbweth_915_base";
52
54
  })(MorphoBlueVersions || (exports.MorphoBlueVersions = MorphoBlueVersions = {}));
53
55
  var MorphoBlueOracleType;
54
56
  (function (MorphoBlueOracleType) {
package/esm/markets/compound/marketsAssets.js CHANGED
@@ -4,7 +4,7 @@ export const compoundV2CollateralAssets = [
4
4
  'cETH', 'cDAI', 'cBAT', 'cZRX', 'cUSDC', 'cWBTC Legacy', 'cWBTC', 'cUSDT',
5
5
  'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
6
6
  ].map((symbol) => getAssetInfo(symbol));
7
- export const v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'rswETH'];
7
+ export const v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC'];
8
8
  export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH', 'ezETH'];
9
9
  export const v3USDCCollAssetsBase = ['ETH', 'cbETH', 'wstETH', 'cbBTC'];
10
10
  export const v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC', 'wstETH'];
@@ -23,7 +23,7 @@ export const v3USDCeCollAssets = {
23
23
  [NetworkNumber.Arb]: v3USDCeCollAssetsArb,
24
24
  [NetworkNumber.Base]: [],
25
25
  };
26
- export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH'];
26
+ export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH', 'tBTC'];
27
27
  export const v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC'];
28
28
  export const v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC', 'rsETH', 'ezETH', 'USDC', 'USDT'];
29
29
  export const v3ETHCollAssetsOpt = ['rETH', 'wstETH', 'WBTC', 'ezETH', 'USDC', 'USDT', 'weETH', 'wrsETH'];
@@ -42,7 +42,7 @@ export const v3USDbCCollAssets = {
42
42
  [NetworkNumber.Arb]: [],
43
43
  [NetworkNumber.Base]: v3USDbCCollAssetsBase,
44
44
  };
45
- export const v3USDTCollAssetsEth = ['ETH', 'WBTC', 'wstETH', 'COMP', 'UNI', 'LINK', 'cbBTC'];
45
+ export const v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC'];
46
46
  export const v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
47
47
  export const v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP', 'wstETH'];
48
48
  // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
package/esm/markets/morphoBlue/index.d.ts CHANGED
@@ -30,6 +30,7 @@ export declare const MORPHO_BLUE_USDE_DAI_770: (networkId?: NetworkNumber) => Mo
30
30
  export declare const MORPHO_BLUE_USDE_DAI_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
31
31
  export declare const MORPHO_BLUE_USDE_DAI_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
32
32
  export declare const MORPHO_BLUE_USDE_DAI_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
33
+ export declare const MORPHO_BLUE_RETH_ETH_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
33
34
  export declare const MORPHO_BLUE_CBETH_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
34
35
  export declare const MORPHO_BLUE_WSTETH_ETH_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
35
36
  export declare const MORPHO_BLUE_WSTETH_ETH_965_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -41,6 +42,7 @@ export declare const MORPHO_BLUE_RETH_USDC_860_BASE: (networkId?: NetworkNumber)
41
42
  export declare const MORPHO_BLUE_RETH_ETH_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
42
43
  export declare const MORPHO_BLUE_CBBTC_ETH_915_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
43
44
  export declare const MORPHO_BLUE_CBBTC_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
45
+ export declare const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
44
46
  export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
45
47
  readonly morphobluewstethusdc: MorphoBlueMarketData;
46
48
  readonly morphobluesdaiusdc: MorphoBlueMarketData;
@@ -61,6 +63,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
61
63
  readonly morphobluetbtcusdc: MorphoBlueMarketData;
62
64
  readonly morphobluecbbtceth: MorphoBlueMarketData;
63
65
  readonly morphobluecbbtcusdc: MorphoBlueMarketData;
66
+ readonly morphoblueretheth_945: MorphoBlueMarketData;
64
67
  readonly morphobluewstetheth_945: MorphoBlueMarketData;
65
68
  readonly morphobluewstetheth_945_exchange_rate: MorphoBlueMarketData;
66
69
  readonly morphobluewstetheth_965_exchange_rate: MorphoBlueMarketData;
@@ -79,6 +82,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
79
82
  readonly morphoblueretheth_945_base: MorphoBlueMarketData;
80
83
  readonly morphobluecbbtceth_915_base: MorphoBlueMarketData;
81
84
  readonly morphobluecbbtcusdc_860_base: MorphoBlueMarketData;
85
+ readonly morphobluewsuperoethbweth_915_base: MorphoBlueMarketData;
82
86
  readonly morphobluecbetheth_945_base: MorphoBlueMarketData;
83
87
  readonly morphobluecbetheth_965_base: MorphoBlueMarketData;
84
88
  readonly morphobluewstetheth_945_base: MorphoBlueMarketData;
package/esm/markets/morphoBlue/index.js CHANGED
@@ -454,6 +454,21 @@ export const MORPHO_BLUE_USDE_DAI_945 = (networkId = NetworkNumber.Eth) => ({
454
454
  marketId: '0xdb760246f6859780f6c1b272d47a8f64710777121118e56e0cdb4b8b744a3094',
455
455
  protocolName: 'morpho-blue',
456
456
  });
457
+ export const MORPHO_BLUE_RETH_ETH_945 = (networkId = NetworkNumber.Eth) => ({
458
+ chainIds: [1],
459
+ label: 'Morpho',
460
+ shortLabel: 'rETH/ETH',
461
+ value: MorphoBlueVersions.MorphoBlueREthEth_945,
462
+ url: 'retheth-3c83f77b',
463
+ loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
464
+ collateralToken: '0xae78736Cd615f374D3085123A210448E74Fc6393',
465
+ oracle: '0x1b4A3F92e5Fffd1d35A98751c9FE4472483579bB',
466
+ oracleType: MorphoBlueOracleType.MARKET_RATE,
467
+ irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
468
+ lltv: 0.945,
469
+ marketId: '0x3c83f77bde9541f8d3d82533b19bbc1f97eb2f1098bb991728acbfbede09cc5d',
470
+ protocolName: 'morpho-blue',
471
+ });
457
472
  // BASE
458
473
  export const MORPHO_BLUE_CBETH_USDC_860_BASE = (networkId = NetworkNumber.Eth) => ({
459
474
  chainIds: [NetworkNumber.Base],
@@ -620,6 +635,21 @@ export const MORPHO_BLUE_CBBTC_USDC_860_BASE = (networkId = NetworkNumber.Eth) =
620
635
  marketId: '0x9103c3b4e834476c9a62ea009ba2c884ee42e94e6e314a26f04d312434191836',
621
636
  protocolName: 'morpho-blue',
622
637
  });
638
+ export const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = (networkId = NetworkNumber.Eth) => ({
639
+ chainIds: [NetworkNumber.Base],
640
+ label: 'Morpho',
641
+ shortLabel: 'wsuperOETHb/WETH',
642
+ value: MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base,
643
+ url: 'wsuperoethbweth-144bf18d',
644
+ loanToken: '0x4200000000000000000000000000000000000006',
645
+ collateralToken: '0x7FcD174E80f264448ebeE8c88a7C4476AAF58Ea6',
646
+ oracle: '0x28C964c985fe84736fAdc7Cf0bBd58B54bc7CF93',
647
+ oracleType: MorphoBlueOracleType.MARKET_RATE,
648
+ irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
649
+ lltv: 0.915,
650
+ marketId: '0x144bf18d6bf4c59602548a825034f73bf1d20177fc5f975fc69d5a5eba929b45',
651
+ protocolName: 'morpho-blue',
652
+ });
623
653
  export const MorphoBlueMarkets = (networkId) => ({
624
654
  [MorphoBlueVersions.MorphoBlueWstEthUSDC]: MORPHO_BLUE_WSTETH_USDC(networkId),
625
655
  [MorphoBlueVersions.MorphoBlueSDAIUSDC]: MORPHO_BLUE_SDAI_USDC(networkId),
@@ -640,6 +670,7 @@ export const MorphoBlueMarkets = (networkId) => ({
640
670
  [MorphoBlueVersions.MorphoBlueTBTCUSDC]: MORPHO_BLUE_TBTC_USDC(networkId),
641
671
  [MorphoBlueVersions.MorphoBlueCbBTCEth_915]: MORPHO_BLUE_CBBTC_ETH_915(networkId),
642
672
  [MorphoBlueVersions.MorphoBlueCbBTCUSDC_860]: MORPHO_BLUE_CBBTC_USDC_860(networkId),
673
+ [MorphoBlueVersions.MorphoBlueREthEth_945]: MORPHO_BLUE_RETH_ETH_945(networkId),
643
674
  // wstETH/WETH
644
675
  [MorphoBlueVersions.MorphoBlueWstEthEth_945]: MORPHO_BLUE_WSTETH_ETH_945(networkId),
645
676
  [MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE(networkId),
@@ -662,6 +693,8 @@ export const MorphoBlueMarkets = (networkId) => ({
662
693
  [MorphoBlueVersions.MorphoBlueREthEth_945_Base]: MORPHO_BLUE_RETH_ETH_945_BASE(networkId),
663
694
  [MorphoBlueVersions.MorphoBlueCbBTCEth_915_Base]: MORPHO_BLUE_CBBTC_ETH_915_BASE(networkId),
664
695
  [MorphoBlueVersions.MorphoBlueCbBTCUSDC_860_Base]: MORPHO_BLUE_CBBTC_USDC_860_BASE(networkId),
696
+ // wsuperOETHb/WETH Base
697
+ [MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base]: MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE(networkId),
665
698
  // cbETH/WETH Base
666
699
  [MorphoBlueVersions.MorphoBlueCbEthEth_945_Base]: MORPHO_BLUE_CBETH_ETH_945_BASE(networkId),
667
700
  [MorphoBlueVersions.MorphoBlueCbEthEth_965_Base]: MORPHO_BLUE_CBETH_ETH_965_BASE(networkId),
package/esm/markets/spark/marketAssets.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { NetworkNumber } from '../../types/common';
2
- export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC'];
2
+ export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS'];
3
3
  // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
4
4
  export const sparkAssetsDefaultMarket = {
5
5
  [NetworkNumber.Eth]: sparkAssetsDefaultMarketEth,
package/esm/staking/staking.d.ts CHANGED
@@ -4,6 +4,7 @@ export declare const getStETHApr: (web3: Web3, fromBlock?: number, blockNumber?:
4
4
  export declare const getCbETHApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
5
5
  export declare const getREthApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
6
6
  export declare const getDsrApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
7
+ export declare const getSsrApy: () => Promise<string>;
7
8
  export declare const STAKING_ASSETS: string[];
8
9
  export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | "0" | undefined;
9
10
  export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
package/esm/staking/staking.js CHANGED
@@ -76,13 +76,37 @@ export const getDsrApy = (web3, blockNumber = 'latest') => __awaiter(void 0, voi
76
76
  .mul(100)
77
77
  .toString();
78
78
  });
79
+ export const getSsrApy = () => __awaiter(void 0, void 0, void 0, function* () {
80
+ const res = yield fetch('https://app.defisaver.com/api/sky/data');
81
+ const data = yield res.json();
82
+ return new Dec(data.data.skyData[0].sky_savings_rate_apy).mul(100).toString();
83
+ });
84
+ const getSuperOETHApy = () => __awaiter(void 0, void 0, void 0, function* () {
85
+ console.log('getSuperOETHApy');
86
+ const res = yield fetch('https://origin.squids.live/origin-squid/graphql', {
87
+ method: 'POST',
88
+ headers: {
89
+ 'Content-Type': 'application/json',
90
+ },
91
+ body: JSON.stringify({
92
+ query: '\n query OTokenApy($chainId: Int!, $token: String!) {\n oTokenApies(\n limit: 1\n orderBy: timestamp_DESC\n where: {chainId_eq: $chainId, otoken_containsInsensitive: $token}\n ) {\n apy7DayAvg\n apy14DayAvg\n apy30DayAvg\n apr\n apy\n }\n}\n ',
93
+ variables: {
94
+ token: '0xdbfefd2e8460a6ee4955a68582f85708baea60a3',
95
+ chainId: 8453,
96
+ },
97
+ }),
98
+ });
99
+ const data = yield res.json();
100
+ return new Dec(data.data.oTokenApies[0].apy).mul(100).toString();
101
+ });
79
102
  const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function* () {
80
103
  const res = yield fetch(`https://app.defisaver.com/api/staking/apy?asset=${asset}`);
81
104
  const data = yield res.json();
82
105
  return data.apy;
83
106
  });
84
- export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH'];
107
+ export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
85
108
  export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
109
+ console.log('getStakingApy', asset, blockNumber, fromBlock);
86
110
  try {
87
111
  if (asset === 'stETH' || asset === 'wstETH')
88
112
  return getStETHApr(web3, fromBlock, blockNumber);
@@ -106,6 +130,10 @@ export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = u
106
130
  return getApyFromDfsApi('rsETH');
107
131
  if (asset === 'pufETH')
108
132
  return getApyFromDfsApi('pufETH');
133
+ if (asset === 'wsuperOETHb')
134
+ return getSuperOETHApy();
135
+ if (asset === 'sUSDS')
136
+ return getSsrApy();
109
137
  }
110
138
  catch (e) {
111
139
  console.error(`Failed to fetch APY for ${asset}`);
package/esm/types/morphoBlue.d.ts CHANGED
@@ -9,6 +9,7 @@ export declare enum MorphoBlueVersions {
9
9
  MorphoBlueWstEthUSDA_Exchange_Rate = "morphobluewstethusda_exchange_rate",
10
10
  MorphoBlueWstEthPYUSD = "morphobluwstethpyusd",
11
11
  MorphoBlueWeEthEth = "morphoblueweetheth",
12
+ MorphoBlueREthEth_945 = "morphoblueretheth_945",
12
13
  MorphoBlueWBTCPYUSD = "morphobluewbtcpyusd",
13
14
  MorphoBlueWBTCEth = "morphobluewbtceth",
14
15
  MorphoBlueUSDeUSDT = "morphoblueusdeusdt",
@@ -40,7 +41,8 @@ export declare enum MorphoBlueVersions {
40
41
  MorphoBlueREthUSDC_860_Base = "morphobluerethusdc_860_base",
41
42
  MorphoBlueREthEth_945_Base = "morphoblueretheth_945_base",
42
43
  MorphoBlueCbBTCEth_915_Base = "morphobluecbbtceth_915_base",
43
- MorphoBlueCbBTCUSDC_860_Base = "morphobluecbbtcusdc_860_base"
44
+ MorphoBlueCbBTCUSDC_860_Base = "morphobluecbbtcusdc_860_base",
45
+ MorphoBlueWsuperOETHbWETH_915_Base = "morphobluewsuperoethbweth_915_base"
44
46
  }
45
47
  export declare enum MorphoBlueOracleType {
46
48
  MARKET_RATE = "Market rate",
package/esm/types/morphoBlue.js CHANGED
@@ -10,6 +10,7 @@ export var MorphoBlueVersions;
10
10
  MorphoBlueVersions["MorphoBlueWstEthUSDA_Exchange_Rate"] = "morphobluewstethusda_exchange_rate";
11
11
  MorphoBlueVersions["MorphoBlueWstEthPYUSD"] = "morphobluwstethpyusd";
12
12
  MorphoBlueVersions["MorphoBlueWeEthEth"] = "morphoblueweetheth";
13
+ MorphoBlueVersions["MorphoBlueREthEth_945"] = "morphoblueretheth_945";
13
14
  MorphoBlueVersions["MorphoBlueWBTCPYUSD"] = "morphobluewbtcpyusd";
14
15
  MorphoBlueVersions["MorphoBlueWBTCEth"] = "morphobluewbtceth";
15
16
  MorphoBlueVersions["MorphoBlueUSDeUSDT"] = "morphoblueusdeusdt";
@@ -46,6 +47,7 @@ export var MorphoBlueVersions;
46
47
  MorphoBlueVersions["MorphoBlueREthEth_945_Base"] = "morphoblueretheth_945_base";
47
48
  MorphoBlueVersions["MorphoBlueCbBTCEth_915_Base"] = "morphobluecbbtceth_915_base";
48
49
  MorphoBlueVersions["MorphoBlueCbBTCUSDC_860_Base"] = "morphobluecbbtcusdc_860_base";
50
+ MorphoBlueVersions["MorphoBlueWsuperOETHbWETH_915_Base"] = "morphobluewsuperoethbweth_915_base";
49
51
  })(MorphoBlueVersions || (MorphoBlueVersions = {}));
50
52
  export var MorphoBlueOracleType;
51
53
  (function (MorphoBlueOracleType) {
package/package.json CHANGED
@@ -1,37 +1,42 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "0.0.166-dev",
3
+ "version": "0.0.166-dev2",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
7
7
  "types": "./esm/index.d.ts",
8
8
  "scripts": {
9
9
  "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
10
- "build:cjs": "rm -rf cjs && tsc -p tsconfig.json",
10
+ "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
11
11
  "build": "npm run lint && npm run generate-contracts && npm run build:cjs && npm run build:esm",
12
12
  "dev": "npm run generate-contracts && tsc -p tsconfig.json --watch",
13
13
  "lint": "eslint src/ --fix",
14
14
  "lint-check": "eslint src/",
15
15
  "generate-contracts": "node scripts/generateContracts.js",
16
16
  "test": "mocha tests/*",
17
- "test-single": "mocha ./tests/$npm_config_name.js",
17
+ "test-single": "mocha ./tests/$npm_config_name.ts",
18
18
  "test:debugger": "mocha --inspect-brk tests/*",
19
- "build-test": "npm run build && npm run test"
19
+ "build-test": "npm run build && npm run test",
20
+ "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
20
21
  },
21
22
  "keywords": [],
22
23
  "author": "",
23
24
  "license": "ISC",
24
25
  "dependencies": {
25
- "@defisaver/tokens": "^1.5.37",
26
+ "@defisaver/tokens": "^1.5.45",
26
27
  "@ethersproject/bignumber": "^5.7.0",
27
28
  "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
28
29
  "decimal.js": "^10.4.3"
29
30
  },
30
31
  "devDependencies": {
31
32
  "@defisaver/eslint-config": "^1.0.1",
33
+ "@types/chai": "^5.0.0",
34
+ "@types/mocha": "^10.0.9",
35
+ "@types/web3": "^1.0.20",
32
36
  "chai": "^4.3.8",
33
37
  "dotenv": "^16.3.1",
34
38
  "eslint": "^8.49.0",
39
+ "eslint-plugin-import": "^2.31.0",
35
40
  "mocha": "^10.2.0",
36
41
  "ts-node": "^10.9.2",
37
42
  "typechain": "^8.3.1",
package/src/markets/compound/marketsAssets.ts CHANGED
@@ -6,7 +6,7 @@ export const compoundV2CollateralAssets = [
6
6
  'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
7
7
  ].map((symbol) => getAssetInfo(symbol));
8
8
 
9
- export const v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'rswETH'];
9
+ export const v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC'];
10
10
  export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH', 'ezETH'];
11
11
  export const v3USDCCollAssetsBase = ['ETH', 'cbETH', 'wstETH', 'cbBTC'];
12
12
  export const v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC', 'wstETH'];
@@ -29,7 +29,7 @@ export const v3USDCeCollAssets = {
29
29
  [NetworkNumber.Base]: [],
30
30
  } as const;
31
31
 
32
- export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH'];
32
+ export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH', 'tBTC'];
33
33
  export const v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC'];
34
34
  export const v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC', 'rsETH', 'ezETH', 'USDC', 'USDT'];
35
35
  export const v3ETHCollAssetsOpt = ['rETH', 'wstETH', 'WBTC', 'ezETH', 'USDC', 'USDT', 'weETH', 'wrsETH'];
@@ -52,7 +52,7 @@ export const v3USDbCCollAssets = {
52
52
  [NetworkNumber.Base]: v3USDbCCollAssetsBase,
53
53
  };
54
54
 
55
- export const v3USDTCollAssetsEth = ['ETH', 'WBTC', 'wstETH', 'COMP', 'UNI', 'LINK', 'cbBTC'];
55
+ export const v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC'];
56
56
  export const v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
57
57
  export const v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP', 'wstETH'];
58
58
 
package/src/markets/morphoBlue/index.ts CHANGED
@@ -460,6 +460,22 @@ export const MORPHO_BLUE_USDE_DAI_945 = (networkId: NetworkNumber = NetworkNumbe
460
460
  protocolName: 'morpho-blue',
461
461
  });
462
462
 
463
+ export const MORPHO_BLUE_RETH_ETH_945 = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
464
+ chainIds: [1],
465
+ label: 'Morpho',
466
+ shortLabel: 'rETH/ETH',
467
+ value: MorphoBlueVersions.MorphoBlueREthEth_945,
468
+ url: 'retheth-3c83f77b',
469
+ loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
470
+ collateralToken: '0xae78736Cd615f374D3085123A210448E74Fc6393',
471
+ oracle: '0x1b4A3F92e5Fffd1d35A98751c9FE4472483579bB',
472
+ oracleType: MorphoBlueOracleType.MARKET_RATE,
473
+ irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
474
+ lltv: 0.945,
475
+ marketId: '0x3c83f77bde9541f8d3d82533b19bbc1f97eb2f1098bb991728acbfbede09cc5d',
476
+ protocolName: 'morpho-blue',
477
+ });
478
+
463
479
  // BASE
464
480
 
465
481
  export const MORPHO_BLUE_CBETH_USDC_860_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
@@ -628,6 +644,22 @@ export const MORPHO_BLUE_CBBTC_USDC_860_BASE = (networkId: NetworkNumber = Netwo
628
644
  protocolName: 'morpho-blue',
629
645
  });
630
646
 
647
+ export const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
648
+ chainIds: [NetworkNumber.Base],
649
+ label: 'Morpho',
650
+ shortLabel: 'wsuperOETHb/WETH',
651
+ value: MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base,
652
+ url: 'wsuperoethbweth-144bf18d',
653
+ loanToken: '0x4200000000000000000000000000000000000006',
654
+ collateralToken: '0x7FcD174E80f264448ebeE8c88a7C4476AAF58Ea6',
655
+ oracle: '0x28C964c985fe84736fAdc7Cf0bBd58B54bc7CF93',
656
+ oracleType: MorphoBlueOracleType.MARKET_RATE,
657
+ irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
658
+ lltv: 0.915,
659
+ marketId: '0x144bf18d6bf4c59602548a825034f73bf1d20177fc5f975fc69d5a5eba929b45',
660
+ protocolName: 'morpho-blue',
661
+ });
662
+
631
663
  export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
632
664
  [MorphoBlueVersions.MorphoBlueWstEthUSDC]: MORPHO_BLUE_WSTETH_USDC(networkId),
633
665
  [MorphoBlueVersions.MorphoBlueSDAIUSDC]: MORPHO_BLUE_SDAI_USDC(networkId),
@@ -648,6 +680,8 @@ export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
648
680
  [MorphoBlueVersions.MorphoBlueTBTCUSDC]: MORPHO_BLUE_TBTC_USDC(networkId),
649
681
  [MorphoBlueVersions.MorphoBlueCbBTCEth_915]: MORPHO_BLUE_CBBTC_ETH_915(networkId),
650
682
  [MorphoBlueVersions.MorphoBlueCbBTCUSDC_860]: MORPHO_BLUE_CBBTC_USDC_860(networkId),
683
+ [MorphoBlueVersions.MorphoBlueREthEth_945]: MORPHO_BLUE_RETH_ETH_945(networkId),
684
+
651
685
  // wstETH/WETH
652
686
  [MorphoBlueVersions.MorphoBlueWstEthEth_945]: MORPHO_BLUE_WSTETH_ETH_945(networkId),
653
687
  [MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE(networkId),
@@ -672,6 +706,9 @@ export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
672
706
  [MorphoBlueVersions.MorphoBlueCbBTCEth_915_Base]: MORPHO_BLUE_CBBTC_ETH_915_BASE(networkId),
673
707
  [MorphoBlueVersions.MorphoBlueCbBTCUSDC_860_Base]: MORPHO_BLUE_CBBTC_USDC_860_BASE(networkId),
674
708
 
709
+ // wsuperOETHb/WETH Base
710
+ [MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base]: MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE(networkId),
711
+
675
712
  // cbETH/WETH Base
676
713
  [MorphoBlueVersions.MorphoBlueCbEthEth_945_Base]: MORPHO_BLUE_CBETH_ETH_945_BASE(networkId),
677
714
  [MorphoBlueVersions.MorphoBlueCbEthEth_965_Base]: MORPHO_BLUE_CBETH_ETH_965_BASE(networkId),
package/src/markets/spark/marketAssets.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { NetworkNumber } from '../../types/common';
2
2
 
3
- export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC'];
3
+ export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS'];
4
4
 
5
5
  // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
6
6
  export const sparkAssetsDefaultMarket = {
package/src/staking/staking.ts CHANGED
@@ -77,15 +77,42 @@ export const getDsrApy = async (web3: Web3, blockNumber: 'latest' | number = 'la
77
77
  .toString();
78
78
  };
79
79
 
80
+ export const getSsrApy = async () => {
81
+ const res = await fetch('https://app.defisaver.com/api/sky/data');
82
+ const data = await res.json();
83
+ return new Dec(data.data.skyData[0].sky_savings_rate_apy).mul(100).toString();
84
+ };
85
+
86
+ const getSuperOETHApy = async () => {
87
+ console.log('getSuperOETHApy');
88
+ const res = await fetch('https://origin.squids.live/origin-squid/graphql', {
89
+ method: 'POST',
90
+ headers: {
91
+ 'Content-Type': 'application/json',
92
+ },
93
+ body: JSON.stringify({
94
+ query: '\n query OTokenApy($chainId: Int!, $token: String!) {\n oTokenApies(\n limit: 1\n orderBy: timestamp_DESC\n where: {chainId_eq: $chainId, otoken_containsInsensitive: $token}\n ) {\n apy7DayAvg\n apy14DayAvg\n apy30DayAvg\n apr\n apy\n }\n}\n ',
95
+ variables: {
96
+ token: '0xdbfefd2e8460a6ee4955a68582f85708baea60a3',
97
+ chainId: 8453,
98
+ },
99
+ }),
100
+ });
101
+
102
+ const data = await res.json();
103
+ return new Dec(data.data.oTokenApies[0].apy).mul(100).toString();
104
+ };
105
+
80
106
  const getApyFromDfsApi = async (asset: string) => {
81
107
  const res = await fetch(`https://app.defisaver.com/api/staking/apy?asset=${asset}`);
82
108
  const data = await res.json();
83
109
  return data.apy;
84
110
  };
85
111
 
86
- export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH'];
112
+ export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
87
113
 
88
114
  export const getStakingApy = (asset: string, web3: Web3, blockNumber: 'latest' | number = 'latest', fromBlock: number | undefined = undefined) => {
115
+ console.log('getStakingApy', asset, blockNumber, fromBlock);
89
116
  try {
90
117
  if (asset === 'stETH' || asset === 'wstETH') return getStETHApr(web3, fromBlock, blockNumber);
91
118
  if (asset === 'cbETH') return getCbETHApr(web3, blockNumber);
@@ -98,6 +125,8 @@ export const getStakingApy = (asset: string, web3: Web3, blockNumber: 'latest' |
98
125
  if (asset === 'ETHx') return getApyFromDfsApi('ETHx');
99
126
  if (asset === 'rsETH' || asset === 'wrsETH') return getApyFromDfsApi('rsETH');
100
127
  if (asset === 'pufETH') return getApyFromDfsApi('pufETH');
128
+ if (asset === 'wsuperOETHb') return getSuperOETHApy();
129
+ if (asset === 'sUSDS') return getSsrApy();
101
130
  } catch (e) {
102
131
  console.error(`Failed to fetch APY for ${asset}`);
103
132
  return '0';
@@ -117,7 +146,7 @@ export const calculateInterestEarned = (principal: string, interest: string, typ
117
146
  return (+principal * (1 + (+interest / 100 * interval))) - +principal;
118
147
  }
119
148
 
120
- return (+principal * (((1 + (+interest / 100) / BLOCKS_IN_A_YEAR)) ** (BLOCKS_IN_A_YEAR * interval))) - +principal; // eslint-disable-line
149
+ return (+principal * (((1 + (+interest / 100) / BLOCKS_IN_A_YEAR)) ** (BLOCKS_IN_A_YEAR * interval))) - +principal; // eslint-disable-line
121
150
  };
122
151
 
123
152
  export const calculateNetApy = (usedAssets: MMUsedAssets, assetsData: MMAssetsData, isMorpho = false) => {
package/src/types/morphoBlue.ts CHANGED
@@ -11,6 +11,7 @@ export enum MorphoBlueVersions {
11
11
  MorphoBlueWstEthUSDA_Exchange_Rate = 'morphobluewstethusda_exchange_rate', // wstETH/USDA
12
12
  MorphoBlueWstEthPYUSD = 'morphobluwstethpyusd', // wstETH/PYUSD
13
13
  MorphoBlueWeEthEth = 'morphoblueweetheth', // weETH/ETH
14
+ MorphoBlueREthEth_945 = 'morphoblueretheth_945', // rETH/ETH
14
15
  MorphoBlueWBTCPYUSD = 'morphobluewbtcpyusd', // WBTC/PYUSD
15
16
  MorphoBlueWBTCEth = 'morphobluewbtceth', // WBTC/ETH
16
17
  MorphoBlueUSDeUSDT = 'morphoblueusdeusdt', // USDe/USDT
@@ -48,6 +49,7 @@ export enum MorphoBlueVersions {
48
49
  MorphoBlueREthEth_945_Base = 'morphoblueretheth_945_base',
49
50
  MorphoBlueCbBTCEth_915_Base = 'morphobluecbbtceth_915_base',
50
51
  MorphoBlueCbBTCUSDC_860_Base = 'morphobluecbbtcusdc_860_base',
52
+ MorphoBlueWsuperOETHbWETH_915_Base = 'morphobluewsuperoethbweth_915_base',
51
53
  }
52
54
 
53
55
  export enum MorphoBlueOracleType {