@naviprotocol/lending 2.0.2 → 2.0.4

package/dist/index.esm.js

@@ -129,9 +129,9 @@ const oe = l.bytes(32).transform({
   borrow_balance: l.u256(),
   /** User's current supply balance */
   supply_balance: l.u256()
-}), Ge = "2.0.2", O = {
+}), Ge = "2.0.4", E = {
   version: Ge
-}, We = O.version, He = () => {
+}, We = E.version, He = () => {
   if (typeof process < "u" && process.versions && process.versions.node) {
     const e = process.version;
     return `Node.js ${e.startsWith("v") ? e.substring(1) : e}`;
@@ -353,7 +353,7 @@ class lt {
   }
   getCoreProvider() {
     const t = this.provider.core;
-    return t && typeof t.getObject == "function" && typeof t.getDynamicObjectField == "function" ? t : null;
+    return t && typeof t.getObject == "function" && typeof t.getDynamicObjectField == "function" && typeof t.getDynamicField == "function" ? t : null;
   }
   async getMoveObjectJson(t) {
     const r = this.getCoreProvider();
@@ -500,16 +500,25 @@ class lt {
   async getPriceFeedObjectId(t) {
     const r = re(t);
     if (!this.priceFeedObjectIdCache.has(r)) {
-      const { id: o, fieldType: n } = await this.getPriceTableInfo(), a = this.getCoreProvider() ? se(
-        `${n}::price_identifier::PriceIdentifier`,
-        it(ie(r))
-      ) : {
-        type: `${n}::price_identifier::PriceIdentifier`,
-        value: {
-          bytes: Array.from(ie(r))
-        }
-      }, c = await this.getDynamicMoveObjectJson(o, a);
-      c?.fields ? this.priceFeedObjectIdCache.set(r, c.fields.value) : this.priceFeedObjectIdCache.set(r, void 0);
+      const { id: o, fieldType: n } = await this.getPriceTableInfo(), a = `${n}::price_identifier::PriceIdentifier`, c = this.getCoreProvider();
+      if (c) {
+        const { dynamicField: i } = await c.getDynamicField({
+          parentId: o,
+          name: se(a, it(ie(r)))
+        }), s = i?.value?.bcs;
+        this.priceFeedObjectIdCache.set(
+          r,
+          s && s.length === 32 ? l.Address.parse(Uint8Array.from(s)) : void 0
+        );
+      } else {
+        const i = await this.getDynamicMoveObjectJson(o, {
+          type: a,
+          value: {
+            bytes: Array.from(ie(r))
+          }
+        });
+        i?.fields ? this.priceFeedObjectIdCache.set(r, i.fields.value) : this.priceFeedObjectIdCache.set(r, void 0);
+      }
     }
     return this.priceFeedObjectIdCache.get(r);
   }
@@ -551,7 +560,7 @@ function Yt(e) {
 function ue() {
   return je;
 }
-function E(e) {
+function O(e) {
   const t = e?.services?.naviOpenApi ?? J.services?.naviOpenApi;
   return {
     baseUrl: pt(t?.baseUrl ?? dt),
@@ -559,7 +568,7 @@ function E(e) {
   };
 }
 function M(e, t) {
-  const r = E(t), o = e.startsWith("/") ? e : `/${e}`;
+  const r = O(t), o = e.startsWith("/") ? e : `/${e}`;
   return `${r.baseUrl}${o}`;
 }
 function mt(e) {
@@ -614,7 +623,7 @@ async function q(e, t) {
   });
   return ft(n);
 }
-function Ie(e) {
+function ke(e) {
   return {
     json: !!e?.showContent,
     display: !!e?.showDisplay,
@@ -622,7 +631,7 @@ function Ie(e) {
     objectBcs: !!e?.showBcs
   };
 }
-function ke(e) {
+function Ie(e) {
   return !e || e instanceof Error ? {
     error: e instanceof Error ? { code: "notFound", error: e.message } : void 0
   } : {
@@ -648,9 +657,9 @@ async function yt(e, t) {
     throw new Error("getSuiObject requires a Sui v2 Core-capable client");
   const { object: o } = await r.getObject({
     objectId: t.id,
-    include: Ie(t.options)
+    include: ke(t.options)
   });
-  return ke(o);
+  return Ie(o);
 }
 async function gt(e, t) {
   const r = e?.core;
@@ -658,9 +667,9 @@ async function gt(e, t) {
     throw new Error("multiGetSuiObjects requires a Sui v2 Core-capable client");
   const { objects: o } = await r.getObjects({
     objectIds: t.ids,
-    include: Ie(t.options)
+    include: ke(t.options)
   });
-  return o.map(ke);
+  return o.map(Ie);
 }
 function _e(e) {
   const t = [];
@@ -777,8 +786,8 @@ var z = /* @__PURE__ */ ((e) => (e[e.Supply = 1] = "Supply", e[e.Withdraw = 2] =
 const G = $(
   A(
     async (e) => {
-      const t = (e?.markets || [F.main]).map((a) => _(a)), r = E(e), o = M(
-        `/navi/pools?env=${e?.env || "prod"}&sdk=${O.version}&market=${t.map(
+      const t = (e?.markets || [F.main]).map((a) => _(a)), r = O(e), o = M(
+        `/navi/pools?env=${e?.env || "prod"}&sdk=${E.version}&market=${t.map(
           (a) => a.key
         )}`,
         e
@@ -787,9 +796,9 @@ const G = $(
       );
       return n.data.forEach((a) => {
         const i = n.meta.emodes.filter((b) => {
-          const I = _(b.marketId);
-          return a.market === I.key && b.isActive;
-        }).filter((b) => !!b.assets.find((I) => I.assetId === a.id));
+          const k = _(b.marketId);
+          return a.market === k.key && b.isActive;
+        }).filter((b) => !!b.assets.find((k) => k.assetId === a.id));
         a.emodes = i;
         const s = p(a.totalSupplyAmount).div(Math.pow(10, 9)).decimalPlaces(a.token.decimals, p.ROUND_DOWN).toString(), u = p(a.borrowedAmount).shiftedBy(-9).decimalPlaces(a.token.decimals, p.ROUND_DOWN).toString(), m = p(s).multipliedBy(a.oracle.price).toString(), w = p(u).multipliedBy(a.oracle.price).toString(), y = p(a.supplyCapCeiling).shiftedBy(-27).decimalPlaces(a.token.decimals, p.ROUND_DOWN).toString(), g = p.max(
           p(a.borrowedAmount),
@@ -820,7 +829,7 @@ async function S(e, t) {
 }
 const Zt = $(
   A(async (e) => {
-    const t = E(e), r = M(`/navi/stats?sdk=${O.version}`, e);
+    const t = O(e), r = M(`/navi/stats?sdk=${E.version}`, e);
     return (await fetch(r, {
       headers: U(D, t)
     }).then((n) => n.json())).data;
@@ -828,7 +837,7 @@ const Zt = $(
 ), Xt = $(
   A(
     async (e) => {
-      const t = E(e), r = M(`/navi/fee?sdk=${O.version}`, e);
+      const t = O(e), r = M(`/navi/fee?sdk=${E.version}`, e);
       return await fetch(r, {
         headers: U(D, t)
       }).then((n) => n.json());
@@ -1253,8 +1262,8 @@ const _ = (e) => {
 ), j = $(
   A(
     async (e) => {
-      const t = _(e?.market || R), r = E(e), o = M(
-        `/navi/config?env=${e?.env || "prod"}&sdk=${O.version}&market=${t.key}`,
+      const t = _(e?.market || R), r = O(e), o = M(
+        `/navi/config?env=${e?.env || "prod"}&sdk=${E.version}&market=${t.key}`,
         e
       );
       return (await fetch(o, {
@@ -1263,7 +1272,7 @@ const _ = (e) => {
     }
   )
 ), v = 1e3 * 60 * 5;
-async function It(e, t) {
+async function kt(e, t) {
   const r = await j({
     cacheTime: v,
     ...t
@@ -1273,7 +1282,7 @@ async function It(e, t) {
     arguments: []
   });
 }
-async function kt(e, t, r) {
+async function It(e, t, r) {
   const o = await j({
     cacheTime: v,
     ...r
@@ -1317,12 +1326,12 @@ async function ar(e, t, r) {
   const o = await j({
     cacheTime: v,
     ...r
-  }), n = await It(e, r);
+  }), n = await kt(e, r);
   await _t(e, t, {
     ...r,
     accountCap: n
   });
-  const a = await _(r?.market || R), c = await kt(e, n, r);
+  const a = await _(r?.market || R), c = await It(e, n, r);
   return e.moveCall({
     target: `${o.emode.contract.registryPackage}::registry::register_emode_for_account_cap`,
     arguments: [
@@ -1446,13 +1455,13 @@ async function Ae(e, t, r) {
   })).results || [], w = {};
   s.forEach((d, f) => {
     try {
-      const b = m[f]?.returnValues?.map((T) => l.vector(qe).parse(Uint8Array.from(T[0])))[0] || [], I = {};
+      const b = m[f]?.returnValues?.map((T) => l.vector(qe).parse(Uint8Array.from(T[0])))[0] || [], k = {};
       for (const T of b)
-        I[T.id] = {
+        k[T.id] = {
           supplyIndex: T.supply_index,
           borrowIndex: T.borrow_index
         };
-      w[d.key] = I;
+      w[d.key] = k;
     } catch (b) {
       console.warn(
         `[@naviprotocol/lending] Failed to decode reserve data for market "${d.key}", falling back to open-api pool indices`,
@@ -1462,19 +1471,19 @@ async function Ae(e, t, r) {
   });
   const y = m.slice(s.length).map((d) => d.returnValues?.map((f) => l.vector(ze).parse(Uint8Array.from(f[0])))[0] || []), g = [];
   return y.forEach((d, f) => {
-    const b = t[f], I = _(b.market), T = w[I.key] || {};
-    d.forEach((k) => {
-      if (k.supply_balance === "0" && k.borrow_balance === "0" && (b.emodeId === void 0 || !r?.includeZeroBalanceEmodePositions))
+    const b = t[f], k = _(b.market), T = w[k.key] || {};
+    d.forEach((I) => {
+      if (I.supply_balance === "0" && I.borrow_balance === "0" && (b.emodeId === void 0 || !r?.includeZeroBalanceEmodePositions))
         return;
-      const B = c[`${I.key}-${k.asset_id}`];
+      const B = c[`${k.key}-${I.asset_id}`];
       if (!B)
         return;
-      const W = T[k.asset_id], Y = W?.supplyIndex ?? B.currentSupplyIndex, Oe = W?.borrowIndex ?? B.currentBorrowIndex, Ee = de(k.supply_balance, Y).toString(), Ve = de(k.borrow_balance, Oe).toString();
+      const W = T[I.asset_id], Y = W?.supplyIndex ?? B.currentSupplyIndex, Ee = W?.borrowIndex ?? B.currentBorrowIndex, Oe = de(I.supply_balance, Y).toString(), Ve = de(I.borrow_balance, Ee).toString();
       g.push({
-        supplyBalance: Ee,
+        supplyBalance: Oe,
         borrowBalance: Ve,
-        assetId: k.asset_id,
-        market: I.key,
+        assetId: I.asset_id,
+        market: k.key,
         pool: B,
         emodeId: b.emodeId
       });
@@ -1527,8 +1536,8 @@ const dr = A(
   async (e, t) => {
     const r = new URLSearchParams();
     t?.cursor && r.set("cursor", t.cursor), r.set("userAddress", e);
-    const o = E(t), n = M(
-      `/navi/user/transactions?${r.toString()}&sdk=${O.version}`,
+    const o = O(t), n = M(
+      `/navi/user/transactions?${r.toString()}&sdk=${E.version}`,
       t
     );
     return (await fetch(n, {
@@ -2073,23 +2082,7 @@ async function fe(e, t, r) {
     a.length > 0 && await $t(e, a, r);
   }
   for (const n of t)
-    r?.env === "dev" ? e.moveCall({
-      target: `${o.oracle.packageId}::oracle_pro::update_single_price`,
-      arguments: [
-        e.object("0x6"),
-        // Clock object
-        e.object(o.oracle.oracleConfig),
-        // Oracle configuration
-        e.object(o.oracle.priceOracle),
-        // Price oracle contract
-        e.object(o.oracle.supraOracleHolder),
-        // Supra oracle holder
-        e.object(n.pythPriceInfoObject),
-        // Pyth price info object
-        e.pure.address(n.feedId)
-        // Price feed ID
-      ]
-    }) : e.moveCall({
+    e.moveCall({
       target: `${o.oracle.packageId}::oracle_pro::update_single_price_v2`,
       arguments: [
         e.object("0x6"),
@@ -2115,7 +2108,7 @@ async function $e(e) {
     cacheTime: v
   })).oracle.feeds;
 }
-function Ot(e, t) {
+function Et(e, t) {
   return e.filter((r) => !!(t?.lendingState && t.lendingState.find((n) => r.oracleId === n.pool.oracleId) || t?.lendingPositions && t.lendingPositions.find((n) => {
     if (![
       "navi-lending-supply",
@@ -2141,7 +2134,7 @@ async function yr(e, t, r, o) {
       ...o,
       markets: c
     });
-    return n = Ot(a, {
+    return n = Et(a, {
       lendingPositions: i,
       pools: r
     }), await fe(e, n, {
@@ -2166,8 +2159,8 @@ async function yr(e, t, r, o) {
 const ne = $(
   A(
     async (e) => {
-      const t = E(e), r = M(
-        `/navi/flashloan?env=${e?.env || "prod"}&sdk=${O.version}&market=${e?.market || R}`,
+      const t = O(e), r = M(
+        `/navi/flashloan?env=${e?.env || "prod"}&sdk=${E.version}&market=${e?.market || R}`,
         e
       ), o = await fetch(r, {
         headers: U(D, t)
@@ -2313,7 +2306,7 @@ async function br(e, t, r, o, n, a) {
     return [m, w];
   }
 }
-async function Et(e, t, r) {
+async function Ot(e, t, r) {
   const o = r?.client ?? V, n = await G({
     ...r,
     markets: Object.values(F),
@@ -2362,9 +2355,9 @@ async function Et(e, t, r) {
           const g = y[0].length;
           for (let d = 0; d < g; d++) {
             const f = a.find(
-              (I) => C(I.coinType) === C(y[1][d])
+              (k) => C(k.coinType) === C(y[1][d])
             ), b = n.find(
-              (I) => C(I.coinType) === C(y[0][d]) && I.market === i.market
+              (k) => C(k.coinType) === C(y[0][d]) && k.market === i.market
             );
             !f || !b || c.push({
               assetId: b.id,
@@ -2405,7 +2398,7 @@ async function vr(e, t) {
       };
     })
   );
-  return await Et(e, n, t);
+  return await Ot(e, n, t);
 }
 function Cr(e) {
   const t = /* @__PURE__ */ new Map();
@@ -2438,18 +2431,18 @@ function Cr(e) {
 }
 const jr = A(
   async (e, t) => {
-    const r = E(t), o = M(
-      `/navi/user/total_claimed_reward?userAddress=${e}&sdk=${O.version}&market=${t?.market || R}`,
+    const r = O(t), o = M(
+      `/navi/user/total_claimed_reward?userAddress=${e}&sdk=${E.version}&market=${t?.market || R}`,
       t
     );
     return (await fetch(o, {
       headers: U(D, r)
     }).then((a) => a.json())).data;
   }
-), Ir = A(
+), kr = A(
   async (e, t) => {
-    const r = E(t), o = M(
-      `/navi/user/rewards?userAddress=${e}&page=${t?.page || 1}&pageSize=${t?.size || 400}&sdk=${O.version}&market=${t?.market || R}`,
+    const r = O(t), o = M(
+      `/navi/user/rewards?userAddress=${e}&page=${t?.page || 1}&pageSize=${t?.size || 400}&sdk=${E.version}&market=${t?.market || R}`,
       t
     ), n = await fetch(o, {
       headers: U(D, r)
@@ -2459,7 +2452,7 @@ const jr = A(
     });
   }
 );
-async function kr(e, t, r) {
+async function Ir(e, t, r) {
   const o = await G({
     ...r,
     markets: Object.values(F),
@@ -2491,17 +2484,17 @@ async function kr(e, t, r) {
       cacheTime: v,
       market: m
     }), f = c.split("___")[0], b = o.filter(
-      (k) => C(k.suiCoinType) === C(f)
+      (I) => C(I.suiCoinType) === C(f)
     );
-    b.sort((k, B) => k.market === m ? -1 : 1);
-    const I = b[0], T = d.rewardFunds[C(f)];
+    b.sort((I, B) => I.market === m ? -1 : 1);
+    const k = b[0], T = d.rewardFunds[C(f)];
     if (!T)
       throw new Error(`No matching rewardFund found for reward coin: ${f} ${m}`);
     if (r?.accountCap && !r.customCoinReceive)
       throw new Error("customCoinReceive is required when accountCap is provided");
     if (r?.customCoinReceive) {
-      let k;
-      r.accountCap ? k = e.moveCall({
+      let I;
+      r.accountCap ? I = e.moveCall({
         target: `${d.package}::incentive_v3::claim_reward_with_account_cap`,
         arguments: [
           e.object("0x06"),
@@ -2520,7 +2513,7 @@ async function kr(e, t, r) {
           // Account capability
         ],
         typeArguments: [f]
-      }) : g ? k = e.moveCall({
+      }) : g ? I = e.moveCall({
         target: `${d.package}::incentive_v3::claim_reward_with_account_cap`,
         arguments: [
           e.object("0x06"),
@@ -2539,7 +2532,7 @@ async function kr(e, t, r) {
           // Account capability
         ],
         typeArguments: [f]
-      }) : k = e.moveCall({
+      }) : I = e.moveCall({
         target: `${d.package}::incentive_v3::claim_reward`,
         arguments: [
           e.object("0x06"),
@@ -2559,7 +2552,7 @@ async function kr(e, t, r) {
       });
       const [B] = e.moveCall({
         target: "0x2::coin::from_balance",
-        arguments: [k],
+        arguments: [I],
         typeArguments: [f]
       });
       if (r?.customCoinReceive.type === "transfer") {
@@ -2571,23 +2564,23 @@ async function kr(e, t, r) {
         );
       }
       if (r?.customCoinReceive.type === "depositNAVI") {
-        const W = p(I.totalSupplyAmount).shiftedBy(-9), Y = p(I.supplyCapCeiling).shiftedBy(-27);
+        const W = p(k.totalSupplyAmount).shiftedBy(-9), Y = p(k.supplyCapCeiling).shiftedBy(-27);
         W.plus(u).isGreaterThan(Y) && r?.customCoinReceive.depositNAVI?.fallbackReceiveAddress ? e.transferObjects(
           [B],
           e.pure.address(r.customCoinReceive.depositNAVI.fallbackReceiveAddress)
-        ) : await vt(e, I, B, {
+        ) : await vt(e, k, B, {
           ...r,
-          market: I.market
+          market: k.market
         });
       } else
         a.push({
           coin: B,
-          identifier: I,
+          identifier: k,
           owner: w,
           isEMode: g
         });
     } else if (r?.accountCap || g) {
-      const k = e.moveCall({
+      const I = e.moveCall({
         target: `${d.package}::incentive_v3::claim_reward_with_account_cap`,
         arguments: [
           e.object("0x06"),
@@ -2608,7 +2601,7 @@ async function kr(e, t, r) {
         typeArguments: [f]
       }), [B] = e.moveCall({
         target: "0x2::coin::from_balance",
-        arguments: [k],
+        arguments: [I],
         typeArguments: [f]
       });
       e.transferObjects(
@@ -2658,9 +2651,9 @@ export {
   ze as UserStateInfo,
   er as borrowCoinPTB,
   M as buildNaviOpenApiUrl,
-  kr as claimLendingRewardsPTB,
+  Ir as claimLendingRewardsPTB,
   Yt as configureNaviSdk,
-  It as createAccountCapPTB,
+  kt as createAccountCapPTB,
   ar as createEModeCapPTB,
   ve as createNaviLegacyJsonRpcClient,
   rt as createNaviSuiClient,
@@ -2669,9 +2662,9 @@ export {
   ir as emodeIdentityId,
   _t as enterEModePTB,
   or as exitEModePTB,
-  Ot as filterPriceFeeds,
+  Et as filterPriceFeeds,
   hr as flashloanPTB,
-  kt as getAccountCapOwnerPTB,
+  It as getAccountCapOwnerPTB,
   Jt as getAddressBalance,
   ne as getAllFlashLoanAssets,
   rr as getBorrowFee,
@@ -2697,7 +2690,7 @@ export {
   Zt as getStats,
   dr as getTransactions,
   vr as getUserAvailableLendingRewards,
-  Ir as getUserClaimedRewardHistory,
+  kr as getUserClaimedRewardHistory,
   Be as getUserEModeCaps,
   jr as getUserTotalClaimedReward,
   br as liquidatePTB,
@@ -2711,7 +2704,7 @@ export {
   tr as repayCoinPTB,
   wr as repayFlashLoanPTB,
   Qt as requireNaviGraphQLClient,
-  E as resolveNaviOpenApiEndpoint,
+  O as resolveNaviOpenApiEndpoint,
   Cr as summaryLendingRewards,
   yr as updateOraclePriceBeforeUserOperationPTB,
   fe as updateOraclePricesPTB,