@naviprotocol/lending 1.4.4-beta.4 → 1.4.4-beta.6

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { Transaction as N } from "@mysten/sui/transactions";
+import { Transaction as F } from "@mysten/sui/transactions";
 import { bcs as m, toHex as ce, fromHex as se } from "@mysten/bcs";
 import { SuiClient as le, getFullnodeUrl as ue } from "@mysten/sui/client";
 import pe from "lodash.camelcase";
@@ -129,7 +129,7 @@ const K = m.bytes(32).transform({
   borrow_balance: m.u256(),
   /** User's current supply balance */
   supply_balance: m.u256()
-}), ge = "1.4.4-beta.4", V = {
+}), ge = "1.4.4-beta.6", V = {
   version: ge
 }, he = V.version, ve = () => {
   if (typeof process < "u" && process.versions && process.versions.node)
@@ -256,12 +256,12 @@ var R = /* @__PURE__ */ ((e) => (e[e.Supply = 1] = "Supply", e[e.Withdraw = 2] =
 const q = P(
   B(
     async (e) => {
-      const r = (e?.markets || [E.main]).map((t) => I(t)), o = `https://open-api.naviprotocol.io/api/navi/pools?env=${e?.env || "prod"}&sdk=${V.version}&market=${r.map(
+      const r = (e?.markets || [E.main]).map((t) => j(t)), o = `https://open-api.naviprotocol.io/api/navi/pools?env=${e?.env || "prod"}&sdk=${V.version}&market=${r.map(
         (t) => t.key
       )}`, n = await fetch(o, { headers: M }).then((t) => t.json());
       return n.data.forEach((t) => {
         const s = n.meta.emodes.filter((f) => {
-          const k = I(f.marketId);
+          const k = j(f.marketId);
           return t.market === k.key && f.isActive;
         }).filter((f) => !!f.assets.find((k) => k.assetId === t.id));
         t.emodes = s;
@@ -586,7 +586,7 @@ const tt = P(
       });
       if (e?.address && typeof e?.asset < "u")
         try {
-          const t = await A(e.asset, e), a = e?.client ?? S, s = new N();
+          const t = await A(e.asset, e), a = e?.client ?? S, s = new F();
           s.moveCall({
             target: `${r.package}::incentive_v3::get_borrow_fee_v2`,
             arguments: [
@@ -634,7 +634,7 @@ class je {
     this.poolMap = {}, this.emodeMap = {}, this.pools = [], this.emodes = [], this.emodePools = [], this.emodeBorrowablePools = [], this.emodeSupplyablePools = [], this._overview = {
       marketTotalSupplyValue: "0",
       marketTotalBorrowValue: "0"
-    }, this.config = I(r), this.initPools(o);
+    }, this.config = j(r), this.initPools(o);
   }
   get overview() {
     return this._overview;
@@ -692,7 +692,7 @@ class je {
     return typeof r == "number" && r === this.config.id && (o = !0), typeof r == "string" && r === this.config.key && (o = !0), typeof r == "object" && r.id === this.config.id && (o = !0), o;
   }
 }
-const I = (e) => {
+const j = (e) => {
   const o = Object.values(E).find((n) => typeof e == "number" ? n.id === e : typeof e == "string" ? n.key === e : n.id === e.id);
   if (!o)
     throw new Error("Market not found");
@@ -706,7 +706,7 @@ const I = (e) => {
         markets: e
       });
       return e.map((n) => {
-        const t = I(n), a = o.filter((s) => s.market === t.key);
+        const t = j(n), a = o.filter((s) => s.market === t.key);
         return new je(n, a);
       });
     }
@@ -718,7 +718,7 @@ const I = (e) => {
 ), _ = P(
   B(
     async (e) => {
-      const r = I(e?.market || U), o = `https://open-api.naviprotocol.io/api/navi/config?env=${e?.env || "prod"}&sdk=${V.version}&market=${r.key}`;
+      const r = j(e?.market || U), o = `https://open-api.naviprotocol.io/api/navi/config?env=${e?.env || "prod"}&sdk=${V.version}&market=${r.key}`;
       return (await fetch(o, { headers: M }).then((t) => t.json())).data;
     }
   )
@@ -782,7 +782,7 @@ async function nt(e, r, o) {
     ...o,
     accountCap: t
   });
-  const a = await I(o?.market || U), s = await Be(e, t, o);
+  const a = await j(o?.market || U), s = await Be(e, t, o);
   return e.moveCall({
     target: `${n.emode.contract.registryPackage}::registry::register_emode_for_account_cap`,
     arguments: [
@@ -799,7 +799,7 @@ const ee = P(
       const o = await _({
         cacheTime: w,
         ...r
-      }), n = new N(), t = r?.client ?? S;
+      }), n = new F(), t = r?.client ?? S;
       n.moveCall({
         target: `${o.emode.contract.registryPackage}::registry::find_user_emode_account_caps`,
         arguments: [n.object(o.emode.contract.registryObject), n.pure.address(e)]
@@ -817,7 +817,7 @@ const ee = P(
   )
 );
 function at(e) {
-  return `${I(e.marketId).key}-${e.emodeId}`;
+  return `${j(e.marketId).key}-${e.emodeId}`;
 }
 function it(e, r, o) {
   const n = typeof o?.balance == "number", t = n ? o.balance : 0;
@@ -863,7 +863,7 @@ async function Pe(e, r, o) {
   return te(e, r, 0, 0, 0, !1, o);
 }
 async function oe(e, r, o) {
-  const n = new N(), t = o?.client ?? S, a = await q({
+  const n = new F(), t = o?.client ?? S, a = await q({
     ...o,
     markets: Object.values(E)
   }), s = G(a);
@@ -883,7 +883,7 @@ async function oe(e, r, o) {
     sender: e
   })).results || []).map((d) => d.returnValues?.map((y) => C.vector(ye).parse(Uint8Array.from(y[0])))[0] || []), l = [];
   return c.forEach((d, y) => {
-    const v = r[y], g = I(v.market);
+    const v = r[y], g = j(v.market);
     d.forEach((u) => {
       if (u.supply_balance === "0" && u.borrow_balance === "0" && (v.emodeId === void 0 || !o?.includeZeroBalanceEmodePositions))
         return;
@@ -893,13 +893,13 @@ async function oe(e, r, o) {
       const k = J(
         u.supply_balance,
         f.currentSupplyIndex
-      ).toString(), j = J(
+      ).toString(), I = J(
         u.borrow_balance,
         f.currentBorrowIndex
       ).toString();
       l.push({
         supplyBalance: k,
-        borrowBalance: j,
+        borrowBalance: I,
         assetId: u.asset_id,
         market: g.key,
         pool: f,
@@ -910,7 +910,7 @@ async function oe(e, r, o) {
 }
 const ct = P(
   async (e, r) => {
-    const n = (r?.markets || Object.keys(E)).map((t) => I(t)).map((t) => ({
+    const n = (r?.markets || Object.keys(E)).map((t) => j(t)).map((t) => ({
       address: e,
       market: t.key
     }));
@@ -918,7 +918,7 @@ const ct = P(
   }
 );
 async function st(e, r) {
-  const o = r?.client ?? S, n = new N();
+  const o = r?.client ?? S, n = new F();
   await Pe(n, e, r);
   const t = await o.devInspectTransactionBlock({
     transactionBlock: n,
@@ -927,7 +927,7 @@ async function st(e, r) {
   return x(Number(a[0]) || 0);
 }
 async function lt(e, r, o, n) {
-  const t = n?.client ?? S, a = new N();
+  const t = n?.client ?? S, a = new F();
   let s = 0, i = 0;
   const c = await A(r, n);
   if (o.forEach((v) => {
@@ -980,7 +980,7 @@ async function pt(e, r) {
 }
 const $e = P(
   async (e, r) => {
-    const o = [], n = (r?.markets || Object.keys(E)).map((i) => I(i));
+    const o = [], n = (r?.markets || Object.keys(E)).map((i) => j(i));
     let t = [];
     try {
       t = await ee(e, r);
@@ -993,13 +993,13 @@ const $e = P(
     })).concat(
       t.filter((i) => !!n.find((c) => c.id === i.marketId)).map((i) => ({
         address: i.accountCap,
-        market: I(i.marketId).key,
+        market: j(i.marketId).key,
         emodeId: i.emodeId
       }))
     );
     return (await oe(e, a, r)).forEach((i) => {
       const c = typeof i.emodeId == "number" ? t.find((l) => {
-        const d = I(i.market);
+        const d = j(i.market);
         return l.emodeId === i.emodeId && l.marketId === d.id;
       }) : void 0;
       if (c) {
@@ -1086,7 +1086,7 @@ const $e = P(
     }), o;
   }
 );
-class O {
+class N {
   constructor(r, o) {
     this._positions = [], this._priceMap = {}, this._overview = {
       hf: 1 / 0,
@@ -1126,7 +1126,7 @@ class O {
   }
   filterPositionsByPool(r) {
     const n = !!r.isEMode ? ["navi-lending-emode-supply", "navi-lending-emode-borrow"] : ["navi-lending-supply", "navi-lending-borrow"];
-    return new O(
+    return new N(
       this.positions.filter((t) => {
         const a = t[t.type];
         return n.includes(t.type) && a.pool.uniqueId === r.uniqueId;
@@ -1162,7 +1162,7 @@ class O {
         token: r.token,
         pool: r
       }
-    }, new O([...this.positions, a], this._priceMap);
+    }, new N([...this.positions, a], this._priceMap);
   }
   withdraw(r, o) {
     const n = !!r.isEMode, t = this.getPrice(r);
@@ -1192,7 +1192,7 @@ class O {
         token: r.token,
         pool: r
       }
-    }, new O([...this.positions, a], this._priceMap);
+    }, new N([...this.positions, a], this._priceMap);
   }
   borrow(r, o) {
     const n = !!r.isEMode, t = this.getPrice(r);
@@ -1222,7 +1222,7 @@ class O {
         token: r.token,
         pool: r
       }
-    }, new O([...this.positions, a], this._priceMap);
+    }, new N([...this.positions, a], this._priceMap);
   }
   repay(r, o) {
     const n = !!r.isEMode, t = this.getPrice(r);
@@ -1252,7 +1252,7 @@ class O {
         token: r.token,
         pool: r
       }
-    }, new O([...this.positions, a], this._priceMap);
+    }, new N([...this.positions, a], this._priceMap);
   }
   resolveValueUSD(r) {
     return Object.keys(this._priceMap).length > 0 ? p(r.amount).multipliedBy(this.getPrice(r.pool)).toString() : r.valueUSD;
@@ -1680,7 +1680,7 @@ async function vt(e, r, o, n, t, a) {
   }
 }
 async function Ue(e, r, o) {
-  const n = o?.client ?? S, t = new N(), a = await q({
+  const n = o?.client ?? S, t = new F(), a = await q({
     ...o,
     markets: Object.values(E),
     cacheTime: w
@@ -1737,9 +1737,9 @@ async function Ue(e, r, o) {
       const g = d[0].length;
       for (let u = 0; u < g; u++) {
         const f = s.find(
-          (j) => b(j.coinType) === b(d[1][u])
+          (I) => b(I.coinType) === b(d[1][u])
         ), k = a.find(
-          (j) => b(j.coinType) === b(d[0][u]) && j.market === v.market
+          (I) => b(I.coinType) === b(d[0][u]) && I.market === v.market
         );
         !f || !k || l.push({
           assetId: k.id,
@@ -1758,7 +1758,7 @@ async function Ue(e, r, o) {
   }), l;
 }
 async function wt(e, r) {
-  const o = (r?.markets || [E.main]).map((a) => I(a));
+  const o = (r?.markets || [E.main]).map((a) => j(a));
   let n = [];
   try {
     n = await ee(e, r);
@@ -1771,7 +1771,7 @@ async function wt(e, r) {
     market: a.key
   })).concat(
     n.filter((a) => !!o.find((s) => s.id === a.marketId)).map((a) => {
-      const s = I(a.marketId);
+      const s = j(a.marketId);
       return {
         address: a.accountCap,
         owner: e,
@@ -1831,7 +1831,7 @@ async function Ct(e, r, o) {
     cacheTime: w
   }), t = /* @__PURE__ */ new Map();
   for (const s of r) {
-    const { rewardCoinType: i, ruleIds: c, market: l, owner: d, address: y, emodeId: v } = s, g = `${i}___${y}`;
+    const { rewardCoinType: i, ruleIds: c, market: l, owner: d, address: y, emodeId: v } = s, g = `${i}___${y}__${l}`;
     for (const u of c) {
       t.has(g) || t.set(g, {
         assetIds: [],
@@ -1857,10 +1857,9 @@ async function Ct(e, r, o) {
       market: d
     }), f = s.split("___")[0], k = n.filter(($) => b($.suiCoinType) === b(f));
     k.sort(($, D) => $.market === d ? -1 : 1);
-    const j = k[0];
-    if (!j || !j.contract.rewardFundId)
+    const I = k[0], O = u.rewardFunds[b(f)];
+    if (!O)
       throw new Error(`No matching rewardFund found for reward coin: ${f} ${d}`);
-    const F = j.contract.rewardFundId;
     if (o?.accountCap && !o.customCoinReceive)
       throw new Error("customCoinReceive is required when accountCap is provided");
     if (o?.customCoinReceive) {
@@ -1874,7 +1873,7 @@ async function Ct(e, r, o) {
           // Incentive V3 contract
           e.object(u.storage),
           // Protocol storage
-          e.object(F),
+          e.object(O),
           // Reward fund
           e.pure.vector("string", i),
           // Asset IDs
@@ -1893,7 +1892,7 @@ async function Ct(e, r, o) {
           // Incentive V3 contract
           e.object(u.storage),
           // Protocol storage
-          e.object(F),
+          e.object(O),
           // Reward fund
           e.pure.vector("string", i),
           // Asset IDs
@@ -1912,7 +1911,7 @@ async function Ct(e, r, o) {
           // Incentive V3 contract
           e.object(u.storage),
           // Protocol storage
-          e.object(F),
+          e.object(O),
           // Reward fund
           e.pure.vector("string", i),
           // Asset IDs
@@ -1935,18 +1934,18 @@ async function Ct(e, r, o) {
         );
       }
       if (o?.customCoinReceive.type === "depositNAVI") {
-        const ae = p(j.totalSupplyAmount).shiftedBy(-9), ie = p(j.supplyCapCeiling).shiftedBy(-27);
+        const ae = p(I.totalSupplyAmount).shiftedBy(-9), ie = p(I.supplyCapCeiling).shiftedBy(-27);
         ae.plus(l).isGreaterThan(ie) && o?.customCoinReceive.depositNAVI?.fallbackReceiveAddress ? e.transferObjects(
           [D],
           e.pure.address(o.customCoinReceive.depositNAVI.fallbackReceiveAddress)
-        ) : await Ce(e, j, D, {
+        ) : await Ce(e, I, D, {
           ...o,
-          market: j.market
+          market: I.market
         });
       } else
         a.push({
           coin: D,
-          identifier: j,
+          identifier: I,
           owner: y,
           isEMode: g
         });
@@ -1960,7 +1959,7 @@ async function Ct(e, r, o) {
           // Incentive V3 contract
           e.object(u.storage),
           // Protocol storage
-          e.object(F),
+          e.object(O),
           // Reward fund
           e.pure.vector("string", i),
           // Asset IDs
@@ -1989,7 +1988,7 @@ async function Ct(e, r, o) {
           // Incentive V3 contract
           e.object(u.storage),
           // Protocol storage
-          e.object(F),
+          e.object(O),
           // Reward fund
           e.pure.vector("string", i),
           // Asset IDs
@@ -2014,7 +2013,7 @@ export {
   Ke as OracleInfo,
   R as PoolOperator,
   Je as ReserveDataInfo,
-  O as UserPositions,
+  N as UserPositions,
   ye as UserStateInfo,
   xe as borrowCoinPTB,
   Ct as claimLendingRewardsPTB,
@@ -2038,7 +2037,7 @@ export {
   $e as getLendingPositions,
   ct as getLendingState,
   ot as getMarket,
-  I as getMarketConfig,
+  j as getMarketConfig,
   Ie as getMarkets,
   A as getPool,
   q as getPools,