@t2000/sdk 0.18.29 → 0.18.31

package/dist/index.cjs

@@ -55980,49 +55980,6 @@ function solveHashcash(challenge) {
   }
 }
 
-// src/gas/autoTopUp.ts
-var AUTO_TOPUP_MIN_SUI_FOR_GAS = 5000000n;
-async function shouldAutoTopUp(client, address) {
-  const [suiBalance, usdcBalance] = await Promise.all([
-    client.getBalance({ owner: address, coinType: SUPPORTED_ASSETS.SUI.type }),
-    client.getBalance({ owner: address, coinType: SUPPORTED_ASSETS.USDC.type })
-  ]);
-  const suiRaw = BigInt(suiBalance.totalBalance);
-  const usdcRaw = BigInt(usdcBalance.totalBalance);
-  return suiRaw < AUTO_TOPUP_THRESHOLD && suiRaw >= AUTO_TOPUP_MIN_SUI_FOR_GAS && usdcRaw >= AUTO_TOPUP_MIN_USDC;
-}
-async function executeAutoTopUp(client, keypair) {
-  const address = keypair.getPublicKey().toSuiAddress();
-  const topupAmountHuman = Number(AUTO_TOPUP_AMOUNT) / 1e6;
-  const { tx } = await buildSwapTx({
-    client,
-    address,
-    fromAsset: "USDC",
-    toAsset: "SUI",
-    amount: topupAmountHuman
-  });
-  const result = await client.signAndExecuteTransaction({
-    signer: keypair,
-    transaction: tx,
-    options: { showEffects: true, showBalanceChanges: true }
-  });
-  await client.waitForTransaction({ digest: result.digest });
-  let suiReceived = 0;
-  if (result.balanceChanges) {
-    for (const change of result.balanceChanges) {
-      if (change.coinType === SUPPORTED_ASSETS.SUI.type && change.owner && typeof change.owner === "object" && "AddressOwner" in change.owner && change.owner.AddressOwner === address) {
-        suiReceived += Number(change.amount) / Number(MIST_PER_SUI);
-      }
-    }
-  }
-  return {
-    success: true,
-    tx: result.digest,
-    usdcSpent: topupAmountHuman,
-    suiReceived: Math.abs(suiReceived)
-  };
-}
-
 // src/gas/gasStation.ts
 async function requestGasSponsorship(txJson, sender, type, txBcsBytes) {
   const payload = { sender, type };
@@ -56085,6 +56042,83 @@ async function getGasStatus(address) {
   return await res.json();
 }
 
+// src/gas/autoTopUp.ts
+async function shouldAutoTopUp(client, address) {
+  const [suiBalance, usdcBalance] = await Promise.all([
+    client.getBalance({ owner: address, coinType: SUPPORTED_ASSETS.SUI.type }),
+    client.getBalance({ owner: address, coinType: SUPPORTED_ASSETS.USDC.type })
+  ]);
+  const suiRaw = BigInt(suiBalance.totalBalance);
+  const usdcRaw = BigInt(usdcBalance.totalBalance);
+  return suiRaw < AUTO_TOPUP_THRESHOLD && usdcRaw >= AUTO_TOPUP_MIN_USDC;
+}
+async function executeAutoTopUp(client, keypair) {
+  const address = keypair.getPublicKey().toSuiAddress();
+  const topupAmountHuman = Number(AUTO_TOPUP_AMOUNT) / 1e6;
+  const { tx } = await buildSwapTx({
+    client,
+    address,
+    fromAsset: "USDC",
+    toAsset: "SUI",
+    amount: topupAmountHuman
+  });
+  tx.setSender(address);
+  let result;
+  try {
+    result = await client.signAndExecuteTransaction({
+      signer: keypair,
+      transaction: tx,
+      options: { showEffects: true, showBalanceChanges: true }
+    });
+  } catch {
+    const { tx: freshTx } = await buildSwapTx({
+      client,
+      address,
+      fromAsset: "USDC",
+      toAsset: "SUI",
+      amount: topupAmountHuman
+    });
+    freshTx.setSender(address);
+    let txJson;
+    let txBcsBase64;
+    try {
+      txJson = freshTx.serialize();
+    } catch {
+      const bcsBytes = await freshTx.build({ client });
+      txBcsBase64 = Buffer.from(bcsBytes).toString("base64");
+    }
+    const sponsored = await requestGasSponsorship(
+      txJson ?? "",
+      address,
+      "auto-topup",
+      txBcsBase64
+    );
+    const sponsoredTxBytes = Buffer.from(sponsored.txBytes, "base64");
+    const { signature: agentSig } = await keypair.signTransaction(sponsoredTxBytes);
+    result = await client.executeTransactionBlock({
+      transactionBlock: sponsored.txBytes,
+      signature: [agentSig, sponsored.sponsorSignature],
+      options: { showEffects: true, showBalanceChanges: true }
+    });
+    reportGasUsage(address, result.digest, 0, 0, "auto-topup");
+  }
+  await client.waitForTransaction({ digest: result.digest });
+  let suiReceived = 0;
+  if (result.balanceChanges) {
+    for (const change of result.balanceChanges) {
+      if (change.coinType === SUPPORTED_ASSETS.SUI.type && change.owner && typeof change.owner === "object" && "AddressOwner" in change.owner && change.owner.AddressOwner === address) {
+        suiReceived += Number(change.amount) / Number(MIST_PER_SUI);
+      }
+    }
+  }
+  return {
+    success: true,
+    tx: result.digest,
+    usdcSpent: topupAmountHuman,
+    suiReceived: Math.abs(suiReceived)
+  };
+}
+
 // src/gas/manager.ts
 function extractGasCost(effects) {
   if (!effects?.gasUsed) return 0;
@@ -56175,6 +56209,17 @@ async function executeWithGas(client, keypair, buildTx, options) {
   if (options?.enforcer && options?.metadata) {
     options.enforcer.check(options.metadata);
   }
+  const result = await resolveGas(client, keypair, buildTx);
+  try {
+    const address = keypair.getPublicKey().toSuiAddress();
+    if (await shouldAutoTopUp(client, address)) {
+      await executeAutoTopUp(client, keypair);
+    }
+  } catch {
+  }
+  return result;
+}
+async function resolveGas(client, keypair, buildTx) {
   const errors = [];
   try {
     const tx = await buildTx();
@@ -57082,13 +57127,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;
@@ -58898,13 +58936,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,
@@ -59256,16 +59319,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 });