@suilend/sdk 2.0.4 → 2.0.5

package/client.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { SUI_CLOCK_OBJECT_ID, SUI_SYSTEM_STATE_OBJECT_ID, fromBase64, normalizeStructTag, toHex, } from "@mysten/sui/utils";
 import { SuiPriceServiceConnection, SuiPythClient, } from "@pythnetwork/pyth-sui-js";
-import { extractCTokenCoinType, getAllCoins, mergeAllCoins, } from "@suilend/sui-fe";
+import { extractCTokenCoinType, getAllCoins } from "@suilend/sui-fe";
 import { PriceInfoObject } from "./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-info/structs";
 import { phantom } from "./_generated/_framework/reified";
 import { PKG_V10, setPublishedAt } from "./_generated/suilend";
@@ -20,6 +20,7 @@ import { createLendingMarket } from "./_generated/suilend/lending-market-registr
 import { Obligation } from "./_generated/suilend/obligation/structs";
 import { newConfig as createRateLimiterConfig, } from "./_generated/suilend/rate-limiter/functions";
 import { createReserveConfig, } from "./_generated/suilend/reserve-config/functions";
+import { getSpendableCoin } from "./lib/coin";
 import { PRIMARY_PYTH_ENDPOINT } from "./lib/pyth";
 import { Side } from "./lib/types";
 const SUI_COINTYPE = "0x2::sui::SUI";
