@berachain/berajs 0.2.11 → 0.2.13

package/src/hooks/honey/useIsBadCollateralAsset.ts

@@ -18,10 +18,10 @@ import { usePythLatestPrices } from "./usePythLatestPrices";
 export interface UseIsBadCollateralResponse
   extends DefaultHookReturnType<IsBadCollateralResponse | undefined> {}
 
-export const useIsBadCollateralAsset = (
+export function useIsBadCollateralAsset(
   { collateral }: { collateral: Token | undefined },
   options?: DefaultHookOptions,
-): UseIsBadCollateralResponse => {
+): UseIsBadCollateralResponse {
   const publicClient = usePublicClient();
   const { priceFeedMap, flags } = useHoneyConfig();
   const { data: latestPrices } = usePythLatestPrices(
@@ -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/perps/usePythUpdateFee.ts

@@ -8,7 +8,7 @@ import { assertPublicClient } from "../../errors/assert";
 import type { DefaultHookOptions } from "../../types/global";
 import { getPythDefaultUpdateFee } from "../../utils/pythHoneyUtils";
 
-export const usePythUpdateFee = (
+export function usePythUpdateFee(
   {
     pythPriceFeedCalldata,
     tokenListLength,
@@ -17,7 +17,7 @@ export const usePythUpdateFee = (
     tokenListLength: number;
   },
   options?: DefaultHookOptions,
-) => {
+) {
   const publicClient = usePublicClient();
   const QUERY_KEY =
     pythPriceFeedCalldata && pythPriceFeedCalldata.length > 0
@@ -42,4 +42,4 @@ export const usePythUpdateFee = (
     data,
     isLoading,
   };
-};
+}

package/src/hooks/pol/useAutoclaimedIncentives.ts

@@ -2,7 +2,7 @@ import { useBeraWallet } from "@berachain/wagmi/hooks";
 import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getAutoclaimedIncentives } from "../../actions/pol/getAutoclaimedIncentives";
-import type { AutoclaimedIncentivesResponse } from "../../types/bribe-boost";
+import type { AutoclaimedIncentivesResponse } from "../../types/bribeBoost";
 import type { DefaultHookReturnType } from "../../types/global";
 
 interface UseAutoclaimedIncentivesArgs {
@@ -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

@@ -3,7 +3,7 @@ import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getAutoclaimedIncentivesTxHash } from "../../actions/pol/getAutoclaimedIncentivesTxHash";
 import { POLLING } from "../../enum/polling";
-import type { AutoclaimedIncentivesTxHashResponse } from "../../types/bribe-boost";
+import type { AutoclaimedIncentivesTxHashResponse } from "../../types/bribeBoost";
 import type { DefaultHookReturnType } from "../../types/global";
 
 interface UseAutoclaimedIncentivesTxHashArgs {
@@ -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

@@ -14,9 +14,9 @@ import type {
 import { parseBaseArgs } from "../../utils/parseBaseArgs";
 
 // TODO: REFACTOR ON REDEPLOY
-export const useBgtUnstakedBalance = (
+export function useBgtUnstakedBalance(
   options?: DefaultHookOptions,
-): DefaultHookReturnType<string | undefined> => {
+): DefaultHookReturnType<string | undefined> {
   const { address: account } = useBeraWallet();
   const publicClient = usePublicClient();
   const QUERY_KEY =
@@ -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

@@ -3,24 +3,24 @@ import { formatUnits } from "viem";
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
 import { useSWR } from "@berachain/utils/pkg/swr";
 
-import { getUserVaultsReward } from "../../actions/pol/getUserVaultsReward";
+import { getRewardVaultEarnedRewards } from "../../actions/pol/getRewardVaultEarnedRewards";
 import { POLLING } from "../../enum/polling";
 import { assertPublicClient } from "../../errors/assert";
 import { parseBaseArgs } from "../../utils/parseBaseArgs";
 
-export const useClaimableFees = () => {
+export function useClaimableFees() {
   const { address: account } = useBeraWallet();
   const publicClient = usePublicClient();
   const QUERY_KEY =
     account && publicClient ? (["useClaimableFees", account] as const) : null;
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, account]) => {
       assertPublicClient(publicClient);
       const { config } = parseBaseArgs({
         chainId: publicClient.chain.id,
       });
-      const vaultReward = await getUserVaultsReward({
+      const vaultReward = await getRewardVaultEarnedRewards({
         account,
         vaultAddress: config.pol.staker,
         publicClient,
@@ -31,8 +31,4 @@ export const useClaimableFees = () => {
       refreshInterval: POLLING.SLOW * 2,
     },
   );
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
-};
+}

package/src/hooks/pol/useHighestVaultsAPR.ts

@@ -14,22 +14,20 @@ 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({
  *   filteringVaults: ['0x123...', '0x456...']
  * });
  */
-export const useHighestVaultsAPR = (
+export function useHighestVaultsAPR(
   where: GqlRewardVaultFilter = {},
   { isEnabled = true }: { isEnabled?: boolean } = {},
 ): {
   highestApr: GqlRewardVaultDynamicData["apr"] | undefined;
   isLoading: boolean;
-  refresh: () => void;
-} => {
+} {
   const swrResponse = useRewardVaults(
     {
       filter: {
@@ -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/useOnChainRewardVault.ts

@@ -14,19 +14,20 @@ import { assertPublicClient } from "../../errors/assert";
 import type { DefaultHookOptions } from "../../types/global";
 import { parseBaseArgs } from "../../utils/parseBaseArgs";
 
-const useOnChainRewardVaultQueryKey = (address: Address | undefined) =>
-  address && isAddress(address)
+function useOnChainRewardVaultQueryKey(address: Address | undefined) {
+  return address && isAddress(address)
     ? (["onChainRewardVault", address.toLowerCase() as Address] as const)
     : null;
+}
 
-export const useOnChainRewardVault = (
+export function useOnChainRewardVault(
   {
     address,
   }: {
     address: Address | undefined;
   },
   opt: DefaultHookOptions,
-) => {
+) {
   const publicClient = usePublicClient();
 
   const QUERY_KEY = useOnChainRewardVaultQueryKey(address);
@@ -118,4 +119,4 @@ export const useOnChainRewardVault = (
     },
     opt,
   );
-};
+}

package/src/hooks/pol/usePollGlobalData.ts

@@ -11,12 +11,12 @@ import type {
   DefaultHookReturnType,
 } from "../../types/global";
 
-export const usePollGlobalData = (
+export function usePollGlobalData(
   options?: DefaultHookOptions,
-): DefaultHookReturnType<GlobalData> => {
+): 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

@@ -9,15 +9,15 @@ import type {
 export interface UsePollMarketsResponse
   extends DefaultHookReturnType<GetMarkets> {}
 
-export const usePollMarketsQueryKey = () => {
+export function usePollMarketsQueryKey() {
   return "usePollMarkets";
-};
+}
 
-export const usePollMarkets = (
+export function usePollMarkets(
   options?: DefaultHookOptions,
-): UsePollMarketsResponse => {
+): 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/useRewardTokenToBeraRate.ts

@@ -1,4 +1,4 @@
-import { type Address, isAddress } from "viem";
+import type { Address } from "viem";
 
 import { defaultChainId } from "@berachain/config/internal";
 
@@ -6,18 +6,17 @@ import { usePublicClient } from "@berachain/wagmi/hooks";
 import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getRewardTokenToBeraRate } from "../../actions/pol/getRewardTokenToBeraRate";
-import { assertPublicClient } from "../../errors/assert";
-import { InvalidArgumentError } from "../../errors/InvalidArgumentError";
+import { assertAddress, assertPublicClient } from "../../errors/assert";
 import type { DefaultHookOptions } from "../../types/global";
 
-export const useRewardTokenToBeraRate = (
+export function useRewardTokenToBeraRate(
   {
     address,
   }: {
     address: Address | undefined;
   },
   opt?: DefaultHookOptions,
-) => {
+) {
   const QUERY_KEY = address
     ? (["useRewardTokenToBeraRate", address] as const)
     : null;
@@ -26,14 +25,7 @@ export const useRewardTokenToBeraRate = (
   return useSWR(
     QUERY_KEY,
     async ([_, address]) => {
-      if (!address || !isAddress(address)) {
-        throw new InvalidArgumentError({
-          property: "address",
-          value: address,
-          expected: "Address",
-        });
-      }
-
+      assertAddress(address, "address");
       assertPublicClient(publicClient);
 
       return getRewardTokenToBeraRate({
@@ -45,4 +37,4 @@ export const useRewardTokenToBeraRate = (
       ...opt,
     },
   );
-};
+}

package/src/hooks/pol/useRewardVault.ts

@@ -13,15 +13,16 @@ import { useOnChainRewardVault } from "./useOnChainRewardVault";
 export interface UseRewardVaultResponse
   extends DefaultHookReturnType<ApiVaultFragment> {}
 
-export const useRewardVaultQueryKey = (address: Address | undefined) =>
-  address
+export function useRewardVaultQueryKey(address: Address | undefined) {
+  return address
     ? (["useRewardVault", address.toLowerCase() as Address] as const)
     : null;
+}
 
-export const useRewardVault = (
+export function useRewardVault(
   id: Address | undefined,
   options?: DefaultHookOptions,
-): UseRewardVaultResponse => {
+): UseRewardVaultResponse {
   const QUERY_KEY = useRewardVaultQueryKey(id);
 
   // The off-chain fetch is intentionally always enabled; `isEnabled` only gates
@@ -48,8 +49,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

@@ -10,7 +10,7 @@ import type { DefaultHookOptions } from "../../types/global";
 import { useRewardVaultFromToken } from "./useRewardVaultFromToken";
 
 // NOTE: this is entirely on-chain
-export const useRewardVaultBalanceFromStakingToken = (
+export function useRewardVaultBalanceFromStakingToken(
   {
     stakingToken,
     rewardVaultAddress: _rewardVaultAddress,
@@ -19,7 +19,7 @@ export const useRewardVaultBalanceFromStakingToken = (
     rewardVaultAddress?: Address;
   },
   options?: DefaultHookOptions,
-) => {
+) {
   const { address: account } = useBeraWallet();
   const publicClient = usePublicClient();
 
@@ -27,7 +27,7 @@ export const useRewardVaultBalanceFromStakingToken = (
   const {
     data: rewardVaultAddress = _rewardVaultAddress,
     error,
-    mutate: mutateRewardVaultAddress,
+    refresh: mutateRewardVaultAddress,
     isLoading: isLoadingRewardVaultAddress,
   } = useRewardVaultFromToken(
     {
@@ -76,8 +76,8 @@ export const useRewardVaultBalanceFromStakingToken = (
     ...swrResponse,
     refresh: () => {
       mutateRewardVaultAddress();
-      swrResponse.mutate();
+      swrResponse.refresh();
     },
     isLoading: swrResponse.isLoading || isLoadingRewardVaultAddress,
   };
-};
+}

package/src/hooks/pol/useRewardVaultFromToken.ts

@@ -8,7 +8,7 @@ import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 import { assertPublicClient } from "../../errors/assert";
 import { parseBaseArgs } from "../../utils/parseBaseArgs";
 
-export const useRewardVaultFromToken = (
+export function useRewardVaultFromToken(
   {
     tokenAddress,
   }: {
@@ -19,7 +19,7 @@ export const useRewardVaultFromToken = (
   }: {
     isEnabled?: boolean;
   } = {},
-) => {
+) {
   const publicClient = usePublicClient();
 
   const QUERY_KEY: readonly [string, Address] | null =
@@ -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

@@ -7,10 +7,10 @@ import { getRewardVaultRewards } from "../../actions/pol/getRewardVaultRewards";
 import { assertPublicClient } from "../../errors/assert";
 import type { DefaultHookOptions } from "../../types/global";
 
-export const useRewardVaultRewards = (
+export function useRewardVaultRewards(
   address: Address,
   options?: DefaultHookOptions,
-) => {
+) {
   const publicClient = usePublicClient();
 
   const QUERY_KEY =
@@ -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?.(),
-  };
-};
+}