@t2000/sdk 0.8.1 → 0.8.4

package/dist/index.js

@@ -536,6 +536,13 @@ function matchesCoinType(poolType, targetType) {
   const targetSuffix = targetType.split("::").slice(1).join("::").toLowerCase();
   return poolSuffix === targetSuffix;
 }
+function resolvePoolSymbol(pool) {
+  const coinType = pool.suiCoinType || pool.coinType || "";
+  for (const [key, info] of Object.entries(SUPPORTED_ASSETS)) {
+    if (matchesCoinType(coinType, info.type)) return key;
+  }
+  return pool.token?.symbol ?? "UNKNOWN";
+}
 async function getPool(asset = "USDC") {
   const pools = await getPools();
   const targetType = SUPPORTED_ASSETS[asset].type;
@@ -568,6 +575,20 @@ function addOracleUpdate(tx, config, pool) {
     ]
   });
 }
+function addOracleUpdatesForPositions(tx, config, pools, states, primaryPool) {
+  const updated = /* @__PURE__ */ new Set();
+  addOracleUpdate(tx, config, primaryPool);
+  updated.add(primaryPool.id);
+  for (const state of states) {
+    if (updated.has(state.assetId)) continue;
+    const pool = pools.find((p) => p.id === state.assetId);
+    if (!pool) continue;
+    const feed = config.oracle.feeds?.find((f2) => f2.assetId === pool.id);
+    if (!feed) continue;
+    addOracleUpdate(tx, config, pool);
+    updated.add(pool.id);
+  }
+}
 function rateToApy(rawRate) {
   if (!rawRate || rawRate === "0") return 0;
   return Number(BigInt(rawRate)) / 10 ** RATE_DECIMALS * 100;
@@ -680,7 +701,7 @@ async function buildWithdrawTx(client, address, amount, options = {}) {
   const rawAmount = Number(stableToRaw(effectiveAmount, assetInfo.decimals));
   const tx = new Transaction();
   tx.setSender(address);
-  addOracleUpdate(tx, config, pool);
+  addOracleUpdatesForPositions(tx, config, pools, states, pool);
   const [balance] = tx.moveCall({
     target: `${config.package}::incentive_v3::withdraw_v2`,
     arguments: [
@@ -711,10 +732,15 @@ async function buildBorrowTx(client, address, amount, options = {}) {
   const asset = options.asset ?? "USDC";
   const assetInfo = SUPPORTED_ASSETS[asset];
   const rawAmount = Number(stableToRaw(amount, assetInfo.decimals));
-  const [config, pool] = await Promise.all([getConfig(), getPool(asset)]);
+  const [config, pool, pools, states] = await Promise.all([
+    getConfig(),
+    getPool(asset),
+    getPools(),
+    getUserState(client, address)
+  ]);
   const tx = new Transaction();
   tx.setSender(address);
-  addOracleUpdate(tx, config, pool);
+  addOracleUpdatesForPositions(tx, config, pools, states, pool);
   const [balance] = tx.moveCall({
     target: `${config.package}::incentive_v3::borrow_v2`,
     arguments: [
@@ -872,7 +898,7 @@ async function getPositions(client, addressOrKeypair) {
   for (const state of states) {
     const pool = pools.find((p) => p.id === state.assetId);
     if (!pool) continue;
-    const symbol = pool.token?.symbol ?? "UNKNOWN";
+    const symbol = resolvePoolSymbol(pool);
     const supplyBal = compoundBalance(state.supplyBalance, pool.currentSupplyIndex);
     const borrowBal = compoundBalance(state.borrowBalance, pool.currentBorrowIndex);
     if (supplyBal > 1e-4) {
@@ -1323,10 +1349,10 @@ var NaviAdapter = class {
   }
   async getRates(asset) {
     const rates = await getRates(this.client);
-    const key = asset.toUpperCase();
-    const r = rates[key];
+    const normalized = normalizeAsset(asset);
+    const r = rates[normalized];
     if (!r) throw new T2000Error("ASSET_NOT_SUPPORTED", `NAVI does not support ${asset}`);
-    return { asset, saveApy: r.saveApy, borrowApy: r.borrowApy };
+    return { asset: normalized, saveApy: r.saveApy, borrowApy: r.borrowApy };
   }
   async getPositions(address) {
     const result = await getPositions(this.client, address);
@@ -1339,22 +1365,22 @@ var NaviAdapter = class {
     return getHealthFactor(this.client, address);
   }
   async buildSaveTx(address, amount, asset, options) {
-    const stableAsset = asset?.toUpperCase() === "USDC" ? "USDC" : asset;
+    const stableAsset = normalizeAsset(asset);
     const tx = await buildSaveTx(this.client, address, amount, { ...options, asset: stableAsset });
     return { tx };
   }
   async buildWithdrawTx(address, amount, asset) {
-    const stableAsset = asset?.toUpperCase() === "USDC" ? "USDC" : asset;
+    const stableAsset = normalizeAsset(asset);
     const result = await buildWithdrawTx(this.client, address, amount, { asset: stableAsset });
     return { tx: result.tx, effectiveAmount: result.effectiveAmount };
   }
   async buildBorrowTx(address, amount, asset, options) {
-    const stableAsset = asset?.toUpperCase() === "USDC" ? "USDC" : asset;
+    const stableAsset = normalizeAsset(asset);
     const tx = await buildBorrowTx(this.client, address, amount, { ...options, asset: stableAsset });
     return { tx };
   }
   async buildRepayTx(address, amount, asset) {
-    const stableAsset = asset?.toUpperCase() === "USDC" ? "USDC" : asset;
+    const stableAsset = normalizeAsset(asset);
     const tx = await buildRepayTx(this.client, address, amount, { asset: stableAsset });
     return { tx };
   }