@t2000/cli 1.0.1 → 1.1.0

package/dist/{dist-4CCB73ET.js → dist-67XBQC7P.js}

@@ -35,6 +35,7 @@ import {
   SafeguardError,
   T2000,
   T2000Error,
+  T2000_OVERLAY_FEE_WALLET,
   TOKEN_MAP,
   USDC_DECIMALS,
   USDC_TYPE,
@@ -48,7 +49,7 @@ import {
   WAL_TYPE,
   WBTC_TYPE,
   ZkLoginSigner,
-  addCollectFeeToTx,
+  addFeeTransfer,
   allDescriptors,
   assertAllowedAsset,
   buildStakeVSuiTx,
@@ -105,7 +106,7 @@ import {
   usdcToRaw,
   validateAddress,
   walletExists
-} from "./chunk-G2DXW5RK.js";
+} from "./chunk-KDR2GPAB.js";
 import "./chunk-V7PXDEKG.js";
 import "./chunk-Q2LY5BHK.js";
 import "./chunk-3XUF7GM3.js";
@@ -146,6 +147,7 @@ export {
   SafeguardError,
   T2000,
   T2000Error,
+  T2000_OVERLAY_FEE_WALLET,
   TOKEN_MAP,
   USDC_DECIMALS,
   USDC_TYPE,
@@ -159,7 +161,7 @@ export {
   WAL_TYPE,
   WBTC_TYPE,
   ZkLoginSigner,
-  addCollectFeeToTx,
+  addFeeTransfer,
   allDescriptors,
   assertAllowedAsset,
   buildStakeVSuiTx,
@@ -217,4 +219,4 @@ export {
   validateAddress,
   walletExists
 };
-//# sourceMappingURL=dist-4CCB73ET.js.map
+//# sourceMappingURL=dist-67XBQC7P.js.map

package/dist/{dist-R6F53QGO.js → dist-SLM2OSSP.js}

@@ -130097,18 +130097,22 @@ __export2(cetus_swap_exports, {
   resolveTokenType: () => resolveTokenType,
   simulateSwap: () => simulateSwap
 });
-function getClient3(walletAddress) {
-  if (clientInstance) return clientInstance;
-  clientInstance = new AggregatorClient({
+function getClient3(walletAddress, overlayFee) {
+  const rate = overlayFee?.rate ?? 0;
+  const receiver = overlayFee?.receiver ?? "";
+  const key = `${walletAddress}|${rate}|${receiver}`;
+  const cached3 = clientCache.get(key);
+  if (cached3) return cached3;
+  const client = new AggregatorClient({
     signer: walletAddress,
     env: Env.Mainnet,
-    overlayFeeRate: OVERLAY_FEE_RATE,
-    overlayFeeReceiver: OVERLAY_FEE_RECEIVER
+    ...rate > 0 && receiver ? { overlayFeeRate: rate, overlayFeeReceiver: receiver } : {}
   });
-  return clientInstance;
+  clientCache.set(key, client);
+  return client;
 }
 async function findSwapRoute(params) {
-  const client = getClient3(params.walletAddress);
+  const client = getClient3(params.walletAddress, params.overlayFee);
   const findParams = {
     from: params.from,
     target: params.to,
@@ -130145,7 +130149,7 @@ function normalizePriceImpact(value) {
   return Number.isFinite(n) ? n : 0;
 }
 async function buildSwapTx(params) {
-  const client = getClient3(params.walletAddress);
+  const client = getClient3(params.walletAddress, params.overlayFee);
   const clampedSlippage = Math.max(1e-3, Math.min(params.slippage, 0.05));
   const outputCoin = await client.routerSwap({
     router: params.route.routerData,
@@ -130156,7 +130160,7 @@ async function buildSwapTx(params) {
   return outputCoin;
 }
 async function simulateSwap(params) {
-  const client = getClient3(params.walletAddress);
+  const client = getClient3(params.walletAddress, params.overlayFee);
   try {
     await client.devInspectTransactionBlock(params.tx);
     return { success: true };
@@ -130165,22 +130169,16 @@ async function simulateSwap(params) {
   }
 }
 var OVERLAY_FEE_RATE;
-var OVERLAY_FEE_RECEIVER;
-var clientInstance;
+var clientCache;
 var init_cetus_swap = __esm2({
   "src/protocols/cetus-swap.ts"() {
     init_token_registry();
     OVERLAY_FEE_RATE = 1e-3;
-    OVERLAY_FEE_RECEIVER = process.env.T2000_TREASURY_ADDRESS ?? "0x3bb501b8300125dca59019247941a42af6b292a150ce3cfcce9449456be2ec91";
-    clientInstance = null;
+    clientCache = /* @__PURE__ */ new Map();
   }
 });
 init_errors7();
 var MIST_PER_SUI2 = 1000000000n;
-var USDC_DECIMALS = 6;
-var BPS_DENOMINATOR = 10000n;
-var SAVE_FEE_BPS = 10n;
-var BORROW_FEE_BPS = 5n;
 var SUPPORTED_ASSETS = {
   USDC: {
     type: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC",
@@ -130264,12 +130262,12 @@ function assertAllowedAsset(op, asset) {
     );
   }
 }
-var T2000_PACKAGE_ID = process.env.T2000_PACKAGE_ID ?? "0xd775fcc66eae26797654d435d751dea56b82eeb999de51fd285348e573b968ad";
-var T2000_CONFIG_ID = process.env.T2000_CONFIG_ID ?? "0x08ba26f0d260b5edf6a19c71492b3eb914906a7419baf2df1426765157e5862a";
-var T2000_TREASURY_ID = process.env.T2000_TREASURY_ID ?? "0xf420ec0dcad44433042fb56e1413fb88d3ff65be94fcf425ef9ff750164590e8";
+process.env.T2000_PACKAGE_ID ?? "0xd775fcc66eae26797654d435d751dea56b82eeb999de51fd285348e573b968ad";
+process.env.T2000_CONFIG_ID ?? "0x08ba26f0d260b5edf6a19c71492b3eb914906a7419baf2df1426765157e5862a";
+process.env.T2000_OVERLAY_FEE_WALLET ?? "0x5366efbf2b4fe5767fe2e78eb197aa5f5d138d88ac3333fbf3f80a1927da473a";
 var DEFAULT_RPC_URL = "https://fullnode.mainnet.sui.io:443";
 var DEFAULT_KEY_PATH = "~/.t2000/wallet.key";
-var API_BASE_URL = process.env.T2000_API_URL ?? "https://api.t2000.ai";
+process.env.T2000_API_URL ?? "https://api.t2000.ai";
 var CETUS_USDC_SUI_POOL = "0x51e883ba7c0b566a26cbc8a94cd33eb0abd418a77cc1e60ad22fd9b1f29cd2ab";
 init_errors7();
 var cachedClient = null;
@@ -130429,9 +130427,6 @@ var ZkLoginSigner = class {
   }
 };
 init_errors7();
-function usdcToRaw(amount2) {
-  return BigInt(Math.round(amount2 * 10 ** USDC_DECIMALS));
-}
 function stableToRaw(amount2, decimals2) {
   return BigInt(Math.round(amount2 * 10 ** decimals2));
 }
@@ -130738,55 +130733,6 @@ function extractCommands(txBlock) {
   return result;
 }
 init_token_registry();
-var FEE_RATES = {
-  save: SAVE_FEE_BPS,
-  borrow: BORROW_FEE_BPS
-};
-var OP_CODES = {
-  save: 0,
-  borrow: 2
-};
-function calculateFee(operation, amount2) {
-  const bps2 = FEE_RATES[operation];
-  const feeAmount = amount2 * Number(bps2) / Number(BPS_DENOMINATOR);
-  const rawAmount = usdcToRaw(feeAmount);
-  return {
-    amount: feeAmount,
-    asset: "USDC",
-    rate: Number(bps2) / Number(BPS_DENOMINATOR),
-    rawAmount
-  };
-}
-function addCollectFeeToTx(tx, paymentCoin, operation) {
-  const bps2 = FEE_RATES[operation];
-  if (bps2 <= 0n) return;
-  tx.moveCall({
-    target: `${T2000_PACKAGE_ID}::treasury::collect_fee`,
-    typeArguments: [SUPPORTED_ASSETS.USDC.type],
-    arguments: [
-      tx.object(T2000_TREASURY_ID),
-      tx.object(T2000_CONFIG_ID),
-      paymentCoin,
-      tx.pure.u8(OP_CODES[operation])
-    ]
-  });
-}
-async function reportFee(agentAddress, operation, feeAmount, feeRate, txDigest) {
-  try {
-    await fetch(`${API_BASE_URL}/api/fees`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        agentAddress,
-        operation,
-        feeAmount: feeAmount.toString(),
-        feeRate: feeRate.toString(),
-        txDigest
-      })
-    });
-  } catch {
-  }
-}
 function ulebEncode2(num2) {
   let bigNum = BigInt(num2);
   const arr = [];
@@ -134545,9 +134491,6 @@ async function buildSaveTx(client, address2, amount2, options = {}) {
   const tx = new Transaction();
   tx.setSender(address2);
   const coinObj = mergeCoins(tx, coins);
-  if (options.collectFee) {
-    addCollectFeeToTx(tx, coinObj, "save");
-  }
   const rawAmount = Math.min(Number(stableToRaw(amount2, assetInfo.decimals)), Number(totalBalance));
   try {
     await Ce(tx, assetInfo.type, coinObj, {
@@ -134618,9 +134561,6 @@ async function addWithdrawToTx(tx, client, address2, amount2, options = {}) {
 async function addSaveToTx(tx, _client, _address, coin, options = {}) {
   const asset = options.asset ?? "USDC";
   const assetInfo = resolveAssetInfo(asset);
-  if (options.collectFee) {
-    addCollectFeeToTx(tx, coin, "save");
-  }
   try {
     await Ce(tx, assetInfo.type, coin, { env: "prod" });
   } catch (err) {
@@ -134651,9 +134591,6 @@ async function buildBorrowTx(client, address2, amount2, options = {}) {
   await refreshOracle(tx, client, address2, { skipPythUpdate: options.skipPythUpdate });
   try {
     const borrowedCoin = await Xe(tx, assetInfo.type, rawAmount, sdkOptions(client));
-    if (options.collectFee) {
-      addCollectFeeToTx(tx, borrowedCoin, "borrow");
-    }
     tx.transferObjects([borrowedCoin], address2);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -134661,6 +134598,22 @@ async function buildBorrowTx(client, address2, amount2, options = {}) {
   }
   return tx;
 }
+async function addBorrowToTx(tx, client, address2, amount2, options = {}) {
+  if (!amount2 || amount2 <= 0 || !Number.isFinite(amount2)) {
+    throw new T2000Error("INVALID_AMOUNT", "Borrow amount must be a positive number");
+  }
+  const asset = options.asset ?? "USDC";
+  const assetInfo = resolveAssetInfo(asset);
+  const rawAmount = Number(stableToRaw(amount2, assetInfo.decimals));
+  await refreshOracle(tx, client, address2, { skipPythUpdate: options.skipPythUpdate });
+  try {
+    const borrowedCoin = await Xe(tx, assetInfo.type, rawAmount, sdkOptions(client));
+    return borrowedCoin;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new T2000Error("PROTOCOL_UNAVAILABLE", `NAVI borrow failed: ${msg}`);
+  }
+}
 async function buildRepayTx(client, address2, amount2, options = {}) {
   if (!amount2 || amount2 <= 0 || !Number.isFinite(amount2)) {
     throw new T2000Error("INVALID_AMOUNT", "Repay amount must be a positive number");
@@ -134959,9 +134912,9 @@ var NaviAdapter = class {
   async getHealth(address2) {
     return getHealthFactor(this.client, address2);
   }
-  async buildSaveTx(address2, amount2, asset, options) {
+  async buildSaveTx(address2, amount2, asset) {
     const normalized = normalizeAsset(asset);
-    const tx = await buildSaveTx(this.client, address2, amount2, { ...options, asset: normalized });
+    const tx = await buildSaveTx(this.client, address2, amount2, { asset: normalized });
     return { tx };
   }
   async buildWithdrawTx(address2, amount2, asset, options) {
@@ -134999,9 +134952,16 @@ var NaviAdapter = class {
       skipPythUpdate: options?.skipPythUpdate
     });
   }
-  async addSaveToTx(tx, address2, coin, asset, options) {
+  async addSaveToTx(tx, address2, coin, asset) {
     const normalized = normalizeAsset(asset);
-    return addSaveToTx(tx, this.client, address2, coin, { ...options, asset: normalized });
+    return addSaveToTx(tx, this.client, address2, coin, { asset: normalized });
+  }
+  async addBorrowToTx(tx, address2, amount2, asset, options) {
+    const normalized = normalizeAsset(asset);
+    return addBorrowToTx(tx, this.client, address2, amount2, {
+      asset: normalized,
+      skipPythUpdate: options?.skipPythUpdate
+    });
   }
   async addRepayToTx(tx, address2, coin, asset, options) {
     const normalized = normalizeAsset(asset);
@@ -135735,7 +135695,6 @@ var T2000 = class _T2000 extends import_index2.default {
         );
       }
     }
-    const fee = calculateFee("save", amount2);
     const saveAmount = amount2;
     const adapter2 = await this.resolveLending(params.protocol, asset, "save");
     const canPTB = !!adapter2.addSaveToTx;
@@ -135748,14 +135707,13 @@ var T2000 = class _T2000 extends import_index2.default {
         const merged = this._mergeCoinsInTx(tx2, coins);
         const rawAmount = BigInt(Math.floor(saveAmount * 10 ** assetInfo.decimals));
         const [inputCoin] = tx2.splitCoins(merged, [rawAmount]);
-        await adapter2.addSaveToTx(tx2, this._address, inputCoin, asset, { collectFee: true });
+        await adapter2.addSaveToTx(tx2, this._address, inputCoin, asset);
         return tx2;
       }
-      const { tx } = await adapter2.buildSaveTx(this._address, saveAmount, asset, { collectFee: true });
+      const { tx } = await adapter2.buildSaveTx(this._address, saveAmount, asset);
       return tx;
     });
     const rates = await adapter2.getRates(asset);
-    reportFee(this._address, "save", fee.amount, fee.rate, gasResult.digest);
     this.emitBalanceChange(asset, saveAmount, "save", gasResult.digest);
     let savingsBalance = saveAmount;
     for (let attempt = 0; attempt < 3; attempt++) {
@@ -135775,7 +135733,7 @@ var T2000 = class _T2000 extends import_index2.default {
       tx: gasResult.digest,
       amount: saveAmount,
       apy: rates.saveApy,
-      fee: fee.amount,
+      fee: 0,
       gasCost: gasResult.gasCostSui,
       savingsBalance
     };
@@ -136038,21 +135996,19 @@ var T2000 = class _T2000 extends import_index2.default {
         currentHF: maxResult.currentHF
       });
     }
-    const fee = calculateFee("borrow", params.amount);
     const borrowAmount = params.amount;
     const gasResult = await executeTx(this.client, this._signer, async () => {
-      const { tx } = await adapter2.buildBorrowTx(this._address, borrowAmount, asset, { collectFee: true });
+      const { tx } = await adapter2.buildBorrowTx(this._address, borrowAmount, asset);
       return tx;
     });
     const hf = await adapter2.getHealth(this._address);
-    reportFee(this._address, "borrow", fee.amount, fee.rate, gasResult.digest);
     this.emitBalanceChange(asset, borrowAmount, "borrow", gasResult.digest);
     return {
       success: true,
       tx: gasResult.digest,
       amount: borrowAmount,
       asset,
-      fee: fee.amount,
+      fee: 0,
       healthFactor: hf.healthFactor,
       gasCost: gasResult.gasCostSui
     };
@@ -136325,7 +136281,7 @@ var T2000 = class _T2000 extends import_index2.default {
           if (coins.length === 0) throw new T2000Error("INSUFFICIENT_BALANCE", "No USDC coins after swap");
           const merged = this._mergeCoinsInTx(tx, coins);
           const [inputCoin] = tx.splitCoins(merged, [gainedRaw]);
-          await adapter2.addSaveToTx(tx, this._address, inputCoin, "USDC", { collectFee: false });
+          await adapter2.addSaveToTx(tx, this._address, inputCoin, "USDC");
           return tx;
         });
         depositTx = depositResult.digest;
@@ -137784,7 +137740,7 @@ ${context}
     })
   );
 }
-var PKG_VERSION = "1.0.1";
+var PKG_VERSION = "1.1.0";
 console.log = (...args) => console.error("[log]", ...args);
 console.warn = (...args) => console.error("[warn]", ...args);
 async function startMcpServer(opts) {
@@ -137874,4 +137830,4 @@ axios/dist/node/axios.cjs:
      *)
   *)
 */
-//# sourceMappingURL=dist-R6F53QGO.js.map
+//# sourceMappingURL=dist-SLM2OSSP.js.map