@berachain/berajs 0.2.10 → 0.2.12

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";
@@ -36,7 +35,7 @@ export function usePollAllowances(
       ? (["usePollAllowances", account, args?.items] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, account, items]) => {
       return getAllowances({
@@ -46,14 +45,8 @@ export function usePollAllowances(
       });
     },
     {
-      ...options?.opts,
-      refreshInterval: options?.opts?.refreshInterval ?? POLLING.NORMAL,
+      ...options,
+      refreshInterval: options?.refreshInterval ?? POLLING.NORMAL,
     },
   );
-
-  return {
-    ...swrResponse,
-
-    refresh: () => swrResponse?.mutate?.(),
-  };
 }

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,
     },
   );
 
@@ -110,9 +110,6 @@ export function usePollBalance(
 
   return {
     ...rest,
-    refresh: () => {
-      rest.mutate();
-    },
     isLoading: isLoading || isNativeToken ? isLoadingTokenInformation : false,
     error: error || !isNativeToken ? error : undefined,
     data: tokenBalance,

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,14 +67,14 @@ export function usePollWalletBalances(
     },
     {
       refreshInterval: POLLING.NORMAL,
-      ...options?.opts,
+      ...options,
     },
   );
 
   return {
     ...swrResponse,
     refresh: () => {
-      swrResponse?.mutate?.();
+      swrResponse?.refresh();
       refresh();
     },
   };

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";
@@ -27,11 +27,7 @@ export const useStakingTokenInformation = (
     args?.address && publicClient && isAddress(args.address)
       ? (["useStakingTokenInformation", args.address] as const)
       : null;
-  const swrResponse = useSWRImmutable<
-    Partial<Token> | undefined,
-    any,
-    typeof QUERY_KEY
-  >(
+  return useSWRImmutable<Partial<Token> | undefined, any, typeof QUERY_KEY>(
     QUERY_KEY,
     async ([_, address]) => {
       if (isToken(address, "BERA")) {
@@ -48,11 +44,6 @@ export const useStakingTokenInformation = (
         publicClient,
       });
     },
-    { ...options?.opts },
+    { ...options },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 };

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";
@@ -33,7 +33,7 @@ export function useTokenInformation(
     args?.address && publicClient && isAddress(args.address)
       ? (["useTokenInformation", args.address, args.chainId] as const)
       : null;
-  const swrResponse = useSWRImmutable<Token | undefined, any, typeof QUERY_KEY>(
+  return useSWRImmutable<Token | undefined, any, typeof QUERY_KEY>(
     QUERY_KEY,
     async ([_, address, chainId = defaultChainId]) => {
       if (isToken(address, "BERA")) {
@@ -57,11 +57,6 @@ export function useTokenInformation(
         chainId,
       });
     },
-    { ...options?.opts },
+    { ...options },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 }

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";
@@ -27,7 +26,7 @@ export const useAllValidators = (
   options?: DefaultHookOptions,
 ): DefaultHookReturnType<GetValidatorsQuery | undefined> => {
   const { config } = parseBaseArgs(variables);
-  const swrResponse = useSWR<GetValidatorsQuery | undefined>(
+  return useSWR<GetValidatorsQuery | undefined>(
     useAllValidatorsQueryKey({ variables }),
     async ([, variables]) => {
       const result = await getAllValidators({
@@ -40,12 +39,7 @@ export const useAllValidators = (
     },
     {
       refreshInterval: POLLING.SLOW,
-      ...options?.opts,
+      ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 };

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,21 +20,13 @@ 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,
+  return useSWR(
+    id ? QUERY_KEY : null,
     async ([, id]) => {
       if (!id || !isHex(id)) throw new Error(`Invalid validator ID: ${id}`);
 
       return getApiValidator({ id });
     },
-    {
-      ...options?.opts,
-    },
+    options,
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 };

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";
@@ -18,7 +18,7 @@ export const useDailyValidatorBlockStats = ({
     ? (["useDailyValidatorBlockStats", pubKey, first] as const)
     : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, pubKey, first]) => {
       return await getDailyValidatorBlockStats({
@@ -30,6 +30,4 @@ export const useDailyValidatorBlockStats = ({
       refreshInterval: POLLING.SLOW,
     },
   );
-
-  return { ...swrResponse, refresh: () => swrResponse.mutate() };
 };

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";
@@ -11,7 +10,7 @@ export function useDefaultRewardAllocation(options?: DefaultHookOptions) {
   const publicClient = usePublicClient();
   const QUERY_KEY = publicClient ? ["useDefaultRewardAllocation"] : null;
 
-  const swrResponse = useSWR<ValidatorRewardAllocation | undefined>(
+  return useSWR<ValidatorRewardAllocation | undefined>(
     QUERY_KEY,
     async () => {
       assertPublicClient(publicClient);
@@ -21,12 +20,7 @@ export function useDefaultRewardAllocation(options?: DefaultHookOptions) {
       });
     },
     {
-      ...options?.opts,
+      ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 }

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,
     },
   );
 
@@ -117,6 +117,5 @@ export function useManagedValidatorRole(
           hasRewardAllocatorRole,
         }
       : undefined,
-    refresh: () => swrResponse.mutate(),
   };
 }

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,
+  return useSWR(
+    publicClient ? QUERY_KEY : null,
     async ([, pubkey]) => {
       assertPublicClient(publicClient);
 
@@ -59,12 +58,6 @@ export const useOnChainValidator = (
         votingPower: Number(boostees),
       } as Partial<ApiValidatorFragment>;
     },
+    options,
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => {
-      swrResponse.mutate();
-    },
-  };
 };

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,13 +19,12 @@ 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;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, valPubKey]) => {
       assertPublicClient(publicClient);
@@ -37,12 +36,7 @@ export const useStakingPoolBatch = ({
     },
     {
       refreshInterval: POLLING.FAST,
-      ...options?.opts,
+      ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 };

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,
@@ -25,7 +24,7 @@ export const useUserActiveValidators = (
       ? (["useUserActiveValidators", account] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, account]) => {
       return await getUserActiveValidators({
@@ -35,13 +34,8 @@ export const useUserActiveValidators = (
     },
     {
       ...options,
-      refreshInterval: options?.opts?.refreshInterval ?? POLLING.SLOW,
+      refreshInterval: options?.refreshInterval ?? POLLING.SLOW,
       keepPreviousData: true,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 };

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,
@@ -27,7 +27,7 @@ export const useUserBoostsOnValidator = ({
       ? (["useUserBoostsOnValidator", pubkey, account] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, pubkey, account]) => {
       return await getUserBoostsOnValidator({
@@ -40,6 +40,4 @@ export const useUserBoostsOnValidator = ({
       refreshInterval: POLLING.NORMAL,
     },
   );
-
-  return { ...swrResponse, refresh: () => swrResponse.mutate() };
 };

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";
@@ -136,8 +136,8 @@ export const useUserClaimableIncentives =
     );
 
     const refresh = useCallback(() => {
-      allRewardsResponse?.mutate();
-      swrResponse?.mutate();
+      allRewardsResponse?.refresh();
+      swrResponse?.refresh();
     }, [allRewardsResponse, swrResponse]);
 
     return {

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";
 
 /**
@@ -38,7 +39,7 @@ export const useUserStakingPositions = ({
   const queryClient = account
     ? (["useUserStakingPositions", account, validatorAddress] as const)
     : null;
-  const swrResponse = useSWRImmutable(
+  return useSWRImmutable(
     queryClient,
     async ([_, account, validatorAddress]) => {
       const userStakingPolls = await getUserStakingPositions(account);
@@ -52,11 +53,4 @@ export const useUserStakingPositions = ({
       return userStakingPolls;
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => {
-      swrResponse.mutate();
-    },
-  };
 };