@berachain/berajs 0.2.11 → 0.2.13

package/src/hooks/validators/useUserActiveValidators.ts

@@ -14,9 +14,9 @@ import type {
 interface UseUserActiveValidatorsResponse
   extends DefaultHookReturnType<ValidatorWithUserBoost[] | undefined> {}
 
-export const useUserActiveValidators = (
+export function useUserActiveValidators(
   options?: DefaultHookOptions,
-): UseUserActiveValidatorsResponse => {
+): UseUserActiveValidatorsResponse {
   const { address: account } = useBeraWallet();
   const publicClient = usePublicClient();
   const QUERY_KEY =
@@ -24,7 +24,7 @@ export const useUserActiveValidators = (
       ? (["useUserActiveValidators", account] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, account]) => {
       return await getUserActiveValidators({
@@ -38,9 +38,4 @@ export const useUserActiveValidators = (
       keepPreviousData: true,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
-};
+}

package/src/hooks/validators/useUserBoostsOnValidator.ts

@@ -10,13 +10,13 @@ import {
 import { POLLING } from "../../enum/polling";
 import type { DefaultHookReturnType } from "../../types/global";
 
-export const useUserBoostsOnValidator = ({
+export function useUserBoostsOnValidator({
   pubkey,
   ...args
 }: {
   pubkey: Address | undefined;
   account?: Address;
-}): DefaultHookReturnType<UserBoostsOnValidator> => {
+}): DefaultHookReturnType<UserBoostsOnValidator> {
   const { address: connectedAccount } = useBeraWallet();
 
   const publicClient = usePublicClient();
@@ -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

@@ -9,7 +9,7 @@ import { POLLING } from "../../enum/polling";
 import { BeraError } from "../../errors/BeraError";
 import { BeraMonitoring } from "../../errors/BeraMonitoring";
 import { InvalidArgumentError } from "../../errors/InvalidArgumentError";
-import type { BribeBoostRewardProof } from "../../types/bribe-boost";
+import type { BribeBoostRewardProof } from "../../types/bribeBoost";
 import type { DefaultHookReturnType } from "../../types/global";
 import { formatIncentivesTokenMap } from "../../utils/formatIncentivesTokenMap";
 
@@ -18,132 +18,131 @@ interface UseUserClaimableIncentivesReturnType
   tokenMap?: Set<string> | undefined;
 }
 
-export const useUserClaimableIncentives =
-  (): UseUserClaimableIncentivesReturnType => {
-    const { address: account } = useBeraWallet();
+export function useUserClaimableIncentives(): UseUserClaimableIncentivesReturnType {
+  const { address: account } = useBeraWallet();
 
-    const REWARDS_QUERY_KEY = account
-      ? (["useUserClaimableIncentives", account] as const)
-      : null;
+  const REWARDS_QUERY_KEY = account
+    ? (["useUserClaimableIncentives", account] as const)
+    : null;
 
-    const allRewardsResponse = useSWR(
-      REWARDS_QUERY_KEY,
-      async ([, account]) => {
-        if (!account) {
-          throw new BeraError({
-            message: "useUserClaimableIncentives needs a logged in account",
-            level: "error",
-          });
-        }
+  const allRewardsResponse = useSWR(
+    REWARDS_QUERY_KEY,
+    async ([, account]) => {
+      if (!account) {
+        throw new BeraError({
+          message: "useUserClaimableIncentives needs a logged in account",
+          level: "error",
+        });
+      }
+
+      // Get all reward tokens and all claimable validator associated with the account
+      return await getUserClaimableIncentives({
+        account,
+      });
+    },
+    {
+      revalidateOnFocus: false,
+      revalidateOnReconnect: false,
+      revalidateIfStale: false,
+      refreshInterval: POLLING.SLOW,
+    },
+  );
+
+  const allRewards = allRewardsResponse?.data;
+  const tokenMap = useMemo(() => {
+    // Return empty set if no incentives data or still loading
+    if (!allRewards) {
+      return undefined;
+    }
+
+    // If the data is not an array, capture an error
+    if (!Array.isArray(allRewards)) {
+      BeraMonitoring.captureException(
+        new BeraError({
+          message: "Incorrect aggregated incentives data receieved.",
+          level: "error",
+          extra: {
+            allRewards,
+            account: account,
+          },
+        }),
+      );
+      return undefined;
+    }
+
+    return formatIncentivesTokenMap(allRewards);
+  }, [allRewards, account]);
+
+  const QUERY_KEY =
+    account && allRewards
+      ? (["useUserClaimableIncentives", account, allRewards] as const)
+      : null;
 
-        // Get all reward tokens and all claimable validator associated with the account
-        return await getUserClaimableIncentives({
-          account,
+  const swrResponse = useSWR(
+    QUERY_KEY,
+    async ([, account, allRewards]) => {
+      if (!account) {
+        throw new InvalidArgumentError({
+          property: "account",
+          value: account,
+          expected: "Address",
         });
-      },
-      {
-        revalidateOnFocus: false,
-        revalidateOnReconnect: false,
-        revalidateIfStale: false,
-        refreshInterval: POLLING.SLOW,
-      },
-    );
-
-    const allRewards = allRewardsResponse?.data;
-    const tokenMap = useMemo(() => {
+      }
+
       // Return empty set if no incentives data or still loading
       if (!allRewards) {
-        return undefined;
+        return [];
       }
 
-      // If the data is not an array, capture an error
       if (!Array.isArray(allRewards)) {
-        BeraMonitoring.captureException(
-          new BeraError({
-            message: "Incorrect aggregated incentives data receieved.",
-            level: "error",
-            extra: {
-              allRewards,
-              account: account,
-            },
-          }),
-        );
-        return undefined;
+        // If the data is unexpected, throw an error
+        throw new InvalidArgumentError({
+          message:
+            "Incorrect aggregated incentives data receieved to calculate proofs.",
+          property: "allRewards",
+          value: allRewards,
+          expected: "Array",
+          level: "error",
+        });
       }
 
-      return formatIncentivesTokenMap(allRewards);
-    }, [allRewards, account]);
-
-    const QUERY_KEY =
-      account && allRewards
-        ? (["useUserClaimableIncentives", account, allRewards] as const)
-        : null;
-
-    const swrResponse = useSWR(
-      QUERY_KEY,
-      async ([, account, allRewards]) => {
-        if (!account) {
-          throw new InvalidArgumentError({
-            property: "account",
-            value: account,
-            expected: "Address",
+      const validatorsSet = new Set(allRewards.map((item) => item.validator));
+      const validatorAddresses = Array.from(validatorsSet);
+
+      // Get total count of rewards for each validator in increments of MAX_PROOFS_SIZE_PER_INCENTIVE_CLAIM
+      return await Promise.all(
+        validatorAddresses.map(async (validator) => {
+          const proofsData = await getRewardProofsByValidator({
+            account: account,
+            validator: validator as `0x${string}`,
+            page: 1,
+            perPage: 10_000,
           });
-        }
-
-        // Return empty set if no incentives data or still loading
-        if (!allRewards) {
-          return [];
-        }
-
-        if (!Array.isArray(allRewards)) {
-          // If the data is unexpected, throw an error
-          throw new InvalidArgumentError({
-            message:
-              "Incorrect aggregated incentives data receieved to calculate proofs.",
-            property: "allRewards",
-            value: allRewards,
-            expected: "Array",
-            level: "error",
-          });
-        }
-
-        const validatorsSet = new Set(allRewards.map((item) => item.validator));
-        const validatorAddresses = Array.from(validatorsSet);
-
-        // Get total count of rewards for each validator in increments of MAX_PROOFS_SIZE_PER_INCENTIVE_CLAIM
-        return await Promise.all(
-          validatorAddresses.map(async (validator) => {
-            const proofsData = await getRewardProofsByValidator({
-              account: account,
-              validator: validator as `0x${string}`,
-              page: 1,
-              perPage: 10_000,
-            });
-
-            return {
-              ...proofsData,
-              validator: validator,
-            };
-          }),
-        );
-      },
-      {
-        revalidateOnFocus: false,
-        revalidateOnReconnect: false,
-        revalidateIfStale: false,
-        refreshInterval: POLLING.SLOW,
-      },
-    );
-
-    const refresh = useCallback(() => {
-      allRewardsResponse?.mutate();
-      swrResponse?.mutate();
-    }, [allRewardsResponse, swrResponse]);
-
-    return {
-      ...swrResponse,
-      isLoading: allRewardsResponse?.isLoading || swrResponse?.isLoading,
-      tokenMap,
-      refresh,
-    };
+
+          return {
+            ...proofsData,
+            validator: validator,
+          };
+        }),
+      );
+    },
+    {
+      revalidateOnFocus: false,
+      revalidateOnReconnect: false,
+      revalidateIfStale: false,
+      refreshInterval: POLLING.SLOW,
+    },
+  );
+
+  const refresh = useCallback(() => {
+    allRewardsResponse?.refresh();
+    swrResponse?.refresh();
+  }, [allRewardsResponse, swrResponse]);
+
+  return {
+    ...swrResponse,
+    isLoading: allRewardsResponse?.isLoading || swrResponse?.isLoading,
+    tokenMap,
+    refresh,
   };
+}

package/src/hooks/validators/useUserStakingPositions.ts

@@ -29,17 +29,17 @@ import { getUserStakingPositions } from "../../actions/validators/getUserStaking
  * });
  * ```
  */
-export const useUserStakingPositions = ({
+export function useUserStakingPositions({
   account,
   validatorAddress,
 }: {
   account: Address | undefined;
   validatorAddress?: Address;
-}) => {
+}) {
   const queryClient = account
     ? (["useUserStakingPositions", account, validatorAddress] as const)
     : null;
-  const swrResponse = useSWRImmutable(
+  return useSWRImmutable(
     queryClient,
     async ([_, account, validatorAddress]) => {
       const userStakingPolls = await getUserStakingPositions(account);
@@ -53,11 +53,4 @@ export const useUserStakingPositions = ({
       return userStakingPolls;
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => {
-      swrResponse.mutate();
-    },
-  };
-};
+}

package/src/hooks/validators/useValidatorAnalytics.ts

@@ -7,6 +7,9 @@ import { getValidatorAnalytics } from "../../actions/validators/getValidatorAnal
 import { POLLING } from "../../enum/polling";
 import type { DefaultHookReturnType } from "../../types/global";
 
+/**
+ * @deprecated will be removed in pol vNext
+ */
 export function useValidatorAnalytics({
   pubkey,
   dayRange,
@@ -19,7 +22,7 @@ export function useValidatorAnalytics({
       ? (["useValidatorAnalytics", pubkey, dayRange] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, pubkey, dayRange]) => {
       return await getValidatorAnalytics({
@@ -31,6 +34,4 @@ export function useValidatorAnalytics({
       refreshInterval: POLLING.SLOW,
     },
   );
-
-  return { ...swrResponse, refresh: () => swrResponse.mutate() };
 }

package/src/hooks/validators/useValidatorCommission.ts

@@ -9,17 +9,17 @@ import type {
   DefaultHookReturnType,
 } from "../../types/global";
 
-export const useValidatorCommission = (
+export function useValidatorCommission(
   pubKey: Address,
   options?: DefaultHookOptions,
-): DefaultHookReturnType<number | undefined | null> => {
+): DefaultHookReturnType<number | undefined | null> {
   const publicClient = usePublicClient();
   const QUERY_KEY =
     publicClient && pubKey
       ? (["useValidatorCommission", pubKey] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, pubKey]) => {
       return await getValidatorCommission({
@@ -31,9 +31,4 @@ export const useValidatorCommission = (
       ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
-};
+}

package/src/hooks/validators/useValidatorEstimatedBgtPerYear.ts

@@ -1,12 +1,12 @@
 import type { ApiValidatorMinimalFragment } from "@berachain/graphql/pol/api";
 
 import { getValidatorEstimatedBgtPerYear } from "../../actions/validators/getValidatorEstimatedBgtPerYear";
-import { useBlockTime } from "../../contexts/block-time-provider";
+import { useBlockTime } from "../../contexts/BlockTimeProvider";
 import { usePollGlobalData } from "../pol/usePollGlobalData";
 
-export const useValidatorEstimatedBgtPerYear = (
+export function useValidatorEstimatedBgtPerYear(
   validator: ApiValidatorMinimalFragment,
-): { data: number | undefined; isLoading: boolean } => {
+): { data: number | undefined; isLoading: boolean } {
   const { data: globalData, isLoading } = usePollGlobalData();
 
   const blockTime = useBlockTime();
@@ -21,4 +21,4 @@ export const useValidatorEstimatedBgtPerYear = (
       : undefined,
     isLoading,
   };
-};
+}

package/src/hooks/validators/useValidatorIncentiveDistribution.ts

@@ -25,7 +25,7 @@ export function useValidatorIncentiveDistribution({
       ? (["useValidatorIncentiveDistribution", pubkey, dayRange] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, pubkey, dayRange]) => {
       return await getValidatorIncentiveDistribution({ pubkey, dayRange });
@@ -34,6 +34,4 @@ export function useValidatorIncentiveDistribution({
       refreshInterval: POLLING.SLOW,
     },
   );
-
-  return { ...swrResponse, refresh: () => swrResponse.mutate() };
 }

package/src/hooks/validators/useValidatorQueuedCommission.ts

@@ -23,7 +23,7 @@ export function useValidatorQueuedCommission(
       ? (["useValidatorQueuedCommission", pubKey] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, pubKey]) => {
       assertPublicClient(publicClient);
@@ -36,9 +36,4 @@ export function useValidatorQueuedCommission(
       ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 }

package/src/hooks/validators/useValidatorQueuedOperatorAddress.ts

@@ -12,17 +12,17 @@ import type {
   DefaultHookReturnType,
 } from "../../types/global";
 
-export const useValidatorQueuedOperatorAddress = (
+export function useValidatorQueuedOperatorAddress(
   pubKey: Address,
   options?: DefaultHookOptions,
-): DefaultHookReturnType<ValidatorQueuedOperatorAddress | undefined> => {
+): DefaultHookReturnType<ValidatorQueuedOperatorAddress | undefined> {
   const publicClient = usePublicClient();
   const QUERY_KEY =
     publicClient && pubKey
       ? (["useValidatorQueuedOperatorAddress", pubKey] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, pubKey]) => {
       return await getValidatorQueuedOperatorAddress({
@@ -34,9 +34,4 @@ export const useValidatorQueuedOperatorAddress = (
       ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
-};
+}

package/src/hooks/validators/useValidatorQueuedRewardAllocation.ts

@@ -10,17 +10,17 @@ import type {
   DefaultHookReturnType,
 } from "../../types/global";
 
-export const useValidatorQueuedRewardAllocation = (
+export function useValidatorQueuedRewardAllocation(
   pubKey: Address,
   options?: DefaultHookOptions,
-): DefaultHookReturnType<ValidatorRewardAllocation | undefined> => {
+): DefaultHookReturnType<ValidatorRewardAllocation | undefined> {
   const publicClient = usePublicClient();
   const QUERY_KEY =
     publicClient && pubKey
       ? (["useValidatorQueuedRewardAllocation", pubKey] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, pubKey]) => {
       return await getValidatorQueuedRewardAllocation({
@@ -32,9 +32,4 @@ export const useValidatorQueuedRewardAllocation = (
       ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
-};
+}

package/src/hooks/validators/useValidatorRewardAllocation.ts

@@ -16,7 +16,7 @@ export function useValidatorRewardAllocation(
       ? (["useValidatorRewardAllocation", pubKey] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, pubKey]) => {
       return getValidatorRewardAllocation({
@@ -28,9 +28,4 @@ export function useValidatorRewardAllocation(
       ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 }

package/src/types/bribeBoost.d.ts

@@ -0,0 +1,69 @@
+import type { Address } from "viem";
+
+export interface BribeBoostReward {
+  token: string;
+  total_unclaimed: string;
+}
+
+export interface BribeBoostRewardItem {
+  rewards: BribeBoostReward[];
+  validator: string;
+}
+
+export interface BribeBoostRewardProof {
+  validator?: string;
+  pagination: {
+    next: number;
+    previous: number;
+    record_per_page: number;
+    current_page: number;
+    total_page: number;
+  };
+  rewards:
+    | {
+        id: string;
+        dist_id: string;
+        token: Address;
+        recipient: string;
+        amount: string;
+        merkle_proof: string[];
+        available_at: number;
+      }[]
+    | null;
+}
+
+// Response shape of GET /api/v1/wallets/:wallet/autoclaimed:
+//   { [wallet]: { [validatorPubkey]: { [tokenAddress]: { amount } } } }
+// `amount` is a stringified bigint in token base units. The backend now
+// aggregates across validators under a single fake pubkey (`0x000…000`),
+// so consumers can collapse the validator dimension blindly.
+export type AutoclaimedIncentivesResponse = Record<
+  Address,
+  Record<Address, Record<Address, { amount: string }>>
+>;
+
+// Response shape of GET /api/v1/wallets/:wallet/autoclaimed/txhash: same
+// nesting, but each token leaf is `{ txhash }`. Tokens still pending are
+// simply absent — when a token from `/autoclaimed` has no entry here, the
+// bot hasn't distributed it yet.
+export type AutoclaimedIncentivesTxHashResponse = Record<
+  Address,
+  Record<Address, Record<Address, { txhash: string }>>
+>;
+
+export interface BribeBoostValidatorApr {
+  id: string;
+  boost_total_bgt: string;
+  rewards_total_usd: string;
+  daily_rate: string;
+  apr: string;
+  apy: string;
+  tokens: Address[]; // Confirm this type with backend real data
+  validator: string;
+  start_block: number;
+  end_block: number;
+  start_timestamp: number;
+  end_timestamp: number;
+  created_at: string;
+  updated_at: string;
+}

package/src/types/exports.ts

@@ -1,4 +1,4 @@
-export * from "./bribe-boost.d";
+export * from "./bribeBoost.d";
 export * from "./dex.d";
 export * from "./enso.d";
 export * from "./global.d";

package/src/types/global.d.ts

@@ -12,7 +12,10 @@ import type {
 
 import type { BeraConfig, ChainId } from "@berachain/config";
 
-import type { SWRConfiguration, SWRResponse } from "@berachain/utils/pkg/swr";
+import type {
+  BeraSwrResponse,
+  SWRConfiguration,
+} from "@berachain/utils/pkg/swr";
 
 import type { ContractName } from "../enum/contracts";
 import type { TransactionActionType } from "../enum/txnEnum";
@@ -23,12 +26,7 @@ import type {
 
 export type DefaultHookOptions = SWRConfiguration & { isEnabled?: boolean };
 
-export type DefaultHookReturnType<T = any> = Omit<
-  SWRResponse<T, any, any>,
-  "mutate"
-> & {
-  refresh: () => void;
-};
+export type DefaultHookReturnType<T = any> = BeraSwrResponse<T, any>;
 
 export type IContractWriteFn = <
   abi extends Abi | undefined = undefined,

package/src/utils/filter.ts

@@ -3,11 +3,9 @@
  * @param data - The data to filter
  * @returns The filtered data
  */
-export const dailyResolution = <
+export function dailyResolution<
   T extends { timestamp?: number; _timestamp?: number },
->(
-  data: T[],
-) => {
+>(data: T[]): T[] {
   // Filter to get one data point per day
   const dailyData: T[] = [];
   let lastDay = "";
@@ -31,4 +29,4 @@ export const dailyResolution = <
   }
 
   return dailyData;
-};
+}