@moonwell-fi/moonwell-sdk 0.12.1 → 0.12.2

package/actions/morpho/user-rewards/common.ts

@@ -1,5 +1,3 @@
-import lodash from "lodash";
-const { uniq } = lodash;
 import { type Address, getContract, parseAbi, zeroAddress } from "viem";
 import { Amount } from "../../../common/amount.js";
 import { MOONWELL_FETCH_JSON_HEADERS } from "../../../common/fetch-headers.js";
@@ -14,258 +12,54 @@ import {
 } from "../../../environments/utils/index.js";
 import type { MorphoUserReward } from "../../../types/morphoUserReward.js";
 import type { MorphoUserStakingReward } from "../../../types/morphoUserStakingReward.js";
-import { getGraphQL } from "../utils/graphql.js";
 
 export async function getUserMorphoRewardsData(params: {
   environment: Environment;
   account: `0x${string}`;
 }): Promise<MorphoUserReward[]> {
+  // The Morpho URD distributions endpoint (rewards.morpho.org) was
+  // deprecated and now 301-redirects to a SPA, so JSON parsing fails.
+  // Surface only Merkl rewards.
+  const merklRewards = await getMerklRewardsData(
+    params.environment,
+    params.account,
+  );
+
   const isFullDeployment =
     params.environment.custom.morpho?.minimalDeployment === false;
 
-  const emptyMorphoRewards: MorphoRewardsResponse[] = [];
-  const [merklRewards, morphoRewards] = await Promise.all([
-    getMerklRewardsData(params.environment, params.account),
-    isFullDeployment
-      ? getMorphoRewardsData(params.environment, params.account)
-      : Promise.resolve(emptyMorphoRewards),
-  ]);
-
-  if (isFullDeployment) {
-    // Process Morpho rewards (GraphQL query depends on morphoRewards result)
-    const morphoAssets = await getMorphoAssetsData(
-      params.environment,
-      morphoRewards.map((r) => r.asset.address),
-    );
-
-    const morphoResult: (MorphoUserReward | undefined)[] = morphoRewards.map(
-      (r) => {
-        const asset = morphoAssets.find(
-          (a) => a.address.toLowerCase() === r.asset.address.toLowerCase(),
-        );
-
-        if (!asset) {
-          return undefined;
-        }
-
-        const rewardToken: TokenConfig = {
-          address: asset.address,
-          decimals: asset.decimals,
-          symbol: asset.symbol,
-          name: asset.name,
-        };
-
-        switch (r.type) {
-          case "uniform-reward": {
-            const claimableNow = new Amount(
-              BigInt(r.amount?.claimable_now || 0),
-              rewardToken.decimals,
-            );
-            const claimableNowUsd = claimableNow.value * (asset.priceUsd || 0);
-            const claimableFuture = new Amount(
-              BigInt(r.amount?.claimable_next || 0),
-              rewardToken.decimals,
-            );
-            const claimableFutureUsd =
-              claimableFuture.value * (asset.priceUsd || 0);
-
-            const uniformReward: MorphoUserReward = {
-              type: "uniform-reward",
-              chainId: r.asset.chain_id,
-              account: r.user,
-              rewardToken,
-              claimableNow,
-              claimableNowUsd,
-              claimableFuture,
-              claimableFutureUsd,
-            };
-            return uniformReward;
-          }
-
-          case "market-reward": {
-            const claimableNow = new Amount(
-              BigInt(r.for_supply?.claimable_now || 0),
-              rewardToken.decimals,
-            );
-            const claimableNowUsd = claimableNow.value * (asset.priceUsd || 0);
-
-            const claimableFuture = new Amount(
-              BigInt(r.for_supply?.claimable_next || 0),
-              rewardToken.decimals,
-            );
-            const claimableFutureUsd =
-              claimableFuture.value * (asset.priceUsd || 0);
-
-            const collateralClaimableNow = new Amount(
-              BigInt(r.for_collateral?.claimable_now || 0),
-              rewardToken.decimals,
-            );
-            const collateralClaimableNowUsd =
-              collateralClaimableNow.value * (asset.priceUsd || 0);
-            const collateralClaimableFuture = new Amount(
-              BigInt(r.for_collateral?.claimable_next || 0),
-              rewardToken.decimals,
-            );
-            const collateralClaimableFutureUsd =
-              collateralClaimableFuture.value * (asset.priceUsd || 0);
-
-            const borrowClaimableNow = new Amount(
-              BigInt(r.for_borrow?.claimable_now || 0),
-              rewardToken.decimals,
-            );
-            const borrowClaimableNowUsd =
-              borrowClaimableNow.value * (asset.priceUsd || 0);
-            const borrowClaimableFuture = new Amount(
-              BigInt(r.for_borrow?.claimable_next || 0),
-              rewardToken.decimals,
-            );
-            const borrowClaimableFutureUsd =
-              borrowClaimableFuture.value * (asset.priceUsd || 0);
-
-            //Rewards reallocated to vaults are reported as vault rewards
-            if (r.reallocated_from) {
-              const vaultReward: MorphoUserReward = {
-                type: "vault-reward",
-                chainId: r.program.chain_id,
-                account: r.user,
-                vaultId: r.reallocated_from,
-                rewardToken,
-                claimableNow,
-                claimableNowUsd,
-                claimableFuture,
-                claimableFutureUsd,
-              };
-              return vaultReward;
-            } else {
-              const marketReward: MorphoUserReward = {
-                type: "market-reward",
-                chainId: r.program.chain_id,
-                account: r.user,
-                marketId: r.program.market_id || "",
-                rewardToken,
-                collateralRewards: {
-                  claimableNow: collateralClaimableNow,
-                  claimableNowUsd: collateralClaimableNowUsd,
-                  claimableFuture: collateralClaimableFuture,
-                  claimableFutureUsd: collateralClaimableFutureUsd,
-                },
-                borrowRewards: {
-                  claimableNow: borrowClaimableNow,
-                  claimableNowUsd: borrowClaimableNowUsd,
-                  claimableFuture: borrowClaimableFuture,
-                  claimableFutureUsd: borrowClaimableFutureUsd,
-                },
-              };
-              return marketReward;
-            }
-          }
-          case "vault-reward": {
-            const claimableNow = new Amount(
-              BigInt(r.for_supply?.claimable_now || 0),
-              rewardToken.decimals,
-            );
-            const claimableNowUsd = claimableNow.value * (asset.priceUsd || 0);
-            const claimableFuture = new Amount(
-              BigInt(r.for_supply?.claimable_next || 0),
-              rewardToken.decimals,
-            );
-            const claimableFutureUsd =
-              claimableFuture.value * (asset.priceUsd || 0);
-
-            const vaultReward: MorphoUserReward = {
-              type: "vault-reward",
-              chainId: r.program.chain_id,
-              account: r.user,
-              vaultId: r.program.vault,
-              rewardToken,
-              claimableNow,
-              claimableNowUsd,
-              claimableFuture,
-              claimableFutureUsd,
-            };
-
-            return vaultReward;
-          }
-        }
-      },
-    );
-
-    // Process Merkl rewards
-    const vaultCampaignIds = new Set<string>(
-      (Object.values(publicEnvironments) as Environment[]).flatMap(
-        (environment) =>
-          Object.values(environment.config.vaults ?? {})
-            .map((vault) => vault.campaignId)
-            .filter((id): id is string => id !== undefined),
-      ),
+  // For full deployments (Base), restrict to Moonwell vault campaigns so the
+  // result excludes staking and other Moonwell campaigns; those are returned
+  // by their own actions (e.g. getUserStakingInfo). On other chains, surface
+  // every Merkl reward we get back.
+  const vaultCampaignIds = isFullDeployment
+    ? new Set<string>(
+        (Object.values(publicEnvironments) as Environment[]).flatMap(
+          (environment) =>
+            Object.values(environment.config.vaults ?? {})
+              .map((vault) => vault.campaignId)
+              .filter((id): id is string => id !== undefined),
+        ),
+      )
+    : null;
+
+  const sumBreakdowns = (
+    breakdowns: {
+      campaignId: string;
+      amount: string;
+      claimed: string;
+      pending: string;
+    }[],
+    field: "amount" | "claimed" | "pending",
+  ): bigint =>
+    breakdowns.reduce(
+      (acc, curr) =>
+        vaultCampaignIds === null || vaultCampaignIds.has(curr.campaignId)
+          ? acc + BigInt(curr[field])
+          : acc,
+      0n,
     );
 
-    const getVaultRewardAmount = (
-      breakdowns: any[],
-      field: "amount" | "claimed" | "pending",
-    ) => {
-      return breakdowns.reduce(
-        (acc, curr) =>
-          vaultCampaignIds.has(curr.campaignId)
-            ? acc + BigInt(curr[field])
-            : acc,
-        0n,
-      );
-    };
-
-    const merklResult: MorphoUserReward[] = [];
-
-    for (const chainData of merklRewards) {
-      for (const reward of chainData.rewards) {
-        // Try to find token info in morphoAssets first
-        const morphoAsset = morphoAssets.find(
-          (a) => a.address.toLowerCase() === reward.token.address.toLowerCase(),
-        );
-
-        const rewardToken: TokenConfig = {
-          address: reward.token.address as Address,
-          decimals: morphoAsset?.decimals ?? reward.token.decimals,
-          symbol: morphoAsset?.symbol ?? reward.token.symbol,
-          name: morphoAsset?.name ?? reward.token.symbol,
-        };
-
-        const amount = getVaultRewardAmount(reward.breakdowns, "amount");
-        const claimed = getVaultRewardAmount(reward.breakdowns, "claimed");
-        const pending = getVaultRewardAmount(reward.breakdowns, "pending");
-
-        const claimableNow = new Amount(amount - claimed, rewardToken.decimals);
-        const claimableNowUsd =
-          claimableNow.value *
-          (morphoAsset?.priceUsd ?? reward.token.price ?? 0);
-        const claimableFuture = new Amount(pending, rewardToken.decimals);
-        const claimableFutureUsd =
-          claimableFuture.value *
-          (morphoAsset?.priceUsd ?? reward.token.price ?? 0);
-
-        const merklReward: MorphoUserReward = {
-          type: "merkl-reward",
-          chainId: chainData.chain.id,
-          account: params.account,
-          rewardToken,
-          claimableNow,
-          claimableNowUsd,
-          claimableFuture,
-          claimableFutureUsd,
-        };
-
-        merklResult.push(merklReward);
-      }
-    }
-
-    // Combine both results
-    const allResults = [
-      ...(morphoResult.filter((r) => r !== undefined) as MorphoUserReward[]),
-      ...merklResult,
-    ];
-
-    return allResults;
-  }
-
   const merklResult: MorphoUserReward[] = [];
 
   for (const chainData of merklRewards) {
@@ -277,19 +71,23 @@ export async function getUserMorphoRewardsData(params: {
         name: reward.token.symbol,
       };
 
-      const claimableNow = new Amount(
-        BigInt(reward.amount) - BigInt(reward.claimed),
-        rewardToken.decimals,
-      );
+      const amount = vaultCampaignIds
+        ? sumBreakdowns(reward.breakdowns, "amount")
+        : BigInt(reward.amount);
+      const claimed = vaultCampaignIds
+        ? sumBreakdowns(reward.breakdowns, "claimed")
+        : BigInt(reward.claimed);
+      const pending = vaultCampaignIds
+        ? sumBreakdowns(reward.breakdowns, "pending")
+        : BigInt(reward.pending);
+
+      const claimableNow = new Amount(amount - claimed, rewardToken.decimals);
       const claimableNowUsd = claimableNow.value * (reward.token.price ?? 0);
-      const claimableFuture = new Amount(
-        BigInt(reward.pending),
-        rewardToken.decimals,
-      );
+      const claimableFuture = new Amount(pending, rewardToken.decimals);
       const claimableFutureUsd =
         claimableFuture.value * (reward.token.price ?? 0);
 
-      const merklReward: MorphoUserReward = {
+      merklResult.push({
         type: "merkl-reward",
         chainId: chainData.chain.id,
         account: params.account,
@@ -298,9 +96,7 @@ export async function getUserMorphoRewardsData(params: {
         claimableNowUsd,
         claimableFuture,
         claimableFutureUsd,
-      };
-
-      merklResult.push(merklReward);
+      });
     }
   }
 
@@ -456,94 +252,6 @@ const getRewardsEarnedData = async (
   return rewards.filter(Boolean);
 };
 
-type MorphoRewardsResponse = {
-  user: Address;
-  for_borrow: {
-    claimable_next: string;
-    claimable_now: string;
-    claimed: string;
-    total: string;
-  };
-  for_collateral: {
-    claimable_next: string;
-    claimable_now: string;
-    claimed: string;
-    total: string;
-  };
-  for_supply: {
-    claimable_next: string;
-    claimable_now: string;
-    claimed: string;
-    total: string;
-  };
-  program: {
-    asset: { address: Address };
-    market_id?: string;
-    chain_id: number;
-    vault: Address;
-  };
-  asset: { address: Address; chain_id: number };
-  amount?: { claimable_next: string; claimable_now: string };
-  type: "vault-reward" | "market-reward" | "uniform-reward";
-  reallocated_from: Address;
-};
-
-type MorphoAssetResponse = {
-  address: Address;
-  symbol: string;
-  priceUsd: number | undefined;
-  name: string;
-  decimals: number;
-};
-
-async function getMorphoRewardsData(
-  environment: Environment,
-  account: Address,
-): Promise<MorphoRewardsResponse[]> {
-  const baseUrl =
-    environment.custom.morpho?.rewardsApiUrl || "https://rewards.morpho.org";
-  const rewardsRequest = await fetch(
-    `${baseUrl}/v1/users/${account}/rewards?chain_id=${environment.chainId}&trusted=true&exclude_merkl_programs=true`,
-    {
-      headers: MOONWELL_FETCH_JSON_HEADERS,
-    },
-  );
-  const rewards = await rewardsRequest.json();
-  return (rewards.data || []) as MorphoRewardsResponse[];
-}
-
-async function getMorphoAssetsData(
-  environment: Environment,
-  addresses: Address[],
-): Promise<MorphoAssetResponse[]> {
-  const rewardsRequest = await getGraphQL<{
-    assets: {
-      items: MorphoAssetResponse[];
-    };
-  }>(
-    environment,
-    `
-    query {
-      assets(where: { address_in:[${uniq(addresses)
-        .map((a: string) => `"${a.toLowerCase()}"`)
-        .join(",")}]}) {
-        items {
-          address     
-          symbol
-          priceUsd
-          name
-          decimals
-        }
-      }
-    }
-  `,
-  );
-  if (rewardsRequest) {
-    return rewardsRequest.assets.items;
-  }
-  return [];
-}
-
 type MerklRewardsResponse = {
   chain: {
     id: number;

package/errors/version.ts

@@ -1 +1 @@
-export const version = '0.12.1'
+export const version = '0.12.2'

package/package.json

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