@moonwell-fi/moonwell-sdk 0.10.2 → 0.10.4

package/actions/core/markets/getMarketSnapshots.ts

@@ -326,6 +326,8 @@ async function fetchCoreMarketSnapshotsFromPonder(
         totalBorrowsUsd: borrowUsd,
         totalLiquidity: liquidity,
         totalLiquidityUsd: liquidityUsd,
+        totalReallocatableLiquidity: 0,
+        totalReallocatableLiquidityUsd: 0,
         baseSupplyApy: point.baseSupplyApy,
         baseBorrowApy: point.baseBorrowApy,
         collateralTokenPrice: price,
@@ -552,12 +554,17 @@ export async function fetchIsolatedMarketSnapshots(
             collateralTokenPrice > 0
               ? snapshot.totalLiquidityUsd / collateralTokenPrice
               : snapshot.totalLiquidity;
+          const totalReallocatableLiquidity =
+            collateralTokenPrice > 0
+              ? snapshot.totalReallocatableLiquidityUsd / collateralTokenPrice
+              : snapshot.totalReallocatableLiquidity;
 
           return {
             ...snapshot,
             collateralTokenPrice,
             totalSupply,
             totalLiquidity,
+            totalReallocatableLiquidity,
           };
         });
       }
@@ -790,6 +797,8 @@ async function fetchIsolatedMarketSnapshotsFromBlueApi(
               totalSupplyUsd: Number(supplyAssetsUsd.y),
               totalLiquidity,
               totalLiquidityUsd: Number(liquidityAssetsUsd.y),
+              totalReallocatableLiquidity: 0,
+              totalReallocatableLiquidityUsd: 0,
               baseSupplyApy: supplyApy.y,
               baseBorrowApy: borrowApy.y,
               loanTokenPrice,

package/actions/governance/common.ts

@@ -54,8 +54,68 @@ type MerklReward = {
   pending: string;
 };
 
+type MerklCampaign = {
+  campaignId: string;
+  apr: number;
+  startTimestamp: number;
+  endTimestamp: number;
+  params: {
+    targetToken: string;
+  };
+};
+
+type CampaignIdsCache = {
+  ids: string[];
+  fetchedAt: number;
+};
+
+const MOONWELL_MERKL_CREATOR = "0x8b621804a7637b781e2BbD58e256a591F2dF7d51";
+const CAMPAIGN_IDS_CACHE_TTL_MS = 4 * 60 * 60 * 1000; // 4 hours
 const MAX_BREAKDOWN_PAGES = 10;
 
+let campaignIdsCache: CampaignIdsCache | null = null;
+
+/** Resets the in-memory campaign IDs cache. Intended for use in tests only. */
+export function resetMerklCampaignIdsCache(): void {
+  campaignIdsCache = null;
+}
+
+/**
+ * Fetches all Moonwell Merkl campaign IDs from the API.
+ * Results are cached in memory for 4 hours since campaigns only change monthly.
+ */
+export async function getMerklCampaignIds(): Promise<string[]> {
+  const now = Date.now();
+  if (
+    campaignIdsCache !== null &&
+    now - campaignIdsCache.fetchedAt < CAMPAIGN_IDS_CACHE_TTL_MS
+  ) {
+    return campaignIdsCache.ids;
+  }
+
+  try {
+    const response = await fetch(
+      `https://api.merkl.xyz/v4/campaigns?creatorAddress=${MOONWELL_MERKL_CREATOR}&excludeSubCampaigns=true&items=100`,
+      { headers: MOONWELL_FETCH_JSON_HEADERS },
+    );
+
+    if (!response.ok) {
+      console.warn(
+        `Merkl API request failed: ${response.status} ${response.statusText}`,
+      );
+      return campaignIdsCache?.ids ?? [];
+    }
+
+    const data = (await response.json()) as MerklCampaign[];
+    const ids = data.map((c) => c.campaignId);
+    campaignIdsCache = { ids, fetchedAt: now };
+    return ids;
+  } catch (error) {
+    console.error("Error in getMerklCampaignIds:", error);
+    return campaignIdsCache?.ids ?? [];
+  }
+}
+
 export async function getMerklRewardsData(
   campaignId: string[],
   chainId: number,
@@ -152,13 +212,15 @@ export async function getMerklRewardsData(
   }
 }
 
-export async function getMerklStakingApr(campaignId: string): Promise<number> {
+export async function getMerklStakingApr(
+  contractAddress: string,
+): Promise<number> {
+  const now = Math.floor(Date.now() / 1000);
+
   try {
     const response = await fetch(
-      `https://api.merkl.xyz/v4/campaigns?campaignId=${campaignId}`,
-      {
-        headers: MOONWELL_FETCH_JSON_HEADERS,
-      },
+      `https://api.merkl.xyz/v4/campaigns?creatorAddress=${MOONWELL_MERKL_CREATOR}&excludeSubCampaigns=true&items=100`,
+      { headers: MOONWELL_FETCH_JSON_HEADERS },
     );
 
     if (!response.ok) {
@@ -168,9 +230,15 @@ export async function getMerklStakingApr(campaignId: string): Promise<number> {
       return 0;
     }
 
-    const data = (await response.json()) as { apr: number }[];
+    const data = (await response.json()) as MerklCampaign[];
 
-    return data.reduce((acc, curr) => acc + Number(curr.apr), 0);
+    return data
+      .filter((c) => c.startTimestamp <= now && c.endTimestamp >= now)
+      .filter(
+        (c) =>
+          c.params.targetToken.toLowerCase() === contractAddress.toLowerCase(),
+      )
+      .reduce((acc, c) => acc + Number(c.apr), 0);
   } catch (error) {
     console.error("Error in getMerklStakingApr:", error);
     return 0;

package/actions/governance/getStakingInfo.ts

@@ -87,9 +87,14 @@ export async function getStakingInfo<
     )
     .filter((val) => val !== undefined);
 
-  const baseStakingApr = await getMerklStakingApr(
-    "0xd6481eec8f9bd0d7c3d8ea71ea46df738497264effa46fa0b796c0e65c6c7427",
-  ); // merkl campaign id
+  const baseEnv = envsWithStaking.find((env) => env.chainId === base.id);
+  const stakingTokenKey = baseEnv?.config.contracts.stakingToken;
+  const baseStkToken =
+    baseEnv != null && stakingTokenKey != null
+      ? baseEnv.config.tokens[stakingTokenKey]
+      : undefined;
+  const baseStakingApr =
+    baseStkToken != null ? await getMerklStakingApr(baseStkToken.address) : 0;
 
   const result = envsWithStaking.flatMap((curr, index) => {
     const token =

package/actions/governance/getUserStakingInfo.ts

@@ -9,7 +9,7 @@ import {
   publicEnvironments,
 } from "../../environments/index.js";
 import type { UserStakingInfo } from "../../types/staking.js";
-import { getMerklRewardsData } from "./common.js";
+import { getMerklCampaignIds, getMerklRewardsData } from "./common.js";
 
 export type GetUserStakingInfoParameters<
   environments,
@@ -55,18 +55,9 @@ export async function getUserStakingInfo<
     }),
   );
 
-  // merkl rewards by campaignId
+  const campaignIds = await getMerklCampaignIds();
   const merklRewards = await getMerklRewardsData(
-    [
-      "0xcd60ff26dc0b43f14c995c494bc5650087eaae68b279bdbe85e0e8eaa11fd513",
-      "0xf2c5b7dd2d3416d3853bcf1e93c1cfdb7b5b5fda079d36408df02f731f7d1499",
-      "0x0761f42dda11caa8ef9d8f46a12fc13f073bd11153ff16ac0177c59a536f68ee",
-      "0x78a35e1cb13a476120a0d7efa669deda6578d46f8ecc708621291df87e90252b",
-      "0xf9e12deb62df71ffe6527b8f9000f93d3f783b3a58f7ec3f2be52cb9156608f3",
-      "0xc21b035371d3e8af5b81024a6fe9b713cb047d8c6dbaa4663a5aac9e76663c50",
-      "0x0c3ec6a807049edd368e2493b6ab1f71557384c248013f5eee9cb375eead5faa",
-      "0xd6481eec8f9bd0d7c3d8ea71ea46df738497264effa46fa0b796c0e65c6c7427",
-    ],
+    campaignIds,
     base.id,
     userAddress,
   );

package/actions/lunar-indexer-transformers.ts

@@ -40,6 +40,8 @@ export function transformMarketSnapshot(
     totalBorrowsUsd: Number(lunar.totalBorrowsUSD),
     totalLiquidity: Number(lunar.totalLiquidity),
     totalLiquidityUsd: Number(lunar.totalLiquidityUSD),
+    totalReallocatableLiquidity: 0,
+    totalReallocatableLiquidityUsd: 0,
     baseSupplyApy: Number(lunar.baseSupplyApy),
     baseBorrowApy: Number(lunar.baseBorrowApy),
     timestamp: Number(lunar.timestamp) * 1000, // Convert unix timestamp to milliseconds

package/actions/morpho/markets/common.ts

@@ -718,12 +718,13 @@ async function getMorphoMarketRewards(
 
   if (result) {
     const markets = result.markets.items.map((item) => {
+      const loanAssetDecimals = item.loanAsset.decimals;
       const mapping: GetMorphoMarketsRewardsReturnType = {
         chainId: item.morphoBlue.chain.id,
         marketId: item.uniqueKey,
         reallocatableLiquidityAssets: new Amount(
           BigInt(item.reallocatableLiquidityAssets),
-          item.loanAsset.decimals,
+          loanAssetDecimals,
         ),
         // Note: The Morpho GraphQL API may return null for collateralAssets and
         // collateralAssetsUsd for markets with no collateral deposited or during data sync.
@@ -738,7 +739,7 @@ async function getMorphoMarketRewards(
         collateralAssetsUsd: item.state.collateralAssetsUsd ?? null,
         publicAllocatorSharedLiquidity: item.publicAllocatorSharedLiquidity.map(
           (item) => ({
-            assets: Number(item.assets),
+            assets: Number(item.assets) / 10 ** loanAssetDecimals,
             vault: {
               address: item.vault.address,
               name: item.vault.name,

package/actions/morpho/markets/getMarketSnapshots.ts

@@ -16,9 +16,11 @@ export type MarketSnapshot = {
   totalSupplyAssets: Amount;
   totalBorrowAssets: Amount;
   totalLiquidity: Amount;
+  totalReallocatableLiquidity: Amount;
   totalSupplyAssetsUsd: number;
   totalBorrowAssetsUsd: number;
   totalLiquidityUsd: number;
+  totalReallocatableLiquidityUsd: number;
   loanTokenPrice: number;
   collateralTokenPrice: number;
   supplyApy: number;
@@ -105,9 +107,16 @@ export async function getMarketSnapshots<
         BigInt(Math.round(s.totalLiquidity * 10 ** loanToken.decimals)),
         loanToken.decimals,
       ),
+      totalReallocatableLiquidity: new Amount(
+        BigInt(
+          Math.round(s.totalReallocatableLiquidity * 10 ** loanToken.decimals),
+        ),
+        loanToken.decimals,
+      ),
       totalSupplyAssetsUsd: s.totalSupplyUsd,
       totalBorrowAssetsUsd: s.totalBorrowsUsd,
       totalLiquidityUsd: s.totalLiquidityUsd,
+      totalReallocatableLiquidityUsd: s.totalReallocatableLiquidityUsd,
       loanTokenPrice: s.loanTokenPrice,
       collateralTokenPrice: s.collateralTokenPrice,
       supplyApy: s.baseSupplyApy,
@@ -181,15 +190,29 @@ export async function getMarketSnapshots<
       loanToken.decimals,
     );
 
+    const totalReallocatableLiquidity = new Amount(
+      BigInt(
+        Math.floor(
+          Number.parseFloat(snapshot.totalReallocatableLiquidity ?? "0") *
+            10 ** loanToken.decimals,
+        ),
+      ),
+      loanToken.decimals,
+    );
+
     return {
       timestamp: snapshot.timestamp,
       blockNumber: BigInt(snapshot.blockNumber),
       totalSupplyAssets,
       totalBorrowAssets,
       totalLiquidity,
+      totalReallocatableLiquidity,
       totalSupplyAssetsUsd: Number.parseFloat(snapshot.totalSupplyAssetsUsd),
       totalBorrowAssetsUsd: Number.parseFloat(snapshot.totalBorrowAssetsUsd),
       totalLiquidityUsd: Number.parseFloat(snapshot.totalLiquidityUsd),
+      totalReallocatableLiquidityUsd: Number.parseFloat(
+        snapshot.totalReallocatableLiquidityUsd ?? "0",
+      ),
       loanTokenPrice: Number.parseFloat(snapshot.loanTokenPrice),
       collateralTokenPrice: Number.parseFloat(snapshot.collateralTokenPrice),
       supplyApy: Number.parseFloat(snapshot.supplyApy),

package/actions/morpho/markets/lunarIndexerTransform.ts

@@ -82,6 +82,8 @@ export type LunarIndexerMarketSnapshot = {
   totalSupplyAssetsUsd: string;
   totalBorrowAssetsUsd: string;
   totalLiquidityUsd: string;
+  totalReallocatableLiquidity?: string;
+  totalReallocatableLiquidityUsd?: string;
   loanTokenPrice: string;
   collateralTokenPrice: string;
   supplyApy: string;
@@ -125,6 +127,13 @@ export function transformIsolatedMarketSnapshotFromIndexer(
       ? totalLiquidityUsd / collateralTokenPrice
       : Number.parseFloat(snapshot.totalLiquidity);
 
+  const totalReallocatableLiquidity = Number.parseFloat(
+    snapshot.totalReallocatableLiquidity ?? "0",
+  );
+  const totalReallocatableLiquidityUsd = Number.parseFloat(
+    snapshot.totalReallocatableLiquidityUsd ?? "0",
+  );
+
   return {
     chainId: snapshot.chainId,
     marketId: snapshot.marketId.toLowerCase(),
@@ -135,6 +144,8 @@ export function transformIsolatedMarketSnapshotFromIndexer(
     totalBorrowsUsd: Number.parseFloat(snapshot.totalBorrowAssetsUsd),
     totalLiquidity,
     totalLiquidityUsd,
+    totalReallocatableLiquidity,
+    totalReallocatableLiquidityUsd,
     baseSupplyApy: Number.parseFloat(snapshot.supplyApy),
     baseBorrowApy: Number.parseFloat(snapshot.borrowApy),
     loanTokenPrice,

package/actions/morpho/vaults/common.ts

@@ -847,6 +847,21 @@ async function getMorphoVaultsDataFromOnChain(params: {
               },
             );
 
+            // For V2 vaults, normalize allocations to reflect deployed asset distribution
+            // V2 vaults may have idle capital not deployed to adapters, which causes
+            // raw allocations to sum to less than 100% of total vault assets
+            if (vaultConfig.version === 2) {
+              const totalAllocation = markets.reduce(
+                (sum, m) => sum + m.allocation,
+                0,
+              );
+              if (totalAllocation > 0) {
+                for (const market of markets) {
+                  market.allocation = market.allocation / totalAllocation;
+                }
+              }
+            }
+
             // Only calculate baseApy from markets for v1 vaults
             // v2 vaults already have baseApy from Morpho API
             if (vaultConfig.version !== 2) {

package/environments/definitions/base/morpho-vaults.ts

@@ -9,24 +9,52 @@ export const vaults = createVaultConfig({
       vaultToken: "mwETH",
       campaignId:
         "0x1df9a935f6b928b4809c4fda483f16839140864b2b412cc5fea85fd5d9d00e57",
+      version: 2,
+    },
+    mwETHv1: {
+      underlyingToken: "ETH",
+      vaultToken: "mwETHv1",
+      campaignId:
+        "0x1df9a935f6b928b4809c4fda483f16839140864b2b412cc5fea85fd5d9d00e57",
     },
     mwUSDC: {
       underlyingToken: "USDC",
       vaultToken: "mwUSDC",
       campaignId:
         "0xec43a3d75ae25c5255eb06b3aac6b79ccb2cdb6b99740ea13553661b0f06b756",
+      version: 2,
+    },
+    mwUSDCv1: {
+      underlyingToken: "USDC",
+      vaultToken: "mwUSDCv1",
+      campaignId:
+        "0xec43a3d75ae25c5255eb06b3aac6b79ccb2cdb6b99740ea13553661b0f06b756",
     },
     mwEURC: {
       underlyingToken: "EURC",
       vaultToken: "mwEURC",
       campaignId:
         "0x03430078e052d58b6e80fa8e373c38a75736f1d24768b9c92a2e44bc4ce62b1d",
+      version: 2,
+    },
+    mwEURCv1: {
+      underlyingToken: "EURC",
+      vaultToken: "mwEURCv1",
+      campaignId:
+        "0x03430078e052d58b6e80fa8e373c38a75736f1d24768b9c92a2e44bc4ce62b1d",
     },
     mwcbBTC: {
       underlyingToken: "cbBTC",
       vaultToken: "mwcbBTC",
       campaignId:
         "0xb230a09331c22280ae3e02a65caad21a553274912352d8f93c7a92c0f9bb3da4",
+      version: 2,
+    },
+    mwcbBTCv1: {
+      underlyingToken: "cbBTC",
+      vaultToken: "mwcbBTCv1",
+      campaignId:
+        "0xb230a09331c22280ae3e02a65caad21a553274912352d8f93c7a92c0f9bb3da4",
     },
     meUSDC: {
       underlyingToken: "USDC",

package/environments/definitions/base/tokens.ts

@@ -141,29 +141,53 @@ export const tokens = createTokenConfig({
     symbol: "mEURC",
   },
   mwETH: {
-    address: "0xa0E430870c4604CcfC7B38Ca7845B1FF653D0ff1",
+    address: "0x89BeDBB1C4837444Da215A377275Ff96A84D6f53",
     decimals: 18,
     name: "Moonwell Flagship ETH",
     symbol: "mwETH",
   },
+  mwETHv1: {
+    address: "0xa0E430870c4604CcfC7B38Ca7845B1FF653D0ff1",
+    decimals: 18,
+    name: "Moonwell Flagship ETH V1",
+    symbol: "mwETHv1",
+  },
   mwUSDC: {
-    address: "0xc1256Ae5FF1cf2719D4937adb3bbCCab2E00A2Ca",
+    address: "0x48a90E85be5C56b0A669985A12ee7C449fC79965",
     decimals: 18,
     name: "Moonwell Flagship USDC",
     symbol: "mwUSDC",
   },
+  mwUSDCv1: {
+    address: "0xc1256Ae5FF1cf2719D4937adb3bbCCab2E00A2Ca",
+    decimals: 18,
+    name: "Moonwell Flagship USDC V1",
+    symbol: "mwUSDCv1",
+  },
   mwEURC: {
-    address: "0xf24608E0CCb972b0b0f4A6446a0BBf58c701a026",
+    address: "0x5083b1387Ec3d4Ee6467B83890D98f1AF93F7c48",
     decimals: 18,
     name: "Moonwell Flagship EURC",
     symbol: "mwEURC",
   },
+  mwEURCv1: {
+    address: "0xf24608E0CCb972b0b0f4A6446a0BBf58c701a026",
+    decimals: 18,
+    name: "Moonwell Flagship EURC V1",
+    symbol: "mwEURCv1",
+  },
   mwcbBTC: {
-    address: "0x543257eF2161176D7C8cD90BA65C2d4CaEF5a796",
+    address: "0xdbA76Bc542bb07538e046B40F2e8a215B409F7A8",
     decimals: 18,
     name: "Moonwell Frontier cbBTC",
     symbol: "mwcbBTC",
   },
+  mwcbBTCv1: {
+    address: "0x543257eF2161176D7C8cD90BA65C2d4CaEF5a796",
+    decimals: 18,
+    name: "Moonwell Frontier cbBTC V1",
+    symbol: "mwcbBTCv1",
+  },
   WELL: {
     address: "0xA88594D404727625A9437C3f886C7643872296AE",
     decimals: 18,

package/errors/version.ts

@@ -1 +1 @@
-export const version = '0.10.2'
+export const version = '0.10.4'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonwell-fi/moonwell-sdk",
   "description": "TypeScript Interface for Moonwell",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",

package/types/market.ts

@@ -51,6 +51,8 @@ export type MarketSnapshot = {
   totalBorrowsUsd: number;
   totalLiquidity: number;
   totalLiquidityUsd: number;
+  totalReallocatableLiquidity: number;
+  totalReallocatableLiquidityUsd: number;
   baseSupplyApy: number;
   baseBorrowApy: number;
   loanTokenPrice: number;