@t2000/sdk 1.0.1 → 1.1.0

package/dist/index.cjs

@@ -728,18 +728,22 @@ __export(cetus_swap_exports, {
   resolveTokenType: () => resolveTokenType,
   simulateSwap: () => simulateSwap
 });
-function getClient(walletAddress) {
-  if (clientInstance) return clientInstance;
-  clientInstance = new aggregatorSdk.AggregatorClient({
+function getClient(walletAddress, overlayFee) {
+  const rate = overlayFee?.rate ?? 0;
+  const receiver = overlayFee?.receiver ?? "";
+  const key = `${walletAddress}|${rate}|${receiver}`;
+  const cached = clientCache.get(key);
+  if (cached) return cached;
+  const client = new aggregatorSdk.AggregatorClient({
     signer: walletAddress,
     env: aggregatorSdk.Env.Mainnet,
-    overlayFeeRate: exports.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 = getClient(params.walletAddress);
+  const client = getClient(params.walletAddress, params.overlayFee);
   const findParams = {
     from: params.from,
     target: params.to,
@@ -776,7 +780,7 @@ function normalizePriceImpact(value) {
   return Number.isFinite(n) ? n : 0;
 }
 async function buildSwapTx(params) {
-  const client = getClient(params.walletAddress);
+  const client = getClient(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,
@@ -787,7 +791,7 @@ async function buildSwapTx(params) {
   return outputCoin;
 }
 async function simulateSwap(params) {
-  const client = getClient(params.walletAddress);
+  const client = getClient(params.walletAddress, params.overlayFee);
   try {
     await client.devInspectTransactionBlock(params.tx);
     return { success: true };
@@ -795,13 +799,12 @@ async function simulateSwap(params) {
     return { success: false, error: err instanceof Error ? err.message : String(err) };
   }
 }
-exports.OVERLAY_FEE_RATE = void 0; var OVERLAY_FEE_RECEIVER, clientInstance;
+exports.OVERLAY_FEE_RATE = void 0; var clientCache;
 var init_cetus_swap = __esm({
   "src/protocols/cetus-swap.ts"() {
     init_token_registry();
     exports.OVERLAY_FEE_RATE = 1e-3;
-    OVERLAY_FEE_RECEIVER = process.env.T2000_TREASURY_ADDRESS ?? "0x3bb501b8300125dca59019247941a42af6b292a150ce3cfcce9449456be2ec91";
-    clientInstance = null;
+    clientCache = /* @__PURE__ */ new Map();
   }
 });
 
@@ -897,13 +900,13 @@ 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";
+var T2000_OVERLAY_FEE_WALLET = process.env.T2000_OVERLAY_FEE_WALLET ?? "0x5366efbf2b4fe5767fe2e78eb197aa5f5d138d88ac3333fbf3f80a1927da473a";
 var DEFAULT_NETWORK = "mainnet";
 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";
 var GAS_RESERVE_MIN = 0.05;
 
@@ -1445,57 +1448,6 @@ function extractCommands(txBlock) {
 // src/t2000.ts
 init_token_registry();
 
-// src/protocols/protocolFee.ts
-var FEE_RATES = {
-  save: SAVE_FEE_BPS,
-  borrow: BORROW_FEE_BPS
-};
-var OP_CODES = {
-  save: 0,
-  borrow: 2
-};
-function calculateFee(operation, amount) {
-  const bps = FEE_RATES[operation];
-  const feeAmount = amount * Number(bps) / Number(BPS_DENOMINATOR);
-  const rawAmount = usdcToRaw(feeAmount);
-  return {
-    amount: feeAmount,
-    asset: "USDC",
-    rate: Number(bps) / Number(BPS_DENOMINATOR),
-    rawAmount
-  };
-}
-function addCollectFeeToTx(tx, paymentCoin, operation) {
-  const bps = FEE_RATES[operation];
-  if (bps <= 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 {
-  }
-}
-
 // ../../node_modules/.pnpm/@mysten+bcs@2.0.2/node_modules/@mysten/bcs/dist/uleb.mjs
 function ulebEncode(num) {
   let bigNum = BigInt(num);
@@ -5279,9 +5231,6 @@ async function buildSaveTx(client, address, amount, options = {}) {
   const tx = new transactions.Transaction();
   tx.setSender(address);
   const coinObj = mergeCoins(tx, coins);
-  if (options.collectFee) {
-    addCollectFeeToTx(tx, coinObj, "save");
-  }
   const rawAmount = Math.min(Number(stableToRaw(amount, assetInfo.decimals)), Number(totalBalance));
   try {
     await Ce(tx, assetInfo.type, coinObj, {
@@ -5352,9 +5301,6 @@ async function addWithdrawToTx(tx, client, address, amount, 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) {
@@ -5385,9 +5331,6 @@ async function buildBorrowTx(client, address, amount, options = {}) {
   await refreshOracle(tx, client, address, { skipPythUpdate: options.skipPythUpdate });
   try {
     const borrowedCoin = await Xe(tx, assetInfo.type, rawAmount, sdkOptions(client));
-    if (options.collectFee) {
-      addCollectFeeToTx(tx, borrowedCoin, "borrow");
-    }
     tx.transferObjects([borrowedCoin], address);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -5395,6 +5338,22 @@ async function buildBorrowTx(client, address, amount, options = {}) {
   }
   return tx;
 }
+async function addBorrowToTx(tx, client, address, amount, options = {}) {
+  if (!amount || amount <= 0 || !Number.isFinite(amount)) {
+    throw new exports.T2000Error("INVALID_AMOUNT", "Borrow amount must be a positive number");
+  }
+  const asset = options.asset ?? "USDC";
+  const assetInfo = resolveAssetInfo(asset);
+  const rawAmount = Number(stableToRaw(amount, assetInfo.decimals));
+  await refreshOracle(tx, client, address, { 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 exports.T2000Error("PROTOCOL_UNAVAILABLE", `NAVI borrow failed: ${msg}`);
+  }
+}
 async function buildRepayTx(client, address, amount, options = {}) {
   if (!amount || amount <= 0 || !Number.isFinite(amount)) {
     throw new exports.T2000Error("INVALID_AMOUNT", "Repay amount must be a positive number");
@@ -5722,9 +5681,9 @@ var NaviAdapter = class {
   async getHealth(address) {
     return getHealthFactor(this.client, address);
   }
-  async buildSaveTx(address, amount, asset, options) {
+  async buildSaveTx(address, amount, asset) {
     const normalized = normalizeAsset(asset);
-    const tx = await buildSaveTx(this.client, address, amount, { ...options, asset: normalized });
+    const tx = await buildSaveTx(this.client, address, amount, { asset: normalized });
     return { tx };
   }
   async buildWithdrawTx(address, amount, asset, options) {
@@ -5762,9 +5721,16 @@ var NaviAdapter = class {
       skipPythUpdate: options?.skipPythUpdate
     });
   }
-  async addSaveToTx(tx, address, coin, asset, options) {
+  async addSaveToTx(tx, address, coin, asset) {
+    const normalized = normalizeAsset(asset);
+    return addSaveToTx(tx, this.client, address, coin, { asset: normalized });
+  }
+  async addBorrowToTx(tx, address, amount, asset, options) {
     const normalized = normalizeAsset(asset);
-    return addSaveToTx(tx, this.client, address, coin, { ...options, asset: normalized });
+    return addBorrowToTx(tx, this.client, address, amount, {
+      asset: normalized,
+      skipPythUpdate: options?.skipPythUpdate
+    });
   }
   async addRepayToTx(tx, address, coin, asset, options) {
     const normalized = normalizeAsset(asset);
@@ -6506,7 +6472,6 @@ var T2000 = class _T2000 extends eventemitter3.EventEmitter {
         );
       }
     }
-    const fee = calculateFee("save", amount);
     const saveAmount = amount;
     const adapter = await this.resolveLending(params.protocol, asset, "save");
     const canPTB = !!adapter.addSaveToTx;
@@ -6519,14 +6484,13 @@ var T2000 = class _T2000 extends eventemitter3.EventEmitter {
         const merged = this._mergeCoinsInTx(tx2, coins);
         const rawAmount = BigInt(Math.floor(saveAmount * 10 ** assetInfo.decimals));
         const [inputCoin] = tx2.splitCoins(merged, [rawAmount]);
-        await adapter.addSaveToTx(tx2, this._address, inputCoin, asset, { collectFee: true });
+        await adapter.addSaveToTx(tx2, this._address, inputCoin, asset);
         return tx2;
       }
-      const { tx } = await adapter.buildSaveTx(this._address, saveAmount, asset, { collectFee: true });
+      const { tx } = await adapter.buildSaveTx(this._address, saveAmount, asset);
       return tx;
     });
     const rates = await adapter.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++) {
@@ -6546,7 +6510,7 @@ var T2000 = class _T2000 extends eventemitter3.EventEmitter {
       tx: gasResult.digest,
       amount: saveAmount,
       apy: rates.saveApy,
-      fee: fee.amount,
+      fee: 0,
       gasCost: gasResult.gasCostSui,
       savingsBalance
     };
@@ -6809,21 +6773,19 @@ var T2000 = class _T2000 extends eventemitter3.EventEmitter {
         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 adapter.buildBorrowTx(this._address, borrowAmount, asset, { collectFee: true });
+      const { tx } = await adapter.buildBorrowTx(this._address, borrowAmount, asset);
       return tx;
     });
     const hf = await adapter.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
     };
@@ -7096,7 +7058,7 @@ var T2000 = class _T2000 extends eventemitter3.EventEmitter {
           if (coins.length === 0) throw new exports.T2000Error("INSUFFICIENT_BALANCE", "No USDC coins after swap");
           const merged = this._mergeCoinsInTx(tx, coins);
           const [inputCoin] = tx.splitCoins(merged, [gainedRaw]);
-          await adapter.addSaveToTx(tx, this._address, inputCoin, "USDC", { collectFee: false });
+          await adapter.addSaveToTx(tx, this._address, inputCoin, "USDC");
           return tx;
         });
         depositTx = depositResult.digest;
@@ -7224,6 +7186,37 @@ var T2000 = class _T2000 extends eventemitter3.EventEmitter {
 // src/index.ts
 init_errors();
 
+// src/protocols/protocolFee.ts
+var FEE_RATES = {
+  save: SAVE_FEE_BPS,
+  borrow: BORROW_FEE_BPS,
+  // Swap uses Cetus's overlay-fee mechanism (taken from output by the aggregator
+  // and transferred to `overlayFee.receiver`). We list the rate here for display
+  // / quote calculations only — `addFeeTransfer` is NOT called for swaps.
+  swap: 10n
+  // 0.1%
+};
+function calculateFee(operation, amount) {
+  const bps = FEE_RATES[operation];
+  const feeAmount = amount * Number(bps) / Number(BPS_DENOMINATOR);
+  const rawAmount = usdcToRaw(feeAmount);
+  return {
+    amount: feeAmount,
+    asset: "USDC",
+    rate: Number(bps) / Number(BPS_DENOMINATOR),
+    rawAmount
+  };
+}
+function addFeeTransfer(tx, paymentCoin, feeBps, receiver, amount) {
+  if (feeBps <= 0n) return;
+  if (amount <= 0) return;
+  const feeAmount = amount * Number(feeBps) / Number(BPS_DENOMINATOR);
+  const rawFee = usdcToRaw(feeAmount);
+  if (rawFee <= 0n) return;
+  const [feeCoin] = tx.splitCoins(paymentCoin, [tx.pure.u64(rawFee)]);
+  tx.transferObjects([feeCoin], tx.pure.address(receiver));
+}
+
 // src/protocols/financialSummary.ts
 var HF_WARN_THRESHOLD = 1.8;
 var HF_CRITICAL_THRESHOLD = 1.3;
@@ -7432,9 +7425,10 @@ exports.SUPPORTED_ASSETS = SUPPORTED_ASSETS;
 exports.SafeguardEnforcer = SafeguardEnforcer;
 exports.SafeguardError = SafeguardError;
 exports.T2000 = T2000;
+exports.T2000_OVERLAY_FEE_WALLET = T2000_OVERLAY_FEE_WALLET;
 exports.USDC_DECIMALS = USDC_DECIMALS;
 exports.ZkLoginSigner = ZkLoginSigner;
-exports.addCollectFeeToTx = addCollectFeeToTx;
+exports.addFeeTransfer = addFeeTransfer;
 exports.allDescriptors = allDescriptors;
 exports.assertAllowedAsset = assertAllowedAsset;
 exports.buildStakeVSuiTx = buildStakeVSuiTx;