@moonwell-fi/moonwell-sdk 0.10.7 → 0.12.0

package/actions/morpho/vaults/getMorphoVaultStakingSnapshots.ts

@@ -1,23 +1,20 @@
-import axios from "axios";
 import type { MoonwellClient } from "../../../client/createMoonwellClient.js";
 import {
   type SnapshotPeriod,
   applyGranularity,
   calculateTimeRange,
   getEnvironmentFromArgs,
-  isStartOfDay,
   toApiGranularity,
 } from "../../../common/index.js";
 import type {
   MorphoVaultParameterType,
   NetworkParameterType,
 } from "../../../common/types.js";
-import type { Chain, Environment } from "../../../environments/index.js";
+import type { Chain } from "../../../environments/index.js";
 import type { MorphoVaultStakingSnapshot } from "../../../types/morphoVault.js";
 import {
   DEFAULT_LUNAR_TIMEOUT_MS,
   createLunarIndexerClient,
-  shouldFallback,
 } from "../../lunar-indexer-client.js";
 import { transformVaultStakingSnapshots } from "../../lunar-indexer-transformers.js";
 
@@ -56,37 +53,31 @@ export async function getMorphoVaultStakingSnapshots<
   } = args as GetMorphoVaultStakingSnapshotsParameters<environments, undefined>;
 
   const { lunarIndexerUrl } = environment;
