@suilend/sdk 2.0.4 → 2.0.5

package/strategies.js

@@ -14,10 +14,11 @@ import BigNumber from "bignumber.js";
 import { BN } from "bn.js";
 import { cloneDeep } from "lodash";
 import { LstClient, SPRING_SUI_UPGRADE_CAP_ID, getLatestPackageId as getLatestSpringSuiPackageId, } from "@suilend/springsui-sdk";
-import { API_URL, MAX_U64, MS_PER_YEAR, NORMALIZED_AUSD_COINTYPE, NORMALIZED_SUI_COINTYPE, NORMALIZED_USDC_COINTYPE, NORMALIZED_sSUI_COINTYPE, NORMALIZED_suiUSDT_COINTYPE, NORMALIZED_suiWBTC_COINTYPE, NORMALIZED_xBTC_COINTYPE, getAllCoins, isSui, mergeAllCoins, } from "@suilend/sui-fe";
+import { API_URL, MAX_U64, MS_PER_YEAR, NORMALIZED_AUSD_COINTYPE, NORMALIZED_SUI_COINTYPE, NORMALIZED_USDC_COINTYPE, NORMALIZED_sSUI_COINTYPE, NORMALIZED_suiUSDT_COINTYPE, NORMALIZED_suiWBTC_COINTYPE, NORMALIZED_xBTC_COINTYPE, isSui, } from "@suilend/sui-fe";
 import { getNetAprPercent } from "./lib";
+import { getSpendableCoin } from "./lib/coin";
 import { getRewardsMap } from "./lib/liquidityMining";
-import { STRATEGY_TYPE_INFO_MAP, StrategyType, strategyBorrow, strategyClaimRewardsAndSwapForCoinType, strategyDeposit, strategyWithdraw, } from "./lib/strategyOwnerCap";
+import { STRATEGY_TYPE_INFO_MAP, StrategyType, strategyBorrow, strategyClaimRewardsAndMergeCoins, strategyDeposit, strategyWithdraw, } from "./lib/strategyOwnerCap";
 import { MMT_CONTRACT_PACKAGE_ID, MMT_VERSION_OBJECT_ID } from "./mmt";
 import { getWeightedBorrowsUsd } from "./utils";
 export const STRATEGY_E = 10 ** -7;
@@ -35,20 +36,28 @@ export const STRATEGY_TYPE_FLASH_LOAN_OBJ_MAP = {
         borrowA: false,
         feePercent: 0.01,
     },
