@defisaver/positions-sdk 0.0.166-dev → 0.0.166-dev10-liquity-v2

package/cjs/liquityV2/index.js

@@ -0,0 +1,139 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLiquityV2TroveData = exports.getDebtInFrontLiquityV2 = exports.getLiquityV2UserTroveIds = exports.getLiquityV2MarketData = void 0;
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const tokens_1 = require("@defisaver/tokens");
+const contracts_1 = require("../contracts");
+const types_1 = require("../types");
+const staking_1 = require("../staking");
+const liquityV2Helpers_1 = require("../helpers/liquityV2Helpers");
+const utils_1 = require("../services/utils");
+const getLiquityV2MarketData = (web3, network, selectedMarket, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const viewContract = (0, contracts_1.LiquityV2ViewContract)(web3, network);
+    const { marketAddress, debtToken, collateralToken } = selectedMarket;
+    const data = yield viewContract.methods.getMarketData(marketAddress).call();
+    const hintHelperAddress = data.hintHelpers;
+    const troveNFTAddress = data.troveNFT;
+    const borrowerOperationsAddress = data.borrowerOperations;
+    const troveManagerAddress = data.troveManager;
+    const stabilityPoolAddress = data.stabilityPool;
+    const collSurplusPoolAddress = data.collSurplusPool;
+    const assetsData = {};
+    assetsData[debtToken] = {
+        symbol: debtToken,
+        address: (0, tokens_1.getAssetInfo)(debtToken, network).address,
+        price: '1',
+        totalSupply: '0',
+        totalBorrow: (0, tokens_1.assetAmountInEth)(data.entireSystemDebt),
+        canBeSupplied: false,
+        canBeBorrowed: true,
+    };
+    assetsData[collateralToken] = {
+        symbol: collateralToken,
+        address: (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(collateralToken), network).address,
+        price: (0, tokens_1.assetAmountInEth)(data.collPrice),
+        totalSupply: (0, tokens_1.assetAmountInEth)(data.entireSystemColl),
+        totalBorrow: '0',
+        canBeSupplied: true,
+        canBeBorrowed: false,
+    };
+    if (staking_1.STAKING_ASSETS.includes(collateralToken)) {
+        assetsData[collateralToken].incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collateralToken, mainnetWeb3);
+        assetsData[collateralToken].incentiveSupplyToken = collateralToken;
+    }
+    const minCollRatio = new decimal_js_1.default(data.MCR).div(1e16).toString();
+    return {
+        assetsData,
+        marketData: {
+            minCollRatio,
+            hintHelperAddress,
+            troveNFTAddress,
+            borrowerOperationsAddress,
+            troveManagerAddress,
+            stabilityPoolAddress,
+            collSurplusPoolAddress,
+        },
+    };
+});
+exports.getLiquityV2MarketData = getLiquityV2MarketData;
+const _getUserTroves = (viewContract, account, marketAddress, startIndex = 0, endIndex = 100) => __awaiter(void 0, void 0, void 0, function* () { return viewContract.methods.getUserTroves(account, marketAddress, startIndex, endIndex).call(); });
+const getUserTroves = (viewContract, account, marketAddress, startIndex = 0, endIndex = 100, troves = []) => __awaiter(void 0, void 0, void 0, function* () {
+    const result = yield _getUserTroves(viewContract, account, marketAddress, startIndex, endIndex);
+    const newStartIndex = endIndex + 1;
+    const nextFreeTroveIndex = result.nextFreeTroveIndex;
+    const existingTroves = [...troves, ...result.troves];
+    if (nextFreeTroveIndex !== '-1')
+        return { troves: existingTroves.filter((trove) => trove.ownedByUser), nextFreeTroveIndex };
+    return getUserTroves(viewContract, account, marketAddress, newStartIndex, newStartIndex + 100, existingTroves);
+});
+const getLiquityV2UserTroveIds = (web3, network, selectedMarket, account) => __awaiter(void 0, void 0, void 0, function* () {
+    const viewContract = (0, contracts_1.LiquityV2ViewContract)(web3, network);
+    const { troves, nextFreeTroveIndex } = yield getUserTroves(viewContract, account, selectedMarket.marketAddress);
+    return { troves, nextFreeTroveIndex };
+});
+exports.getLiquityV2UserTroveIds = getLiquityV2UserTroveIds;
+const _getDebtInFront = (viewContract, marketAddress, troveId, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () { return viewContract.methods.getDebtInFront(marketAddress, troveId, accumulatedSum, iterations).call(); });
+const getDebtInFrontLiquityV2 = (viewContract, marketAddress, troveId, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () {
+    const { debt, next } = yield _getDebtInFront(viewContract, marketAddress, troveId, accumulatedSum, iterations);
+    if (next === '0')
+        return (0, tokens_1.assetAmountInEth)(debt);
+    return (0, exports.getDebtInFrontLiquityV2)(viewContract, marketAddress, next, debt, iterations);
+});
+exports.getDebtInFrontLiquityV2 = getDebtInFrontLiquityV2;
+const getLiquityV2TroveData = (web3, network, { selectedMarket, assetsData, marketData, troveId, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const viewContract = (0, contracts_1.LiquityV2ViewContract)(web3, network);
+    const { minCollRatio } = marketData;
+    const { collateralToken, marketAddress, debtToken } = selectedMarket;
+    const [data, debtInFront] = yield Promise.all([
+        viewContract.methods.getTroveInfo(marketAddress, troveId).call(),
+        (0, exports.getDebtInFrontLiquityV2)(viewContract, marketAddress, troveId),
+    ]);
+    const usedAssets = {};
+    const debtAssetData = assetsData[debtToken];
+    const borrowed = (0, tokens_1.assetAmountInEth)(data.debtAmount);
+    usedAssets[debtToken] = {
+        symbol: debtToken,
+        supplied: '0',
+        suppliedUsd: '0',
+        borrowed,
+        borrowedUsd: new decimal_js_1.default(borrowed).mul(debtAssetData.price).toString(),
+        isBorrowed: true,
+        isSupplied: false,
+    };
+    const collAssetData = assetsData[collateralToken];
+    const suppliedColl = (0, tokens_1.assetAmountInEth)(data.collAmount);
+    usedAssets[collateralToken] = {
+        symbol: collateralToken,
+        supplied: suppliedColl,
+        suppliedUsd: new decimal_js_1.default(suppliedColl).mul(collAssetData.price).toString(),
+        borrowed: '0',
+        borrowedUsd: '0',
+        isBorrowed: false,
+        isSupplied: true,
+        collateral: true,
+    };
+    const collRatio = new decimal_js_1.default(data.TCRatio).div(1e16).toString();
+    const interestRate = new decimal_js_1.default(data.annualInterestRate).div(1e16).toString();
+    const interestBatchManager = data.interestBatchManager;
+    const payload = Object.assign(Object.assign({ usedAssets,
+        troveId,
+        interestRate,
+        interestBatchManager,
+        debtInFront, troveStatus: types_1.LIQUITY_TROVE_STATUS_ENUM[parseInt(data.status, 10)] }, (0, liquityV2Helpers_1.getLiquityV2AggregatedPositionData)({
+        usedAssets, assetsData, minCollRatio, interestRate,
+    })), { collRatio });
+    return payload;
+});
+exports.getLiquityV2TroveData = getLiquityV2TroveData;

