@t2000/sdk 0.16.16 → 0.16.18

package/dist/{index-BOkO4S7r.d.cts → index-BRjfwac2.d.cts}

@@ -669,6 +669,13 @@ declare class SuilendAdapter implements LendingAdapter {
         coin: TransactionObjectArgument;
         effectiveAmount: number;
     }>;
+    /**
+     * 3-step cToken redemption matching the official Suilend SDK flow:
+     * 1. redeem_ctokens_and_withdraw_liquidity_request — creates a LiquidityRequest
+     * 2. unstake_sui_from_staker — (SUI only) unstakes from validators to replenish available_liquidity
+     * 3. fulfill_liquidity_request — splits underlying tokens from the reserve
+     */
+    private redeemCtokens;
     addSaveToTx(tx: Transaction, address: string, coin: TransactionObjectArgument, asset: string, options?: {
         collectFee?: boolean;
     }): Promise<void>;

package/dist/{index-BOkO4S7r.d.ts → index-BRjfwac2.d.ts}

@@ -669,6 +669,13 @@ declare class SuilendAdapter implements LendingAdapter {
         coin: TransactionObjectArgument;
         effectiveAmount: number;
     }>;
+    /**
+     * 3-step cToken redemption matching the official Suilend SDK flow:
+     * 1. redeem_ctokens_and_withdraw_liquidity_request — creates a LiquidityRequest
+     * 2. unstake_sui_from_staker — (SUI only) unstakes from validators to replenish available_liquidity
+     * 3. fulfill_liquidity_request — splits underlying tokens from the reserve
+     */
+    private redeemCtokens;
     addSaveToTx(tx: Transaction, address: string, coin: TransactionObjectArgument, asset: string, options?: {
         collectFee?: boolean;
     }): Promise<void>;

package/dist/index.cjs

@@ -185,11 +185,10 @@ function parseMoveAbortMessage(msg) {
   if (abortMatch) {
     const code = parseInt(abortMatch[1], 10);
     const mapped = mapMoveAbortCode(code);
-    if (mapped.startsWith("Move abort code:")) {
-      const moduleMatch = msg.match(/in '([^']+)'/);
-      if (moduleMatch) return `${mapped} (in ${moduleMatch[1]})`;
-    }
-    return mapped;
+    const moduleMatch = msg.match(/Identifier\("([^"]+)"\)/) ?? msg.match(/in '([^']+)'/);
+    const fnMatch = msg.match(/function_name:\s*Some\("([^"]+)"\)/);
+    const suffix = moduleMatch ? ` [${moduleMatch[1]}${fnMatch ? `::${fnMatch[1]}` : ""}]` : "";
+    return `${mapped}${suffix}`;
   }
   return msg;
 }
@@ -1776,6 +1775,7 @@ SUPPORTED_ASSETS.USDC.type;
 var WAD = 1e18;
 var MIN_HEALTH_FACTOR2 = 1.5;
 var CLOCK2 = "0x6";
+var SUI_SYSTEM_STATE2 = "0x5";
 var LENDING_MARKET_ID = "0x84030d26d85eaa7035084a057f2f11f701b7e2e4eda87551becbc7c97505ece1";
 var LENDING_MARKET_TYPE = "0xf95b06141ed4a174f239417323bde3f209b972f5930d8521ea38a52aff3a6ddf::suilend::MAIN_POOL";
 var SUILEND_PACKAGE = "0xf95b06141ed4a174f239417323bde3f209b972f5930d8521ea38a52aff3a6ddf";
@@ -1791,6 +1791,9 @@ var descriptor4 = {
     "lending_market::create_obligation": "save",
     "lending_market::withdraw_ctokens": "withdraw",
     "lending_market::redeem_ctokens_and_withdraw_liquidity": "withdraw",
+    "lending_market::redeem_ctokens_and_withdraw_liquidity_request": "withdraw",
+    "lending_market::fulfill_liquidity_request": "withdraw",
+    "lending_market::unstake_sui_from_staker": "withdraw",
     "lending_market::borrow": "borrow",
     "lending_market::repay": "repay"
   }
