@defisaver/positions-sdk 2.1.13-dev-plasma-fluid6 → 2.1.13-dev-plasma-fluid8

package/cjs/fluid/index.js

@@ -119,7 +119,9 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
                 break;
             }
             case 'wrsETH': {
-                const { ethPrice, wrsETHRate, } = (0, priceService_1.parseWrsETHPriceCalls)(results[i + offset].result.toString(), 
+                const { ethPrice, wrsETHRate, } = (0, priceService_1.parseWrsETHPriceCalls)(
+                // @ts-ignore
+                results[i + offset].result[1].toString(), 
                 // @ts-ignore
                 results[i + offset + 1].result[1].toString());
                 offset += 1;
@@ -127,7 +129,9 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
                 break;
             }
             case 'syrupUSDT': {
-                const { syrupUSDTRate, USDTRate, } = (0, priceService_1.parseSyrupUSDTPriceCalls)(results[i + offset].result.toString(), 
+                const { syrupUSDTRate, USDTRate, } = (0, priceService_1.parseSyrupUSDTPriceCalls)(
+                // @ts-ignore
+                results[i + offset].result[1].toString(), 
                 // @ts-ignore
                 results[i + offset + 1].result[1].toString());
                 offset += 1;
@@ -135,7 +139,9 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
                 break;
             }
             case 'wstUSR': {
-                const { wstUSRRate, USRRate, } = (0, priceService_1.parseWstUSRPriceCalls)(results[i + offset].result.toString(), 
+                const { wstUSRRate, USRRate, } = (0, priceService_1.parseWstUSRPriceCalls)(
+                // @ts-ignore
+                results[i + offset].result[1].toString(), 
                 // @ts-ignore
                 results[i + offset + 1].result[1].toString());
                 offset += 1;

package/cjs/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/cjs/liquityV2/index.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.getLiquitySAndYBold = exports.getLiquityV2Staking = exports.getLiquityV2ClaimableCollateral = exports.getLiquityV2TroveData = exports._getLiquityV2TroveData = exports.getDebtInFrontForInterestRateLiquityV2 = exports.getLiquityV2UserTroveIds = exports._getLiquityV2UserTroveIds = exports.getLiquityV2MarketData = exports._getLiquityV2MarketData = void 0;
+exports.getLiquitySAndYBold = exports.getLiquityV2Staking = exports.getLiquityV2ClaimableCollateral = exports.getLiquityV2TroveData = exports._getLiquityV2TroveData = exports.getDebtInFrontForInterestRateLiquityV2 = exports.getDebtInFrontForInterestRateIncludingNewDebtLiquityV2 = exports.calculateDebtInFrontLiquityV2 = exports.getLiquityV2UserTroveIds = exports._getLiquityV2UserTroveIds = exports.getLiquityV2MarketData = exports._getLiquityV2MarketData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
@@ -201,11 +201,39 @@ const getAllMarketsUnbackedDebts = (markets, isLegacy, provider, network) => __a
     return Object.fromEntries(allMarketsUnbackedDebt);
 });
 const calculateDebtInFrontLiquityV2 = (markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront) => {
+    // Sanity check to avoid division by 0. Very unlikely to ever happen.
+    const selectedMarketTotalBorrow = new decimal_js_1.default(markets[selectedMarket].assetsData[(0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[selectedMarket].debtToken].totalBorrow);
+    if (selectedMarketTotalBorrow.eq(0))
+        return new decimal_js_1.default(0).toString();
     const selectedMarketUnbackedDebt = new decimal_js_1.default(allMarketsUnbackedDebts[selectedMarket]);
     const { isLegacy } = (0, markets_1.LiquityV2Markets)(common_1.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 decimal_js_1.default(val)), new decimal_js_1.default(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 decimal_js_1.default(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 } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[version];
+            if (version === selectedMarket && isLegacyMarket !== isLegacy)
+                return new decimal_js_1.default(interestRateDebtInFront);
+            const { assetsData } = market;
+            const { debtToken } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[version];
+            // For other markets, subtract their unbacked debt as it will be cleared in first redemption call
+            const marketUnbackedDebt = new decimal_js_1.default(allMarketsUnbackedDebts[version]);
+            const totalBorrow = new decimal_js_1.default(assetsData[debtToken].totalBorrow).sub(marketUnbackedDebt);
+            const amountToRedeem = new decimal_js_1.default(interestRateDebtInFront).mul(totalBorrow).div(selectedMarketTotalBorrow);
+            return decimal_js_1.default.min(amountToRedeem, totalBorrow);
+        });
+        const redemptionAmount = amountBeingRedeemedOnEachMarketByTotalBorrow.reduce((acc, val) => acc.plus(val), new decimal_js_1.default(0));
+        return totalUnbackedDebt.plus(redemptionAmount).toString();
+    }
+    const amountBeingRedeemedOnEachMarketByUnbackedDebt = Object.entries(markets).map(([version, market]) => {
         const { isLegacy: isLegacyMarket } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[version];
         if (version === selectedMarket && isLegacyMarket !== isLegacy)
             return new decimal_js_1.default(interestRateDebtInFront);
@@ -213,16 +241,31 @@ const calculateDebtInFrontLiquityV2 = (markets, selectedMarket, allMarketsUnback
         const { debtToken } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[version];
         const unbackedDebt = new decimal_js_1.default(allMarketsUnbackedDebts[version]);
         const totalBorrow = new decimal_js_1.default(assetsData[debtToken].totalBorrow);
-        const amountToReedem = new decimal_js_1.default(interestRateDebtInFront).mul(unbackedDebt).div(selectedMarketUnbackedDebt);
-        return decimal_js_1.default.min(amountToReedem, totalBorrow);
+        const amountToRedeem = new decimal_js_1.default(interestRateDebtInFront).mul(unbackedDebt).div(selectedMarketUnbackedDebt);
+        return decimal_js_1.default.min(amountToRedeem, totalBorrow);
     });
-    return amountBeingReedemedOnEachMarket.reduce((acc, val) => acc.plus(val), new decimal_js_1.default(0)).toString();
+    return amountBeingRedeemedOnEachMarketByUnbackedDebt.reduce((acc, val) => acc.plus(val), new decimal_js_1.default(0)).toString();
 };
+exports.calculateDebtInFrontLiquityV2 = calculateDebtInFrontLiquityV2;
+// @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.
+const getDebtInFrontForInterestRateIncludingNewDebtLiquityV2 = (newDebt, markets, selectedMarket, provider, network, interestRate) => __awaiter(void 0, void 0, void 0, function* () {
+    const marketsWithNewDebt = structuredClone(markets);
+    const selectedMarketDebtToken = (0, markets_1.LiquityV2Markets)(network)[selectedMarket].debtToken;
+    const currentTotalBorrow = new decimal_js_1.default(marketsWithNewDebt[selectedMarket].assetsData[selectedMarketDebtToken].totalBorrow);
+    marketsWithNewDebt[selectedMarket].assetsData[selectedMarketDebtToken].totalBorrow = currentTotalBorrow.add(newDebt).toString();
+    const { isLegacy } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[selectedMarket];
+    const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(marketsWithNewDebt, isLegacy, provider, network);
+    const interestRateDebtInFront = new decimal_js_1.default(yield getDebtInFrontForInterestRateSingleMarketLiquityV2(provider, network, isLegacy, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, interestRate));
+    return (0, exports.calculateDebtInFrontLiquityV2)(marketsWithNewDebt, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
+});
+exports.getDebtInFrontForInterestRateIncludingNewDebtLiquityV2 = getDebtInFrontForInterestRateIncludingNewDebtLiquityV2;
 const getDebtInFrontLiquityV2 = (markets, selectedMarket, provider, network, viewContract, troveId) => __awaiter(void 0, void 0, void 0, function* () {
     const { isLegacy } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[selectedMarket];
     const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, isLegacy, provider, network);
     const interestRateDebtInFront = yield getDebtInFrontForSingleMarketLiquityV2(provider, network, isLegacy, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, troveId);
-    return calculateDebtInFrontLiquityV2(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
+    return (0, exports.calculateDebtInFrontLiquityV2)(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
 /**
  * @param markets
@@ -237,7 +280,7 @@ const _getDebtInFrontForInterestRateLiquityV2 = (markets_2, selectedMarket_1, pr
     const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, isLegacy, provider, network);
     const interestRateDebtInFront = new decimal_js_1.default(yield getDebtInFrontForInterestRateSingleMarketLiquityV2(provider, network, isLegacy, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, interestRate))
         .sub(debtInFrontBeingMoved);
-    return calculateDebtInFrontLiquityV2(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
+    return (0, exports.calculateDebtInFrontLiquityV2)(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
 const getDebtInFrontForInterestRateLiquityV2 = (markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1) => __awaiter(void 0, [markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1], void 0, function* (markets, selectedMarket, provider, network, isLegacy, interestRate, debtInFrontBeingMoved = '0') { return _getDebtInFrontForInterestRateLiquityV2(markets, selectedMarket, (0, viem_1.getViemProvider)(provider, network), network, isLegacy, interestRate, debtInFrontBeingMoved); });
 exports.getDebtInFrontForInterestRateLiquityV2 = getDebtInFrontForInterestRateLiquityV2;

package/cjs/moneymarket/moneymarketCommonService.js

@@ -27,7 +27,11 @@ 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', 'BOLD'];
+exports.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',
+];
 const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;
     let supplyStable = 0;

package/esm/fluid/index.js

@@ -113,7 +113,9 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
                 break;
             }
             case 'wrsETH': {
-                const { ethPrice, wrsETHRate, } = parseWrsETHPriceCalls(results[i + offset].result.toString(), 
+                const { ethPrice, wrsETHRate, } = parseWrsETHPriceCalls(
+                // @ts-ignore
+                results[i + offset].result[1].toString(), 
                 // @ts-ignore
                 results[i + offset + 1].result[1].toString());
                 offset += 1;
@@ -121,7 +123,9 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
                 break;
             }
             case 'syrupUSDT': {
-                const { syrupUSDTRate, USDTRate, } = parseSyrupUSDTPriceCalls(results[i + offset].result.toString(), 
+                const { syrupUSDTRate, USDTRate, } = parseSyrupUSDTPriceCalls(
+                // @ts-ignore
+                results[i + offset].result[1].toString(), 
                 // @ts-ignore
                 results[i + offset + 1].result[1].toString());
                 offset += 1;
@@ -129,7 +133,9 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
                 break;
             }
             case 'wstUSR': {
-                const { wstUSRRate, USRRate, } = parseWstUSRPriceCalls(results[i + offset].result.toString(), 
+                const { wstUSRRate, USRRate, } = parseWstUSRPriceCalls(
+                // @ts-ignore
+                results[i + offset].result[1].toString(), 
                 // @ts-ignore
                 results[i + offset + 1].result[1].toString());
                 offset += 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/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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.13-dev-plasma-fluid6",
+  "version": "2.1.13-dev-plasma-fluid8",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.7.8",
+    "@defisaver/tokens": "^1.7.9",
     "@types/lodash": "^4.17.15",
     "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.6.0",

package/src/fluid/index.ts

@@ -182,7 +182,8 @@ const getChainLinkPricesForTokens = async (
           ethPrice,
           wrsETHRate,
         } = parseWrsETHPriceCalls(
-          results[i + offset].result!.toString(),
+          // @ts-ignore
+          results[i + offset].result[1]!.toString(),
           // @ts-ignore
           results[i + offset + 1].result[1]!.toString(),
         );
@@ -196,7 +197,8 @@ const getChainLinkPricesForTokens = async (
           syrupUSDTRate,
           USDTRate,
         } = parseSyrupUSDTPriceCalls(
-          results[i + offset].result!.toString(),
+          // @ts-ignore
+          results[i + offset].result[1]!.toString(),
           // @ts-ignore
           results[i + offset + 1].result[1]!.toString(),
         );
@@ -209,7 +211,8 @@ const getChainLinkPricesForTokens = async (
           wstUSRRate,
           USRRate,
         } = parseWstUSRPriceCalls(
-          results[i + offset].result!.toString(),
+          // @ts-ignore
+          results[i + offset].result[1]!.toString(),
           // @ts-ignore
           results[i + offset + 1].result[1]!.toString(),
         );

package/src/liquityV2/index.ts

@@ -264,23 +264,69 @@ const getAllMarketsUnbackedDebts = async (markets: Record<LiquityV2Versions, Liq
   return Object.fromEntries(allMarketsUnbackedDebt) as Record<LiquityV2Versions, string>;
 };
 
-const calculateDebtInFrontLiquityV2 = (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, allMarketsUnbackedDebts: Record<LiquityV2Versions, string>, interestRateDebtInFront: string): string => {
+export const calculateDebtInFrontLiquityV2 = (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, allMarketsUnbackedDebts: Record<LiquityV2Versions, string>, interestRateDebtInFront: string): string => {
+  // 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 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 as LiquityV2Versions];
+      if (version === selectedMarket && isLegacyMarket !== isLegacy) return new Dec(interestRateDebtInFront);
+      const { assetsData } = market;
+      const { debtToken } = LiquityV2Markets(NetworkNumber.Eth)[version as LiquityV2Versions];
+      // For other markets, subtract their unbacked debt as it will be cleared in first redemption call
+      const marketUnbackedDebt = new Dec(allMarketsUnbackedDebts[version as LiquityV2Versions]);
+      const totalBorrow = new Dec(assetsData[debtToken].totalBorrow).sub(marketUnbackedDebt);
+      const amountToRedeem = new Dec(interestRateDebtInFront).mul(totalBorrow).div(selectedMarketTotalBorrow);
+      return Dec.min(amountToRedeem, totalBorrow);
+    });
 
-  const amountBeingReedemedOnEachMarket = Object.entries(markets).map(([version, market]) => {
+    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 as LiquityV2Versions];
     if (version === selectedMarket && isLegacyMarket !== isLegacy) return new Dec(interestRateDebtInFront);
     const { assetsData } = market;
     const { debtToken } = LiquityV2Markets(NetworkNumber.Eth)[version as LiquityV2Versions];
     const unbackedDebt = new Dec(allMarketsUnbackedDebts[version as LiquityV2Versions]);
     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 = async (newDebt: string, markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, provider: Client, network: NetworkNumber, interestRate: string) => {
+  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 = await getAllMarketsUnbackedDebts(marketsWithNewDebt, isLegacy, provider, network);
+  const interestRateDebtInFront = new Dec(await getDebtInFrontForInterestRateSingleMarketLiquityV2(provider, network, isLegacy, LiquityV2Markets(network)[selectedMarket].marketAddress, interestRate));
+
+  return calculateDebtInFrontLiquityV2(marketsWithNewDebt, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 };
 
 const getDebtInFrontLiquityV2 = async (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, provider: Client, network: NetworkNumber, viewContract: any, troveId: string) => {

package/src/moneymarket/moneymarketCommonService.ts

@@ -20,7 +20,11 @@ export const calcLeverageLiqPrice = (leverageType: string, assetPrice: string, b
 
 export const calculateBorrowingAssetLimit = (assetBorrowedUsd: string, borrowLimitUsd: string) => 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: MMUsedAssets, dustLimit = 5) => {
   let borrowUnstable = 0;

package/src/staking/staking.ts

@@ -60,7 +60,10 @@ const getApyFromDfsApi = async (asset: string, network: number = NetworkNumber.E
   }
 };
 
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT'];
+export const STAKING_ASSETS = [
+  'cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH',
+  'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov', 'PT USDe Jan', 'PT sUSDe Jan',
+  'wrsETH', 'wstETH', 'syrupUSDT'];
 
 export const getStakingApy = memoize(async (asset: string, network: number = NetworkNumber.Eth) => {
   try {