package/cjs/markets/compound/marketsAssets.js

@@ -7,7 +7,7 @@ exports.compoundV2CollateralAssets = [
     'cETH', 'cDAI', 'cBAT', 'cZRX', 'cUSDC', 'cWBTC Legacy', 'cWBTC', 'cUSDT',
     'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
 ].map((symbol) => (0, tokens_1.getAssetInfo)(symbol));
-exports.v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'rswETH'];
+exports.v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC'];
 exports.v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH', 'ezETH'];
 exports.v3USDCCollAssetsBase = ['ETH', 'cbETH', 'wstETH', 'cbBTC'];
 exports.v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC', 'wstETH'];
@@ -26,7 +26,7 @@ exports.v3USDCeCollAssets = {
     [common_1.NetworkNumber.Arb]: exports.v3USDCeCollAssetsArb,
     [common_1.NetworkNumber.Base]: [],
 };
-exports.v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH'];
+exports.v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH', 'tBTC'];
 exports.v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC'];
 exports.v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC', 'rsETH', 'ezETH', 'USDC', 'USDT'];
 exports.v3ETHCollAssetsOpt = ['rETH', 'wstETH', 'WBTC', 'ezETH', 'USDC', 'USDT', 'weETH', 'wrsETH'];
@@ -45,7 +45,7 @@ exports.v3USDbCCollAssets = {
     [common_1.NetworkNumber.Arb]: [],
     [common_1.NetworkNumber.Base]: exports.v3USDbCCollAssetsBase,
 };