-    [StrategyType.stratSUI_SUI_LOOPING]: {
+    [StrategyType.USDC_sSUI_SUI_LOOPING]: {
         provider: StrategyFlashLoanProvider.MMT,
-        poolId: "0x9c92c5b8e9d83e485fb4c86804ac8b920bb0beaace5e61a5b0239218f627f8e9", // xSUI-SUI 0.01% https://app.mmt.finance/liquidity/0x9c92c5b8e9d83e485fb4c86804ac8b920bb0beaace5e61a5b0239218f627f8e9
-        coinTypeA: "0x2b6602099970374cf58a2a1b9d96f005fccceb81e92eb059873baf420eb6c717::x_sui::X_SUI",
-        coinTypeB: NORMALIZED_SUI_COINTYPE,
+        poolId: "0x737ec6a4d3ed0c7e6cc18d8ba04e7ffd4806b726c97efd89867597368c4d06a9", // suiUSDT-USDC 0.001% https://app.mmt.finance/liquidity/0x737ec6a4d3ed0c7e6cc18d8ba04e7ffd4806b726c97efd89867597368c4d06a9
+        coinTypeA: NORMALIZED_suiUSDT_COINTYPE,
+        coinTypeB: NORMALIZED_USDC_COINTYPE,
         borrowA: false,
-        feePercent: 0.01,
+        feePercent: 0.001,
     },
-    [StrategyType.USDC_sSUI_SUI_LOOPING]: {
+    [StrategyType.USDsui_USDC_LOOPING]: {
         provider: StrategyFlashLoanProvider.MMT,
         poolId: "0x737ec6a4d3ed0c7e6cc18d8ba04e7ffd4806b726c97efd89867597368c4d06a9", // suiUSDT-USDC 0.001% https://app.mmt.finance/liquidity/0x737ec6a4d3ed0c7e6cc18d8ba04e7ffd4806b726c97efd89867597368c4d06a9
         coinTypeA: NORMALIZED_suiUSDT_COINTYPE,
         coinTypeB: NORMALIZED_USDC_COINTYPE,
-        borrowA: false,
+        borrowA: false, // Requires swap from USDT to USDsui
+        feePercent: 0.001,
+    },
+    [StrategyType.eEARN_USDC_LOOPING]: {
+        provider: StrategyFlashLoanProvider.MMT,
+        poolId: "0x737ec6a4d3ed0c7e6cc18d8ba04e7ffd4806b726c97efd89867597368c4d06a9", // suiUSDT-USDC 0.001% https://app.mmt.finance/liquidity/0x737ec6a4d3ed0c7e6cc18d8ba04e7ffd4806b726c97efd89867597368c4d06a9
+        coinTypeA: NORMALIZED_suiUSDT_COINTYPE,
+        coinTypeB: NORMALIZED_USDC_COINTYPE,
+        borrowA: false, // Requires swap from USDC to eEARN
         feePercent: 0.001,
     },
     [StrategyType.AUSD_sSUI_SUI_LOOPING]: {
@@ -107,6 +116,23 @@ export const STRATEGY_TYPE_FLASH_LOAN_OBJ_MAP = {
         borrowA: false,
         feePercent: 0.001,
     },
+    // TODO: Update poolId for USDsui sSUI-SUI
+    [StrategyType.USDsui_sSUI_SUI_LOOPING]: {
+        provider: StrategyFlashLoanProvider.MMT,
+        poolId: "0x737ec6a4d3ed0c7e6cc18d8ba04e7ffd4806b726c97efd89867597368c4d06a9", // suiUSDT-USDC 0.001% https://app.mmt.finance/liquidity/0x737ec6a4d3ed0c7e6cc18d8ba04e7ffd4806b726c97efd89867597368c4d06a9
+        coinTypeA: NORMALIZED_suiUSDT_COINTYPE,
+        coinTypeB: NORMALIZED_USDC_COINTYPE,
+        borrowA: false,
+        feePercent: 0.001,
+    },
+    [StrategyType.stratSUI_SUI_LOOPING]: {
+        provider: StrategyFlashLoanProvider.MMT,
+        poolId: "0x9c92c5b8e9d83e485fb4c86804ac8b920bb0beaace5e61a5b0239218f627f8e9", // xSUI-SUI 0.01% https://app.mmt.finance/liquidity/0x9c92c5b8e9d83e485fb4c86804ac8b920bb0beaace5e61a5b0239218f627f8e9
+        coinTypeA: "0x2b6602099970374cf58a2a1b9d96f005fccceb81e92eb059873baf420eb6c717::x_sui::X_SUI",
+        coinTypeB: NORMALIZED_SUI_COINTYPE,
+        borrowA: false,
+        feePercent: 0.01,
+    },
 };
 export const getReserveSafeDepositLimit = (reserve) => {
     // Calculate safe deposit limit (subtract 10 mins of deposit APR from cap)
@@ -133,7 +159,10 @@ export const hasStrategyPosition = (obligation) => obligation.deposits.length >
 // SUI
 export const getStrategySuiReserve = (
 // AppContext
-reserveMap) => reserveMap[NORMALIZED_SUI_COINTYPE];
+reserveMap) => {
+    var _a;
+    return (_a = reserveMap[NORMALIZED_SUI_COINTYPE]) !== null && _a !== void 0 ? _a : { price: new BigNumber(1) };
+};
 export const fetchStrategyLstMap = (suiClient) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const lstCoinTypes = Array.from(new Set([
@@ -213,16 +242,21 @@ export const STRATEGY_TYPE_EXPOSURE_MAP = {
         max: new BigNumber(3), // Actual max: 1 / (1 - (sSUI Open LTV %)) = 3.333x, where sSUI Open LTV % = 70%
         default: new BigNumber(3),
     },
-    [StrategyType.stratSUI_SUI_LOOPING]: {
-        min: new BigNumber(1),
-        max: new BigNumber(3), // Actual max: 1 / (1 - (sSUI Open LTV %)) = 3.333x, where sSUI Open LTV % = 70%
-        default: new BigNumber(3),
-    },
     [StrategyType.USDC_sSUI_SUI_LOOPING]: {
         min: new BigNumber(1),
         max: new BigNumber(3), // Actual max: 1 + (USDC Open LTV %) * (1 / (1 - (sSUI Open LTV %))) = 3.5666x, where USDC Open LTV % = 77% and sSUI Open LTV % = 70%
         default: new BigNumber(3),
     },
+    [StrategyType.USDsui_USDC_LOOPING]: {
+        min: new BigNumber(1),
+        max: new BigNumber(4), // Actual max: 1 / (1 - (USDsui Open LTV %)) = 4.347x, where USDsui Open LTV % = 77%
+        default: new BigNumber(4),
+    },
+    [StrategyType.eEARN_USDC_LOOPING]: {
+        min: new BigNumber(1),
+        max: new BigNumber(4.5), // Actual max: 1 / (1 - (eEARN Open LTV %)) = 5x, where eEARN Open LTV % = 80%
+        default: new BigNumber(4.5),
+    },
     [StrategyType.AUSD_sSUI_SUI_LOOPING]: {
         min: new BigNumber(1),
         max: new BigNumber(3), // Actual max: 1 + (AUSD Open LTV %) * (1 / (1 - (sSUI Open LTV %))) = 3.5666x, where AUSD Open LTV % = 77% and sSUI Open LTV % = 70%
@@ -258,6 +292,16 @@ export const STRATEGY_TYPE_EXPOSURE_MAP = {
         max: new BigNumber(4), // Actual max: 1 / (1 - (USDC Open LTV %)) = 4.347x, where USDC Open LTV % = 77%
         default: new BigNumber(4),
     },
+    [StrategyType.USDsui_sSUI_SUI_LOOPING]: {
+        min: new BigNumber(1),
+        max: new BigNumber(3), // Actual max: 1 + (USDsui Open LTV %) * (1 / (1 - (sSUI Open LTV %))) = 3.5666x, where USDsui Open LTV % = 77% and sSUI Open LTV % = 70%
+        default: new BigNumber(3),
+    },
+    [StrategyType.stratSUI_SUI_LOOPING]: {
+        min: new BigNumber(1),
+        max: new BigNumber(3), // Actual max: 1 / (1 - (sSUI Open LTV %)) = 3.333x, where sSUI Open LTV % = 70%
+        default: new BigNumber(3),
+    },
 };
 // Reserves
 export const getStrategyDepositReserves = (
@@ -801,6 +845,7 @@ lstMap, strategyType, obligation, exposure) => {
         StrategyType.AUSD_sSUI_SUI_LOOPING,
         StrategyType.xBTC_sSUI_SUI_LOOPING,
         StrategyType.suiUSDT_sSUI_SUI_LOOPING,
+        StrategyType.USDsui_sSUI_SUI_LOOPING,
     ].includes(strategyType))
         return new BigNumber(0); // Not shown in UI
     let _obligation;
@@ -897,12 +942,14 @@ transaction) => __awaiter(void 0, void 0, void 0, function* () {
             }, null, 2));
             // 1.2) Borrow
             const stepBorrowedAmount = BigNumber.min(pendingBorrowedAmount, stepMaxBorrowedAmount).decimalPlaces(borrowReserve.token.decimals, BigNumber.ROUND_DOWN);
+            if (stepBorrowedAmount.lte(0))
+                break;
             const isMaxBorrow = stepBorrowedAmount.eq(stepMaxBorrowedAmount);
             console.log(`[loopStrategyToExposure] ${i} borrow_sui.borrow |`, JSON.stringify({
                 stepBorrowedAmount: stepBorrowedAmount.toFixed(20),
                 isMaxBorrow,
             }, null, 2));
-            const [borrowedCoin] = strategyBorrow(borrowReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(borrowReserve.coinType), BigInt(stepBorrowedAmount
+            const [borrowedCoin] = strategyBorrow(strategyType, borrowReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(borrowReserve.coinType), BigInt(stepBorrowedAmount
                 .times(10 ** borrowReserve.token.decimals)
                 .integerValue(BigNumber.ROUND_DOWN)
                 .toString()), transaction);
@@ -927,7 +974,7 @@ transaction) => __awaiter(void 0, void 0, void 0, function* () {
                 stepDepositedAmount: stepDepositedAmount.toFixed(20),
                 isMaxDeposit,
             }, null, 2));
-            strategyDeposit(stepLstCoin, loopingDepositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(loopingDepositReserve.coinType), transaction);
+            strategyDeposit(strategyType, stepLstCoin, loopingDepositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(loopingDepositReserve.coinType), transaction);
             // 2.3) Update state
             deposits = addOrInsertStrategyDeposit(deposits, {
                 coinType: loopingDepositReserve.coinType,
@@ -983,12 +1030,14 @@ transaction) => __awaiter(void 0, void 0, void 0, function* () {
             }, null, 2));
             // 1.2) Borrow
             const stepBorrowedAmount = BigNumber.min(pendingBorrowedAmount, stepMaxBorrowedAmount).decimalPlaces(borrowReserve.token.decimals, BigNumber.ROUND_DOWN);
+            if (stepBorrowedAmount.lte(0))
+                break;
             const isMaxBorrow = stepBorrowedAmount.eq(stepMaxBorrowedAmount);
             console.log(`[loopStrategyToExposure] ${i} borrow.borrow |`, JSON.stringify({
                 stepBorrowedAmount: stepBorrowedAmount.toFixed(20),
                 isMaxBorrow,
             }, null, 2));
-            const [stepBorrowedCoin] = strategyBorrow(borrowReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(borrowReserve.coinType), BigInt(stepBorrowedAmount
+            const [stepBorrowedCoin] = strategyBorrow(strategyType, borrowReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(borrowReserve.coinType), BigInt(stepBorrowedAmount
                 .times(10 ** borrowReserve.token.decimals)
                 .integerValue(BigNumber.ROUND_DOWN)
                 .toString()), transaction);
@@ -1045,7 +1094,7 @@ transaction) => __awaiter(void 0, void 0, void 0, function* () {
                 stepDepositedAmount: stepDepositedAmount.toFixed(20),
                 isMaxDeposit,
             }, null, 2));
-            strategyDeposit(stepBaseCoin, loopingDepositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(loopingDepositReserve.coinType), transaction);
+            strategyDeposit(strategyType, stepBaseCoin, loopingDepositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(loopingDepositReserve.coinType), transaction);
             // 2.3) Update state
             deposits = addOrInsertStrategyDeposit(deposits, {
                 coinType: loopingDepositReserve.coinType,
@@ -1135,7 +1184,7 @@ transaction, dryRunTransaction) => __awaiter(void 0, void 0, void 0, function* (
             lstWithdrawnAmount: lstWithdrawnAmount.toFixed(20),
         }));
         // 1.1) Withdraw
-        const [withdrawnLstCoin] = strategyWithdraw(depositReserves.lst.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.lst.coinType), BigInt(new BigNumber(lstWithdrawnAmount
+        const [withdrawnLstCoin] = strategyWithdraw(strategyType, depositReserves.lst.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.lst.coinType), BigInt(new BigNumber(lstWithdrawnAmount
             .times(10 ** LST_DECIMALS)
             .integerValue(BigNumber.ROUND_DOWN)
             .toString())
@@ -1194,7 +1243,7 @@ transaction, dryRunTransaction) => __awaiter(void 0, void 0, void 0, function* (
                 remainingLstWithdrawnAmount: remainingLstWithdrawnAmount.toFixed(20),
             }));
             // 1.1) MAX Withdraw
-            const [withdrawnRemainingLstCoin] = strategyWithdraw(depositReserves.lst.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.lst.coinType), BigInt(MAX_U64.toString()), transaction);
+            const [withdrawnRemainingLstCoin] = strategyWithdraw(strategyType, depositReserves.lst.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.lst.coinType), BigInt(MAX_U64.toString()), transaction);
             // 1.2) Update state
             deposits = addOrInsertStrategyDeposit(deposits, {
                 coinType: depositReserves.lst.coinType,
@@ -1246,7 +1295,7 @@ transaction, dryRunTransaction) => __awaiter(void 0, void 0, void 0, function* (
                 throw new Error("No swap quote found");
             }
             // 3) Deposit base
-            strategyDeposit(swapCoin, depositReserves.base.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.base.coinType), transaction);
+            strategyDeposit(strategyType, swapCoin, depositReserves.base.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.base.coinType), transaction);
         }
     });
     const fullyRepayBorrowsUsingBase = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -1269,7 +1318,7 @@ transaction, dryRunTransaction) => __awaiter(void 0, void 0, void 0, function* (
         // 1) MAX withdraw LST
         if (depositReserves.lst !== undefined) {
             // 1.1) MAX withdraw
-            const [withdrawnMaxLstCoin] = strategyWithdraw(depositReserves.lst.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.lst.coinType), BigInt(MAX_U64.toString()), transaction);
+            const [withdrawnMaxLstCoin] = strategyWithdraw(strategyType, depositReserves.lst.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.lst.coinType), BigInt(MAX_U64.toString()), transaction);
             // 1.2) Update state
             deposits = addOrInsertStrategyDeposit(deposits, {
                 coinType: depositReserves.lst.coinType,
@@ -1296,7 +1345,7 @@ transaction, dryRunTransaction) => __awaiter(void 0, void 0, void 0, function* (
             baseWithdrawnAmount: baseWithdrawnAmount.toFixed(20),
         }, null, 2));
         // 2.1) Withdraw
-        const [withdrawnBaseCoin] = strategyWithdraw(depositReserves.base.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.base.coinType), BigInt(new BigNumber(baseWithdrawnAmount
+        const [withdrawnBaseCoin] = strategyWithdraw(strategyType, depositReserves.base.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.base.coinType), BigInt(new BigNumber(baseWithdrawnAmount
             .times(10 ** depositReserves.base.token.decimals)
             .integerValue(BigNumber.ROUND_DOWN)
             .toString())
@@ -1463,7 +1512,7 @@ transaction, dryRunTransaction) => __awaiter(void 0, void 0, void 0, function* (
                 stepWithdrawnAmount: stepWithdrawnAmount.toFixed(20),
                 isMaxWithdraw,
             }, null, 2));
-            const [stepWithdrawnCoin] = strategyWithdraw(loopingDepositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(loopingDepositReserve.coinType), BigInt(new BigNumber(stepWithdrawnAmount
+            const [stepWithdrawnCoin] = strategyWithdraw(strategyType, loopingDepositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(loopingDepositReserve.coinType), BigInt(new BigNumber(stepWithdrawnAmount
                 .times(10 ** loopingDepositReserve.token.decimals)
                 .integerValue(BigNumber.ROUND_DOWN)
                 .toString())
@@ -1564,7 +1613,13 @@ transaction, dryRunTransaction) => __awaiter(void 0, void 0, void 0, function* (
                 stepWithdrawnAmount: stepWithdrawnAmount.toFixed(20),
                 isMaxWithdraw,
             }, null, 2));
-            const [stepWithdrawnCoin] = strategyWithdraw(loopingDepositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(loopingDepositReserve.coinType), BigInt(new BigNumber(stepWithdrawnAmount
+            // `pendingBorrowedAmount` can fall below a single unit of base after
+            // rounding down to the deposit coin's decimals, leaving
+            // `stepWithdrawnAmount = 0`. Cetus returns "No swap quote found" for a
+            // zero-amount quote — there's nothing meaningful left to unloop, so stop.
+            if (stepWithdrawnAmount.lte(0))
+                break;
+            const [stepWithdrawnCoin] = strategyWithdraw(strategyType, loopingDepositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(loopingDepositReserve.coinType), BigInt(new BigNumber(stepWithdrawnAmount
                 .times(10 ** loopingDepositReserve.token.decimals)
                 .integerValue(BigNumber.ROUND_DOWN)
                 .toString())
@@ -1621,7 +1676,14 @@ transaction, dryRunTransaction) => __awaiter(void 0, void 0, void 0, function* (
             }, null, 2), routers);
             // 3) Repay borrows
             // 3.1) Repay
-            const stepRepaidAmount = new BigNumber(new BigNumber(routers.amountOut.toString()).div(10 ** borrowReserve.token.decimals)).decimalPlaces(borrowReserve.token.decimals, BigNumber.ROUND_DOWN);
+            // Actual on-chain swap output can be up to `slippagePercent`% less than the
+            // Cetus quote — track pessimistically so `borrowedAmount` stays ≥ real debt.
+            // Otherwise per-step under-counting accumulates and the final
+            // `fullyRepayBorrowsUsingBase` sizes off a near-zero tracked value, stranding
+            // dust borrow that blocks the subsequent `MAX_U64` deposit withdraw.
+            const stepRepaidAmount = new BigNumber(new BigNumber(routers.amountOut.toString())
+                .times(1 - slippagePercent / 100)
+                .div(10 ** borrowReserve.token.decimals)).decimalPlaces(borrowReserve.token.decimals, BigNumber.ROUND_DOWN);
             const isMaxRepay = stepRepaidAmount.eq(stepMaxRepaidAmount);
             console.log(`[unloopStrategyToExposure] ${i} repay_borrows.repay |`, JSON.stringify({
                 stepRepaidAmount: stepRepaidAmount.toFixed(20),
@@ -1705,7 +1767,7 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
         // 1.1.2) Stake SUI for LST
         const lstCoin = lst.client.mint(transaction, suiCoin);
         // 1.1.3) Deposit LST (1x exposure)
-        strategyDeposit(lstCoin, depositReserves.lst.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.lst.coinType), transaction);
+        strategyDeposit(strategyType, lstCoin, depositReserves.lst.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.lst.coinType), transaction);
         // 1.1.4) Update state
         deposits = addOrInsertStrategyDeposit(deposits, {
             coinType: depositReserves.lst.coinType,
@@ -1715,16 +1777,12 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
     // 1.2) LST
     else if (deposit.coinType === ((_c = depositReserves.lst) === null || _c === void 0 ? void 0 : _c.coinType)) {
         // 1.2.1) Split coins
-        const allCoinsLst = yield getAllCoins(suiClient, _address, depositReserves.lst.coinType);
-        const mergeCoinLst = mergeAllCoins(depositReserves.lst.coinType, transaction, allCoinsLst);
-        const lstCoin = transaction.splitCoins(transaction.object(mergeCoinLst.coinObjectId), [
-            BigInt(deposit.depositedAmount
-                .times(10 ** LST_DECIMALS)
-                .integerValue(BigNumber.ROUND_DOWN)
-                .toString()),
-        ]);
+        const lstCoin = yield getSpendableCoin(suiClient, _address, depositReserves.lst.coinType, deposit.depositedAmount
+            .times(10 ** LST_DECIMALS)
+            .integerValue(BigNumber.ROUND_DOWN)
+            .toString(), transaction);
         // 1.2.2) Deposit LST (1x exposure)
-        strategyDeposit(lstCoin, depositReserves.lst.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.lst.coinType), transaction);
+        strategyDeposit(strategyType, lstCoin, depositReserves.lst.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.lst.coinType), transaction);
         // 1.2.3) Update state
         deposits = addOrInsertStrategyDeposit(deposits, deposit);
         // 1.3) Other
@@ -1732,18 +1790,53 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
     else {
         const otherReserve = reserveMap[deposit.coinType];
         // 1.3.1) Split coins
-        const allCoinsOther = yield getAllCoins(suiClient, _address, otherReserve.coinType);
-        const mergeCoinOther = mergeAllCoins(otherReserve.coinType, transaction, allCoinsOther);
-        const otherCoin = transaction.splitCoins(transaction.object(mergeCoinOther.coinObjectId), [
-            BigInt(deposit.depositedAmount
-                .times(10 ** otherReserve.token.decimals)
-                .integerValue(BigNumber.ROUND_DOWN)
-                .toString()),
-        ]);
-        // 1.3.2) Deposit other (1x exposure)
-        strategyDeposit(otherCoin, otherReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(otherReserve.coinType), transaction);
-        // 1.3.3) Update state
-        deposits = addOrInsertStrategyDeposit(deposits, deposit);
+        const otherCoin = yield getSpendableCoin(suiClient, _address, otherReserve.coinType, deposit.depositedAmount
+            .times(10 ** otherReserve.token.decimals)
+            .integerValue(BigNumber.ROUND_DOWN)
+            .toString(), transaction);
+        // 1.3.2) If the deposit coin is the same as the borrow coin, swap to base first
+        if (deposit.coinType === borrowReserve.coinType && depositReserve) {
+            const routers = yield cetusSdk.findRouters({
+                from: otherReserve.coinType,
+                target: depositReserve.coinType,
+                amount: new BN(deposit.depositedAmount
+                    .times(10 ** otherReserve.token.decimals)
+                    .integerValue(BigNumber.ROUND_DOWN)
+                    .toString()),
+                byAmountIn: true,
+                splitCount: 0,
+            });
+            if (!routers)
+                throw new Error("No swap quote found");
+            const slippagePercent = 1;
+            let baseCoin;
+            try {
+                baseCoin = (yield cetusSdk.fixableRouterSwapV3({
+                    router: routers,
+                    inputCoin: otherCoin,
+                    slippage: slippagePercent / 100,
+                    txb: transaction,
+                    partner: cetusPartnerId,
+                }));
+            }
+            catch (err) {
+                throw new Error("No swap quote found");
+            }
+            const swappedAmount = new BigNumber(routers.amountOut.toString())
+                .div(10 ** depositReserve.token.decimals)
+                .decimalPlaces(depositReserve.token.decimals, BigNumber.ROUND_DOWN);
+            strategyDeposit(strategyType, baseCoin, depositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserve.coinType), transaction);
+            deposits = addOrInsertStrategyDeposit(deposits, {
+                coinType: depositReserve.coinType,
+                depositedAmount: swappedAmount,
+            });
+        }
+        else {
+            // 1.3.3) Deposit other (1x exposure)
+            strategyDeposit(strategyType, otherCoin, otherReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(otherReserve.coinType), transaction);
+            // 1.3.4) Update state
+            deposits = addOrInsertStrategyDeposit(deposits, deposit);
+        }
     }
     console.log(`[deposit] deposit |`, JSON.stringify({
         deposits: deposits.map((d) => ({
@@ -1885,7 +1978,7 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
     }
     // 2) Withdraw base or LST
     // 2.1) Withdraw
-    const [withdrawnCoin] = strategyWithdraw(depositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserve.coinType), BigInt(new BigNumber(withdrawnAmount
+    const [withdrawnCoin] = strategyWithdraw(strategyType, depositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserve.coinType), BigInt(new BigNumber(withdrawnAmount
         .times(10 ** depositReserve.token.decimals)
         .integerValue(BigNumber.ROUND_DOWN)
         .toString())
@@ -1916,8 +2009,38 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
         return { deposits, borrowedAmount, transaction, withdrawnCoin };
     else {
         if (depositReserve.coinType === ((_h = depositReserves.base) === null || _h === void 0 ? void 0 : _h.coinType)) {
-            // 3.1) Transfer base to user
-            transaction.transferObjects([withdrawnCoin], _address);
+            if (withdraw.coinType !== depositReserve.coinType) {
+                const routers = yield cetusSdk.findRouters({
+                    from: depositReserve.coinType,
+                    target: withdraw.coinType,
+                    amount: new BN(withdrawnAmount
+                        .times(10 ** depositReserve.token.decimals)
+                        .integerValue(BigNumber.ROUND_DOWN)
+                        .toString()),
+                    byAmountIn: true,
+                    splitCount: 0,
+                });
+                if (!routers)
+                    throw new Error("No swap quote found");
+                const slippagePercent = 1;
+                let swappedCoin;
+                try {
+                    swappedCoin = (yield cetusSdk.fixableRouterSwapV3({
+                        router: routers,
+                        inputCoin: withdrawnCoin,
+                        slippage: slippagePercent / 100,
+                        txb: transaction,
+                        partner: cetusPartnerId,
+                    }));
+                }
+                catch (err) {
+                    throw new Error("No swap quote found");
+                }
+                transaction.transferObjects([swappedCoin], _address);
+            }
+            else {
+                transaction.transferObjects([withdrawnCoin], _address);
+            }
         }
         else {
             if (isSui(withdraw.coinType)) {
@@ -1936,10 +2059,10 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
 });
 export const strategyMaxWithdrawTx = (
 // AppContext
-reserveMap, rewardPriceMap, rewardsMap, 
+reserveMap, rewardsMap, 
 // Strategy
 lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _address, strategyOwnerCapId, obligationId, _deposits, _borrowedAmount, withdrawCoinType, transaction, dryRunTransaction) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const strategyInfo = STRATEGY_TYPE_INFO_MAP[strategyType];
     const lst = strategyInfo.depositLstCoinType !== undefined
         ? lstMap[strategyInfo.depositLstCoinType]
@@ -1982,7 +2105,8 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
         }, null, 2));
     }
     // 2) MAX withdraw base or LST
-    const [withdrawnCoin] = strategyWithdraw(depositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserve.coinType), BigInt(MAX_U64.toString()), transaction);
+    const estimatedWithdrawnAmount = (_c = (_b = deposits.find((d) => d.coinType === depositReserve.coinType)) === null || _b === void 0 ? void 0 : _b.depositedAmount) !== null && _c !== void 0 ? _c : new BigNumber(0);
+    const [withdrawnCoin] = strategyWithdraw(strategyType, depositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserve.coinType), BigInt(MAX_U64.toString()), transaction);
     // 2.2) Update state
     deposits = [];
     console.log(`[strategyMaxWithdraw] max_withdraw.update_state |`, JSON.stringify({
@@ -1993,9 +2117,39 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
         borrowedAmount: borrowedAmount.toFixed(20),
     }, null, 2));
     // 3) Transfer coin to user
-    if (depositReserve.coinType === ((_b = depositReserves.base) === null || _b === void 0 ? void 0 : _b.coinType)) {
-        // 3.1) Transfer base to user
-        transaction.transferObjects([withdrawnCoin], _address);
+    if (depositReserve.coinType === ((_d = depositReserves.base) === null || _d === void 0 ? void 0 : _d.coinType)) {
+        if (withdrawCoinType !== depositReserve.coinType) {
+            const routers = yield cetusSdk.findRouters({
+                from: depositReserve.coinType,
+                target: withdrawCoinType,
+                amount: new BN(estimatedWithdrawnAmount
+                    .times(10 ** depositReserve.token.decimals)
+                    .integerValue(BigNumber.ROUND_DOWN)
+                    .toString()),
+                byAmountIn: true,
+                splitCount: 0,
+            });
+            if (!routers)
+                throw new Error("No swap quote found");
+            const slippagePercent = 1;
+            let swappedCoin;
+            try {
+                swappedCoin = (yield cetusSdk.fixableRouterSwapV3({
+                    router: routers,
+                    inputCoin: withdrawnCoin,
+                    slippage: slippagePercent / 100,
+                    txb: transaction,
+                    partner: cetusPartnerId,
+                }));
+            }
+            catch (err) {
+                throw new Error("No swap quote found");
+            }
+            transaction.transferObjects([swappedCoin], _address);
+        }
+        else {
+            transaction.transferObjects([withdrawnCoin], _address);
+        }
     }
     else {
         if (isSui(withdrawCoinType)) {
@@ -2009,14 +2163,13 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
             transaction.transferObjects([withdrawnCoin], _address);
         }
     }
-    // 4) Claim rewards, swap for withdrawCoinType, and transfer to user
+    // 4) Claim rewards and transfer to user
     if (hasClaimableRewards) {
         try {
-            const txCopy = Transaction.from(transaction);
-            yield strategyClaimRewardsAndSwapForCoinType(_address, cetusSdk, cetusPartnerId, rewardsMap, rewardPriceMap, reserveMap[withdrawCoinType], strategyOwnerCapId, false, // isDepositing (false = transfer to user)
-            txCopy);
-            yield dryRunTransaction(txCopy); // Throws error if fails
-            transaction = txCopy;
+            const mergedCoinsMap = strategyClaimRewardsAndMergeCoins(strategyType, rewardsMap, strategyOwnerCapId, transaction);
+            for (const coin of Object.values(mergedCoinsMap)) {
+                transaction.transferObjects([coin], _address);
+            }
         }
         catch (err) {
             // Don't block user if fails
@@ -2199,7 +2352,7 @@ export const strategyDepositAdjustWithdrawTx = (
 reserveMap, 
 // Strategy
 lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _address, strategyOwnerCapId, obligationId, _deposits, _borrowedAmount, flashLoanBorrowedAmount, transaction, dryRunTransaction) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     const strategyInfo = STRATEGY_TYPE_INFO_MAP[strategyType];
     const lst = strategyInfo.depositLstCoinType !== undefined
         ? lstMap[strategyInfo.depositLstCoinType]
@@ -2225,12 +2378,23 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
     let borrowedAmount = _borrowedAmount;
     // 1) Flash loan base/LST
     const flashLoanObj = STRATEGY_TYPE_FLASH_LOAN_OBJ_MAP[strategyType];
-    if (depositReserve.coinType === ((_b = depositReserves.lst) === null || _b === void 0 ? void 0 : _b.coinType)) {
+    const flashLoanCoinType = flashLoanObj.borrowA
+        ? flashLoanObj.coinTypeA
+        : flashLoanObj.coinTypeB;
+    const flashLoanCoinReserve = (_b = reserveMap[flashLoanCoinType]) !== null && _b !== void 0 ? _b : depositReserve;
+    const needsFlashLoanCoinSwap = flashLoanCoinType !== depositReserve.coinType;
+    if (depositReserve.coinType === ((_c = depositReserves.lst) === null || _c === void 0 ? void 0 : _c.coinType)) {
         // TODO: Account for LST mint fees
         flashLoanBorrowedAmount = flashLoanBorrowedAmount
-            .times((_c = lst === null || lst === void 0 ? void 0 : lst.lstToSuiExchangeRate) !== null && _c !== void 0 ? _c : 1)
+            .times((_d = lst === null || lst === void 0 ? void 0 : lst.lstToSuiExchangeRate) !== null && _d !== void 0 ? _d : 1)
             .decimalPlaces(SUI_DECIMALS, BigNumber.ROUND_UP);
     }
+    let flashLoanBorrowAmountForLoan = flashLoanBorrowedAmount;
+    if (needsFlashLoanCoinSwap) {
+        flashLoanBorrowAmountForLoan = flashLoanBorrowAmountForLoan
+            .times(1.01) // Buffer for swap slippage
+            .decimalPlaces(flashLoanCoinReserve.token.decimals, BigNumber.ROUND_UP);
+    }
     let borrowedBalanceA, borrowedBalanceB, receipt;
     if (flashLoanObj.provider === StrategyFlashLoanProvider.MMT) {
         [borrowedBalanceA, borrowedBalanceB, receipt] = transaction.moveCall({
@@ -2239,9 +2403,9 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
             arguments: [
                 transaction.object(flashLoanObj.poolId),
                 transaction.pure.u64(flashLoanObj.borrowA
-                    ? flashLoanBorrowedAmount
+                    ? flashLoanBorrowAmountForLoan
                         .times(10 **
-                        (depositReserve.coinType === ((_d = depositReserves.lst) === null || _d === void 0 ? void 0 : _d.coinType)
+                        (depositReserve.coinType === ((_e = depositReserves.lst) === null || _e === void 0 ? void 0 : _e.coinType)
                             ? SUI_DECIMALS
                             : depositReserve.token.decimals))
                         .integerValue(BigNumber.ROUND_DOWN)
@@ -2249,11 +2413,11 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
                     : 0),
                 transaction.pure.u64(flashLoanObj.borrowA
                     ? 0
-                    : flashLoanBorrowedAmount
+                    : flashLoanBorrowAmountForLoan
                         .times(10 **
-                        (depositReserve.coinType === ((_e = depositReserves.lst) === null || _e === void 0 ? void 0 : _e.coinType)
+                        (depositReserve.coinType === ((_f = depositReserves.lst) === null || _f === void 0 ? void 0 : _f.coinType)
                             ? SUI_DECIMALS
-                            : depositReserve.token.decimals))
+                            : flashLoanCoinReserve.token.decimals))
                         .integerValue(BigNumber.ROUND_DOWN)
                         .toString()),
                 transaction.object(MMT_VERSION_OBJECT_ID),
@@ -2266,9 +2430,9 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
     // 2) Deposit additional (to get back up to 100% health, so the user can then unloop back down to the max leverage shown in the UI)
     // 2.1) Deposit
     let depositedAmount = flashLoanBorrowedAmount;
-    if (depositReserve.coinType === ((_f = depositReserves.lst) === null || _f === void 0 ? void 0 : _f.coinType))
+    if (depositReserve.coinType === ((_g = depositReserves.lst) === null || _g === void 0 ? void 0 : _g.coinType))
         depositedAmount = new BigNumber(depositedAmount.minus(getStrategyLstMintFee(lstMap, depositReserve.coinType, depositedAmount)))
-            .times((_g = lst === null || lst === void 0 ? void 0 : lst.suiToLstExchangeRate) !== null && _g !== void 0 ? _g : 1)
+            .times((_h = lst === null || lst === void 0 ? void 0 : lst.suiToLstExchangeRate) !== null && _h !== void 0 ? _h : 1)
             .decimalPlaces(depositReserve.token.decimals, BigNumber.ROUND_DOWN);
     let flashLoanBorrowedCoin = transaction.moveCall({
         target: "0x2::coin::from_balance",
@@ -2277,9 +2441,35 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
         ],
         arguments: [flashLoanObj.borrowA ? borrowedBalanceA : borrowedBalanceB],
     });
-    if (depositReserve.coinType === ((_h = depositReserves.lst) === null || _h === void 0 ? void 0 : _h.coinType))
+    if (depositReserve.coinType === ((_j = depositReserves.lst) === null || _j === void 0 ? void 0 : _j.coinType))
         flashLoanBorrowedCoin = lst.client.mint(transaction, flashLoanBorrowedCoin);
-    strategyDeposit(flashLoanBorrowedCoin, depositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserve.coinType), transaction);
+    if (needsFlashLoanCoinSwap) {
+        const depositRouters = yield cetusSdk.findRouters({
+            from: flashLoanCoinType,
+            target: depositReserve.coinType,
+            amount: new BN(flashLoanBorrowAmountForLoan
+                .times(10 ** flashLoanCoinReserve.token.decimals)
+                .integerValue(BigNumber.ROUND_DOWN)
+                .toString()),
+            byAmountIn: true,
+            splitCount: 0,
+        });
+        if (!depositRouters)
+            throw new Error("No swap quote found");
+        try {
+            flashLoanBorrowedCoin = (yield cetusSdk.fixableRouterSwapV3({
+                router: depositRouters,
+                inputCoin: flashLoanBorrowedCoin,
+                slippage: 1 / 100,
+                txb: transaction,
+                partner: cetusPartnerId,
+            }));
+        }
+        catch (err) {
+            throw new Error("No swap quote found");
+        }
+    }
+    strategyDeposit(strategyType, flashLoanBorrowedCoin, depositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserve.coinType), transaction);
     // 2.2) Update state
     deposits = addOrInsertStrategyDeposit(deposits, {
         coinType: depositReserve.coinType,
@@ -2303,14 +2493,18 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
     const dryRunResults = yield dryRunTransaction(transaction);
     const flashLoanRepayAmount = new BigNumber(bcs
         .u64()
-        .parse(new Uint8Array((_m = (_l = (_k = (_j = dryRunResults.results) === null || _j === void 0 ? void 0 : _j.find((r, index) => index === receiptDebts.Result)) === null || _k === void 0 ? void 0 : _k.returnValues) === null || _l === void 0 ? void 0 : _l[flashLoanObj.borrowA ? 0 : 1][0]) !== null && _m !== void 0 ? _m : [0])))
-        .div(10 ** depositReserve.token.decimals)
-        .decimalPlaces(depositReserve.token.decimals, BigNumber.ROUND_UP);
+        .parse(new Uint8Array((_o = (_m = (_l = (_k = dryRunResults.results) === null || _k === void 0 ? void 0 : _k.find((r, index) => index === receiptDebts.Result)) === null || _l === void 0 ? void 0 : _l.returnValues) === null || _m === void 0 ? void 0 : _m[flashLoanObj.borrowA ? 0 : 1][0]) !== null && _o !== void 0 ? _o : [0])))
+        .div(10 ** flashLoanCoinReserve.token.decimals)
+        .decimalPlaces(flashLoanCoinReserve.token.decimals, BigNumber.ROUND_UP);
     // 4.1) Withdraw additional + fee
     let withdrawnAmount = flashLoanRepayAmount;
-    if (depositReserve.coinType === ((_o = depositReserves.lst) === null || _o === void 0 ? void 0 : _o.coinType))
+    if (needsFlashLoanCoinSwap)
+        withdrawnAmount = flashLoanRepayAmount
+            .times(1.01) // Buffer for swap slippage
+            .decimalPlaces(depositReserve.token.decimals, BigNumber.ROUND_UP);
+    else if (depositReserve.coinType === ((_p = depositReserves.lst) === null || _p === void 0 ? void 0 : _p.coinType))
         withdrawnAmount = withdrawnAmount
-            .div(1 - +((_p = lst === null || lst === void 0 ? void 0 : lst.redeemFeePercent) !== null && _p !== void 0 ? _p : 0) / 100) // Potential rounding issue (max 1 MIST)
+            .div(1 - +((_q = lst === null || lst === void 0 ? void 0 : lst.redeemFeePercent) !== null && _q !== void 0 ? _q : 0) / 100) // Potential rounding issue (max 1 MIST)
             .decimalPlaces(depositReserve.token.decimals, BigNumber.ROUND_UP);
     const { deposits: newDeposits2, borrowedAmount: newBorrowedAmount2, transaction: newTransaction2, withdrawnCoin, } = yield strategyWithdrawTx(reserveMap, lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _address, strategyOwnerCapId, obligationId, deposits, borrowedAmount, {
         coinType: depositReserve.coinType,
@@ -2324,8 +2518,34 @@ lstMap, strategyType, suiClient, suilendClient, cetusSdk, cetusPartnerId, _addre
     transaction = newTransaction2;
     // 4.3) Repay flash loan
     let flashLoanRepayCoin = withdrawnCoin;
-    if (depositReserve.coinType === ((_q = depositReserves.lst) === null || _q === void 0 ? void 0 : _q.coinType))
+    if (depositReserve.coinType === ((_r = depositReserves.lst) === null || _r === void 0 ? void 0 : _r.coinType))
         flashLoanRepayCoin = lst.client.redeem(transaction, flashLoanRepayCoin);
+    if (needsFlashLoanCoinSwap) {
+        const repayRouters = yield cetusSdk.findRouters({
+            from: depositReserve.coinType,
+            target: flashLoanCoinType,
+            amount: new BN(withdrawnAmount
+                .times(10 ** depositReserve.token.decimals)
+                .integerValue(BigNumber.ROUND_DOWN)
+                .toString()),
+            byAmountIn: true,
+            splitCount: 0,
+        });
+        if (!repayRouters)
+            throw new Error("No swap quote found");
+        try {
+            flashLoanRepayCoin = (yield cetusSdk.fixableRouterSwapV3({
+                router: repayRouters,
+                inputCoin: flashLoanRepayCoin,
+                slippage: 1 / 100,
+                txb: transaction,
+                partner: cetusPartnerId,
+            }));
+        }
+        catch (err) {
+            throw new Error("No swap quote found");
+        }
+    }
     const flashLoanRepayBalance = transaction.moveCall({
         target: "0x2::coin::into_balance",
         typeArguments: [