-  if (lunarIndexerUrl) {
-    try {
-      return await fetchVaultStakingSnapshotsFromLunar(
-        vaultAddress,
-        lunarIndexerUrl,
-        environment.chainId,
-        period,
-        customStartTime,
-        customEndTime,
-      );
-    } catch (error) {
-      if (!shouldFallback(error)) {
-        throw error;
-      }
-      console.debug(
-        "[Lunar fallback] Falling back to Ponder for vault staking snapshots:",
-        error,
-      );
-    }
+
+  if (!lunarIndexerUrl) {
+    return [];
   }
 
-  const { startTime } = calculateTimeRange(
-    period,
-    customStartTime,
-    customEndTime,
-  );
-  return fetchVaultStakingSnapshotsFromPonder(
-    vaultAddress,
-    environment,
-    startTime,
-  );
+  try {
+    return await fetchVaultStakingSnapshotsFromLunar(
+      vaultAddress,
+      lunarIndexerUrl,
+      environment.chainId,
+      period,
+      customStartTime,
+      customEndTime,
+    );
+  } catch (error) {
+    console.warn(
+      `[getMorphoVaultStakingSnapshots] Lunar Indexer failed for chain ${environment.chainId}:`,
+      error,
+    );
+    environment.onError?.(error, {
+      source: "morpho-vault-staking-snapshots",
+      chainId: environment.chainId,
+    });
+    return [];
+  }
 }
 
 async function fetchVaultStakingSnapshotsFromLunar(
@@ -131,81 +122,3 @@ async function fetchVaultStakingSnapshotsFromLunar(
   allSnapshots.sort((a, b) => a.timestamp - b.timestamp);
   return applyGranularity(allSnapshots, granularity);
 }
-
-interface VaultStakingData {
-  totalStaked: number;
-  totalStakedUSD: number;
-  timestamp: number;
-}
-
-async function fetchVaultStakingSnapshotsFromPonder(
-  vaultAddress: string,
-  environment: Environment,
-  startTime?: number,
-): Promise<MorphoVaultStakingSnapshot[]> {
-  const dailyData: VaultStakingData[] = [];
-  let hasNextPage = true;
-  let endCursor: string | undefined;
-
-  while (hasNextPage) {
-    const result = await axios.post<{
-      data: {
-        vaultStakingDailySnapshots: {
-          items: VaultStakingData[];
-          pageInfo: {
-            hasNextPage: boolean;
-            endCursor: string;
-          };
-        };
-      };
-    }>(environment.indexerUrl, {
-      query: `
-          query {
-            vaultStakingDailySnapshots (
-              limit: 365,
-              orderBy: "timestamp"
-              orderDirection: "desc"
-              where: {vaultAddress: "${vaultAddress.toLowerCase()}", chainId: ${environment.chainId}}
-              ${endCursor ? `after: "${endCursor}"` : ""}
-            ) {
-              items {
-                  totalStaked
-                  totalStakedUSD
-                  timestamp
-              }
-              pageInfo {
-                hasNextPage
-                endCursor
-              }
-            }
-          }
-        `,
-    });
-
-    if (result.data.data.vaultStakingDailySnapshots) {
-      dailyData.push(
-        ...result.data.data.vaultStakingDailySnapshots.items.filter(
-          (f: { timestamp: number }) =>
-            isStartOfDay(f.timestamp) &&
-            (startTime === undefined || f.timestamp >= startTime),
-        ),
-      );
-      hasNextPage =
-        result.data.data.vaultStakingDailySnapshots.pageInfo.hasNextPage;
-      endCursor =
-        result.data.data.vaultStakingDailySnapshots.pageInfo.endCursor;
-    }
-  }
-
-  if (dailyData.length > 0) {
-    return dailyData.map((point: VaultStakingData) => ({
-      vaultAddress: vaultAddress.toLowerCase(),
-      chainId: environment.chainId,
-      timestamp: point.timestamp * 1000,
-      totalStaked: Number(point.totalStaked),
-      totalStakedUsd: Number(point.totalStakedUSD),
-    }));
-  } else {
-    return [];
-  }
-}

package/client/createMoonwellClient.ts

@@ -77,12 +77,15 @@ export type NetworksConfig<networks> = {} extends networks
 
 export const createMoonwellClient = <const networks>(config: {
   networks: NetworksConfig<Narrow<networks>>;
+  onError?: (
+    error: unknown,
+    context: { source: string; chainId: number },
+  ) => void;
 }) => {
-  const environments = Object.keys(config.networks).reduce((prev, curr) => {
-    const key = curr as SupportedChains;
-    const networkConfig = (config.networks as NetworksConfig<SupportedChains>)[
-      key
-    ]!;
+  const environments = Object.entries(
+    config.networks as NetworksConfig<SupportedChains>,
+  ).reduce((prev, [curr, networkConfig]) => {
+    if (!networkConfig) return prev;
     return {
       ...prev,
       [curr]: createEnvironment({
@@ -143,6 +146,15 @@ export const createMoonwellClient = <const networks>(config: {
     }
   >;
 
+  if (config.onError) {
+    const onError = config.onError;
+    for (const env of Object.values(
+      environments as Record<string, Environment>,
+    )) {
+      env.onError = onError;
+    }
+  }
+
   const client = {
     environments,
   };

package/environments/definitions/arbitrum/environment.ts

@@ -8,7 +8,6 @@ import { tokens } from "./tokens.js";
 
 const createEnvironment = (
   rpcUrls?: string[],
-  indexerUrl?: string,
   governanceIndexerUrl?: string,
 ): Environment<typeof tokens, {}, {}, {}, {}> =>
   createEnvironmentConfig({
@@ -25,7 +24,6 @@ const createEnvironment = (
     transport: rpcUrls
       ? fallback(rpcUrls.map((url) => http(url)))
       : http("https://rpc.moonwell.fi/main/evm/42161"),
-    indexerUrl: indexerUrl || "https://ponder.moonwell.fi",
     governanceIndexerUrl:
       governanceIndexerUrl ||
       "https://lunar-services-worker.moonwell.workers.dev",

package/environments/definitions/avalanche/environment.ts

@@ -8,7 +8,6 @@ import { tokens } from "./tokens.js";
 
 const createEnvironment = (
   rpcUrls?: string[],
-  indexerUrl?: string,
   governanceIndexerUrl?: string,
 ): Environment<typeof tokens, {}, {}, {}, {}> =>
   createEnvironmentConfig({
@@ -25,7 +24,6 @@ const createEnvironment = (
     transport: rpcUrls
       ? fallback(rpcUrls.map((url) => http(url)))
       : http("https://rpc.moonwell.fi/main/evm/43114"),
-    indexerUrl: indexerUrl || "https://ponder.moonwell.fi",
     governanceIndexerUrl:
       governanceIndexerUrl ||
       "https://lunar-services-worker.moonwell.workers.dev",

package/environments/definitions/base/custom.ts

@@ -5,7 +5,6 @@ export const custom = createCustomConfig({
     minimalDeployment: false,
     apiUrl: "https://api.morpho.org/graphql",
     rewardsApiUrl: "https://rewards.morpho.org",
-    lunarIndexerUrl: "https://lunar-services-worker.moonwell.workers.dev",
   },
   governance: {
     token: "WELL",

package/environments/definitions/base/environment.ts

@@ -15,7 +15,6 @@ const base = defineChain({ ...baseChain, testnet: false });
 
 const createEnvironment = (
   rpcUrls?: string[],
-  indexerUrl?: string,
   governanceIndexerUrl?: string,
   lunarIndexerUrl?: string,
 ): Environment<
@@ -37,7 +36,6 @@ const createEnvironment = (
     transport: rpcUrls
       ? fallback(rpcUrls.map((url) => http(url)))
       : http("https://rpc.moonwell.fi/main/evm/8453"),
-    indexerUrl: indexerUrl || "https://ponder.moonwell.fi",
     governanceIndexerUrl:
       governanceIndexerUrl ||
       "https://lunar-services-worker.moonwell.workers.dev",

package/environments/definitions/ethereum/environment.ts

@@ -8,7 +8,6 @@ import { tokens } from "./tokens.js";
 
 const createEnvironment = (
   rpcUrls?: string[],
-  indexerUrl?: string,
   governanceIndexerUrl?: string,
 ): Environment<typeof tokens, {}, {}, {}, {}> =>
   createEnvironmentConfig({
@@ -23,7 +22,6 @@ const createEnvironment = (
     transport: rpcUrls
       ? fallback(rpcUrls.map((url) => http(url)))
       : http("https://rpc.moonwell.fi/main/evm/1"),
-    indexerUrl: indexerUrl || "https://ponder.moonwell.fi",
     governanceIndexerUrl:
       governanceIndexerUrl ||
       "https://lunar-services-worker.moonwell.workers.dev",

package/environments/definitions/moonbeam/environment.ts

@@ -8,7 +8,6 @@ import { tokens } from "./tokens.js";
 
 const createEnvironment = (
   rpcUrls?: string[],
-  indexerUrl?: string,
   governanceIndexerUrl?: string,
   lunarIndexerUrl?: string,
 ) =>
@@ -24,7 +23,6 @@ const createEnvironment = (
     transport: rpcUrls
       ? fallback(rpcUrls.map((url) => http(url)))
       : http("https://rpc.moonwell.fi/main/evm/1284"),
-    indexerUrl: indexerUrl || "https://ponder.moonwell.fi",
     lunarIndexerUrl:
       lunarIndexerUrl || "https://lunar-services-worker.moonwell.workers.dev",
     governanceIndexerUrl:

package/environments/definitions/optimism/custom.ts

@@ -5,7 +5,6 @@ export const custom = createCustomConfig({
     minimalDeployment: true,
     apiUrl: "https://api.morpho.org/graphql",
     rewardsApiUrl: "https://rewards.morpho.org",
-    lunarIndexerUrl: "https://lunar-services-worker.moonwell.workers.dev",
   },
   governance: {
     token: "WELL",

package/environments/definitions/optimism/environment.ts

@@ -11,7 +11,6 @@ const optimism = defineChain({ ...optimismChain, testnet: false });
 
 const createEnvironment = (
   rpcUrls?: string[],
-  indexerUrl?: string,
   governanceIndexerUrl?: string,
   lunarIndexerUrl?: string,
 ) =>
@@ -27,7 +26,6 @@ const createEnvironment = (
     transport: rpcUrls
       ? fallback(rpcUrls.map((url) => http(url)))
       : http("https://rpc.moonwell.fi/main/evm/10"),
-    indexerUrl: indexerUrl || "https://ponder.moonwell.fi",
     lunarIndexerUrl:
       lunarIndexerUrl || "https://lunar-services-worker.moonwell.workers.dev",
     governanceIndexerUrl:

package/environments/definitions/polygon/environment.ts

@@ -8,7 +8,6 @@ import { tokens } from "./tokens.js";
 
 const createEnvironment = (
   rpcUrls?: string[],
-  indexerUrl?: string,
   governanceIndexerUrl?: string,
 ): Environment<typeof tokens, {}, {}, {}, {}> =>
   createEnvironmentConfig({
@@ -23,7 +22,6 @@ const createEnvironment = (
     transport: rpcUrls
       ? fallback(rpcUrls.map((url) => http(url)))
       : http("https://rpc.moonwell.fi/main/evm/137"),
-    indexerUrl: indexerUrl || "https://ponder.moonwell.fi",
     governanceIndexerUrl:
       governanceIndexerUrl ||
       "https://lunar-services-worker.moonwell.workers.dev",

package/environments/index.ts

@@ -147,49 +147,28 @@ export type GetEnvironment<chain> = chain extends typeof base
 export const createEnvironment = <const chain extends Chain>(config: {
   chain: chain;
   rpcUrls?: string[] | undefined;
-  indexerUrl?: string;
 }): GetEnvironment<chain> => {
   switch (config.chain.id) {
     case base.id:
-      return createBaseEnvironment(
-        config.rpcUrls,
-        config.indexerUrl,
-      ) as GetEnvironment<chain>;
+      return createBaseEnvironment(config.rpcUrls) as GetEnvironment<chain>;
     case moonbeam.id:
-      return createMoonbeamEnvironment(
-        config.rpcUrls,
-        config.indexerUrl,
-      ) as GetEnvironment<chain>;
+      return createMoonbeamEnvironment(config.rpcUrls) as GetEnvironment<chain>;
     case moonriver.id:
       return createMoonriverEnvironment(
         config.rpcUrls,
-        config.indexerUrl,
       ) as GetEnvironment<chain>;
     case optimism.id:
-      return createOptimismEnvironment(
-        config.rpcUrls,
-        config.indexerUrl,
-      ) as GetEnvironment<chain>;
+      return createOptimismEnvironment(config.rpcUrls) as GetEnvironment<chain>;
     case ethereum.id:
-      return createEthereumEnvironment(
-        config.rpcUrls,
-        config.indexerUrl,
-      ) as GetEnvironment<chain>;
+      return createEthereumEnvironment(config.rpcUrls) as GetEnvironment<chain>;
     case avalanche.id:
       return createAvalancheEnvironment(
         config.rpcUrls,
-        config.indexerUrl,
       ) as GetEnvironment<chain>;
     case arbitrum.id:
-      return createArbitrumEnvironment(
-        config.rpcUrls,
-        config.indexerUrl,
-      ) as GetEnvironment<chain>;
+      return createArbitrumEnvironment(config.rpcUrls) as GetEnvironment<chain>;
     case polygon.id:
-      return createPolygonEnvironment(
-        config.rpcUrls,
-        config.indexerUrl,
-      ) as GetEnvironment<chain>;
+      return createPolygonEnvironment(config.rpcUrls) as GetEnvironment<chain>;
     default:
       throw new Error("Unsupported chainId");
   }

package/environments/types/config.ts

@@ -141,7 +141,6 @@ export type CustomConfigType = {
     minimalDeployment?: boolean;
     apiUrl?: string; // For api.morpho.org/graphql
     rewardsApiUrl?: string; // For rewards.morpho.org
-    lunarIndexerUrl?: string; // For lunar-services vault endpoints
   };
   governance?: {
     token: GovernanceToken;
@@ -229,9 +228,13 @@ export const createEnvironmentConfig = <
   name: string;
   chain: Chain;
   transport: Transport;
-  indexerUrl: string;
+  indexerUrl?: string;
   governanceIndexerUrl: string;
   lunarIndexerUrl?: string;
+  onError?: (
+    error: unknown,
+    context: { source: string; chainId: number },
+  ) => void;
   tokens: TokensConfig<tokens>;
   markets: MarketsConfig<markets, tokens>;
   vaults: VaultsConfig<vaults, tokens>;
@@ -496,6 +499,7 @@ export const createEnvironmentConfig = <
     indexerUrl: config.indexerUrl,
     governanceIndexerUrl: config.governanceIndexerUrl,
     lunarIndexerUrl: config.lunarIndexerUrl,
+    onError: config.onError,
     tokens: tokenContracts,
     markets: marketContracts,
     vaults: vaultsContracts,
@@ -531,9 +535,13 @@ export type Environment<
   name: string;
   chainId: number;
   chain: Chain;
-  indexerUrl: string;
+  indexerUrl?: string;
   governanceIndexerUrl: string;
   lunarIndexerUrl?: string;
+  onError?: (
+    error: unknown,
+    context: { source: string; chainId: number },
+  ) => void;
   tokens: {
     [name in keyof tokens]: TokenContractReturnType;
   };

package/errors/version.ts

@@ -1 +1 @@
-export const version = '0.10.7'
+export const version = '0.12.0'

package/package.json

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