@moonwell-fi/moonwell-sdk 0.13.0 → 0.14.0

package/_types/actions/governance/proposals/getProposals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getProposals.d.ts","sourceRoot":"","sources":["../../../../actions/governance/proposals/getProposals.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAE9E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,gCAAgC,CAAC;AAEzE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAY3D,MAAM,MAAM,sBAAsB,CAChC,YAAY,EACZ,OAAO,SAAS,KAAK,GAAG,SAAS,IAC/B,4BAA4B,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;AAExD,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;AAEzD,wBAAsB,YAAY,CAChC,YAAY,EACZ,OAAO,SAAS,KAAK,GAAG,SAAS,EAEjC,MAAM,EAAE,cAAc,EACtB,IAAI,CAAC,EAAE,sBAAsB,CAAC,YAAY,EAAE,OAAO,CAAC,GACnD,sBAAsB,CAkCxB"}
+{"version":3,"file":"getProposals.d.ts","sourceRoot":"","sources":["../../../../actions/governance/proposals/getProposals.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAE9E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,gCAAgC,CAAC;AAEzE,OAAO,EAAE,KAAK,QAAQ,EAAiB,MAAM,4BAA4B,CAAC;AAY1E,MAAM,MAAM,sBAAsB,CAChC,YAAY,EACZ,OAAO,SAAS,KAAK,GAAG,SAAS,IAC/B,4BAA4B,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;AAExD,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;AAEzD,wBAAsB,YAAY,CAChC,YAAY,EACZ,OAAO,SAAS,KAAK,GAAG,SAAS,EAEjC,MAAM,EAAE,cAAc,EACtB,IAAI,CAAC,EAAE,sBAAsB,CAAC,YAAY,EAAE,OAAO,CAAC,GACnD,sBAAsB,CAyCxB"}

package/_types/actions/morpho/user-rewards/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../actions/morpho/user-rewards/common.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,WAAW,EAGjB,MAAM,gCAAgC,CAAC;AAKxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2CAA2C,CAAC;AAEzF;;;;;;;GAOG;AACH,qBAAa,aAAc,SAAQ,KAAK;IACtC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBAEb,MAAM,EAAE;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAChC,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB;CAWF;AAED,wBAAsB,wBAAwB,CAAC,MAAM,EAAE;IACrD,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;IACvB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAsF9B;AAED,wBAAsB,+BAA+B,CAAC,MAAM,EAAE;IAC5D,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;CACxB,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAsGrC"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../actions/morpho/user-rewards/common.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,WAAW,EAGjB,MAAM,gCAAgC,CAAC;AAKxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2CAA2C,CAAC;AAGzF;;;;;;;GAOG;AACH,qBAAa,aAAc,SAAQ,KAAK;IACtC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBAEb,MAAM,EAAE;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAChC,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB;CAWF;AAED,wBAAsB,wBAAwB,CAAC,MAAM,EAAE;IACrD,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;IACvB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAsF9B;AAED,wBAAsB,+BAA+B,CAAC,MAAM,EAAE;IAC5D,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;CACxB,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC,CA4GrC"}

package/_types/actions/morpho/vaults/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../actions/morpho/vaults/common.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,WAAW,EAEjB,MAAM,gCAAgC,CAAC;AAKxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EACV,WAAW,EAEZ,MAAM,+BAA+B,CAAC;AAkavC,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAazB;AAy3BD,KAAK,4BAA4B,GAAG;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,WAAW,CAAC;IACxB,OAAO,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,WAAW,EAAE,EACrB,uBAAuB,CAAC,EAAE,OAAO,GAChC,OAAO,CAAC,4BAA4B,EAAE,CAAC,CA8NzC"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../actions/morpho/vaults/common.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,WAAW,EAEjB,MAAM,gCAAgC,CAAC;AAKxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EACV,WAAW,EAEZ,MAAM,+BAA+B,CAAC;AAsavC,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAazB;AA43BD,KAAK,4BAA4B,GAAG;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,WAAW,CAAC;IACxB,OAAO,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,WAAW,EAAE,EACrB,uBAAuB,CAAC,EAAE,OAAO,GAChC,OAAO,CAAC,4BAA4B,EAAE,CAAC,CA8NzC"}

