@berachain/berajs 0.2.10 → 0.2.12

package/src/hooks/bend/useGetConvertToAssets.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import type { GetConvertToAssetsProps } from "../../actions/bend/getConvertToAssets";
 import { getConvertToAssets } from "../../actions/bend/getConvertToAssets";
@@ -16,7 +15,7 @@ export const useGetConvertToAssets = (
   options?: DefaultHookOptions,
 ) => {
   const publicClient = usePublicClient({ chainId: vaultChainId });
-  const swrResponse = useSWR(
+  return useSWR(
     publicClient && sharesAmount && vaultAddress
       ? ["useGetConvertToAssets", sharesAmount, vaultAddress, vaultChainId]
       : null,
@@ -30,14 +29,7 @@ export const useGetConvertToAssets = (
       });
     },
     {
-      ...options?.opts,
+      ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => {
-      swrResponse.mutate();
-    },
-  };
 };

package/src/hooks/dex/useAggregatorsQuotes.ts

@@ -118,7 +118,7 @@ export function useAggregatorsQuotes(
       ...args,
       aggregator: oogabooga,
     },
-    { opts: swrOptions },
+    swrOptions,
   );
 
   const flyResult = raw_useSingleAggregatorQuote(
@@ -127,7 +127,7 @@ export function useAggregatorsQuotes(
       ...args,
       aggregator: fly,
     },
-    { opts: swrOptions },
+    swrOptions,
   );
 
   const erc4626Result = raw_useSingleAggregatorQuote(
@@ -136,7 +136,7 @@ export function useAggregatorsQuotes(
       ...args,
       aggregator: erc4626Deposit,
     },
-    { opts: swrOptions },
+    swrOptions,
   );
 
   const kyberswapResult = raw_useSingleAggregatorQuote(
@@ -145,7 +145,7 @@ export function useAggregatorsQuotes(
       ...args,
       aggregator: kyberswap,
     },
-    { opts: swrOptions },
+    swrOptions,
   );
 
   const openOceanResult = raw_useSingleAggregatorQuote(
@@ -154,7 +154,7 @@ export function useAggregatorsQuotes(
       ...args,
       aggregator: openOcean,
     },
-    { opts: swrOptions },
+    swrOptions,
   );
 
   const haikuResult = raw_useSingleAggregatorQuote(
@@ -163,7 +163,7 @@ export function useAggregatorsQuotes(
       ...args,
       aggregator: haiku,
     },
-    { opts: swrOptions },
+    swrOptions,
   );
 
   const ensoResult = raw_useSingleAggregatorQuote(
@@ -172,7 +172,7 @@ export function useAggregatorsQuotes(
       ...args,
       aggregator: enso,
     },
-    { opts: swrOptions },
+    swrOptions,
   );
 
   const { protocol: bexProtocol } = useBexStatus();
@@ -183,7 +183,7 @@ export function useAggregatorsQuotes(
       ...args,
       aggregator: bex,
     },
