@t2000/sdk 0.15.1 → 0.15.2

package/dist/index.js

@@ -3944,26 +3944,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) {
@@ -3982,27 +3976,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() {