@berachain/berajs 0.2.10 → 0.2.12

package/src/hooks/enso/useZapStakeBera.ts

@@ -1,11 +1,11 @@
 "use client";
 
-import useSWR from "swr";
 import { formatUnits, parseUnits } from "viem";
 
 import { chainConfigs, defaultChainId } from "@berachain/config/internal";
 
 import { useBeraWallet } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { ensoErc4626 } from "../../actions/dex/aggregators/enso/ensoErc4626";
 import { POLLING } from "../../enum/polling";
@@ -85,7 +85,7 @@ export function useZapStakeBera(
       });
     },
     {
-      ...options?.opts,
+      ...options,
       refreshInterval: POLLING.NORMAL,
     },
   );
@@ -106,8 +106,5 @@ export function useZapStakeBera(
       priceImpactPercentage,
       isCrossChain: inputToken && tokenOut.chainId !== inputToken?.chainId,
     },
-    refresh: () => {
-      swrResponse.mutate();
-    },
   };
 }

package/src/hooks/exports.ts

@@ -51,6 +51,7 @@ export * from "./perps/usePythUpdateFee";
 export { useAutoclaimedIncentives } from "./pol/useAutoclaimedIncentives";
 export { useAutoclaimedIncentivesTxHash } from "./pol/useAutoclaimedIncentivesTxHash";
 export * from "./pol/useBgtAprSimulation";
+export { useBgtIncentiveDistributorPaused } from "./pol/useBgtIncentiveDistributorPaused";
 export { useBgtUnstakedBalance } from "./pol/useBgtUnstakedBalance";
 export { useClaimableFees } from "./pol/useClaimableFees";
 export * from "./pol/useHighestVaultsAPR";

package/src/hooks/governance/useGetPastVotes.ts

@@ -1,9 +1,9 @@
-import useSWRImmutable from "swr/immutable";
 import { type Address, formatUnits } from "viem";
 
 import { bgtAbi } from "@berachain/abis/pol/bgt";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 
 import { assertPublicClient } from "../../errors/assert";
 import { parseBaseArgs } from "../../utils/parseBaseArgs";

package/src/hooks/governance/useHasVoted.ts

@@ -1,9 +1,9 @@
-import useSWR from "swr";
 import { type Address, isAddress } from "viem";
 
 import { berachainGovernanceAbi as governanceAbi } from "@berachain/abis/gov/berachainGovernance";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { assertPublicClient } from "../../errors/assert";
 import { parseBaseArgs } from "../../utils/parseBaseArgs";

package/src/hooks/governance/useIsCanceller.ts

@@ -1,9 +1,9 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import { timeLockAbi as governanceTimelockAbi } from "@berachain/abis/gov/timeLock";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { CANCELLER_ROLE } from "../../actions/governance/constants";
 import { POLLING } from "../../enum/polling";

package/src/hooks/governance/usePollAllProposals.ts

@@ -1,5 +1,4 @@
 import { useEffect, useMemo, useState } from "react";
