@suilend/sdk 2.0.4 → 3.0.2

package/lib/strategyOwnerCap.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { SUI_CLOCK_OBJECT_ID, SUI_SYSTEM_STATE_OBJECT_ID, } from "@mysten/sui/utils";
 import BigNumber from "bignumber.js";
 import BN from "bn.js";
-import { MAX_U64, NORMALIZED_AUSD_COINTYPE, NORMALIZED_SUI_COINTYPE, NORMALIZED_USDC_COINTYPE, NORMALIZED_sSUI_COINTYPE, NORMALIZED_stratSUI_COINTYPE, NORMALIZED_suiUSDT_COINTYPE, NORMALIZED_suiWBTC_COINTYPE, NORMALIZED_xBTC_COINTYPE, isSui, } from "@suilend/sui-fe";
+import { MAX_U64, NORMALIZED_AUSD_COINTYPE, NORMALIZED_SUI_COINTYPE, NORMALIZED_USDC_COINTYPE, NORMALIZED_USDsui_COINTYPE, NORMALIZED_eEARN_COINTYPE, NORMALIZED_sSUI_COINTYPE, NORMALIZED_stratSUI_COINTYPE, NORMALIZED_suiUSDT_COINTYPE, NORMALIZED_suiWBTC_COINTYPE, NORMALIZED_xBTC_COINTYPE, isSui, } from "@suilend/sui-fe";
 import { LENDING_MARKET_ID, LENDING_MARKET_TYPE, } from "../client";
 import { Side } from "./types";
 export const STRATEGY_WRAPPER_PACKAGE_ID_V1 = "0xba97dc73a07638d03d77ad2161484eb21db577edc9cadcd7035fef4b4f2f6fa1";