@@ -2135,7 +2138,9 @@ var SuilendAdapter = class {
     const deposited = dep ? dep.ctokenAmount * ratio / 10 ** reserve.mintDecimals : 0;
     const effectiveAmount = Math.min(amount, deposited);
     if (effectiveAmount <= 0) throw new T2000Error("NO_COLLATERAL", `Nothing to withdraw for ${assetInfo.displayName} on Suilend`);
-    const rawAmount = Math.floor(effectiveAmount * 10 ** reserve.mintDecimals);
+    const U64_MAX = "18446744073709551615";
+    const isFullWithdraw = dep && effectiveAmount >= deposited * 0.999;
+    const withdrawArg = isFullWithdraw ? U64_MAX : String(Math.floor(effectiveAmount * 10 ** reserve.mintDecimals / ratio));
     const tx = new transactions.Transaction();
     tx.setSender(address);
     const [ctokens] = tx.moveCall({
@@ -2146,25 +2151,10 @@ var SuilendAdapter = class {
         tx.pure.u64(reserve.arrayIndex),
         tx.object(caps[0].id),
         tx.object(CLOCK2),
-        tx.pure.u64(rawAmount)
-      ]
-    });
-    const exemptionType = `${SUILEND_PACKAGE}::lending_market::RateLimiterExemption<${LENDING_MARKET_TYPE}, ${assetInfo.type}>`;
-    const [none] = tx.moveCall({
-      target: "0x1::option::none",
-      typeArguments: [exemptionType]
-    });
-    const [coin] = tx.moveCall({
-      target: `${pkg}::lending_market::redeem_ctokens_and_withdraw_liquidity`,
-      typeArguments: [LENDING_MARKET_TYPE, assetInfo.type],
-      arguments: [
-        tx.object(LENDING_MARKET_ID),
-        tx.pure.u64(reserve.arrayIndex),
-        tx.object(CLOCK2),
-        ctokens,
-        none
+        tx.pure("u64", BigInt(withdrawArg))
       ]
     });
+    const coin = this.redeemCtokens(tx, pkg, reserve, assetInfo.type, assetKey, ctokens);
     tx.transferObjects([coin], address);
     return { tx, effectiveAmount };
   }
@@ -2182,7 +2172,7 @@ var SuilendAdapter = class {
     const deposited = dep ? dep.ctokenAmount * ratio / 10 ** reserve.mintDecimals : 0;
     const effectiveAmount = Math.min(amount, deposited);
     if (effectiveAmount <= 0) throw new T2000Error("NO_COLLATERAL", `Nothing to withdraw for ${assetInfo.displayName} on Suilend`);
-    const rawAmount = Math.floor(effectiveAmount * 10 ** reserve.mintDecimals);
+    const ctokenAmount = dep && effectiveAmount >= deposited * 0.999 ? dep.ctokenAmount : Math.floor(effectiveAmount * 10 ** reserve.mintDecimals / ratio);
     const [ctokens] = tx.moveCall({
       target: `${pkg}::lending_market::withdraw_ctokens`,
       typeArguments: [LENDING_MARKET_TYPE, assetInfo.type],
@@ -2191,17 +2181,27 @@ var SuilendAdapter = class {
         tx.pure.u64(reserve.arrayIndex),
         tx.object(caps[0].id),
         tx.object(CLOCK2),
-        tx.pure.u64(rawAmount)
+        tx.pure.u64(ctokenAmount)
       ]
     });
-    const exemptionType = `${SUILEND_PACKAGE}::lending_market::RateLimiterExemption<${LENDING_MARKET_TYPE}, ${assetInfo.type}>`;
+    const coin = this.redeemCtokens(tx, pkg, reserve, assetInfo.type, assetKey, ctokens);
+    return { coin, effectiveAmount };
+  }
+  /**
+   * 3-step cToken redemption matching the official Suilend SDK flow:
+   * 1. redeem_ctokens_and_withdraw_liquidity_request — creates a LiquidityRequest
+   * 2. unstake_sui_from_staker — (SUI only) unstakes from validators to replenish available_liquidity
+   * 3. fulfill_liquidity_request — splits underlying tokens from the reserve
+   */
+  redeemCtokens(tx, pkg, reserve, coinType, assetKey, ctokens) {
+    const exemptionType = `${SUILEND_PACKAGE}::lending_market::RateLimiterExemption<${LENDING_MARKET_TYPE}, ${coinType}>`;
     const [none] = tx.moveCall({
       target: "0x1::option::none",
       typeArguments: [exemptionType]
     });
-    const [coin] = tx.moveCall({
-      target: `${pkg}::lending_market::redeem_ctokens_and_withdraw_liquidity`,
-      typeArguments: [LENDING_MARKET_TYPE, assetInfo.type],
+    const [liquidityRequest] = tx.moveCall({
+      target: `${pkg}::lending_market::redeem_ctokens_and_withdraw_liquidity_request`,
+      typeArguments: [LENDING_MARKET_TYPE, coinType],
       arguments: [
         tx.object(LENDING_MARKET_ID),
         tx.pure.u64(reserve.arrayIndex),
@@ -2210,7 +2210,28 @@ var SuilendAdapter = class {
         none
       ]
     });
-    return { coin, effectiveAmount };
+    if (assetKey === "SUI") {
+      tx.moveCall({
+        target: `${pkg}::lending_market::unstake_sui_from_staker`,
+        typeArguments: [LENDING_MARKET_TYPE],
+        arguments: [
+          tx.object(LENDING_MARKET_ID),
+          tx.pure.u64(reserve.arrayIndex),
+          liquidityRequest,
+          tx.object(SUI_SYSTEM_STATE2)
+        ]
+      });
+    }
+    const [coin] = tx.moveCall({
+      target: `${pkg}::lending_market::fulfill_liquidity_request`,
+      typeArguments: [LENDING_MARKET_TYPE, coinType],
+      arguments: [
+        tx.object(LENDING_MARKET_ID),
+        tx.pure.u64(reserve.arrayIndex),
+        liquidityRequest
+      ]
+    });
+    return coin;
   }
   async addSaveToTx(tx, address, coin, asset, options) {
     const assetKey = asset in SUPPORTED_ASSETS ? asset : "USDC";