@berachain/berajs 0.2.9 → 0.2.11

package/src/hooks/pol/useVaultAddress.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getRewardVaultStakingToken } from "../../actions/pol/getRewardVaultStakingToken";
 import { assertPublicClient } from "../../errors/assert";

package/src/hooks/pol/useVaultHistory.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import type { GetVaultHistoryQuery } from "@berachain/graphql/pol/api";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import {
   type GetVaultHistoryArgs,

package/src/hooks/pol/useVaultValidators.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import type { ApiValidatorFragment } from "@berachain/graphql/pol/api";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getVaultValidators } from "../../actions/pol/getVaultValidators";
 import type {
@@ -25,7 +25,7 @@ export const useVaultValidators = (
       });
     },
     {
-      ...options?.opts,
+      ...options,
     },
   );
 

package/src/hooks/tokens/useMultipleTokenInformation.ts

@@ -1,9 +1,9 @@
-import useSWRImmutable from "swr/immutable";
 import { isAddress } from "viem";
 
 import { defaultChainId } from "@berachain/config/internal";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 
 import { getTokenInformation } from "../../actions/tokens/getTokenInformation";
 import { assertPublicClient } from "../../errors/assert";
@@ -64,7 +64,7 @@ export function useMultipleTokenInformation(
         }),
       );
     },
-    { ...options?.opts },
+    { ...options },
   );
 
   return {

package/src/hooks/tokens/usePollAllowances.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import { useBeraWallet, useConfig } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getAllowances } from "../../actions/tokens/getAllowances";
 import { POLLING } from "../../enum/polling";
@@ -46,8 +45,8 @@ export function usePollAllowances(
       });
     },
     {
-      ...options?.opts,
-      refreshInterval: options?.opts?.refreshInterval ?? POLLING.NORMAL,
+      ...options,
+      refreshInterval: options?.refreshInterval ?? POLLING.NORMAL,
     },
   );
 

package/src/hooks/tokens/usePollBalance.ts

@@ -1,4 +1,3 @@
-import useSWR from "swr";
 import {
   type Address,
   erc20Abi,
@@ -11,6 +10,7 @@ import {
 import { defaultChainId } from "@berachain/config/internal";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { POLLING } from "../../enum/polling";
 import { assertPublicClient } from "../../errors/assert";
@@ -47,7 +47,6 @@ export function usePollBalance(
   const assetOwner = owner ?? account;
 
   const QUERY_KEY =
-    (options?.opts?.isEnabled ?? true) &&
     publicClient &&
     assetOwner &&
     isAddress(assetOwner) &&
@@ -80,6 +79,7 @@ export function usePollBalance(
     },
     {
       refreshInterval: POLLING.FAST,
+      ...options,
     },
   );
 

package/src/hooks/tokens/usePollWalletBalances.ts

@@ -1,5 +1,4 @@
 import { useMemo } from "react";
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import {
@@ -7,6 +6,7 @@ import {
   useConfig,
   usePublicClient,
 } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getWalletBalances } from "../../actions/tokens/getWalletBalances";
 import { POLLING } from "../../enum/polling";
@@ -67,7 +67,7 @@ export function usePollWalletBalances(
     },
     {
       refreshInterval: POLLING.NORMAL,
-      ...options?.opts,
+      ...options,
     },
   );
 

package/src/hooks/tokens/useStakingTokenInformation.ts

@@ -1,7 +1,7 @@
-import useSWRImmutable from "swr/immutable";
 import { isAddress, zeroAddress } from "viem";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 
 import { getStakingTokenInformation } from "../../actions/pol/getStakingTokenInformation";
 import type { Token } from "../../types/dex";
@@ -48,7 +48,7 @@ export const useStakingTokenInformation = (
         publicClient,
       });
     },