package/_types/errors/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "0.13.0";
+export declare const version = "0.14.0";
 //# sourceMappingURL=version.d.ts.map

package/actions/core/markets/common.ts

@@ -17,6 +17,7 @@ import {
   findTokenByAddress,
 } from "../../../environments/utils/index.js";
 import type { Market } from "../../../types/market.js";
+import { getGovernanceTokenPriceFor } from "../../governance/getWellPrice.js";
 
 export const getMarketsData = async (environment: Environment) => {
   // Moonriver (chainId 1285) should always use on-chain data
@@ -54,7 +55,7 @@ export const getMarketsData = async (environment: Environment) => {
     viewsContract?.read.getProtocolInfo(),
     viewsContract?.read.getAllMarketsInfo(),
     homeViewsContract?.read.getNativeTokenPrice(),
-    homeViewsContract?.read.getGovernanceTokenPrice(),
+    getGovernanceTokenPriceFor(environment),
   ]);
 
   // If getAllMarketsInfo failed (e.g. broken on-chain oracle), fall back to
@@ -506,13 +507,17 @@ async function fetchMarketsFromLunar(
 
     const [nativeTokenPriceRaw, governanceTokenPriceRaw] = await Promise.all([
       homeEnvironment.contracts.views?.read.getNativeTokenPrice(),
-      homeEnvironment.contracts.views?.read.getGovernanceTokenPrice(),
+      getGovernanceTokenPriceFor(environment).catch((err) => {
+        environment.onError?.(err, {
+          source: "governance-token-price",
+          chainId: environment.chainId,
+        });
+        return 0n;
+      }),
     ]);
 
-    if (!nativeTokenPriceRaw || !governanceTokenPriceRaw) {
-      throw new Error(
-        "Failed to fetch native or governance token prices from home chain",
-      );
+    if (nativeTokenPriceRaw === undefined) {
+      throw new Error("Failed to fetch native token price from home chain");
     }
 
     governanceTokenPrice = new Amount(governanceTokenPriceRaw, 18);

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

@@ -9,6 +9,7 @@ import {
   findTokenByAddress,
 } from "../../../environments/utils/index.js";
 import type { UserReward } from "../../../types/userReward.js";
+import { getGovernanceTokenPriceFor } from "../../governance/getWellPrice.js";
 
 export const getUserRewardsData = async (params: {
   environment: Environment;
@@ -27,7 +28,7 @@ export const getUserRewardsData = async (params: {
     viewsContract?.read.getAllMarketsInfo(),
     viewsContract?.read.getUserRewards([params.account]),
     homeViewsContract?.read.getNativeTokenPrice(),
-    homeViewsContract?.read.getGovernanceTokenPrice(),
+    getGovernanceTokenPriceFor(params.environment),
   ] as const);
 
   // Narrow each one by status and coerce to undefined on failure:
@@ -43,14 +44,14 @@ export const getUserRewardsData = async (params: {
   if (
     !allMarkets ||
     !userRewards ||
-    !nativeTokenPriceRaw ||
-    !governanceTokenPriceRaw
+    nativeTokenPriceRaw === undefined ||
+    governanceTokenPriceRaw === undefined
   ) {
     return [];
   }
 
-  const governanceTokenPrice = new Amount(governanceTokenPriceRaw || 0n, 18);
-  const nativeTokenPrice = new Amount(nativeTokenPriceRaw || 0n, 18);
+  const governanceTokenPrice = new Amount(governanceTokenPriceRaw, 18);
+  const nativeTokenPrice = new Amount(nativeTokenPriceRaw, 18);
 
   let tokenPrices =
     allMarkets

package/actions/governance/getStakingInfo.ts

@@ -7,14 +7,10 @@ import {
   getEnvironmentsFromArgs,
 } from "../../common/index.js";
 import type { NetworkParameterType } from "../../common/types.js";
-import {
-  type Chain,
-  type Environment,
-  type TokensType,
-  publicEnvironments,
-} from "../../environments/index.js";
+import type { Chain, Environment } from "../../environments/index.js";
 import type { StakingInfo } from "../../types/staking.js";
 import { getMerklStakingApr } from "./common.js";
+import { getGovernanceTokenPriceFor } from "./getWellPrice.js";
 
 export type GetStakingInfoParameters<
   environments,
@@ -23,6 +19,108 @@ export type GetStakingInfoParameters<
 
 export type GetStakingInfoReturnType = Promise<StakingInfo[]>;
 
+type StakingInfoStruct = {
+  cooldown: bigint;
+  distributionEnd: bigint;
+  emissionPerSecond: bigint;
+  totalSupply: bigint;
+  unstakeWindow: bigint;
+};
+
+const isStakingInfoStruct = (value: unknown): value is StakingInfoStruct => {
+  if (typeof value !== "object" || value === null) return false;
+  const v = value as Record<string, unknown>;
+  return (
+    typeof v.cooldown === "bigint" &&
+    typeof v.distributionEnd === "bigint" &&
+    typeof v.emissionPerSecond === "bigint" &&
+    typeof v.totalSupply === "bigint" &&
+    typeof v.unstakeWindow === "bigint"
+  );
+};
+
+/**
+ * Reads the staking fields directly from the stkWELL token contract when the
+ * core views' getStakingInfo() is unavailable or returns zeroed data
+ * (e.g. reverts on Moonbeam). Reads each field independently so a single
+ * transient RPC failure doesn't erase the whole fallback.
+ *
+ * The `assets` mapping is keyed by the stkWELL contract's own address — that's
+ * the Aave-fork convention (`address(this)` in StakedAave._initialize), not
+ * the underlying staked token. Verified on Moonbeam: assets(stkWELL) returns
+ * non-zero emissionPerSecond; assets(WELL) returns zero.
+ */
+async function getStakingInfoFromStkWell(
+  environment: Environment,
+): Promise<StakingInfoStruct | undefined> {
+  const stakingToken = environment.contracts.stakingToken;
+  const stakingTokenKey = environment.config.contracts.stakingToken;
+  const tokens = environment.config.tokens as Record<
+    string,
+    { address: `0x${string}` } | undefined
+  >;
+  const stakingTokenAddress = stakingTokenKey
+    ? tokens[stakingTokenKey]?.address
+    : undefined;
+  if (!stakingToken || !stakingTokenAddress) {
+    environment.onError?.(
+      new Error("getStakingInfoFromStkWell: missing stkWELL config"),
+      { source: "staking-fallback", chainId: environment.chainId },
+    );
+    return undefined;
+  }
+
+  const [
+    cooldownR,
+    unstakeWindowR,
+    distributionEndR,
+    totalSupplyR,
+    assetDataR,
+  ] = await Promise.allSettled([
+    stakingToken.read.COOLDOWN_SECONDS(),
+    stakingToken.read.UNSTAKE_WINDOW(),
+    stakingToken.read.DISTRIBUTION_END(),
+    stakingToken.read.totalSupply(),
+    stakingToken.read.assets([stakingTokenAddress]),
+  ]);
+
+  // Surface every rejection so operators don't have to guess which read failed.
+  for (const r of [
+    cooldownR,
+    unstakeWindowR,
+    distributionEndR,
+    totalSupplyR,
+    assetDataR,
+  ]) {
+    if (r.status === "rejected") {
+      environment.onError?.(r.reason, {
+        source: "staking-fallback",
+        chainId: environment.chainId,
+      });
+    }
+  }
+
+  // totalSupply is load-bearing for APR; if its read failed (vs. legitimately
+  // returning 0n on an empty new chain) we can't produce a sensible struct.
+  if (totalSupplyR.status === "rejected") return undefined;
+
+  const assetData =
+    assetDataR.status === "fulfilled" ? assetDataR.value : undefined;
+  // viem returns multi-output reads as a tuple (Readonly<[bigint, bigint, bigint]>)
+  // even when the ABI names the outputs.
+  const emissionPerSecond = assetData ? assetData[0] : 0n;
+
+  return {
+    cooldown: cooldownR.status === "fulfilled" ? cooldownR.value : 0n,
+    unstakeWindow:
+      unstakeWindowR.status === "fulfilled" ? unstakeWindowR.value : 0n,
+    distributionEnd:
+      distributionEndR.status === "fulfilled" ? distributionEndR.value : 0n,
+    totalSupply: totalSupplyR.value,
+    emissionPerSecond,
+  };
+}
+
 export async function getStakingInfo<
   environments,
   Network extends Chain | undefined,
@@ -36,85 +134,104 @@ export async function getStakingInfo<
     (env) => env.config.contracts.stakingToken,
   );
 
+  const baseEnvironment = (
+    client.environments as { base?: Environment } | undefined
+  )?.base;
+
   const envStakingInfoSettlements = await Promise.allSettled(
     envsWithStaking.map(async (environment) => {
-      const homeEnvironment =
-        (Object.values(publicEnvironments) as Environment[]).find((e) =>
-          e.custom?.governance?.chainIds?.includes(environment.chainId),
-        ) || environment;
-
       const isBase = environment.chainId === base.id;
 
-      const settlements = await Promise.allSettled([
-        environment.contracts.views?.read.getStakingInfo(),
-        homeEnvironment.contracts.views?.read.getGovernanceTokenPrice(),
-        ...(isBase
-          ? [
-              environment.contracts.views?.read.getStakingInfo({
+      const [viewsStakingResult, historicalStakingResult, priceResult] =
+        await Promise.allSettled([
+          environment.contracts.views?.read.getStakingInfo(),
+          isBase
+            ? environment.contracts.views?.read.getStakingInfo({
                 blockNumber: BigInt(34149943),
-              }),
-            ]
-          : []),
-      ]);
-
-      return settlements.map((s) =>
-        s.status === "fulfilled" ? s.value : undefined,
-      );
+              })
+            : Promise.resolve(undefined),
+          getGovernanceTokenPriceFor(environment, baseEnvironment),
+        ]);
+
+      const viewsStaking =
+        viewsStakingResult.status === "fulfilled"
+          ? viewsStakingResult.value
+          : undefined;
+
+      // Fall back to direct stkWELL reads when the views call rejected (the
+      // known Moonbeam failure mode) or returned a fully-zeroed struct
+      // (suspicious — a real deployment always has cooldown and unstake
+      // window configured > 0). A new chain with zero stakers but real
+      // schedule constants still goes through views.
+      const allZeroed =
+        isStakingInfoStruct(viewsStaking) &&
+        viewsStaking.cooldown === 0n &&
+        viewsStaking.unstakeWindow === 0n &&
+        viewsStaking.totalSupply === 0n &&
+        viewsStaking.emissionPerSecond === 0n;
+      const viewsValid = isStakingInfoStruct(viewsStaking) && !allZeroed;
+      const stakingInfo: StakingInfoStruct | undefined = viewsValid
+        ? viewsStaking
+        : await getStakingInfoFromStkWell(environment);
+
+      const historicalStaking =
+        historicalStakingResult.status === "fulfilled"
+          ? historicalStakingResult.value
+          : undefined;
+
+      const price = priceResult.status === "fulfilled" ? priceResult.value : 0n;
+
+      if (priceResult.status === "rejected") {
+        environment.onError?.(priceResult.reason, {
+          source: "governance-token-price",
+          chainId: environment.chainId,
+        });
+      }
+
+      return { stakingInfo, historicalStaking, price };
     }),
   );
 
-  const envStakingInfo = envStakingInfoSettlements
-    .filter((s) => s.status === "fulfilled")
-    .map(
-      (s) =>
-        (
-          s as PromiseFulfilledResult<
-            (
-              | bigint
-              | {
-                  cooldown: bigint;
-                  unstakeWindow: bigint;
-                  distributionEnd: bigint;
-                  totalSupply: bigint;
-                  emissionPerSecond: bigint;
-                  lastUpdateTimestamp: bigint;
-                  index: bigint;
-                }
-              | undefined
-            )[]
-          >
-        ).value,
-    )
-    .filter((val) => val !== undefined);
+  const envStakingInfo = envStakingInfoSettlements.map((s) =>
+    s.status === "fulfilled"
+      ? s.value
+      : { stakingInfo: undefined, historicalStaking: undefined, price: 0n },
+  );
 
   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 baseStakingTokenKey = baseEnv?.config.contracts.stakingToken;
+  const baseTokens = baseEnv?.config.tokens as
+    | Record<string, { address: `0x${string}` } | undefined>
+    | undefined;
+  const baseStkTokenAddress = baseStakingTokenKey
+    ? baseTokens?.[baseStakingTokenKey]?.address
+    : undefined;
+  const baseStakingApr = baseStkTokenAddress
+    ? await getMerklStakingApr(baseStkTokenAddress)
+    : 0;
 
   const result = envsWithStaking.flatMap((curr, index) => {
-    const token =
-      curr.config.tokens[
-        curr.config.contracts.governanceToken as keyof TokensType<typeof curr>
-      ]!;
-    const stakingToken =
-      curr.config.tokens[
-        curr.config.contracts.stakingToken as keyof TokensType<typeof curr>
-      ]!;
-
-    const envStakingInfoData = envStakingInfo[index]![0]!;
-    const envGovernanceTokenPriceData = envStakingInfo[index]![1];
-    const envStakingInfoDataAfterX28Proposal = envStakingInfo[index]![2]!;
+    const govKey = curr.config.contracts.governanceToken;
+    const stkKey = curr.config.contracts.stakingToken;
+    const currTokens = curr.config.tokens as Record<
+      string,
+      { address: `0x${string}`; decimals: number; name: string; symbol: string }
+    >;
+    if (!govKey || !stkKey) return [];
+    const token = currTokens[govKey];
+    const stakingToken = currTokens[stkKey];
+    if (!token || !stakingToken) return [];
+
+    // envStakingInfo is built via Promise.allSettled with an explicit
+    // fallback object at the .map below, so entries are always defined here.
+    const {
+      stakingInfo: envStakingInfoData,
+      historicalStaking,
+      price,
+    } = envStakingInfo[index];
     const isBase = curr.chainId === base.id;
 
-    if (
-      !envStakingInfoData ||
-      (isBase && !envStakingInfoDataAfterX28Proposal)
-    ) {
+    if (!envStakingInfoData || (isBase && !historicalStaking)) {
       return [];
     }
 
@@ -124,20 +241,9 @@ export async function getStakingInfo<
       emissionPerSecond: emissionPerSecondRaw,
       totalSupply: totalSupplyRaw,
       unstakeWindow,
-    } = envStakingInfoData as {
-      cooldown: bigint;
-      distributionEnd: bigint;
-      emissionPerSecond: bigint;
-      totalSupply: bigint;
-      unstakeWindow: bigint;
-    };
-
-    //Quick workaround to get governance token price from some other environment
-    const governanceTokenPrice = new Amount(
-      (envGovernanceTokenPriceData ?? 0n) as bigint,
-      18,
-    );
+    } = envStakingInfoData;
 
+    const tokenPrice = new Amount(price, 18);
     const totalSupply = new Amount(totalSupplyRaw, 18);
     const emissionPerSecond = new Amount(emissionPerSecondRaw, 18);
 
@@ -145,7 +251,9 @@ export async function getStakingInfo<
       emissionPerSecond.value * SECONDS_PER_DAY * DAYS_PER_YEAR;
 
     const apr =
-      ((emissionPerYear + totalSupply.value) / totalSupply.value - 1) * 100;
+      totalSupply.value > 0
+        ? ((emissionPerYear + totalSupply.value) / totalSupply.value - 1) * 100
+        : 0;
 
     const stakingInfo: StakingInfo = {
       apr: isBase ? baseStakingApr : apr,
@@ -153,10 +261,10 @@ export async function getStakingInfo<
       cooldown: Number(cooldown),
       distributionEnd: Number(distributionEnd),
       token,
-      tokenPrice: governanceTokenPrice.value,
+      tokenPrice: tokenPrice.value,
       stakingToken,
       totalSupply,
-      totalSupplyUSD: totalSupply.value * governanceTokenPrice.value,
+      totalSupplyUSD: totalSupply.value * tokenPrice.value,
       unstakeWindow: Number(unstakeWindow),
     };