@1delta/margin-fetcher-sol 0.0.2 → 0.0.3

package/dist/index.js

@@ -309,6 +309,7 @@ __export(index_exports, {
   decodeHumaPoolConfig: () => decodeHumaPoolConfig,
   decodeHumaPoolState: () => decodeHumaPoolState,
   decodeHumaRedemptionRequest: () => decodeHumaRedemptionRequest,
+  decodeJlRateModel: () => decodeJlRateModel,
   decodeJuniorUnlockShare: () => decodeJuniorUnlockShare,
   decodeJupFlashloanAdmin: () => decodeJupFlashloanAdmin,
   decodeKaminoObligation: () => decodeKaminoObligation,
@@ -508,6 +509,7 @@ __export(index_exports, {
   readHumaChainState: () => readHumaChainState,
   readHumaLenderState: () => readHumaLenderState,
   readHumaRedemptionRequests: () => readHumaRedemptionRequests,
+  readJlLayerIrms: () => readJlLayerIrms,
   readJlNextVaultId: () => readJlNextVaultId,
   readJupFlashAssets: () => readJupFlashAssets,
   readJupFlashAvailable: () => readJupFlashAvailable,
@@ -8397,6 +8399,8 @@ var RESERVE = {
   maxLiquidationBonusBps: 4876,
   originationFeeSf: 4896,
   flashLoanFeeSf: 4904,
+  // config.borrowRateCurve — 11 × CurvePoint { utilizationRateBps u32, borrowRateBps u32 }, after fees' 8 padding bytes
+  borrowRateCurve: 4920,
   borrowFactorPct: 5008,
   depositLimit: 5016,
   borrowLimit: 5024,
@@ -8539,6 +8543,14 @@ function readKlendReserveChain(reserve, data) {
     debtWithdrawalCap: withdrawalCap(data, RESERVE.debtWithdrawalCap),
     disableUsageAsCollOutsideEmode: data[RESERVE.disableUsageAsCollOutsideEmode] !== 0,
     utilizationLimitBlockBorrowingAbovePct: data[RESERVE.utilizationLimitBlockBorrowingAbovePct],
+    borrowRateCurve: Array.from({ length: 11 }, (_, i) => {
+      const v = new DataView(data.buffer, data.byteOffset);
+      const off = RESERVE.borrowRateCurve + 8 * i;
+      return [
+        v.getUint32(off, true) / 1e4,
+        v.getUint32(off + 4, true) / 1e4
+      ];
+    }),
     borrowLimitOutsideElevationGroup: u64(
       data,
       RESERVE.borrowLimitOutsideElevationGroup
@@ -9035,6 +9047,15 @@ function exchangeRateOf(inp) {
   if (!t || !s || t.num <= 0n || s.num <= 0n) return { num: 1n, den: 1n };
   return { num: t.num * s.den, den: t.den * s.num };
 }
+function dedupeKnots(knots) {
+  const out = [];
+  for (const k of knots) {
+    const last = out[out.length - 1];
+    if (last && last[0] === k[0] && last[1] === k[1]) continue;
+    out.push(k);
+  }
+  return out;
+}
 function convertKaminoReserve(inp, ctx) {
   const { stats, metrics, detail, chain } = inp;
   const mint = chain?.mint ?? stats.token;
@@ -9132,7 +9153,12 @@ function convertKaminoReserve(inp, ctx) {
       interestRateBasis: stats.interestRateBasis,
       protocolTakeRatePct: stats.protocolTakeRatePct,
       hostFixedInterestRateBps: stats.hostFixedInterestRateBps,
-      borrowCurve: detail.borrowCurve,
+      borrowCurve: chain ? dedupeKnots(chain.borrowRateCurve) : detail.borrowCurve,
+      borrowCurveSource: chain ? "chain" : "api",
+      ...stats.interestRateBasis === "legacy" && ctx.slotSeconds ? { slotSeconds: ctx.slotSeconds } : {},
+      ...chain ? {
+        utilizationLimitBlockBorrowingAbovePct: chain.utilizationLimitBlockBorrowingAbovePct
+      } : {},
       autoDeleverage: stats.autoDeleverage,
       source: chain ? "chain" : "api",
       maxLiquidationBonus: chain ? chain.maxLiquidationBonusBps / 1e4 : num(detail.maxLiquidationBonus),
@@ -9178,6 +9204,7 @@ function convertKaminoMarket(inp) {
       closeFactor,
       chainMarket: inp.chainMarket,
       slot: inp.slot,
+      slotSeconds: inp.slotSeconds,
       tokenList: inp.tokenList
     });
     data[row.marketUid] = row;
@@ -9193,6 +9220,7 @@ function convertKaminoMarket(inp) {
 }
 
 // src/lending/public-data/kamino/fetchPublic.ts
+var import_svm_kit2 = require("@1delta/svm-kit");
 async function fetchKaminoPublic(opts = {}) {
   const api = createKaminoApi(opts);
   const { markets, metricsByMarket } = await listServedMarkets(api, opts);
@@ -9259,6 +9287,7 @@ async function fetchKaminoPublic(opts = {}) {
     return false;
   });
   const rpc = opts.rpc;
+  const slotSeconds = opts.slotSeconds ?? (rpc ? await (0, import_svm_kit2.measureSlotSeconds)(rpc) : void 0);
   const chainReads = await Promise.all(
     served.map(async (mr) => {
       if (!rpc) return void 0;
@@ -9291,7 +9320,8 @@ async function fetchKaminoPublic(opts = {}) {
       reserves,
       ...chain?.market ? { chainMarket: chain.market, slot: chain.slot } : {},
       leveragePairs: mr.leveragePairs,
-      tokenList: opts.tokenList
+      tokenList: opts.tokenList,
+      slotSeconds
     });
     out[conv.lenderKey] = {
       chainId: conv.chainId,
@@ -9345,7 +9375,7 @@ init_types();
 init_lenders();
 
 // src/lending/public-data/jupiter-lend/onchain.ts
-var import_svm_kit3 = require("@1delta/svm-kit");
+var import_svm_kit4 = require("@1delta/svm-kit");
 
 // src/lending/public-data/jupiter-lend/idl/vaults-accounts.json
 var vaults_accounts_default = {
@@ -10177,7 +10207,7 @@ var vaults_accounts_default = {
 };
 
 // src/lending/public-data/jupiter-lend/flashloan.ts
-var import_svm_kit2 = require("@1delta/svm-kit");
+var import_svm_kit3 = require("@1delta/svm-kit");
 
 // src/lending/public-data/jupiter-lend/idl/flashloan.json
 var flashloan_default = {
@@ -10753,27 +10783,27 @@ var JUP_LIQUIDITY_PROGRAMS = {
 };
 var utf82 = (s) => new TextEncoder().encode(s);
 var pk2 = (address) => {
-  const b = (0, import_svm_kit2.decodeBase58)(address);
+  const b = (0, import_svm_kit3.decodeBase58)(address);
   if (!b || b.length !== 32) throw new Error(`not a pubkey: ${address}`);
   return b;
 };
-var jupFlashloanAdmin = async (market = "main") => (await (0, import_svm_kit2.findProgramAddress)(
+var jupFlashloanAdmin = async (market = "main") => (await (0, import_svm_kit3.findProgramAddress)(
   [utf82("flashloan_admin")],
   JUP_FLASHLOAN_PROGRAMS[market]
 )).address;
-var jupLiquidity = async (market = "main") => (await (0, import_svm_kit2.findProgramAddress)(
+var jupLiquidity = async (market = "main") => (await (0, import_svm_kit3.findProgramAddress)(
   [utf82("liquidity")],
   JUP_LIQUIDITY_PROGRAMS[market]
 )).address;
-var jupLiquidityReserve = async (mint, market = "main") => (await (0, import_svm_kit2.findProgramAddress)(
+var jupLiquidityReserve = async (mint, market = "main") => (await (0, import_svm_kit3.findProgramAddress)(
   [utf82("reserve"), pk2(mint)],
   JUP_LIQUIDITY_PROGRAMS[market]
 )).address;
-var jupRateModel = async (mint, market = "main") => (await (0, import_svm_kit2.findProgramAddress)(
+var jupRateModel = async (mint, market = "main") => (await (0, import_svm_kit3.findProgramAddress)(
   [utf82("rate_model"), pk2(mint)],
   JUP_LIQUIDITY_PROGRAMS[market]
 )).address;
-var jupFlashBorrowPosition = async (mint, market = "main") => (await (0, import_svm_kit2.findProgramAddress)(
+var jupFlashBorrowPosition = async (mint, market = "main") => (await (0, import_svm_kit3.findProgramAddress)(
   [
     utf82("user_borrow_position"),
     pk2(mint),
@@ -10781,9 +10811,9 @@ var jupFlashBorrowPosition = async (mint, market = "main") => (await (0, import_
   ],
   JUP_LIQUIDITY_PROGRAMS[market]
 )).address;
-var jupLiquidityVault = async (mint, tokenProgram, market = "main") => (0, import_svm_kit2.getAssociatedTokenAddress)(await jupLiquidity(market), mint, tokenProgram);
+var jupLiquidityVault = async (mint, tokenProgram, market = "main") => (0, import_svm_kit3.getAssociatedTokenAddress)(await jupLiquidity(market), mint, tokenProgram);
 function decodeJupFlashloanAdmin(data) {
-  const a = (0, import_svm_kit2.decodeIdlAccount)(JUP_FLASHLOAN_IDL, "FlashloanAdmin", data);
+  const a = (0, import_svm_kit3.decodeIdlAccount)(JUP_FLASHLOAN_IDL, "FlashloanAdmin", data);
   return {
     authority: a.authority,
     liquidityProgram: a.liquidity_program,
@@ -10799,7 +10829,7 @@ async function readJupFlashloanAdmin(rpc, market = "main") {
   const { accounts } = await rpc.readAccounts([address], { encoding: "base64" });
   const a = accounts[0];
   if (!a || a.owner !== JUP_FLASHLOAN_PROGRAMS[market]) return null;
-  return decodeJupFlashloanAdmin((0, import_svm_kit2.fromBase64)(a.data[0]));
+  return decodeJupFlashloanAdmin((0, import_svm_kit3.fromBase64)(a.data[0]));
 }
 async function readJupFlashAssets(rpc, market = "main") {
   const admin = await jupFlashloanAdmin(market);
@@ -10816,7 +10846,7 @@ async function readJupFlashAssets(rpc, market = "main") {
     { accounts: 1 }
   );
   const mints = /* @__PURE__ */ new Set();
-  for (const r of rows) mints.add((0, import_svm_kit2.encodeBase58)((0, import_svm_kit2.fromBase64)(r.account.data[0])));
+  for (const r of rows) mints.add((0, import_svm_kit3.encodeBase58)((0, import_svm_kit3.fromBase64)(r.account.data[0])));
   return [...mints];
 }
 async function readJupFlashAvailable(rpc, mint, tokenProgram, market = "main") {
@@ -10849,22 +10879,22 @@ var u16le = (n) => new Uint8Array([n & 255, n >> 8 & 255]);
 var big = (v) => BigInt(v ?? 0);
 var maxB = (a, b) => a > b ? a : b;
 var minB = (a, b) => a < b ? a : b;
-var jlVaultConfigPda = async (vaultId, market = "main") => (await (0, import_svm_kit3.findProgramAddress)(
+var jlVaultConfigPda = async (vaultId, market = "main") => (await (0, import_svm_kit4.findProgramAddress)(
   [utf83("vault_config"), u16le(vaultId)],
   JUP_VAULTS_PROGRAMS[market]
 )).address;
-var jlVaultStatePda = async (vaultId, market = "main") => (await (0, import_svm_kit3.findProgramAddress)(
+var jlVaultStatePda = async (vaultId, market = "main") => (await (0, import_svm_kit4.findProgramAddress)(
   [utf83("vault_state"), u16le(vaultId)],
   JUP_VAULTS_PROGRAMS[market]
 )).address;
-var jlVaultAdminPda = async (market = "main") => (await (0, import_svm_kit3.findProgramAddress)([utf83("vault_admin")], JUP_VAULTS_PROGRAMS[market])).address;
-var liq = async (seeds, market) => (await (0, import_svm_kit3.findProgramAddress)(seeds, JUP_LIQUIDITY_PROGRAMS[market])).address;
+var jlVaultAdminPda = async (market = "main") => (await (0, import_svm_kit4.findProgramAddress)([utf83("vault_admin")], JUP_VAULTS_PROGRAMS[market])).address;
+var liq = async (seeds, market) => (await (0, import_svm_kit4.findProgramAddress)(seeds, JUP_LIQUIDITY_PROGRAMS[market])).address;
 var pk3 = async (a) => {
-  const b = (0, import_svm_kit3.decodeBase58)(a);
+  const b = (0, import_svm_kit4.decodeBase58)(a);
   if (!b || b.length !== 32) throw new Error(`not a pubkey: ${a}`);
   return b;
 };
-var dec = (name, data) => (0, import_svm_kit3.decodeIdlAccount)(JL_VAULTS_ACCOUNTS_IDL, name, (0, import_svm_kit3.fromBase64)(data));
+var dec = (name, data) => (0, import_svm_kit4.decodeIdlAccount)(JL_VAULTS_ACCOUNTS_IDL, name, (0, import_svm_kit4.fromBase64)(data));
 var ratio = (withInterest, free) => {
   if (withInterest > free) return [free * FOUR_DECIMALS / withInterest, false];
   if (withInterest < free) return [withInterest * FOUR_DECIMALS / free, true];
@@ -11164,7 +11194,7 @@ async function readJupiterLendVaultsOnchain(rpc, market, vaultIds, opts = {}) {
   for (const mint of mints) {
     const a = r2.m.get(mint);
     if (!a) continue;
-    const b = (0, import_svm_kit3.fromBase64)(a.data[0]);
+    const b = (0, import_svm_kit4.fromBase64)(a.data[0]);
     if (b.length >= 45) decimalsOf.set(mint, b[44]);
   }
   const reserves = /* @__PURE__ */ new Map();
@@ -11183,7 +11213,7 @@ async function readJupiterLendVaultsOnchain(rpc, market, vaultIds, opts = {}) {
   const balanceOf = (mint) => {
     const a = r3.m.get(vaultOf.get(mint) ?? "");
     if (!a) return 0n;
-    const b = (0, import_svm_kit3.fromBase64)(a.data[0]);
+    const b = (0, import_svm_kit4.fromBase64)(a.data[0]);
     return b.length >= 72 ? new DataView(b.buffer, b.byteOffset, b.byteLength).getBigUint64(
       64,
       true
@@ -11419,6 +11449,68 @@ async function readJupiterLendVaultsOnchain(rpc, market, vaultIds, opts = {}) {
   }
   return out;
 }
+function decodeJlRateModel(data) {
+  if (data.length < 53)
+    throw new Error(`RateModel is ${data.length} bytes, expected 53`);
+  const v = new DataView(data.buffer, data.byteOffset, data.byteLength);
+  const u16 = (o) => v.getUint16(o, true);
+  const version = data[40];
+  if (version !== 1 && version !== 2)
+    throw new Error(`RateModel version ${version} not supported`);
+  return {
+    version,
+    rateAtZero: u16(41),
+    kink1: u16(43),
+    rateAtKink1: u16(45),
+    rateAtMax: u16(47),
+    ...version === 2 ? { kink2: u16(49), rateAtKink2: u16(51) } : {}
+  };
+}
+async function readJlLayerIrms(rpc, market, mints, now = BigInt(Math.floor(Date.now() / 1e3))) {
+  const uniq = [...new Set(mints)];
+  const keys = await Promise.all(
+    uniq.map(async (m2) => ({
+      mint: m2,
+      model: await liq([utf83("rate_model"), await pk3(m2)], market),
+      reserve: await liq([utf83("reserve"), await pk3(m2)], market)
+    }))
+  );
+  const { m } = await read(
+    rpc,
+    keys.flatMap((k) => [k.model, k.reserve])
+  );
+  const out = /* @__PURE__ */ new Map();
+  for (const k of keys) {
+    const ma = m.get(k.model);
+    const ra = m.get(k.reserve);
+    if (!ma || !ra) continue;
+    try {
+      const model = decodeJlRateModel((0, import_svm_kit4.fromBase64)(ma.data[0]));
+      const r = dec("TokenReserve", ra.data[0]);
+      const o = jlOverallTokenData(r, now);
+      const P = JL_EXCHANGE_PRICES_PRECISION;
+      const bWi = Number(big(r.total_borrow_with_interest) * o.borrowEx / P);
+      const sWi = Number(big(r.total_supply_with_interest) * o.supplyEx / P);
+      const tb = Number(o.totalBorrow);
+      const ts = Number(o.totalSupply);
+      const u = ts > 0 ? tb / ts : 0;
+      const ratio2 = u > 0 && sWi > 0 ? bWi / sWi / u : 1;
+      out.set(k.mint, {
+        ...model,
+        feeOnInterest: Number(r.fee_on_interest),
+        maxUtilization: Number(o.maxUtilization),
+        supplyWithInterestRatio: Number.isFinite(ratio2) ? ratio2 : 1,
+        lastUtilization: Number(r.last_utilization),
+        borrowRate: Number(r.borrow_rate)
+      });
+    } catch (e) {
+      console.warn(
+        `[jupiter-lend] rate model for ${k.mint} not read: ${e.message}`
+      );
+    }
+  }
+  return out;
+}
 
 // src/lending/public-data/jupiter-lend/convertPublic.ts
 var JL_FACTOR_SCALE = 1e3;
@@ -11737,6 +11829,22 @@ async function fetchJupiterLendPublic(opts = {}) {
         }
       }
       const fromChain = new Map(chain.map((c) => [c.vault.id, c]));
+      let irms = /* @__PURE__ */ new Map();
+      if (opts.rpc) {
+        const mints = /* @__PURE__ */ new Set();
+        for (const v of [...vaults, ...chain.map((c) => c.vault)]) {
+          const cv = fromChain.get(v.id);
+          if (!cv?.smartCol) mints.add(v.supplyToken.address);
+          if (!cv?.smartDebt) mints.add(v.borrowToken.address);
+        }
+        try {
+          irms = await readJlLayerIrms(opts.rpc, market, [...mints]);
+        } catch (e) {
+          console.warn(
+            `[jupiter-lend] layer rate models for ${market} not read: ${e.message}`
+          );
+        }
+      }
       for (const v of [...vaults, ...chain.map((c) => c.vault)]) {
         if (only && !only.includes(v.id)) continue;
         const conv = convertJupiterLendVault(market, v, {
@@ -11745,6 +11853,15 @@ async function fetchJupiterLendPublic(opts = {}) {
           layer
         });
         const cv = fromChain.get(v.id);
+        const mags = {
+          supplyMagnifier: Number(v.supplyRateMagnifier) || 0,
+          borrowMagnifier: Number(v.borrowRateMagnifier) || 0
+        };
+        for (const row of Object.values(conv.data)) {
+          const smart = row.underlying === v.supplyToken.address ? cv?.smartCol : cv?.smartDebt;
+          const irm = smart ? void 0 : irms.get(row.underlying);
+          if (irm) row.jupiterLend = { irm: { ...irm, ...mags } };
+        }
         const meta = conv.params.jupiterLendVault;
         meta.source = cv ? "chain" : "api";
         if (cv) {
@@ -11796,7 +11913,7 @@ var SAVE_API_BASE = "https://api.save.finance";
 var SAVE_WAD = 10n ** 18n;
 var SAVE_U64_MAX = "18446744073709551615";
 var SAVE_SLOTS_PER_YEAR = 63072e3;
-var SAVE_DEFAULT_AVG_SLOT_SECONDS = 0.4;
+var SAVE_DEFAULT_AVG_SLOT_SECONDS = 0.2665;
 var SAVE_LIQUIDATION_CLOSE_FACTOR = 0.2;
 var SAVE_MAX_LIQUIDATABLE_VALUE_USD = 5e5;
 var SAVE_FULL_LIQUIDATION_VALUE_USD = 1;
@@ -12336,7 +12453,7 @@ function createPacer(intervalMs) {
 }
 
 // src/lending/public-data/loopscale/markets.ts
-var import_svm_kit4 = require("@1delta/svm-kit");
+var import_svm_kit5 = require("@1delta/svm-kit");
 async function buildLoopscaleRoster(vaults, loops, opts = {}) {
   const byKey = /* @__PURE__ */ new Map();
   const key2 = (p, c) => `${p}_${c}`;
@@ -12440,7 +12557,7 @@ async function buildLoopscaleRoster(vaults, loops, opts = {}) {
   ];
   const unresolved = [];
   if (toProbe.length && opts.rpc) {
-    const mints = await (0, import_svm_kit4.getMints)(opts.rpc, toProbe);
+    const mints = await (0, import_svm_kit5.getMints)(opts.rpc, toProbe);
     const dec2 = /* @__PURE__ */ new Map();
     mints.forEach((m, i) => m && dec2.set(toProbe[i], m.decimals));
     for (const pair of byKey.values()) {
@@ -12747,7 +12864,12 @@ function convertLoopscalePair(pair, opts) {
     termId: t.termId,
     durationDays: t.durationDays,
     durationSecs: t.durationDays * 86400,
-    apr: t.apr
+    apr: t.apr,
+    ladder: t.ladder.map((l) => ({
+      apr: l.apr,
+      assets: fmt2(l.sum, pDec),
+      fill: "single"
+    }))
   }));
   const common = {
     totalDebtStable: "0",
@@ -12887,11 +13009,11 @@ function convertLoopscalePair(pair, opts) {
 }
 
 // src/lending/public-data/loopscale/fetchPublic.ts
-var import_svm_kit6 = require("@1delta/svm-kit");
+var import_svm_kit7 = require("@1delta/svm-kit");
 init_lenders();
 
 // src/lending/public-data/loopscale/accounts.ts
-var import_svm_kit5 = require("@1delta/svm-kit");
+var import_svm_kit6 = require("@1delta/svm-kit");
 
 // src/lending/public-data/loopscale/idl/loopscale.json
 var loopscale_default = {
@@ -19874,8 +19996,8 @@ var podDecimalToNumber = (p) => Number(podToBigInt(p)) / 1e18;
 var podBool = (p) => bytesOf(p)[0] !== 0;
 var raw = (v) => v;
 function decodeLoopscaleLoan(data) {
-  const r = raw((0, import_svm_kit5.decodeIdlAccount)(LOOPSCALE_IDL, "Loan", data));
-  const zero = (0, import_svm_kit5.encodeBase58)(new Uint8Array(32));
+  const r = raw((0, import_svm_kit6.decodeIdlAccount)(LOOPSCALE_IDL, "Loan", data));
+  const zero = (0, import_svm_kit6.encodeBase58)(new Uint8Array(32));
   const ledgers = r.ledgers.map(
     (l) => ({
       status: l.status,
@@ -19919,7 +20041,7 @@ function decodeLoopscaleLoan(data) {
   };
 }
 function decodeLoopscaleStrategy(data) {
-  const r = raw((0, import_svm_kit5.decodeIdlAccount)(LOOPSCALE_IDL, "Strategy", data));
+  const r = raw((0, import_svm_kit6.decodeIdlAccount)(LOOPSCALE_IDL, "Strategy", data));
   return {
     version: r.version,
     nonce: r.nonce,
@@ -19956,13 +20078,13 @@ async function readLoopscaleLoans(rpc, loanAddresses) {
   return {
     slot,
     loans: accounts.map(
-      (a) => a && a.owner === LOOPSCALE_PROGRAM_ID ? decodeLoopscaleLoan((0, import_svm_kit5.fromBase64)(a.data[0])) : null
+      (a) => a && a.owner === LOOPSCALE_PROGRAM_ID ? decodeLoopscaleLoan((0, import_svm_kit6.fromBase64)(a.data[0])) : null
     )
   };
 }
 function decodeLoopscaleMarketInformation(data) {
-  const r = raw((0, import_svm_kit5.decodeIdlAccount)(LOOPSCALE_IDL, "MarketInformation", data));
-  const zero = (0, import_svm_kit5.encodeBase58)(new Uint8Array(32));
+  const r = raw((0, import_svm_kit6.decodeIdlAccount)(LOOPSCALE_IDL, "MarketInformation", data));
+  const zero = (0, import_svm_kit6.encodeBase58)(new Uint8Array(32));
   const caps = (c) => ({
     max1hr: podToBigInt(c.max_1hr).toString(),
     max24hr: podToBigInt(c.max_24hr).toString(),
@@ -20011,7 +20133,7 @@ async function readLoopscaleMarketInformation(rpc, addresses) {
     try {
       out.set(
         unique[i],
-        decodeLoopscaleMarketInformation((0, import_svm_kit5.fromBase64)(a.data[0]))
+        decodeLoopscaleMarketInformation((0, import_svm_kit6.fromBase64)(a.data[0]))
       );
     } catch (e) {
       console.warn(
@@ -20204,7 +20326,7 @@ async function fetchLoopscalePublic(opts = {}) {
     opts.vaults ?? api.vaults(),
     opts.loops ?? api.loops()
   ]);
-  const rpc = opts.rpc ?? (0, import_svm_kit6.createSvmRpc)();
+  const rpc = opts.rpc ?? (0, import_svm_kit7.createSvmRpc)();
   const { pairs, unresolved } = await buildLoopscaleRoster(vaults, loops, {
     ...opts,
     rpc
@@ -20365,7 +20487,7 @@ function deriveLoopscalePrices(vaults, loops, pairs, tokenList, loanBook) {
 }
 
 // src/prices/pythPush.ts
-var import_svm_kit7 = require("@1delta/svm-kit");
+var import_svm_kit8 = require("@1delta/svm-kit");
 var PYTH_RECEIVER_PROGRAM = "rec2HHDDnjLfj4kE7VyEtFA1HPGQLK33259532cRyHp";
 var PYTH_PRICE_UPDATE_V2_DISCRIMINATOR = [
   34,
@@ -20378,7 +20500,7 @@ var PYTH_PRICE_UPDATE_V2_DISCRIMINATOR = [
   205
 ];
 function decodePythPriceUpdate(data) {
-  const b = typeof data === "string" ? (0, import_svm_kit7.fromBase64)(data) : data;
+  const b = typeof data === "string" ? (0, import_svm_kit8.fromBase64)(data) : data;
   for (let i = 0; i < 8; i++)
     if (b[i] !== PYTH_PRICE_UPDATE_V2_DISCRIMINATOR[i])
       throw new Error("pyth: account is not a PriceUpdateV2");
@@ -20512,7 +20634,7 @@ function createP0Api(opts = {}) {
 }
 
 // src/lending/public-data/project0/accounts.ts
-var import_svm_kit8 = require("@1delta/svm-kit");
+var import_svm_kit9 = require("@1delta/svm-kit");
 
 // src/lending/public-data/project0/idl/marginfi.json
 var marginfi_default = {
@@ -35378,7 +35500,7 @@ function decimalStringToI80F48(s) {
 }
 var utf84 = (s) => new TextEncoder().encode(s);
 var pk4 = (address) => {
-  const b = (0, import_svm_kit8.decodeBase58)(address);
+  const b = (0, import_svm_kit9.decodeBase58)(address);
   if (!b || b.length !== 32)
     throw new Error(`project0: not a 32-byte pubkey: ${address}`);
   return b;
@@ -35388,16 +35510,16 @@ var u16le2 = (n) => {
     throw new Error(`project0: u16 out of range: ${n}`);
   return new Uint8Array([n & 255, n >> 8]);
 };
-var p0LiquidityVaultAuthority = async (bank, programId = P0_PROGRAM_ID) => (await (0, import_svm_kit8.findProgramAddress)(
+var p0LiquidityVaultAuthority = async (bank, programId = P0_PROGRAM_ID) => (await (0, import_svm_kit9.findProgramAddress)(
   [utf84(P0_SEEDS.liquidityVaultAuthority), pk4(bank)],
   programId
 )).address;
-var p0LiquidityVault = async (bank, programId = P0_PROGRAM_ID) => (await (0, import_svm_kit8.findProgramAddress)(
+var p0LiquidityVault = async (bank, programId = P0_PROGRAM_ID) => (await (0, import_svm_kit9.findProgramAddress)(
   [utf84(P0_SEEDS.liquidityVault), pk4(bank)],
   programId
 )).address;
-var p0FeeState = async (programId = P0_PROGRAM_ID) => (await (0, import_svm_kit8.findProgramAddress)([utf84(P0_SEEDS.feeState)], programId)).address;
-var p0MarginfiAccountPda = async (authority, accountIndex = 0, opts = {}) => (await (0, import_svm_kit8.findProgramAddress)(
+var p0FeeState = async (programId = P0_PROGRAM_ID) => (await (0, import_svm_kit9.findProgramAddress)([utf84(P0_SEEDS.feeState)], programId)).address;
+var p0MarginfiAccountPda = async (authority, accountIndex = 0, opts = {}) => (await (0, import_svm_kit9.findProgramAddress)(
   [
     utf84(P0_SEEDS.marginfiAccount),
     pk4(opts.group ?? P0_MAIN_GROUP),
@@ -35487,8 +35609,8 @@ var bankConfig = (c) => ({
   cbEmaAlphaBps: c.cb_ema_alpha_bps
 });
 function decodeP0Bank(address, data, tokenSymbol) {
-  const bytes2 = typeof data === "string" ? (0, import_svm_kit8.fromBase64)(data) : data;
-  const r = (0, import_svm_kit8.decodeIdlAccount)(P0_IDL, "Bank", bytes2);
+  const bytes2 = typeof data === "string" ? (0, import_svm_kit9.fromBase64)(data) : data;
+  const r = (0, import_svm_kit9.decodeIdlAccount)(P0_IDL, "Bank", bytes2);
   const entries = r.emode.emode_config.entries.filter((e) => e.collateral_bank_emode_tag !== 0).map((e) => ({
     collateralBankEmodeTag: e.collateral_bank_emode_tag,
     flags: e.flags,
@@ -35713,8 +35835,8 @@ var u32ToBasis = (v) => v / 4294967295 * 100;
 var P0_PAUSE_DURATION_SECONDS = 6 * 60 * 60;
 var p0GroupPausedAt = (g, now) => !!g?.panic.pausedFlag && (now < g.panic.pauseStartTimestamp || now - g.panic.pauseStartTimestamp < P0_PAUSE_DURATION_SECONDS);
 function decodeP0Group(address, data) {
-  const bytes2 = typeof data === "string" ? (0, import_svm_kit8.fromBase64)(data) : data;
-  const r = (0, import_svm_kit8.decodeIdlAccount)(P0_IDL, "MarginfiGroup", bytes2);
+  const bytes2 = typeof data === "string" ? (0, import_svm_kit9.fromBase64)(data) : data;
+  const r = (0, import_svm_kit9.decodeIdlAccount)(P0_IDL, "MarginfiGroup", bytes2);
   return {
     address,
     admin: r.admin,
@@ -35747,8 +35869,8 @@ function decodeP0Group(address, data) {
   };
 }
 function decodeP0MarginfiAccount(address, data) {
-  const bytes2 = typeof data === "string" ? (0, import_svm_kit8.fromBase64)(data) : data;
-  const r = (0, import_svm_kit8.decodeIdlAccount)(
+  const bytes2 = typeof data === "string" ? (0, import_svm_kit9.fromBase64)(data) : data;
+  const r = (0, import_svm_kit9.decodeIdlAccount)(
     P0_IDL,
     "MarginfiAccount",
     bytes2
@@ -35803,10 +35925,10 @@ var P0_GROUP_SIZE = 9256;
 var P0_ACCOUNT_GROUP_OFFSET = 8;
 var P0_ACCOUNT_AUTHORITY_OFFSET = 8 + 32;
 var P0_BANK_GROUP_OFFSET = 8 + 32 + 1;
-var p0BankMetadataPda = async (bank, programId = P0_PROGRAM_ID) => (await (0, import_svm_kit8.findProgramAddress)([utf84("metadata"), pk4(bank)], programId)).address;
+var p0BankMetadataPda = async (bank, programId = P0_PROGRAM_ID) => (await (0, import_svm_kit9.findProgramAddress)([utf84("metadata"), pk4(bank)], programId)).address;
 function decodeP0BankMetadata(data) {
-  const bytes2 = typeof data === "string" ? (0, import_svm_kit8.fromBase64)(data) : data;
-  const r = (0, import_svm_kit8.decodeIdlAccount)(P0_IDL, "BankMetadata", bytes2);
+  const bytes2 = typeof data === "string" ? (0, import_svm_kit9.fromBase64)(data) : data;
+  const r = (0, import_svm_kit9.decodeIdlAccount)(P0_IDL, "BankMetadata", bytes2);
   const td = new TextDecoder();
   const ticker = td.decode(r.ticker.subarray(0, r.end_ticker_byte)).trim();
   const description = td.decode(r.description.subarray(0, r.end_description_byte)).trim();
@@ -35956,7 +36078,7 @@ function p0CurveKnots(c) {
 }
 
 // src/vaults/lst/stakePool.ts
-var import_svm_kit9 = require("@1delta/svm-kit");
+var import_svm_kit10 = require("@1delta/svm-kit");
 var SPL_STAKE_POOL_PROGRAM = "SPoo1Ku8WFXoNDMHPsrGSTSG1Y47rzgn41SLUNakuHy";
 var OFFSET_RESERVE_STAKE = 130;
 var OFFSET_POOL_MINT = 162;
@@ -35985,8 +36107,8 @@ function decodeStakePool(data) {
       `stake-pool: account is ${data.byteLength} bytes, need \u2265 ${OFFSET_LAST_UPDATE_EPOCH + 8}`
     );
   const out = {
-    poolMint: (0, import_svm_kit9.encodeBase58)(data.slice(OFFSET_POOL_MINT, OFFSET_POOL_MINT + 32)),
-    reserveStake: (0, import_svm_kit9.encodeBase58)(
+    poolMint: (0, import_svm_kit10.encodeBase58)(data.slice(OFFSET_POOL_MINT, OFFSET_POOL_MINT + 32)),
+    reserveStake: (0, import_svm_kit10.encodeBase58)(
       data.slice(OFFSET_RESERVE_STAKE, OFFSET_RESERVE_STAKE + 32)
     ),
     totalLamports: u642(data, OFFSET_TOTAL_LAMPORTS),
@@ -35994,7 +36116,7 @@ function decodeStakePool(data) {
     lastUpdateEpoch: u642(data, OFFSET_LAST_UPDATE_EPOCH)
   };
   try {
-    const r = new import_svm_kit9.BorshReader(data);
+    const r = new import_svm_kit10.BorshReader(data);
     r.skip(OFFSET_TAIL);
     r.skip(8 + 8 + 32);
     const epoch = readFee(r);
@@ -36032,7 +36154,7 @@ async function readStakePools(rpc, stakePools, opts = {}) {
   const pools = accounts.map((a) => {
     if (!a || a.owner !== program) return null;
     try {
-      return decodeStakePool((0, import_svm_kit9.fromBase64)(a.data[0]));
+      return decodeStakePool((0, import_svm_kit10.fromBase64)(a.data[0]));
     } catch {
       return null;
     }
@@ -36084,10 +36206,10 @@ async function readEpochClock(rpc) {
 }
 
 // src/lending/public-data/project0/prices.ts
-var import_svm_kit11 = require("@1delta/svm-kit");
+var import_svm_kit12 = require("@1delta/svm-kit");
 
 // src/prices/oracleAccounts.ts
-var import_svm_kit10 = require("@1delta/svm-kit");
+var import_svm_kit11 = require("@1delta/svm-kit");
 var PYTH_PRICE_UPDATE_OWNERS = /* @__PURE__ */ new Set([
   "rec5EKMGg6MxZYaMdyBfgwp4d5rB9T1VQH5pJv5LtFJ",
   "rec2HHDDnjLfj4kE7VyEtFA1HPGQLK33259532cRyHp"
@@ -36097,7 +36219,7 @@ var SWITCHBOARD_ON_DEMAND_PROGRAM = "SBondMDrcV3K4kxZR1HNVT7osZxAHVHgYXL5Ze1oMUv
 var SWITCHBOARD_V2_PROGRAM = "SW1TCH7qEPTdLsDHRgPuMQjbQxKdH2aBStViMFnt64f";
 var SCOPE_PROGRAM = "HFn8GnPADiny6XqUoWE8uRPPxb29ikn4yTuPa9MF2fWJ";
 var MARINADE_PROGRAM = "MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD";
-var bytes = (data) => typeof data === "string" ? (0, import_svm_kit10.fromBase64)(data) : data;
+var bytes = (data) => typeof data === "string" ? (0, import_svm_kit11.fromBase64)(data) : data;
 var view = (b) => new DataView(b.buffer, b.byteOffset, b.byteLength);
 var i128 = (b, o) => {
   const dv = view(b);
@@ -36292,9 +36414,9 @@ async function resolveP0Prices(rpc, banks, opts = {}) {
             if (r > 0) msolRate[key2] = r;
           }
         } else if (scopeKeys.has(key2)) {
-          if (a.owner === SCOPE_PROGRAM) scopeData[key2] = (0, import_svm_kit11.fromBase64)(a.data[0]);
+          if (a.owner === SCOPE_PROGRAM) scopeData[key2] = (0, import_svm_kit12.fromBase64)(a.data[0]);
         } else if (P0_STAKE_POOL_PROGRAMS.has(a.owner)) {
-          const p = decodeStakePool((0, import_svm_kit11.fromBase64)(a.data[0]));
+          const p = decodeStakePool((0, import_svm_kit12.fromBase64)(a.data[0]));
           if (p.poolTokenSupply > 0n)
             poolRate[key2] = Number(p.totalLamports) / Number(p.poolTokenSupply);
         }
@@ -36822,13 +36944,13 @@ function deriveP0Mode(liabilityTags, roster) {
 }
 
 // src/lending/public-data/project0/fetchPublic.ts
-var import_svm_kit12 = require("@1delta/svm-kit");
+var import_svm_kit13 = require("@1delta/svm-kit");
 async function fetchProject0Public(opts = {}) {
   const api = createP0Api(opts);
   const groups = opts.groups?.length ? opts.groups : [P0_MAIN_GROUP];
   const source = opts.source ?? "chain";
   const roster = opts.roster ?? "scan";
-  const rpc = source === "chain" || roster === "scan" || !opts.prices?.cacheOnly ? opts.rpc ?? (0, import_svm_kit12.createSvmRpc)() : opts.rpc;
+  const rpc = source === "chain" || roster === "scan" || !opts.prices?.cacheOnly ? opts.rpc ?? (0, import_svm_kit13.createSvmRpc)() : opts.rpc;
   const out = {};
   for (const group of groups) {
     let banks = [];
@@ -36943,6 +37065,7 @@ async function getLenderPublicData(chainId, opts = {}) {
 }
 
 // src/lending/public-data/getLenderPublicDataAll.ts
+var import_svm_kit14 = require("@1delta/svm-kit");
 init_types();
 init_lenders();
 
@@ -37067,12 +37190,15 @@ async function getLenderPublicDataAll(chainId, lenders, opts = {}) {
   if (chainId !== SOLANA_CHAIN_ID)
     throw new Error(`getLenderPublicDataAll: unsupported chain ${chainId}`);
   const out = {};
+  const needsSlot = opts.rpc && (lenders.some(import_lender_registry2.isSave) && opts.save?.avgSlotSeconds === void 0 || lenders.some(import_lender_registry2.isKamino) && opts.kamino?.slotSeconds === void 0);
+  const slotSeconds = needsSlot ? await (0, import_svm_kit14.measureSlotSeconds)(opts.rpc) : void 0;
   const kaminoKeys = lenders.filter(import_lender_registry2.isKamino);
   if (kaminoKeys.length) {
     const explicit = kaminoKeys.map(import_lender_registry2.kaminoMarketFromKey).filter((m) => !!m);
     const wantsAll = kaminoKeys.some((k) => !(0, import_lender_registry2.kaminoMarketFromKey)(k));
     const res = await fetchKaminoPublic({
       ...opts.kamino,
+      slotSeconds: opts.kamino?.slotSeconds ?? slotSeconds,
       rpc: opts.kamino?.rpc ?? opts.rpc,
       tokenList: opts.tokenList ?? opts.kamino?.tokenList,
       ...wantsAll ? {} : { markets: explicit }
@@ -37112,6 +37238,7 @@ async function getLenderPublicDataAll(chainId, lenders, opts = {}) {
     const wantsAll = saveKeys.some((k) => !(0, import_lender_registry2.saveMarketFromKey)(k));
     const res = await fetchSavePublic({
       ...opts.save,
+      avgSlotSeconds: opts.save?.avgSlotSeconds ?? slotSeconds,
       tokenList: opts.tokenList ?? opts.save?.tokenList,
       ...wantsAll ? {} : { markets: explicit }
     });
@@ -37578,7 +37705,7 @@ async function fetchExponentPtMarkets(opts = {}) {
 }
 
 // src/vaults/solstice/accounts.ts
-var import_svm_kit13 = require("@1delta/svm-kit");
+var import_svm_kit15 = require("@1delta/svm-kit");
 
 // src/vaults/solstice/idl/yield_strategy.json
 var yield_strategy_default = {
@@ -48249,12 +48376,12 @@ var SOLSTICE_DECIMALS = 6;
 var SOLSTICE_PRICE_DECIMALS = 6;
 var utf85 = (s) => new TextEncoder().encode(s);
 var pk5 = (address) => {
-  const b = (0, import_svm_kit13.decodeBase58)(address);
+  const b = (0, import_svm_kit15.decodeBase58)(address);
   if (!b || b.length !== 32)
     throw new Error(`solstice: not a 32-byte pubkey: ${address}`);
   return b;
 };
-var pda = async (seeds, programId) => (await (0, import_svm_kit13.findProgramAddress)(seeds, programId)).address;
+var pda = async (seeds, programId) => (await (0, import_svm_kit15.findProgramAddress)(seeds, programId)).address;
 async function yieldVaultPdas(programId = SOLSTICE_PROGRAMS.yieldVault) {
   const [controller, yieldPool, vestingSchedule, shareMint, assetVault] = await Promise.all(
     [
@@ -48338,20 +48465,20 @@ var oracleCanonicalPda = (feedId, programId = SOLSTICE_PROGRAMS.oracle) => pda([
 var strategyNameOf = (raw2) => new TextDecoder().decode(raw2).replace(/\0+$/, "");
 var YV = SOLSTICE_YIELD_VAULT_IDL;
 var YS = SOLSTICE_YIELD_STRATEGY_IDL;
-var decodeController = (d2) => (0, import_svm_kit13.decodeIdlAccount)(YV, "Controller", d2);
-var decodeYieldPool = (d2) => (0, import_svm_kit13.decodeIdlAccount)(YV, "YieldPool", d2);
-var decodeVestingSchedule = (d2) => (0, import_svm_kit13.decodeIdlAccount)(YV, "VestingSchedule", d2);
-var decodeCooldownEscrow = (d2) => (0, import_svm_kit13.decodeIdlAccount)(YV, "CooldownEscrow", d2);
-var decodeStrategyController = (d2) => (0, import_svm_kit13.decodeIdlAccount)(YS, "Controller", d2);
-var decodeStrategy = (d2) => (0, import_svm_kit13.decodeIdlAccount)(YS, "Strategy", d2);
-var decodeAccountingState = (d2) => (0, import_svm_kit13.decodeIdlAccount)(YS, "AccountingState", d2);
-var decodeSettlementBatch = (d2) => (0, import_svm_kit13.decodeIdlAccount)(YS, "SettlementBatch", d2);
-var decodeJuniorUnlockShare = (d2) => (0, import_svm_kit13.decodeIdlAccount)(YS, "JuniorUnlockShare", d2);
-var decodeSeniorUnlockCooldown = (d2) => (0, import_svm_kit13.decodeIdlAccount)(YS, "SeniorUnlockCooldown", d2);
+var decodeController = (d2) => (0, import_svm_kit15.decodeIdlAccount)(YV, "Controller", d2);
+var decodeYieldPool = (d2) => (0, import_svm_kit15.decodeIdlAccount)(YV, "YieldPool", d2);
+var decodeVestingSchedule = (d2) => (0, import_svm_kit15.decodeIdlAccount)(YV, "VestingSchedule", d2);
+var decodeCooldownEscrow = (d2) => (0, import_svm_kit15.decodeIdlAccount)(YV, "CooldownEscrow", d2);
+var decodeStrategyController = (d2) => (0, import_svm_kit15.decodeIdlAccount)(YS, "Controller", d2);
+var decodeStrategy = (d2) => (0, import_svm_kit15.decodeIdlAccount)(YS, "Strategy", d2);
+var decodeAccountingState = (d2) => (0, import_svm_kit15.decodeIdlAccount)(YS, "AccountingState", d2);
+var decodeSettlementBatch = (d2) => (0, import_svm_kit15.decodeIdlAccount)(YS, "SettlementBatch", d2);
+var decodeJuniorUnlockShare = (d2) => (0, import_svm_kit15.decodeIdlAccount)(YS, "JuniorUnlockShare", d2);
+var decodeSeniorUnlockCooldown = (d2) => (0, import_svm_kit15.decodeIdlAccount)(YS, "SeniorUnlockCooldown", d2);
 function accountDiscriminator(idl, name) {
   const a = idl.accounts.find((x) => x.name === name);
   if (!a) throw new Error(`idl ${idl.metadata?.name}: no account ${name}`);
-  return (0, import_svm_kit13.encodeBase58)(Uint8Array.from(a.discriminator));
+  return (0, import_svm_kit15.encodeBase58)(Uint8Array.from(a.discriminator));
 }
 var SETTLEMENT_BATCH_SIZE = 309;
 var ORACLE_CANONICAL_SIZE = 365;
@@ -48394,7 +48521,7 @@ function tokenAmount(data) {
 }
 var need = (a, what) => {
   if (!a) throw new Error(`solstice: ${what} account is missing`);
-  return (0, import_svm_kit13.fromBase64)(a.data[0]);
+  return (0, import_svm_kit15.fromBase64)(a.data[0]);
 };
 async function readSolsticeChainState(rpc, opts = {}) {
   const programs = { ...SOLSTICE_PROGRAMS, ...opts.programs };
@@ -48459,7 +48586,7 @@ async function readSolsticeChainState(rpc, opts = {}) {
       const raw2 = r.accounts[j++];
       s.oracleAccount = feeds[i];
       if (raw2)
-        s.oracle = decodeOracleCanonical((0, import_svm_kit13.fromBase64)(raw2.data[0])) ?? void 0;
+        s.oracle = decodeOracleCanonical((0, import_svm_kit15.fromBase64)(raw2.data[0])) ?? void 0;
     });
   }
   return { slot, yieldVault, strategies };
@@ -48572,12 +48699,12 @@ function strategyMode(s, oraclePriceUsd, priceDecimals = 6) {
 
 // src/vaults/solstice/fetchPublic.ts
 init_types();
-var import_svm_kit14 = require("@1delta/svm-kit");
+var import_svm_kit16 = require("@1delta/svm-kit");
 var SCALE = 10 ** SOLSTICE_DECIMALS;
 var fmt3 = (raw2) => Number(raw2) / SCALE;
 var BATCH_STATUS = ["active", "cancelled", "settled"];
 async function fetchSolsticeSettlementBatches(rpc, strategyName, juniorQueueTimeSeconds, programId = SOLSTICE_PROGRAMS.yieldStrategy) {
-  const fetchers = (0, import_svm_kit14.createSvmFetchers)(rpc);
+  const fetchers = (0, import_svm_kit16.createSvmFetchers)(rpc);
   const rows = await fetchers.indexed.scanProgram(
     programId,
     [
@@ -48595,7 +48722,7 @@ async function fetchSolsticeSettlementBatches(rpc, strategyName, juniorQueueTime
   );
   const out = [];
   for (const r of rows) {
-    const b = decodeSettlementBatch((0, import_svm_kit14.fromBase64)(r.account.data[0]));
+    const b = decodeSettlementBatch((0, import_svm_kit16.fromBase64)(r.account.data[0]));
     if (strategyNameOf(b.strategy_name) !== strategyName) continue;
     const settlementTime = Number(b.settlement_time);
     out.push({
@@ -48861,7 +48988,7 @@ function buildSolsticeVaults(state, ctx) {
   return out;
 }
 async function fetchSolsticeVaults(opts = {}) {
-  const rpc = opts.rpc ?? (0, import_svm_kit14.createSvmRpc)();
+  const rpc = opts.rpc ?? (0, import_svm_kit16.createSvmRpc)();
   const nowSecs = opts.nowSecs ?? Math.floor(Date.now() / 1e3);
   const tokenList = opts.tokenList ?? {};
   const state = await readSolsticeChainState(rpc, {
@@ -48900,15 +49027,15 @@ async function fetchSolsticeVaults(opts = {}) {
 
 // src/vaults/solstice/fetchUser.ts
 init_types();
-var import_svm_kit15 = require("@1delta/svm-kit");
+var import_svm_kit17 = require("@1delta/svm-kit");
 async function fetchSolsticeUser(account, opts = {}) {
-  const rpc = opts.rpc ?? (0, import_svm_kit15.createSvmRpc)();
+  const rpc = opts.rpc ?? (0, import_svm_kit17.createSvmRpc)();
   const vaults = opts.vaults ?? await fetchSolsticeVaults({ ...opts, rpc });
   const rows = Object.values(vaults);
   const nowSecs = opts.nowSecs ?? Math.floor(Date.now() / 1e3);
   const atas = await Promise.all(
     rows.map(
-      (r) => (0, import_svm_kit15.getAssociatedTokenAddress)(account, r.address, import_svm_kit15.TOKEN_PROGRAM)
+      (r) => (0, import_svm_kit17.getAssociatedTokenAddress)(account, r.address, import_svm_kit17.TOKEN_PROGRAM)
     )
   );
   const eusx = rows.find((r) => r.kind === "yield-vault");
@@ -48938,7 +49065,7 @@ async function fetchSolsticeUser(account, opts = {}) {
   const { slot, accounts } = await rpc.readAccounts(keys);
   let i = 0;
   const next = () => accounts[i++] ?? null;
-  const bytes2 = (a) => a ? (0, import_svm_kit15.fromBase64)(a.data[0]) : void 0;
+  const bytes2 = (a) => a ? (0, import_svm_kit17.fromBase64)(a.data[0]) : void 0;
   const holdings = [];
   rows.forEach((r, k) => {
     const d2 = bytes2(next());
@@ -65101,7 +65228,7 @@ var HUMA_SEEDS = {
 };
 
 // src/vaults/huma/accounts.ts
-var import_svm_kit16 = require("@1delta/svm-kit");
+var import_svm_kit18 = require("@1delta/svm-kit");
 var HUMA_POOL = {
   poolConfig: "28hFhD21Nka3stL27a8zZ4nRLgaDVxRYwJgeEVgeakzS",
   poolId: "sFp7QFGknaW37xRFfdRwbC4QhM1n7Y9sJkYL4vnqXRn",
@@ -65116,11 +65243,11 @@ var HUMA_CLASSIC_MODE_ID = "Fr2BGzmFkufAUXNWSWk79juyWrHVCj8AbyzbbvZzhwgz";
 var HUMA_DECIMALS = 6;
 var utf86 = (s) => new TextEncoder().encode(s);
 var pk6 = (address) => {
-  const b = (0, import_svm_kit16.decodeBase58)(address);
+  const b = (0, import_svm_kit18.decodeBase58)(address);
   if (!b || b.length !== 32) throw new Error(`huma: bad pubkey ${address}`);
   return b;
 };
-var pda2 = (seeds) => (0, import_svm_kit16.findProgramAddress)(seeds, HUMA_PROGRAM).then((r) => r.address);
+var pda2 = (seeds) => (0, import_svm_kit18.findProgramAddress)(seeds, HUMA_PROGRAM).then((r) => r.address);
 var humaPoolConfigPda = () => pda2([utf86("pool_config"), pk6(HUMA_POOL.poolId)]);
 var humaPoolStatePda = () => pda2([utf86("pool_state"), pk6(HUMA_POOL.poolConfig)]);
 var humaPoolAuthorityPda = () => pda2([utf86("pool_authority"), pk6(HUMA_POOL.poolConfig)]);
@@ -65136,11 +65263,11 @@ var u128be = (v) => {
     out[15 - i] = Number(v >> BigInt(8 * i) & 0xffn);
   return out;
 };
-var decodeHumaPoolState = (d2) => (0, import_svm_kit16.decodeIdlAccount)(HUMA_IDL, "PoolState", d2);
-var decodeHumaModeConfig = (d2) => (0, import_svm_kit16.decodeIdlAccount)(HUMA_IDL, "ModeConfig", d2);
-var decodeHumaPoolConfig = (d2) => (0, import_svm_kit16.decodeIdlAccount)(HUMA_IDL, "PoolConfig", d2);
-var decodeHumaLenderState = (d2) => (0, import_svm_kit16.decodeIdlAccount)(HUMA_IDL, "LenderState", d2);
-var decodeHumaRedemptionRequest = (d2) => (0, import_svm_kit16.decodeIdlAccount)(HUMA_IDL, "RedemptionRequest", d2);
+var decodeHumaPoolState = (d2) => (0, import_svm_kit18.decodeIdlAccount)(HUMA_IDL, "PoolState", d2);
+var decodeHumaModeConfig = (d2) => (0, import_svm_kit18.decodeIdlAccount)(HUMA_IDL, "ModeConfig", d2);
+var decodeHumaPoolConfig = (d2) => (0, import_svm_kit18.decodeIdlAccount)(HUMA_IDL, "PoolConfig", d2);
+var decodeHumaLenderState = (d2) => (0, import_svm_kit18.decodeIdlAccount)(HUMA_IDL, "LenderState", d2);
+var decodeHumaRedemptionRequest = (d2) => (0, import_svm_kit18.decodeIdlAccount)(HUMA_IDL, "RedemptionRequest", d2);
 function mintSupply2(data) {
   if (data.length < 44) throw new Error("huma: mint account too short");
   return data.slice(36, 44).reduce((a, b, i) => a | BigInt(b) << BigInt(8 * i), 0n);
@@ -65154,23 +65281,23 @@ var need2 = (a, what) => {
   return a;
 };
 async function readHumaChainState(rpc, pool = HUMA_POOL) {
-  const poolUnderlyingToken = await (0, import_svm_kit16.getAssociatedTokenAddress)(
+  const poolUnderlyingToken = await (0, import_svm_kit18.getAssociatedTokenAddress)(
     await humaPoolAuthorityPda(),
     pool.underlyingMint,
-    import_svm_kit16.TOKEN_PROGRAM
+    import_svm_kit18.TOKEN_PROGRAM
   );
   const { slot, accounts: first } = await rpc.readAccounts(
     [pool.poolState, pool.poolConfig, poolUnderlyingToken],
     { encoding: "base64" }
   );
   const state = decodeHumaPoolState(
-    (0, import_svm_kit16.fromBase64)(need2(first[0], "pool_state").data[0])
+    (0, import_svm_kit18.fromBase64)(need2(first[0], "pool_state").data[0])
   );
   const config = decodeHumaPoolConfig(
-    (0, import_svm_kit16.fromBase64)(need2(first[1], "pool_config").data[0])
+    (0, import_svm_kit18.fromBase64)(need2(first[1], "pool_config").data[0])
   );
   const poolCash = tokenAmount2(
-    first[2] ? (0, import_svm_kit16.fromBase64)(first[2].data[0]) : void 0
+    first[2] ? (0, import_svm_kit18.fromBase64)(first[2].data[0]) : void 0
   );
   const modeMints = await Promise.all(
     state.mode_config_keys.map((k) => humaModeMintPda(k))
@@ -65185,9 +65312,9 @@ async function readHumaChainState(rpc, pool = HUMA_POOL) {
     { encoding: "base64" }
   );
   const modeConfig = decodeHumaModeConfig(
-    (0, import_svm_kit16.fromBase64)(need2(modeAcct, "mode_config").data[0])
+    (0, import_svm_kit18.fromBase64)(need2(modeAcct, "mode_config").data[0])
   );
-  const mintData = (0, import_svm_kit16.fromBase64)(need2(mintAcct, "pst_mint").data[0]);
+  const mintData = (0, import_svm_kit18.fromBase64)(need2(mintAcct, "pst_mint").data[0]);
   const next = state.redemption.next_request_id;
   const last = state.redemption.last_request_id;
   const gate = state.redemption.global_redemption_gating;
@@ -65244,7 +65371,7 @@ async function readHumaLenderState(rpc, modeConfig, wallet) {
   const a = accounts[0];
   return {
     address,
-    state: a ? decodeHumaLenderState((0, import_svm_kit16.fromBase64)(a.data[0])) : null
+    state: a ? decodeHumaLenderState((0, import_svm_kit18.fromBase64)(a.data[0])) : null
   };
 }
 var HUMA_REDEMPTION_REQUEST_SIZE = 273;
@@ -65260,12 +65387,12 @@ async function readHumaRedemptionRequests(fetchers, wallet) {
   );
   return rows.map((r) => ({
     address: r.pubkey,
-    ...decodeHumaRedemptionRequest((0, import_svm_kit16.fromBase64)(r.account.data[0]))
+    ...decodeHumaRedemptionRequest((0, import_svm_kit18.fromBase64)(r.account.data[0]))
   })).sort((a, b) => a.id < b.id ? -1 : a.id > b.id ? 1 : 0);
 }
 
 // src/vaults/huma/fetchPublic.ts
-var import_svm_kit17 = require("@1delta/svm-kit");
+var import_svm_kit19 = require("@1delta/svm-kit");
 var SCALE2 = 10 ** HUMA_DECIMALS;
 var fmt4 = (raw2) => Number(raw2) / SCALE2;
 var HUMA_REDEMPTION_SLA_SECONDS = 7 * 86400;
@@ -65350,7 +65477,7 @@ function convertHumaPst(s, ctx) {
 }
 async function fetchHumaPstVaults(rpcOrOpts = {}) {
   const opts = "readAccounts" in rpcOrOpts ? { rpc: rpcOrOpts } : rpcOrOpts;
-  const rpc = opts.rpc ?? (0, import_svm_kit17.createSvmRpc)();
+  const rpc = opts.rpc ?? (0, import_svm_kit19.createSvmRpc)();
   const s = await readHumaChainState(rpc);
   let priceUsd = opts.priceUsd;
   if (priceUsd === void 0 && opts.fetchPrices !== false) {
@@ -65671,7 +65798,7 @@ async function fetchKaminoKvaults(opts = {}) {
 
 // src/vaults/lst/fetchPublic.ts
 init_types();
-var import_svm_kit18 = require("@1delta/svm-kit");
+var import_svm_kit20 = require("@1delta/svm-kit");
 var LAMPORTS_PER_SOL = 10 ** 9;
 var TOKEN_SCALE = 10 ** 9;
 var SPL_STAKE_POOL_LSTS = [
@@ -65734,7 +65861,7 @@ function convertLst(entry, pool, ctx, stakePoolAddress, programId, slot) {
     provider: "lst",
     chainId: SOLANA_CHAIN_ID,
     address: pool.poolMint,
-    underlying: import_svm_kit18.WRAPPED_SOL,
+    underlying: import_svm_kit20.WRAPPED_SOL,
     symbol: share.symbol ?? entry.symbol,
     name: share.name ?? entry.name,
     displayName: `${entry.curatorName} ${entry.symbol}`,
@@ -65798,7 +65925,7 @@ function convertLst(entry, pool, ctx, stakePoolAddress, programId, slot) {
   };
 }
 async function fetchLstVaults(opts = {}) {
-  const rpc = opts.rpc ?? (0, import_svm_kit18.createSvmRpc)();
+  const rpc = opts.rpc ?? (0, import_svm_kit20.createSvmRpc)();
   const entries = opts.entries ?? SPL_STAKE_POOL_LSTS;
   const tokenList = opts.tokenList ?? {};
   const { slot, pools } = await readStakePools(
@@ -65808,10 +65935,10 @@ async function fetchLstVaults(opts = {}) {
   let solPriceUsd = opts.solPriceUsd;
   if (solPriceUsd === void 0 && opts.fetchPrices !== false) {
     solPriceUsd = await fetchJupiterPrices(
-      [import_svm_kit18.WRAPPED_SOL],
+      [import_svm_kit20.WRAPPED_SOL],
       tokenList,
       opts.priceApi
-    ).then((p) => p.byMint[import_svm_kit18.WRAPPED_SOL]).catch(() => void 0);
+    ).then((p) => p.byMint[import_svm_kit20.WRAPPED_SOL]).catch(() => void 0);
   }
   const found = pools.filter((p) => !!p);
   const [epoch, reserves] = await Promise.all([
@@ -66268,7 +66395,7 @@ async function fetchJupiterLendOracleEntries(opts = {}) {
 }
 
 // src/prices/oracle-prices/fetchers/save.ts
-var import_svm_kit19 = require("@1delta/svm-kit");
+var import_svm_kit21 = require("@1delta/svm-kit");
 async function fetchSaveOracleEntries(opts = {}) {
   const res = opts.publicData ?? await fetchSavePublic(opts);
   const feeds = /* @__PURE__ */ new Set();
@@ -66280,7 +66407,7 @@ async function fetchSaveOracleEntries(opts = {}) {
   const readings = /* @__PURE__ */ new Map();
   if (opts.live !== false && feeds.size) {
     try {
-      const rpc = opts.rpc ?? (0, import_svm_kit19.createSvmRpc)();
+      const rpc = opts.rpc ?? (0, import_svm_kit21.createSvmRpc)();
       const keys = [...feeds];
       const { accounts } = await rpc.readAccounts(keys, { encoding: "base64" });
       accounts.forEach((a, i) => {
@@ -66711,7 +66838,7 @@ async function mintToReserve(api, market) {
 
 // src/lending/user-data/kamino/onchain.ts
 init_types();
-var import_svm_kit20 = require("@1delta/svm-kit");
+var import_svm_kit22 = require("@1delta/svm-kit");
 init_lenders();
 var KLEND_OBLIGATION_SIZE = 3344;
 var KLEND_OBLIGATION_DISCRIMINATOR = [
@@ -66730,7 +66857,7 @@ var SF = 60n;
 var bsf = (b) => b.value.reduce((a, w, i) => a + (BigInt(w) << 64n * BigInt(i)), 0n);
 var sfToNumber = (x) => Number(x >> 30n) / 2 ** 30;
 function decodeKaminoObligation(address, data) {
-  const o = (0, import_svm_kit20.decodeIdlAccount)(KLEND_IDL, "Obligation", data);
+  const o = (0, import_svm_kit22.decodeIdlAccount)(KLEND_IDL, "Obligation", data);
   return {
     address,
     owner: o.owner,
@@ -66758,7 +66885,7 @@ function decodeKaminoObligation(address, data) {
   };
 }
 function decodeKaminoReserveState(reserve, data) {
-  const r = (0, import_svm_kit20.decodeIdlAccount)(KLEND_IDL, "Reserve", data);
+  const r = (0, import_svm_kit22.decodeIdlAccount)(KLEND_IDL, "Reserve", data);
   const l = r.liquidity;
   const totalSf = klendTotalSupplySf({
     availableAmount: BigInt(l.totalAvailableAmount),
@@ -66931,15 +67058,15 @@ function valueKaminoObligations(account, obligations, reserves, groups = {}, acc
   };
 }
 async function fetchKaminoUserOnchain(account, opts = {}) {
-  const rpc = opts.rpc ?? (0, import_svm_kit20.createSvmRpc)();
-  const hits = await (0, import_svm_kit20.createSvmFetchers)(rpc).indexed.scanProgram(
+  const rpc = opts.rpc ?? (0, import_svm_kit22.createSvmRpc)();
+  const hits = await (0, import_svm_kit22.createSvmFetchers)(rpc).indexed.scanProgram(
     KLEND_PROGRAM_ID,
     [
       { dataSize: KLEND_OBLIGATION_SIZE },
       {
         memcmp: {
           offset: 0,
-          bytes: (0, import_svm_kit20.encodeBase58)(Uint8Array.from(KLEND_OBLIGATION_DISCRIMINATOR))
+          bytes: (0, import_svm_kit22.encodeBase58)(Uint8Array.from(KLEND_OBLIGATION_DISCRIMINATOR))
         }
       },
       { memcmp: { offset: KLEND_OBLIGATION_OWNER_OFFSET, bytes: account } }
@@ -66950,7 +67077,7 @@ async function fetchKaminoUserOnchain(account, opts = {}) {
     }
   );
   const markets = opts.markets && new Set(opts.markets);
-  const obligations = hits.map((h) => decodeKaminoObligation(h.pubkey, (0, import_svm_kit20.fromBase64)(h.account.data[0]))).filter((o) => !markets || markets.has(o.market));
+  const obligations = hits.map((h) => decodeKaminoObligation(h.pubkey, (0, import_svm_kit22.fromBase64)(h.account.data[0]))).filter((o) => !markets || markets.has(o.market));
   const reserves = { ...opts.reserves };
   const need3 = [
     ...new Set(
@@ -66973,8 +67100,8 @@ async function fetchKaminoUserOnchain(account, opts = {}) {
       const a = accounts2[i];
       if (!a || a.owner !== KLEND_PROGRAM_ID) return;
       if (i < need3.length)
-        reserves[k] = decodeKaminoReserveState(k, (0, import_svm_kit20.fromBase64)(a.data[0]));
-      else groups[k] = readKlendElevationGroups((0, import_svm_kit20.fromBase64)(a.data[0]));
+        reserves[k] = decodeKaminoReserveState(k, (0, import_svm_kit22.fromBase64)(a.data[0]));
+      else groups[k] = readKlendElevationGroups((0, import_svm_kit22.fromBase64)(a.data[0]));
     });
   }
   const accounts = {};
@@ -67136,13 +67263,13 @@ async function fetchJupiterLendUser(account, opts = {}) {
 }
 
 // src/lending/user-data/save/obligation.ts
-var import_svm_kit21 = require("@1delta/svm-kit");
+var import_svm_kit23 = require("@1delta/svm-kit");
 function decodeSaveObligation(address, data) {
   if (data.length !== SAVE_OBLIGATION_SIZE)
     throw new Error(
       `save obligation ${address}: ${data.length} bytes, expected ${SAVE_OBLIGATION_SIZE}`
     );
-  const r = new import_svm_kit21.BorshReader(data);
+  const r = new import_svm_kit23.BorshReader(data);
   const version = r.u8();
   const lastUpdateSlot = r.u64();
   const stale = r.bool();
@@ -67207,8 +67334,8 @@ function saveObligationSeed(lendingMarket, index = 0) {
 }
 var sha256 = async (bytes2) => new Uint8Array(await crypto.subtle.digest("SHA-256", bytes2));
 async function createWithSeed(base, seed, programId) {
-  const b = (0, import_svm_kit21.decodeBase58)(base);
-  const p = (0, import_svm_kit21.decodeBase58)(programId);
+  const b = (0, import_svm_kit23.decodeBase58)(base);
+  const p = (0, import_svm_kit23.decodeBase58)(programId);
   if (!b || b.length !== 32) throw new Error(`not a pubkey: ${base}`);
   if (!p || p.length !== 32) throw new Error(`not a pubkey: ${programId}`);
   const s = new TextEncoder().encode(seed);
@@ -67217,25 +67344,25 @@ async function createWithSeed(base, seed, programId) {
   buf.set(b, 0);
   buf.set(s, 32);
   buf.set(p, 32 + s.length);
-  return (0, import_svm_kit21.encodeBase58)(await sha256(buf));
+  return (0, import_svm_kit23.encodeBase58)(await sha256(buf));
 }
 var saveObligationAddress = (wallet, lendingMarket, index = 0, programId = SAVE_PROGRAM_ID) => createWithSeed(wallet, saveObligationSeed(lendingMarket, index), programId);
 
 // src/lending/user-data/save/fetchUser.ts
 init_types();
-var import_svm_kit22 = require("@1delta/svm-kit");
+var import_svm_kit24 = require("@1delta/svm-kit");
 init_lenders();
 var SAVE_WALLET_POS_ID = "wallet";
 var readTokenAmount = (bytes2, mint) => {
   if (bytes2.length < 72) return void 0;
-  if ((0, import_svm_kit22.encodeBase58)(bytes2.subarray(0, 32)) !== mint) return void 0;
+  if ((0, import_svm_kit24.encodeBase58)(bytes2.subarray(0, 32)) !== mint) return void 0;
   let v = 0n;
   for (let i = 71; i >= 64; i--) v = v << 8n | BigInt(bytes2[i]);
   return v;
 };
 async function fetchSaveUser(account, opts = {}) {
   const api = createSaveApi(opts);
-  const rpc = opts.rpc ?? (0, import_svm_kit22.createSvmRpc)();
+  const rpc = opts.rpc ?? (0, import_svm_kit24.createSvmRpc)();
   const configs = opts.configs ?? await api.marketConfigs();
   const markets = selectSaveMarkets(configs, opts);
   const step = Math.min(
@@ -67267,10 +67394,10 @@ async function fetchSaveUser(account, opts = {}) {
       reserve,
       market: c.market,
       cTokenMint: c.collateralMint,
-      address: await (0, import_svm_kit22.getAssociatedTokenAddress)(
+      address: await (0, import_svm_kit24.getAssociatedTokenAddress)(
         account,
         c.collateralMint,
-        import_svm_kit22.TOKEN_PROGRAM
+        import_svm_kit24.TOKEN_PROGRAM
       )
     }))
   );
@@ -67291,7 +67418,7 @@ async function fetchSaveUser(account, opts = {}) {
       const exists = !!a && a.owner === SAVE_PROGRAM_ID && typeof a.data?.[0] === "string";
       (probed[key2] ??= []).push({ index: c.index, address: c.address, exists });
       if (!exists) return;
-      const bytes2 = (0, import_svm_kit22.fromBase64)(a.data[0]);
+      const bytes2 = (0, import_svm_kit24.fromBase64)(a.data[0]);
       if (bytes2.length !== SAVE_OBLIGATION_SIZE) return;
       found.push({ c, ob: decodeSaveObligation(c.address, bytes2) });
     });
@@ -67312,9 +67439,9 @@ async function fetchSaveUser(account, opts = {}) {
   const wallet = [];
   ataCands.forEach((c, i) => {
     const a = ataAccounts[i];
-    if (!a || a.owner !== import_svm_kit22.TOKEN_PROGRAM || typeof a.data?.[0] !== "string")
+    if (!a || a.owner !== import_svm_kit24.TOKEN_PROGRAM || typeof a.data?.[0] !== "string")
       return;
-    const amount = readTokenAmount((0, import_svm_kit22.fromBase64)(a.data[0]), c.cTokenMint);
+    const amount = readTokenAmount((0, import_svm_kit24.fromBase64)(a.data[0]), c.cTokenMint);
     if (amount && amount > 0n) wallet.push({ c, cTokens: amount });
   });
   const reserveIds = [
@@ -67594,7 +67721,7 @@ async function fetchSaveUser(account, opts = {}) {
 }
 
 // src/lending/user-data/loopscale/fetchUser.ts
-var import_svm_kit23 = require("@1delta/svm-kit");
+var import_svm_kit25 = require("@1delta/svm-kit");
 init_types();
 var shortAddr = (a) => `${a.slice(0, 4)}\u2026${a.slice(-4)}`;
 function convertLoopscaleUser(account, items, opts) {
@@ -67793,7 +67920,7 @@ async function fetchLoopscaleUser(account, opts = {}) {
   ];
   if (unknown.length) {
     try {
-      const mints = await (0, import_svm_kit23.getMints)(opts.rpc ?? (0, import_svm_kit23.createSvmRpc)(), unknown);
+      const mints = await (0, import_svm_kit25.getMints)(opts.rpc ?? (0, import_svm_kit25.createSvmRpc)(), unknown);
       mints.forEach((m, i) => {
         if (m) decimals[unknown[i]] = m.decimals;
       });
@@ -67813,17 +67940,17 @@ async function fetchLoopscaleUser(account, opts = {}) {
 
 // src/lending/user-data/project0/fetchUser.ts
 init_types();
-var import_svm_kit24 = require("@1delta/svm-kit");
+var import_svm_kit26 = require("@1delta/svm-kit");
 init_lenders();
 var flagOn = (flags, bit) => (BigInt(flags) & bit) !== 0n;
 async function fetchProject0User(account, opts = {}) {
-  const rpc = opts.rpc ?? (0, import_svm_kit24.createSvmRpc)();
+  const rpc = opts.rpc ?? (0, import_svm_kit26.createSvmRpc)();
   const groups = opts.groups?.length ? opts.groups : [P0_MAIN_GROUP];
   const pub = opts.publicData ?? await fetchProject0Public({ ...opts, rpc, groups });
   const found = [];
   let discovery = opts.discovery ?? "scan";
   let readSlot = 0;
-  const f = (0, import_svm_kit24.createSvmFetchers)(rpc);
+  const f = (0, import_svm_kit26.createSvmFetchers)(rpc);
   for (const group of groups) {
     if (discovery === "scan") {
       try {
@@ -67833,7 +67960,7 @@ async function fetchProject0User(account, opts = {}) {
             {
               memcmp: {
                 offset: 0,
-                bytes: (0, import_svm_kit24.encodeBase58)(
+                bytes: (0, import_svm_kit26.encodeBase58)(
                   Uint8Array.from(P0_MARGINFI_ACCOUNT_DISCRIMINATOR)
                 )
               }
@@ -69437,6 +69564,7 @@ function project0TermAdapter(row, group) {
   decodeHumaPoolConfig,
   decodeHumaPoolState,
   decodeHumaRedemptionRequest,
+  decodeJlRateModel,
   decodeJuniorUnlockShare,
   decodeJupFlashloanAdmin,
   decodeKaminoObligation,
@@ -69636,6 +69764,7 @@ function project0TermAdapter(row, group) {
   readHumaChainState,
   readHumaLenderState,
   readHumaRedemptionRequests,
+  readJlLayerIrms,
   readJlNextVaultId,
   readJupFlashAssets,
   readJupFlashAvailable,