@t2000/sdk 0.18.30 → 0.18.31

package/dist/index.js

@@ -57124,13 +57124,6 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
         trackedCostBasis[pos.asset] = (trackedCostBasis[pos.asset] ?? 0) + pos.costBasis;
         if (pos.earning) earningAssetSet.add(pos.asset);
       }
-      for (const key of this.portfolio.getAllStrategyKeys()) {
-        for (const sp of this.portfolio.getStrategyPositions(key)) {
-          if (!(sp.asset in INVESTMENT_ASSETS)) continue;
-          trackedAmounts[sp.asset] = (trackedAmounts[sp.asset] ?? 0) + sp.totalAmount;
-          trackedCostBasis[sp.asset] = (trackedCostBasis[sp.asset] ?? 0) + sp.costBasis;
-        }
-      }
       let investmentValue = 0;
       let investmentCostBasis = 0;
       let trackedValue = 0;
@@ -58940,13 +58933,38 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
         strategyPositions[key] = enrichedStrat;
       }
     }
-    const allPositions = [...enriched, ...Object.values(strategyPositions).flat()];
-    const totalInvested = allPositions.reduce((sum, p) => sum + p.costBasis, 0);
-    const totalValue = allPositions.reduce((sum, p) => sum + p.currentValue, 0);
+    const strategyAmountByAsset = {};
+    for (const strats of Object.values(strategyPositions)) {
+      for (const sp of strats) {
+        const prev = strategyAmountByAsset[sp.asset] ?? { amount: 0, costBasis: 0 };
+        strategyAmountByAsset[sp.asset] = {
+          amount: prev.amount + sp.totalAmount,
+          costBasis: prev.costBasis + sp.costBasis
+        };
+      }
+    }
+    const directOnly = enriched.map((pos) => {
+      const strat = strategyAmountByAsset[pos.asset];
+      if (!strat) return pos;
+      const directAmt = pos.totalAmount - strat.amount;
+      if (directAmt <= 1e-6) return null;
+      const directCost = pos.costBasis - strat.costBasis;
+      const currentValue = directAmt * (pos.currentPrice ?? 0);
+      return {
+        ...pos,
+        totalAmount: directAmt,
+        costBasis: directCost,
+        currentValue,
+        unrealizedPnL: currentValue - directCost,
+        unrealizedPnLPct: directCost > 0 ? (currentValue - directCost) / directCost * 100 : 0
+      };
+    }).filter((p) => p !== null);
+    const totalInvested = enriched.reduce((sum, p) => sum + p.costBasis, 0);
+    const totalValue = enriched.reduce((sum, p) => sum + p.currentValue, 0);
     const totalUnrealizedPnL = totalValue - totalInvested;
     const totalUnrealizedPnLPct = totalInvested > 0 ? totalUnrealizedPnL / totalInvested * 100 : 0;
     const result = {
-      positions: enriched,
+      positions: directOnly,
       totalInvested,
       totalValue,
       unrealizedPnL: totalUnrealizedPnL,
@@ -59298,16 +59316,7 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
   async getFreeBalance(asset) {
     if (!(asset in INVESTMENT_ASSETS)) return Infinity;
     const pos = this.portfolio.getPosition(asset);
-    const directAmount = pos && pos.totalAmount > 0 && !pos.earning ? pos.totalAmount : 0;
-    let strategyTotal = 0;
-    for (const key of this.portfolio.getAllStrategyKeys()) {
-      for (const sp of this.portfolio.getStrategyPositions(key)) {
-        if (sp.asset === asset && sp.totalAmount > 0) {
-          strategyTotal += sp.totalAmount;
-        }
-      }
-    }
-    const walletInvested = Math.max(directAmount, strategyTotal);
+    const walletInvested = pos && pos.totalAmount > 0 && !pos.earning ? pos.totalAmount : 0;
     if (walletInvested <= 0) return Infinity;
     const assetInfo = SUPPORTED_ASSETS[asset];
     const balance = await this.client.getBalance({ owner: this._address, coinType: assetInfo.type });