@defisaver/positions-sdk 0.0.72 → 0.0.74

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.
@@ -2,5 +2,5 @@ export { AaveMarkets } from './aave';
2
2
  export { CompoundMarkets } from './compound';
3
3
  export { SparkMarkets } from './spark';
4
4
  export { CrvUsdMarkets } from './curveUsd';
5
- export { MorphoBlueMarkets } from './morphoBlue';
5
+ export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
6
6
  export { LlamaLendMarkets } from './llamaLend';
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.LlamaLendMarkets = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.CompoundMarkets = exports.AaveMarkets = void 0;
3
+ exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.CompoundMarkets = exports.AaveMarkets = void 0;
4
4
  var aave_1 = require("./aave");
5
5
  Object.defineProperty(exports, "AaveMarkets", { enumerable: true, get: function () { return aave_1.AaveMarkets; } });
6
6
  var compound_1 = require("./compound");
@@ -11,5 +11,6 @@ var curveUsd_1 = require("./curveUsd");
11
11
  Object.defineProperty(exports, "CrvUsdMarkets", { enumerable: true, get: function () { return curveUsd_1.CrvUsdMarkets; } });
12
12
  var morphoBlue_1 = require("./morphoBlue");
13
13
  Object.defineProperty(exports, "MorphoBlueMarkets", { enumerable: true, get: function () { return morphoBlue_1.MorphoBlueMarkets; } });
14
+ Object.defineProperty(exports, "findMorphoBlueMarket", { enumerable: true, get: function () { return morphoBlue_1.findMorphoBlueMarket; } });
14
15
  var llamaLend_1 = require("./llamaLend");
15
16
  Object.defineProperty(exports, "LlamaLendMarkets", { enumerable: true, get: function () { return llamaLend_1.LlamaLendMarkets; } });
@@ -54,3 +54,4 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
54
54
  readonly morphoblueusdedai_915: MorphoBlueMarketData;
55
55
  readonly morphoblueusdedai_945: MorphoBlueMarketData;
56
56
  };
57
+ export declare const findMorphoBlueMarket: (collateralToken: string, loanToken: string, lltv: number, oracle: string, irm: string, network?: NetworkNumber) => MorphoBlueMarketData | null;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.MorphoBlueMarkets = 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_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_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_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 types_1 = require("../../types");
5
5
  const common_1 = require("../../types/common");
6
6
  const MORPHO_BLUE_WSTETH_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -454,3 +454,13 @@ const MorphoBlueMarkets = (networkId) => ({
454
454
  [types_1.MorphoBlueVersions.MorphoBlueUSDeDAI_945]: (0, exports.MORPHO_BLUE_USDE_DAI_945)(networkId),
455
455
  });
456
456
  exports.MorphoBlueMarkets = MorphoBlueMarkets;
