@naviprotocol/lending 1.4.0-emode.17 → 1.4.0-emode.19

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import { Transaction as U } from "@mysten/sui/transactions";
 import { bcs as d, toHex as re, fromHex as ae } from "@mysten/bcs";
-import { SuiClient as ie, getFullnodeUrl as ce } from "@mysten/sui/client";
+import { SuiClient as ce, getFullnodeUrl as ie } from "@mysten/sui/client";
 import se from "lodash.camelcase";
 import { normalizeStructTag as ue } from "@mysten/sui/utils";
 import { SuiPriceServiceConnection as Y, SuiPythClient as le } from "@pythnetwork/pyth-sui-js";
@@ -129,7 +129,7 @@ const W = d.bytes(32).transform({
   borrow_balance: d.u256(),
   /** User's current supply balance */
   supply_balance: d.u256()
-}), me = "1.4.0-emode.17", $ = {
+}), me = "1.4.0-emode.19", $ = {
   version: me
 }, ye = $.version, ge = () => {
   if (typeof process < "u" && process.versions && process.versions.node)
@@ -143,15 +143,15 @@ const W = d.bytes(32).transform({
 }, fe = () => {
   let e = "";
   return typeof process < "u" && process.versions && process.versions.node && (e = `lending/${ye} (${ge()})`), e;
-}, H = fe(), S = new ie({
-  url: ce("mainnet")
+}, H = fe(), S = new ce({
+  url: ie("mainnet")
 });
 function J(e) {
   const o = [];
   return e.forEach((n, r) => {
     const t = r === e.length - 1;
     if (typeof n == "object" && n !== null && t) {
-      const { client: a, disableCache: c, cacheTime: i, ...s } = n;
+      const { client: a, disableCache: i, cacheTime: c, ...s } = n;
       o.push(s);
     } else
       o.push(n);
@@ -170,10 +170,10 @@ function A(e) {
   let o = {};
   return (...n) => {
     const r = n[n.length - 1], t = J(n), a = o[t];
-    return !r?.disableCache && typeof a?.data < "u" && (typeof r?.cacheTime > "u" || r.cacheTime > Date.now() - a.cacheAt) ? a.data : e(...n).then((c) => (o[t] = {
-      data: c,
+    return !r?.disableCache && typeof a?.data < "u" && (typeof r?.cacheTime > "u" || r.cacheTime > Date.now() - a.cacheAt) ? a.data : e(...n).then((i) => (o[t] = {
+      data: i,
       cacheAt: Date.now()
-    }, c));
+    }, i));
   };
 }
 function F(e) {
@@ -260,16 +260,16 @@ const R = A(
         (t) => t.key
       )}`, r = await fetch(n, { headers: V }).then((t) => t.json());
       return r.data.forEach((t) => {
-        const c = r.meta.emodes.filter((f) => {
+        const i = r.meta.emodes.filter((f) => {
           const _ = j(f.marketId);
           return t.market === _.key && f.isActive;
         }).filter((f) => !!f.assets.find((_) => _.assetId === t.id));
-        t.emodes = c;
-        const i = l(t.totalSupplyAmount).div(Math.pow(10, 9)).decimalPlaces(t.token.decimals, l.ROUND_DOWN).toString(), s = l(t.borrowedAmount).shiftedBy(-9).decimalPlaces(t.token.decimals, l.ROUND_DOWN).toString(), u = l(i).multipliedBy(t.oracle.price).toString(), m = l(s).multipliedBy(t.oracle.price).toString(), g = l(t.supplyCapCeiling).shiftedBy(-27).decimalPlaces(t.token.decimals, l.ROUND_DOWN).toString(), v = l.max(
+        t.emodes = i;
+        const c = l(t.totalSupplyAmount).div(Math.pow(10, 9)).decimalPlaces(t.token.decimals, l.ROUND_DOWN).toString(), s = l(t.borrowedAmount).shiftedBy(-9).decimalPlaces(t.token.decimals, l.ROUND_DOWN).toString(), u = l(c).multipliedBy(t.oracle.price).toString(), m = l(s).multipliedBy(t.oracle.price).toString(), g = l(t.supplyCapCeiling).shiftedBy(-27).decimalPlaces(t.token.decimals, l.ROUND_DOWN).toString(), v = l.max(
           l(t.borrowedAmount),
           l(t.validBorrowAmount)
         ).shiftedBy(-9).decimalPlaces(t.token.decimals, l.ROUND_DOWN).toString(), w = l(g).multipliedBy(t.oracle.price).toString(), p = l(v).multipliedBy(t.oracle.price).toString();
-        t.poolSupplyAmount = i, t.poolBorrowAmount = s, t.poolSupplyValue = u, t.poolBorrowValue = m, t.poolSupplyCapAmount = g, t.poolBorrowCapAmount = v, t.poolSupplyCapValue = w, t.poolBorrowCapValue = p;
+        t.poolSupplyAmount = c, t.poolBorrowAmount = s, t.poolSupplyValue = u, t.poolBorrowValue = m, t.poolSupplyCapAmount = g, t.poolBorrowCapAmount = v, t.poolSupplyCapValue = w, t.poolBorrowCapValue = p;
       }), r.data;
     }
   )
@@ -312,14 +312,14 @@ async function be(e, o, n, r) {
   }), a = await B(o, r);
   if (a?.deprecatedAt && Date.now() > a.deprecatedAt)
     throw new Error(`The lending pool for coinType ${a.suiCoinType} has been deprecated.`);
-  const c = typeof n == "object" && n.$kind === "GasCoin";
-  if (b(a.suiCoinType) === b("0x2::sui::SUI") && c) {
+  const i = typeof n == "object" && n.$kind === "GasCoin";
+  if (b(a.suiCoinType) === b("0x2::sui::SUI") && i) {
     if (!r?.amount)
       throw new Error("Amount is required for sui coin");
     n = e.splitCoins(n, [r.amount]);
   }
-  let i;
-  return typeof r?.amount < "u" ? i = y(r.amount, e.pure.u64) : i = e.moveCall({
+  let c;
+  return typeof r?.amount < "u" ? c = y(r.amount, e.pure.u64) : c = e.moveCall({
     target: "0x2::coin::value",
     arguments: [y(n, e.object)],
     typeArguments: [a.suiCoinType]
@@ -344,7 +344,7 @@ async function be(e, o, n, r) {
       e.object(a.contract.pool),
       e.pure.u8(a.id),
       y(n, e.object),
-      i,
+      c,
       e.object(t.incentiveV2),
       e.object(t.incentiveV3)
     ],
@@ -358,8 +358,8 @@ async function Ye(e, o, n, r) {
   const t = await k({
     ...r,
     cacheTime: h
-  }), a = await B(o, r), c = y(n, e.pure.u64);
-  let i;
+  }), a = await B(o, r), i = y(n, e.pure.u64);
+  let c;
   if (t.version === 1)
     if (r?.accountCap) {
       const [u] = e.moveCall({
@@ -370,14 +370,14 @@ async function Ye(e, o, n, r) {
           e.object(t.storage),
           e.object(a.contract.pool),
           e.pure.u8(a.id),
-          c,
+          i,
           e.object(t.incentiveV2),
           e.object(t.incentiveV3),
           y(r.accountCap, e.object)
         ],
         typeArguments: [a.suiCoinType]
       });
-      i = u;
+      c = u;
     } else {
       const [u] = e.moveCall({
         target: `${t.package}::incentive_v3::withdraw`,
@@ -387,13 +387,13 @@ async function Ye(e, o, n, r) {
           e.object(t.storage),
           e.object(a.contract.pool),
           e.pure.u8(a.id),
-          c,
+          i,
           e.object(t.incentiveV2),
           e.object(t.incentiveV3)
         ],
         typeArguments: [a.suiCoinType]
       });
-      i = u;
+      c = u;
     }
   else if (r?.accountCap) {
     const [u] = e.moveCall({
@@ -404,7 +404,7 @@ async function Ye(e, o, n, r) {
         e.object(t.storage),
         e.object(a.contract.pool),
         e.pure.u8(a.id),
-        c,
+        i,
         e.object(t.incentiveV2),
         e.object(t.incentiveV3),
         y(r.accountCap, e.object),
@@ -412,7 +412,7 @@ async function Ye(e, o, n, r) {
       ],
       typeArguments: [a.suiCoinType]
     });
-    i = u;
+    c = u;
   } else {
     const [u] = e.moveCall({
       target: `${t.package}::incentive_v3::withdraw_v2`,
@@ -422,18 +422,18 @@ async function Ye(e, o, n, r) {
         e.object(t.storage),
         e.object(a.contract.pool),
         e.pure.u8(a.id),
-        c,
+        i,
         e.object(t.incentiveV2),
         e.object(t.incentiveV3),
         e.object("0x05")
       ],
       typeArguments: [a.suiCoinType]
     });
-    i = u;
+    c = u;
   }
   return e.moveCall({
     target: "0x2::coin::from_balance",
-    arguments: [i],
+    arguments: [c],
     typeArguments: [a.suiCoinType]
   });
 }
@@ -444,8 +444,8 @@ async function Je(e, o, n, r) {
   }), a = await B(o, r);
   if (a?.deprecatedAt && Date.now() > a.deprecatedAt)
     throw new Error(`The lending pool for coinType ${a.suiCoinType} has been deprecated.`);
-  const c = y(n, e.pure.u64);
-  let i;
+  const i = y(n, e.pure.u64);
+  let c;
   if (t.version === 1)
     if (r?.accountCap) {
       const [u] = e.moveCall({
@@ -456,14 +456,14 @@ async function Je(e, o, n, r) {
           e.object(t.storage),
           e.object(a.contract.pool),
           e.pure.u8(a.id),
-          c,
+          i,
           e.object(t.incentiveV2),
           e.object(t.incentiveV3),
           y(r.accountCap, e.object)
         ],
         typeArguments: [a.suiCoinType]
       });
-      i = u;
+      c = u;
     } else {
       const [u] = e.moveCall({
         target: `${t.package}::incentive_v3::borrow`,
@@ -473,13 +473,13 @@ async function Je(e, o, n, r) {
           e.object(t.storage),
           e.object(a.contract.pool),
           e.pure.u8(a.id),
-          c,
+          i,
           e.object(t.incentiveV2),
           e.object(t.incentiveV3)
         ],
         typeArguments: [a.suiCoinType]
       });
-      i = u;
+      c = u;
     }
   else if (r?.accountCap) {
     const [u] = e.moveCall({
@@ -490,7 +490,7 @@ async function Je(e, o, n, r) {
         e.object(t.storage),
         e.object(a.contract.pool),
         e.pure.u8(a.id),
-        c,
+        i,
         e.object(t.incentiveV2),
         e.object(t.incentiveV3),
         y(r.accountCap, e.object),
@@ -498,7 +498,7 @@ async function Je(e, o, n, r) {
       ],
       typeArguments: [a.suiCoinType]
     });
-    i = u;
+    c = u;
   } else {
     const [u] = e.moveCall({
       target: `${t.package}::incentive_v3::borrow_v2`,
@@ -508,18 +508,18 @@ async function Je(e, o, n, r) {
         e.object(t.storage),
         e.object(a.contract.pool),
         e.pure.u8(a.id),
-        c,
+        i,
         e.object(t.incentiveV2),
         e.object(t.incentiveV3),
         e.object("0x05")
       ],
       typeArguments: [a.suiCoinType]
     });
-    i = u;
+    c = u;
   }
   return e.moveCall({
     target: "0x2::coin::from_balance",
-    arguments: [e.object(i)],
+    arguments: [e.object(c)],
     typeArguments: [a.suiCoinType]
   });
 }
@@ -527,14 +527,14 @@ async function Qe(e, o, n, r) {
   const t = await k({
     ...r,
     cacheTime: h
-  }), a = await B(o, r), c = typeof n == "object" && n.$kind === "GasCoin";
-  if (b(a.suiCoinType) === b("0x2::sui::SUI") && c) {
+  }), a = await B(o, r), i = typeof n == "object" && n.$kind === "GasCoin";
+  if (b(a.suiCoinType) === b("0x2::sui::SUI") && i) {
     if (!r?.amount)
       throw new Error("Amount is required for sui coin");
     n = e.splitCoins(n, [r.amount]);
   }
-  let i;
-  if (typeof r?.amount < "u" ? i = y(r.amount, e.pure.u64) : i = e.moveCall({
+  let c;
+  if (typeof r?.amount < "u" ? c = y(r.amount, e.pure.u64) : c = e.moveCall({
     target: "0x2::coin::value",
     arguments: [y(n, e.object)],
     typeArguments: [a.suiCoinType]
@@ -569,7 +569,7 @@ async function Qe(e, o, n, r) {
         e.object(a.contract.pool),
         e.pure.u8(a.id),
         y(n, e.object),
-        i,
+        c,
         e.object(t.incentiveV2),
         e.object(t.incentiveV3)
       ],
@@ -584,21 +584,21 @@ const Xe = A(
       });
       if (e?.address && typeof e?.asset < "u")
         try {
-          const t = await B(e.asset, e), a = e?.client ?? S, c = new U();
-          c.moveCall({
+          const t = await B(e.asset, e), a = e?.client ?? S, i = new U();
+          i.moveCall({
             target: `${o.package}::incentive_v3::get_borrow_fee_v2`,
             arguments: [
-              c.object(o.incentiveV3),
-              c.pure.address(e.address),
-              c.pure.u8(t.id),
-              c.pure.u64(1e4)
+              i.object(o.incentiveV3),
+              i.pure.address(e.address),
+              i.pure.u8(t.id),
+              i.pure.u64(1e4)
             ],
             typeArguments: []
           });
-          const i = await a.devInspectTransactionBlock({
-            transactionBlock: c,
+          const c = await a.devInspectTransactionBlock({
+            transactionBlock: i,
             sender: e.address
-          }), s = O(i, [C.u64()]);
+          }), s = O(c, [C.u64()]);
           return (Number(s[0]) || 0) / 100;
         } catch (t) {
           console.error(t);
@@ -629,40 +629,40 @@ class ke {
   }
   addPools(o) {
     const n = q(this.pools), r = z(this.emodes), t = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Set();
-    let c = l(0), i = l(0);
+    let i = l(0), c = l(0);
     o.forEach((s) => {
       if (!this.checkMarket(s.market)) {
         console.warn(`Pool is not in market ${this.config.name}`, s);
         return;
       }
-      n[s.uniqueId] || this.pools.push(s), s.emodes.forEach((m) => {
+      n[s.uniqueId] || this.pools.push(s), s?.emodes?.forEach((m) => {
         r[m.uniqueId] || this.emodes.push(m), m.assets.forEach((g) => {
           g.isDebt && t.add(s.uniqueId), g.isCollateral && a.add(s.uniqueId);
         });
-      }), i = i.plus(s.poolBorrowValue), c = c.plus(s.poolSupplyValue);
+      }), c = c.plus(s.poolBorrowValue), i = i.plus(s.poolSupplyValue);
     }), this.poolMap = q(this.pools, "id"), this.emodeMap = z(this.emodes, "emodeId"), this.emodes.forEach((s) => {
       const u = this.getEModePools(s.emodeId);
       this.emodePools.push(...u);
     }), this._overview = {
-      marketTotalSupplyValue: c.toString(),
-      marketTotalBorrowValue: i.toString()
+      marketTotalSupplyValue: i.toString(),
+      marketTotalBorrowValue: c.toString()
     }, this.emodeBorrowablePools = this.pools.filter((s) => t.has(s.uniqueId)), this.emodeSupplyablePools = this.pools.filter((s) => a.has(s.uniqueId));
   }
   getEMode(o) {
     return this.emodeMap[o] || null;
   }
   getEModeRelatePools(o, n) {
-    const { collateral: r, debt: t, emodeId: a } = n || {}, c = [];
-    return o.emodes.forEach((i) => {
-      typeof a == "number" && a !== i.emodeId || i.assets.forEach((s) => {
-        typeof r == "boolean" && r && s.isCollateral && s.assetId === o.id && c.push(this.poolMap[s.assetId]), typeof t == "boolean" && t && s.isDebt && s.assetId === o.id && c.push(this.poolMap[s.assetId]);
+    const { collateral: r, debt: t, emodeId: a } = n || {}, i = [];
+    return o.emodes.forEach((c) => {
+      typeof a == "number" && a !== c.emodeId || c.assets.forEach((s) => {
+        typeof r == "boolean" && r && s.isCollateral && s.assetId === o.id && i.push(this.poolMap[s.assetId]), typeof t == "boolean" && t && s.isDebt && s.assetId === o.id && i.push(this.poolMap[s.assetId]);
       });
-    }), c;
+    }), i;
   }
   getEModePools(o) {
     const n = this.getEMode(o);
     return n ? n.assets.map((t) => t.assetId).map((t) => this.poolMap[t]).filter((t) => !!t).map((t) => {
-      const a = n.assets.find((c) => c.assetId === t.id);
+      const a = n.assets.find((i) => i.assetId === t.id);
       return {
         ...t,
         emode: {
@@ -692,7 +692,7 @@ const j = (e) => {
         markets: e
       });
       return e.map((r) => {
-        const t = j(r), a = n.filter((c) => c.market === t.key);
+        const t = j(r), a = n.filter((i) => i.market === t.key);
         return new ke(r, a);
       });
     }
@@ -768,12 +768,12 @@ async function et(e, o, n) {
     ...n,
     accountCap: t
   });
-  const a = await j(n?.market || D), c = await je(e, t, n);
+  const a = await j(n?.market || D), i = await je(e, t, n);
   return e.moveCall({
     target: `${r.emode.contract.registryPackage}::registry::register_emode_for_account_cap`,
     arguments: [
       e.object(r.emode.contract.registryObject),
-      c,
+      i,
       y(a.id, e.pure.u64),
       y(o, e.pure.u64)
     ]
@@ -790,11 +790,11 @@ const X = A(
         target: `${n.emode.contract.registryPackage}::registry::find_user_emode_account_caps`,
         arguments: [r.object(n.emode.contract.registryObject), r.pure.address(e)]
       });
-      const c = (await t.devInspectTransactionBlock({
+      const i = (await t.devInspectTransactionBlock({
         transactionBlock: r,
         sender: e
-      })).results[0].returnValues, i = C.vector(C.u64()).parse(Uint8Array.from(c[0][0])), s = C.vector(C.u64()).parse(Uint8Array.from(c[1][0])), u = C.vector(C.Address).parse(Uint8Array.from(c[2][0]));
-      return i.map((m, g) => ({
+      })).results[0].returnValues, c = C.vector(C.u64()).parse(Uint8Array.from(i[0][0])), s = C.vector(C.u64()).parse(Uint8Array.from(i[1][0])), u = C.vector(C.Address).parse(Uint8Array.from(i[2][0]));
+      return c.map((m, g) => ({
         marketId: Number(m),
         emodeId: Number(s[g]),
         accountCap: u[g].toString()
@@ -808,33 +808,33 @@ function tt(e) {
 function ot(e, o, n) {
   const r = typeof n?.balance == "number", t = r ? n.balance : 0;
   let a = 0;
-  const c = [];
-  let i = "";
+  const i = [];
+  let c = "";
   if (o.sort((s, u) => Number(u.balance) - Number(s.balance)).forEach((s) => {
     if (!(r && a >= t) && Number(s.balance) !== 0) {
-      if (i || (i = s.coinType), i !== s.coinType)
+      if (c || (c = s.coinType), c !== s.coinType)
         throw new Error("All coins must be of the same type");
-      a += Number(s.balance), c.push(s.coinObjectId);
+      a += Number(s.balance), i.push(s.coinObjectId);
     }
-  }), c.length === 0)
+  }), i.length === 0)
     throw new Error("No coins to merge");
   if (r && a < t)
     throw new Error(
       `Balance is less than the specified balance: ${a} < ${t}`
     );
-  return b(i) === b("0x2::sui::SUI") && n?.useGasCoin ? r ? e.splitCoins(e.gas, [e.pure.u64(t)]) : e.gas : (c.length === 1 ? e.object(c[0]) : e.mergeCoins(c[0], c.slice(1)), r ? e.splitCoins(c[0], [e.pure.u64(t)]) : c[0]);
+  return b(c) === b("0x2::sui::SUI") && n?.useGasCoin ? r ? e.splitCoins(e.gas, [e.pure.u64(t)]) : e.gas : (i.length === 1 ? e.object(i[0]) : e.mergeCoins(i[0], i.slice(1)), r ? e.splitCoins(i[0], [e.pure.u64(t)]) : i[0]);
 }
-async function Z(e, o, n, r, t, a, c) {
-  const i = await k({
-    ...c,
+async function Z(e, o, n, r, t, a, i) {
+  const c = await k({
+    ...i,
     cacheTime: h
-  }), s = await B(n, c);
+  }), s = await B(n, i);
   return e.moveCall({
-    target: `${i.uiGetter}::calculator_unchecked::dynamic_health_factor`,
+    target: `${c.uiGetter}::calculator_unchecked::dynamic_health_factor`,
     arguments: [
       e.object("0x06"),
-      e.object(i.storage),
-      e.object(i.oracle.priceOracle),
+      e.object(c.storage),
+      e.object(c.oracle.priceOracle),
       we(e, s),
       y(o, e.pure.address),
       y(s.id, e.pure.u8),
@@ -852,7 +852,7 @@ async function x(e, o, n) {
   const r = new U(), t = n?.client ?? S, a = await R({
     ...n,
     markets: Object.values(E)
-  }), c = q(a);
+  }), i = q(a);
   for (let m of o) {
     const g = await k({
       ...n,
@@ -873,7 +873,7 @@ async function x(e, o, n) {
     m.forEach((p) => {
       if (p.supply_balance === "0" && p.borrow_balance === "0")
         return;
-      const f = c[`${w.key}-${p.asset_id}`];
+      const f = i[`${w.key}-${p.asset_id}`];
       if (!f)
         return;
       const _ = G(
@@ -914,19 +914,19 @@ async function rt(e, o) {
 }
 async function at(e, o, n, r) {
   const t = r?.client ?? S, a = new U();
-  let c = 0, i = 0;
+  let i = 0, c = 0;
   const s = await B(o, r);
   if (n.forEach((v) => {
-    v.type === N.Supply ? c += v.amount : v.type === N.Withdraw ? c -= v.amount : v.type === N.Borrow ? i += v.amount : v.type === N.Repay && (i -= v.amount);
-  }), c * i < 0)
+    v.type === N.Supply ? i += v.amount : v.type === N.Withdraw ? i -= v.amount : v.type === N.Borrow ? c += v.amount : v.type === N.Repay && (c -= v.amount);
+  }), i * c < 0)
     throw new Error("Invalid operations");
-  const u = c > 0 || i > 0;
+  const u = i > 0 || c > 0;
   await Z(
     a,
     e,
     s,
-    Math.abs(c),
     Math.abs(i),
+    Math.abs(c),
     u,
     r
   );
@@ -936,7 +936,7 @@ async function at(e, o, n, r) {
   }), g = O(m, [C.u256()]);
   return Q(Number(g[0]) || 0);
 }
-const it = I(
+const ct = I(
   async (e, o) => {
     const n = new URLSearchParams();
     o?.cursor && n.set("cursor", o.cursor), n.set("userAddress", e);
@@ -944,7 +944,7 @@ const it = I(
     return (await fetch(r, { headers: V }).then((a) => a.json())).data;
   }
 );
-async function ct(e, o) {
+async function it(e, o) {
   let n = null;
   const r = [], t = o?.client ?? S;
   do {
@@ -966,86 +966,86 @@ async function ct(e, o) {
 }
 const Be = A(
   async (e, o) => {
-    const n = [], r = (o?.markets || Object.keys(E)).map((i) => j(i)), t = await X(e, o), a = r.map((i) => ({
+    const n = [], r = (o?.markets || Object.keys(E)).map((c) => j(c)), t = await X(e, o), a = r.map((c) => ({
       address: e,
-      market: i.key
+      market: c.key
     })).concat(
-      t.filter((i) => !!r.find((s) => s.id === i.marketId)).map((i) => ({
-        address: e,
-        market: j(i.marketId).key,
-        emodeId: i.emodeId
+      t.filter((c) => !!r.find((s) => s.id === c.marketId)).map((c) => ({
+        address: c.accountCap,
+        market: j(c.marketId).key,
+        emodeId: c.emodeId
       }))
     );
-    return (await x(e, a, o)).forEach((i) => {
-      const s = i.emodeId ? t.find((u) => {
-        const m = j(i.market);
-        return u.emodeId === i.emodeId && u.marketId === m.id;
+    return (await x(e, a, o)).forEach((c) => {
+      const s = c.emodeId ? t.find((u) => {
+        const m = j(c.market);
+        return u.emodeId === c.emodeId && u.marketId === m.id;
       }) : void 0;
       if (s) {
-        if (l(i.supplyBalance).gt(0)) {
-          const u = l(i.supplyBalance).shiftedBy(-9).decimalPlaces(i.pool.token.decimals, l.ROUND_DOWN);
+        if (l(c.supplyBalance).gt(0)) {
+          const u = l(c.supplyBalance).shiftedBy(-9).decimalPlaces(c.pool.token.decimals, l.ROUND_DOWN);
           n.push({
-            id: `${i.pool.uniqueId}_${s.emodeId}_navi-lending-emode-supply`,
+            id: `${c.pool.uniqueId}_${s.emodeId}_navi-lending-emode-supply`,
             wallet: e,
             protocol: "navi",
-            market: i.market,
+            market: c.market,
             type: "navi-lending-emode-supply",
             "navi-lending-emode-supply": {
               amount: u.toString(),
-              pool: K(i.pool, s),
-              token: i.pool.token,
-              valueUSD: u.multipliedBy(i.pool.oracle.price).toString(),
+              pool: K(c.pool, s),
+              token: c.pool.token,
+              valueUSD: u.multipliedBy(c.pool.oracle.price).toString(),
               emodeCap: s
             }
           });
         }
-        if (l(i.borrowBalance).gt(0)) {
-          const u = l(i.borrowBalance).shiftedBy(-9).decimalPlaces(i.pool.token.decimals, l.ROUND_DOWN);
+        if (l(c.borrowBalance).gt(0)) {
+          const u = l(c.borrowBalance).shiftedBy(-9).decimalPlaces(c.pool.token.decimals, l.ROUND_DOWN);
           n.push({
-            id: `${i.pool.uniqueId}_${s.emodeId}_navi-lending-emode-borrow`,
+            id: `${c.pool.uniqueId}_${s.emodeId}_navi-lending-emode-borrow`,
             wallet: e,
             protocol: "navi",
-            market: i.market,
+            market: c.market,
             type: "navi-lending-emode-borrow",
             "navi-lending-emode-borrow": {
               amount: u.toString(),
-              pool: K(i.pool, s),
-              token: i.pool.token,
-              valueUSD: u.multipliedBy(i.pool.oracle.price).toString(),
+              pool: K(c.pool, s),
+              token: c.pool.token,
+              valueUSD: u.multipliedBy(c.pool.oracle.price).toString(),
               emodeCap: s
             }
           });
         }
       } else {
-        if (l(i.supplyBalance).gt(0)) {
-          const u = l(i.supplyBalance).shiftedBy(-9).decimalPlaces(i.pool.token.decimals, l.ROUND_DOWN);
+        if (l(c.supplyBalance).gt(0)) {
+          const u = l(c.supplyBalance).shiftedBy(-9).decimalPlaces(c.pool.token.decimals, l.ROUND_DOWN);
           n.push({
-            id: `${i.pool.uniqueId}_navi-lending-supply`,
+            id: `${c.pool.uniqueId}_navi-lending-supply`,
             wallet: e,
             protocol: "navi",
             type: "navi-lending-supply",
-            market: i.market,
+            market: c.market,
             "navi-lending-supply": {
               amount: u.toString(),
-              pool: i.pool,
-              token: i.pool.token,
-              valueUSD: u.multipliedBy(i.pool.oracle.price).toString()
+              pool: c.pool,
+              token: c.pool.token,
+              valueUSD: u.multipliedBy(c.pool.oracle.price).toString()
             }
           });
         }
-        if (l(i.borrowBalance).gt(0)) {
-          const u = l(i.borrowBalance).shiftedBy(-9).decimalPlaces(i.pool.token.decimals, l.ROUND_DOWN);
+        if (l(c.borrowBalance).gt(0)) {
+          const u = l(c.borrowBalance).shiftedBy(-9).decimalPlaces(c.pool.token.decimals, l.ROUND_DOWN);
           n.push({
-            id: `${i.pool.uniqueId}_navi-lending-borrow`,
+            id: `${c.pool.uniqueId}_navi-lending-borrow`,
             wallet: e,
             protocol: "navi",
-            market: i.market,
+            market: c.market,
             type: "navi-lending-borrow",
             "navi-lending-borrow": {
               amount: u.toString(),
-              pool: i.pool,
-              token: i.pool.token,
-              valueUSD: u.multipliedBy(i.pool.oracle.price).toString()
+              pool: c.pool,
+              token: c.pool.token,
+              valueUSD: u.multipliedBy(c.pool.oracle.price).toString()
             }
           });
         }
@@ -1209,7 +1209,7 @@ class M {
   }
   getPositionsOverview(o) {
     const n = {}, r = {};
-    let t = new l(0), a = new l(0), c = new l(0), i = new l(0), s = new l(0), u = new l(0);
+    let t = new l(0), a = new l(0), i = new l(0), c = new l(0), s = new l(0), u = new l(0);
     o.forEach((w) => {
       if (w.type === "navi-lending-supply") {
         const p = w["navi-lending-supply"];
@@ -1233,35 +1233,35 @@ class M {
     }), o.forEach((w) => {
       if (w.type === "navi-lending-supply") {
         const p = w["navi-lending-supply"], f = p.pool.supplyIncentiveApyInfo.apy;
-        c = c.plus(
+        i = i.plus(
           new l(p.valueUSD).dividedBy(t).multipliedBy(new l(f).dividedBy(100))
         ), n[p.pool.suiCoinType] = l(n[p.pool.suiCoinType] || 0).plus(p.amount).toString();
       } else if (w.type === "navi-lending-borrow") {
         const p = w["navi-lending-borrow"], f = p.pool.borrowIncentiveApyInfo.apy;
-        a.gt(0) && (i = i.plus(
+        a.gt(0) && (c = c.plus(
           new l(p.valueUSD).dividedBy(a).multipliedBy(new l(f).dividedBy(100))
         )), r[p.pool.suiCoinType] = l(r[p.pool.suiCoinType] || 0).plus(p.amount).toString();
       } else if (w.type === "navi-lending-emode-supply") {
         const p = w["navi-lending-emode-supply"], f = p.pool.supplyIncentiveApyInfo.apy;
-        t.gt(0) && (c = c.plus(
+        t.gt(0) && (i = i.plus(
           new l(p.valueUSD).dividedBy(t).multipliedBy(new l(f).dividedBy(100))
         )), n[p.pool.suiCoinType] = l(n[p.pool.suiCoinType] || 0).plus(p.amount).toString();
       } else if (w.type === "navi-lending-emode-borrow") {
         const p = w["navi-lending-emode-borrow"], f = p.pool.borrowIncentiveApyInfo.apy;
-        a.gt(0) && (i = i.plus(
+        a.gt(0) && (c = c.plus(
           new l(p.valueUSD).dividedBy(a).multipliedBy(new l(f).dividedBy(100))
         )), r[p.pool.suiCoinType] = l(r[p.pool.suiCoinType] || 0).plus(p.amount).toString();
       }
     });
-    const m = t.minus(a), g = t.minus(a).eq(0) ? new l(0) : t.multipliedBy(c).minus(a.multipliedBy(i)).div(t.minus(a));
+    const m = t.minus(a), g = t.minus(a).eq(0) ? new l(0) : t.multipliedBy(i).minus(a.multipliedBy(c)).div(t.minus(a));
     return {
       hf: a.toNumber() !== 0 ? s.dividedBy(a).toNumber() : 1 / 0,
       netVaule: m.toString(),
       netWorthApr: g.toString(),
       totalSupplyValue: t.toString(),
       totalBorrowValue: a.toString(),
-      totalsupplyApy: c.toString(),
-      totalBorrowApy: i.toString(),
+      totalsupplyApy: i.toString(),
+      totalBorrowApy: c.toString(),
       maxLiquidationValue: s.toString(),
       maxLoanToVaule: u.toString(),
       supply: n,
@@ -1325,7 +1325,7 @@ async function $e(e, o, n) {
   }
   for (const t of o)
     e.moveCall({
-      target: `${r.oracle.packageId}::oracle_pro::update_single_price`,
+      target: `${r.oracle.packageId}::oracle_pro::update_single_price_v2`,
       arguments: [
         e.object("0x6"),
         // Clock object
@@ -1337,6 +1337,7 @@ async function $e(e, o, n) {
         // Supra oracle holder
         e.object(t.pythPriceInfoObject),
         // Pyth price info object
+        e.object(r.oracle.switchboardAggregator),
         e.pure.address(t.feedId)
         // Price feed ID
       ]
@@ -1365,14 +1366,14 @@ async function st(e, o, n, r) {
     n.forEach((u) => {
       a.includes(u.market) || a.push(u.market);
     });
-    const c = await Be(o, {
+    const i = await Be(o, {
       ...r,
       markets: a
-    }), i = Pe(t, {
-      lendingPositions: c,
+    }), c = Pe(t, {
+      lendingPositions: i,
       pools: n
     });
-    return await $e(e, i, {
+    return await $e(e, c, {
       updatePythPriceFeeds: !0,
       ...r
     });
@@ -1437,12 +1438,12 @@ async function pt(e, o, n, r, t) {
   const a = await k({
     ...t,
     cacheTime: h
-  }), c = await B(o, t);
+  }), i = await B(o, t);
   if (!(await L({
     ...t,
     cacheTime: h
   })).some(
-    (m) => b(m.coinType) === b(c.suiCoinType)
+    (m) => b(m.coinType) === b(i.suiCoinType)
   ))
     throw new Error("Pool does not support flashloan");
   const [u] = e.moveCall({
@@ -1450,28 +1451,28 @@ async function pt(e, o, n, r, t) {
     arguments: [
       e.object("0x06"),
       e.object(a.storage),
-      e.object(c.contract.pool),
+      e.object(i.contract.pool),
       y(n, e.object),
       y(r, e.object)
     ],
-    typeArguments: [c.suiCoinType]
+    typeArguments: [i.suiCoinType]
   });
   return [u];
 }
 async function dt(e, o, n, r, t, a) {
-  const c = {
+  const i = {
     ...a,
     cacheTime: h
-  }, i = await k(c), s = await B(o, c), u = await B(r, c);
-  if (i.version === 1) {
+  }, c = await k(i), s = await B(o, i), u = await B(r, i);
+  if (c.version === 1) {
     const [m, g] = e.moveCall({
-      target: `${i.package}::incentive_v3::liquidation`,
+      target: `${c.package}::incentive_v3::liquidation`,
       arguments: [
         e.object("0x06"),
         // Clock object
-        e.object(i.priceOracle),
+        e.object(c.priceOracle),
         // Price oracle for asset pricing
-        e.object(i.storage),
+        e.object(c.storage),
         // Protocol storage
         e.pure.u8(s.id),
         // Pay asset ID
@@ -1485,9 +1486,9 @@ async function dt(e, o, n, r, t, a) {
         // Collateral asset pool contract
         y(t, e.pure.address),
         // Borrower address
-        e.object(i.incentiveV2),
+        e.object(c.incentiveV2),
         // Incentive V2 contract
-        e.object(i.incentiveV3)
+        e.object(c.incentiveV3)
         // Incentive V3 contract
       ],
       typeArguments: [s.suiCoinType, u.suiCoinType]
@@ -1495,13 +1496,13 @@ async function dt(e, o, n, r, t, a) {
     return [m, g];
   } else {
     const [m, g] = e.moveCall({
-      target: `${i.package}::incentive_v3::liquidation_v2`,
+      target: `${c.package}::incentive_v3::liquidation_v2`,
       arguments: [
         e.object("0x06"),
         // Clock object
-        e.object(i.priceOracle),
+        e.object(c.priceOracle),
         // Price oracle for asset pricing
-        e.object(i.storage),
+        e.object(c.storage),
         // Protocol storage
         e.pure.u8(s.id),
         // Pay asset ID
@@ -1515,9 +1516,9 @@ async function dt(e, o, n, r, t, a) {
         // Collateral asset pool contract
         y(t, e.pure.address),
         // Borrower address
-        e.object(i.incentiveV2),
+        e.object(c.incentiveV2),
         // Incentive V2 contract
-        e.object(i.incentiveV3),
+        e.object(c.incentiveV3),
         // Incentive V3 contract
         e.object("0x05")
         // SuiSystemState object
@@ -1532,7 +1533,7 @@ async function Ve(e, o, n) {
     ...n,
     markets: Object.values(E),
     cacheTime: h
-  }), c = await te(n);
+  }), i = await te(n);
   for (let m of o) {
     const g = await k({
       ...n,
@@ -1553,11 +1554,11 @@ async function Ve(e, o, n) {
       ]
     });
   }
-  const i = await r.devInspectTransactionBlock({
+  const c = await r.devInspectTransactionBlock({
     transactionBlock: t,
     sender: e
   }), s = [];
-  i?.results?.forEach((m) => {
+  c?.results?.forEach((m) => {
     s.push(
       O(
         {
@@ -1584,7 +1585,7 @@ async function Ve(e, o, n) {
     if (m.length === 5 && Array.isArray(m[0])) {
       const w = m[0].length;
       for (let p = 0; p < w; p++) {
-        const f = c.find(
+        const f = i.find(
           (T) => b(T.coinType) === b(m[1][p])
         ), _ = a.find(
           (T) => b(T.coinType) === b(m[0][p])
@@ -1609,11 +1610,11 @@ async function mt(e, o) {
     address: e,
     market: a.key
   })).concat(
-    r.filter((a) => !!n.find((c) => c.id === a.marketId)).map((a) => {
-      const c = j(a.marketId);
+    r.filter((a) => !!n.find((i) => i.id === a.marketId)).map((a) => {
+      const i = j(a.marketId);
       return {
         address: e,
-        market: c.key,
+        market: i.key,
         emodeId: a.emodeId
       };
     })
@@ -1623,8 +1624,8 @@ async function mt(e, o) {
 function yt(e) {
   const o = /* @__PURE__ */ new Map();
   e.forEach((r) => {
-    const t = r.assetId, a = r.option, c = `${t}-${a}-${r.rewardCoinType}-${r.market}`;
-    o.has(c) ? o.get(c).total += r.userClaimableReward : o.set(c, {
+    const t = r.assetId, a = r.option, i = `${t}-${a}-${r.rewardCoinType}-${r.market}`;
+    o.has(i) ? o.get(i).total += r.userClaimableReward : o.set(i, {
       assetId: t,
       rewardType: a,
       coinType: r.rewardCoinType,
@@ -1633,11 +1634,11 @@ function yt(e) {
     });
   });
   const n = /* @__PURE__ */ new Map();
-  for (const { assetId: r, rewardType: t, coinType: a, total: c, market: i } of o.values()) {
-    const s = `${r}-${t}-${i}`;
-    n.has(s) || n.set(s, { assetId: r, rewardType: t, market: i, rewards: /* @__PURE__ */ new Map() });
+  for (const { assetId: r, rewardType: t, coinType: a, total: i, market: c } of o.values()) {
+    const s = `${r}-${t}-${c}`;
+    n.has(s) || n.set(s, { assetId: r, rewardType: t, market: c, rewards: /* @__PURE__ */ new Map() });
     const u = n.get(s);
-    u.rewards.set(a, (u.rewards.get(a) || 0) + c);
+    u.rewards.set(a, (u.rewards.get(a) || 0) + i);
   }
   return Array.from(n.values()).map((r) => ({
     assetId: r.assetId,
@@ -1671,8 +1672,8 @@ async function wt(e, o, n) {
     markets: Object.values(E),
     cacheTime: h
   }), a = /* @__PURE__ */ new Map();
-  for (const i of o) {
-    const { rewardCoinType: s, ruleIds: u, market: m, owner: g, emodeId: v } = i, w = `${s}-${m}-${g}`;
+  for (const c of o) {
+    const { rewardCoinType: s, ruleIds: u, market: m, owner: g, emodeId: v } = c, w = `${s}-${m}-${g}`;
     for (const p of u) {
       a.has(w) || a.set(w, {
         assetIds: [],
@@ -1683,16 +1684,16 @@ async function wt(e, o, n) {
         isEMode: typeof v < "u"
       });
       const f = a.get(w);
-      f.assetIds.push(i.assetCoinType.replace("0x", "")), f.ruleIds.push(p), f.amount += i.userClaimableReward;
+      f.assetIds.push(c.assetCoinType.replace("0x", "")), f.ruleIds.push(p), f.amount += c.userClaimableReward;
     }
   }
-  const c = [];
-  for (const [i, { assetIds: s, ruleIds: u, amount: m, market: g, owner: v, isEMode: w }] of a) {
+  const i = [];
+  for (const [c, { assetIds: s, ruleIds: u, amount: m, market: g, owner: v, isEMode: w }] of a) {
     const p = t.find(
-      (_) => b(_.suiCoinType) === b(i) && _.market === g
+      (_) => b(_.suiCoinType) === b(c) && _.market === g
     );
     if (!p || !p.contract.rewardFundId)
-      throw new Error(`No matching rewardFund found for reward coin: ${i} ${g}`);
+      throw new Error(`No matching rewardFund found for reward coin: ${c} ${g}`);
     const f = p.contract.rewardFundId;
     if (n?.accountCap && !n.customCoinReceive)
       throw new Error("customCoinReceive is required when accountCap is provided");
@@ -1716,7 +1717,7 @@ async function wt(e, o, n) {
           y(n.accountCap, e.object)
           // Account capability
         ],
-        typeArguments: [i]
+        typeArguments: [c]
       }) : w ? _ = e.moveCall({
         target: `${r.package}::incentive_v3::claim_reward_with_account_cap`,
         arguments: [
@@ -1735,7 +1736,7 @@ async function wt(e, o, n) {
           y(v, e.object)
           // Account capability
         ],
-        typeArguments: [i]
+        typeArguments: [c]
       }) : _ = e.moveCall({
         target: `${r.package}::incentive_v3::claim_reward`,
         arguments: [
@@ -1752,12 +1753,12 @@ async function wt(e, o, n) {
           e.pure.vector("address", u)
           // Rule IDs
         ],
-        typeArguments: [i]
+        typeArguments: [c]
       });
       const [T] = e.moveCall({
         target: "0x2::coin::from_balance",
         arguments: [_],
-        typeArguments: [i]
+        typeArguments: [c]
       });
       if (n?.customCoinReceive.type === "transfer") {
         if (!n.customCoinReceive.transfer)
@@ -1774,7 +1775,7 @@ async function wt(e, o, n) {
           e.pure.address(n.customCoinReceive.depositNAVI.fallbackReceiveAddress)
         ) : await be(e, p, T, n);
       } else
-        c.push({
+        i.push({
           coin: T,
           identifier: p,
           owner: v,
@@ -1799,11 +1800,11 @@ async function wt(e, o, n) {
           y(n?.accountCap || v, e.object)
           // Account capability
         ],
-        typeArguments: [i]
+        typeArguments: [c]
       }), [T] = e.moveCall({
         target: "0x2::coin::from_balance",
         arguments: [_],
-        typeArguments: [i]
+        typeArguments: [c]
       });
       e.transferObjects(
         [T],
@@ -1826,10 +1827,10 @@ async function wt(e, o, n) {
           e.pure.vector("address", u)
           // Rule IDs
         ],
-        typeArguments: [i]
+        typeArguments: [c]
       });
   }
-  return c;
+  return i;
 }
 export {
   W as Address,
@@ -1859,7 +1860,7 @@ export {
   je as getAccountCapOwnerPTB,
   L as getAllFlashLoanAssets,
   Xe as getBorrowFee,
-  ct as getCoins,
+  it as getCoins,
   k as getConfig,
   Ke as getFees,
   ut as getFlashLoanAsset,
@@ -1877,7 +1878,7 @@ export {
   at as getSimulatedHealthFactor,
   Z as getSimulatedHealthFactorPTB,
   ze as getStats,
-  it as getTransactions,
+  ct as getTransactions,
   mt as getUserAvailableLendingRewards,
   ft as getUserClaimedRewardHistory,
   X as getUserEModeCaps,