-    { ...options?.opts },
+    { ...options },
   );
 
   return {

package/src/hooks/tokens/useTokenCurrentPrices.ts

@@ -1,9 +1,10 @@
 import { useMemo } from "react";
-import useSWR from "swr";
 import { type Address, isAddress, zeroAddress } from "viem";
 
 import { defaultChainId } from "@berachain/config/internal";
 
+import { useSWR } from "@berachain/utils/pkg/swr";
+
 import { getTokenCurrentPrices } from "../../actions/prices/getTokenCurrentPrices";
 import { POLLING } from "../../enum/polling";
 import type { TokenCurrentPriceMap, TokenWithPrice } from "../../types/dex";
@@ -21,10 +22,8 @@ export function useTokenCurrentPrices(
     addressIn?: string[] | readonly string[];
   } = {},
   options: DefaultHookOptions = {
-    opts: {
-      refreshInterval: POLLING.NORMAL,
-      revalidateOnFocus: true,
-    },
+    refreshInterval: POLLING.NORMAL,
+    revalidateOnFocus: true,
   },
 ) {
   const { tokenList, ensoTokens } = useTokens();
@@ -65,13 +64,12 @@ export function useTokenCurrentPrices(
     ? beraAddresses
     : tokenList.map((token) => token.address);
 
-  const QUERY_KEY =
-    addresses && (options.opts?.isEnabled ?? true)
-      ? ([
-          "useTokenCurrentPrices",
-          addresses.map((a) => a.toLowerCase() as Address),
-        ] as const)
-      : null;
+  const QUERY_KEY = addresses
+    ? ([
+        "useTokenCurrentPrices",
+        addresses.map((a) => a.toLowerCase() as Address),
+      ] as const)
+    : null;
 
   const apiResponse = useSWR(
     QUERY_KEY,
@@ -79,7 +77,7 @@ export function useTokenCurrentPrices(
       // this only works for Berachain tokens
       return getTokenCurrentPrices({ addressIn: addresses });
     },
-    options.opts,
+    options,
   );
 
   const ensoMatchingPrices = useMemo<TokenCurrentPriceMap>(() => {

package/src/hooks/tokens/useTokenInformation.ts

@@ -1,9 +1,9 @@
-import useSWRImmutable from "swr/immutable";
 import { isAddress, zeroAddress } from "viem";
 
 import { defaultChainId } from "@berachain/config/internal";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 
 import { getTokenInformation } from "../../actions/tokens/getTokenInformation";
 import { assertPublicClient } from "../../errors/assert";
@@ -57,7 +57,7 @@ export function useTokenInformation(
         chainId,
       });
     },
-    { ...options?.opts },
+    { ...options },
   );
 
   return {

package/src/hooks/tokens/useTokenPrice.ts

@@ -7,7 +7,7 @@ export function useTokenPrice(
   { token }: { token: TokenPriceInput | undefined },
   options?: DefaultHookOptions,
 ) {
-  const { isLoading, priceMap } = useTokenPrices(
+  const { isLoading, error, priceMap } = useTokenPrices(
     { tokens: token ? [token] : undefined },
     options,
   );
@@ -17,5 +17,6 @@ export function useTokenPrice(
       ? priceMap[token.chainId]?.[token.address.toLowerCase() as Address]
       : undefined,
     isLoading,
+    error,
   };
 }

package/src/hooks/tokens/useTokenPrices.ts

@@ -23,10 +23,8 @@ export function useTokenPrices(
     tokens?: TokenPriceInput[];
   } = {},
   options: DefaultHookOptions = {
-    opts: {
-      refreshInterval: POLLING.NORMAL,
-      revalidateOnFocus: true,
-    },
+    refreshInterval: POLLING.NORMAL,
+    revalidateOnFocus: true,
   },
 ) {
   const { ensoTokens } = useTokens();
@@ -126,6 +124,7 @@ export function useTokenPrices(
 
   return {
     isLoading: apiResponse.isLoading,
+    error: apiResponse.error,
     data,
     priceMap,
     getTokenPrice,

package/src/hooks/tokens/useTotalSupply.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import { type Address, erc20Abi } from "viem";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { assertPublicClient } from "../../errors/assert";
 

package/src/hooks/tokens/useUnderlyingAsset.ts

@@ -1,6 +1,5 @@
-import useSWRImmutable from "swr/immutable";
-
 import { useConfig } from "@berachain/wagmi/hooks";
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 
 import { getUnderlyingToken } from "../../actions/tokens/getUnderlyingToken";
 import type { MinimalERC20 } from "../../types/dex";

package/src/hooks/useBlockToTimestamp.ts

@@ -1,6 +1,5 @@
-import useSWRImmutable from "swr/immutable";
-
 import { useBlockNumber, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 
 import { getBlockTimestamp } from "../actions/misc/getBlockTimestamp";
 import { useBlockTime } from "../contexts/block-time-provider";

package/src/hooks/useGetVerifiedAbi.ts

@@ -1,8 +1,9 @@
-import useSWRImmutable from "swr/immutable";
 import { isAddress, zeroAddress } from "viem";
 
 import { chainId } from "@berachain/config/internal";
 
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
+
 import { beraFetchJson } from "../utils/beraFetch";
 
 interface SuccessResponse {

package/src/hooks/validators/useAllValidators.ts

@@ -1,10 +1,9 @@
-import useSWR from "swr";
-
 import type {
   GetValidatorsQuery,
   GetValidatorsQueryVariables,
   GqlChain,
 } from "@berachain/graphql/pol/api";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getAllValidators } from "../../actions/validators/getAllValidators";
 import { POLLING } from "../../enum/polling";
@@ -40,7 +39,7 @@ export const useAllValidators = (
     },
     {
       refreshInterval: POLLING.SLOW,
-      ...options?.opts,
+      ...options,
     },
   );
 

package/src/hooks/validators/useApiEnrichedAllocation.ts

@@ -1,4 +1,4 @@
-import useSWR from "swr";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getApiEnrichedAllocation } from "../../actions/validators/getApiEnrichedAllocation";
 import type { ValidatorRewardAllocation } from "../../actions/validators/getValidatorRewardAllocation";

package/src/hooks/validators/useApiValidator.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import { type Address, isHex } from "viem";
 
 import type { GetValidatorQuery } from "@berachain/graphql/pol/api";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getApiValidator } from "../../actions/validators/getApiValidator";
 import type {
@@ -20,17 +20,14 @@ export const useApiValidator = (
   options?: DefaultHookOptions,
 ): UsePollValidatorInfoResponse => {
   const QUERY_KEY = useApiValidatorQueryKey(id);
-  const isEnabled = options?.opts?.isEnabled ?? true;
   const swrResponse = useSWR(
-    isEnabled && id ? QUERY_KEY : null,
+    id ? QUERY_KEY : null,
     async ([, id]) => {
       if (!id || !isHex(id)) throw new Error(`Invalid validator ID: ${id}`);
 
       return getApiValidator({ id });
     },
-    {
-      ...options?.opts,
-    },
+    options,
   );
 
   return {

package/src/hooks/validators/useBaselineRewardAllocation.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getBaselineRewardAllocation } from "../../actions/validators/getBaselineRewardAllocation";
 import { assertPublicClient } from "../../errors/assert";

package/src/hooks/validators/useDailyValidatorBlockStats.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import type { GetValidatorBlockStatsQuery } from "@berachain/graphql/pol/subgraph";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getDailyValidatorBlockStats } from "../../actions/validators/getDailyValidatorBlockStats";
 import { POLLING } from "../../enum/polling";

package/src/hooks/validators/useDefaultRewardAllocation.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getDefaultRewardAllocation } from "../../actions/validators/getDefaultRewardAllocation";
 import type { ValidatorRewardAllocation } from "../../actions/validators/getValidatorRewardAllocation";
@@ -21,7 +20,7 @@ export function useDefaultRewardAllocation(options?: DefaultHookOptions) {
       });
     },
     {
-      ...options?.opts,
+      ...options,
     },
   );
 