@@ -18,8 +18,9 @@ const STRATEGY_WRAPPER_PACKAGE_ID_V7 = "0x864b66441e95323c320ee7584592769930a2d2
 export var StrategyType;
 (function (StrategyType) {
     StrategyType["sSUI_SUI_LOOPING"] = "1";
-    StrategyType["stratSUI_SUI_LOOPING"] = "2";
     StrategyType["USDC_sSUI_SUI_LOOPING"] = "3";
+    StrategyType["USDsui_USDC_LOOPING"] = "10";
+    StrategyType["eEARN_USDC_LOOPING"] = "11";
     StrategyType["AUSD_sSUI_SUI_LOOPING"] = "4";
     StrategyType["xBTC_sSUI_SUI_LOOPING"] = "100";
     StrategyType["xBTC_suiWBTC_LOOPING"] = "101";
@@ -27,9 +28,13 @@ export var StrategyType;
     StrategyType["AUSD_USDC_LOOPING"] = "6";
     StrategyType["AUSD_suiUSDT_LOOPING"] = "7";
     StrategyType["USDC_suiUSDT_LOOPING"] = "8";
+    StrategyType["USDsui_sSUI_SUI_LOOPING"] = "9";
+    StrategyType["stratSUI_SUI_LOOPING"] = "2";
 })(StrategyType || (StrategyType = {}));
 export const STRATEGY_TYPE_INFO_MAP = {
     [StrategyType.sSUI_SUI_LOOPING]: {
+        lendingMarketId: LENDING_MARKET_ID,
+        lendingMarketType: LENDING_MARKET_TYPE,
         queryParam: "sSUI-SUI-looping",
         header: {
             coinTypes: [NORMALIZED_sSUI_COINTYPE, NORMALIZED_SUI_COINTYPE],
@@ -43,21 +48,9 @@ export const STRATEGY_TYPE_INFO_MAP = {
         currencyCoinTypes: [NORMALIZED_SUI_COINTYPE, NORMALIZED_sSUI_COINTYPE],
         defaultCurrencyCoinType: NORMALIZED_SUI_COINTYPE,
     },
-    [StrategyType.stratSUI_SUI_LOOPING]: {
-        queryParam: "stratSUI-SUI-looping",
-        header: {
-            coinTypes: [NORMALIZED_stratSUI_COINTYPE, NORMALIZED_SUI_COINTYPE],
-            title: "stratSUI/SUI",
-            tooltip: "Sets up a stratSUI/SUI Looping strategy by depositing stratSUI and borrowing SUI to the desired leverage",
-            type: "Looping",
-        },
-        depositBaseCoinType: undefined,
-        depositLstCoinType: NORMALIZED_stratSUI_COINTYPE,
-        borrowCoinType: NORMALIZED_SUI_COINTYPE,
-        currencyCoinTypes: [NORMALIZED_SUI_COINTYPE, NORMALIZED_stratSUI_COINTYPE],
-        defaultCurrencyCoinType: NORMALIZED_SUI_COINTYPE,
-    },
     [StrategyType.USDC_sSUI_SUI_LOOPING]: {
+        lendingMarketId: LENDING_MARKET_ID,
+        lendingMarketType: LENDING_MARKET_TYPE,
         queryParam: "USDC-sSUI-SUI-looping",
         header: {
             coinTypes: [NORMALIZED_USDC_COINTYPE],
@@ -71,7 +64,41 @@ export const STRATEGY_TYPE_INFO_MAP = {
         currencyCoinTypes: [NORMALIZED_USDC_COINTYPE],
         defaultCurrencyCoinType: NORMALIZED_USDC_COINTYPE,
     },
+    [StrategyType.USDsui_USDC_LOOPING]: {
+        lendingMarketId: LENDING_MARKET_ID,
+        lendingMarketType: LENDING_MARKET_TYPE,
+        queryParam: "USDsui-USDC-looping",
+        header: {
+            coinTypes: [NORMALIZED_USDsui_COINTYPE, NORMALIZED_USDC_COINTYPE],
+            title: "USDsui/USDC",
+            tooltip: "Sets up an USDsui/USDC Looping strategy by depositing USDsui and borrowing USDC to the desired leverage",
+            type: "Looping",
+        },
+        depositBaseCoinType: NORMALIZED_USDsui_COINTYPE,
+        depositLstCoinType: undefined,
+        borrowCoinType: NORMALIZED_USDC_COINTYPE,
+        currencyCoinTypes: [NORMALIZED_USDsui_COINTYPE, NORMALIZED_USDC_COINTYPE],
+        defaultCurrencyCoinType: NORMALIZED_USDsui_COINTYPE,
+    },
+    [StrategyType.eEARN_USDC_LOOPING]: {
+        lendingMarketId: "0x74d92cb095b618f344486f77bcce87fbffc0fe0b46584bb1828bb291a222dda8",
+        lendingMarketType: "0x423f05ea163ae1bc5c03d75ef70d3e5d887455084118e46c4f76878530a03619::ember_market::EMBER_MARKET",
+        queryParam: "eEARN-USDC-looping",
+        header: {
+            coinTypes: [NORMALIZED_eEARN_COINTYPE, NORMALIZED_USDC_COINTYPE],
+            title: "eEARN/USDC",
+            tooltip: "Sets up an eEARN/USDC Looping strategy by depositing eEARN and borrowing USDC to the desired leverage",
+            type: "Looping",
+        },
+        depositBaseCoinType: NORMALIZED_eEARN_COINTYPE,
+        depositLstCoinType: undefined,
+        borrowCoinType: NORMALIZED_USDC_COINTYPE,
+        currencyCoinTypes: [NORMALIZED_eEARN_COINTYPE, NORMALIZED_USDC_COINTYPE],
+        defaultCurrencyCoinType: NORMALIZED_eEARN_COINTYPE,
+    },
     [StrategyType.AUSD_sSUI_SUI_LOOPING]: {
+        lendingMarketId: LENDING_MARKET_ID,
+        lendingMarketType: LENDING_MARKET_TYPE,
         queryParam: "AUSD-sSUI-SUI-looping",
         header: {
             coinTypes: [NORMALIZED_AUSD_COINTYPE],
@@ -86,6 +113,8 @@ export const STRATEGY_TYPE_INFO_MAP = {
         defaultCurrencyCoinType: NORMALIZED_AUSD_COINTYPE,
     },
     [StrategyType.xBTC_sSUI_SUI_LOOPING]: {
+        lendingMarketId: LENDING_MARKET_ID,
+        lendingMarketType: LENDING_MARKET_TYPE,
         queryParam: "xBTC-sSUI-SUI-looping",
         header: {
             coinTypes: [NORMALIZED_xBTC_COINTYPE],
@@ -100,6 +129,8 @@ export const STRATEGY_TYPE_INFO_MAP = {
         defaultCurrencyCoinType: NORMALIZED_xBTC_COINTYPE,
     },
     [StrategyType.xBTC_suiWBTC_LOOPING]: {
+        lendingMarketId: LENDING_MARKET_ID,
+        lendingMarketType: LENDING_MARKET_TYPE,
         queryParam: "xBTC-suiWBTC-looping",
         header: {
             coinTypes: [NORMALIZED_xBTC_COINTYPE, NORMALIZED_suiWBTC_COINTYPE],
@@ -114,6 +145,8 @@ export const STRATEGY_TYPE_INFO_MAP = {
         defaultCurrencyCoinType: NORMALIZED_xBTC_COINTYPE,
     },
     [StrategyType.suiUSDT_sSUI_SUI_LOOPING]: {
+        lendingMarketId: LENDING_MARKET_ID,
+        lendingMarketType: LENDING_MARKET_TYPE,
         queryParam: "suiUSDT-sSUI-SUI-looping",
         header: {
             coinTypes: [NORMALIZED_suiUSDT_COINTYPE],
@@ -128,6 +161,8 @@ export const STRATEGY_TYPE_INFO_MAP = {
         defaultCurrencyCoinType: NORMALIZED_suiUSDT_COINTYPE,
     },
     [StrategyType.AUSD_USDC_LOOPING]: {
+        lendingMarketId: LENDING_MARKET_ID,
+        lendingMarketType: LENDING_MARKET_TYPE,
         queryParam: "AUSD-USDC-looping",
         header: {
             coinTypes: [NORMALIZED_AUSD_COINTYPE, NORMALIZED_USDC_COINTYPE],
@@ -142,6 +177,8 @@ export const STRATEGY_TYPE_INFO_MAP = {
         defaultCurrencyCoinType: NORMALIZED_AUSD_COINTYPE,
     },
     [StrategyType.AUSD_suiUSDT_LOOPING]: {
+        lendingMarketId: LENDING_MARKET_ID,
+        lendingMarketType: LENDING_MARKET_TYPE,
         queryParam: "AUSD-suiUSDT-looping",
         header: {
             coinTypes: [NORMALIZED_AUSD_COINTYPE, NORMALIZED_suiUSDT_COINTYPE],
@@ -156,6 +193,8 @@ export const STRATEGY_TYPE_INFO_MAP = {
         defaultCurrencyCoinType: NORMALIZED_AUSD_COINTYPE,
     },
     [StrategyType.USDC_suiUSDT_LOOPING]: {
+        lendingMarketId: LENDING_MARKET_ID,
+        lendingMarketType: LENDING_MARKET_TYPE,
         queryParam: "USDC-suiUSDT-looping",
         header: {
             coinTypes: [NORMALIZED_USDC_COINTYPE, NORMALIZED_suiUSDT_COINTYPE],
@@ -169,66 +208,117 @@ export const STRATEGY_TYPE_INFO_MAP = {
         currencyCoinTypes: [NORMALIZED_USDC_COINTYPE, NORMALIZED_suiUSDT_COINTYPE],
         defaultCurrencyCoinType: NORMALIZED_USDC_COINTYPE,
     },
+    [StrategyType.USDsui_sSUI_SUI_LOOPING]: {
+        lendingMarketId: LENDING_MARKET_ID,
+        lendingMarketType: LENDING_MARKET_TYPE,
+        queryParam: "USDsui-sSUI-SUI-looping",
+        header: {
+            coinTypes: [NORMALIZED_USDsui_COINTYPE],
+            title: "USDsui sSUI/SUI",
+            tooltip: "Sets up a USDsui sSUI/SUI Looping strategy by depositing USDsui and looping sSUI/SUI to the desired leverage",
+            type: "Looping",
+        },
+        depositBaseCoinType: NORMALIZED_USDsui_COINTYPE,
+        depositLstCoinType: NORMALIZED_sSUI_COINTYPE,
+        borrowCoinType: NORMALIZED_SUI_COINTYPE,
+        currencyCoinTypes: [NORMALIZED_USDsui_COINTYPE],
+        defaultCurrencyCoinType: NORMALIZED_USDsui_COINTYPE,
+    },
+    [StrategyType.stratSUI_SUI_LOOPING]: {
+        lendingMarketId: LENDING_MARKET_ID,
+        lendingMarketType: LENDING_MARKET_TYPE,
+        queryParam: "stratSUI-SUI-looping",
+        header: {
+            coinTypes: [NORMALIZED_stratSUI_COINTYPE, NORMALIZED_SUI_COINTYPE],
+            title: "stratSUI/SUI",
+            tooltip: "Sets up a stratSUI/SUI Looping strategy by depositing stratSUI and borrowing SUI to the desired leverage",
+            type: "Looping",
+        },
+        depositBaseCoinType: undefined,
+        depositLstCoinType: NORMALIZED_stratSUI_COINTYPE,
+        borrowCoinType: NORMALIZED_SUI_COINTYPE,
+        currencyCoinTypes: [NORMALIZED_SUI_COINTYPE, NORMALIZED_stratSUI_COINTYPE],
+        defaultCurrencyCoinType: NORMALIZED_SUI_COINTYPE,
+    },
 };
-export const strategyDeposit = (coin, coinType, strategyOwnerCap, reserveArrayIndex, transaction) => transaction.moveCall({
-    target: `${STRATEGY_WRAPPER_PACKAGE_ID_V7}::strategy_wrapper::deposit_liquidity_and_deposit_into_obligation`,
-    typeArguments: [LENDING_MARKET_TYPE, coinType],
-    arguments: [
-        transaction.object(strategyOwnerCap),
-        transaction.object(LENDING_MARKET_ID),
-        transaction.pure.u64(reserveArrayIndex),
-        transaction.object(SUI_CLOCK_OBJECT_ID),
-        transaction.object(coin),
-    ],
-});
-export const strategyBorrow = (coinType, strategyOwnerCap, reserveArrayIndex, value, transaction) => isSui(coinType)
-    ? transaction.moveCall({
-        target: `${STRATEGY_WRAPPER_PACKAGE_ID_V7}::strategy_wrapper::borrow_sui_from_obligation`,
-        typeArguments: [LENDING_MARKET_TYPE],
+const getStrategyLendingMarket = (strategyType) => {
+    const info = STRATEGY_TYPE_INFO_MAP[strategyType];
+    return {
+        lendingMarketId: info.lendingMarketId,
+        lendingMarketType: info.lendingMarketType,
+    };
+};
+export const strategyDeposit = (strategyType, coin, coinType, strategyOwnerCap, reserveArrayIndex, transaction) => {
+    const { lendingMarketId, lendingMarketType } = getStrategyLendingMarket(strategyType);
+    return transaction.moveCall({
+        target: `${STRATEGY_WRAPPER_PACKAGE_ID_V7}::strategy_wrapper::deposit_liquidity_and_deposit_into_obligation`,
+        typeArguments: [lendingMarketType, coinType],
         arguments: [
             transaction.object(strategyOwnerCap),
-            transaction.object(LENDING_MARKET_ID),
+            transaction.object(lendingMarketId),
             transaction.pure.u64(reserveArrayIndex),
             transaction.object(SUI_CLOCK_OBJECT_ID),
-            transaction.pure.u64(value),
-            transaction.object(SUI_SYSTEM_STATE_OBJECT_ID),
+            transaction.object(coin),
         ],
-    })
-    : transaction.moveCall({
-        target: `${STRATEGY_WRAPPER_PACKAGE_ID_V7}::strategy_wrapper::borrow_from_obligation`,
-        typeArguments: [LENDING_MARKET_TYPE, coinType],
+    });
+};
+export const strategyBorrow = (strategyType, coinType, strategyOwnerCap, reserveArrayIndex, value, transaction) => {
+    const { lendingMarketId, lendingMarketType } = getStrategyLendingMarket(strategyType);
+    return isSui(coinType)
+        ? transaction.moveCall({
+            target: `${STRATEGY_WRAPPER_PACKAGE_ID_V7}::strategy_wrapper::borrow_sui_from_obligation`,
+            typeArguments: [lendingMarketType],
+            arguments: [
+                transaction.object(strategyOwnerCap),
+                transaction.object(lendingMarketId),
+                transaction.pure.u64(reserveArrayIndex),
+                transaction.object(SUI_CLOCK_OBJECT_ID),
+                transaction.pure.u64(value),
+                transaction.object(SUI_SYSTEM_STATE_OBJECT_ID),
+            ],
+        })
+        : transaction.moveCall({
+            target: `${STRATEGY_WRAPPER_PACKAGE_ID_V7}::strategy_wrapper::borrow_from_obligation`,
+            typeArguments: [lendingMarketType, coinType],
+            arguments: [
+                transaction.object(strategyOwnerCap),
+                transaction.object(lendingMarketId),
+                transaction.pure.u64(reserveArrayIndex),
+                transaction.object(SUI_CLOCK_OBJECT_ID),
+                transaction.pure.u64(value),
+            ],
+        });
+};
+export const strategyWithdraw = (strategyType, coinType, strategyOwnerCap, reserveArrayIndex, value, transaction) => {
+    const { lendingMarketId, lendingMarketType } = getStrategyLendingMarket(strategyType);
+    return transaction.moveCall({
+        target: `${STRATEGY_WRAPPER_PACKAGE_ID_V7}::strategy_wrapper::withdraw_from_obligation_and_redeem`,
+        typeArguments: [lendingMarketType, coinType],
         arguments: [
             transaction.object(strategyOwnerCap),
-            transaction.object(LENDING_MARKET_ID),
+            transaction.object(lendingMarketId),
             transaction.pure.u64(reserveArrayIndex),
             transaction.object(SUI_CLOCK_OBJECT_ID),
             transaction.pure.u64(value),
         ],
     });
-export const strategyWithdraw = (coinType, strategyOwnerCap, reserveArrayIndex, value, transaction) => transaction.moveCall({
-    target: `${STRATEGY_WRAPPER_PACKAGE_ID_V7}::strategy_wrapper::withdraw_from_obligation_and_redeem`,
-    typeArguments: [LENDING_MARKET_TYPE, coinType],
-    arguments: [
-        transaction.object(strategyOwnerCap),
-        transaction.object(LENDING_MARKET_ID),
-        transaction.pure.u64(reserveArrayIndex),
-        transaction.object(SUI_CLOCK_OBJECT_ID),
-        transaction.pure.u64(value),
-    ],
-});
-const strategyClaimRewards = (coinType, strategyOwnerCap, reserveArrayIndex, rewardIndex, side, transaction) => transaction.moveCall({
-    target: `${STRATEGY_WRAPPER_PACKAGE_ID_V7}::strategy_wrapper::claim_rewards`,
-    typeArguments: [LENDING_MARKET_TYPE, coinType],
-    arguments: [
-        transaction.object(strategyOwnerCap),
-        transaction.object(LENDING_MARKET_ID),
-        transaction.object(SUI_CLOCK_OBJECT_ID),
-        transaction.pure.u64(reserveArrayIndex),
-        transaction.pure.u64(rewardIndex),
-        transaction.pure.bool(side === Side.DEPOSIT),
-    ],
-});
-const strategyClaimRewardsAndMergeCoins = (rewardsMap, strategyOwnerCap, transaction) => {
+};
+const strategyClaimRewards = (strategyType, coinType, strategyOwnerCap, reserveArrayIndex, rewardIndex, side, transaction) => {
+    const { lendingMarketId, lendingMarketType } = getStrategyLendingMarket(strategyType);
+    return transaction.moveCall({
+        target: `${STRATEGY_WRAPPER_PACKAGE_ID_V7}::strategy_wrapper::claim_rewards`,
+        typeArguments: [lendingMarketType, coinType],
+        arguments: [
+            transaction.object(strategyOwnerCap),
+            transaction.object(lendingMarketId),
+            transaction.object(SUI_CLOCK_OBJECT_ID),
+            transaction.pure.u64(reserveArrayIndex),
+            transaction.pure.u64(rewardIndex),
+            transaction.pure.bool(side === Side.DEPOSIT),
+        ],
+    });
+};
+export const strategyClaimRewardsAndMergeCoins = (strategyType, rewardsMap, strategyOwnerCap, transaction) => {
     // 1) Get rewards
     const rewards = Object.values(rewardsMap)
         .flatMap((r) => r.rewards)
@@ -241,7 +331,7 @@ const strategyClaimRewardsAndMergeCoins = (rewardsMap, strategyOwnerCap, transac
     // 2) Claim rewards and merge coins
     const mergeCoinsMap = {};
     for (const reward of rewards) {
-        const [claimedCoin] = strategyClaimRewards(reward.rewardCoinType, strategyOwnerCap, reward.reserveArrayIndex, reward.rewardIndex, reward.side, transaction);
+        const [claimedCoin] = strategyClaimRewards(strategyType, reward.rewardCoinType, strategyOwnerCap, reward.reserveArrayIndex, reward.rewardIndex, reward.side, transaction);
         if (mergeCoinsMap[reward.rewardCoinType] === undefined)
             mergeCoinsMap[reward.rewardCoinType] = [];
         mergeCoinsMap[reward.rewardCoinType].push(claimedCoin);
@@ -255,94 +345,6 @@ const strategyClaimRewardsAndMergeCoins = (rewardsMap, strategyOwnerCap, transac
     }
     return mergedCoinsMap;
 };
-export const strategyClaimRewardsAndSwapForCoinType = (address, cetusSdk, cetusPartnerId, rewardsMap, rewardPriceMap, depositReserve, strategyOwnerCap, isDepositing, transaction) => __awaiter(void 0, void 0, void 0, function* () {
-    const filteredRewardsMap = Object.fromEntries(Object.entries(rewardsMap).filter(([coinType]) => {
-        var _a;
-        return ((_a = rewardPriceMap[coinType]) !== null && _a !== void 0 ? _a : new BigNumber(0))
-            .times(rewardsMap[coinType].amount)
-            .gte(0.01);
-    }));
-    // 1) Claim rewards and merge coins
-    const mergedCoinsMap = strategyClaimRewardsAndMergeCoins(filteredRewardsMap, strategyOwnerCap, transaction);
-    // 2) Prepare
-    const nonSwappedCoinTypes = Object.keys(mergedCoinsMap).filter((coinType) => coinType === depositReserve.coinType);
-    const swappedCoinTypes = Object.keys(mergedCoinsMap).filter((coinType) => coinType !== depositReserve.coinType);
-    let resultCoin = undefined;
-    // 3.1) Non-swapped coins
-    for (const [coinType, coin] of Object.entries(mergedCoinsMap).filter(([coinType]) => nonSwappedCoinTypes.includes(coinType))) {
-        if (resultCoin)
-            transaction.mergeCoins(resultCoin, [coin]);
-        else
-            resultCoin = coin;
-    }
-    // 3.2) Swapped coins
-    // 3.2.1) Get routers
-    const amountsAndSortedQuotesMap = Object.fromEntries(yield Promise.all(Object.entries(mergedCoinsMap)
-        .filter(([coinType]) => swappedCoinTypes.includes(coinType))
-        .map(([coinType, coin]) => (() => __awaiter(void 0, void 0, void 0, function* () {
-        try {
-            // Get amount
-            const { rawAmount: amount } = filteredRewardsMap[coinType]; // Use underestimate (rewards keep accruing)
-            // Get routes
-            const routers = yield cetusSdk.findRouters({
-                from: coinType,
-                target: depositReserve.coinType,
-                amount: new BN(amount.toString()), // Underestimate (rewards keep accruing)
-                byAmountIn: true,
-            });
-            if (!routers)
-                throw new Error(`No swap quote found for ${coinType}`);
-            console.log("[strategyClaimRewardsAndSwapForCoinType] routers", {
-                coinType,
-                routers,
-            });
-            return [coinType, { coin, routers }];
-        }
-        catch (err) {
-            console.error(err);
-            return [coinType, { coin, routers: undefined }];
-        }
-    }))())));
-    console.log("[strategyClaimRewardsAndSwapForCoinType] amountsAndSortedQuotesMap", { amountsAndSortedQuotesMap });
-    // 3.2.2) Swap
-    for (const [coinType, { coin: coinIn, routers }] of Object.entries(amountsAndSortedQuotesMap)) {
-        if (routers === undefined)
-            continue; // Skip coin if no swap quote found
-        console.log("[strategyClaimRewardsAndSwapForCoinType] swapping coinType", coinType);
-        try {
-            let coinOut;
-            try {
-                coinOut = (yield cetusSdk.fixableRouterSwapV3({
-                    router: routers,
-                    inputCoin: coinIn,
-                    slippage: 3 / 100,
-                    txb: transaction,
-                    partner: cetusPartnerId,
-                }));
-                if (resultCoin)
-                    transaction.mergeCoins(resultCoin, [coinOut]);
-                else
-                    resultCoin = coinOut;
-            }
-            catch (err) {
-                throw new Error(`No swap quote found for ${coinType}`);
-            }
-        }
-        catch (err) {
-            console.error(err);
-            continue; // Skip coin if swap fails
-        }
-    }
-    // 4) Deposit
-    if (!resultCoin)
-        throw new Error("No coin to deposit or transfer");
-    if (isDepositing) {
-        strategyDeposit(resultCoin, depositReserve.coinType, strategyOwnerCap, depositReserve.arrayIndex, transaction);
-    }
-    else {
-        transaction.transferObjects([resultCoin], transaction.pure.address(address));
-    }
-});
 export const strategySwapSomeDepositsForCoinType = (strategyType, cetusSdk, cetusPartnerId, obligation, noSwapCoinTypes, // coinTypes to not swap for depositReserve.coinType
 swapPercent, // percent of deposit to swap for depositReserve.coinType (0-100)
 depositReserve, strategyOwnerCap, transaction) => __awaiter(void 0, void 0, void 0, function* () {
@@ -352,7 +354,7 @@ depositReserve, strategyOwnerCap, transaction) => __awaiter(void 0, void 0, void
         return;
     const withdrawnCoinsMap = {};
     for (const deposit of swapCoinTypeDeposits) {
-        const [withdrawnCoin] = strategyWithdraw(deposit.coinType, strategyOwnerCap, deposit.reserve.arrayIndex, swapPercent.eq(100)
+        const [withdrawnCoin] = strategyWithdraw(strategyType, deposit.coinType, strategyOwnerCap, deposit.reserve.arrayIndex, swapPercent.eq(100)
             ? BigInt(MAX_U64.toString())
             : BigInt(new BigNumber(new BigNumber(deposit.depositedAmount.times(swapPercent.div(100)))
                 .times(10 ** deposit.reserve.token.decimals)
@@ -429,9 +431,10 @@ depositReserve, strategyOwnerCap, transaction) => __awaiter(void 0, void 0, void
     if (!resultCoin)
         throw new Error("No coin to deposit or transfer");
     console.log("[strategySwapSomeDepositsForCoinType] depositing resultCoin");
-    strategyDeposit(resultCoin, depositReserve.coinType, strategyOwnerCap, depositReserve.arrayIndex, transaction);
+    strategyDeposit(strategyType, resultCoin, depositReserve.coinType, strategyOwnerCap, depositReserve.arrayIndex, transaction);
 });
 export const createStrategyOwnerCapIfNoneExists = (strategyType, strategyOwnerCap, transaction) => {
+    const { lendingMarketId, lendingMarketType } = getStrategyLendingMarket(strategyType);
     let strategyOwnerCapId;
     let didCreate = false;
     if (strategyOwnerCap)
@@ -439,9 +442,9 @@ export const createStrategyOwnerCapIfNoneExists = (strategyType, strategyOwnerCa
     else {
         strategyOwnerCapId = transaction.moveCall({
             target: `${STRATEGY_WRAPPER_PACKAGE_ID_V7}::strategy_wrapper::create_strategy_owner_cap`,
-            typeArguments: [LENDING_MARKET_TYPE],
+            typeArguments: [lendingMarketType],
             arguments: [
-                transaction.object(LENDING_MARKET_ID),
+                transaction.object(lendingMarketId),
                 transaction.pure.u8(+strategyType),
             ],
         });

package/margin/margin/admin_cap.d.ts

@@ -3,8 +3,8 @@
  **************************************************************/
 import { MoveStruct } from '../utils/index.js';
 export declare const AdminCap: MoveStruct<{
-    id: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
+    id: import("@mysten/sui/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
 }, "0xd5f3054404ec9275b50985851a5b515728f131a3bdd9c9a5f738a9326b738d53::admin_cap::AdminCap">;
 export declare const InitEvent: MoveStruct<{
-    admin_cap_id: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
+    admin_cap_id: import("@mysten/sui/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
 }, "0xd5f3054404ec9275b50985851a5b515728f131a3bdd9c9a5f738a9326b738d53::admin_cap::InitEvent">;

package/margin/margin/deps/std/type_name.d.ts

@@ -13,5 +13,5 @@ export declare const TypeName: MoveStruct<{
        * Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or
        * 32 depending on the Move platform)
        */
-    name: import("@mysten/bcs").BcsType<string, string, "string">;
+    name: import("@mysten/sui/bcs").BcsType<string, string, "string">;
 }, "std::type_name::TypeName">;

package/margin/margin/deps/sui/vec_set.d.ts

@@ -1,7 +1,7 @@
 /**************************************************************
  * THIS FILE IS GENERATED AND SHOULD NOT BE MANUALLY MODIFIED *
  **************************************************************/
-import { type BcsType } from '@mysten/sui/bcs';
+import { type BcsType, bcs } from '@mysten/sui/bcs';
 import { MoveStruct } from '../../../utils/index.js';
 /**
  * A set data structure backed by a vector. The set is guaranteed not to contain
@@ -14,7 +14,5 @@ import { MoveStruct } from '../../../utils/index.js';
 export declare function VecSet<K extends BcsType<any>>(...typeParameters: [
     K
 ]): MoveStruct<{
-    contents: BcsType<import("@mysten/bcs").InferBcsType<K>[], Iterable<import("@mysten/bcs").InferBcsInput<K>> & {
-        length: number;
-    }, string>;
-}, `0x2::vec_set::VecSet<${K["name"]}>`>;
+    contents: ReturnType<typeof bcs.vector<K>>;
+}>;

package/margin/margin/deps/suilend/lending_market.d.ts

@@ -3,6 +3,6 @@
  **************************************************************/
 import { MoveStruct } from '../../../utils/index.js';
 export declare const ObligationOwnerCap: MoveStruct<{
-    id: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
-    obligation_id: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
+    id: import("@mysten/sui/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
+    obligation_id: import("@mysten/sui/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
 }, "suilend::lending_market::ObligationOwnerCap<phantom P>">;

package/margin/margin/market.d.ts

@@ -2,53 +2,36 @@
  * THIS FILE IS GENERATED AND SHOULD NOT BE MANUALLY MODIFIED *
  **************************************************************/
 import { MoveStruct, type RawTransactionArgument } from '../utils/index.js';
+import { bcs } from '@mysten/sui/bcs';
 import { type Transaction } from '@mysten/sui/transactions';
+import * as version from './version.js';
+import * as vec_set from './deps/sui/vec_set.js';
 export declare const Market: MoveStruct<{
-    id: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
-    version: import("../utils/index.js").MoveTuple<readonly [import("@mysten/bcs").BcsType<number, number, "u16">], "0xd5f3054404ec9275b50985851a5b515728f131a3bdd9c9a5f738a9326b738d53::version::Version">;
-    fee_recipient: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
-    open_fee_rate: import("@mysten/bcs").BcsType<string, string | number | bigint, "u64">;
-    close_fee_rate: import("@mysten/bcs").BcsType<string, string | number | bigint, "u64">;
-    permissions: MoveStruct<{
-        contents: import("@mysten/bcs").BcsType<import("@mysten/bcs").EnumOutputShapeWithKeys<{
-            OpenPosition: true;
-            ClosePosition: true;
-            Deposit: true;
-            Borrow: true;
-            Withdraw: true;
-            Repay: true;
-            ClaimReward: true;
-        }, "Borrow" | "Deposit" | "Withdraw" | "Repay" | "OpenPosition" | "ClosePosition" | "ClaimReward">[], Iterable<import("@mysten/bcs").EnumInputShape<{
-            OpenPosition: boolean | object | null;
-            ClosePosition: boolean | object | null;
-            Deposit: boolean | object | null;
-            Borrow: boolean | object | null;
-            Withdraw: boolean | object | null;
-            Repay: boolean | object | null;
-            ClaimReward: boolean | object | null;
-        }>> & {
-            length: number;
-        }, string>;
-    }, "0x2::vec_set::VecSet<0xd5f3054404ec9275b50985851a5b515728f131a3bdd9c9a5f738a9326b738d53::permissions::Permission>">;
-}, "0xd5f3054404ec9275b50985851a5b515728f131a3bdd9c9a5f738a9326b738d53::market::Market<phantom BASE, phantom QUOTE>">;
+    id: typeof bcs.Address;
+    version: typeof version.Version;
+    fee_recipient: typeof bcs.Address;
+    open_fee_rate: ReturnType<typeof bcs.u64>;
+    close_fee_rate: ReturnType<typeof bcs.u64>;
+    permissions: ReturnType<typeof vec_set.VecSet>;
+}>;
 export declare const CreateMarketEvent: MoveStruct<{
-    market_id: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
+    market_id: import("@mysten/sui/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
     base_token: MoveStruct<{
-        name: import("@mysten/bcs").BcsType<string, string, "string">;
+        name: import("@mysten/sui/bcs").BcsType<string, string, "string">;
     }, "std::type_name::TypeName">;
     quote_token: MoveStruct<{
-        name: import("@mysten/bcs").BcsType<string, string, "string">;
+        name: import("@mysten/sui/bcs").BcsType<string, string, "string">;
     }, "std::type_name::TypeName">;
-    open_fee_rate: import("@mysten/bcs").BcsType<string, string | number | bigint, "u64">;
-    close_fee_rate: import("@mysten/bcs").BcsType<string, string | number | bigint, "u64">;
+    open_fee_rate: import("@mysten/sui/bcs").BcsType<string, string | number | bigint, "u64">;
+    close_fee_rate: import("@mysten/sui/bcs").BcsType<string, string | number | bigint, "u64">;
 }, "0xd5f3054404ec9275b50985851a5b515728f131a3bdd9c9a5f738a9326b738d53::market::CreateMarketEvent">;
 export declare const MarketUpdatedEvent: MoveStruct<{
-    market_id: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
-    open_fee_rate: import("@mysten/bcs").BcsType<string, string | number | bigint, "u64">;
-    close_fee_rate: import("@mysten/bcs").BcsType<string, string | number | bigint, "u64">;
+    market_id: import("@mysten/sui/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
+    open_fee_rate: import("@mysten/sui/bcs").BcsType<string, string | number | bigint, "u64">;
+    close_fee_rate: import("@mysten/sui/bcs").BcsType<string, string | number | bigint, "u64">;
 }, "0xd5f3054404ec9275b50985851a5b515728f131a3bdd9c9a5f738a9326b738d53::market::MarketUpdatedEvent">;
 export declare const UpdateMarketPermissionEvent: MoveStruct<{
-    market_id: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
+    market_id: import("@mysten/sui/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
     permission: import("../utils/index.js").MoveEnum<{
         OpenPosition: null;
         ClosePosition: null;
@@ -58,8 +41,8 @@ export declare const UpdateMarketPermissionEvent: MoveStruct<{
         Repay: null;
         ClaimReward: null;
     }, "0xd5f3054404ec9275b50985851a5b515728f131a3bdd9c9a5f738a9326b738d53::permissions::Permission">;
-    is_pause: import("@mysten/bcs").BcsType<boolean, boolean, "bool">;
-    sender: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
+    is_pause: import("@mysten/sui/bcs").BcsType<boolean, boolean, "bool">;
+    sender: import("@mysten/sui/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
 }, "0xd5f3054404ec9275b50985851a5b515728f131a3bdd9c9a5f738a9326b738d53::market::UpdateMarketPermissionEvent">;
 export interface CheckVersionArguments {
     market: RawTransactionArgument<string>;