-import useSWRInfinite, { type SWRInfiniteResponse } from "swr/infinite";
 
 import {
   type OrderDirection,
@@ -8,6 +7,8 @@ import {
   type ProposalSelectionFragment,
   ProposalStatus,
 } from "@berachain/graphql/governance";
+import type { SWRInfiniteResponse } from "@berachain/utils/pkg/swr/infinite";
+import useSWRInfinite from "@berachain/utils/pkg/swr/infinite";
 
 import { getAllProposals } from "../../actions/governance/getAllProposals";
 import { POLLING } from "../../enum/polling";
@@ -66,7 +67,7 @@ export function usePollAllProposalsQueryKey(
   args: Partial<UsePollAllProposalsArgs> = {},
 ): (
   pageIndex: number,
-  previousPageData?: ProposalSelectionFragment[],
+  previousPageData?: ProposalSelectionFragment[] | null,
 ) => PollAllProposalsKey {
   const subgraphPageSize = 2 * (args.perPage ?? DEFAULT_PER_PAGE);
 
@@ -141,16 +142,16 @@ export function usePollAllProposals(
     return (proposals ?? []).filter(Boolean) as ProposalSelectionFragment[];
   }
 
-  const swr = useSWRInfinite<ProposalSelectionFragment[], PollAllProposalsKey>(
-    getKey,
-    fetcher,
-    {
-      // Increase initialSize in order to prefetch more proposals at a time.
-      initialSize: 1,
-      refreshInterval: options?.opts?.refreshInterval ?? POLLING.SLOW,
-      ...options?.opts,
-    },
-  );
+  const swr = useSWRInfinite<
+    ProposalSelectionFragment[],
+    any,
+    PollAllProposalsKey
+  >(getKey, fetcher, {
+    // Increase initialSize in order to prefetch more proposals at a time.
+    initialSize: 1,
+    refreshInterval: options?.refreshInterval ?? POLLING.SLOW,
+    ...options,
+  });
 
   const data = useMemo(() => {
     if (!swr.data) return [];

package/src/hooks/governance/usePollProposal.ts

@@ -1,11 +1,11 @@
 import { useEffect, useState } from "react";
-import useSWR from "swr";
 
 import {
   ProposalStatus,
   type ProposalWithVotesFragment,
 } from "@berachain/graphql/governance";
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getProposalDetails } from "../../actions/governance/getProposalDetails";
 import { POLLING } from "../../enum/polling";
@@ -53,8 +53,8 @@ export const usePollProposal = (
       return getProposalDetails({ proposalId, client: publicClient });
     },
     {
-      ...options?.opts,
-      refreshInterval: options?.opts?.refreshInterval ?? POLLING.SLOW,
+      ...options,
+      refreshInterval: options?.refreshInterval ?? POLLING.SLOW,
     },
   );
 
@@ -75,25 +75,22 @@ export const usePollProposal = (
     switch (swrResponse.data.status) {
       case ProposalStatus.Pending:
         if (timestamp >= Number(swrResponse.data.voteStartAt)) {
-          swrResponse.mutate();
+          swrResponse.refresh();
         }
         break;
       case ProposalStatus.Active:
         if (timestamp >= Number(swrResponse.data.voteEndAt)) {
-          swrResponse.mutate();
+          swrResponse.refresh();
         }
         break;
       case ProposalStatus.InQueue:
         if (Date.now() / 1000 + 1 >= Number(swrResponse.data.queueEnd)) {
-          swrResponse.mutate();
+          swrResponse.refresh();
         }
         break;
     }
   }, [swrResponse.data?.status, timestamp]);
 
   // const votes = swrResponse.data?.votes.nodes ?? [];
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
+  return swrResponse;
 };

package/src/hooks/governance/usePollProposalThreshold.ts

@@ -1,9 +1,9 @@
-import useSWR from "swr";
 import { type Address, formatEther } from "viem";
 
 import { berachainGovernanceAbi as governanceAbi } from "@berachain/abis/gov/berachainGovernance";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { POLLING } from "../../enum/polling";
 import { assertPublicClient } from "../../errors/assert";
