@t2000/sdk 0.16.2 → 0.16.7

package/dist/index.cjs

@@ -2129,12 +2129,13 @@ var SuilendAdapter = class {
     if (!reserve) throw new T2000Error("ASSET_NOT_SUPPORTED", `${assetInfo.displayName} reserve not found on Suilend`);
     const caps = await this.fetchObligationCaps(address);
     if (caps.length === 0) throw new T2000Error("NO_COLLATERAL", "No Suilend position found");
-    const positions = await this.getPositions(address);
-    const deposited = positions.supplies.find((s) => s.asset === assetKey)?.amount ?? 0;
+    const obligation = await this.fetchObligation(caps[0].obligationId);
+    const dep = obligation.deposits.find((d) => d.reserveIdx === reserve.arrayIndex);
+    const ratio = cTokenRatio(reserve);
+    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 ratio = cTokenRatio(reserve);
-    const ctokenAmount = Math.ceil(effectiveAmount * 10 ** reserve.mintDecimals / ratio);
+    const ctokenAmount = dep && effectiveAmount >= deposited * 0.999 ? dep.ctokenAmount : Math.floor(effectiveAmount * 10 ** reserve.mintDecimals / ratio);
     const tx = new transactions.Transaction();
     tx.setSender(address);
     const [ctokens] = tx.moveCall({
@@ -2175,12 +2176,13 @@ var SuilendAdapter = class {
     if (!reserve) throw new T2000Error("ASSET_NOT_SUPPORTED", `${assetInfo.displayName} reserve not found on Suilend`);
     const caps = await this.fetchObligationCaps(address);
     if (caps.length === 0) throw new T2000Error("NO_COLLATERAL", "No Suilend position found");
-    const positions = await this.getPositions(address);
-    const deposited = positions.supplies.find((s) => s.asset === assetKey)?.amount ?? 0;
+    const obligation = await this.fetchObligation(caps[0].obligationId);
+    const dep = obligation.deposits.find((d) => d.reserveIdx === reserve.arrayIndex);
+    const ratio = cTokenRatio(reserve);
+    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 ratio = cTokenRatio(reserve);
-    const ctokenAmount = Math.ceil(effectiveAmount * 10 ** reserve.mintDecimals / ratio);
+    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],
@@ -2388,13 +2390,62 @@ function solveHashcash(challenge) {
   }
 }
 
+// src/gas/autoTopUp.ts
+var AUTO_TOPUP_MIN_SUI_FOR_GAS = 5000000n;
+async function shouldAutoTopUp(client, address) {
+  const [suiBalance, usdcBalance] = await Promise.all([
+    client.getBalance({ owner: address, coinType: SUPPORTED_ASSETS.SUI.type }),
+    client.getBalance({ owner: address, coinType: SUPPORTED_ASSETS.USDC.type })
+  ]);
+  const suiRaw = BigInt(suiBalance.totalBalance);
+  const usdcRaw = BigInt(usdcBalance.totalBalance);
+  return suiRaw < AUTO_TOPUP_THRESHOLD && suiRaw >= AUTO_TOPUP_MIN_SUI_FOR_GAS && usdcRaw >= AUTO_TOPUP_MIN_USDC;
+}
+async function executeAutoTopUp(client, keypair) {
+  const address = keypair.getPublicKey().toSuiAddress();
+  const topupAmountHuman = Number(AUTO_TOPUP_AMOUNT) / 1e6;
+  const { tx } = await buildSwapTx({
+    client,
+    address,
+    fromAsset: "USDC",
+    toAsset: "SUI",
+    amount: topupAmountHuman
+  });
+  const result = await client.signAndExecuteTransaction({
+    signer: keypair,
+    transaction: tx,
+    options: { showEffects: true, showBalanceChanges: true }
+  });
+  await client.waitForTransaction({ digest: result.digest });
+  let suiReceived = 0;
+  if (result.balanceChanges) {
+    for (const change of result.balanceChanges) {
+      if (change.coinType === SUPPORTED_ASSETS.SUI.type && change.owner && typeof change.owner === "object" && "AddressOwner" in change.owner && change.owner.AddressOwner === address) {
+        suiReceived += Number(change.amount) / Number(MIST_PER_SUI);
+      }
+    }
+  }
+  return {
+    success: true,
+    tx: result.digest,
+    usdcSpent: topupAmountHuman,
+    suiReceived: Math.abs(suiReceived)
+  };
+}
+
 // src/gas/gasStation.ts
-async function requestGasSponsorship(txJson, sender, type) {
-  const txBytes = Buffer.from(txJson).toString("base64");
+async function requestGasSponsorship(txJson, sender, type, txBcsBytes) {
+  const payload = { sender, type };
+  if (txBcsBytes) {
+    payload.txBcsBytes = txBcsBytes;
+  } else {
+    payload.txJson = txJson;
+    payload.txBytes = Buffer.from(txJson).toString("base64");
+  }
   const res = await fetch(`${API_BASE_URL}/api/gas`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ txJson, txBytes, sender, type })
+    body: JSON.stringify(payload)
   });
   const data = await res.json();
   if (!res.ok) {
@@ -2444,53 +2495,6 @@ async function getGasStatus(address) {
   return await res.json();
 }
 
-// src/gas/autoTopUp.ts
-async function shouldAutoTopUp(client, address) {
-  const [suiBalance, usdcBalance] = await Promise.all([
-    client.getBalance({ owner: address, coinType: SUPPORTED_ASSETS.SUI.type }),
-    client.getBalance({ owner: address, coinType: SUPPORTED_ASSETS.USDC.type })
-  ]);
-  const suiRaw = BigInt(suiBalance.totalBalance);
-  const usdcRaw = BigInt(usdcBalance.totalBalance);
-  return suiRaw < AUTO_TOPUP_THRESHOLD && usdcRaw >= AUTO_TOPUP_MIN_USDC;
-}
-async function executeAutoTopUp(client, keypair) {
-  const address = keypair.getPublicKey().toSuiAddress();
-  const topupAmountHuman = Number(AUTO_TOPUP_AMOUNT) / 1e6;
-  const { tx } = await buildSwapTx({
-    client,
-    address,
-    fromAsset: "USDC",
-    toAsset: "SUI",
-    amount: topupAmountHuman
-  });
-  const txJson = tx.serialize();
-  const sponsoredResult = await requestGasSponsorship(txJson, address, "auto-topup");
-  const sponsoredTxBytes = Buffer.from(sponsoredResult.txBytes, "base64");
-  const { signature: agentSig } = await keypair.signTransaction(sponsoredTxBytes);
-  const result = await client.executeTransactionBlock({
-    transactionBlock: sponsoredResult.txBytes,
-    signature: [agentSig, sponsoredResult.sponsorSignature],
-    options: { showEffects: true, showBalanceChanges: true }
-  });
-  await client.waitForTransaction({ digest: result.digest });
-  let suiReceived = 0;
-  if (result.balanceChanges) {
-    for (const change of result.balanceChanges) {
-      if (change.coinType === SUPPORTED_ASSETS.SUI.type && change.owner && typeof change.owner === "object" && "AddressOwner" in change.owner && change.owner.AddressOwner === address) {
-        suiReceived += Number(change.amount) / Number(MIST_PER_SUI);
-      }
-    }
-  }
-  reportGasUsage(address, result.digest, 0, 0, "auto-topup");
-  return {
-    success: true,
-    tx: result.digest,
-    usdcSpent: topupAmountHuman,
-    suiReceived: Math.abs(suiReceived)
-  };
-}
-
 // src/gas/manager.ts
 function extractGasCost(effects) {
   if (!effects?.gasUsed) return 0;
@@ -2518,11 +2522,12 @@ async function trySelfFunded(client, keypair, tx) {
     gasCostSui: extractGasCost(result.effects)
   };
 }
-async function tryAutoTopUpThenSelfFund(client, keypair, tx) {
+async function tryAutoTopUpThenSelfFund(client, keypair, buildTx) {
   const address = keypair.getPublicKey().toSuiAddress();
   const canTopUp = await shouldAutoTopUp(client, address);
   if (!canTopUp) return null;
   await executeAutoTopUp(client, keypair);
+  const tx = await buildTx();
   tx.setSender(address);
   const result = await client.signAndExecuteTransaction({
     signer: keypair,
@@ -2540,8 +2545,15 @@ async function tryAutoTopUpThenSelfFund(client, keypair, tx) {
 async function trySponsored(client, keypair, tx) {
   const address = keypair.getPublicKey().toSuiAddress();
   tx.setSender(address);
-  const txJson = tx.serialize();
-  const sponsoredResult = await requestGasSponsorship(txJson, address);
+  let txJson;
+  let txBcsBase64;
+  try {
+    txJson = tx.serialize();
+  } catch {
+    const bcsBytes = await tx.build({ client });
+    txBcsBase64 = Buffer.from(bcsBytes).toString("base64");
+  }
+  const sponsoredResult = await requestGasSponsorship(txJson ?? "", address, void 0, txBcsBase64);
   const sponsoredTxBytes = Buffer.from(sponsoredResult.txBytes, "base64");
   const { signature: agentSig } = await keypair.signTransaction(sponsoredTxBytes);
   const result = await client.executeTransactionBlock({
@@ -2577,8 +2589,7 @@ async function executeWithGas(client, keypair, buildTx, options) {
     errors.push(`self-funded: ${msg}`);
   }
   try {
-    const tx = await buildTx();
-    const result = await tryAutoTopUpThenSelfFund(client, keypair, tx);
+    const result = await tryAutoTopUpThenSelfFund(client, keypair, buildTx);
     if (result) return result;
     errors.push("auto-topup: not eligible (low USDC or sufficient SUI)");
   } catch (err) {