@t2000/sdk 0.5.6 → 0.6.2

package/dist/index.cjs

@@ -426,8 +426,6 @@ async function reportFee(agentAddress, operation, feeAmount, feeRate, txDigest)
   } catch {
   }
 }
-
-// src/protocols/navi.ts
 var USDC_TYPE = SUPPORTED_ASSETS.USDC.type;
 var RATE_DECIMALS = 27;
 var LTV_DECIMALS = 27;
@@ -438,6 +436,8 @@ var SUI_SYSTEM_STATE = "0x05";
 var NAVI_BALANCE_DECIMALS = 9;
 var CONFIG_API = "https://open-api.naviprotocol.io/api/navi/config?env=prod";
 var POOLS_API = "https://open-api.naviprotocol.io/api/navi/pools?env=prod";
+var PACKAGE_API = "https://open-api.naviprotocol.io/api/package";
+var packageCache = null;
 function toBigInt(v) {
   if (typeof v === "bigint") return v;
   return BigInt(String(v));
@@ -462,9 +462,22 @@ async function fetchJson(url) {
   const json = await res.json();
   return json.data ?? json;
 }
+async function getLatestPackageId() {
+  if (packageCache && Date.now() - packageCache.ts < CACHE_TTL) return packageCache.id;
+  const res = await fetch(PACKAGE_API);
+  if (!res.ok) throw new T2000Error("PROTOCOL_UNAVAILABLE", `NAVI package API error: ${res.status}`);
+  const json = await res.json();
+  if (!json.packageId) throw new T2000Error("PROTOCOL_UNAVAILABLE", "NAVI package API returned no packageId");
+  packageCache = { id: json.packageId, ts: Date.now() };
+  return json.packageId;
+}
 async function getConfig(fresh = false) {
   if (configCache && !fresh && Date.now() - configCache.ts < CACHE_TTL) return configCache.data;
-  const data = await fetchJson(CONFIG_API);
+  const [data, latestPkg] = await Promise.all([
+    fetchJson(CONFIG_API),
+    getLatestPackageId()
+  ]);
+  data.package = latestPkg;
   configCache = { data, ts: Date.now() };
   return data;
 }
@@ -482,6 +495,24 @@ async function getUsdcPool() {
   if (!usdc) throw new T2000Error("PROTOCOL_UNAVAILABLE", "USDC pool not found on NAVI");
   return usdc;
 }
+function addOracleUpdate(tx, config, pool) {
+  const feed = config.oracle.feeds?.find((f2) => f2.assetId === pool.id);
+  if (!feed) {
+    throw new T2000Error("PROTOCOL_UNAVAILABLE", `Oracle feed not found for asset ${pool.token?.symbol ?? pool.id}`);
+  }
+  tx.moveCall({
+    target: `${config.oracle.packageId}::oracle_pro::update_single_price_v2`,
+    arguments: [
+      tx.object(CLOCK),
+      tx.object(config.oracle.oracleConfig),
+      tx.object(config.oracle.priceOracle),
+      tx.object(config.oracle.supraOracleHolder),
+      tx.object(feed.pythPriceInfoObject),
+      tx.object(config.oracle.switchboardAggregator),
+      tx.pure.address(feed.feedId)
+    ]
+  });
+}
 function rateToApy(rawRate) {
   if (!rawRate || rawRate === "0") return 0;
   return Number(BigInt(rawRate)) / 10 ** RATE_DECIMALS * 100;
@@ -504,7 +535,7 @@ function compoundBalance(rawBalance, currentIndex) {
   if (!rawBalance || !currentIndex || currentIndex === "0") return 0;
   const scale = BigInt("1" + "0".repeat(RATE_DECIMALS));
   const half = scale / 2n;
-  const result = (rawBalance * scale + half) / BigInt(currentIndex);
+  const result = (rawBalance * BigInt(currentIndex) + half) / scale;
   return Number(result) / 10 ** NAVI_BALANCE_DECIMALS;
 }
 async function getUserState(client, address) {
@@ -538,23 +569,25 @@ async function fetchCoins(client, owner, coinType) {
   }
   return all;
 }
-function mergeCoinsPtb(tx, coins, amount) {
+function mergeCoins(tx, coins) {
   if (coins.length === 0) throw new T2000Error("INSUFFICIENT_BALANCE", "No coins to merge");
   const primary = tx.object(coins[0].coinObjectId);
   if (coins.length > 1) {
     tx.mergeCoins(primary, coins.slice(1).map((c) => tx.object(c.coinObjectId)));
   }
-  const [split] = tx.splitCoins(primary, [amount]);
-  return split;
+  return primary;
 }
 async function buildSaveTx(client, address, amount, options = {}) {
+  if (!amount || amount <= 0 || !Number.isFinite(amount)) {
+    throw new T2000Error("INVALID_AMOUNT", "Save amount must be a positive number");
+  }
   const rawAmount = Number(usdcToRaw(amount));
   const [config, pool] = await Promise.all([getConfig(), getUsdcPool()]);
   const coins = await fetchCoins(client, address, USDC_TYPE);
   if (coins.length === 0) throw new T2000Error("INSUFFICIENT_BALANCE", "No USDC coins found");
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  const coinObj = mergeCoinsPtb(tx, coins, rawAmount);
+  const coinObj = mergeCoins(tx, coins);
   if (options.collectFee) {
     addCollectFeeToTx(tx, coinObj, "save");
   }
@@ -588,8 +621,9 @@ async function buildWithdrawTx(client, address, amount) {
   const rawAmount = Number(usdcToRaw(effectiveAmount));
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  tx.moveCall({
-    target: `${config.package}::incentive_v3::entry_withdraw_v2`,
+  addOracleUpdate(tx, config, pool);
+  const [balance] = tx.moveCall({
+    target: `${config.package}::incentive_v3::withdraw_v2`,
     arguments: [
       tx.object(CLOCK),
       tx.object(config.oracle.priceOracle),
@@ -600,17 +634,28 @@ async function buildWithdrawTx(client, address, amount) {
       tx.object(config.incentiveV2),
       tx.object(config.incentiveV3),
       tx.object(SUI_SYSTEM_STATE)
-    ]
+    ],
+    typeArguments: [pool.suiCoinType]
+  });
+  const [coin] = tx.moveCall({
+    target: "0x2::coin::from_balance",
+    arguments: [balance],
+    typeArguments: [pool.suiCoinType]
   });
+  tx.transferObjects([coin], address);
   return { tx, effectiveAmount };
 }
 async function buildBorrowTx(client, address, amount, options = {}) {
+  if (!amount || amount <= 0 || !Number.isFinite(amount)) {
+    throw new T2000Error("INVALID_AMOUNT", "Borrow amount must be a positive number");
+  }
   const rawAmount = Number(usdcToRaw(amount));
   const [config, pool] = await Promise.all([getConfig(), getUsdcPool()]);
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  tx.moveCall({
-    target: `${config.package}::incentive_v3::entry_borrow_v2`,
+  addOracleUpdate(tx, config, pool);
+  const [balance] = tx.moveCall({
+    target: `${config.package}::incentive_v3::borrow_v2`,
     arguments: [
       tx.object(CLOCK),
       tx.object(config.oracle.priceOracle),
@@ -621,18 +666,32 @@ async function buildBorrowTx(client, address, amount, options = {}) {
       tx.object(config.incentiveV2),
       tx.object(config.incentiveV3),
       tx.object(SUI_SYSTEM_STATE)
-    ]
+    ],
+    typeArguments: [pool.suiCoinType]
+  });
+  const [borrowedCoin] = tx.moveCall({
+    target: "0x2::coin::from_balance",
+    arguments: [balance],
+    typeArguments: [pool.suiCoinType]
   });
+  if (options.collectFee) {
+    addCollectFeeToTx(tx, borrowedCoin, "borrow");
+  }
+  tx.transferObjects([borrowedCoin], address);
   return tx;
 }
 async function buildRepayTx(client, address, amount) {
+  if (!amount || amount <= 0 || !Number.isFinite(amount)) {
+    throw new T2000Error("INVALID_AMOUNT", "Repay amount must be a positive number");
+  }
   const rawAmount = Number(usdcToRaw(amount));
   const [config, pool] = await Promise.all([getConfig(), getUsdcPool()]);
   const coins = await fetchCoins(client, address, USDC_TYPE);
   if (coins.length === 0) throw new T2000Error("INSUFFICIENT_BALANCE", "No USDC coins to repay with");
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  const coinObj = mergeCoinsPtb(tx, coins, rawAmount);
+  addOracleUpdate(tx, config, pool);
+  const coinObj = mergeCoins(tx, coins);
   tx.moveCall({
     target: `${config.package}::incentive_v3::entry_repay`,
     arguments: [
@@ -1002,7 +1061,7 @@ var ProtocolRegistry = class {
       }
     }
     if (candidates.length === 0) {
-      throw new Error(`No lending adapter supports saving ${asset}`);
+      throw new T2000Error("ASSET_NOT_SUPPORTED", `No lending adapter supports saving ${asset}`);
     }
     candidates.sort((a, b) => b.rate.saveApy - a.rate.saveApy);
     return candidates[0];
@@ -1020,7 +1079,7 @@ var ProtocolRegistry = class {
       }
     }
     if (candidates.length === 0) {
-      throw new Error(`No lending adapter supports borrowing ${asset}`);
+      throw new T2000Error("ASSET_NOT_SUPPORTED", `No lending adapter supports borrowing ${asset}`);
     }
     candidates.sort((a, b) => a.rate.borrowApy - b.rate.borrowApy);
     return candidates[0];
@@ -1037,7 +1096,7 @@ var ProtocolRegistry = class {
       }
     }
     if (candidates.length === 0) {
-      throw new Error(`No swap adapter supports ${from} \u2192 ${to}`);
+      throw new T2000Error("ASSET_NOT_SUPPORTED", `No swap adapter supports ${from} \u2192 ${to}`);
     }
     candidates.sort((a, b) => b.quote.expectedOutput - a.quote.expectedOutput);
     return candidates[0];
@@ -1100,7 +1159,7 @@ var NaviAdapter = class {
     const rates = await getRates(this.client);
     const key = asset.toUpperCase();
     const r = rates[key];
-    if (!r) throw new Error(`NAVI does not support ${asset}`);
+    if (!r) throw new T2000Error("ASSET_NOT_SUPPORTED", `NAVI does not support ${asset}`);
     return { asset, saveApy: r.saveApy, borrowApy: r.borrowApy };
   }
   async getPositions(address) {
@@ -2303,7 +2362,10 @@ var T2000 = class _T2000 extends eventemitter3.EventEmitter {
     return { positions };
   }
   async rates() {
-    return getRates(this.client);
+    const allRatesResult = await this.registry.allRates("USDC");
+    if (allRatesResult.length === 0) return { USDC: { saveApy: 0, borrowApy: 0 } };
+    const best = allRatesResult.reduce((a, b) => b.rates.saveApy > a.rates.saveApy ? b : a);
+    return { USDC: { saveApy: best.rates.saveApy, borrowApy: best.rates.borrowApy } };
   }
   async allRates(asset = "USDC") {
     return this.registry.allRates(asset);