-    { opts: { ...swrOptions, isEnabled: bexProtocol.isPaused === false } },
+    { ...swrOptions, isEnabled: bexProtocol.isPaused === false },
   );
 
   const wberaSwapResult = raw_useSingleAggregatorQuote({
@@ -198,7 +198,7 @@ export function useAggregatorsQuotes(
       ...args,
       aggregator: bgtRedeem,
     },
-    { opts: swrOptions },
+    swrOptions,
   );
 
   const honeyResult = raw_useSingleAggregatorQuote(
@@ -207,7 +207,7 @@ export function useAggregatorsQuotes(
       ...args,
       aggregator: honeyNative,
     },
-    { opts: swrOptions },
+    swrOptions,
   );
 
   const results = isWrapOrUnwrap
@@ -258,6 +258,8 @@ export function useAggregatorsQuotes(
 
   return {
     ...data,
-    refresh: () => results.map((r) => r.mutate()),
+    refresh: () => {
+      results.map((r) => r.refresh());
+    },
   };
 }

package/src/hooks/dex/useAggregatorsRouterFeeBps.ts

@@ -1,9 +1,9 @@
-import useSWRImmutable from "swr/immutable";
 import { type PublicClient, zeroAddress } from "viem";
 
 import aggregatorsRouterAbi from "@berachain/abis/meta-aggregator/metaAggregatorV2";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 
 import { parseBaseArgs } from "../../utils/parseBaseArgs";
 
@@ -12,7 +12,7 @@ export const useAggregatorsRouterFeeBps = () => {
   const { config } = parseBaseArgs({
     chainId: publicClient.chain?.id,
   });
-  const swrResponse = useSWRImmutable(
+  return useSWRImmutable(
     publicClient &&
       config.bex.aggregatorsRouter &&
       config.bex.aggregatorsRouter !== zeroAddress
@@ -27,9 +27,4 @@ export const useAggregatorsRouterFeeBps = () => {
       return Number(fee);
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: swrResponse.mutate,
-  };
 };

package/src/hooks/dex/useAllUserPools.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import type { GetPoolsQueryVariables } from "@berachain/graphql/dex/api";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getAllPools } from "../../actions/dex/getAllPools";
 import { POLLING } from "../../enum/polling";
@@ -18,21 +17,17 @@ export const useAllUserPools = (
   query: GetPoolsQueryVariables,
   options?: DefaultHookOptions,
 ) => {
-  const swrResponse = useSWR(
+  return useSWR(
     useAllUserPoolsQueryKey({ query }),
-    async ([_, params]: [string, GetPoolsQueryVariables]) => {
-      return getAllPools({ ...params, fetchPolicy: "no-cache" });
+    async ([_, params]) => {
+      return getAllPools({
+        ...(params as GetPoolsQueryVariables),
+        fetchPolicy: "no-cache",
+      });
     },
     {
       refreshInterval: POLLING.SLOW,
-      ...options?.opts,
+      ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => {
-      swrResponse.mutate();
-    },
-  };
 };

package/src/hooks/dex/useApiPool.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import { type Address, type Hex, isAddress } from "viem";
 
 import type { MinimalPoolFragment } from "@berachain/graphql/dex/api";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getApiPool } from "../../actions/dex/getApiPool";
 import { POLLING } from "../../enum/polling";
@@ -24,7 +24,7 @@ export function useApiPool({
   poolId: Hex;
   account?: Address;
 }) {
-  const res = useSWR(
+  return useSWR(
     useApiPoolQueryKey({ poolId, account }),
     async ([, poolId, account]): Promise<MinimalPoolFragment> => {
       if (account && !isAddress(account)) {
@@ -43,11 +43,4 @@ export function useApiPool({
       refreshInterval: POLLING.NORMAL,
     },
   );
-
-  return {
-    ...res,
-    refresh: () => {
-      res.mutate();
-    },
-  };
 }

package/src/hooks/dex/useGlobalLiquidityAndSwapVolume.ts

@@ -1,4 +1,4 @@
-import useSWR from "swr";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getGlobalLiquidityAndSwapVolume } from "../../actions/dex/getGlobalLiquidityAndSwapVolume";
 
@@ -17,6 +17,5 @@ export const useGlobalLiquidityAndSwapVolume = () => {
         response.data?.protocolMetricsAggregated.swapVolume24h,
       ),
     },
-    refresh: () => response.mutate(),
   };
 };

package/src/hooks/dex/useOnChainPoolData.ts

@@ -1,8 +1,8 @@
 import { useMemo } from "react";
-import useSWRImmutable from "swr/immutable";
 import { type Address, formatUnits, isAddress } from "viem";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 
 import { getOnChainPool } from "../../actions/dex/getOnChainPool";
 import type { TokenPriceInfo } from "../../types/dex";
@@ -65,7 +65,7 @@ export function useOnChainPoolData(poolId: string) {
     data: poolData,
     error,
     isLoading,
-    mutate,
+    refresh: mutate,
   } = useSWRImmutable(
     // FIXME: why are we using useSWRImmutable when we fetch tokenSupply and swapFee?
     publicClient ? QUERY_KEY : null,
@@ -145,7 +145,6 @@ export function useOnChainPoolData(poolId: string) {
     data: pool,
     error,
     isLoading: isLoading || isTokenInformationLoading || isTokenPricesLoading,
-    mutate,
-    refresh: () => mutate(),
+    refresh: mutate,
   };
 }

package/src/hooks/dex/usePollPoolCreationRelayerApproval.ts

@@ -1,9 +1,9 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import { vaultAbi as balancerVaultAbi } from "@berachain/abis/bex/vault";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { assertPublicClient } from "../../errors/assert";
 import type { DefaultHookOptions } from "../../types/global";
@@ -29,7 +29,7 @@ export const usePollPoolCreationRelayerApproval = (
         ] as const)
       : null;
 
-  const swrResponse = useSWR<boolean>(
+  return useSWR<boolean>(
     QUERY_KEY,
     async ([, account]) => {
       assertPublicClient(publicClient);
@@ -44,12 +44,6 @@ export const usePollPoolCreationRelayerApproval = (
 
       return approved;
     },
-    { ...options?.opts },
+    { ...options },
   );
-
-  const refreshPoolCreationApproval = () => {
-    swrResponse.mutate();
-  };
-
-  return { ...swrResponse, refreshPoolCreationApproval };
 };

package/src/hooks/dex/usePoolEvents.ts

@@ -1,6 +1,5 @@
-import useSWRImmutable from "swr/immutable";
-
 import type { GqlPoolEventType } from "@berachain/graphql/dex/api";
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 
 import { getPoolEvents } from "../../actions/dex/getPoolEvents";
 import { POLLING } from "../../enum/polling";

package/src/hooks/dex/usePoolHistoricalData.ts

@@ -1,9 +1,8 @@
-import useSWR from "swr";
-
 import type {
   GqlChain,
   PoolHistoricalDataFragment,
 } from "@berachain/graphql/dex/api";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getPoolHistoricalData } from "../../actions/dex/getPoolHistoricalData";
 import type {
@@ -25,7 +24,7 @@ export const usePoolHistoricalData = (
     ? (["usePoolHistoricalData", poolId] as const)
     : null;
 
-  const swrResponse = useSWR<
+  return useSWR<
     PoolHistoricalDataFragment[] | undefined,
     any,
     typeof QUERY_KEY
@@ -37,11 +36,6 @@ export const usePoolHistoricalData = (
         chain: config.bex.chainName as GqlChain,
       });
     },
-    options?.opts,
+    options,
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => void swrResponse.mutate(),
-  };
 };

package/src/hooks/dex/usePools.ts

@@ -1,8 +1,8 @@
 import { useMemo } from "react";
-import useSWR from "swr";
 
 import type { GetPoolsQueryVariables } from "@berachain/graphql/dex/api";
 import { useBeraWallet } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getAllPools } from "../../actions/dex/getAllPools";
 import { POLLING } from "../../enum/polling";
