@berachain/berajs 0.2.2 → 0.2.3

package/dist/types/exports.d.cts

@@ -1,4 +1,4 @@
-export { A as AggregatedTokenTotals, g as BribeBoostReward, b as BribeBoostRewardItem, B as BribeBoostRewardProof, h as BribeBoostValidatorApr, t as ClaimedIncentives, u as ClaimedIncentivesLocalState, C as CustomProposal, n as CustomProposalActionErrors, a as CustomProposalErrors, D as DefaultHookOptions, c as DefaultHookReturnType, G as GovernanceTopic, I as IContractWrite, i as IContractWriteFn, r as IncentiveReward, s as IncentiveRewardChunksWithValidatorData, m as PROPOSAL_GENRE, j as Proposal, p as ProposalAction, l as ProposalVotes, P as ProtocolMetadata, o as SafeProposalAction, d as StakedBeraAsset, S as StakingConfig, U as UserVaultInfo, q as VerifiedAbi, V as Vote, k as Voter } from '../global.d-CN6l2b9E.cjs';
+export { A as AggregatedTokenTotals, g as BribeBoostReward, b as BribeBoostRewardItem, B as BribeBoostRewardProof, h as BribeBoostValidatorApr, t as ClaimedIncentives, u as ClaimedIncentivesLocalState, C as CustomProposal, n as CustomProposalActionErrors, a as CustomProposalErrors, D as DefaultHookOptions, c as DefaultHookReturnType, G as GovernanceTopic, I as IContractWrite, i as IContractWriteFn, r as IncentiveReward, s as IncentiveRewardChunksWithValidatorData, m as PROPOSAL_GENRE, j as Proposal, p as ProposalAction, l as ProposalVotes, P as ProtocolMetadata, o as SafeProposalAction, d as StakedBeraAsset, S as StakingConfig, U as UserVaultInfo, q as VerifiedAbi, V as Vote, k as Voter } from '../global.d-DLRtrPG5.cjs';
 export { A as AllowanceQueryItem, j as AllowanceToken, B as BalanceToken, z as BexStatus, w as Calldata, H as HoneySwapActions, I as IAggregatorArgs, D as IAggregatorQuote, g as IRawAggregatorQuote, v as IUserPosition, M as MinimalERC20, h as PythPriceFeedMap, S as SwapRequest, b as Token, i as TokenCurrentPriceMap, x as TokenPriceInfo, t as TokenWithAmount, a as TokenWithMetadata, y as TokenWithPrice } from '../HoneyConfigProvider-Ca3ouozs.cjs';
 import { BundleData, EnsoClient } from '@ensofinance/sdk';
 import { TransactionRequest, Address, Hex, PublicClient } from 'viem';

package/dist/types/exports.d.ts

