@t2000/sdk 0.18.3 → 0.18.5

package/dist/index.js

@@ -1129,11 +1129,19 @@ async function getRates(client) {
 }
 async function getPositions(client, addressOrKeypair) {
   const address = typeof addressOrKeypair === "string" ? addressOrKeypair : addressOrKeypair.getPublicKey().toSuiAddress();
-  const [states, pools] = await Promise.all([getUserState(client, address), getPools()]);
+  const [states, cachedPools] = await Promise.all([getUserState(client, address), getPools()]);
+  let pools = cachedPools;
+  const unmatchedIds = states.filter((s) => !pools.find((p) => p.id === s.assetId)).map((s) => s.assetId);
+  if (unmatchedIds.length > 0) {
+    pools = await getPools(true);
+  }
   const positions = [];
   for (const state of states) {
     const pool = pools.find((p) => p.id === state.assetId);
-    if (!pool) continue;
+    if (!pool) {
+      console.warn(`[NAVI] No pool found for assetId=${state.assetId} (supply=${state.supplyBalance}, borrow=${state.borrowBalance}) \u2014 funds may be invisible`);
+      continue;
+    }
     const symbol = resolvePoolSymbol(pool);
     const supplyBal = compoundBalance(state.supplyBalance, pool.currentSupplyIndex, pool);
     const borrowBal = compoundBalance(state.borrowBalance, pool.currentBorrowIndex, pool);
@@ -1672,15 +1680,20 @@ var ProtocolRegistry = class {
   }
   async allPositions(address) {
     const results = [];
+    const errors = [];
     for (const adapter of this.lending.values()) {
       try {
         const positions = await adapter.getPositions(address);
         if (positions.supplies.length > 0 || positions.borrows.length > 0) {
           results.push({ protocol: adapter.name, protocolId: adapter.id, positions });
         }
-      } catch {
+      } catch (err) {
+        errors.push(`${adapter.name}: ${err instanceof Error ? err.message : String(err)}`);
       }
     }
+    if (results.length === 0 && errors.length > 0) {
+      throw new T2000Error("PROTOCOL_UNAVAILABLE", `Protocol queries failed (${errors.length}/${this.lending.size}): ${errors.join("; ")}`);
+    }
     return results;
   }
   getLending(id) {
@@ -3866,6 +3879,9 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
           if (sp.asset in INVESTMENT_ASSETS) investedAssets.add(sp.asset);
         }
       }
+      for (const asset of Object.keys(INVESTMENT_ASSETS)) {
+        if ((bal.assets[asset] ?? 0) > 0) investedAssets.add(asset);
+      }
       for (const asset of investedAssets) {
         if (asset === "SUI" || asset in assetPrices) continue;
         try {
@@ -4067,11 +4083,14 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
       return this.withdrawAllProtocols();
     }
     const allPositions = await this.registry.allPositions(this._address);
+    const earningAssets = new Set(
+      this.portfolio.getPositions().filter((p) => p.earning).map((p) => p.asset)
+    );
     const supplies = [];
     for (const pos of allPositions) {
       if (params.protocol && pos.protocolId !== params.protocol) continue;
       for (const s of pos.positions.supplies) {
-        if (s.amount > 1e-3 && !(s.asset in INVESTMENT_ASSETS)) {
+        if (s.amount > 1e-3 && !earningAssets.has(s.asset)) {
           supplies.push({ protocolId: pos.protocolId, asset: s.asset, amount: s.amount, apy: s.apy });
         }
       }
@@ -4155,7 +4174,7 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
     const withdrawable = [];
     for (const pos of allPositions) {
       for (const supply of pos.positions.supplies) {
-        if (supply.amount > 0.01 && !earningAssets.has(supply.asset) && !(supply.asset in INVESTMENT_ASSETS)) {
+        if (supply.amount > 0.01 && !earningAssets.has(supply.asset)) {
           withdrawable.push({ protocolId: pos.protocolId, asset: supply.asset, amount: supply.amount });
         }
       }
@@ -4182,7 +4201,8 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
     if (entries.length === 0) {
       throw new T2000Error("NO_COLLATERAL", "No savings to withdraw across any protocol");
     }
-    const swapAdapter = this.registry.listSwap()[0];
+    const hasNonUsdc = entries.some((e) => e.asset !== "USDC");
+    const swapAdapter = hasNonUsdc ? this.registry.listSwap()[0] : void 0;
     const canPTB = entries.every((e) => e.adapter.addWithdrawToTx) && (!swapAdapter || swapAdapter.addSwapToTx);
     let totalUsdcReceived = 0;
     const gasResult = await executeWithGas(this.client, this.keypair, async () => {
@@ -4190,7 +4210,6 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
         const tx = new Transaction();
         tx.setSender(this._address);
         const usdcCoins = [];
-        const nonUsdcCoins = [];
         for (const entry of entries) {
           const { coin, effectiveAmount } = await entry.adapter.addWithdrawToTx(
             tx,
@@ -4201,9 +4220,20 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
           if (entry.asset === "USDC") {
             totalUsdcReceived += effectiveAmount;
             usdcCoins.push(coin);
+          } else if (swapAdapter?.addSwapToTx) {
+            const { outputCoin, estimatedOut, toDecimals } = await swapAdapter.addSwapToTx(
+              tx,
+              this._address,
+              coin,
+              entry.asset,
+              "USDC",
+              effectiveAmount
+            );
+            totalUsdcReceived += estimatedOut / 10 ** toDecimals;
+            usdcCoins.push(outputCoin);
           } else {
             totalUsdcReceived += effectiveAmount;
-            nonUsdcCoins.push(coin);
+            tx.transferObjects([coin], this._address);
           }
         }
         if (usdcCoins.length > 1) {
@@ -4212,9 +4242,6 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
         if (usdcCoins.length > 0) {
           tx.transferObjects([usdcCoins[0]], this._address);
         }
-        for (const coin of nonUsdcCoins) {
-          tx.transferObjects([coin], this._address);
-        }
         return tx;
       }
       let lastTx;
@@ -4223,6 +4250,9 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
         totalUsdcReceived += built.effectiveAmount;
         lastTx = built.tx;
       }
+      if (hasNonUsdc && swapAdapter) {
+        await this._convertWalletStablesToUsdc(await queryBalance(this.client, this._address));
+      }
       return lastTx;
     });
     if (totalUsdcReceived <= 0) {