@defisaver/positions-sdk 2.1.15 → 2.1.17-dev-1

package/esm/liquityV2/index.d.ts

@@ -23,6 +23,8 @@ export declare const getLiquityV2UserTroveIds: (provider: EthereumProvider, netw
     }[];
     nextFreeTroveIndex: string;
 }>;
+export declare const calculateDebtInFrontLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, allMarketsUnbackedDebts: Record<LiquityV2Versions, string>, interestRateDebtInFront: string) => string;
+export declare const getDebtInFrontForInterestRateIncludingNewDebtLiquityV2: (newDebt: string, markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, provider: Client, network: NetworkNumber, interestRate: string) => Promise<string>;
 export declare const getDebtInFrontForInterestRateLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, provider: EthereumProvider, network: NetworkNumber, isLegacy: boolean, interestRate: string, debtInFrontBeingMoved?: string) => Promise<string>;
 export declare const _getLiquityV2TroveData: (provider: Client, network: NetworkNumber, { selectedMarket, assetsData, troveId, allMarketsData, }: {
     selectedMarket: LiquityV2MarketInfo;

package/esm/liquityV2/index.js

@@ -190,12 +190,40 @@ const getAllMarketsUnbackedDebts = (markets, isLegacy, provider, network) => __a
     })));
     return Object.fromEntries(allMarketsUnbackedDebt);
 });