-exports.v3USDTCollAssetsEth = ['ETH', 'WBTC', 'wstETH', 'COMP', 'UNI', 'LINK', 'cbBTC'];
+exports.v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC'];
 exports.v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
 exports.v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP', 'wstETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`

package/cjs/markets/index.d.ts

@@ -4,4 +4,4 @@ export { SparkMarkets } from './spark';
 export { CrvUsdMarkets } from './curveUsd';
 export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
 export { LlamaLendMarkets } from './llamaLend';
-export { EulerV2Markets } from './euler';
+export { LiquityV2Markets } from './liquityV2';

package/cjs/markets/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EulerV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.morphoAaveV3AssetEthMarket = exports.morphoAaveV2AssetDefaultMarket = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
+exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.morphoAaveV3AssetEthMarket = exports.morphoAaveV2AssetDefaultMarket = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
 var aave_1 = require("./aave");
 Object.defineProperty(exports, "AaveMarkets", { enumerable: true, get: function () { return aave_1.AaveMarkets; } });
 Object.defineProperty(exports, "aaveV1AssetsDefaultMarket", { enumerable: true, get: function () { return aave_1.aaveV1AssetsDefaultMarket; } });
@@ -26,5 +26,5 @@ Object.defineProperty(exports, "MorphoBlueMarkets", { enumerable: true, get: fun
 Object.defineProperty(exports, "findMorphoBlueMarket", { enumerable: true, get: function () { return morphoBlue_1.findMorphoBlueMarket; } });
 var llamaLend_1 = require("./llamaLend");
 Object.defineProperty(exports, "LlamaLendMarkets", { enumerable: true, get: function () { return llamaLend_1.LlamaLendMarkets; } });
-var euler_1 = require("./euler");
-Object.defineProperty(exports, "EulerV2Markets", { enumerable: true, get: function () { return euler_1.EulerV2Markets; } });
+var liquityV2_1 = require("./liquityV2");
+Object.defineProperty(exports, "LiquityV2Markets", { enumerable: true, get: function () { return liquityV2_1.LiquityV2Markets; } });

package/cjs/markets/liquityV2/index.d.ts

@@ -0,0 +1,8 @@
+import { NetworkNumber } from '../../types/common';
+import { LiquityV2MarketInfo } from '../../types/liquityV2';
+export declare const LIQUITY_V2_ETH_MARKET: (networkId?: NetworkNumber) => LiquityV2MarketInfo;
+export declare const LIQUITY_V2_WSTETH_MARKET: (networkId?: NetworkNumber) => LiquityV2MarketInfo;
+export declare const LiquityV2Markets: (networkId: NetworkNumber) => {
+    readonly liquityv2eth: LiquityV2MarketInfo;
+    readonly liquityv2wsteth: LiquityV2MarketInfo;
+};

package/cjs/markets/liquityV2/index.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LiquityV2Markets = exports.LIQUITY_V2_WSTETH_MARKET = exports.LIQUITY_V2_ETH_MARKET = void 0;
+const common_1 = require("../../types/common");
+const liquityV2_1 = require("../../types/liquityV2");
+const LIQUITY_V2_ETH_MARKET = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Liquity V2 ETH',
+    shortLabel: 'ETH',
+    value: liquityV2_1.LiquityV2Versions.LiquityV2Eth,
+    url: 'eth',
+    debtToken: 'BOLD',
+    collateralToken: 'ETH',
+    marketAddress: '0x7d2d2c79ec89c7f1d718ae1586363ad2c56ded9d',
+    protocolName: 'liquity-v2',
+});
+exports.LIQUITY_V2_ETH_MARKET = LIQUITY_V2_ETH_MARKET;
+const LIQUITY_V2_WSTETH_MARKET = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Liquity V2 wstETH',
+    shortLabel: 'wstETH',
+    value: liquityV2_1.LiquityV2Versions.LiquityV2WstEth,
+    url: 'wsteth',
+    debtToken: 'BOLD',
+    collateralToken: 'wstETH',
+    marketAddress: '0x83b74f12a2894fcf7a4864eff6090d7d8a060c6b',
+    protocolName: 'liquity-v2',
+});
+exports.LIQUITY_V2_WSTETH_MARKET = LIQUITY_V2_WSTETH_MARKET;
+const LiquityV2Markets = (networkId) => ({
+    [liquityV2_1.LiquityV2Versions.LiquityV2Eth]: (0, exports.LIQUITY_V2_ETH_MARKET)(networkId),
+    [liquityV2_1.LiquityV2Versions.LiquityV2WstEth]: (0, exports.LIQUITY_V2_WSTETH_MARKET)(networkId),
+});
+exports.LiquityV2Markets = LiquityV2Markets;

package/cjs/markets/morphoBlue/index.d.ts

@@ -30,6 +30,7 @@ export declare const MORPHO_BLUE_USDE_DAI_770: (networkId?: NetworkNumber) => Mo
 export declare const MORPHO_BLUE_USDE_DAI_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_USDE_DAI_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_USDE_DAI_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_RETH_ETH_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBETH_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSTETH_ETH_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 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)
 export declare const MORPHO_BLUE_RETH_ETH_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBBTC_ETH_915_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBBTC_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluewstethusdc: MorphoBlueMarketData;
     readonly morphobluesdaiusdc: MorphoBlueMarketData;
@@ -61,6 +63,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluetbtcusdc: MorphoBlueMarketData;
     readonly morphobluecbbtceth: MorphoBlueMarketData;
     readonly morphobluecbbtcusdc: MorphoBlueMarketData;
+    readonly morphoblueretheth_945: MorphoBlueMarketData;
     readonly morphobluewstetheth_945: MorphoBlueMarketData;
     readonly morphobluewstetheth_945_exchange_rate: MorphoBlueMarketData;
     readonly morphobluewstetheth_965_exchange_rate: MorphoBlueMarketData;
@@ -79,6 +82,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphoblueretheth_945_base: MorphoBlueMarketData;
     readonly morphobluecbbtceth_915_base: MorphoBlueMarketData;
     readonly morphobluecbbtcusdc_860_base: MorphoBlueMarketData;
+    readonly morphobluewsuperoethbweth_915_base: MorphoBlueMarketData;
     readonly morphobluecbetheth_945_base: MorphoBlueMarketData;
     readonly morphobluecbetheth_965_base: MorphoBlueMarketData;
     readonly morphobluewstetheth_945_base: MorphoBlueMarketData;

package/cjs/markets/morphoBlue/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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;
 const utils_1 = require("../../services/utils");
 const types_1 = require("../../types");
 const common_1 = require("../../types/common");
@@ -487,6 +487,22 @@ const MORPHO_BLUE_USDE_DAI_945 = (networkId = common_1.NetworkNumber.Eth) => ({
     protocolName: 'morpho-blue',
 });
 exports.MORPHO_BLUE_USDE_DAI_945 = MORPHO_BLUE_USDE_DAI_945;
+const MORPHO_BLUE_RETH_ETH_945 = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho',
+    shortLabel: 'rETH/ETH',
+    value: types_1.MorphoBlueVersions.MorphoBlueREthEth_945,
+    url: 'retheth-3c83f77b',
+    loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+    collateralToken: '0xae78736Cd615f374D3085123A210448E74Fc6393',
+    oracle: '0x1b4A3F92e5Fffd1d35A98751c9FE4472483579bB',
+    oracleType: types_1.MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.945,
+    marketId: '0x3c83f77bde9541f8d3d82533b19bbc1f97eb2f1098bb991728acbfbede09cc5d',
+    protocolName: 'morpho-blue',
+});
+exports.MORPHO_BLUE_RETH_ETH_945 = MORPHO_BLUE_RETH_ETH_945;
 // BASE
 const MORPHO_BLUE_CBETH_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Base],
@@ -664,6 +680,22 @@ const MORPHO_BLUE_CBBTC_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth)
     protocolName: 'morpho-blue',
 });
 exports.MORPHO_BLUE_CBBTC_USDC_860_BASE = MORPHO_BLUE_CBBTC_USDC_860_BASE;
+const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [common_1.NetworkNumber.Base],
+    label: 'Morpho',
+    shortLabel: 'wsuperOETHb/WETH',
+    value: types_1.MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base,
+    url: 'wsuperoethbweth-144bf18d',
+    loanToken: '0x4200000000000000000000000000000000000006',
+    collateralToken: '0x7FcD174E80f264448ebeE8c88a7C4476AAF58Ea6',
+    oracle: '0x28C964c985fe84736fAdc7Cf0bBd58B54bc7CF93',
+    oracleType: types_1.MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.915,
+    marketId: '0x144bf18d6bf4c59602548a825034f73bf1d20177fc5f975fc69d5a5eba929b45',
+    protocolName: 'morpho-blue',
+});
+exports.MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE;
 const MorphoBlueMarkets = (networkId) => ({
     [types_1.MorphoBlueVersions.MorphoBlueWstEthUSDC]: (0, exports.MORPHO_BLUE_WSTETH_USDC)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueSDAIUSDC]: (0, exports.MORPHO_BLUE_SDAI_USDC)(networkId),
@@ -684,6 +716,7 @@ const MorphoBlueMarkets = (networkId) => ({
     [types_1.MorphoBlueVersions.MorphoBlueTBTCUSDC]: (0, exports.MORPHO_BLUE_TBTC_USDC)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueCbBTCEth_915]: (0, exports.MORPHO_BLUE_CBBTC_ETH_915)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueCbBTCUSDC_860]: (0, exports.MORPHO_BLUE_CBBTC_USDC_860)(networkId),
+    [types_1.MorphoBlueVersions.MorphoBlueREthEth_945]: (0, exports.MORPHO_BLUE_RETH_ETH_945)(networkId),
     // wstETH/WETH
     [types_1.MorphoBlueVersions.MorphoBlueWstEthEth_945]: (0, exports.MORPHO_BLUE_WSTETH_ETH_945)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: (0, exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE)(networkId),
@@ -706,6 +739,8 @@ const MorphoBlueMarkets = (networkId) => ({
     [types_1.MorphoBlueVersions.MorphoBlueREthEth_945_Base]: (0, exports.MORPHO_BLUE_RETH_ETH_945_BASE)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueCbBTCEth_915_Base]: (0, exports.MORPHO_BLUE_CBBTC_ETH_915_BASE)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueCbBTCUSDC_860_Base]: (0, exports.MORPHO_BLUE_CBBTC_USDC_860_BASE)(networkId),
+    // wsuperOETHb/WETH Base
+    [types_1.MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base]: (0, exports.MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE)(networkId),
     // cbETH/WETH Base
     [types_1.MorphoBlueVersions.MorphoBlueCbEthEth_945_Base]: (0, exports.MORPHO_BLUE_CBETH_ETH_945_BASE)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueCbEthEth_965_Base]: (0, exports.MORPHO_BLUE_CBETH_ETH_965_BASE)(networkId),

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', 'weETH', 'cbBTC'];
+exports.sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS'];
 // @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/moneymarket/moneymarketCommonService.js

@@ -27,7 +27,7 @@ const calcLeverageLiqPrice = (leverageType, assetPrice, borrowedUsd, borrowLimit
 exports.calcLeverageLiqPrice = calcLeverageLiqPrice;
 const calculateBorrowingAssetLimit = (assetBorrowedUsd, borrowLimitUsd) => new decimal_js_1.default(assetBorrowedUsd).div(borrowLimitUsd).times(100).toString();
 exports.calculateBorrowingAssetLimit = calculateBorrowingAssetLimit;
-exports.STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'crvUSD'];
+exports.STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'crvUSD', 'BOLD'];
 const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;
     let supplyStable = 0;

package/cjs/services/utils.d.ts

@@ -20,5 +20,3 @@ export declare const bytesToString: (hex: string) => string;
  */
 export declare const mapRange: (input: number | string, minInput: number | string, maxInput: number | string, minOutput: number | string, maxOutput: number | string) => number;
 export declare const isEnabledOnBitmap: (bitmap: number, assetId: number) => bigint;
-export declare const MAXUINT: string;
-export declare const isMaxuint: (amount: string) => boolean;

package/cjs/services/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMaxuint = exports.MAXUINT = exports.isEnabledOnBitmap = exports.mapRange = exports.bytesToString = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.getWeiAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.wethToEth = exports.ethToWeth = exports.addToObjectIf = exports.isLayer2Network = void 0;
+exports.isEnabledOnBitmap = exports.mapRange = exports.bytesToString = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.getWeiAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.wethToEth = exports.ethToWeth = exports.addToObjectIf = exports.isLayer2Network = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../types/common");
@@ -56,6 +56,3 @@ exports.mapRange = mapRange;
 // eslint-disable-next-line no-bitwise
 const isEnabledOnBitmap = (bitmap, assetId) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
 exports.isEnabledOnBitmap = isEnabledOnBitmap;
-exports.MAXUINT = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
-const isMaxuint = (amount) => (0, exports.compareAddresses)(exports.MAXUINT, amount);
-exports.isMaxuint = isMaxuint;

package/cjs/staking/staking.d.ts

@@ -4,6 +4,7 @@ export declare const getStETHApr: (web3: Web3, fromBlock?: number, blockNumber?:
 export declare const getCbETHApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getREthApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getDsrApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
+export declare const getSsrApy: () => Promise<string>;
 export declare const STAKING_ASSETS: string[];
 export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | "0" | undefined;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;

package/cjs/staking/staking.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const contracts_1 = require("../contracts");
 const common_1 = require("../types/common");
@@ -86,13 +86,38 @@ const getDsrApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, vo
         .toString();
 });
 exports.getDsrApy = getDsrApy;
+const getSsrApy = () => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch('https://app.defisaver.com/api/sky/data');
+    const data = yield res.json();
+    return new decimal_js_1.default(data.data.skyData[0].sky_savings_rate_apy).mul(100).toString();
+});
+exports.getSsrApy = getSsrApy;
+const getSuperOETHApy = () => __awaiter(void 0, void 0, void 0, function* () {
+    console.log('getSuperOETHApy');
+    const res = yield fetch('https://origin.squids.live/origin-squid/graphql', {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+            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    ',
+            variables: {
+                token: '0xdbfefd2e8460a6ee4955a68582f85708baea60a3',
+                chainId: 8453,
+            },
+        }),
+    });
+    const data = yield res.json();
+    return new decimal_js_1.default(data.data.oTokenApies[0].apy).mul(100).toString();
+});
 const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function* () {
     const res = yield fetch(`https://app.defisaver.com/api/staking/apy?asset=${asset}`);
     const data = yield res.json();
     return data.apy;
 });
-exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH'];
+exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
 const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
+    console.log('getStakingApy', asset, blockNumber, fromBlock);
     try {
         if (asset === 'stETH' || asset === 'wstETH')
             return (0, exports.getStETHApr)(web3, fromBlock, blockNumber);
@@ -116,6 +141,10 @@ const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefine
             return getApyFromDfsApi('rsETH');
         if (asset === 'pufETH')
             return getApyFromDfsApi('pufETH');
+        if (asset === 'wsuperOETHb')
+            return getSuperOETHApy();
+        if (asset === 'sUSDS')
+            return (0, exports.getSsrApy)();
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);