@t2000/sdk 0.9.5 → 0.9.6

package/dist/adapters/index.js

@@ -351,18 +351,14 @@ function addOracleUpdate(tx, config, pool) {
     ]
   });
 }
-function addOracleUpdatesForPositions(tx, config, pools, states, primaryPool) {
+function addOracleUpdatesForAllPools(tx, config, pools) {
   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);
+  for (const feed of config.oracle.feeds ?? []) {
+    if (updated.has(feed.assetId)) continue;
+    const pool = pools.find((p) => p.id === feed.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);
+    updated.add(feed.assetId);
   }
 }
 function rateToApy(rawRate) {
@@ -390,7 +386,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 +404,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 +461,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);
+  addOracleUpdatesForAllPools(tx, config, pools);
   const [balance] = tx.moveCall({
     target: `${config.package}::incentive_v3::withdraw_v2`,
     arguments: [
@@ -506,18 +501,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);
+  addOracleUpdatesForAllPools(tx, config, pools);
   const [balance] = tx.moveCall({
     target: `${config.package}::incentive_v3::withdraw_v2`,
     arguments: [
@@ -598,15 +593,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);
+  addOracleUpdatesForAllPools(tx, config, pools);
   const [balance] = tx.moveCall({
     target: `${config.package}::incentive_v3::borrow_v2`,
     arguments: [