@moonwell-fi/moonwell-sdk 0.20.5 → 0.21.0

package/actions/core/markets/getMarketSnapshots.ts

@@ -11,7 +11,6 @@ import { buildMarketId } from "../../../common/lunar-indexer-helpers.js";
 import type { NetworkParameterType } from "../../../common/types.js";
 import type { Chain, Environment } from "../../../environments/index.js";
 import type { MarketSnapshot } from "../../../types/market.js";
-import { postWithRetry } from "../../axiosWithRetry.js";
 import {
   DEFAULT_LUNAR_TIMEOUT_MS,
   createLunarIndexerClient,
@@ -141,23 +140,7 @@ async function fetchCoreMarketSnapshots(
   endTime?: number,
 ): Promise<MarketSnapshot[]> {
   if (!environment.lunarIndexerUrl) {
-    if (!environment.indexerUrl) return [];
-    try {
-      return await fetchCoreMarketSnapshotsFromPonder(
-        marketAddress,
-        environment,
-      );
-    } catch (error) {
-      console.warn(
-        `[getMarketSnapshots] Ponder failed for chain ${environment.chainId}:`,
-        error,
-      );
-      environment.onError?.(error, {
-        source: "market-snapshots-ponder",
-        chainId: environment.chainId,
-      });
-      return [];
-    }
+    return [];
   }
   try {
     return await fetchCoreMarketSnapshotsFromLunar(
@@ -180,106 +163,6 @@ async function fetchCoreMarketSnapshots(
   }
 }
 
-async function fetchCoreMarketSnapshotsFromPonder(
-  marketAddress: string,
-  environment: Environment,
-): Promise<MarketSnapshot[]> {
-  if (!environment.indexerUrl) return [];
-
-  interface MarketDailyData {
-    totalBorrows: number;
-    totalBorrowsUSD: number;
-    totalSupplies: number;
-    totalSuppliesUSD: number;
-    totalLiquidity: number;
-    totalLiquidityUSD: number;
-    baseSupplyApy: number;
-    baseBorrowApy: number;
-    timestamp: number;
-  }
-
-  const dailyData: MarketDailyData[] = [];
-  let hasNextPage = true;
-  let endCursor: string | undefined;
-
-  while (hasNextPage) {
-    const result = await postWithRetry<{
-      data: {
-        marketDailySnapshots: {
-          items: MarketDailyData[];
-          pageInfo: { hasNextPage: boolean; endCursor: string };
-        };
-      };
-    }>(environment.indexerUrl, {
-      query: `
-          query {
-            marketDailySnapshots (
-              limit: 1000,
-              orderBy: "timestamp"
-              orderDirection: "desc"
-              where: {marketAddress: "${marketAddress.toLowerCase()}", chainId: ${environment.chainId}}
-              ${endCursor ? `after: "${endCursor}"` : ""}
-            ) {
-              items {
-                totalBorrows
-                totalBorrowsUSD
-                totalSupplies
-                totalSuppliesUSD
-                totalLiquidity
-                totalLiquidityUSD
-                baseSupplyApy
-                baseBorrowApy
-                timestamp
-              }
-              pageInfo {
-                hasNextPage
-                endCursor
-              }
-            }
-          }
-        `,
-    });
-
-    dailyData.push(
-      ...result.data.data.marketDailySnapshots.items.filter(
-        (f: { timestamp: number }) => isStartOfDay(f.timestamp),
-      ),
-    );
-    hasNextPage = result.data.data.marketDailySnapshots.pageInfo.hasNextPage;
-    endCursor = result.data.data.marketDailySnapshots.pageInfo.endCursor;
-  }
-
-  if (dailyData.length === 0) return [];
-
-  return dailyData.map((point) => {
-    const supplied = Number(point.totalSupplies);
-    const borrow = Number(point.totalBorrows);
-    const borrowUsd = Number(point.totalBorrowsUSD);
-    const suppliedUsd = Number(point.totalSuppliesUSD);
-    const liquidity = Math.max(point.totalLiquidity, 0);
-    const liquidityUsd = Math.max(point.totalLiquidityUSD, 0);
-    const price = suppliedUsd / supplied;
-
-    return {
-      marketId: marketAddress.toLowerCase(),
-      chainId: environment.chainId,
-      timestamp: point.timestamp * 1000,
-      totalSupply: supplied,
-      totalSupplyUsd: suppliedUsd,
-      totalBorrows: borrow,
-      totalBorrowsUsd: borrowUsd,
-      totalLiquidity: liquidity,
-      totalLiquidityUsd: liquidityUsd,
-      totalReallocatableLiquidity: 0,
-      totalReallocatableLiquidityUsd: 0,
-      baseSupplyApy: point.baseSupplyApy,
-      baseBorrowApy: point.baseBorrowApy,
-      collateralTokenPrice: price,
-      loanTokenPrice: price,
-    };
-  });
-}
-
 async function fetchCoreMarketSnapshotsFromLunar(
   marketAddress: string,
   environment: Environment,

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

@@ -5,13 +5,11 @@ import {
   applyGranularity,
   calculateTimeRange,
   getEnvironmentFromArgs,
-  isStartOfDay,
   toApiGranularity,
 } from "../../../common/index.js";
 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,
@@ -54,8 +52,7 @@ export type GetUserPositionSnapshotsReturnType = Promise<
  * @remarks
  * - 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
- * - Snapshots are filtered to start-of-day for "1d" granularity
+ * - Environments without a Lunar Indexer configured return an empty array
  */
 export async function getUserPositionSnapshots<
   environments,
@@ -89,23 +86,7 @@ async function fetchUserPositionSnapshots(
   granularity?: "6h" | "1d",
 ): Promise<UserPositionSnapshot[]> {
   if (!environment.lunarIndexerUrl) {
-    if (!environment.indexerUrl) return [];
-    try {
-      return await fetchUserPositionSnapshotsFromPonder(
-        userAddress,
-        environment,
-      );
-    } catch (error) {
-      console.warn(
-        `[getUserPositionSnapshots] Ponder failed for chain ${environment.chainId}:`,
-        error,
-      );
-      environment.onError?.(error, {
-        source: "user-position-snapshots-ponder",
-        chainId: environment.chainId,
-      });
-      return [];
-    }
+    return [];
   }
   try {
     return await fetchUserPositionSnapshotsFromLunar(
@@ -186,73 +167,3 @@ async function fetchUserPositionSnapshotsFromLunar(
     resolvedGranularity,
   );
 }
-
-async function fetchUserPositionSnapshotsFromPonder(
-  userAddress: Address,
-  environment: Environment,
-): Promise<UserPositionSnapshot[]> {
-  if (!environment.indexerUrl) return [];
-
-  interface UserDailyData {
-    totalBorrowsUSD: string;
-    totalSuppliesUSD: string;
-    totalCollateralUSD: string;
-    timestamp: number;
-  }
-
-  const dailyData: UserDailyData[] = [];
-  let hasNextPage = true;
-  let endCursor: string | undefined;
-
-  while (hasNextPage) {
-    const result = await postWithRetry<{
-      data: {
-        accountDailySnapshots: {
-          items: UserDailyData[];
-          pageInfo: { hasNextPage: boolean; endCursor: string };
-        };
-      };
-    }>(environment.indexerUrl, {
-      query: `
-          query {
-            accountDailySnapshots(
-              limit: 365,
-              orderDirection: "desc",
-              orderBy: "timestamp",
-              where: { accountAddress: "${userAddress.toLowerCase()}", chainId: ${environment.chainId} }
-              ${endCursor ? `after: "${endCursor}"` : ""}
-            ) {
-              items {
-                timestamp,
-                totalBorrowsUSD,
-                totalSuppliesUSD,
-                totalCollateralUSD,
-              }
-              pageInfo {
-                hasNextPage
-                endCursor
-              }
-            }
-          }
-        `,
-    });
-
-    dailyData.push(
-      ...result.data.data.accountDailySnapshots.items.filter(
-        (f: { timestamp: number }) => isStartOfDay(f.timestamp),
-      ),
-    );
-    hasNextPage = result.data.data.accountDailySnapshots.pageInfo.hasNextPage;
-    endCursor = result.data.data.accountDailySnapshots.pageInfo.endCursor;
-  }
-
-  if (dailyData.length === 0) 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,9 +1,9 @@
 import type { MoonwellClient } from "../../client/createMoonwellClient.js";
 import { getEnvironmentFromArgs } from "../../common/index.js";
 import type { OptionalNetworkParameterType } from "../../common/types.js";
-import type { Chain, Environment } from "../../environments/index.js";
+import type { Chain } from "../../environments/index.js";
 import type { CirculatingSupplySnapshot } from "../../types/circulatingSupply.js";
-import { getWithRetry, postWithRetry } from "../axiosWithRetry.js";
+import { getWithRetry } from "../axiosWithRetry.js";
 
 export type GetCirculatingSupplySnapshotsParameters<
   environments,
@@ -74,9 +74,7 @@ export async function getCirculatingSupplySnapshots<
   }
 
   if (!environment.lunarIndexerUrl) {
-    return environment.indexerUrl
-      ? fetchCirculatingSupplyFromPonder(environment)
-      : [];
+    return [];
   }
 
   try {
@@ -112,70 +110,3 @@ export async function getCirculatingSupplySnapshots<
     return [];
   }
 }
-
-async function fetchCirculatingSupplyFromPonder(
-  environment: Environment,
-): Promise<CirculatingSupplySnapshot[]> {
-  if (!environment.indexerUrl) return [];
-  try {
-    const response = await postWithRetry<{
-      data: {
-        circulatingSupplyDailySnapshots: {
-          items: {
-            chainId: number;
-            tokenAddress: string;
-            circulatingSupply: number;
-            timestamp: number;
-          }[];
-        };
-      };
-    }>(environment.indexerUrl, {
-      query: `
-          {
-            circulatingSupplyDailySnapshots(
-              where: { chainId: ${environment.chainId} }
-              orderBy: "timestamp"
-              orderDirection: "desc"
-              limit: 1000
-            ) {
-              items {
-                chainId
-                tokenAddress
-                circulatingSupply
-                timestamp
-              }
-            }
-          }
-        `,
-    });
-
-    if (
-      response.status === 200 &&
-      response.data?.data?.circulatingSupplyDailySnapshots
-    ) {
-      return response.data.data.circulatingSupplyDailySnapshots.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: item.circulatingSupply,
-              timestamp: item.timestamp,
-            },
-          ];
-        },
-      );
-    }
-    return [];
-  } catch (ex) {
-    console.error(
-      "An error occurred while fetching getCirculatingSupplySnapshots...",
-      ex,
-    );
-    return [];
-  }
-}

package/actions/governance/getStakingSnapshots.ts

@@ -9,7 +9,6 @@ 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,
@@ -47,18 +46,7 @@ export async function getStakingSnapshots<
   } = (args ?? {}) as GetStakingSnapshotsParameters<environments, undefined>;
 
   if (!environment.lunarIndexerUrl) {
-    const { startTime } = calculateTimeRange(
-      period,
-      customStartTime,
-      customEndTime,
-    );
-    return environment.indexerUrl
-      ? fetchStakingSnapshotsFromPonder(
-          environment.chainId,
-          environment.indexerUrl,
-          startTime,
-        )
-      : [];
+    return [];
   }
 
   try {
@@ -122,49 +110,3 @@ async function fetchStakingSnapshotsFromLunar(
   allSnapshots.sort((a, b) => a.timestamp - b.timestamp);
   return applyGranularity(allSnapshots, granularity);
 }
-
-async function fetchStakingSnapshotsFromPonder(
-  chainId: number,
-  indexerUrl: string,
-  startTime?: number,
-): Promise<StakingSnapshot[]> {
-  try {
-    const response = await postWithRetry<{
-      data: {
-        stakingDailySnapshots: {
-          items: StakingSnapshot[];
-        };
-      };
-    }>(indexerUrl, {
-      query: `
-          query {
-            stakingDailySnapshots(
-              limit: 365,
-              orderBy: "timestamp"
-              orderDirection: "desc"
-              where: {chainId: ${chainId}}
-            ) {
-              items {
-                chainId
-                totalStaked
-                totalStakedUSD
-                timestamp
-              }
-            }
-          }
-        `,
-    });
-
-    if (response.status === 200 && response.data?.data?.stakingDailySnapshots) {
-      const items = response.data.data.stakingDailySnapshots.items;
-      return startTime
-        ? items.filter((item) => item.timestamp >= startTime)
-        : items;
-    } else {
-      return [];
-    }
-  } catch (ex) {
-    console.error("An error occured while fetching getStakingSnapshots...", ex);
-    return [];
-  }
-}

package/actions/governance/proposals/common.ts

@@ -497,7 +497,18 @@ export const getProposalsOnChainData = async (
       let eta = 0;
 
       if (proposalData) {
-        const onChainEta = Number(proposalData[4]);
+        // The eta lives at a different tuple index per governor: the legacy
+        // single-chain governor's `proposals()` returns
+        // (id, proposer, eta, startTimestamp, endTimestamp, ...) so eta is at
+        // index 2, whereas the multichain governor's returns
+        // (proposer, voteSnapshotTimestamp, votingStartTime, votingEndTime,
+        // crossChainVoteCollectionEndTimestamp, ...) so its execution-available
+        // timestamp is at index 4. Reading index 4 for a legacy Moonriver
+        // proposal picked up `endTimestamp` (the voting-end time, already in the
+        // past once voting closes), which made the timeline flip straight to
+        // "Timelock Ready to Execute" and surfaced the Execute button before the
+        // timelock had actually elapsed (MOO-611).
+        const onChainEta = Number(proposalData[isMultichain ? 4 : 2]);
         if (onChainEta === 0 && isMultichain && p.votingEndTime) {
           eta = p.votingEndTime + 86400; // 1 day
         } else {

package/actions/lunar-indexer-client.ts

@@ -244,7 +244,7 @@ export class LunarIndexerError extends Error {
 }
 
 /**
- * Determine if an error should trigger fallback to Ponder/on-chain
+ * Determine if an error should trigger fallback to on-chain data
  */
 export function shouldFallback(error: unknown): boolean {
   if (axios.isAxiosError(error)) {

package/environments/definitions/governance.ts

@@ -19,13 +19,6 @@ function createGovernanceTokensConfig<T extends GovernanceTokensType>(
 }
 
 export const GovernanceTokensConfig = createGovernanceTokensConfig({
-  WELL_TESTNET: {
-    id: "WELL_TESTNET",
-    symbol: "WELL",
-    name: "WELL (Testnet)",
-    chainIds: [] as number[],
-    testnet: true,
-  },
   WELL: {
     id: "WELL",
     symbol: "WELL",

package/errors/version.ts

@@ -1 +1 @@
-export const version = '0.20.5'
+export const version = '0.21.0'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonwell-fi/moonwell-sdk",
   "description": "TypeScript Interface for Moonwell",
-  "version": "0.20.5",
+  "version": "0.21.0",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",
@@ -76,7 +76,7 @@
     "@rhinestone/module-sdk": "0.2.7",
     "@types/lodash": "^4.17.9",
     "@types/node": "^22.13.10",
-    "axios": "^1.7.7",
+    "axios": "^1.18.1",
     "dayjs": "^1.11.20",
     "lodash": "^4.17.21",
     "viem": "^2.26.2"