@t2000/sdk 0.8.3 → 0.8.5

package/dist/index.cjs

@@ -577,6 +577,20 @@ function addOracleUpdate(tx, config, pool) {
     ]
   });
 }
+function addOracleUpdatesForPositions(tx, config, pools, states, primaryPool) {
+  const updated = /* @__PURE__ */ new Set();
+  addOracleUpdate(tx, config, primaryPool);
+  updated.add(primaryPool.id);
+  for (const state of states) {
+    if (updated.has(state.assetId)) continue;
+    const pool = pools.find((p) => p.id === state.assetId);
+    if (!pool) continue;
+    const feed = config.oracle.feeds?.find((f2) => f2.assetId === pool.id);
+    if (!feed) continue;
+    addOracleUpdate(tx, config, pool);
+    updated.add(pool.id);
+  }
+}
 function rateToApy(rawRate) {
   if (!rawRate || rawRate === "0") return 0;
   return Number(BigInt(rawRate)) / 10 ** RATE_DECIMALS * 100;
@@ -689,7 +703,7 @@ async function buildWithdrawTx(client, address, amount, options = {}) {
   const rawAmount = Number(stableToRaw(effectiveAmount, assetInfo.decimals));
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  addOracleUpdate(tx, config, pool);
+  addOracleUpdatesForPositions(tx, config, pools, states, pool);
   const [balance] = tx.moveCall({
     target: `${config.package}::incentive_v3::withdraw_v2`,
     arguments: [
@@ -720,10 +734,15 @@ async function buildBorrowTx(client, address, amount, options = {}) {
   const asset = options.asset ?? "USDC";
   const assetInfo = SUPPORTED_ASSETS[asset];
   const rawAmount = Number(stableToRaw(amount, assetInfo.decimals));
-  const [config, pool] = await Promise.all([getConfig(), getPool(asset)]);
+  const [config, pool, pools, states] = await Promise.all([
+    getConfig(),
+    getPool(asset),
+    getPools(),
+    getUserState(client, address)
+  ]);
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  addOracleUpdate(tx, config, pool);
+  addOracleUpdatesForPositions(tx, config, pools, states, pool);
   const [balance] = tx.moveCall({
     target: `${config.package}::incentive_v3::borrow_v2`,
     arguments: [
@@ -2776,6 +2795,22 @@ var T2000 = class _T2000 extends eventemitter3.EventEmitter {
     const current = savePositions.reduce(
       (worst, p) => p.apy < worst.apy ? p : worst
     );
+    const withdrawAdapter = this.registry.getLending(current.protocolId);
+    if (withdrawAdapter) {
+      try {
+        const maxResult = await withdrawAdapter.maxWithdraw(this._address, current.asset);
+        if (maxResult.maxAmount < current.amount) {
+          current.amount = Math.max(0, maxResult.maxAmount - 0.01);
+        }
+      } catch {
+      }
+    }
+    if (current.amount <= 0.01) {
+      throw new T2000Error(
+        "HEALTH_FACTOR_TOO_LOW",
+        "Cannot rebalance \u2014 active borrows prevent safe withdrawal. Repay some debt first."
+      );
+    }
     const apyDiff = bestRate.rates.saveApy - current.apy;
     const isSameProtocol = current.protocolId === bestRate.protocolId;
     const isSameAsset = current.asset === bestRate.asset;
@@ -2887,7 +2922,6 @@ var T2000 = class _T2000 extends eventemitter3.EventEmitter {
     }
     const txDigests = [];
     let totalGasCost = 0;
-    const withdrawAdapter = this.registry.getLending(current.protocolId);
     if (!withdrawAdapter) throw new T2000Error("PROTOCOL_UNAVAILABLE", `Protocol ${current.protocolId} not found`);
     const withdrawResult = await executeWithGas(this.client, this.keypair, async () => {
       const built = await withdrawAdapter.buildWithdrawTx(this._address, current.amount, current.asset);