@berachain/berajs 0.2.11 → 0.2.12

package/src/hooks/honey/useHoneyVaultsBalance.ts

@@ -23,7 +23,7 @@ export const useHoneyVaultsBalance = (
       ? (["useHoneyVaultsBalance", collateralList] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([_, collateralList]) => {
       assertPublicClient(publicClient);
@@ -35,9 +35,4 @@ export const useHoneyVaultsBalance = (
     },
     { ...options, refreshInterval: POLLING.NORMAL },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => void swrResponse.mutate(),
-  };
 };

package/src/hooks/honey/useIsBadCollateralAsset.ts

@@ -49,7 +49,7 @@ export const useIsBadCollateralAsset = (
         ] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([_, collateral, latestPrices, isPythWrapperEnabled]) => {
       assertPublicClient(publicClient);
@@ -66,9 +66,4 @@ export const useIsBadCollateralAsset = (
       refreshInterval: options?.refreshInterval ?? POLLING.NORMAL,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => void swrResponse.mutate(),
-  };
 };

package/src/hooks/honey/useIsBasketModeEnabled.ts

@@ -42,7 +42,7 @@ export function useIsBasketModeEnabled(
         ] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([_, isMint, latestPrices, isPythWrapperEnabled, collateralList]) => {
       assertPublicClient(publicClient);
@@ -62,9 +62,4 @@ export function useIsBasketModeEnabled(
       refreshInterval: options?.refreshInterval ?? POLLING.FAST,
     },
   );
-  return {
-    ...swrResponse,
-    data: swrResponse.data,
-    refresh: () => void swrResponse.mutate(),
-  };
 }

package/src/hooks/honey/usePythLatestPrices.ts

@@ -1,4 +1,4 @@
-import type { SWRResponse } from "@berachain/utils/pkg/swr";
+import type { BeraSwrResponse } from "@berachain/utils/pkg/swr";
 import { useSWR } from "@berachain/utils/pkg/swr";
 
 import type { PythLatestUpdates } from "../../actions/honey/getPythLatestPrices";
@@ -10,7 +10,7 @@ import type { PythPriceFeedMap } from "../../types/honeySwap";
  * Hook to fetch the latest Pyth price updates for specified pair addresses
  * @param {Object} params - The parameters object
  * @param {Address[] | undefined} params.pairMainAddress - Array of pair addresses to fetch price updates for