@@ -221,16 +222,7 @@ export class SuilendClient {
     }
     addReward(ownerId_1, lendingMarketOwnerCapId_1, reserveArrayIndex_1, isDepositReward_1, rewardCoinType_1, rewardValue_1, startTimeMs_1, endTimeMs_1, transaction_1) {
         return __awaiter(this, arguments, void 0, function* (ownerId, lendingMarketOwnerCapId, reserveArrayIndex, isDepositReward, rewardCoinType, rewardValue, startTimeMs, endTimeMs, transaction, mergeCoins = true) {
-            const coins = (yield this.client.getCoins({
-                owner: ownerId,
-                coinType: rewardCoinType,
-            })).data;
-            if (coins.length > 1 && !isSui(rewardCoinType) && mergeCoins) {
-                transaction.mergeCoins(transaction.object(coins[0].coinObjectId), coins.map((c) => transaction.object(c.coinObjectId)).slice(1));
-            }
-            const [rewardCoin] = transaction.splitCoins(isSui(rewardCoinType)
-                ? transaction.gas
-                : transaction.object(coins[0].coinObjectId), [rewardValue]);
+            const rewardCoin = yield getSpendableCoin(this.client, ownerId, rewardCoinType, rewardValue, transaction);
             return addPoolReward(transaction, [this.lendingMarket.$typeArgs[0], rewardCoinType], {
                 lendingMarketOwnerCap: transaction.object(lendingMarketOwnerCapId),
                 lendingMarket: transaction.object(this.lendingMarket.id),
@@ -454,21 +446,13 @@ export class SuilendClient {
     }
     depositIntoObligation(ownerId, coinType, value, transaction, obligationOwnerCap) {
         return __awaiter(this, void 0, void 0, function* () {
-            const coins = yield getAllCoins(this.client, ownerId, coinType);
-            const mergeCoin = mergeAllCoins(coinType, transaction, coins);
-            const [sendCoin] = transaction.splitCoins(isSui(coinType)
-                ? transaction.gas
-                : transaction.object(mergeCoin.coinObjectId), [value]);
+            const sendCoin = yield getSpendableCoin(this.client, ownerId, coinType, value, transaction);
             this.deposit(sendCoin, coinType, obligationOwnerCap, transaction);
         });
     }
     depositLiquidityAndGetCTokens(ownerId, coinType, value, transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            const coins = yield getAllCoins(this.client, ownerId, coinType);
-            const mergeCoin = mergeAllCoins(coinType, transaction, coins);
-            const [sendCoin] = transaction.splitCoins(isSui(coinType)
-                ? transaction.gas
-                : transaction.object(mergeCoin.coinObjectId), [value]);
+            const sendCoin = yield getSpendableCoin(this.client, ownerId, coinType, value, transaction);
             const [ctokens] = depositLiquidityAndMintCtokens(transaction, [this.lendingMarket.$typeArgs[0], coinType], {
                 lendingMarket: transaction.object(this.lendingMarket.id),
                 reserveArrayIndex: transaction.pure.u64(this.findReserveArrayIndex(coinType)),
@@ -578,11 +562,7 @@ export class SuilendClient {
     }
     repayIntoObligation(ownerId, obligationId, coinType, value, transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            const coins = yield getAllCoins(this.client, ownerId, coinType);
-            const mergeCoin = mergeAllCoins(coinType, transaction, coins);
-            const [sendCoin] = transaction.splitCoins(isSui(coinType)
-                ? transaction.gas
-                : transaction.object(mergeCoin.coinObjectId), [value]);
+            const sendCoin = yield getSpendableCoin(this.client, ownerId, coinType, value, transaction);
             const result = this.repay(obligationId, coinType, sendCoin, transaction);
             transaction.transferObjects([sendCoin], transaction.pure.address(ownerId));
             return result;
@@ -637,13 +617,12 @@ export class SuilendClient {
     }
     redeemCtokensAndWithdrawLiquidity(ownerId, ctokenCoinTypes, transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            const mergeCoinMap = {};
             for (const ctokenCoinType of ctokenCoinTypes) {
                 const coins = yield getAllCoins(this.client, ownerId, ctokenCoinType);
-                const mergeCoin = mergeAllCoins(ctokenCoinType, transaction, coins);
-                mergeCoinMap[ctokenCoinType] = mergeCoin;
-            }
-            for (const [ctokenCoinType, mergeCoin] of Object.entries(mergeCoinMap)) {
+                const totalBalance = coins.reduce((sum, c) => sum + BigInt(c.balance), BigInt(0));
+                if (totalBalance === BigInt(0))
+                    throw new Error(`No ${ctokenCoinType} coins found for redeem`);
+                const ctokenCoin = yield getSpendableCoin(this.client, ownerId, ctokenCoinType, totalBalance.toString(), transaction);
                 const coinType = extractCTokenCoinType(ctokenCoinType);
                 const [exemption] = transaction.moveCall({
                     target: `0x1::option::none`,
@@ -652,7 +631,7 @@ export class SuilendClient {
                     ],
                     arguments: [],
                 });
-                const [redeemCoin] = this.redeem(transaction.object(mergeCoin.coinObjectId), coinType, exemption, transaction);
+                const [redeemCoin] = this.redeem(ctokenCoin, coinType, exemption, transaction);
                 transaction.transferObjects([redeemCoin], transaction.pure.address(ownerId));
             }
         });

package/lib/coin.d.ts

@@ -0,0 +1,3 @@
+import { SuiJsonRpcClient } from "@mysten/sui/jsonRpc";
+import { Transaction, TransactionObjectArgument } from "@mysten/sui/transactions";
+export declare const getSpendableCoin: (suiClient: SuiJsonRpcClient, address: string, coinType: string, value: string, transaction: Transaction) => Promise<TransactionObjectArgument>;

package/lib/coin.js

@@ -0,0 +1,67 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { getAllCoins, isSui, mergeAllCoins } from "@suilend/sui-fe";
+// Build a spendable coin using owned coin objects, address balance, or both.
+export const getSpendableCoin = (suiClient, address, coinType, value, transaction) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const spendValue = BigInt(value);
+    if (spendValue <= BigInt(0)) {
+        throw new Error("Spend amount must be positive");
+    }
+    // Address-balance withdrawals resolve against the transaction sender.
+    transaction.setSenderIfNotSet(address);
+    const [coins, balance] = yield Promise.all([
+        getAllCoins(suiClient, address, coinType),
+        suiClient.getBalance({ owner: address, coinType }),
+    ]);
+    const nonZeroCoins = coins.filter((c) => BigInt(c.balance) > BigInt(0));
+    const objectCoinBalance = nonZeroCoins.reduce((sum, c) => sum + BigInt(c.balance), BigInt(0));
+    const addressBalanceAvailable = BigInt((_a = balance.fundsInAddressBalance) !== null && _a !== void 0 ? _a : "0");
+    const totalAvailable = BigInt(balance.totalBalance);
+    if (totalAvailable < spendValue) {
+        throw new Error(`Insufficient ${coinType} balance: need ${value}, have ${balance.totalBalance} (${objectCoinBalance.toString()} in coins, ${addressBalanceAvailable.toString()} in address)`);
+    }
+    const objectCoinSpend = objectCoinBalance >= spendValue ? spendValue : objectCoinBalance;
+    const addressBalanceSpend = spendValue - objectCoinSpend;
+    console.log(`[getSpendableCoin] ${coinType} requested=${value} coinObjects=${objectCoinSpend.toString()} addressBalance=${addressBalanceSpend.toString()}`);
+    // Address balance only.
+    if (objectCoinSpend === BigInt(0)) {
+        return transaction.moveCall({
+            target: "0x2::coin::redeem_funds",
+            typeArguments: [coinType],
+            arguments: [transaction.withdrawal({ amount: value, type: coinType })],
+        });
+    }
+    const mergedCoin = mergeAllCoins(coinType, transaction, nonZeroCoins);
+    const coinSource = isSui(coinType)
+        ? transaction.gas
+        : transaction.object(mergedCoin.coinObjectId);
+    // Coin objects only.
+    if (addressBalanceSpend === BigInt(0)) {
+        const [sendCoin] = transaction.splitCoins(coinSource, [value]);
+        return sendCoin;
+    }
+    // Mixed: split from coin objects, redeem the rest from address balance, merge.
+    const [objectCoin] = transaction.splitCoins(coinSource, [
+        objectCoinSpend.toString(),
+    ]);
+    const addressCoin = transaction.moveCall({
+        target: "0x2::coin::redeem_funds",
+        typeArguments: [coinType],
+        arguments: [
+            transaction.withdrawal({
+                amount: addressBalanceSpend.toString(),
+                type: coinType,
+            }),
+        ],
+    });
+    transaction.mergeCoins(objectCoin, [addressCoin]);
+    return objectCoin;
+});

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+export * from "./coin";
 export * from "./constants";
 export * from "./initialize";
 export * from "./liquidityMining";

package/lib/index.js

@@ -1,3 +1,4 @@
+export * from "./coin";
 export * from "./constants";
 export * from "./initialize";
 export * from "./liquidityMining";

package/lib/initialize.js

@@ -16,7 +16,7 @@ import { parseLendingMarket, parseObligation } from "../parsers";
 import * as simulate from "../utils/simulate";
 import { WAD } from "./constants";
 import { getWorkingPythEndpoint } from "./pyth";
-import { STRATEGY_WRAPPER_PACKAGE_ID_V1, } from "./strategyOwnerCap";
+import { STRATEGY_TYPE_INFO_MAP, STRATEGY_WRAPPER_PACKAGE_ID_V1, } from "./strategyOwnerCap";
 export const RESERVES_CUSTOM_ORDER = {
     [LENDING_MARKET_ID]: [
         // MAIN ASSETS
@@ -232,8 +232,9 @@ export const initializeObligations = (suiClient, suilendClient, refreshedRawRese
         };
     const [strategyOwnerCaps, obligationOwnerCaps] = yield Promise.all([
         (() => __awaiter(void 0, void 0, void 0, function* () {
-            if (suilendClient.lendingMarket.id !== LENDING_MARKET_ID)
-                return []; // Only main lending market has strategy owner caps
+            const hasStrategies = Object.values(STRATEGY_TYPE_INFO_MAP).some((info) => info.lendingMarketId === suilendClient.lendingMarket.id);
+            if (!hasStrategies)
+                return [];
             const objects = yield getAllOwnedObjects(suiClient, address, {
                 StructType: `${STRATEGY_WRAPPER_PACKAGE_ID_V1}::strategy_wrapper::StrategyOwnerCap<${suilendClient.lendingMarket.$typeArgs[0]}>`,
             });

package/lib/strategyOwnerCap.d.ts

@@ -1,22 +1,27 @@
 import { AggregatorClient as CetusSdk } from "@cetusprotocol/aggregator-sdk";
-import { Transaction, TransactionObjectInput, TransactionResult } from "@mysten/sui/transactions";
+import { Transaction, TransactionObjectArgument, TransactionObjectInput, TransactionResult } from "@mysten/sui/transactions";
 import BigNumber from "bignumber.js";
 import { ParsedObligation, ParsedReserve } from "../parsers";
 import { RewardsMap, StrategyOwnerCap } from "./types";
 export declare const STRATEGY_WRAPPER_PACKAGE_ID_V1 = "0xba97dc73a07638d03d77ad2161484eb21db577edc9cadcd7035fef4b4f2f6fa1";
 export declare enum StrategyType {
     sSUI_SUI_LOOPING = "1",
-    stratSUI_SUI_LOOPING = "2",
     USDC_sSUI_SUI_LOOPING = "3",
+    USDsui_USDC_LOOPING = "10",
+    eEARN_USDC_LOOPING = "11",
     AUSD_sSUI_SUI_LOOPING = "4",
     xBTC_sSUI_SUI_LOOPING = "100",// Used to be for Slush Strategies #0
     xBTC_suiWBTC_LOOPING = "101",// Used to be for Slush Strategies #1
     suiUSDT_sSUI_SUI_LOOPING = "5",
     AUSD_USDC_LOOPING = "6",
     AUSD_suiUSDT_LOOPING = "7",
-    USDC_suiUSDT_LOOPING = "8"
+    USDC_suiUSDT_LOOPING = "8",
+    USDsui_sSUI_SUI_LOOPING = "9",
+    stratSUI_SUI_LOOPING = "2"
 }
 export declare const STRATEGY_TYPE_INFO_MAP: Record<StrategyType, {
+    lendingMarketId: string;
+    lendingMarketType: string;
     queryParam: string;
     header: {
         coinTypes: string[];
@@ -30,10 +35,10 @@ export declare const STRATEGY_TYPE_INFO_MAP: Record<StrategyType, {
     currencyCoinTypes: string[];
     defaultCurrencyCoinType: string;
 }>;
-export declare const strategyDeposit: (coin: TransactionObjectInput, coinType: string, strategyOwnerCap: TransactionObjectInput, reserveArrayIndex: bigint, transaction: Transaction) => TransactionResult;
-export declare const strategyBorrow: (coinType: string, strategyOwnerCap: TransactionObjectInput, reserveArrayIndex: bigint, value: bigint, transaction: Transaction) => TransactionResult;
-export declare const strategyWithdraw: (coinType: string, strategyOwnerCap: TransactionObjectInput, reserveArrayIndex: bigint, value: bigint, transaction: Transaction) => TransactionResult;
-export declare const strategyClaimRewardsAndSwapForCoinType: (address: string, cetusSdk: CetusSdk, cetusPartnerId: string, rewardsMap: RewardsMap, rewardPriceMap: Record<string, BigNumber | undefined>, depositReserve: ParsedReserve, strategyOwnerCap: TransactionObjectInput, isDepositing: boolean, transaction: Transaction) => Promise<void>;
+export declare const strategyDeposit: (strategyType: StrategyType, coin: TransactionObjectInput, coinType: string, strategyOwnerCap: TransactionObjectInput, reserveArrayIndex: bigint, transaction: Transaction) => TransactionResult;
+export declare const strategyBorrow: (strategyType: StrategyType, coinType: string, strategyOwnerCap: TransactionObjectInput, reserveArrayIndex: bigint, value: bigint, transaction: Transaction) => TransactionResult;
+export declare const strategyWithdraw: (strategyType: StrategyType, coinType: string, strategyOwnerCap: TransactionObjectInput, reserveArrayIndex: bigint, value: bigint, transaction: Transaction) => TransactionResult;
+export declare const strategyClaimRewardsAndMergeCoins: (strategyType: StrategyType, rewardsMap: RewardsMap, strategyOwnerCap: TransactionObjectInput, transaction: Transaction) => Record<string, TransactionObjectArgument>;
 export declare const strategySwapSomeDepositsForCoinType: (strategyType: StrategyType, cetusSdk: CetusSdk, cetusPartnerId: string, obligation: ParsedObligation, noSwapCoinTypes: string[], // coinTypes to not swap for depositReserve.coinType
 swapPercent: BigNumber, // percent of deposit to swap for depositReserve.coinType (0-100)
 depositReserve: ParsedReserve, strategyOwnerCap: TransactionObjectInput, transaction: Transaction) => Promise<void>;