@@ -18,7 +18,7 @@ export const usePollProposalThreshold = (
     ? (["usePollProposalThreshold", governorAddress] as const)
     : null;
 
-  const swrResponse = useSWR<{ votesThreshold: string }, any, typeof QUERY_KEY>(
+  return useSWR<{ votesThreshold: string }, any, typeof QUERY_KEY>(
     QUERY_KEY,
     async ([, governorAddress]) => {
       assertPublicClient(publicClient);
@@ -34,9 +34,4 @@ export const usePollProposalThreshold = (
       refreshInterval: POLLING.SLOW,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: swrResponse.mutate,
-  };
 };

package/src/hooks/governance/usePollProposalVotes.ts

@@ -1,6 +1,6 @@
-import useSWRInfinite, { type SWRInfiniteKeyLoader } from "swr/infinite";
-
 import type { GetProposalVotesQueryVariables } from "@berachain/graphql/governance";
+import type { SWRInfiniteKeyLoader } from "@berachain/utils/pkg/swr/infinite";
+import { useSWRInfinite } from "@berachain/utils/pkg/swr/infinite";
 
 import { getProposalVotes } from "../../actions/governance/getProposalVotes";
 
@@ -12,6 +12,17 @@ type UsePollProposalVotesArgs = Omit<
 // const ACTUAL_PER_PAGE = 500;
 
 const DEFAULT_LIMIT = 1000;
+
+type ProposalVotesKey =
+  | [
+      string,
+      number,
+      number,
+      UsePollProposalVotesArgs["proposalId"],
+      UsePollProposalVotesArgs["orderBy"],
+      UsePollProposalVotesArgs["orderDirection"],
+    ]
+  | null;
 /**
  * Fetches all the votes for a proposal from the Subgraph
  * @param args - The arguments to pass to the query
@@ -21,9 +32,13 @@ export const usePollProposalVotes = (
   args: UsePollProposalVotesArgs,
   total: number,
 ) => {
-  return useSWRInfinite(
+  return useSWRInfinite<
+    Awaited<ReturnType<typeof getProposalVotes>>,
+    any,
+    ProposalVotesKey
+  >(
     usePollProposalVotesQueryKey(args, total),
-    async ([_key, page]: [string, number]) => {
+    async ([_key, page]) => {
       return getProposalVotes({
         variables: {
           ...args,
@@ -44,7 +59,10 @@ export const usePollProposalVotesQueryKey =
   (
     { ...args }: UsePollProposalVotesArgs,
     total: number,
-  ): SWRInfiniteKeyLoader =>
+  ): SWRInfiniteKeyLoader<
+    Awaited<ReturnType<typeof getProposalVotes>>,
+    ProposalVotesKey
+  > =>
   (
     pageIndex: number,
     // previousPageData: Awaited<ReturnType<typeof getProposalVotes>>,

package/src/hooks/governance/usePollUserDelegates.ts

@@ -1,9 +1,9 @@
-import useSWR from "swr";
 import { type Address, formatEther } from "viem";
 
 import { bgtAbi } from "@berachain/abis/pol/bgt";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { POLLING } from "../../enum/polling";
 import { assertPublicClient } from "../../errors/assert";
@@ -25,7 +25,7 @@ export const usePollUserDelegates = (
     ? (["usePollUserDelegates", account] as const)
     : null;
 
-  const swrResponse = useSWR<
+  return useSWR<
     { delegate: Address; currentVotes: string | undefined },
     any,
     typeof QUERY_KEY
@@ -62,13 +62,8 @@ export const usePollUserDelegates = (
       };
     },
     {
-      ...options?.opts,
-      refreshInterval: options?.opts?.refreshInterval ?? POLLING.SLOW,
+      ...options,
+      refreshInterval: options?.refreshInterval ?? POLLING.SLOW,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 };

package/src/hooks/governance/useProposalFromTx.ts

@@ -1,14 +1,15 @@
-import useSWR, { type SWRResponse } from "swr";
 import type { Address } from "viem";
 
 import type { ProposalWithVotesFragment } from "@berachain/graphql/governance";
 import { usePublicClient, useTransactionReceipt } from "@berachain/wagmi/hooks";
+import type { BeraSwrResponse } from "@berachain/utils/pkg/swr";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getProposalFromTx } from "../../actions/governance/getProposalFromTx";
 
 export const useProposalFromTx = (
   txHash?: Address,
-): SWRResponse<ProposalWithVotesFragment | null> => {
+): BeraSwrResponse<ProposalWithVotesFragment | null> => {
   const { data: tx } = useTransactionReceipt({
     hash: txHash,
   });
@@ -18,7 +19,7 @@ export const useProposalFromTx = (
   const QUERY_KEY =
     tx && publicClient ? (["useProposalFromTx", txHash] as const) : null;
 
-  const swrResponse = useSWR(QUERY_KEY, async ([, txHash]) => {
+  return useSWR(QUERY_KEY, async ([, txHash]) => {
     if (!tx) {
       throw new Error("Transaction not found");
     }
@@ -32,6 +33,4 @@ export const useProposalFromTx = (
 
     return getProposalFromTx({ tx, publicClient });
   });
-
-  return swrResponse;
 };

package/src/hooks/governance/useProposalSnapshot.ts

@@ -1,9 +1,8 @@
-import type { SWRResponse } from "swr";
-import useSWRImmutable from "swr/immutable";
-
 import { berachainGovernanceAbi as governanceAbi } from "@berachain/abis/gov/berachainGovernance";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import type { BeraSwrResponse } from "@berachain/utils/pkg/swr";
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 
 import { assertPublicClient } from "../../errors/assert";
 import { parseBaseArgs } from "../../utils/parseBaseArgs";
@@ -19,7 +18,7 @@ export const useProposalSnapshot = ({
   proposalId,
 }: {
   proposalId: number | bigint | string | undefined;
-}): SWRResponse<string> => {
+}): BeraSwrResponse<string> => {
   const publicClient = usePublicClient();
 
   const QUERY_KEY =

package/src/hooks/governance/useProposalState.ts

@@ -1,10 +1,10 @@
-import type { SWRResponse } from "swr";
-import useSWRImmutable from "swr/immutable";
 import type { Address } from "viem";
 
 import { berachainGovernanceAbi as governanceAbi } from "@berachain/abis/gov/berachainGovernance";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import type { BeraSwrResponse } from "@berachain/utils/pkg/swr";
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 
 import { ProposalState } from "../../enum/governance";
 import { assertPublicClient } from "../../errors/assert";
@@ -26,7 +26,7 @@ export const useProposalState = ({
 }: {
   proposalId: number | bigint | string | undefined;
   governorAddress: Address;
-}): SWRResponse<string> => {
+}): BeraSwrResponse<string> => {
   const publicClient = usePublicClient();
 
   const QUERY_KEY =

package/src/hooks/governance/useProposalTimelockState.ts

@@ -1,9 +1,10 @@
-import useSWR, { type SWRResponse } from "swr";
 import type { Address } from "viem";
 
 import { timeLockAbi as governanceTimelockAbi } from "@berachain/abis/gov/timeLock";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import type { BeraSwrResponse } from "@berachain/utils/pkg/swr";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { POLLING } from "../../enum/polling";
 import { assertPublicClient } from "../../errors/assert";
@@ -25,7 +26,7 @@ export function useProposalTimelockState({
 }: {
   proposalTimelockId: Address | undefined;
   timelockAddress: Address;
-}): SWRResponse<
+}): BeraSwrResponse<
   (typeof TimelockOperationState)[keyof typeof TimelockOperationState]
 > {
   const publicClient = usePublicClient();

package/src/hooks/governance/useQuorum.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getQuorum } from "../../actions/governance/getQuorum";
 

package/src/hooks/honey/useCappedGlobally.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getGlobalCapLimit } from "../../actions/honey/getGlobalCapLimit";
 import { useHoneyConfig } from "../../contexts/HoneyConfigProvider";
@@ -39,9 +38,7 @@ export const useCappedGlobally = (
           : undefined,
     },
     {
-      opts: {
-        isEnabled: flags.isPythWrapperEnabled && !!asset?.address,
-      },
+      isEnabled: flags.isPythWrapperEnabled && !!asset?.address,
     },
   );
   const QUERY_KEY =
@@ -59,7 +56,7 @@ export const useCappedGlobally = (
         ] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([
       _,
@@ -84,13 +81,8 @@ export const useCappedGlobally = (
       });
     },
     {
-      ...options?.opts,
+      ...options,
       refreshInterval: 0,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => void swrResponse.mutate(),
-  };
 };

package/src/hooks/honey/useCappedRelatively.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 { getRelativeCapLimit } from "../../actions/honey/getRelativeCapLimit";
 import { useHoneyConfig } from "../../contexts/HoneyConfigProvider";
@@ -41,7 +41,7 @@ export const useCappedRelatively = (
         ] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([_, asset, amount, collaterals, referenceCollateral]) => {
       if (isBasketModeEnabled) {
@@ -80,12 +80,7 @@ export const useCappedRelatively = (
     },
     {
       refreshInterval: 0,
-      ...options?.opts,
+      ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => void swrResponse.mutate(),
-  };
 };

package/src/hooks/honey/useCollateralWeights.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 { getCollateralWeights } from "../../actions/honey/getCollateralWeights";
 import { POLLING } from "../../enum/polling";
@@ -29,7 +29,7 @@ export const useCollateralWeights = (
       ? (["useCollateralWeights", collateralList] as const)
       : undefined;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([_, collateralList]) => {
       assertPublicClient(publicClient);
@@ -40,13 +40,8 @@ export const useCollateralWeights = (
       });
     },
     {
-      ...options?.opts,
-      refreshInterval: options?.opts?.refreshInterval ?? POLLING.NORMAL,
+      ...options,
+      refreshInterval: options?.refreshInterval ?? POLLING.NORMAL,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => void swrResponse.mutate(),
-  };
 };

package/src/hooks/honey/useHoney24hVolume.ts

@@ -1,4 +1,4 @@
-import useSWR from "swr";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getHoney24hVolume } from "../../actions/honey/getHoney24hVolume";
 import { POLLING } from "../../enum/polling";
@@ -8,9 +8,5 @@ export function useHoney24hVolume() {
     refreshInterval: POLLING.SLOW,
   });
 
-  return {
-    ...response,
-
-    refresh: () => response.mutate(),
-  };
+  return response;
 }

package/src/hooks/honey/useHoneyBalances.ts

@@ -1,4 +1,3 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import {
@@ -6,6 +5,7 @@ import {
   useConfig,
   usePublicClient,
 } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getWalletBalances } from "../../actions/tokens/getWalletBalances";
 import { useHoneyConfig } from "../../contexts/HoneyConfigProvider";
@@ -48,7 +48,7 @@ export const useHoneyBalances = (): DefaultHookReturnType<
       ? (["useHoneyBalances", account, collateralList] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([_, account, collateralList]) => {
       assertPublicClient(publicClient);
@@ -75,9 +75,4 @@ export const useHoneyBalances = (): DefaultHookReturnType<
       refreshInterval: POLLING.FAST,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 };

package/src/hooks/honey/useHoneyChartData.ts

@@ -1,17 +1,9 @@
-import useSWR from "swr";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getChartData } from "../../actions/honey/getChartData";
 
 export function useHoneyChartData({ days }: { days: number }) {
-  const swrResponse = useSWR(
-    ["useHoneyChartData", days] as const,
-    async ([_, days]) => {
-      return await getChartData({ days });
-    },
-  );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
+  return useSWR(["useHoneyChartData", days] as const, async ([_, days]) => {
+    return await getChartData({ days });
+  });
 }

package/src/hooks/honey/useHoneyVaultsBalance.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import {
   type GetHoneyVaultsBalanceResponse,
@@ -24,7 +23,7 @@ export const useHoneyVaultsBalance = (
       ? (["useHoneyVaultsBalance", collateralList] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([_, collateralList]) => {
       assertPublicClient(publicClient);
@@ -34,11 +33,6 @@ export const useHoneyVaultsBalance = (
         collateralList,
       });
     },
-    { ...options?.opts, refreshInterval: POLLING.NORMAL },
+    { ...options, refreshInterval: POLLING.NORMAL },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => void swrResponse.mutate(),
-  };
 };

package/src/hooks/honey/useIsBadCollateralAsset.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import {
   type IsBadCollateralResponse,
@@ -34,9 +33,7 @@ export const useIsBadCollateralAsset = (
         : undefined,
     },
     {
-      opts: {
-        isEnabled: flags.isPythWrapperEnabled && !!collateral?.address,
-      },
+      isEnabled: flags.isPythWrapperEnabled && !!collateral?.address,
     },
   );
   const QUERY_KEY =
@@ -52,7 +49,7 @@ export const useIsBadCollateralAsset = (
         ] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([_, collateral, latestPrices, isPythWrapperEnabled]) => {
       assertPublicClient(publicClient);
@@ -65,13 +62,8 @@ export const useIsBadCollateralAsset = (
       });
     },
     {
-      ...options?.opts,
-      refreshInterval: options?.opts?.refreshInterval ?? POLLING.NORMAL,
+      ...options,
+      refreshInterval: options?.refreshInterval ?? POLLING.NORMAL,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => void swrResponse.mutate(),
-  };
 };