@eulerxyz/euler-v2-sdk 0.2.6-beta → 0.2.8-beta

package/dist/src/services/vaults/eulerEarnService/adapters/eulerEarnOnchainAdapter.js

@@ -8,6 +8,21 @@ const SECONDS_IN_YEAR = 365 * 24 * 60 * 60;
 const TARGET_TIME_AGO_SECONDS = 60 * 60;
 const SAMPLE_DISTANCE_BLOCKS = 10_000;
 const EULER_EARN_FETCH_BATCH_SIZE = 4;
+// Blocks to step back from the latest head when picking the "current" sample
+// point. Load-balanced JSON-RPC fleets can serve subsequent eth_calls from
+// nodes whose heads lag the node that answered `getBlockNumber()` by 1–2
+// blocks; pinning convertToAssets to `latest.number` would then fail on lagging
+// nodes. Backing off by a few blocks puts the measurement at a height that
+// every plausibly-synced backend has seen, while the resulting staleness
+// (~60s on Ethereum, sub-second on most L2s) is negligible against the 3600s
+// measurement window.
+const MEASUREMENT_BLOCK_BACKOFF = 5n;
+// Extra digits of precision added on top of share decimals when probing the
+// vault exchange rate. The probe is linear in `convertToAssets`, so scaling it
+// up costs nothing other than headroom against uint256 overflow. With 1e12 on
+// top of asset decimals, even low-decimal assets (USDC/cbBTC) keep tens of
+// significant digits of resolution in the 1h rate change.
+const PROBE_PRECISION_BOOST = 12n;
 const verifiedArrayAbi = [
     {
         type: "function",
@@ -95,36 +110,55 @@ export class EulerEarnOnchainAdapter {
     }
     async getSupplyApyWindow(provider) {
         const latestBlockNumber = await this.queryBlockNumber(provider);
-        const currentBlockNumber = latestBlockNumber > 0n ? latestBlockNumber - 1n : 0n;
-        const sampleDistanceBlocks = currentBlockNumber > BigInt(SAMPLE_DISTANCE_BLOCKS)
+        if (latestBlockNumber <= MEASUREMENT_BLOCK_BACKOFF) {
+            throw new Error("Failed to estimate 1h EulerEarn APY block window.");
+        }
+        const measurementBlockNumber = latestBlockNumber - MEASUREMENT_BLOCK_BACKOFF;
+        const sampleDistanceBlocks = measurementBlockNumber > BigInt(SAMPLE_DISTANCE_BLOCKS)
             ? BigInt(SAMPLE_DISTANCE_BLOCKS)
-            : currentBlockNumber;
-        const sampleBlockNumber = currentBlockNumber - sampleDistanceBlocks;
-        const [currentBlockData, sampleBlockData] = await Promise.all([
-            this.queryBlock(provider, currentBlockNumber),
+            : measurementBlockNumber;
+        const sampleBlockNumber = measurementBlockNumber - sampleDistanceBlocks;
+        const [measurementBlockData, sampleBlockData] = await Promise.all([
+            this.queryBlock(provider, measurementBlockNumber),
             this.queryBlock(provider, sampleBlockNumber),
         ]);
-        const elapsedForSample = Number(currentBlockData.timestamp) - Number(sampleBlockData.timestamp);
+        const elapsedForSample = Number(measurementBlockData.timestamp) -
+            Number(sampleBlockData.timestamp);
         if (elapsedForSample <= 0) {
             throw new Error("Failed to estimate 1h EulerEarn APY block window.");
         }
         const averageBlockTimeSeconds = elapsedForSample / Number(sampleDistanceBlocks);
         const oneHourAgoBlockOffset = Math.round(TARGET_TIME_AGO_SECONDS / averageBlockTimeSeconds);
-        const oneHourAgoBlockNumber = currentBlockNumber > BigInt(oneHourAgoBlockOffset)
-            ? currentBlockNumber - BigInt(oneHourAgoBlockOffset)
-            : 0n;
-        const elapsedSeconds = oneHourAgoBlockOffset * averageBlockTimeSeconds;
+        // Bail if the chain has less than ~1h of history rather than silently
+        // clamping to genesis — the latter would normalise the rate change against
+        // a too-short window and explode the displayed APY.
+        if (measurementBlockNumber <= BigInt(oneHourAgoBlockOffset)) {
+            throw new Error("Failed to determine 1h EulerEarn APY time delta.");
+        }
+        const oneHourAgoBlockNumber = measurementBlockNumber - BigInt(oneHourAgoBlockOffset);
+        // Read the actual timestamp at the prior block instead of trusting the
+        // 10K-block average. Block-rate variance over the last hour (sequencer
+        // hiccups, MEV bursts, late-block stretches) would otherwise scale the
+        // displayed APY by the inverse of the rate skew.
+        const priorBlockData = await this.queryBlock(provider, oneHourAgoBlockNumber);
+        const elapsedSeconds = Number(measurementBlockData.timestamp) -
+            Number(priorBlockData.timestamp);
         if (elapsedSeconds <= 0) {
             throw new Error("Failed to determine 1h EulerEarn APY time delta.");
         }
-        return { currentBlockNumber, oneHourAgoBlockNumber, elapsedSeconds };
+        return { measurementBlockNumber, oneHourAgoBlockNumber, elapsedSeconds };
     }
+    // Compound a measured rate change observed over `elapsedSeconds` into an APY,
+    // using continuous-per-second compounding to match the EVK/Lens convention.
+    // Equivalent to `(1 + spy) ** SECONDS_IN_YEAR - 1` where
+    // `spy = rateChange / elapsedSeconds`.
     computeSupplyApy1h(currentRate, oldRate, elapsedSeconds) {
-        if (oldRate <= 0n)
+        if (oldRate <= 0n || elapsedSeconds <= 0)
             return undefined;
         const rateChange = Number(currentRate - oldRate) / Number(oldRate);
-        const apy = (rateChange * SECONDS_IN_YEAR) / elapsedSeconds;
-        return Number.isFinite(apy) ? apy * 100 : undefined;
+        const spy = rateChange / elapsedSeconds;
+        const apy = ((1 + spy) ** SECONDS_IN_YEAR - 1) * 100;
+        return Number.isFinite(apy) ? apy : undefined;
     }
     async fetchVaults(chainId, vaults) {
         const provider = this.providerService.getProvider(chainId);
@@ -166,9 +200,10 @@ export class EulerEarnOnchainAdapter {
                         });
                     }
                     else {
+                        const probeShares = 10n ** (vaultInfo.vaultDecimals + PROBE_PRECISION_BOOST);
                         const [currentRateResult, oldRateResult] = await Promise.allSettled([
-                            this.queryEulerEarnConvertToAssets(provider, vault, 10n ** vaultInfo.vaultDecimals),
-                            this.queryEulerEarnConvertToAssets(provider, vault, 10n ** vaultInfo.vaultDecimals, supplyApyWindow.value.oneHourAgoBlockNumber),
+                            this.queryEulerEarnConvertToAssets(provider, vault, probeShares, supplyApyWindow.value.measurementBlockNumber),
+                            this.queryEulerEarnConvertToAssets(provider, vault, probeShares, supplyApyWindow.value.oneHourAgoBlockNumber),
                         ]);
                         if (currentRateResult.status === "fulfilled" &&
                             oldRateResult.status === "fulfilled") {

package/dist/src/services/vaults/eulerEarnService/adapters/eulerEarnOnchainAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"eulerEarnOnchainAdapter.js","sourceRoot":"","sources":["../../../../../../src/services/vaults/eulerEarnService/adapters/eulerEarnOnchainAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"eulerEarnOnchainAdapter.js","sourceRoot":"","sources":["../../../../../../src/services/vaults/eulerEarnService/adapters/eulerEarnOnchainAdapter.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/accountComputations.d.ts

@@ -89,43 +89,43 @@ export interface YieldApyBreakdown {
  * Requires populated vaults (for APY data) and market prices (for USD values).
  * Returns `undefined` when prerequisites are missing or equity <= 0.
  */
-export declare function computeSubAccountRoe(subAccount: ISubAccount<IHasVaultAddress>): SubAccountRoe | undefined;
+export declare function computeSubAccountRoe(subAccount: ISubAccount<IHasVaultAddress>, viewer: Address | string | undefined | null): SubAccountRoe | undefined;
 /**
  * Net APY across the full account, relative to total supplied value.
  *
  * `totalNetYield / totalSupplyUsd`, where net yield includes supply APY,
  * borrow costs, supply/borrow reward APRs, and intrinsic APY.
  */
-export declare function computeAccountNetApy(account: IAccount<IHasVaultAddress>): number | undefined;
+export declare function computeAccountNetApy(account: IAccount<IHasVaultAddress>, viewer: Address | string | undefined | null): number | undefined;
 /**
  * Net APY across a pre-filtered set of positions, relative to supplied value.
  * Use this when a higher-level view intentionally excludes some account positions.
  */
-export declare function computePositionsNetApy(positions: Iterable<AccountYieldPosition>): number | undefined;
+export declare function computePositionsNetApy(positions: Iterable<AccountYieldPosition>, viewer: Address | string | undefined | null): number | undefined;
 /**
  * Return on equity across the full account, relative to net asset value.
  *
  * `totalNetYield / (totalSupplyUsd - totalBorrowUsd)`.
  */
-export declare function computeAccountRoe(account: IAccount<IHasVaultAddress>): number | undefined;
+export declare function computeAccountRoe(account: IAccount<IHasVaultAddress>, viewer: Address | string | undefined | null): number | undefined;
 /**
  * Return on equity across a pre-filtered set of positions, relative to net asset value.
  * Use this when a higher-level view intentionally excludes some account positions.
  */
-export declare function computePositionsRoe(positions: Iterable<AccountYieldPosition>): number | undefined;
+export declare function computePositionsRoe(positions: Iterable<AccountYieldPosition>, viewer: Address | string | undefined | null): number | undefined;
 /**
  * APY contribution breakdown across a pre-filtered set of positions, relative to supplied value.
  */
-export declare function computePositionsNetApyBreakdown(positions: Iterable<AccountYieldPosition>): YieldApyBreakdown | undefined;
+export declare function computePositionsNetApyBreakdown(positions: Iterable<AccountYieldPosition>, viewer: Address | string | undefined | null): YieldApyBreakdown | undefined;
 /**
  * ROE contribution breakdown across a pre-filtered set of positions, relative to net asset value.
  */
-export declare function computePositionsRoeBreakdown(positions: Iterable<AccountYieldPosition>): YieldApyBreakdown | undefined;
+export declare function computePositionsRoeBreakdown(positions: Iterable<AccountYieldPosition>, viewer: Address | string | undefined | null): YieldApyBreakdown | undefined;
 /**
  * APY breakdown for a single supplied vault position.
  * Does not require USD values because a single supply-side APY is value-independent.
  */
-export declare function computeSupplyApyBreakdown(vault: IHasVaultAddress | undefined): YieldApyBreakdown | undefined;
+export declare function computeSupplyApyBreakdown(vault: IHasVaultAddress | undefined, viewer: Address | string | undefined | null): YieldApyBreakdown | undefined;
 /**
  * Net APY relative to total supply.
  * `(supplyUsd * (supplyApy + supplyReward) - borrowUsd * (borrowApy - borrowReward)) / supplyUsd`
@@ -151,5 +151,38 @@ export interface AccountYieldPosition {
     vault?: IHasVaultAddress;
     suppliedValueUsd?: number;
     borrowedValueUsd?: number;
+    /**
+     * Optional borrow-side context. When present on a borrow position, the
+     * yield computation also picks up `BORROW_COLLATERAL` campaigns (gated by
+     * the collateral set) and `LOOPING` campaigns (gated by the position
+     * multiplier). Without this context, those campaigns are excluded — the
+     * SDK has no way to know which collaterals back the borrow or what the
+     * effective leverage is.
+     */
+    borrowContext?: BorrowYieldContext;
+}
+/**
+ * Context attached to a borrow `AccountYieldPosition` so collateral-conditional
+ * and leverage-conditional rewards can be attributed to the position.
+ */
+export interface BorrowYieldContext {
+    /**
+     * Collateral vault addresses backing this borrow.
+     * `BORROW_COLLATERAL` campaigns whose `collateralAddress` matches an entry
+     * here are added to the borrow-side reward yield.
+     */
+    collateralAddresses: Address[];
+    /**
+     * Effective leverage multiplier (supplied / equity) for this borrow.
+     * `LOOPING` campaigns count when this value is within the campaign's
+     * `[minMultiplier, maxMultiplier]` envelope.
+     */
+    multiplier?: number;
+    /**
+     * Equity (NAV) in USD for this borrow-collateral set.
+     * `LOOPING` rewards are paid per unit of equity (not scaled by leverage),
+     * so their contribution to the yield total is `equityUsd * loopingApr`.
+     */
+    equityUsd?: number;
 }
 //# sourceMappingURL=accountComputations.d.ts.map

package/dist/src/utils/accountComputations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accountComputations.d.ts","sourceRoot":"","sources":["../../../src/utils/accountComputations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"accountComputations.d.ts","sourceRoot":"","sources":["../../../src/utils/accountComputations.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/accountComputations.js

@@ -136,59 +136,19 @@ export function computeBorrowLiquidationPrice(liquidity) {
  * Requires populated vaults (for APY data) and market prices (for USD values).
  * Returns `undefined` when prerequisites are missing or equity <= 0.
  */
-export function computeSubAccountRoe(subAccount) {
-    let totalLendingYield = 0;
-    let totalBorrowingYield = 0;
-    let totalRewardYield = 0;
-    let totalIntrinsicYield = 0;
-    let totalSupplyUsd = 0;
-    let totalBorrowUsd = 0;
-    let hasData = false;
-    for (const p of subAccount.positions) {
-        const vault = p.vault;
-        if (!vault)
-            continue;
-        const intrinsicApyDecimal = getVaultIntrinsicApy(vault);
-        // Supply side
-        if (p.suppliedValueUsd != null && p.suppliedValueUsd > 0) {
-            const supplyUsd = p.suppliedValueUsd;
-            const supplyApy = getVaultSupplyApy(vault);
-            if (supplyApy != null) {
-                hasData = true;
-                totalSupplyUsd += supplyUsd;
-                totalLendingYield += supplyUsd * supplyApy;
-                totalRewardYield += supplyUsd * getVaultRewardApr(vault, "LEND");
-                totalIntrinsicYield += supplyUsd * intrinsicApyDecimal;
-            }
-        }
-        // Borrow side
-        if (p.borrowedValueUsd != null && p.borrowedValueUsd > 0) {
-            const borrowUsd = p.borrowedValueUsd;
-            const borrowApy = getVaultBorrowApy(vault);
-            if (borrowApy != null) {
-                hasData = true;
-                totalBorrowUsd += borrowUsd;
-                totalBorrowingYield += borrowUsd * borrowApy;
-                totalRewardYield += borrowUsd * getVaultRewardApr(vault, "BORROW");
-                totalIntrinsicYield -= borrowUsd * intrinsicApyDecimal;
-            }
-        }
-    }
-    if (!hasData)
+export function computeSubAccountRoe(subAccount, viewer) {
+    const totals = computePositionYieldTotals(subAccountYieldPositions(subAccount), viewer);
+    if (!totals)
         return undefined;
-    const equity = totalSupplyUsd - totalBorrowUsd;
-    if (equity <= 0)
+    if (totals.totalEquityUsd <= 0)
         return undefined;
-    const lending = totalLendingYield / equity;
-    const borrowing = -totalBorrowingYield / equity;
-    const rewards = totalRewardYield / equity;
-    const intrinsicApy = totalIntrinsicYield / equity;
+    const breakdown = divideYieldTotals(totals, totals.totalEquityUsd);
     return {
-        lending,
-        borrowing,
-        rewards,
-        intrinsicApy,
-        total: lending + borrowing + rewards + intrinsicApy,
+        lending: breakdown.lending,
+        borrowing: breakdown.borrowing,
+        rewards: breakdown.rewards,
+        intrinsicApy: breakdown.intrinsicApy,
+        total: breakdown.total,
     };
 }
 // ---------------------------------------------------------------------------
@@ -200,8 +160,8 @@ export function computeSubAccountRoe(subAccount) {
  * `totalNetYield / totalSupplyUsd`, where net yield includes supply APY,
  * borrow costs, supply/borrow reward APRs, and intrinsic APY.
  */
-export function computeAccountNetApy(account) {
-    const totals = computeAccountYieldTotals(account);
+export function computeAccountNetApy(account, viewer) {
+    const totals = computeAccountYieldTotals(account, viewer);
     if (!totals)
         return undefined;
     if (totals.totalSupplyUsd === 0)
@@ -212,8 +172,8 @@ export function computeAccountNetApy(account) {
  * Net APY across a pre-filtered set of positions, relative to supplied value.
  * Use this when a higher-level view intentionally excludes some account positions.
  */
-export function computePositionsNetApy(positions) {
-    const totals = computePositionYieldTotals(positions);
+export function computePositionsNetApy(positions, viewer) {
+    const totals = computePositionYieldTotals(positions, viewer);
     if (!totals)
         return undefined;
     if (totals.totalSupplyUsd === 0)
@@ -225,8 +185,8 @@ export function computePositionsNetApy(positions) {
  *
  * `totalNetYield / (totalSupplyUsd - totalBorrowUsd)`.
  */
-export function computeAccountRoe(account) {
-    const totals = computeAccountYieldTotals(account);
+export function computeAccountRoe(account, viewer) {
+    const totals = computeAccountYieldTotals(account, viewer);
     if (!totals)
         return undefined;
     if (totals.totalEquityUsd <= 0)
@@ -237,8 +197,8 @@ export function computeAccountRoe(account) {
  * Return on equity across a pre-filtered set of positions, relative to net asset value.
  * Use this when a higher-level view intentionally excludes some account positions.
  */
-export function computePositionsRoe(positions) {
-    const totals = computePositionYieldTotals(positions);
+export function computePositionsRoe(positions, viewer) {
+    const totals = computePositionYieldTotals(positions, viewer);
     if (!totals)
         return undefined;
     if (totals.totalEquityUsd <= 0)
@@ -248,8 +208,8 @@ export function computePositionsRoe(positions) {
 /**
  * APY contribution breakdown across a pre-filtered set of positions, relative to supplied value.
  */
-export function computePositionsNetApyBreakdown(positions) {
-    const totals = computePositionYieldTotals(positions);
+export function computePositionsNetApyBreakdown(positions, viewer) {
+    const totals = computePositionYieldTotals(positions, viewer);
     if (!totals)
         return undefined;
     if (totals.totalSupplyUsd === 0)
@@ -259,8 +219,8 @@ export function computePositionsNetApyBreakdown(positions) {
 /**
  * ROE contribution breakdown across a pre-filtered set of positions, relative to net asset value.
  */
-export function computePositionsRoeBreakdown(positions) {
-    const totals = computePositionYieldTotals(positions);
+export function computePositionsRoeBreakdown(positions, viewer) {
+    const totals = computePositionYieldTotals(positions, viewer);
     if (!totals)
         return undefined;
     if (totals.totalEquityUsd <= 0)
@@ -271,12 +231,12 @@ export function computePositionsRoeBreakdown(positions) {
  * APY breakdown for a single supplied vault position.
  * Does not require USD values because a single supply-side APY is value-independent.
  */
-export function computeSupplyApyBreakdown(vault) {
+export function computeSupplyApyBreakdown(vault, viewer) {
     if (!vault)
         return undefined;
     const lending = getVaultSupplyApy(vault) ?? 0;
     const intrinsicApy = getIntrinsicApyContribution(lending, getVaultIntrinsicApy(vault));
-    const rewards = getVaultRewardApr(vault, "LEND");
+    const rewards = getVaultRewardApr(vault, "LEND", viewer);
     return {
         lending,
         borrowing: 0,
@@ -366,17 +326,57 @@ function sumPositionUsd(positions, field) {
     }
     return total;
 }
-function computeAccountYieldTotals(account) {
+function computeAccountYieldTotals(account, viewer) {
     function* positions() {
         for (const subAccount of Object.values(account.subAccounts ?? {})) {
             if (!subAccount)
                 continue;
-            yield* subAccount.positions;
+            yield* subAccountYieldPositions(subAccount);
         }
     }
-    return computePositionYieldTotals(positions());
+    return computePositionYieldTotals(positions(), viewer);
 }
-function computePositionYieldTotals(positions) {
+/**
+ * Lifts a sub-account's positions into `AccountYieldPosition` entries with
+ * borrow-side context populated. For each borrow position, the collaterals
+ * backing it (via `findCollateralPositionsForBorrow`) are recorded so the
+ * yield computation can pick up `BORROW_COLLATERAL` and `LOOPING` rewards.
+ */
+function subAccountYieldPositions(subAccount) {
+    const out = [];
+    for (const p of subAccount.positions) {
+        if (p.borrowedValueUsd != null && p.borrowedValueUsd > 0) {
+            const collaterals = findCollateralPositionsForBorrow(subAccount, p);
+            const suppliedSum = sumPositionUsd(collaterals, "suppliedValueUsd");
+            const multiplier = computeCollateralMultiplier(suppliedSum, p.borrowedValueUsd);
+            const equityUsd = suppliedSum != null ? suppliedSum - p.borrowedValueUsd : undefined;
+            out.push({
+                vault: p.vault,
+                borrowedValueUsd: p.borrowedValueUsd,
+                borrowContext: {
+                    collateralAddresses: collaterals.map((c) => getAddress(c.vaultAddress)),
+                    multiplier,
+                    equityUsd: equityUsd != null && equityUsd > 0 ? equityUsd : undefined,
+                },
+            });
+            // If the same vault also carries a supply leg (mixed position), emit
+            // it separately so supply rewards still accrue.
+            if (p.suppliedValueUsd != null && p.suppliedValueUsd > 0) {
+                out.push({
+                    vault: p.vault,
+                    suppliedValueUsd: p.suppliedValueUsd,
+                });
+            }
+            continue;
+        }
+        out.push({
+            vault: p.vault,
+            suppliedValueUsd: p.suppliedValueUsd,
+        });
+    }
+    return out;
+}
+function computePositionYieldTotals(positions, viewer) {
     let totalNetYield = 0;
     let totalLendingYield = 0;
     let totalBorrowingYield = 0;
@@ -395,7 +395,7 @@ function computePositionYieldTotals(positions) {
             const baseSupplyApy = getVaultSupplyApy(vault) ?? 0;
             const intrinsicSupplyApy = getIntrinsicApyContribution(baseSupplyApy, getVaultIntrinsicApy(vault));
             const supplyApy = baseSupplyApy + intrinsicSupplyApy;
-            const supplyRewardApy = getVaultRewardApr(vault, "LEND");
+            const supplyRewardApy = getVaultRewardApr(vault, "LEND", viewer);
             totalNetYield += supplyUsd * (supplyApy + supplyRewardApy);
             totalLendingYield += supplyUsd * baseSupplyApy;
             totalRewardYield += supplyUsd * supplyRewardApy;
@@ -409,13 +409,32 @@ function computePositionYieldTotals(positions) {
             const baseBorrowApy = getVaultBorrowApy(vault) ?? 0;
             const intrinsicBorrowApy = getIntrinsicApyContribution(baseBorrowApy, getVaultIntrinsicApy(vault));
             const borrowApy = baseBorrowApy + intrinsicBorrowApy;
-            const borrowRewardApy = getVaultRewardApr(vault, "BORROW");
+            let borrowRewardApy = getVaultRewardApr(vault, "BORROW", viewer);
+            const ctx = position.borrowContext;
+            if (ctx && ctx.collateralAddresses.length > 0) {
+                borrowRewardApy += getVaultRewardApr(vault, "BORROW_COLLATERAL", viewer, (c) => matchesCollateral(c, ctx.collateralAddresses));
+            }
             totalNetYield -= borrowUsd * (borrowApy - borrowRewardApy);
             totalBorrowingYield += borrowUsd * baseBorrowApy;
             totalRewardYield += borrowUsd * borrowRewardApy;
             totalIntrinsicYield -= borrowUsd * intrinsicBorrowApy;
             totalBorrowUsd += borrowUsd;
             hasUsdData = true;
+            // LOOPING rewards are paid per unit of equity (independent of
+            // leverage), so we add `equityUsd * loopingApr` to the reward
+            // totals when the position has a matching, eligible campaign.
+            if (ctx &&
+                ctx.collateralAddresses.length > 0 &&
+                ctx.multiplier != null &&
+                ctx.equityUsd != null &&
+                ctx.equityUsd > 0) {
+                const loopingApr = getVaultRewardApr(vault, "LOOPING", viewer, (c) => isLoopingEligible(c, ctx.collateralAddresses, ctx.multiplier));
+                if (loopingApr !== 0) {
+                    const loopingYield = ctx.equityUsd * loopingApr;
+                    totalNetYield += loopingYield;
+                    totalRewardYield += loopingYield;
+                }
+            }
         }
     }
     if (!hasUsdData)
@@ -487,16 +506,47 @@ function getVaultIntrinsicApy(vault) {
 function getIntrinsicApyContribution(baseApy, intrinsicApy) {
     return (1 + baseApy / 100) * intrinsicApy;
 }
-/** Sum reward APRs for a given action as percentage points from vault campaigns. */
-function getVaultRewardApr(vault, action) {
-    if (!vault.rewards?.campaigns)
+/**
+ * Sum reward APRs (percentage points) for a given action from vault campaigns
+ * eligible to the supplied viewer.
+ *
+ * Uses `vault.rewards.getActiveCampaigns(viewer)` so whitelist/blacklist
+ * filtering is applied consistently with the rest of the SDK. An optional
+ * predicate further narrows the campaigns — used to gate
+ * `BORROW_COLLATERAL` on collateral match and `LOOPING` on multiplier range.
+ */
+function getVaultRewardApr(vault, action, viewer, predicate) {
+    if (!vault.rewards?.getActiveCampaigns)
         return 0;
     let total = 0;
-    for (const c of vault.rewards.campaigns) {
-        if (c.action === action && typeof c.apr === "number") {
-            total += c.apr * 100;
-        }
+    for (const c of vault.rewards.getActiveCampaigns({ viewer })) {
+        if (c.action !== action)
+            continue;
+        if (typeof c.apr !== "number")
+            continue;
+        if (predicate && !predicate(c))
+            continue;
+        total += c.apr * 100;
     }
     return total;
 }
+/** Predicate for `BORROW_COLLATERAL` campaigns: collateral address must match. */
+function matchesCollateral(campaign, collateralAddresses) {
+    if (!campaign.collateralAddress)
+        return false;
+    return collateralAddresses.some((address) => isAddressEqual(address, campaign.collateralAddress));
+}
+/**
+ * Predicate for `LOOPING` campaigns: collateral match AND multiplier within
+ * the campaign's `[minMultiplier, maxMultiplier]` envelope (open ends count).
+ */
+function isLoopingEligible(campaign, collateralAddresses, multiplier) {
+    if (!matchesCollateral(campaign, collateralAddresses))
+        return false;
+    if (campaign.minMultiplier != null && multiplier < campaign.minMultiplier)
+        return false;
+    if (campaign.maxMultiplier != null && multiplier > campaign.maxMultiplier)
+        return false;
+    return true;
+}
 //# sourceMappingURL=accountComputations.js.map