@elemental-stv-core/sdk 0.9.0 → 0.9.2

package/dist/jlpd-strategy/jlp-data.d.ts

@@ -99,6 +99,10 @@ export interface JlpEffectiveWeights {
 export interface EffectiveWeightInput {
     owned: bigint;
     locked: bigint;
+    /** Raw debt u128 (DEBT_MULTIPLIER-scaled by 1e9 internally, then by 10^decimals). */
+    debt: bigint;
+    /** Raw borrow-lend interests accrued u128 (same scale as `debt`). */
+    borrowLendInterestsAccrued: bigint;
     shortSizeUsd: bigint;
     avgShortPriceUsd: bigint;
     guaranteedUsd: bigint;
@@ -107,25 +111,31 @@ export interface EffectiveWeightInput {
     priceScaled8: bigint;
 }
 export interface EffectiveWeightOutput {
-    /** (owned − locked) × price, normalized to 8-decimal USD. Clamped to 0 if negative. */
+    /** (owned + netDebt − locked) × price, normalized to 8-decimal USD. Clamped to 0 if negative. */
     spotEffUsd: bigint;
     /** shortSize × price / avgShortPrice, normalized to 8-decimal USD. 0 if no shorts. */
     shortEffUsd: bigint;
     /** spotEffUsd + shortEffUsd. */
     effUsd: bigint;
-    /** True if (owned − locked) < 0 — spot term was clamped. */
+    /** True if (owned + netDebt − locked) < 0 — spot term was clamped. */
     spotClamped: boolean;
+    /** netDebt tokens applied to spot term (already converted to token-base units). */
+    netDebtTokens: bigint;
 }
 /** Compute effective USD (price-sensitivity-weighted) for a single custody.
  *
  * Formula (in 8-decimal USD):
- *   spot   = (owned − locked) × price_8dec / 10^decimals
- *   short  = shortSize_6dec × price_8dec / avgShortPrice_6dec  (zeroed if either operand is 0)
- *   effUsd = max(spot, 0) + short
+ *   netDebtTokens = max(debt − borrowLendInterestsAccrued, 0) / DEBT_MULTIPLIER
+ *   spot          = (owned + netDebtTokens − locked) × price_8dec / 10^decimals
+ *   short         = shortSize_6dec × price_8dec / avgShortPrice_6dec  (zeroed if either operand is 0)
+ *   effUsd        = max(spot, 0) + short
  *
  * Algebra for unit normalization:
- *   - owned/locked is in 10^decimals base units; price is 10^8 USD.
- *     spot = (owned − locked) × price_8dec / 10^decimals → 10^8 USD ✓
+ *   - owned/locked/netDebt is in 10^decimals base units; price is 10^8 USD.
+ *     spot = (owned + netDebt − locked) × price_8dec / 10^decimals → 10^8 USD ✓
+ *   - debt is stored as u128 scaled by DEBT_MULTIPLIER (1e9) on top of 10^decimals.
+ *     netDebtTokens = (debt − borrowLendInterestsAccrued) / DEBT_MULTIPLIER
+ *     (integer division — small rounding under one base unit, acceptable).
  *   - shortSize and avgShortPrice are both 10^6; ratio is dimensionless.
  *     short = shortSize × price_8dec / avgShortPrice → 10^8 USD ✓
  */

package/dist/jlpd-strategy/jlp-data.js

@@ -105,19 +105,41 @@ async function fetchAllCustodies(connection) {
         };
     });
 }