@@ -28,7 +28,7 @@ export const usePools = (
   const {
     data: userPools,
     isLoading: isUserPoolsLoading,
-    mutate: mutateUserPools,
+    refresh: mutateUserPools,
   } = useAllUserPools({
     userAddress: account,
     chain: query.chain,
@@ -37,7 +37,8 @@ export const usePools = (
   const {
     data: pools,
     isLoading: isPoolsLoading,
-    mutate: mutatePools,
+    refresh: mutatePools,
+    error: poolsError,
   } = useSWR(
     usePoolsQueryKey({ query }),
     async ([_, query]) => {
@@ -45,7 +46,7 @@ export const usePools = (
     },
     {
       refreshInterval: POLLING.SLOW,
-      ...options?.opts,
+      ...options,
     },
   );
 
@@ -74,6 +75,7 @@ export const usePools = (
     pools: mergedPools ?? [],
     walletPools: pools?.pools ?? [],
     isLoading: isPoolsLoading || isUserPoolsLoading,
+    error: poolsError,
     refresh: () => {
       mutatePools();
       mutateUserPools();

package/src/hooks/dex/useSingleAggregatorQuote.ts

@@ -1,7 +1,8 @@
-import useSWR, { type SWRConfiguration } from "swr";
 import { type Address, type PublicClient, parseUnits, zeroAddress } from "viem";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import type { SWRConfiguration } from "@berachain/utils/pkg/swr";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { BaseAggregator } from "../../actions/dex/aggregators/base";
 import { useBeraFlag } from "../../contexts/BeraFlags/BeraFlags";
@@ -67,7 +68,6 @@ function getQueryKey({
   account,
   args,
   feeBps,
-  options,
   activeAggregators,
   isMAEnabled,
 }: {
@@ -75,7 +75,6 @@ function getQueryKey({
   account: Address | undefined;
   args: IUseAggregatorsQuotesArgs;
   feeBps: number | undefined;
-  options?: DefaultHookOptions;
   /**
    * List of active aggregators fetched from edge config flags.
    *
@@ -84,10 +83,6 @@ function getQueryKey({
   activeAggregators: string[] | undefined;
   isMAEnabled: boolean;
 }): IQueryKey | null {
-  if (options?.opts?.isEnabled !== undefined && !options?.opts?.isEnabled) {
-    return null;
-  }
-
   if (!Number(args.amount)) {
     return null;
   }
@@ -243,7 +238,6 @@ export function raw_useSingleAggregatorQuote(
       account,
       args,
       feeBps,
-      options,
       activeAggregators,
       isMAEnabled,
     }),
@@ -252,7 +246,7 @@ export function raw_useSingleAggregatorQuote(
       proxyAggregatorsThroughVercel,
       publicClient,
     }),
-    options?.opts,
+    options,
   );
 }
 
@@ -266,16 +260,10 @@ export function getAggregatorsSWROptions(
   return {
     refreshInterval: POLLING.FAST, // every 10s
     errorRetryCount: 3,
-    ...options?.opts,
+    ...options,
     // biome-ignore lint/nursery/useMaxParams: the function is defined in the SWRConfiguration type
     onErrorRetry(err, key, config, revalidate, revalidateOpts) {
-      options?.opts?.onErrorRetry?.(
-        err,
-        key,
-        config,
-        revalidate,
-        revalidateOpts,
-      );
+      options?.onErrorRetry?.(err, key, config, revalidate, revalidateOpts);
       if (err instanceof BeraError) {
         if (err.reason === BaseAggregator.PATH_NOT_FOUND_REASON) {
           return;
@@ -345,6 +333,6 @@ export function useSingleAggregatorQuote(
       publicClient,
       proxyAggregatorsThroughVercel,
     },
-    { ...options, opts: getAggregatorsSWROptions(options) },
+    getAggregatorsSWROptions(options),
   );
 }

package/src/hooks/enso/useBendDemultiply.ts

@@ -1,6 +1,5 @@
 "use client";
 
-import useSWR from "swr";
 import type { Address, Hex } from "viem";
 import { parseUnits } from "viem";
 
@@ -11,6 +10,7 @@ import {
   useBeraWallet,
   usePublicClient,
 } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getEnsoClient } from "../../actions/clients/getEnsoClient";
 import { getBendDemultiplyBundle } from "../../actions/enso/getBendDemultiplyBundle";
@@ -83,8 +83,7 @@ export function useBendDemultiply(
     currentCollateral &&
     currentDebt &&
     Number(currentDebt) > 0 &&
-    fromAddress &&
-    (options?.opts?.isEnabled ?? true)
+    fromAddress
       ? ([
           "useBendDemultiply",
           fromAddress,
@@ -159,7 +158,7 @@ export function useBendDemultiply(
       });
     },
     {
-      ...options?.opts,
+      ...options,
       refreshInterval: POLLING.NORMAL,
     },
   );

package/src/hooks/enso/useBendMultiply.ts

@@ -1,6 +1,5 @@
 "use client";
 
-import useSWR from "swr";
 import type { Address, Hex } from "viem";
 import { parseUnits } from "viem";
 
@@ -11,6 +10,7 @@ import {
   useBeraWallet,
   usePublicClient,
 } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getEnsoClient } from "../../actions/clients/getEnsoClient";
 import { getBendMultiplyBundle } from "../../actions/enso/getBendMultiplyBundle";
@@ -85,8 +85,7 @@ export function useBendMultiply(
       (leverageMultiplier > 1 &&
         (Number(formattedCurrentCollateralAmount ?? 0) > 0 ||
           Number(formattedSupplyCollateralAmount ?? 0) > 0))) &&
-    fromAddress &&
-    (options?.opts?.isEnabled ?? true)
+    fromAddress
       ? ([
           "useBendMultiply",
           fromAddress,
@@ -164,7 +163,7 @@ export function useBendMultiply(
       });
     },
     {
-      ...options?.opts,
+      ...options,
       refreshInterval: POLLING.NORMAL,
     },
   );

package/src/hooks/enso/useBendZapSupply.ts

@@ -1,11 +1,11 @@
 "use client";
 
-import useSWR from "swr";
 import { type Address, formatEther, parseUnits, zeroAddress } from "viem";
 
 import { defaultChainId as berachainChainId } from "@berachain/config/internal";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { ensoErc4626 } from "../../actions/dex/aggregators/enso/ensoErc4626";
 import { useBeraFlag } from "../../contexts/BeraFlags/BeraFlags";
@@ -115,7 +115,7 @@ export function useBendZapSupply(
         address: zeroAddress,
         chainId: isCrossChain ? tokenIn?.chainId : undefined,
       },
-      { opts: { isEnabled: !!isCrossChain } },
+      { isEnabled: !!isCrossChain },
     );
 
   // for cross-chain zaps, check if transaction value exceeds native token balance
@@ -151,7 +151,7 @@ export function useBendZapSupply(
     isCrossChain,
     nativeFee,
     refresh: () => {
-      swrResponse.mutate();
+      swrResponse.refresh();
     },
   };
 }
@@ -173,7 +173,6 @@ export function useBendZapSupplyHelper(
   );
 
   const isEnabled =
-    (options?.opts?.isEnabled ?? true) &&
     !!tokenIn &&
     !!loanToken &&
     !!bendVault &&
@@ -228,7 +227,7 @@ export function useBendZapSupplyHelper(
       });
     },
     {
-      ...options?.opts,
+      ...options,
       refreshInterval: POLLING.NORMAL,
     },
   );

package/src/hooks/enso/useEnsoSwapBundle.ts

@@ -1,12 +1,12 @@
 "use client";
 
 import { getPublicClient } from "@wagmi/core";
-import useSWR from "swr";
 import { parseUnits } from "viem";
 
 import { defaultChainId as berachainChainId } from "@berachain/config/internal";
 
 import { useBeraWallet, useConfig } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getEnsoClient } from "../../actions/clients/getEnsoClient";
 import { getEnsoSwapBundle } from "../../actions/enso/getEnsoSwapBundle";
@@ -114,7 +114,7 @@ export function useEnsoSwapBundle({
   return {
     ...swrResponse,
     refresh: () => {
-      swrResponse.mutate();
+      swrResponse.refresh();
       refreshBalances();
     },
   };

package/src/hooks/enso/useEnsoUserTokensWithBalances.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import { useBeraWallet, useConfig } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getEnsoClient } from "../../actions/clients/getEnsoClient";
 import { getEnsoUserTokensWithBalances } from "../../actions/enso/getEnsoUserTokensWithBalances";
@@ -18,7 +17,7 @@ export function useEnsoUserTokensWithBalances(
   const proxyAggregatorsThroughVercel = useBeraFlag(
     "proxyAggregatorsThroughVercel",
   );
-  const isEnabled = !!fromAddress && (options?.opts?.isEnabled ?? true);
+  const isEnabled = !!fromAddress;
 
   const QUERY_KEY =
     isEnabled && wagmiConfig
@@ -30,7 +29,7 @@ export function useEnsoUserTokensWithBalances(
         ] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, fromAddress, chainId]): Promise<BalanceToken[]> =>
       getEnsoUserTokensWithBalances({
@@ -43,12 +42,7 @@ export function useEnsoUserTokensWithBalances(
       }),
     {
       refreshInterval: POLLING.NORMAL,
-      isEnabled,
-      ...options?.opts,
+      ...options,
     },
   );
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 }

package/src/hooks/enso/useEnsoWalletV2Address.ts

@@ -1,10 +1,10 @@
 "use client";
 
-import useSWR from "swr";
 import type { Address } from "viem";
 import { getAddress } from "viem";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getEnsoWalletV2Address } from "../../actions/enso/flashloan";
 import { POLLING } from "../../enum/polling";

package/src/hooks/enso/useIsBendAuthorized.ts

@@ -1,9 +1,9 @@
 "use client";
 
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getIsBendAuthorized } from "../../actions/enso/flashloan";
 import { POLLING } from "../../enum/polling";