@t2000/sdk 0.9.5 → 0.9.7

package/dist/adapters/index.js

@@ -1,5 +1,6 @@
 import { Transaction } from '@mysten/sui/transactions';
 import { bcs } from '@mysten/sui/bcs';
+import { SuiPriceServiceConnection, SuiPythClient } from '@pythnetwork/pyth-sui-js';
 import { AggregatorClient, Env } from '@cetusprotocol/aggregator-sdk';
 import { normalizeStructTag } from '@mysten/sui/utils';
 
@@ -257,6 +258,7 @@ 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 PYTH_HERMES_URL = "https://hermes.pyth.network/";
 var packageCache = null;
 function toBigInt(v) {
   if (typeof v === "bigint") return v;
@@ -351,18 +353,32 @@ 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;
+async function refreshStableOracles(tx, client, config, pools) {
+  const stableTypes = STABLE_ASSETS.map((a) => SUPPORTED_ASSETS[a].type);
+  const stablePools = pools.filter((p) => {
+    const ct = p.suiCoinType || p.coinType || "";
+    return stableTypes.some((t) => matchesCoinType(ct, t));
+  });
+  const feeds = (config.oracle.feeds ?? []).filter(
+    (f2) => stablePools.some((p) => p.id === f2.assetId)
+  );
+  if (feeds.length === 0) return;
+  const pythFeedIds = feeds.map((f2) => f2.pythPriceFeedId).filter(Boolean);
+  if (pythFeedIds.length > 0 && config.oracle.pythStateId && config.oracle.wormholeStateId) {
+    try {
+      const connection = new SuiPriceServiceConnection(PYTH_HERMES_URL);
+      const priceUpdateData = await connection.getPriceFeedsUpdateData(pythFeedIds);
+      const pythClient = new SuiPythClient(
+        client,
+        config.oracle.pythStateId,
+        config.oracle.wormholeStateId
+      );
+      await pythClient.updatePriceFeeds(tx, priceUpdateData, pythFeedIds);
+    } catch {
+    }
+  }
+  for (const pool of stablePools) {
     addOracleUpdate(tx, config, pool);
-    updated.add(pool.id);
   }
 }
 function rateToApy(rawRate) {
@@ -390,7 +406,7 @@ function compoundBalance(rawBalance, currentIndex) {
   const result = (rawBalance * BigInt(currentIndex) + half) / scale;
   return Number(result) / 10 ** NAVI_BALANCE_DECIMALS;
 }
-async function getUserState(client, address, includeZero = false) {
+async function getUserState(client, address) {
   const config = await getConfig();
   const tx = new Transaction();
   tx.moveCall({
@@ -408,7 +424,6 @@ async function getUserState(client, address, includeZero = false) {
     supplyBalance: toBigInt(s.supply_balance),
     borrowBalance: toBigInt(s.borrow_balance)
   }));
-  if (includeZero) return mapped;
   return mapped.filter((s) => s.supplyBalance !== 0n || s.borrowBalance !== 0n);
 }
 async function fetchCoins(client, owner, coinType) {
@@ -466,20 +481,20 @@ async function buildSaveTx(client, address, amount, options = {}) {
 async function buildWithdrawTx(client, address, amount, options = {}) {
   const asset = options.asset ?? "USDC";
   const assetInfo = SUPPORTED_ASSETS[asset];
-  const [config, pool, pools, allStates] = await Promise.all([
+  const [config, pool, pools, states] = await Promise.all([
     getConfig(),
     getPool(asset),
     getPools(),
-    getUserState(client, address, true)
+    getUserState(client, address)
   ]);
-  const assetState = allStates.find((s) => s.assetId === pool.id);
+  const assetState = states.find((s) => s.assetId === pool.id);
   const deposited = assetState ? compoundBalance(assetState.supplyBalance, pool.currentSupplyIndex) : 0;
   const effectiveAmount = Math.min(amount, Math.max(0, deposited - WITHDRAW_DUST_BUFFER));
   if (effectiveAmount <= 0) throw new T2000Error("NO_COLLATERAL", `Nothing to withdraw for ${assetInfo.displayName} on NAVI`);
   const rawAmount = Number(stableToRaw(effectiveAmount, assetInfo.decimals));
   const tx = new Transaction();
   tx.setSender(address);
-  addOracleUpdatesForPositions(tx, config, pools, allStates, pool);
+  await refreshStableOracles(tx, client, config, pools);
   const [balance] = tx.moveCall({
     target: `${config.package}::incentive_v3::withdraw_v2`,
     arguments: [
@@ -506,18 +521,18 @@ async function buildWithdrawTx(client, address, amount, options = {}) {
 async function addWithdrawToTx(tx, client, address, amount, options = {}) {
   const asset = options.asset ?? "USDC";
   const assetInfo = SUPPORTED_ASSETS[asset];
-  const [config, pool, pools, allStates] = await Promise.all([
+  const [config, pool, pools, states] = await Promise.all([
     getConfig(),
     getPool(asset),
     getPools(),
-    getUserState(client, address, true)
+    getUserState(client, address)
   ]);
-  const assetState = allStates.find((s) => s.assetId === pool.id);
+  const assetState = states.find((s) => s.assetId === pool.id);
   const deposited = assetState ? compoundBalance(assetState.supplyBalance, pool.currentSupplyIndex) : 0;
   const effectiveAmount = Math.min(amount, Math.max(0, deposited - WITHDRAW_DUST_BUFFER));
   if (effectiveAmount <= 0) throw new T2000Error("NO_COLLATERAL", `Nothing to withdraw for ${assetInfo.displayName} on NAVI`);
   const rawAmount = Number(stableToRaw(effectiveAmount, assetInfo.decimals));
-  addOracleUpdatesForPositions(tx, config, pools, allStates, pool);
+  await refreshStableOracles(tx, client, config, pools);
   const [balance] = tx.moveCall({
     target: `${config.package}::incentive_v3::withdraw_v2`,
     arguments: [
@@ -598,15 +613,14 @@ 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, pools, allStates] = await Promise.all([
+  const [config, pool, pools] = await Promise.all([
     getConfig(),
     getPool(asset),
-    getPools(),
-    getUserState(client, address, true)
+    getPools()
   ]);
   const tx = new Transaction();
   tx.setSender(address);
-  addOracleUpdatesForPositions(tx, config, pools, allStates, pool);
+  await refreshStableOracles(tx, client, config, pools);
   const [balance] = tx.moveCall({
     target: `${config.package}::incentive_v3::borrow_v2`,
     arguments: [