+// Module-level memo for Jupiter price/v3 — 3 consumers in this file
+// (fetchJlpCustodyData, fetchJlpPoolDetails, fetchJlpEffectiveWeights) used to
+// each hit the API independently. A single jlp-pool-snapshot route would fire
+// 3 redundant calls per cache miss. 30s TTL is short enough that prices stay
+// fresh for downstream NAV/weight math, long enough to coalesce snapshot loads.
+const PRICES_TTL_MS = 30000;
+let pricesCache = null;
+let pricesInFlight = null;
 async function fetchPrices() {
+    if (pricesCache && Date.now() - pricesCache.at < PRICES_TTL_MS) {
+        return pricesCache.data;
+    }
+    if (pricesInFlight)
+        return pricesInFlight;
     const ids = CUSTODIES.map((c) => c.mintAddress).join(",");
     const url = `${JUPITER_PRICE_API}?ids=${ids}`;
-    const response = await fetch(url);
-    if (!response.ok) {
-        throw new Error(`Jupiter Price API error: ${response.status}`);
-    }
-    const json = (await response.json());
-    const prices = {};
-    for (const [mint, data] of Object.entries(json)) {
-        prices[mint] = data.usdPrice;
-    }
-    return prices;
+    pricesInFlight = (async () => {
+        try {
+            const response = await fetch(url);
+            if (!response.ok) {
+                throw new Error(`Jupiter Price API error: ${response.status}`);
+            }
+            const json = (await response.json());
+            const prices = {};
+            for (const [mint, data] of Object.entries(json)) {
+                prices[mint] = data.usdPrice;
+            }
+            pricesCache = { at: Date.now(), data: prices };
+            return prices;
+        }
+        finally {
+            pricesInFlight = null;
+        }
+    })();
+    return pricesInFlight;
 }
 function calculateDebtTokens(raw) {
     if (raw.debt <= raw.borrowLendInterestsAccrued)
@@ -422,22 +444,34 @@ function priceToScaled8(priceFloat) {
 /** Compute effective USD (price-sensitivity-weighted) for a single custody.
  *
  * Formula (in 8-decimal USD):
- *   spot   = (owned − locked) × price_8dec / 10^decimals
- *   short  = shortSize_6dec × price_8dec / avgShortPrice_6dec  (zeroed if either operand is 0)
- *   effUsd = max(spot, 0) + short
+ *   netDebtTokens = max(debt − borrowLendInterestsAccrued, 0) / DEBT_MULTIPLIER
+ *   spot          = (owned + netDebtTokens − locked) × price_8dec / 10^decimals
+ *   short         = shortSize_6dec × price_8dec / avgShortPrice_6dec  (zeroed if either operand is 0)
+ *   effUsd        = max(spot, 0) + short
  *
  * Algebra for unit normalization:
- *   - owned/locked is in 10^decimals base units; price is 10^8 USD.
- *     spot = (owned − locked) × price_8dec / 10^decimals → 10^8 USD ✓
+ *   - owned/locked/netDebt is in 10^decimals base units; price is 10^8 USD.
+ *     spot = (owned + netDebt − locked) × price_8dec / 10^decimals → 10^8 USD ✓
+ *   - debt is stored as u128 scaled by DEBT_MULTIPLIER (1e9) on top of 10^decimals.
+ *     netDebtTokens = (debt − borrowLendInterestsAccrued) / DEBT_MULTIPLIER
+ *     (integer division — small rounding under one base unit, acceptable).
  *   - shortSize and avgShortPrice are both 10^6; ratio is dimensionless.
  *     short = shortSize × price_8dec / avgShortPrice → 10^8 USD ✓
  */
 function computeEffectiveUsd(input) {
-    const { owned, locked, shortSizeUsd, avgShortPriceUsd, decimals, priceScaled8 } = input;
+    const { owned, locked, debt, borrowLendInterestsAccrued, shortSizeUsd, avgShortPriceUsd, decimals, priceScaled8, } = input;
     const tokScale = 10n ** BigInt(decimals);
-    // Spot term: (owned − locked) × price / 10^decimals
-    // Use signed bigint subtraction; clamp to 0 if owned < locked (defensive).
-    const netTokens = owned - locked; // bigint — can go negative
+    // Net debt tokens: (debt − interestsAccrued) / DEBT_MULTIPLIER, clamped to 0.
+    // Matches `calculateDebtTokens` in `calculateCustodyAum` to keep both code paths
+    // consistent. DEBT_MULTIPLIER is 1e9, scaled before token decimals.
+    const DEBT_MULTIPLIER_BIG = 1000000000n; // 1e9, matches DEBT_MULTIPLIER constant
+    let netDebtTokens = 0n;
+    if (debt > borrowLendInterestsAccrued) {
+        netDebtTokens = (debt - borrowLendInterestsAccrued) / DEBT_MULTIPLIER_BIG;
+    }
+    // Spot term: (owned + netDebt − locked) × price / 10^decimals
+    // Use signed bigint subtraction; clamp to 0 if (owned + netDebt) < locked.
+    const netTokens = owned + netDebtTokens - locked; // bigint — can go negative
     let spotEffUsd;
     let spotClamped = false;
     if (netTokens <= 0n) {
@@ -459,6 +493,7 @@ function computeEffectiveUsd(input) {
         shortEffUsd,
         effUsd: spotEffUsd + shortEffUsd,
         spotClamped,
+        netDebtTokens,
     };
 }
 /** Compute basis-point shares for each effective USD value, summing to 10000.
@@ -529,6 +564,8 @@ async function fetchJlpEffectiveWeights(connection) {
         const effInput = {
             owned: raw.owned,
             locked: raw.locked,
+            debt: raw.debt,
+            borrowLendInterestsAccrued: raw.borrowLendInterestsAccrued,
             shortSizeUsd: raw.globalShortSizes,
             avgShortPriceUsd: raw.globalShortAveragePrices,
             guaranteedUsd: raw.guaranteedUsd,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elemental-stv-core/sdk",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "TypeScript SDK for Elemental Vaults — p-STV Core, Elemental Lend, JLPD Strategy",
   "license": "Apache-2.0",
   "keywords": [