@@ -1,4 +1,4 @@
-export { A as AggregatedTokenTotals, g as BribeBoostReward, b as BribeBoostRewardItem, B as BribeBoostRewardProof, h as BribeBoostValidatorApr, t as ClaimedIncentives, u as ClaimedIncentivesLocalState, C as CustomProposal, n as CustomProposalActionErrors, a as CustomProposalErrors, D as DefaultHookOptions, c as DefaultHookReturnType, G as GovernanceTopic, I as IContractWrite, i as IContractWriteFn, r as IncentiveReward, s as IncentiveRewardChunksWithValidatorData, m as PROPOSAL_GENRE, j as Proposal, p as ProposalAction, l as ProposalVotes, P as ProtocolMetadata, o as SafeProposalAction, d as StakedBeraAsset, S as StakingConfig, U as UserVaultInfo, q as VerifiedAbi, V as Vote, k as Voter } from '../global.d-wYu8G8IQ.js';
+export { A as AggregatedTokenTotals, g as BribeBoostReward, b as BribeBoostRewardItem, B as BribeBoostRewardProof, h as BribeBoostValidatorApr, t as ClaimedIncentives, u as ClaimedIncentivesLocalState, C as CustomProposal, n as CustomProposalActionErrors, a as CustomProposalErrors, D as DefaultHookOptions, c as DefaultHookReturnType, G as GovernanceTopic, I as IContractWrite, i as IContractWriteFn, r as IncentiveReward, s as IncentiveRewardChunksWithValidatorData, m as PROPOSAL_GENRE, j as Proposal, p as ProposalAction, l as ProposalVotes, P as ProtocolMetadata, o as SafeProposalAction, d as StakedBeraAsset, S as StakingConfig, U as UserVaultInfo, q as VerifiedAbi, V as Vote, k as Voter } from '../global.d-X3cqpCEB.js';
 export { A as AllowanceQueryItem, j as AllowanceToken, B as BalanceToken, z as BexStatus, w as Calldata, H as HoneySwapActions, I as IAggregatorArgs, D as IAggregatorQuote, g as IRawAggregatorQuote, v as IUserPosition, M as MinimalERC20, h as PythPriceFeedMap, S as SwapRequest, b as Token, i as TokenCurrentPriceMap, x as TokenPriceInfo, t as TokenWithAmount, a as TokenWithMetadata, y as TokenWithPrice } from '../HoneyConfigProvider-CK6mOKFH.js';
 import { BundleData, EnsoClient } from '@ensofinance/sdk';
 import { TransactionRequest, Address, Hex, PublicClient } from 'viem';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@berachain/berajs",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "sideEffects": false,
   "files": [
     "dist",
@@ -31,8 +31,8 @@
     "typescript": "5.5.4",
     "viem": "2.45.0",
     "vitest": "3.2.4",
-    "@berachain/wagmi": "0.3.0",
-    "@berachain/utils": "0.1.0"
+    "@berachain/utils": "0.1.0",
+    "@berachain/wagmi": "0.3.0"
   },
   "exports": {
     "./*": {

package/src/hooks/pol/useStakedData.ts

@@ -1,117 +1,194 @@
+import { useMemo } from "react";
 import useSWR from "swr";
 
-import {
-  useBeraWallet,
-  useConfig,
-  usePublicClient,
-} from "@berachain/wagmi/hooks";
+import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
 import BigNumber from "@berachain/utils/pkg/bignumber.js";
 
 import { getEarnedStakedBeraVault } from "~/actions/pol/getEarnedStakedBeraVault";
 import { getRewardTokenToBeraRate } from "~/actions/pol/getRewardTokenToBeraRate";
 import { getStakedBeraAPR } from "~/actions/pol/getStakedBeraAPR";
-import { getTokenCurrentPrices } from "~/actions/prices/getTokenCurrentPrices";
-import { getWalletBalances } from "~/actions/tokens/getWalletBalances";
 import { useBeraFlag } from "~/contexts/BeraFlags/BeraFlags";
 import { POLLING } from "~/enum/polling";
-import { assertDefined, assertPublicClient } from "~/errors/assert";
+import { assertPublicClient } from "~/errors/assert";
+import { usePollWalletBalances } from "~/hooks/tokens/usePollWalletBalances";
+import { useTokenPrices } from "~/hooks/tokens/useTokenPrices";
 import type { StakedBeraAsset } from "~/types/pol";
 import type { StakingConfig } from "~/types/staking";
 
+/**
+ * Fetches staked asset data in two phases for progressive loading:
+ *
+ * 1. APR — independent fetch, resolves quickly, shared by both phases.
+ * 2. Balances (fast path) — wallet balances (via usePollWalletBalances),
+ *    token prices (via useTokenPrices), and exchange rates.
+ *    Provides staked amounts and USD values immediately (earnings are 0).
+ * 3. Positions (slow path) — adds earnings data from the vault.
+ *    Provides the full picture with earned amounts and USD values.
+ *
+ * Consumers can show `balances` right away and swap in `data` once positions resolve.
+ */
 export const useStakedData = (stakingConfigs: StakingConfig[]) => {
   const window = useBeraFlag("swberaAprWindow");
 
-  const wagmiConfig = useConfig();
   const publicClient = usePublicClient();
   const { address: account } = useBeraWallet();
-  const QUERY_KEY =
-    account && wagmiConfig && stakingConfigs
-      ? (["useStakedData", account, stakingConfigs, window] as const)
+
+  const receiptTokens = useMemo(
+    () => stakingConfigs.map((config) => config.receiptToken),
+    [stakingConfigs],
+  );
+  const inputTokens = useMemo(
+    () => stakingConfigs.map((config) => config.inputTokens[0]),
+    [stakingConfigs],
+  );
+
+  // APR — only updates every ~12 hours on BE
+  const aprKey = window ? (["useStakedData:apr", window] as const) : null;
+  const { data: apr } = useSWR(
+    aprKey,
+    async ([, window]) => getStakedBeraAPR({ window }),
+    { refreshInterval: POLLING.NORMAL },
+  );
+
+  const { data: walletBalances, isLoading: isLoadingBalances } =
+    usePollWalletBalances({ tokens: receiptTokens });
+
+  // NOT BERA PRICE, INPUT TOKEN PRICE
+  const { getTokenPrice } = useTokenPrices({ tokens: inputTokens });
+
+  // exchange rates from receipt token → input token (on-chain reads)
+  const exchangeRatesKey =
+    publicClient && receiptTokens.length > 0
+      ? (["useStakedData:exchangeRates", receiptTokens] as const)
+      : null;
+
+  const { data: exchangeRates } = useSWR(
+    exchangeRatesKey,
+    async ([, receiptTokens]) => {
+      assertPublicClient(publicClient);
+      return Promise.all(
+        receiptTokens.map((token) =>
+          getRewardTokenToBeraRate({
+            address: token.address,
+            publicClient,
+          }),
+        ),
+      );
+    },
+    { refreshInterval: POLLING.NORMAL },
+  );
+
+  // balances (fast path) — derived from hooks above, no extra requests
+  const balances = useMemo<StakedBeraAsset[] | undefined>(() => {
+    if (!walletBalances || !exchangeRates) return undefined;
+
+    return stakingConfigs.map((config, i): StakedBeraAsset => {
+      const inputToken = config.inputTokens[0];
+      const stakedBalance =
+        walletBalances.find((b) => b.address === config.receiptToken.address)
+          ?.balance.raw ?? "0";
+      const exchangeRate = exchangeRates[i] ?? 0;
+      const inputTokenPrice = getTokenPrice(inputToken) ?? 0;
+
+      const total = new BigNumber(stakedBalance).multipliedBy(exchangeRate);
+      const stakedAmount = total.dividedBy(10 ** inputToken.decimals);
+      const stakedAmountUsd = stakedAmount.multipliedBy(inputTokenPrice);
+
+      return {
+        token: inputToken,
+        apr: apr ?? 0,
+        stakedAmount: stakedAmount.toNumber(),
+        stakedAmountUsd: stakedAmountUsd.toNumber(),
+        earnedAmount: 0,
+        earnedAmountUsd: 0,
+        isLoadingEarnings: true,
+      };
+    });
+  }, [walletBalances, exchangeRates, stakingConfigs, apr, getTokenPrice]);
+
+  // positions (slow path) — fetch earnings and exchange rates from the vault
+  const positionsKey =
+    account && publicClient && stakingConfigs.length > 0
+      ? (["useStakedData:positions", account, stakingConfigs] as const)
       : null;
-  return useSWR<StakedBeraAsset[] | undefined, any, typeof QUERY_KEY>(
-    QUERY_KEY,
-    async ([, account, stakingConfigs, window]) => {
-      assertDefined(wagmiConfig, "wagmiConfig");
+
+  const {
+    data: positionsRaw,
+    isLoading: isLoadingPositions,
+    isValidating: isValidatingPositions,
+  } = useSWR(
+    positionsKey,
+    async ([, account, stakingConfigs]) => {
       assertPublicClient(publicClient);
-      // get the apr for staking
-      const apr = await getStakedBeraAPR({ window });
-      // pull out the receipt tokens from the staking configs
-      const receiptTokens = stakingConfigs.map((config) => config.receiptToken);
-      // get the staked balances for the receipt tokens
-      const stakedBalancesData = await getWalletBalances({
-        account,
-        tokenList: receiptTokens,
-        wagmiConfig,
-      });
-      const data: StakedBeraAsset[] = await Promise.all(
-        stakingConfigs.map(async (stakingConfig): Promise<StakedBeraAsset> => {
-          // get the staking token & input/receipt token
+
+      return Promise.all(
+        stakingConfigs.map(async (stakingConfig) => {
           const stakingToken = stakingConfig.receiptToken;
-          const inputToken = stakingConfig.inputTokens[0];
-
-          const [earnings, inputTokenPriceData, exchangeRateNowRaw] =
-            await Promise.all([
-              // get the earned input token for the staking token
-              getEarnedStakedBeraVault({
-                address: stakingToken.address,
-                account,
-              }),
-              // NOT BERA PRICE, INPUT TOKEN PRICE
-              getTokenCurrentPrices({ addressIn: [inputToken.address] }),
-              // use getRewardTokenToBeraRate to get the exchange rate
-              getRewardTokenToBeraRate({
-                address: stakingToken.address,
-                publicClient,
-              }),
-            ]);
-
-          // input token price
-          const inputTokenPrice =
-            inputTokenPriceData[inputToken.address]?.price ?? 0;
-          // staked asset balance
-          const stakedBalance =
-            stakedBalancesData?.find((b) => b.address === stakingToken.address)
-              ?.balance.raw ?? "0";
-
-          const exchangeRateNow = exchangeRateNowRaw ?? 0;
-
-          // unrealised gains is the users earnings
-          const unrealisedGains = new BigNumber(earnings.earningsTotal).minus(
-            earnings.earningsRealized,
-          );
-
-          const total = new BigNumber(stakedBalance).multipliedBy(
-            exchangeRateNow,
-          );
-          // desposited is the users deposited amount
-          const desposited = total.minus(unrealisedGains);
-
-          // in terms of bera
-          const stakedAmount = desposited.dividedBy(10 ** inputToken.decimals);
-          const earnedAmount = unrealisedGains.dividedBy(
-            10 ** inputToken.decimals,
-          );
-
-          // in terms of usd
-          const stakedAmountUsd = stakedAmount.multipliedBy(inputTokenPrice);
-          const earnedAmountUsd = earnedAmount.multipliedBy(inputTokenPrice);
-
-          const data: StakedBeraAsset = {
-            token: inputToken,
-            apr: apr ?? 0,
-            stakedAmount: stakedAmount.toNumber(),
-            earnedAmount: earnedAmount.toNumber(),
-            stakedAmountUsd: stakedAmountUsd.toNumber(),
-            earnedAmountUsd: earnedAmountUsd.toNumber(),
-          };
-
-          return data;
+
+          const [earnings, exchangeRate] = await Promise.all([
+            getEarnedStakedBeraVault({
+              address: stakingToken.address,
+              account,
+            }),
+            getRewardTokenToBeraRate({
+              address: stakingToken.address,
+              publicClient,
+            }),
+          ]);
+
+          return { earnings, exchangeRate };
         }),
       );
-      return data;
-    },
-    {
-      refreshInterval: POLLING.FAST,
     },
+    { refreshInterval: POLLING.FAST },
   );
+
+  // derive full StakedBeraAsset[] from raw positions + shared hooks
+  const data = useMemo<StakedBeraAsset[] | undefined>(() => {
+    if (!positionsRaw || !walletBalances) return undefined;
+
+    return stakingConfigs.map((config, i): StakedBeraAsset => {
+      const inputToken = config.inputTokens[0];
+      const stakingToken = config.receiptToken;
+      const { earnings, exchangeRate: exchangeRateRaw } = positionsRaw[i];
+
+      const inputTokenPrice = getTokenPrice(inputToken) ?? 0;
+      const stakedBalance =
+        walletBalances.find((b) => b.address === stakingToken.address)?.balance
+          .raw ?? "0";
+      const exchangeRate = exchangeRateRaw ?? 0;
+
+      const unrealisedGains = new BigNumber(earnings.earningsTotal).minus(
+        earnings.earningsRealized,
+      );
+      const total = new BigNumber(stakedBalance).multipliedBy(exchangeRate);
+      const deposited = total.minus(unrealisedGains);
+
+      const stakedAmount = deposited.dividedBy(10 ** inputToken.decimals);
+      const earnedAmount = unrealisedGains.dividedBy(10 ** inputToken.decimals);
+      const stakedAmountUsd = stakedAmount.multipliedBy(inputTokenPrice);
+      const earnedAmountUsd = earnedAmount.multipliedBy(inputTokenPrice);
+
+      return {
+        token: inputToken,
+        apr: apr ?? 0,
+        stakedAmount: stakedAmount.toNumber(),
+        earnedAmount: earnedAmount.toNumber(),
+        stakedAmountUsd: stakedAmountUsd.toNumber(),
+        earnedAmountUsd: earnedAmountUsd.toNumber(),
+      };
+    });
+  }, [positionsRaw, walletBalances, stakingConfigs, apr, getTokenPrice]);
+
+  return {
+    /** Fast path: staked amounts + USD values (no earnings) */
+    balances,
+    /** Slow path: full enriched positions with earnings */
+    data,
+    /** True only when both balances and positions are still loading */
+    isLoading: isLoadingBalances && isLoadingPositions,
+    isLoadingBalances,
+    isLoadingPositions,
+    isValidatingPositions,
+  };
 };

package/src/types/pol.d.ts

@@ -60,4 +60,5 @@ export type StakedBeraAsset = {
   stakedAmountUsd: number;
   earnedAmount: number;
   earnedAmountUsd: number;
+  isLoadingEarnings?: boolean;
 };