package/src/hooks/validators/useManagedValidatorRole.ts

@@ -1,8 +1,8 @@
 import { useMemo } from "react";
-import useSWR from "swr";
 import type { Address, PublicClient } from "viem";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getValidatorOperatorAddress } from "../../actions/validators/getValidatorOperatorAddress";
 import { getValidatorRewardAllocatorAddress } from "../../actions/validators/getValidatorRewardAllocatorAddress";
@@ -93,7 +93,7 @@ export function useManagedValidatorRole(
       };
     },
     {
-      ...options?.opts,
+      ...options,
     },
   );
 

package/src/hooks/validators/useOnChainValidator.ts

@@ -1,4 +1,3 @@
-import useSWR from "swr";
 import { type Address, keccak256 } from "viem";
 
 import { beaconDepositAbi } from "@berachain/abis/pol/beaconDeposit";
@@ -7,6 +6,7 @@ import { beraChefAbi } from "@berachain/abis/pol/rewards/beraChef";
 
 import type { ApiValidatorFragment } from "@berachain/graphql/pol/api";
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { assertPublicClient } from "../../errors/assert";
 import type {
@@ -21,9 +21,8 @@ export const useOnChainValidator = (
 ): DefaultHookReturnType<Partial<ApiValidatorFragment>> => {
   const publicClient = usePublicClient();
   const QUERY_KEY = pubkey ? (["useOnChainValidator", pubkey] as const) : null;
-  const isEnabled = options.opts?.isEnabled ?? true;
   const swrResponse = useSWR(
-    isEnabled && publicClient ? QUERY_KEY : null,
+    publicClient ? QUERY_KEY : null,
     async ([, pubkey]) => {
       assertPublicClient(publicClient);
 
@@ -59,6 +58,7 @@ export const useOnChainValidator = (
         votingPower: Number(boostees),
       } as Partial<ApiValidatorFragment>;
     },
+    options,
   );
 
   return {

package/src/hooks/validators/useStakingPoolBatch.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getStakingPoolBatch } from "../../actions/validators/getStakingPoolBatch";
 import { POLLING } from "../../enum/polling";
@@ -19,9 +19,8 @@ export const useStakingPoolBatch = ({
   options?: DefaultHookOptions;
 }): DefaultHookReturnType<number | undefined> => {
   const publicClient = usePublicClient();
-  const isEnabled = options?.opts?.isEnabled ?? true;
   const QUERY_KEY =
-    isEnabled && publicClient && valPubKey
+    publicClient && valPubKey
       ? (["useStakingPoolBatch", valPubKey] as const)
       : null;
 
@@ -37,7 +36,7 @@ export const useStakingPoolBatch = ({
     },
     {
       refreshInterval: POLLING.FAST,
-      ...options?.opts,
+      ...options,
     },
   );
 

package/src/hooks/validators/useUserActiveValidators.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import {
   getUserActiveValidators,
@@ -35,7 +34,7 @@ export const useUserActiveValidators = (
     },
     {
       ...options,
-      refreshInterval: options?.opts?.refreshInterval ?? POLLING.SLOW,
+      refreshInterval: options?.refreshInterval ?? POLLING.SLOW,
       keepPreviousData: true,
     },
   );

package/src/hooks/validators/useUserBoostsOnValidator.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import {
   getUserBoostsOnValidator,

package/src/hooks/validators/useUserClaimableIncentives.ts

@@ -1,7 +1,7 @@
 import { useCallback, useMemo } from "react";
-import useSWR from "swr";
 
 import { useBeraWallet } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getRewardProofsByValidator } from "../../actions/pol/getRewardProofsByValidator";
 import { getUserClaimableIncentives } from "../../actions/pol/getUserClaimableIncentives";

package/src/hooks/validators/useUserStakingPositions.ts

@@ -1,6 +1,7 @@
-import useSWRImmutable from "swr/immutable";
 import type { Address } from "viem";
 
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
+
 import { getUserStakingPositions } from "../../actions/validators/getUserStakingPositions";
 
 /**

package/src/hooks/validators/useValidator.ts

@@ -40,12 +40,8 @@ export function useValidator(
                   "",
                 queuedBoostAmount:
                   indexerValidator?.dynamicData?.queuedBoostAmount ?? "",
-                usersActiveBoostCount:
-                  indexerValidator?.dynamicData?.usersActiveBoostCount ?? 0,
-                usersQueuedBoostCount:
-                  indexerValidator?.dynamicData?.usersQueuedBoostCount ?? 0,
-                allTimeDistributedBGTAmount:
-                  indexerValidator?.dynamicData?.allTimeDistributedBGTAmount ??
+                allTimeDistributedRewards:
+                  indexerValidator?.dynamicData?.allTimeDistributedRewards ??
                   "0",
                 rewardRate:
                   onChainValidator?.dynamicData?.rewardRate ??
@@ -53,8 +49,8 @@ export function useValidator(
                   "",
                 stakedBeraAmount:
                   indexerValidator?.dynamicData?.stakedBeraAmount ?? "",
-                lastDayDistributedBGTAmount:
-                  indexerValidator?.dynamicData?.lastDayDistributedBGTAmount ??
+                lastDayDistributedRewards:
+                  indexerValidator?.dynamicData?.lastDayDistributedRewards ??
                   "",
                 lastDayProposedBlockCount:
                   indexerValidator?.dynamicData?.lastDayProposedBlockCount ?? 0,

package/src/hooks/validators/useValidatorAnalytics.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import type { GetValidatorAnalyticsQuery } from "@berachain/graphql/pol/subgraph";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getValidatorAnalytics } from "../../actions/validators/getValidatorAnalytics";
 import { POLLING } from "../../enum/polling";

package/src/hooks/validators/useValidatorCommission.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address, PublicClient } from "viem";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import useSWR from "@berachain/utils/pkg/swr";
 
 import { getValidatorCommission } from "../../actions/validators/getValidatorCommission";
 import type {
@@ -28,7 +28,7 @@ export const useValidatorCommission = (
       });
     },
     {
-      ...options?.opts,
+      ...options,
     },
   );
 

package/src/hooks/validators/useValidatorIncentiveDistribution.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
-import type { GetValidatorIncentiveDistributionQuery } from "@berachain/graphql/pol/subgraph";
+import type { ValidatorIncentivesResponse } from "@berachain/graphql/beep";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getValidatorIncentiveDistribution } from "../../actions/validators/getValidatorIncentiveDistribution";
 import { POLLING } from "../../enum/polling";
@@ -19,7 +19,7 @@ export function useValidatorIncentiveDistribution({
 }: {
   pubkey: Address | undefined;
   dayRange: number;
-}): DefaultHookReturnType<GetValidatorIncentiveDistributionQuery> {
+}): DefaultHookReturnType<ValidatorIncentivesResponse> {
   const QUERY_KEY =
     pubkey && dayRange
       ? (["useValidatorIncentiveDistribution", pubkey, dayRange] as const)

package/src/hooks/validators/useValidatorQueuedCommission.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import {
   getValidatorQueuedCommission,
@@ -33,7 +33,7 @@ export function useValidatorQueuedCommission(
       });
     },
     {
-      ...options?.opts,
+      ...options,
     },
   );
 

package/src/hooks/validators/useValidatorQueuedOperatorAddress.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address, PublicClient } from "viem";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import {
   getValidatorQueuedOperatorAddress,
@@ -31,7 +31,7 @@ export const useValidatorQueuedOperatorAddress = (
       });
     },
     {
-      ...options?.opts,
+      ...options,
     },
   );
 

package/src/hooks/validators/useValidatorQueuedRewardAllocation.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address, PublicClient } from "viem";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getValidatorQueuedRewardAllocation } from "../../actions/validators/getValidatorQueuedRewardAllocation";
 import type { ValidatorRewardAllocation } from "../../actions/validators/getValidatorRewardAllocation";
@@ -29,7 +29,7 @@ export const useValidatorQueuedRewardAllocation = (
       });
     },
     {
-      ...options?.opts,
+      ...options,
     },
   );