457
+ const findMorphoBlueMarket = (collateralToken, loanToken, lltv, oracle, irm, network = common_1.NetworkNumber.Eth) => {
458
+ const markets = (0, exports.MorphoBlueMarkets)(network);
459
+ for (const market of Object.values(markets)) {
460
+ if (market.collateralToken === collateralToken && market.loanToken === loanToken && market.lltv === lltv && market.oracle === oracle && market.irm === irm) {
461
+ return market;
462
+ }
463
+ }
464
+ return null;
465
+ };
466
+ exports.findMorphoBlueMarket = findMorphoBlueMarket;
@@ -85,7 +85,7 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
85
85
  assetsData[(0, utils_1.wethToEth)(loanTokenInfo.symbol)] = {
86
86
  symbol: (0, utils_1.wethToEth)(loanTokenInfo.symbol),
87
87
  address: loanToken,
88
- price: new decimal_js_1.default(loanTokenPrice).div(1e8).toString(),
88
+ price: loanTokenInfo.symbol === 'USDA' ? '1' : new decimal_js_1.default(loanTokenPrice).div(1e8).toString(),
89
89
  supplyRate: new decimal_js_1.default(supplyRate).div(constants_1.WAD).mul(100).toString(),
90
90
  borrowRate: new decimal_js_1.default(compoundedBorrowRate).div(constants_1.WAD).mul(100).toString(),
91
91
  totalSupply: new decimal_js_1.default(marketInfo.totalSupplyAssets).div(scale).toString(),
@@ -96,7 +96,7 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
96
96
  assetsData[(0, utils_1.wethToEth)(collateralTokenInfo.symbol)] = {
97
97
  symbol: (0, utils_1.wethToEth)(collateralTokenInfo.symbol),
98
98
  address: collateralToken,
99
- price: new decimal_js_1.default(loanTokenPrice).div(1e8).mul(oracleRate).toString(),
99
+ price: new decimal_js_1.default(assetsData[(0, utils_1.wethToEth)(loanTokenInfo.symbol)].price).mul(oracleRate).toString(),
100
100
  supplyRate: '0',
101
101
  borrowRate: '0',
102
102
  canBeSupplied: true,
@@ -2,5 +2,5 @@ export { AaveMarkets } from './aave';
2
2
  export { CompoundMarkets } from './compound';
3
3
  export { SparkMarkets } from './spark';
4
4
  export { CrvUsdMarkets } from './curveUsd';
5
- export { MorphoBlueMarkets } from './morphoBlue';
5
+ export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
6
6
  export { LlamaLendMarkets } from './llamaLend';
@@ -2,5 +2,5 @@ export { AaveMarkets } from './aave';
2
2
  export { CompoundMarkets } from './compound';
3
3
  export { SparkMarkets } from './spark';
4
4
  export { CrvUsdMarkets } from './curveUsd';
5
- export { MorphoBlueMarkets } from './morphoBlue';
5
+ export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
6
6
  export { LlamaLendMarkets } from './llamaLend';
@@ -54,3 +54,4 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
54
54
  readonly morphoblueusdedai_915: MorphoBlueMarketData;
55
55
  readonly morphoblueusdedai_945: MorphoBlueMarketData;
56
56
  };
57
+ export declare const findMorphoBlueMarket: (collateralToken: string, loanToken: string, lltv: number, oracle: string, irm: string, network?: NetworkNumber) => MorphoBlueMarketData | null;
@@ -424,3 +424,12 @@ export const MorphoBlueMarkets = (networkId) => ({
424
424
  [MorphoBlueVersions.MorphoBlueUSDeDAI_915]: MORPHO_BLUE_USDE_DAI_915(networkId),
425
425
  [MorphoBlueVersions.MorphoBlueUSDeDAI_945]: MORPHO_BLUE_USDE_DAI_945(networkId),
426
426
  });
427
+ export const findMorphoBlueMarket = (collateralToken, loanToken, lltv, oracle, irm, network = NetworkNumber.Eth) => {
428
+ const markets = MorphoBlueMarkets(network);
429
+ for (const market of Object.values(markets)) {
430
+ if (market.collateralToken === collateralToken && market.loanToken === loanToken && market.lltv === lltv && market.oracle === oracle && market.irm === irm) {
431
+ return market;
432
+ }
433
+ }
434
+ return null;
435
+ };
@@ -79,7 +79,7 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
79
79
  assetsData[wethToEth(loanTokenInfo.symbol)] = {
80
80
  symbol: wethToEth(loanTokenInfo.symbol),
81
81
  address: loanToken,
82
- price: new Dec(loanTokenPrice).div(1e8).toString(),
82
+ price: loanTokenInfo.symbol === 'USDA' ? '1' : new Dec(loanTokenPrice).div(1e8).toString(),
83
83
  supplyRate: new Dec(supplyRate).div(WAD).mul(100).toString(),
84
84
  borrowRate: new Dec(compoundedBorrowRate).div(WAD).mul(100).toString(),
85
85
  totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
@@ -90,7 +90,7 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
90
90
  assetsData[wethToEth(collateralTokenInfo.symbol)] = {
91
91
  symbol: wethToEth(collateralTokenInfo.symbol),
92
92
  address: collateralToken,
93
- price: new Dec(loanTokenPrice).div(1e8).mul(oracleRate).toString(),
93
+ price: new Dec(assetsData[wethToEth(loanTokenInfo.symbol)].price).mul(oracleRate).toString(),
94
94
  supplyRate: '0',
95
95
  borrowRate: '0',
96
96
  canBeSupplied: true,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "0.0.72",
3
+ "version": "0.0.74",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
@@ -2,5 +2,5 @@ export { AaveMarkets } from './aave';
2
2
  export { CompoundMarkets } from './compound';
3
3
  export { SparkMarkets } from './spark';
4
4
  export { CrvUsdMarkets } from './curveUsd';
5
- export { MorphoBlueMarkets } from './morphoBlue';
5
+ export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
6
6
  export { LlamaLendMarkets } from './llamaLend';
@@ -429,4 +429,14 @@ export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
429
429
  [MorphoBlueVersions.MorphoBlueUSDeDAI_860]: MORPHO_BLUE_USDE_DAI_860(networkId),
430
430
  [MorphoBlueVersions.MorphoBlueUSDeDAI_915]: MORPHO_BLUE_USDE_DAI_915(networkId),
431
431
  [MorphoBlueVersions.MorphoBlueUSDeDAI_945]: MORPHO_BLUE_USDE_DAI_945(networkId),
432
- }) as const;
432
+ }) as const;
433
+
434
+ export const findMorphoBlueMarket = (collateralToken: string, loanToken: string, lltv: number, oracle: string, irm: string, network = NetworkNumber.Eth) => {
435
+ const markets = MorphoBlueMarkets(network);
436
+ for (const market of Object.values(markets)) {
437
+ if (market.collateralToken === collateralToken && market.loanToken === loanToken && market.lltv === lltv && market.oracle === oracle && market.irm === irm) {
438
+ return market;
439
+ }
440
+ }
441
+ return null;
442
+ };
@@ -93,7 +93,7 @@ export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber
93
93
  assetsData[wethToEth(loanTokenInfo.symbol)] = {
94
94
  symbol: wethToEth(loanTokenInfo.symbol),
95
95
  address: loanToken,
96
- price: new Dec(loanTokenPrice).div(1e8).toString(),
96
+ price: loanTokenInfo.symbol === 'USDA' ? '1' : new Dec(loanTokenPrice).div(1e8).toString(),
97
97
  supplyRate: new Dec(supplyRate).div(WAD).mul(100).toString(),
98
98
  borrowRate: new Dec(compoundedBorrowRate).div(WAD).mul(100).toString(),
99
99
  totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
@@ -105,7 +105,7 @@ export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber
105
105
  assetsData[wethToEth(collateralTokenInfo.symbol)] = {
106
106
  symbol: wethToEth(collateralTokenInfo.symbol),
107
107
  address: collateralToken,
108
- price: new Dec(loanTokenPrice).div(1e8).mul(oracleRate).toString(),
108
+ price: new Dec(assetsData[wethToEth(loanTokenInfo.symbol)].price).mul(oracleRate).toString(),
109
109
  supplyRate: '0',
110
110
  borrowRate: '0',
111
111
  canBeSupplied: true,