@t2000/sdk 0.18.4 → 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);
@@ -3851,7 +3859,7 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
     );
     try {
       const positions = await this.positions();
-      const savings = positions.positions.filter((p) => p.type === "save").filter((p) => !earningAssets.has(p.asset)).filter((p) => !(p.asset in INVESTMENT_ASSETS)).reduce((sum, p) => sum + p.amount, 0);
+      const savings = positions.positions.filter((p) => p.type === "save").filter((p) => !earningAssets.has(p.asset)).reduce((sum, p) => sum + p.amount, 0);
       const debt = positions.positions.filter((p) => p.type === "borrow").reduce((sum, p) => sum + p.amount, 0);
       bal.savings = savings;
       bal.debt = debt;
@@ -3871,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 {
@@ -4072,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 });
         }
       }
@@ -4160,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 });
         }
       }