@t2000/sdk 0.15.1 → 0.15.3

package/dist/index.cjs

@@ -3056,9 +3056,12 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
   }
   async balance() {
     const bal = await queryBalance(this.client, this._address);
+    const earningAssets = new Set(
+      this.portfolio.getPositions().filter((p) => p.earning).map((p) => p.asset)
+    );
     try {
       const positions = await this.positions();
-      const savings = positions.positions.filter((p) => p.type === "save").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;
@@ -3086,7 +3089,14 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
       for (const pos of portfolioPositions) {
         if (!(pos.asset in INVESTMENT_ASSETS)) continue;
         const price = assetPrices[pos.asset] ?? 0;
-        if (pos.asset === "SUI") {
+        if (pos.earning) {
+          investmentValue += pos.totalAmount * price;
+          investmentCostBasis += pos.costBasis;
+          if (pos.asset === "SUI") {
+            const gasSui = Math.max(0, bal.gasReserve.sui);
+            bal.gasReserve = { sui: gasSui, usdEquiv: gasSui * price };
+          }
+        } else if (pos.asset === "SUI") {
           const actualHeld = Math.min(pos.totalAmount, bal.gasReserve.sui);
           investmentValue += actualHeld * price;
           if (actualHeld < pos.totalAmount && pos.totalAmount > 0) {
@@ -3946,26 +3956,20 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
     if (depositAmount <= 0) {
       throw new T2000Error("INSUFFICIENT_BALANCE", `No ${params.asset} available to deposit (wallet: ${walletAmount}, gas reserve: ${gasReserve})`);
     }
-    const { tx } = await adapter.buildSaveTx(this._address, depositAmount, params.asset);
-    const result = await this.client.signAndExecuteTransaction({
-      signer: this.keypair,
-      transaction: tx,
-      options: { showEffects: true }
+    const gasResult = await executeWithGas(this.client, this.keypair, async () => {
+      const { tx } = await adapter.buildSaveTx(this._address, depositAmount, params.asset);
+      return tx;
     });
-    await this.client.waitForTransaction({ digest: result.digest });
-    const gasCost = result.effects?.gasUsed ? Math.abs(
-      (Number(result.effects.gasUsed.computationCost) + Number(result.effects.gasUsed.storageCost) - Number(result.effects.gasUsed.storageRebate)) / 1e9
-    ) : 0;
     this.portfolio.recordEarn(params.asset, adapter.id, rate.saveApy);
     return {
       success: true,
-      tx: result.digest,
+      tx: gasResult.digest,
       asset: params.asset,
       amount: depositAmount,
       protocol: adapter.name,
       apy: rate.saveApy,
-      gasCost,
-      gasMethod: "self-funded"
+      gasCost: gasResult.gasCostSui,
+      gasMethod: gasResult.gasMethod
     };
   }
   async investUnearn(params) {
@@ -3984,27 +3988,23 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
     const positions = await adapter.getPositions(this._address);
     const supply = positions.supplies.find((s) => s.asset === params.asset);
     const withdrawAmount = supply?.amount ?? pos.totalAmount;
-    const { tx, effectiveAmount } = await adapter.buildWithdrawTx(this._address, withdrawAmount, params.asset);
-    const result = await this.client.signAndExecuteTransaction({
-      signer: this.keypair,
-      transaction: tx,
-      options: { showEffects: true }
-    });
-    await this.client.waitForTransaction({ digest: result.digest });
-    const gasCost = result.effects?.gasUsed ? Math.abs(
-      (Number(result.effects.gasUsed.computationCost) + Number(result.effects.gasUsed.storageCost) - Number(result.effects.gasUsed.storageRebate)) / 1e9
-    ) : 0;
     const protocolName = adapter.name;
+    let effectiveAmount = withdrawAmount;
+    const gasResult = await executeWithGas(this.client, this.keypair, async () => {
+      const result = await adapter.buildWithdrawTx(this._address, withdrawAmount, params.asset);
+      effectiveAmount = result.effectiveAmount;
+      return result.tx;
+    });
     this.portfolio.recordUnearn(params.asset);
     return {
       success: true,
-      tx: result.digest,
+      tx: gasResult.digest,
       asset: params.asset,
       amount: effectiveAmount,
       protocol: protocolName,
       apy: 0,
-      gasCost,
-      gasMethod: "self-funded"
+      gasCost: gasResult.gasCostSui,
+      gasMethod: gasResult.gasMethod
     };
   }
   async getPortfolio() {
@@ -4029,7 +4029,7 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
       const currentPrice = prices[pos.asset] ?? 0;
       let totalAmount = pos.totalAmount;
       let costBasis = pos.costBasis;
-      if (pos.asset in INVESTMENT_ASSETS) {
+      if (pos.asset in INVESTMENT_ASSETS && !pos.earning) {
         try {
           const assetInfo = SUPPORTED_ASSETS[pos.asset];
           const bal = await this.client.getBalance({ owner: this._address, coinType: assetInfo.type });