@moonwell-fi/moonwell-sdk 0.11.0 → 0.12.1

package/actions/core/user-positions/getUserPositionSnapshots.ts

@@ -1,4 +1,3 @@
-import axios from "axios";
 import type { Address } from "viem";
 import type { MoonwellClient } from "../../../client/createMoonwellClient.js";
 import {
@@ -12,10 +11,10 @@ import {
 import type { NetworkParameterType } from "../../../common/types.js";
 import type { Chain, Environment } from "../../../environments/index.js";
 import type { UserPositionSnapshot } from "../../../types/userPosition.js";
+import { postWithRetry } from "../../axiosWithRetry.js";
 import {
   DEFAULT_LUNAR_TIMEOUT_MS,
   createLunarIndexerClient,
-  shouldFallback,
 } from "../../lunar-indexer-client.js";
 import { transformPortfolioToSnapshots } from "../../lunar-indexer-transformers.js";
 
@@ -56,7 +55,6 @@ export type GetUserPositionSnapshotsReturnType = Promise<
  * - Default behavior (no time parameters): Returns 365 days of history
  * - Parameter priority: Custom timestamps > period > default (365 days)
  * - When using Lunar Indexer, custom time ranges are supported
- * - When falling back to Ponder, all available data is returned (client-side filtering may be needed)
  * - Snapshots are filtered to start-of-day for "1d" granularity
  */
 export async function getUserPositionSnapshots<
@@ -90,34 +88,45 @@ async function fetchUserPositionSnapshots(
   endTime?: number,
   granularity?: "6h" | "1d",
 ): Promise<UserPositionSnapshot[]> {
-  if (environment.lunarIndexerUrl) {
+  if (!environment.lunarIndexerUrl) {
+    if (!environment.indexerUrl) return [];
     try {
-      const result = await fetchUserPositionSnapshotsFromLunar(
+      return await fetchUserPositionSnapshotsFromPonder(
         userAddress,
         environment,
-        period,
-        startTime,
-        endTime,
-        granularity,
       );
-      return result;
     } catch (error) {
-      if (!shouldFallback(error)) {
-        throw error;
-      }
-      console.debug(
-        "[Lunar fallback] Falling back to Ponder for user snapshots:",
+      console.warn(
+        `[getUserPositionSnapshots] Ponder failed for chain ${environment.chainId}:`,
         error,
       );
+      environment.onError?.(error, {
+        source: "user-position-snapshots-ponder",
+        chainId: environment.chainId,
+      });
+      return [];
     }
   }
-
-  // Ponder fallback returns all available data (doesn't support time filtering)
-  const result = await fetchUserPositionSnapshotsFromPonder(
-    userAddress,
-    environment,
-  );
-  return result;
+  try {
+    return await fetchUserPositionSnapshotsFromLunar(
+      userAddress,
+      environment,
+      period,
+      startTime,
+      endTime,
+      granularity,
+    );
+  } catch (error) {
+    console.warn(
+      `[getUserPositionSnapshots] Lunar Indexer failed for chain ${environment.chainId}:`,
+      error,
+    );
+    environment.onError?.(error, {
+      source: "user-position-snapshots",
+      chainId: environment.chainId,
+    });
+    return [];
+  }
 }
 
 async function fetchUserPositionSnapshotsFromLunar(
@@ -182,9 +191,7 @@ async function fetchUserPositionSnapshotsFromPonder(
   userAddress: Address,
   environment: Environment,
 ): Promise<UserPositionSnapshot[]> {
-  const dailyData: UserDailyData[] = [];
-  let hasNextPage = true;
-  let endCursor: string | undefined;
+  if (!environment.indexerUrl) return [];
 
   interface UserDailyData {
     totalBorrowsUSD: string;
@@ -193,15 +200,16 @@ async function fetchUserPositionSnapshotsFromPonder(
     timestamp: number;
   }
 
+  const dailyData: UserDailyData[] = [];
+  let hasNextPage = true;
+  let endCursor: string | undefined;
+
   while (hasNextPage) {
-    const result = await axios.post<{
+    const result = await postWithRetry<{
       data: {
         accountDailySnapshots: {
           items: UserDailyData[];
-          pageInfo: {
-            hasNextPage: boolean;
-            endCursor: string;
-          };
+          pageInfo: { hasNextPage: boolean; endCursor: string };
         };
       };
     }>(environment.indexerUrl, {
@@ -238,23 +246,13 @@ async function fetchUserPositionSnapshotsFromPonder(
     endCursor = result.data.data.accountDailySnapshots.pageInfo.endCursor;
   }
 
-  if (dailyData.length > 0) {
-    return dailyData.map((point: UserDailyData) => {
-      const borrowUsd = Number(point.totalBorrowsUSD);
-      const suppliedUsd = Number(point.totalSuppliesUSD);
-      const collateralUsd = Number(point.totalCollateralUSD);
+  if (dailyData.length === 0) return [];
 
-      const result: UserPositionSnapshot = {
-        chainId: environment.chainId,
-        timestamp: point.timestamp * 1000,
-        totalSupplyUsd: suppliedUsd,
-        totalBorrowsUsd: borrowUsd,
-        totalCollateralUsd: collateralUsd,
-      };
-
-      return result;
-    });
-  } else {
-    return [];
-  }
+  return dailyData.map((point) => ({
+    chainId: environment.chainId,
+    timestamp: point.timestamp * 1000,
+    totalSupplyUsd: Number(point.totalSuppliesUSD),
+    totalBorrowsUsd: Number(point.totalBorrowsUSD),
+    totalCollateralUsd: Number(point.totalCollateralUSD),
+  }));
 }

package/actions/governance/getCirculatingSupplySnapshots.ts

@@ -1,10 +1,9 @@
-import axios from "axios";
 import type { MoonwellClient } from "../../client/createMoonwellClient.js";
 import { getEnvironmentFromArgs } from "../../common/index.js";
 import type { OptionalNetworkParameterType } from "../../common/types.js";
-import type { Chain } from "../../environments/index.js";
+import type { Chain, Environment } from "../../environments/index.js";
 import type { CirculatingSupplySnapshot } from "../../types/circulatingSupply.js";
-import { shouldFallback } from "../lunar-indexer-client.js";
+import { getWithRetry, postWithRetry } from "../axiosWithRetry.js";
 
 export type GetCirculatingSupplySnapshotsParameters<
   environments,
@@ -47,7 +46,7 @@ async function fetchCirculatingSupplyFromLunar(
       params.cursor = cursor;
     }
 
-    const response = await axios.get<
+    const response = await getWithRetry<
       LunarPaginatedResponse<LunarCirculatingSupplySnapshot>
     >(`${lunarIndexerUrl}/api/v1/staking/circulating-supply/${chainId}`, {
       params,
@@ -74,42 +73,52 @@ export async function getCirculatingSupplySnapshots<
     return [];
   }
 
-  if (environment.lunarIndexerUrl) {
-    try {
-      const items = await fetchCirculatingSupplyFromLunar(
-        environment.lunarIndexerUrl,
-        environment.chainId,
-      );
-      return items.flatMap((item) => {
-        const token = Object.values(environment.config.tokens).find(
-          (t) => t.address.toLowerCase() === item.tokenAddress.toLowerCase(),
-        );
-        if (!token) return [];
-        return [
-          {
-            chainId: item.chainId,
-            token,
-            circulatingSupply: Number.parseFloat(item.circulatingSupply),
-            totalSupply: item.totalSupply,
-            excludedBalance: item.excludedBalance,
-            timestamp: item.timestamp,
-          },
-        ];
-      });
-    } catch (error) {
-      if (!shouldFallback(error)) {
-        throw error;
-      }
-      console.debug(
-        "[Lunar fallback] Falling back for circulating supply snapshots:",
-        error,
+  if (!environment.lunarIndexerUrl) {
+    return environment.indexerUrl
+      ? fetchCirculatingSupplyFromPonder(environment)
+      : [];
+  }
+
+  try {
+    const items = await fetchCirculatingSupplyFromLunar(
+      environment.lunarIndexerUrl,
+      environment.chainId,
+    );
+    return items.flatMap((item) => {
+      const token = Object.values(environment.config.tokens).find(
+        (t) => t.address.toLowerCase() === item.tokenAddress.toLowerCase(),
       );
-    }
+      if (!token) return [];
+      return [
+        {
+          chainId: item.chainId,
+          token,
+          circulatingSupply: Number.parseFloat(item.circulatingSupply),
+          totalSupply: item.totalSupply,
+          excludedBalance: item.excludedBalance,
+          timestamp: item.timestamp,
+        },
+      ];
+    });
+  } catch (error) {
+    console.warn(
+      `[getCirculatingSupplySnapshots] Lunar Indexer failed for chain ${environment.chainId}:`,
+      error,
+    );
+    environment.onError?.(error, {
+      source: "circulating-supply",
+      chainId: environment.chainId,
+    });
+    return [];
   }
+}
 
-  // Legacy fallback: GraphQL POST to Ponder indexer
+async function fetchCirculatingSupplyFromPonder(
+  environment: Environment,
+): Promise<CirculatingSupplySnapshot[]> {
+  if (!environment.indexerUrl) return [];
   try {
-    const response = await axios.post<{
+    const response = await postWithRetry<{
       data: {
         circulatingSupplyDailySnapshots: {
           items: {
@@ -160,9 +169,8 @@ export async function getCirculatingSupplySnapshots<
           ];
         },
       );
-    } else {
-      return [];
     }
+    return [];
   } catch (ex) {
     console.error(
       "An error occurred while fetching getCirculatingSupplySnapshots...",

package/actions/governance/getDelegates.ts

@@ -1,4 +1,3 @@
-import axios from "axios";
 import { isAddress } from "viem";
 import { base, moonbeam, optimism } from "viem/chains";
 import type { MoonwellClient } from "../../client/createMoonwellClient.js";
@@ -8,6 +7,7 @@ import {
 } from "../../environments/index.js";
 import * as logger from "../../logger/console.js";
 import type { Delegate } from "../../types/delegate.js";
+import { getWithRetry } from "../axiosWithRetry.js";
 import { fetchAllVoters } from "./governor-api-client.js";
 
 export type GetDelegatesReturnType = Promise<Delegate[]>;
@@ -119,7 +119,7 @@ const getForumProfiles = async () => {
 
   const getUsersPaginated = async (page = 0) => {
     try {
-      const response = await axios.get<{
+      const response = await getWithRetry<{
         directory_items: {
           user: {
             id: number;

package/actions/governance/getDiscussions.ts

@@ -1,9 +1,9 @@
-import axios from "axios";
 import lodash from "lodash";
 import type { MoonwellClient } from "../../client/createMoonwellClient.js";
 import { HttpRequestError } from "../../common/index.js";
 import * as logger from "../../logger/console.js";
 import type { Discussion } from "../../types/discussion.js";
+import { getWithRetry } from "../axiosWithRetry.js";
 
 const { isEqual, uniqWith } = lodash;
 
@@ -43,7 +43,7 @@ export async function getDiscussions(
     "Starting to get discussions...",
   );
 
-  const moonwellProposalsResult = await axios.get<ForumTopicRequestResponse>(
+  const moonwellProposalsResult = await getWithRetry<ForumTopicRequestResponse>(
     "https://forum.moonwell.fi/c/proposals/moonwell-improvement-proposals/9/l/latest.json",
   );
 
@@ -51,9 +51,10 @@ export async function getDiscussions(
     throw new HttpRequestError(moonwellProposalsResult.statusText);
   }
 
-  const communityProposalsResult = await axios.get<ForumTopicRequestResponse>(
-    "https://forum.moonwell.fi/c/proposals/community-proposal/19/l/latest.json",
-  );
+  const communityProposalsResult =
+    await getWithRetry<ForumTopicRequestResponse>(
+      "https://forum.moonwell.fi/c/proposals/community-proposal/19/l/latest.json",
+    );
 
   if (
     communityProposalsResult.status !== 200 ||

package/actions/governance/getStakingSnapshots.ts

@@ -1,4 +1,3 @@
-import axios from "axios";
 import type { MoonwellClient } from "../../client/createMoonwellClient.js";
 import {
   type SnapshotPeriod,
@@ -10,10 +9,10 @@ import {
 import type { NetworkParameterType } from "../../common/types.js";
 import type { Chain } from "../../environments/index.js";
 import type { StakingSnapshot } from "../../types/staking.js";
+import { postWithRetry } from "../axiosWithRetry.js";
 import {
   DEFAULT_LUNAR_TIMEOUT_MS,
   createLunarIndexerClient,
-  shouldFallback,
 } from "../lunar-indexer-client.js";
 import { transformStakingSnapshots } from "../lunar-indexer-transformers.js";
 
@@ -47,36 +46,40 @@ export async function getStakingSnapshots<
     endTime: customEndTime,
   } = (args ?? {}) as GetStakingSnapshotsParameters<environments, undefined>;
 
-  if (environment.lunarIndexerUrl) {
-    try {
-      return await fetchStakingSnapshotsFromLunar(
-        environment.chainId,
-        environment.lunarIndexerUrl,
-        period,
-        customStartTime,
-        customEndTime,
-      );
-    } catch (error) {
-      if (!shouldFallback(error)) {
-        throw error;
-      }
-      console.debug(
-        "[Lunar fallback] Falling back to Ponder for staking snapshots:",
-        error,
-      );
-    }
+  if (!environment.lunarIndexerUrl) {
+    const { startTime } = calculateTimeRange(
+      period,
+      customStartTime,
+      customEndTime,
+    );
+    return environment.indexerUrl
+      ? fetchStakingSnapshotsFromPonder(
+          environment.chainId,
+          environment.indexerUrl,
+          startTime,
+        )
+      : [];
   }
 
-  const { startTime } = calculateTimeRange(
-    period,
-    customStartTime,
-    customEndTime,
-  );
-  return fetchStakingSnapshotsFromPonder(
-    environment.chainId,
-    environment.indexerUrl,
-    startTime,
-  );
+  try {
+    return await fetchStakingSnapshotsFromLunar(
+      environment.chainId,
+      environment.lunarIndexerUrl,
+      period,
+      customStartTime,
+      customEndTime,
+    );
+  } catch (error) {
+    console.warn(
+      `[getStakingSnapshots] Lunar Indexer failed for chain ${environment.chainId}:`,
+      error,
+    );
+    environment.onError?.(error, {
+      source: "staking-snapshots",
+      chainId: environment.chainId,
+    });
+    return [];
+  }
 }
 
 async function fetchStakingSnapshotsFromLunar(
@@ -126,7 +129,7 @@ async function fetchStakingSnapshotsFromPonder(
   startTime?: number,
 ): Promise<StakingSnapshot[]> {
   try {
-    const response = await axios.post<{
+    const response = await postWithRetry<{
       data: {
         stakingDailySnapshots: {
           items: StakingSnapshot[];

package/actions/governance/getUserVotingPowers.ts

@@ -1,6 +1,10 @@
 import { type Address, zeroAddress } from "viem";
 import type { MoonwellClient } from "../../client/createMoonwellClient.js";
-import { Amount, getEnvironmentsFromArgs } from "../../common/index.js";
+import {
+  Amount,
+  getBlockNumberAtTimestamp,
+  getEnvironmentsFromArgs,
+} from "../../common/index.js";
 import type { OptionalNetworkParameterType } from "../../common/types.js";
 import type { Chain, GovernanceToken } from "../../environments/index.js";
 import type { UserVotingPowers } from "../../types/userVotingPowers.js";
@@ -15,8 +19,21 @@ export type GetUserVotingPowersParameters<
   /** User address*/
   userAddress: Address;
 
-  /** Block number **/
+  /**
+   * Block number to read voting power at. Applied to every queried chain — only safe
+   * for single-chain governance tokens. For cross-chain tokens (e.g. WELL) prefer
+   * `snapshotTimestamp`, which resolves a correct per-chain block.
+   */
   blockNumber?: bigint;
+
+  /**
+   * Unix timestamp (seconds) at which to read voting power. When set, the SDK looks up
+   * the block on each queried chain whose timestamp is the latest one ≤ this value, and
+   * uses that per-chain block. Use this for cross-chain governance tokens; supplying a
+   * single block number across heterogeneous chains is unsafe because chain heights
+   * diverge. Takes priority over `blockNumber` when both are provided.
+   */
+  snapshotTimestamp?: number;
 };
 
 export type GetUserVotingPowersReturnType = Promise<UserVotingPowers[]>;
@@ -28,7 +45,7 @@ export async function getUserVotingPowers<
   client: MoonwellClient,
   args: GetUserVotingPowersParameters<environments, Network>,
 ): GetUserVotingPowersReturnType {
-  const { governanceToken, userAddress, blockNumber } = args;
+  const { governanceToken, userAddress, blockNumber, snapshotTimestamp } = args;
 
   const environments = getEnvironmentsFromArgs(client, args);
 
@@ -36,12 +53,30 @@ export async function getUserVotingPowers<
     (env) => env.custom?.governance?.token === governanceToken,
   );
 
+  const perChainBlockNumbers =
+    snapshotTimestamp !== undefined
+      ? await Promise.all(
+          tokenEnvironments.map((env) =>
+            getBlockNumberAtTimestamp(
+              env.publicClient,
+              BigInt(snapshotTimestamp),
+            ),
+          ),
+        )
+      : undefined;
+
   const environmentsUserVotingPowers = await Promise.all(
-    tokenEnvironments.map((environment) =>
-      environment.contracts.views?.read.getUserVotingPower([userAddress], {
-        blockNumber,
-      }),
-    ),
+    tokenEnvironments.map((environment, index) => {
+      const blockForChain = perChainBlockNumbers
+        ? perChainBlockNumbers[index]
+        : blockNumber;
+      return environment.contracts.views?.read.getUserVotingPower(
+        [userAddress],
+        {
+          blockNumber: blockForChain,
+        },
+      );
+    }),
   );
 
   return tokenEnvironments.map((environment, index) => {

package/actions/governance/governor-api-client.ts

@@ -1,5 +1,5 @@
-import axios from "axios";
 import type { Environment } from "../../environments/index.js";
+import { getWithRetry } from "../axiosWithRetry.js";
 
 /**
  * Base configuration for Governor API requests
@@ -108,7 +108,7 @@ export async function fetchProposals(
   if (options?.cursor) params.append("cursor", options.cursor);
   if (options?.chainId) params.append("chainId", options.chainId.toString());
 
-  const response = await axios.get<PaginatedResponse<ApiProposal>>(
+  const response = await getWithRetry<PaginatedResponse<ApiProposal>>(
     `${baseUrl}/api/v1/governor/proposals?${params.toString()}`,
   );
 
@@ -152,7 +152,7 @@ export async function fetchProposal(
 ): Promise<ApiProposal> {
   const baseUrl = getGovernorApiUrl(environment);
 
-  const response = await axios.get<ApiProposal>(
+  const response = await getWithRetry<ApiProposal>(
     `${baseUrl}/api/v1/governor/proposals/${proposalId}`,
   );
 
@@ -177,7 +177,7 @@ export async function fetchProposalVotes(
   if (options?.limit) params.append("limit", options.limit.toString());
   if (options?.cursor) params.append("cursor", options.cursor);
 
-  const response = await axios.get<PaginatedResponse<ApiVote>>(
+  const response = await getWithRetry<PaginatedResponse<ApiVote>>(
     `${baseUrl}/api/v1/governor/proposals/${proposalId}/votes?${params.toString()}`,
   );
 
@@ -225,7 +225,9 @@ export async function fetchProposalStateChanges(
   if (options?.limit) params.append("limit", options.limit.toString());
   if (options?.cursor) params.append("cursor", options.cursor);
 
-  const response = await axios.get<PaginatedResponse<ApiProposalStateChange>>(
+  const response = await getWithRetry<
+    PaginatedResponse<ApiProposalStateChange>
+  >(
     `${baseUrl}/api/v1/governor/proposals/${proposalId}/state-changes?${params.toString()}`,
   );
 
@@ -277,7 +279,7 @@ export async function fetchVoters(
   const endpoint = `${baseUrl}/api/v1/governor/voters?${params.toString()}`;
 
   try {
-    const response = await axios.get<PaginatedResponse<ApiVoter>>(endpoint);
+    const response = await getWithRetry<PaginatedResponse<ApiVoter>>(endpoint);
 
     if (response.status !== 200 || !response.data) {
       throw new Error(`Failed to fetch voters: ${response.statusText}`);
@@ -328,7 +330,7 @@ export async function fetchVoter(
 ): Promise<ApiVoter> {
   const baseUrl = getGovernorApiUrl(environment);
 
-  const response = await axios.get<ApiVoter>(
+  const response = await getWithRetry<ApiVoter>(
     `${baseUrl}/api/v1/governor/voters/${address}`,
   );
 
@@ -359,7 +361,7 @@ export async function fetchVoterProposals(
 
   const endpoint = `${baseUrl}/api/v1/governor/voters/${address}/proposals?${params.toString()}`;
 
-  const response = await axios.get<PaginatedResponse<ApiProposal>>(endpoint);
+  const response = await getWithRetry<PaginatedResponse<ApiProposal>>(endpoint);
 
   if (response.status !== 200 || !response.data) {
     throw new Error(`Failed to fetch voter proposals: ${response.statusText}`);
@@ -407,7 +409,7 @@ export async function fetchVoterVotes(
 
   const endpoint = `${baseUrl}/api/v1/governor/voters/${address}/votes?${params.toString()}`;
 
-  const response = await axios.get<PaginatedResponse<ApiVote>>(endpoint);
+  const response = await getWithRetry<PaginatedResponse<ApiVote>>(endpoint);
 
   if (response.status !== 200 || !response.data) {
     throw new Error(`Failed to fetch voter votes: ${response.statusText}`);
@@ -450,7 +452,7 @@ export async function fetchUserVoteReceipt(
 ): Promise<ApiVoteReceipt[]> {
   const baseUrl = getGovernorApiUrl(environment);
 
-  const response = await axios.get<ApiVoteReceipt[]>(
+  const response = await getWithRetry<ApiVoteReceipt[]>(
     `${baseUrl}/api/v1/governor/proposals/${proposalId}/vote/${voterAddress}`,
   );