-const calculateDebtInFrontLiquityV2 = (markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront) => {
+export const calculateDebtInFrontLiquityV2 = (markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront) => {
+    // Sanity check to avoid division by 0. Very unlikely to ever happen.
+    const selectedMarketTotalBorrow = new Dec(markets[selectedMarket].assetsData[LiquityV2Markets(NetworkNumber.Eth)[selectedMarket].debtToken].totalBorrow);
+    if (selectedMarketTotalBorrow.eq(0))
+        return new Dec(0).toString();
     const selectedMarketUnbackedDebt = new Dec(allMarketsUnbackedDebts[selectedMarket]);
     const { isLegacy } = LiquityV2Markets(NetworkNumber.Eth)[selectedMarket];
-    if (selectedMarketUnbackedDebt.eq(0))
-        return interestRateDebtInFront;
-    const amountBeingReedemedOnEachMarket = Object.entries(markets).map(([version, market]) => {
+    const totalUnbackedDebt = Object.values(allMarketsUnbackedDebts).reduce((acc, val) => acc.plus(new Dec(val)), new Dec(0));
+    // When totalUnbackedDebt is 0, redemptions will be proportional with the branch size and not to unbacked debt.
+    // When unbacked debt is 0 for branch, next redemption call won't touch that branch, so in order to estimate total debt in front we will:
+    // - First add up all the unbacked debt from other branches, as that will be the only debt that will be redeemed on the fist redemption call
+    // - Perform split the same way as we would do when totalUnbackedDebt == 0, this would represent the second call to the redemption function
+    if (selectedMarketUnbackedDebt.eq(0)) {
+        // Special case if the branch debt in front is 0, it means that all debt in front is unbacked debt from other branches.
+        if (new Dec(interestRateDebtInFront).eq(0))
+            return totalUnbackedDebt.toString();
+        // Then calculate how much of that estimated amount would go to each branch
+        // Second redemption call - calculate proportional redemption based on updated total debt
+        const amountBeingRedeemedOnEachMarketByTotalBorrow = Object.entries(markets).map(([version, market]) => {
+            const { isLegacy: isLegacyMarket } = LiquityV2Markets(NetworkNumber.Eth)[version];
+            if (version === selectedMarket && isLegacyMarket !== isLegacy)
+                return new Dec(interestRateDebtInFront);
+            const { assetsData } = market;
+            const { debtToken } = LiquityV2Markets(NetworkNumber.Eth)[version];
+            // For other markets, subtract their unbacked debt as it will be cleared in first redemption call
+            const marketUnbackedDebt = new Dec(allMarketsUnbackedDebts[version]);
+            const totalBorrow = new Dec(assetsData[debtToken].totalBorrow).sub(marketUnbackedDebt);
+            const amountToRedeem = new Dec(interestRateDebtInFront).mul(totalBorrow).div(selectedMarketTotalBorrow);
+            return Dec.min(amountToRedeem, totalBorrow);
+        });
+        const redemptionAmount = amountBeingRedeemedOnEachMarketByTotalBorrow.reduce((acc, val) => acc.plus(val), new Dec(0));
+        return totalUnbackedDebt.plus(redemptionAmount).toString();
+    }
+    const amountBeingRedeemedOnEachMarketByUnbackedDebt = Object.entries(markets).map(([version, market]) => {
         const { isLegacy: isLegacyMarket } = LiquityV2Markets(NetworkNumber.Eth)[version];
         if (version === selectedMarket && isLegacyMarket !== isLegacy)
             return new Dec(interestRateDebtInFront);
@@ -203,11 +231,24 @@ const calculateDebtInFrontLiquityV2 = (markets, selectedMarket, allMarketsUnback
         const { debtToken } = LiquityV2Markets(NetworkNumber.Eth)[version];
         const unbackedDebt = new Dec(allMarketsUnbackedDebts[version]);
         const totalBorrow = new Dec(assetsData[debtToken].totalBorrow);
-        const amountToReedem = new Dec(interestRateDebtInFront).mul(unbackedDebt).div(selectedMarketUnbackedDebt);
-        return Dec.min(amountToReedem, totalBorrow);
+        const amountToRedeem = new Dec(interestRateDebtInFront).mul(unbackedDebt).div(selectedMarketUnbackedDebt);
+        return Dec.min(amountToRedeem, totalBorrow);
     });
-    return amountBeingReedemedOnEachMarket.reduce((acc, val) => acc.plus(val), new Dec(0)).toString();
+    return amountBeingRedeemedOnEachMarketByUnbackedDebt.reduce((acc, val) => acc.plus(val), new Dec(0)).toString();
 };
+// @dev The amount redeemed on each branch depends on the unbacked debt of every branch (the difference between total borrow and stability pool deposits).
+// When new debt is generated on the selected market, the unbacked debt will increase, resulting in a higher redemption amount on that branch.
+// This function accepts the new debt that's about to be generated (e.g., trove creation) and estimates the debt in front based on the new state.
+export const getDebtInFrontForInterestRateIncludingNewDebtLiquityV2 = (newDebt, markets, selectedMarket, provider, network, interestRate) => __awaiter(void 0, void 0, void 0, function* () {
+    const marketsWithNewDebt = structuredClone(markets);
+    const selectedMarketDebtToken = LiquityV2Markets(network)[selectedMarket].debtToken;
+    const currentTotalBorrow = new Dec(marketsWithNewDebt[selectedMarket].assetsData[selectedMarketDebtToken].totalBorrow);
+    marketsWithNewDebt[selectedMarket].assetsData[selectedMarketDebtToken].totalBorrow = currentTotalBorrow.add(newDebt).toString();
+    const { isLegacy } = LiquityV2Markets(NetworkNumber.Eth)[selectedMarket];
+    const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(marketsWithNewDebt, isLegacy, provider, network);
+    const interestRateDebtInFront = new Dec(yield getDebtInFrontForInterestRateSingleMarketLiquityV2(provider, network, isLegacy, LiquityV2Markets(network)[selectedMarket].marketAddress, interestRate));
+    return calculateDebtInFrontLiquityV2(marketsWithNewDebt, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
+});
 const getDebtInFrontLiquityV2 = (markets, selectedMarket, provider, network, viewContract, troveId) => __awaiter(void 0, void 0, void 0, function* () {
     const { isLegacy } = LiquityV2Markets(NetworkNumber.Eth)[selectedMarket];
     const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, isLegacy, provider, network);

package/esm/markets/aave/marketAssets.js

@@ -15,7 +15,7 @@ export const aaveV3AssetsDefaultMarketOpt = [
 export const aaveV3AssetsDefaultMarketArb = ['DAI', 'LINK', 'USDC.e', 'WBTC', 'ETH', 'USDT', 'AAVE', 'EURS', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC', 'FRAX', 'ARB', 'weETH', 'GHO', 'ezETH', 'rsETH', 'tBTC'];
 export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC'];
 export const aaveV3AssetsDefaultMarketLinea = ['ETH', 'USDC', 'weETH', 'ezETH', 'USDT', 'wstETH', 'wrsETH', 'WBTC'];
-export const aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH'];
+export const aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const aaveV3AssetsDefaultMarket = {
     [NetworkNumber.Eth]: aaveV3AssetsDefaultMarketEth,

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

@@ -12,7 +12,6 @@ export declare const MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE: (networkId?: Network
 export declare const MORPHO_BLUE_WSTETH_PYUSD: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_USDE_USDT: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SUSDE_USDT: (networkId?: NetworkNumber) => MorphoBlueMarketData;
-export declare const MORPHO_BLUE_SDAI_ETH: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_MKR_USDC: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_TBTC_USDC: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBBTC_ETH_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -20,21 +19,19 @@ export declare const MORPHO_BLUE_CBBTC_USDC_860: (networkId?: NetworkNumber) =>
 export declare const MORPHO_BLUE_SUSDE_USDC_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_EZETH_ETH_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_EZETH_ETH_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
-export declare const MORPHO_BLUE_WEETH_ETH_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WEETH_ETH_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSTETH_ETH_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
-export declare const MORPHO_BLUE_SUSDE_DAI_770: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SUSDE_DAI_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SUSDE_DAI_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SUSDE_DAI_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
-export declare const MORPHO_BLUE_USDE_DAI_770: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 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_USR_USDC_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_SYRUPUSDC_USDC_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_LBTC_USDC_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_LBTC_CBBTC_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBETH_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBETH_USDC_860_BASE_1c21c59d: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSTETH_ETH_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -53,6 +50,7 @@ export declare const MORPHO_BLUE_LBTC_WBTC_945: (networkId?: NetworkNumber) => M
 export declare const MORPHO_BLUE_LBTC_CBBTC_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSTETH_EURC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBBTC_EURC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WETH_EURC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluewstethusdc: MorphoBlueMarketData;
     readonly morphobluesdaiusdc: MorphoBlueMarketData;
@@ -62,34 +60,31 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluewstethusdt: MorphoBlueMarketData;
     readonly morphobluewstethusda_exchange_rate: MorphoBlueMarketData;
     readonly morphobluwstethpyusd: MorphoBlueMarketData;
-    readonly morphoblueweetheth_860: MorphoBlueMarketData;
     readonly morphoblueweetheth_945: MorphoBlueMarketData;
     readonly morphobluewbtcpyusd: MorphoBlueMarketData;
     readonly morphobluewbtceth: MorphoBlueMarketData;
     readonly morphoblueusdeusdt: MorphoBlueMarketData;
     readonly morphobluesusdeusdt: MorphoBlueMarketData;
-    readonly morphobluesdaieth: MorphoBlueMarketData;
     readonly morphoblueezetheth_860: MorphoBlueMarketData;
     readonly morphoblueezetheth_945: MorphoBlueMarketData;
     readonly morphobluemkrusdc: MorphoBlueMarketData;
     readonly morphobluetbtcusdc: MorphoBlueMarketData;
     readonly morphobluecbbtceth: MorphoBlueMarketData;
     readonly morphobluecbbtcusdc: MorphoBlueMarketData;
-    readonly morphoblueretheth_945: MorphoBlueMarketData;
     readonly morphobluesusdeusdc_915: MorphoBlueMarketData;
     readonly morphobluelbtcwbtc_945: MorphoBlueMarketData;
     readonly morphoblueusrusdc_915: MorphoBlueMarketData;
+    readonly morphobluesyrupusdcusdc_915: MorphoBlueMarketData;
+    readonly morphobluelbtcusdc_860: MorphoBlueMarketData;
+    readonly morphobluelbtccbbtc_945: MorphoBlueMarketData;
     readonly morphobluewstetheth_945: MorphoBlueMarketData;
     readonly morphobluewstetheth_945_exchange_rate: MorphoBlueMarketData;
     readonly morphobluewstetheth_965_exchange_rate: MorphoBlueMarketData;
-    readonly morphobluesusdedai_770: MorphoBlueMarketData;
     readonly morphobluesusdedai_860: MorphoBlueMarketData;
     readonly morphobluesusdedai_915: MorphoBlueMarketData;
     readonly morphobluesusdedai_945: MorphoBlueMarketData;
-    readonly morphoblueusdedai_770: MorphoBlueMarketData;
     readonly morphoblueusdedai_860: MorphoBlueMarketData;
     readonly morphoblueusdedai_915: MorphoBlueMarketData;
-    readonly morphoblueusdedai_945: MorphoBlueMarketData;
     readonly morphobluecbethusdc_860_base: MorphoBlueMarketData;
     readonly morphobluecbethusdc_860_base_1c21c59d: MorphoBlueMarketData;
     readonly morphobluewstethusdc_860_base: MorphoBlueMarketData;
@@ -102,6 +97,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluecbbtceurc_860_base: MorphoBlueMarketData;
     readonly morphobluewstetheurc_860_base: MorphoBlueMarketData;
     readonly morphobluelbtccbbtc_945_base: MorphoBlueMarketData;
+    readonly morphobluewetheurc_860_base: MorphoBlueMarketData;
     readonly morphobluewsuperoethbweth_915_base: MorphoBlueMarketData;
     readonly morphobluecbetheth_945_base: MorphoBlueMarketData;
     readonly morphobluecbetheth_965_base: MorphoBlueMarketData;

package/esm/markets/morphoBlue/index.js

@@ -61,6 +61,7 @@ export const MORPHO_BLUE_ETH_USDC = (networkId = NetworkNumber.Eth) => ({
     marketId: '0xf9acc677910cc17f650416a22e2a14d5da7ccb9626db18f1bf94efe64f92b372',
     protocolName: 'morpho-blue',
 });
+// nadja
 export const MORPHO_BLUE_WBTC_USDT = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho',
@@ -181,21 +182,6 @@ export const MORPHO_BLUE_SUSDE_USDT = (networkId = NetworkNumber.Eth) => ({
     marketId: '0xdc5333039bcf15f1237133f74d5806675d83d9cf19cfd4cfdd9be674842651bf',
     protocolName: 'morpho-blue',
 });
-export const MORPHO_BLUE_SDAI_ETH = (networkId = NetworkNumber.Eth) => ({
-    chainIds: [1],
-    label: 'Morpho',
-    shortLabel: 'sDAI/ETH',
-    value: MorphoBlueVersions.MorphoBlueSDAIEth,
-    url: 'sdaieth',
-    loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-    collateralToken: '0x83F20F44975D03b1b09e64809B757c47f942BEeA',
-    oracle: '0x0f9bb760D76af1B5Ca89102084E1963F6698AFda',
-    oracleType: MorphoBlueOracleType.MARKET_RATE,
-    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-    lltv: 0.86,
-    marketId: '0x1929f8139224cb7d5db8c270addc9ce366d37ad279e1135f73c0adce74b0f936',
-    protocolName: 'morpho-blue',
-});
 export const MORPHO_BLUE_MKR_USDC = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho',
@@ -303,21 +289,6 @@ export const MORPHO_BLUE_EZETH_ETH_945 = (networkId = NetworkNumber.Eth) => ({
     protocolName: 'morpho-blue',
 });
 // weETH/ETH
-export const MORPHO_BLUE_WEETH_ETH_860 = (networkId = NetworkNumber.Eth) => ({
-    chainIds: [1],
-    label: 'Morpho',
-    shortLabel: 'weETH/ETH',
-    value: MorphoBlueVersions.MorphoBlueWeEthEth_860,
-    url: 'weetheth-698fe982',
-    loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-    collateralToken: '0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee',
-    oracle: '0x3fa58b74e9a8eA8768eb33c8453e9C2Ed089A40a',
-    oracleType: MorphoBlueOracleType.MARKET_RATE,
-    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-    lltv: 0.86,
-    marketId: '0x698fe98247a40c5771537b5786b2f3f9d78eb487b4ce4d75533cd0e94d88a115',
-    protocolName: 'morpho-blue',
-});
 export const MORPHO_BLUE_WEETH_ETH_945 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho',
@@ -380,21 +351,6 @@ export const MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE = (networkId = NetworkNumb
     protocolName: 'morpho-blue',
 });
 // sUSDe/DAI
-export const MORPHO_BLUE_SUSDE_DAI_770 = (networkId = NetworkNumber.Eth) => ({
-    chainIds: [1],
-    label: 'Morpho',
-    shortLabel: 'sUSDe/DAI',
-    value: MorphoBlueVersions.MorphoBlueSUSDeDAI_770,
-    url: 'susdedai-42dcfb38',
-    loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
-    collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
-    oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
-    oracleType: MorphoBlueOracleType.ETHENA_RATE,
-    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-    lltv: 0.77,
-    marketId: '0x42dcfb38bb98767afb6e38ccf90d59d0d3f0aa216beb3a234f12850323d17536',
-    protocolName: 'morpho-blue',
-});
 export const MORPHO_BLUE_SUSDE_DAI_860 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho',
@@ -441,21 +397,6 @@ export const MORPHO_BLUE_SUSDE_DAI_945 = (networkId = NetworkNumber.Eth) => ({
     protocolName: 'morpho-blue',
 });
 // USDe/DAI
-export const MORPHO_BLUE_USDE_DAI_770 = (networkId = NetworkNumber.Eth) => ({
-    chainIds: [1],
-    label: 'Morpho',
-    shortLabel: 'USDe/DAI',
-    value: MorphoBlueVersions.MorphoBlueUSDeDAI_770,
-    url: 'usdedai-fd8493f0',
-    loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
-    collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
-    oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
-    oracleType: MorphoBlueOracleType.ETHENA_RATE,
-    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-    lltv: 0.77,
-    marketId: '0xfd8493f09eb6203615221378d89f53fcd92ff4f7d62cca87eece9a2fff59e86f',
-    protocolName: 'morpho-blue',
-});
 export const MORPHO_BLUE_USDE_DAI_860 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho',
@@ -486,49 +427,64 @@ export const MORPHO_BLUE_USDE_DAI_915 = (networkId = NetworkNumber.Eth) => ({
     marketId: '0x8e6aeb10c401de3279ac79b4b2ea15fc94b7d9cfc098d6c2a1ff7b2b26d9d02c',
     protocolName: 'morpho-blue',
 });
-export const MORPHO_BLUE_USDE_DAI_945 = (networkId = NetworkNumber.Eth) => ({
+export const MORPHO_BLUE_USR_USDC_915 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho',
-    shortLabel: 'USDe/DAI',
-    value: MorphoBlueVersions.MorphoBlueUSDeDAI_945,
-    url: 'usdedai-db760246',
-    loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
-    collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
-    oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
-    oracleType: MorphoBlueOracleType.ETHENA_RATE,
+    shortLabel: 'USR/USDC',
+    value: MorphoBlueVersions.MorphoBlueUSRUSDC_915,
+    url: 'usrusdc-8e7cc042',
+    loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+    collateralToken: '0x66a1E37c9b0eAddca17d3662D6c05F4DECf3e110',
+    oracle: '0x8875ceb24E656FCA062759BDCF870F59A2B0187b',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-    lltv: 0.945,
-    marketId: '0xdb760246f6859780f6c1b272d47a8f64710777121118e56e0cdb4b8b744a3094',
+    lltv: 0.915,
+    marketId: '0x8e7cc042d739a365c43d0a52d5f24160fa7ae9b7e7c9a479bd02a56041d4cf77',
     protocolName: 'morpho-blue',
 });
-export const MORPHO_BLUE_RETH_ETH_945 = (networkId = NetworkNumber.Eth) => ({
+export const MORPHO_BLUE_SYRUPUSDC_USDC_915 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho',
-    shortLabel: 'rETH/ETH',
-    value: MorphoBlueVersions.MorphoBlueREthEth_945,
-    url: 'retheth-3c83f77b',
-    loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-    collateralToken: '0xae78736Cd615f374D3085123A210448E74Fc6393',
-    oracle: '0x1b4A3F92e5Fffd1d35A98751c9FE4472483579bB',
+    shortLabel: 'syrupUSDC/USDC',
+    value: MorphoBlueVersions.MorphoBlueSyrupUSDCUSDC_915,
+    url: 'syrupusdcusdc-729badf2',
+    loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+    collateralToken: '0x80ac24aA929eaF5013f6436cdA2a7ba190f5Cc0b',
+    oracle: '0x80032f4cb6E3573b9ed61E888AF658E48Fb790cC',
     oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-    lltv: 0.945,
-    marketId: '0x3c83f77bde9541f8d3d82533b19bbc1f97eb2f1098bb991728acbfbede09cc5d',
+    lltv: 0.915,
+    marketId: '0x729badf297ee9f2f6b3f717b96fd355fc6ec00422284ce1968e76647b258cf44',
     protocolName: 'morpho-blue',
 });
-export const MORPHO_BLUE_USR_USDC_915 = (networkId = NetworkNumber.Eth) => ({
+export const MORPHO_BLUE_LBTC_USDC_860 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho',
-    shortLabel: 'USR/USDC',
-    value: MorphoBlueVersions.MorphoBlueUSRUSDC_915,
-    url: 'usrusdc-8e7cc042',
+    shortLabel: 'LBTC/USDC',
+    value: MorphoBlueVersions.MorphoBlueLBTCUSDC_860,
+    url: 'lbtcusdc-bf02d6c6',
     loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-    collateralToken: '0x66a1E37c9b0eAddca17d3662D6c05F4DECf3e110',
-    oracle: '0x8875ceb24E656FCA062759BDCF870F59A2B0187b',
+    collateralToken: '0x8236a87084f8B84306f72007F36F2618A5634494',
+    oracle: '0xDCc04fFaCD7B49035cCdBbbA59a5f955944129DB',
     oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-    lltv: 0.915,
-    marketId: '0x8e7cc042d739a365c43d0a52d5f24160fa7ae9b7e7c9a479bd02a56041d4cf77',
+    lltv: 0.860,
+    marketId: '0xbf02d6c6852fa0b8247d5514d0c91e6c1fbde9a168ac3fd2033028b5ee5ce6d0',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_LBTC_CBBTC_945 = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho',
+    shortLabel: 'LBTC/cbBTC',
+    value: MorphoBlueVersions.MorphoBlueLBTCCbBTC_945,
+    url: 'lbtccbbtc-444bbce8',
+    loanToken: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+    collateralToken: '0x8236a87084f8B84306f72007F36F2618A5634494',
+    oracle: '0x1Ce1a1e68F26019CAf5E823A56e300755D70D078',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.945,
+    marketId: '0x444bbce85350aae535b037d090c8bdf6cc4cfc6d79e17725413b4cb0f6183ad4',
     protocolName: 'morpho-blue',
 });
 // ###### BASE ########
@@ -802,6 +758,21 @@ export const MORPHO_BLUE_CBBTC_EURC_860_BASE = (networkId = NetworkNumber.Eth) =
     marketId: '0x67ebd84b2fb39e3bc5a13d97e4c07abe1ea617e40654826e9abce252e95f049e',
     protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_WETH_EURC_860_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho',
+    shortLabel: 'ETH/EURC',
+    value: MorphoBlueVersions.MorphoBlueWETHEURC_860_Base,
+    url: 'wetheurc-a9b5142f',
+    loanToken: '0x60a3E35Cc302bFA44Cb288Bc5a4F316Fdb1adb42',
+    collateralToken: '0x4200000000000000000000000000000000000006',
+    oracle: '0xE1bb8E5b4930eC9FeC7f7943FCF6227649F14B37',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.86,
+    marketId: '0xa9b5142fa687a24c275faf731f13b52faa9873252bb4e1cb6077aa1f412edb0b',
+    protocolName: 'morpho-blue',
+});
 export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueWstEthUSDC]: MORPHO_BLUE_WSTETH_USDC(networkId),
     [MorphoBlueVersions.MorphoBlueSDAIUSDC]: MORPHO_BLUE_SDAI_USDC(networkId),
@@ -811,37 +782,34 @@ export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueWstEthUSDT]: MORPHO_BLUE_WSTETH_USDT(networkId),
     [MorphoBlueVersions.MorphoBlueWstEthUSDA_Exchange_Rate]: MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE(networkId),
     [MorphoBlueVersions.MorphoBlueWstEthPYUSD]: MORPHO_BLUE_WSTETH_PYUSD(networkId),
-    [MorphoBlueVersions.MorphoBlueWeEthEth_860]: MORPHO_BLUE_WEETH_ETH_860(networkId),
     [MorphoBlueVersions.MorphoBlueWeEthEth_945]: MORPHO_BLUE_WEETH_ETH_945(networkId),
     [MorphoBlueVersions.MorphoBlueWBTCPYUSD]: MORPHO_BLUE_WBTC_PYUSD(networkId),
     [MorphoBlueVersions.MorphoBlueWBTCEth]: MORPHO_BLUE_WBTC_ETH(networkId),
     [MorphoBlueVersions.MorphoBlueUSDeUSDT]: MORPHO_BLUE_USDE_USDT(networkId),
     [MorphoBlueVersions.MorphoBlueSUSDeUSDT]: MORPHO_BLUE_SUSDE_USDT(networkId),
-    [MorphoBlueVersions.MorphoBlueSDAIEth]: MORPHO_BLUE_SDAI_ETH(networkId),
     [MorphoBlueVersions.MorphoBlueEzEthEth_860]: MORPHO_BLUE_EZETH_ETH_860(networkId),
     [MorphoBlueVersions.MorphoBlueEzEthEth_945]: MORPHO_BLUE_EZETH_ETH_945(networkId),
     [MorphoBlueVersions.MorphoBlueMKRUSDC]: MORPHO_BLUE_MKR_USDC(networkId),
     [MorphoBlueVersions.MorphoBlueTBTCUSDC]: MORPHO_BLUE_TBTC_USDC(networkId),
     [MorphoBlueVersions.MorphoBlueCbBTCEth_915]: MORPHO_BLUE_CBBTC_ETH_915(networkId),
     [MorphoBlueVersions.MorphoBlueCbBTCUSDC_860]: MORPHO_BLUE_CBBTC_USDC_860(networkId),
-    [MorphoBlueVersions.MorphoBlueREthEth_945]: MORPHO_BLUE_RETH_ETH_945(networkId),
     [MorphoBlueVersions.MorphoBlueSUSDeUSDC_915]: MORPHO_BLUE_SUSDE_USDC_915(networkId),
     [MorphoBlueVersions.MorphoBlueLBTCWBTC_945]: MORPHO_BLUE_LBTC_WBTC_945(networkId),
     [MorphoBlueVersions.MorphoBlueUSRUSDC_915]: MORPHO_BLUE_USR_USDC_915(networkId),
+    [MorphoBlueVersions.MorphoBlueSyrupUSDCUSDC_915]: MORPHO_BLUE_SYRUPUSDC_USDC_915(networkId),
+    [MorphoBlueVersions.MorphoBlueLBTCUSDC_860]: MORPHO_BLUE_LBTC_USDC_860(networkId),
+    [MorphoBlueVersions.MorphoBlueLBTCCbBTC_945]: MORPHO_BLUE_LBTC_CBBTC_945(networkId),
     // wstETH/WETH
     [MorphoBlueVersions.MorphoBlueWstEthEth_945]: MORPHO_BLUE_WSTETH_ETH_945(networkId),
     [MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE(networkId),
     [MorphoBlueVersions.MorphoBlueWstEthEth_965_Exchange_Rate]: MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE(networkId),
     // sUSDe/DAI
-    [MorphoBlueVersions.MorphoBlueSUSDeDAI_770]: MORPHO_BLUE_SUSDE_DAI_770(networkId),
     [MorphoBlueVersions.MorphoBlueSUSDeDAI_860]: MORPHO_BLUE_SUSDE_DAI_860(networkId),
     [MorphoBlueVersions.MorphoBlueSUSDeDAI_915]: MORPHO_BLUE_SUSDE_DAI_915(networkId),
     [MorphoBlueVersions.MorphoBlueSUSDeDAI_945]: MORPHO_BLUE_SUSDE_DAI_945(networkId),
     // USDe/DAI
-    [MorphoBlueVersions.MorphoBlueUSDeDAI_770]: MORPHO_BLUE_USDE_DAI_770(networkId),
     [MorphoBlueVersions.MorphoBlueUSDeDAI_860]: MORPHO_BLUE_USDE_DAI_860(networkId),
     [MorphoBlueVersions.MorphoBlueUSDeDAI_915]: MORPHO_BLUE_USDE_DAI_915(networkId),
-    [MorphoBlueVersions.MorphoBlueUSDeDAI_945]: MORPHO_BLUE_USDE_DAI_945(networkId),
     // Base
     [MorphoBlueVersions.MorphoBlueCbEthUSDC_860_Base]: MORPHO_BLUE_CBETH_USDC_860_BASE(networkId),
     [MorphoBlueVersions.MorphoBlueCbEthUSDC_860_Base_1c21c59d]: MORPHO_BLUE_CBETH_USDC_860_BASE_1c21c59d(networkId),
@@ -855,6 +823,7 @@ export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueCbBTCEURC_860_Base]: MORPHO_BLUE_CBBTC_EURC_860_BASE(networkId),
     [MorphoBlueVersions.MorphoBlueWstEthEURC_860_Base]: MORPHO_BLUE_WSTETH_EURC_860_BASE(networkId),
     [MorphoBlueVersions.MorphoBlueLBTCCbBTC_945_Base]: MORPHO_BLUE_LBTC_CBBTC_945_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueWETHEURC_860_Base]: MORPHO_BLUE_WETH_EURC_860_BASE(networkId),
     // wsuperOETHb/WETH Base
     [MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base]: MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE(networkId),
     // cbETH/WETH Base

package/esm/moneymarket/moneymarketCommonService.js

@@ -16,7 +16,11 @@ export const calcLeverageLiqPrice = (leverageType, assetPrice, borrowedUsd, borr
     return '0';
 };
 export const calculateBorrowingAssetLimit = (assetBorrowedUsd, borrowLimitUsd) => new Dec(assetBorrowedUsd).div(borrowLimitUsd).times(100).toString();
-export const STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'crvUSD', 'BOLD'];
+export const STABLE_ASSETS = [
+    'DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'USDA',
+    'USDe', 'sUSDe', 'USDS', 'sUSDS', 'USR', 'EURC', 'BOLD', 'BOLD Legacy', 'RLUSD', 'PT sUSDe July', 'PT eUSDe May',
+    'USDtb', 'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Jan', 'PT USDe Jan',
+];
 export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;
     let supplyStable = 0;