- * @returns {SWRResponse<PythLatestUpdates>} SWR response containing the latest Pyth price updates
+ * @returns {BeraSwrResponse<PythLatestUpdates>} SWR response containing the latest Pyth price updates
  * @example
  * ```ts
  * const { data, error } = usePythLatestPrices({
@@ -25,14 +25,14 @@ export function usePythLatestPrices(
     priceFeedMap: PythPriceFeedMap | undefined;
   },
   options?: DefaultHookOptions,
-): SWRResponse<PythLatestUpdates> {
+): BeraSwrResponse<PythLatestUpdates> {
   const priceFeedIds = priceFeedMap ? Object.values(priceFeedMap) : null;
 
   const QUERY_KEY = priceFeedIds
     ? (["usePythLatestPrices", priceFeedIds] as const)
     : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([_, priceFeeds]) => {
       const data = await getPythLatestPrices({ priceFeedId: priceFeeds });
@@ -40,6 +40,4 @@ export function usePythLatestPrices(
     },
     options,
   );
-
-  return swrResponse;
 }

package/src/hooks/pol/useAutoclaimedIncentives.ts

@@ -22,7 +22,7 @@ export function useAutoclaimedIncentives({
       ? (["useAutoclaimedIncentives", account] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, account]) => getAutoclaimedIncentives({ account }),
     {
@@ -31,9 +31,4 @@ export function useAutoclaimedIncentives({
       revalidateIfStale: false,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 }

package/src/hooks/pol/useAutoclaimedIncentivesTxHash.ts

@@ -22,7 +22,7 @@ export function useAutoclaimedIncentivesTxHash({
       ? (["useAutoclaimedIncentivesTxHash", account] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, account]) => getAutoclaimedIncentivesTxHash({ account }),
     {
@@ -36,9 +36,4 @@ export function useAutoclaimedIncentivesTxHash({
       revalidateIfStale: false,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 }

package/src/hooks/pol/useBgtIncentiveDistributorPaused.ts

@@ -21,7 +21,7 @@ export function useBgtIncentiveDistributorPaused(
     ? (["useBgtIncentiveDistributorPaused", publicClient.chain?.id] as const)
     : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async () =>
       getBgtIncentiveDistributorPaused({ publicClient }).catch(() => false),
@@ -31,9 +31,4 @@ export function useBgtIncentiveDistributorPaused(
       ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 }

package/src/hooks/pol/useBgtUnstakedBalance.ts

@@ -24,7 +24,7 @@ export const useBgtUnstakedBalance = (
       ? (["useBgtUnstakedBalance", account] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, account]) => {
       assertPublicClient(publicClient);
@@ -46,9 +46,4 @@ export const useBgtUnstakedBalance = (
       refreshInterval: options?.refreshInterval ?? POLLING.NORMAL,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 };

package/src/hooks/pol/useClaimableFees.ts

@@ -13,7 +13,7 @@ export const useClaimableFees = () => {
   const publicClient = usePublicClient();
   const QUERY_KEY =
     account && publicClient ? (["useClaimableFees", account] as const) : null;
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, account]) => {
       assertPublicClient(publicClient);
@@ -31,8 +31,4 @@ export const useClaimableFees = () => {
       refreshInterval: POLLING.SLOW * 2,
     },
   );
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 };

package/src/hooks/pol/useHighestVaultsAPR.ts

@@ -14,8 +14,7 @@ import { useRewardVaults } from "./useRewardVaults";
  *
  * @returns {Object} An object containing:
  *   - highestApr: The highest APR value from the reward vaults
- *   - refresh: Function to manually refresh the data
- *   - ...swrResponse: All properties from the underlying SWR response
+ *   - isLoading: Loading state
  *
  * @example
  * const { highestApr } = useHighestVaultsAPR({
@@ -28,7 +27,6 @@ export const useHighestVaultsAPR = (
 ): {
   highestApr: GqlRewardVaultDynamicData["apr"] | undefined;
   isLoading: boolean;
-  refresh: () => void;
 } => {
   const swrResponse = useRewardVaults(
     {
@@ -49,7 +47,6 @@ export const useHighestVaultsAPR = (
 
   return {
     isLoading: swrResponse.isLoading,
-    highestApr: swrResponse.data?.gaugeList[0].dynamicData?.apr,
-    refresh: swrResponse.mutate,
+    highestApr: swrResponse.data?.rewardVaultList[0].dynamicData?.apr,
   };
 };

package/src/hooks/pol/usePollGlobalData.ts

@@ -16,7 +16,7 @@ export const usePollGlobalData = (
 ): DefaultHookReturnType<GlobalData> => {
   const publicClient = usePublicClient();
 
-  const swrResponse = useSWR<GlobalData>(
+  return useSWR<GlobalData>(
     publicClient ? "usePollGlobalData" : null,
     async () => {
       assertPublicClient(publicClient);
@@ -28,9 +28,4 @@ export const usePollGlobalData = (
       ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: swrResponse.mutate,
-  };
 };

package/src/hooks/pol/usePollMarkets.ts

@@ -17,7 +17,7 @@ export const usePollMarkets = (
   options?: DefaultHookOptions,
 ): UsePollMarketsResponse => {
   const QUERY_KEY = usePollMarketsQueryKey();
-  const swrResponse = useSWRImmutable<GetMarkets, any, typeof QUERY_KEY>(
+  return useSWRImmutable<GetMarkets, any, typeof QUERY_KEY>(
     QUERY_KEY,
     async () => {
       const res = await getMarkets();
@@ -27,9 +27,4 @@ export const usePollMarkets = (
       ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 };

package/src/hooks/pol/useQueuedBeraUnlock.ts

@@ -39,11 +39,7 @@ export function useQueuedBeraUnlock(
         ] as const)
       : null;
 
-  const swrResponse = useSWRImmutable<
-    StakedBeraWithdrawal[],
-    any,
-    typeof QUERY_KEY
-  >(
+  return useSWRImmutable<StakedBeraWithdrawal[], any, typeof QUERY_KEY>(
     QUERY_KEY,
     async ([, receiptTokenAddresses, account, version]) => {
       assertPublicClient(publicClient);
@@ -64,9 +60,4 @@ export function useQueuedBeraUnlock(
       ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 }

package/src/hooks/pol/useRewardVault.ts

@@ -48,8 +48,8 @@ export const useRewardVault = (
     isLoading: onChainRewardVault.isLoading || swrResponse.isLoading,
     isValidating: onChainRewardVault.isValidating ?? swrResponse.isValidating,
     refresh: () => {
-      swrResponse.mutate();
-      onChainRewardVault.mutate();
+      swrResponse.refresh();
+      onChainRewardVault.refresh();
     },
   };
 };

package/src/hooks/pol/useRewardVaultBalanceFromStakingToken.ts

@@ -27,7 +27,7 @@ export const useRewardVaultBalanceFromStakingToken = (
   const {
     data: rewardVaultAddress = _rewardVaultAddress,
     error,
-    mutate: mutateRewardVaultAddress,
+    refresh: mutateRewardVaultAddress,
     isLoading: isLoadingRewardVaultAddress,
   } = useRewardVaultFromToken(
     {
@@ -76,7 +76,7 @@ export const useRewardVaultBalanceFromStakingToken = (
     ...swrResponse,
     refresh: () => {
       mutateRewardVaultAddress();
-      swrResponse.mutate();
+      swrResponse.refresh();
     },
     isLoading: swrResponse.isLoading || isLoadingRewardVaultAddress,
   };

package/src/hooks/pol/useRewardVaultFromToken.ts

@@ -27,33 +27,27 @@ export const useRewardVaultFromToken = (
       ? ["useRewardVaultFromToken", tokenAddress]
       : null;
 
-  const swrResponse = useSWRImmutable<
-    Address | undefined,
-    any,
-    typeof QUERY_KEY
-  >(QUERY_KEY, async ([, tokenAddress]) => {
-    if (!tokenAddress) {
-      throw new Error("useRewardVaultFromToken needs a valid token address");
-    }
-
-    assertPublicClient(publicClient);
-
-    const { config } = parseBaseArgs({
-      chainId: publicClient.chain.id,
-    });
-
-    const res = await publicClient.readContract({
-      address: config.pol.factory,
-      abi: rewardVaultFactoryAbi,
-      functionName: "getVault",
-      args: [tokenAddress],
-    });
-
-    return res === zeroAddress ? undefined : res;
-  });
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
+  return useSWRImmutable<Address | undefined, any, typeof QUERY_KEY>(
+    QUERY_KEY,
+    async ([, tokenAddress]) => {
+      if (!tokenAddress) {
+        throw new Error("useRewardVaultFromToken needs a valid token address");
+      }
+
+      assertPublicClient(publicClient);
+
+      const { config } = parseBaseArgs({
+        chainId: publicClient.chain.id,
+      });
+
+      const res = await publicClient.readContract({
+        address: config.pol.factory,
+        abi: rewardVaultFactoryAbi,
+        functionName: "getVault",
+        args: [tokenAddress],
+      });
+
+      return res === zeroAddress ? undefined : res;
+    },
+  );
 };

package/src/hooks/pol/useRewardVaultIncentives.ts

@@ -20,7 +20,7 @@ export function useRewardVaultIncentives({
       ? (["useRewardVaultIncentives", address, stakingToken] as const)
       : null;
 
-  const swrResponse = useSWR(QUERY_KEY, async ([, address, stakingToken]) => {
+  return useSWR(QUERY_KEY, async ([, address, stakingToken]) => {
     assertPublicClient(publicClient);
 
     return await getRewardVaultIncentives({
@@ -29,9 +29,4 @@ export function useRewardVaultIncentives({
       publicClient,
     });
   });
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 }

package/src/hooks/pol/useRewardVaultRewards.ts

@@ -18,7 +18,7 @@ export const useRewardVaultRewards = (
       ? (["useRewardVaultRewards", address] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, address]) => {
       assertPublicClient(publicClient);
@@ -29,9 +29,4 @@ export const useRewardVaultRewards = (
       ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 };

package/src/hooks/pol/useRewardVaults.ts

@@ -24,7 +24,7 @@ export const useRewardVaults = (
     args.onChainIncentives,
   );
   const publicClient = usePublicClient();
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, filter, onChainIncentives]) => {
       return await getRewardVaults({
@@ -34,9 +34,4 @@ export const useRewardVaults = (
     },
     options,
   );
-
-  return {
-    ...swrResponse,
-    refresh: swrResponse.mutate,
-  };
 };

package/src/hooks/pol/useStakedAPR.ts

@@ -15,7 +15,7 @@ export function useStakedAPR({
   range: GqlVaultSnapshotDataRange;
 }): DefaultHookReturnType<UseStakedAPR> {
   const QUERY_KEY = range ? (["useStakedAPR", range] as const) : null;
-  const swrResponse = useSWR(QUERY_KEY, async ([, range]) => {
+  return useSWR(QUERY_KEY, async ([, range]) => {
     const unsortedStakedBeraSnapshots = await getStakedBeraSnapshots({
       range,
     });
@@ -29,9 +29,4 @@ export function useStakedAPR({
       apr: item.apr,
     }));
   });
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 }

package/src/hooks/pol/useStakedSnapshots.ts

@@ -1,13 +1,13 @@
 import type { Address } from "viem";
 
-import type { VaultStatsByDayResponse } from "@berachain/graphql/api";
+import type { StakeStatsByDayResponse } from "@berachain/graphql/beep";
 import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getStakingDailyAssets } from "../../actions/pol/getStakingDailyAssets";
 import type { DefaultHookReturnType } from "../../types/global";
 import { dailyResolution } from "../../utils/filter";
 
-type UseStakedBeraSnapshot = Record<Address, VaultStatsByDayResponse>;
+type UseStakedBeraSnapshot = Record<Address, StakeStatsByDayResponse>;
 export function useStakedSnapshots({
   range,
   addresses,
@@ -18,7 +18,7 @@ export function useStakedSnapshots({
   const QUERY_KEY = range
     ? (["useStakedSnapshots", range, addresses] as const)
     : null;
-  const swrResponse = useSWR(QUERY_KEY, async ([, range, addresses]) => {
+  return useSWR(QUERY_KEY, async ([, range, addresses]) => {
     const [...sortedStakingDailyAssetsArray] = await Promise.all([
       ...addresses.map(async (address) => {
         const unstakingDailyAssets = await getStakingDailyAssets({
@@ -40,9 +40,4 @@ export function useStakedSnapshots({
       {} as UseStakedBeraSnapshot,
     );
   });
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 }

package/src/hooks/pol/useTotalStakedAmount.ts

@@ -13,7 +13,7 @@ export function useTotalStakedAmount({
 }): DefaultHookReturnType<Record<Address, bigint>> {
   const publicClient = usePublicClient();
 
-  const swrResponse = useSWR(
+  return useSWR(
     vaultAddresses && publicClient
       ? ["useTotalStakedAmount", vaultAddresses]
       : null,
@@ -21,9 +21,4 @@ export function useTotalStakedAmount({
       return getTotalStakedAmount({ vaultAddresses, publicClient });
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 }

package/src/hooks/pol/useUserVaultInfo.ts

@@ -25,7 +25,7 @@ export const useUserVaultInfo = (
       ? (["useUserVaultInfo", account, args.vaultAddress] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, account, vaultAddress]) => {
       assertPublicClient(publicClient);
@@ -41,9 +41,4 @@ export const useUserVaultInfo = (
       refreshInterval: options?.refreshInterval ?? POLLING.NORMAL,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 };

package/src/hooks/pol/useUserVaults.ts

@@ -19,7 +19,7 @@ export const useUserVaults = (
   const publicClient = usePublicClient();
   const QUERY_KEY =
     account && publicClient ? (["useUserVaults", account] as const) : null;
-  const swrResponse = useSWR<GetUserVaultsResponse, unknown, typeof QUERY_KEY>(
+  return useSWR<GetUserVaultsResponse, unknown, typeof QUERY_KEY>(
     QUERY_KEY,
     async ([, account]) => {
       assertPublicClient(publicClient);
@@ -35,8 +35,4 @@ export const useUserVaults = (
       keepPreviousData: true,
     },
   );
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 };

package/src/hooks/pol/useVaultHistory.ts

@@ -17,12 +17,7 @@ export const useVaultHistory = ({
   const QUERY_KEY = vault
     ? (["useVaultHistory", vault, range, resolution] as const)
     : null;
-  const swrResponse = useSWR(QUERY_KEY, ([, vault, range, resolution]) =>
+  return useSWR(QUERY_KEY, ([, vault, range, resolution]) =>
     getVaultHistory({ vault, range, resolution }),
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 };

package/src/hooks/pol/useVaultValidators.ts

@@ -17,7 +17,7 @@ export const useVaultValidators = (
   options?: DefaultHookOptions,
 ): UsePollValidatorInfoResponse => {
   const QUERY_KEY = id ? (["useVaultValidators", id] as const) : null;
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, address]) => {
       return await getVaultValidators({
@@ -28,9 +28,4 @@ export const useVaultValidators = (
       ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 };

package/src/hooks/tokens/useMultipleTokenInformation.ts

@@ -36,7 +36,7 @@ export function useMultipleTokenInformation(
         ] as const)
       : null;
 
-  const swrResponse = useSWRImmutable<Token[], unknown, typeof QUERY_KEY>(
+  return useSWRImmutable<Token[], unknown, typeof QUERY_KEY>(
     QUERY_KEY,
     async ([, addresses, chainId]) => {
       // We already checked for publicClient in the QUERY_KEY
@@ -66,9 +66,4 @@ export function useMultipleTokenInformation(
     },
     { ...options },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 }

package/src/hooks/tokens/usePollAllowances.ts

@@ -35,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({
@@ -49,10 +49,4 @@ export function usePollAllowances(
       refreshInterval: options?.refreshInterval ?? POLLING.NORMAL,
     },
   );
-
-  return {
-    ...swrResponse,
-
-    refresh: () => swrResponse?.mutate?.(),
-  };
 }

package/src/hooks/tokens/usePollBalance.ts

@@ -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

@@ -74,7 +74,7 @@ export function usePollWalletBalances(
   return {
     ...swrResponse,
     refresh: () => {
-      swrResponse?.mutate?.();
+      swrResponse?.refresh();
       refresh();
     },
   };

package/src/hooks/tokens/useStakingTokenInformation.ts

@@ -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")) {
@@ -50,9 +46,4 @@ export const useStakingTokenInformation = (
     },
     { ...options },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 };