@berachain/berajs 0.2.13 → 0.3.0

package/dist/hooks/exports.mjs

@@ -5,6 +5,7 @@ import {
   BalancerApi,
   BaseAggregator,
   beraWriteContract,
+  ensoErc4626,
   formatValidatorRewardAllocation,
   getAllPools,
   getAllValidators,
@@ -15,7 +16,6 @@ import {
   getAutoclaimedIncentives,
   getAutoclaimedIncentivesTxHash,
   getBgtAprSimulation,
-  getBgtIncentiveDistributorPaused,
   getBlockTimestamp,
   getChartData,
   getCollateralWeights,
@@ -34,7 +34,6 @@ import {
   getPythLatestPrices,
   getPythUpdateFee,
   getRelativeCapLimit,
-  getRewardProofsByValidator,
   getRewardTokenToBeraRate,
   getRewardVault,
   getRewardVaultEarnedRewards,
@@ -44,20 +43,19 @@ import {
   getRewardVaults,
   getSWBeraVaultMetadata,
   getSWBeraWithdrawal,
-  getStakedBeraAPR,
+  getStakedBeraAPY,
   getStakedBeraSnapshots,
   getStakingPoolBatch,
   getSwapPayload,
   getTokenCurrentPrices,
   getTokenInformation,
   getTotalStakedAmount,
-  getUserActiveValidators,
+  getUserActiveValidatorsApi,
+  getUserActiveValidatorsOnChain,
   getUserBoostsOnValidator,
-  getUserClaimableIncentives,
   getUserStakingPositions,
   getUserVaultInfo,
   getUserVaults,
-  getValidatorAnalytics,
   getValidatorCommission,
   getValidatorEstimatedBgtPerYear,
   getValidatorOperatorAddress,
@@ -68,12 +66,13 @@ import {
   getVaultHistory,
   getVaultValidators,
   isBadCollateralAsset,
-  isBasketModeEnabled
-} from "../chunk-DOZJB6IJ.mjs";
-import "../chunk-PHYZRH4I.mjs";
+  isBasketModeEnabled,
+  mergeUserActiveValidators
+} from "../chunk-SMBAW7AG.mjs";
+import "../chunk-BZKA6DBM.mjs";
 import {
   fetchBeep
-} from "../chunk-BSOWLS3W.mjs";
+} from "../chunk-7OESHTBN.mjs";
 import "../chunk-GWSTVITN.mjs";
 import {
   TokenContext,
@@ -82,7 +81,7 @@ import {
   useBlockTime,
   useEnsoUserTokensWithBalances,
   useHoneyConfig
-} from "../chunk-UA3Z47LT.mjs";
+} from "../chunk-5PBYMJRG.mjs";
 import {
   swr_default,
   useSWR,
@@ -91,28 +90,28 @@ import {
 import {
   getEnsoClient,
   getWalletBalances
-} from "../chunk-J3LTASDE.mjs";
+} from "../chunk-ZHV3MQ4F.mjs";
 import "../chunk-ZCEFC2TK.mjs";
-import "../chunk-IFNIPVTZ.mjs";
+import "../chunk-BSLXKPX4.mjs";
+import "../chunk-XO2BFPTB.mjs";
 import "../chunk-GLWPRM33.mjs";
 import {
   TransactionFailedError
-} from "../chunk-EJIGERYM.mjs";
+} from "../chunk-M3MIGSH3.mjs";
 import {
   BeraMonitoring,
   initBeraError
-} from "../chunk-LE4CYW7S.mjs";
+} from "../chunk-FWRYUIJK.mjs";
 import {
   assertAddress,
-  assertAmount,
   assertDefined,
   assertPositive,
   assertPublicClient
-} from "../chunk-QQASX4LJ.mjs";
+} from "../chunk-TXWDUJOY.mjs";
 import {
   computePriceImpact,
   wrapNativeTokens
-} from "../chunk-AEN6IJFU.mjs";
+} from "../chunk-7KN7TDUC.mjs";
 import {
   DEFAULT_METAMASK_GAS_LIMIT,
   bignumber_js_default,
@@ -123,24 +122,24 @@ import {
 } from "../chunk-35RACQD4.mjs";
 import {
   beraFetchJson
-} from "../chunk-ZWTGVIPJ.mjs";
-import "../chunk-7TFV6UKF.mjs";
+} from "../chunk-4576RF2K.mjs";
+import "../chunk-XXKPXNQD.mjs";
 import {
   beraToken,
   getHoneyToken,
   isToken
-} from "../chunk-PJRLHTGC.mjs";
+} from "../chunk-HPRLNT6R.mjs";
 import {
   parseBaseArgs
-} from "../chunk-TGN55GKE.mjs";
+} from "../chunk-SC3BSCTN.mjs";
 import "../chunk-BMNEN4OK.mjs";
 import {
   RequestError
-} from "../chunk-P3YZ7F22.mjs";
+} from "../chunk-LL7XR2H5.mjs";
 import {
   BeraError,
   InvalidArgumentError
-} from "../chunk-NZAH3SGT.mjs";
+} from "../chunk-MVNQY2D4.mjs";
 
 // src/hooks/bend/useGetConvertToAssets.ts
 import { usePublicClient } from "@berachain/wagmi/hooks";
@@ -174,6 +173,7 @@ import { useBeraWallet as useBeraWallet2, usePublicClient as usePublicClient4 }
 
 // src/actions/dex/aggregators/bex.ts
 import {
+  DECIMAL_SCALES,
   Slippage,
   Swap,
   SwapKind,
@@ -192,6 +192,30 @@ var BexAggregator = class extends BaseAggregator {
   supportedChains = [ChainId.MAINNET, ChainId.BEPOLIA];
   url = getUriFromLink(this.config.api);
   type = "graphql";
+  /**
+   * Opt bex out of tokens it structurally can't route (BGT, or decimals
+   * outside b-sdk's supported range) so the quote is never requested and other
+   * aggregators still handle it — see `supportsToken` for the specifics.
+   */
+  getUnsupportedReason(args) {
+    const base = super.getUnsupportedReason(args);
+    if (base !== null) {
+      return base;
+    }
+    for (const token of [args.tokenIn, args.tokenOut]) {
+      if (!this.supportsToken(token)) {
+        return `${this.name} can't route ${token.symbol} (BGT or unsupported decimals).`;
+      }
+    }
+    return null;
+  }
+  supportsToken(token) {
+    if (isToken(token.address, "BGT", { config: this.config })) {
+      return false;
+    }
+    const scaleKey = 18 - token.decimals;
+    return scaleKey in DECIMAL_SCALES;
+  }
   /**
    * Helper function to convert zero address to wrapped token address
    */
@@ -341,7 +365,8 @@ var BexAggregator = class extends BaseAggregator {
           functionName,
           abi: balancerVaultAbi,
           address: callData.to,
-          value: callData.value || BigInt(0)
+          value: callData.value || BigInt(0),
+          extraTags: { aggregator: this.name }
         };
       }
     };
@@ -355,17 +380,21 @@ var RedeemBgtAggregator = class extends BaseAggregator {
   name = "RedeemBgt" /* RedeemBgt */;
   supportedChains = [ChainId2.MAINNET, ChainId2.BEPOLIA];
   type = "rpc";
-  checkChainSupport({
+  getUnsupportedReason({
     tokenIn,
     tokenOut
   }) {
-    if (!super.checkChainSupport({ tokenIn, tokenOut })) {
-      return false;
+    const base = super.getUnsupportedReason({ tokenIn, tokenOut });
+    if (base !== null) {
+      return base;
     }
-    return (
+    if (
       // only supported on same chain
       tokenIn.chainId === tokenOut.chainId && isToken(tokenIn, "BGT", { chainId: tokenIn.chainId }) && isToken(tokenOut, "BERA")
-    );
+    ) {
+      return null;
+    }
+    return `${this.name} only redeems BGT \u2192 BERA on the same chain.`;
   }
   // handles native swaps: wrap and unwrap
   async getQuote({
@@ -487,6 +516,7 @@ var EnsoAggregator = class extends BaseAggregator {
           }
         ],
         functionName: "swap",
+        extraTags: { aggregator: this.name },
         abi: aggregatorsRouterAbi,
         // send full amount to router first, which will deduct the swap fee before executing trade
         value: isTokenInNative ? BigInt(amount) : BigInt("0"),
@@ -508,14 +538,25 @@ var ERC4626Aggregator = class extends BaseAggregator {
    * Returns true when tokenOut is an ERC4626 vault whose underlying asset matches tokenIn,
    * or when depositing native BERA into swBERA.
    */
-  checkChainSupport({
+  getUnsupportedReason({
     tokenIn,
     tokenOut,
     underlyingToken
   }) {
-    const result = super.checkChainSupport({ tokenIn, tokenOut, underlyingToken }) && !!underlyingToken && underlyingToken?.chainId === tokenOut.chainId && (isToken(underlyingToken, tokenIn) || // this is a special case for the swbera vault
+    const base = super.getUnsupportedReason({
+      tokenIn,
+      tokenOut,
+      underlyingToken
+    });
+    if (base !== null) {
+      return base;
+    }
+    const isVaultDeposit = !!underlyingToken && underlyingToken?.chainId === tokenOut.chainId && (isToken(underlyingToken, tokenIn) || // this is a special case for the swbera vault
     isToken(tokenIn, "BERA") && isToken(tokenOut, "SWBERA"));
-    return result;
+    if (isVaultDeposit) {
+      return null;
+    }
+    return `${this.name} only deposits a token into its matching ERC4626 vault.`;
   }
   /**
    * Fetches a deposit quote by calling `convertToShares` on the vault.
@@ -559,14 +600,16 @@ var ERC4626Aggregator = class extends BaseAggregator {
         address: tokenOut.address,
         functionName: "depositNative",
         params: [BigInt(amount), account],
-        value: BigInt(amount)
+        value: BigInt(amount),
+        extraTags: { aggregator: this.name }
       } : {
         abi: erc4626Abi,
         address: tokenOut.address,
         functionName: "deposit",
         contractName: "others.erc4626" /* ERC4626 */,
         params: [BigInt(amount), account],
-        value: 0n
+        value: 0n,
+        extraTags: { aggregator: this.name }
       }
     };
   }
@@ -672,6 +715,7 @@ var FlyAggregator = class extends BaseAggregator {
             }
           ],
           functionName: "swap",
+          extraTags: { aggregator: this.name },
           abi: aggregatorsRouterAbi2,
           // send full amount to router first, which will deduct the swap fee before executing trade
           value: isToken(tokenIn, "BERA") ? BigInt(amount) : BigInt("0"),
@@ -697,6 +741,20 @@ var HaikuAggregator = class extends BaseAggregator {
     "No route found for the given input or the liquidity is not enough",
     "Invalid input amount. Please ensure the total amount of input is greater than 0.001 USD"
   ];
+  getUnsupportedReason({
+    tokenIn,
+    tokenOut,
+    rewardVault
+  }) {
+    const base = super.getUnsupportedReason({ tokenIn, tokenOut });
+    if (base !== null) {
+      return base;
+    }
+    if (rewardVault) {
+      return `${this.name} does not support reward-vault staking.`;
+    }
+    return null;
+  }
   async getQuote({
     tokenIn,
     tokenOut,
@@ -815,6 +873,7 @@ var HaikuAggregator = class extends BaseAggregator {
             }
           ],
           functionName: "swap",
+          extraTags: { aggregator: this.name },
           abi: aggregatorsRouterAbi3,
           // send full amount to router first, which will deduct the swap fee before executing trade
           value: isTokenInNative ? BigInt(amount) : BigInt("0"),
@@ -855,16 +914,23 @@ var HoneyNativeAggregator = class extends BaseAggregator {
       (coll) => isToken(coll.address, isMint ? tokenIn : tokenOut)
     );
   }
-  checkChainSupport({
+  getUnsupportedReason({
     tokenIn,
     tokenOut,
     honeyNativeState
   }) {
-    return super.checkChainSupport({ tokenIn, tokenOut }) && tokenIn.chainId === tokenOut.chainId && this.isHoneyNativeSwap({
+    const base = super.getUnsupportedReason({ tokenIn, tokenOut });
+    if (base !== null) {
+      return base;
+    }
+    if (tokenIn.chainId === tokenOut.chainId && this.isHoneyNativeSwap({
       tokenIn: tokenIn.address,
       tokenOut: tokenOut.address,
       honeyNativeState
-    });
+    })) {
+      return null;
+    }
+    return `${this.name} only mints/redeems HONEY against a listed collateral.`;
   }
   async getQuote({
     tokenIn,
@@ -884,7 +950,7 @@ var HoneyNativeAggregator = class extends BaseAggregator {
       });
     }
     assertPublicClient(publicClient);
-    this.assertChainSupport({ tokenIn, tokenOut });
+    this.assertChainSupport({ tokenIn, tokenOut, honeyNativeState });
     const isMint = isToken(tokenOut, this.honeyToken);
     const hubOrderedCollaterals = collaterals;
     const collateral = collaterals.find(
@@ -1094,6 +1160,7 @@ var KyberSwapAggregator = class extends BaseAggregator {
             }
           ],
           functionName: "swap",
+          extraTags: { aggregator: this.name },
           abi: aggregatorsRouterAbi4,
           // send full amount to router first, which will deduct the swap fee before executing trade
           value: isTokenInNative ? BigInt(amount) : BigInt("0"),
@@ -1188,6 +1255,7 @@ var OogaboogaAggregator = class extends BaseAggregator {
             }
           ],
           functionName: "swap",
+          extraTags: { aggregator: this.name },
           abi: aggregatorsRouterAbi5,
           // send full amount to router first, which will deduct the swap fee before executing trade
           value: isTokenInNative ? BigInt(amount) : BigInt("0"),
@@ -1309,6 +1377,7 @@ var OpenOceanAggregator = class extends BaseAggregator {
             }
           ],
           functionName: "swap",
+          extraTags: { aggregator: this.name },
           abi: aggregatorsRouterAbi6,
           // send full amount to router first, which will deduct the swap fee before executing trade
           value: isTokenInNative ? BigInt(amount) : BigInt("0"),
@@ -1327,18 +1396,21 @@ var WBeraAggregator = class extends BaseAggregator {
   name = "Wrap" /* Wrap */;
   supportedChains = [ChainId10.MAINNET, ChainId10.BEPOLIA];
   type = "rpc";
-  checkChainSupport({
+  // This aggregator's entire job is BERA↔WBERA, so keep the base same-token
+  // (native-normalized) guard from rejecting it.
+  supportsBeraWrap = true;
+  getUnsupportedReason({
     tokenIn,
     tokenOut
   }) {
-    if (
-      // same chain
-      tokenIn.chainId !== tokenOut.chainId || // must be one of our chains
-      !super.checkChainSupport({ tokenIn, tokenOut })
-    ) {
-      return false;
+    const base = super.getUnsupportedReason({ tokenIn, tokenOut });
+    if (base !== null) {
+      return base;
     }
-    return isToken(tokenIn, "BERA") && isToken(tokenOut, "WBERA") || isToken(tokenIn, "WBERA") && isToken(tokenOut, "BERA");
+    if (tokenIn.chainId === tokenOut.chainId && (isToken(tokenIn, "BERA") && isToken(tokenOut, "WBERA") || isToken(tokenIn, "WBERA") && isToken(tokenOut, "BERA"))) {
+      return null;
+    }
+    return `${this.name} only wraps/unwraps between BERA and WBERA on the same chain.`;
   }
   // handles native swaps: wrap and unwrap
   async getQuote({
@@ -1361,13 +1433,15 @@ var WBeraAggregator = class extends BaseAggregator {
           address: this.config.tokens.wbera,
           functionName: "deposit",
           params: [],
-          value: BigInt(amount)
+          value: BigInt(amount),
+          extraTags: { aggregator: this.name }
         } : {
           abi: wberaAbi,
           address: this.config.tokens.wbera,
           functionName: "withdraw",
           params: [BigInt(amount)],
-          value: BigInt(0)
+          value: BigInt(0),
+          extraTags: { aggregator: this.name }
         };
       }
     };
@@ -1458,12 +1532,13 @@ function getQueryKey({
   if (!Number(args.amount)) {
     return null;
   }
-  if (!aggregator.checkChainSupport({
+  if (aggregator.getUnsupportedReason({
     tokenIn: args.tokenIn,
     tokenOut: args.tokenOut,
     underlyingToken: args.underlyingToken,
-    honeyNativeState: args.honeyNativeState
-  })) {
+    honeyNativeState: args.honeyNativeState,
+    rewardVault: args.rewardVault
+  }) !== null) {
     return null;
   }
   const name = aggregator.name;
@@ -1731,7 +1806,13 @@ function useAggregatorsQuotes(args, options) {
       ...args,
       aggregator: bex
     },
-    { ...swrOptions, isEnabled: bexProtocol.isPaused === false }
+    {
+      ...swrOptions,
+      // Compose with the caller's gate (e.g. same-token suppression from
+      // useSwap) instead of overwriting it — otherwise bex fetches whenever
+      // it's unpaused, regardless of isEnabled (HUB-9FQ).
+      isEnabled: (options?.isEnabled ?? true) && bexProtocol.isPaused === false
+    }
   );
   const wberaSwapResult = raw_useSingleAggregatorQuote({
     ...sharedArgs,
@@ -2123,6 +2204,151 @@ function useCreatePool({
   };
 }
 
+// src/hooks/dex/useCrossChainNativeFee.ts
+import { formatEther as formatEther3, zeroAddress as zeroAddress13 } from "viem";
+
+// src/hooks/tokens/usePollBalance.ts
+import {
+  erc20Abi,
+  formatEther as formatEther2,
+  formatUnits as formatUnits5,
+  isAddress as isAddress3,
+  zeroAddress as zeroAddress12
+} from "viem";
+import { defaultChainId as defaultChainId3 } from "@berachain/config/internal";
+import { useBeraWallet as useBeraWallet3, usePublicClient as usePublicClient6 } from "@berachain/wagmi/hooks";
+
+// src/hooks/tokens/useTokenInformation.ts
+import { isAddress as isAddress2, zeroAddress as zeroAddress11 } from "viem";
+import { defaultChainId as defaultChainId2 } from "@berachain/config/internal";
+import { usePublicClient as usePublicClient5 } from "@berachain/wagmi/hooks";
+function useTokenInformation(args, options) {
+  const publicClient = usePublicClient5({
+    chainId: args.chainId
+  });
+  const QUERY_KEY = args?.address && publicClient && isAddress2(args.address) ? ["useTokenInformation", args.address, args.chainId] : null;
+  return useSWRImmutable(
+    QUERY_KEY,
+    async ([_, address, chainId2 = defaultChainId2]) => {
+      if (isToken(address, "BERA")) {
+        return {
+          address: zeroAddress11,
+          decimals: beraToken.decimals,
+          name: beraToken.name,
+          symbol: beraToken.symbol,
+          chainId: chainId2
+        };
+      }
+      assertPublicClient(publicClient);
+      return await getTokenInformation({
+        address,
+        publicClient,
+        chainId: chainId2
+      });
+    },
+    { ...options }
+  );
+}
+
+// src/hooks/tokens/usePollBalance.ts
+function usePollBalance({
+  address: addressString,
+  owner,
+  chainId: chainId2 = defaultChainId3
+}, options) {
+  let address = addressString;
+  if (isToken(address, "ETH")) {
+    address = zeroAddress12;
+  }
+  const publicClient = usePublicClient6({ chainId: chainId2 });
+  const { address: account } = useBeraWallet3();
+  const assetOwner = owner ?? account;
+  const QUERY_KEY = publicClient && assetOwner && isAddress3(assetOwner) && address && isAddress3(address) ? ["usePollBalance", assetOwner, address, chainId2] : null;
+  const { data: tokenInformation, isLoading: isLoadingTokenInformation } = useTokenInformation({ address, chainId: chainId2 });
+  const isNativeToken = isToken(address, "BERA");
+  const { isLoading, data, error, ...rest } = useSWR(
+    QUERY_KEY,
+    async ([, assetOwner2, address2]) => {
+      assertPublicClient(publicClient);
+      if (!isToken(address2, "BERA")) {
+        return await publicClient.readContract({
+          address: address2,
+          abi: erc20Abi,
+          functionName: "balanceOf",
+          args: [assetOwner2]
+        });
+      }
+      return await publicClient.getBalance({
+        address: assetOwner2
+      });
+    },
+    {
+      refreshInterval: 1e4 /* FAST */,
+      ...options
+    }
+  );
+  const formattedBalance = !error && data ? isToken(address, "BERA") ? formatEther2(data) : tokenInformation && !isLoadingTokenInformation ? formatUnits5(data, tokenInformation.decimals) : void 0 : void 0;
+  const tokenBalance = {
+    chainId: chainId2,
+    balance: data ? {
+      raw: data.toString(),
+      formatted: formattedBalance ?? "0"
+    } : { raw: "0", formatted: "0" },
+    address,
+    decimals: isNativeToken ? beraToken.decimals : tokenInformation?.decimals ?? 0,
+    symbol: isNativeToken ? beraToken.symbol : tokenInformation?.symbol ?? "",
+    name: isNativeToken ? beraToken.name : tokenInformation?.name ?? ""
+  };
+  return {
+    ...rest,
+    isLoading: isNativeToken ? isLoading : isLoading || isLoadingTokenInformation,
+    error,
+    data: tokenBalance
+  };
+}
+
+// src/hooks/dex/useCrossChainNativeFee.ts
+function isNativeFeeInsufficient({
+  isCrossChain,
+  value,
+  nativeBalance,
+  isLoading
+}) {
+  if (!isCrossChain) return false;
+  return value > 0n && !isLoading && value > nativeBalance;
+}
+function useCrossChainNativeFee({
+  srcChainId,
+  value
+}) {
+  const isCrossChain = srcChainId !== void 0;
+  const { data: nativeBalanceData, isLoading: isNativeBalanceLoading } = usePollBalance(
+    {
+      address: zeroAddress13,
+      chainId: isCrossChain ? srcChainId : void 0
+    },
+    { isEnabled: isCrossChain }
+  );
+  if (!isCrossChain) {
+    return {
+      nativeFee: void 0,
+      hasInsufficientNativeBalance: false,
+      isNativeBalanceLoading: false
+    };
+  }
+  const nativeBalance = BigInt(nativeBalanceData?.balance.raw ?? 0n);
+  return {
+    nativeFee: value > 0n ? formatEther3(value) : void 0,
+    hasInsufficientNativeBalance: isNativeFeeInsufficient({
+      isCrossChain,
+      value,
+      nativeBalance,
+      isLoading: isNativeBalanceLoading
+    }),
+    isNativeBalanceLoading
+  };
+}
+
 // src/hooks/dex/useGlobalLiquidityAndSwapVolume.ts
 function useGlobalLiquidityAndSwapVolume() {
   const response = useSWR(
@@ -2249,24 +2475,24 @@ function useLiquidityMismatch({
 }
 
 // src/hooks/dex/useLpPosition.ts
-import { formatEther as formatEther3, isAddressEqual } from "viem";
+import { formatEther as formatEther4, isAddressEqual } from "viem";
 
 // src/hooks/pol/useRewardVaultBalanceFromStakingToken.ts
-import { isAddress as isAddress3, zeroAddress as zeroAddress12 } from "viem";
+import { isAddress as isAddress5, zeroAddress as zeroAddress15 } from "viem";
 import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
-import { useBeraWallet as useBeraWallet3, usePublicClient as usePublicClient6 } from "@berachain/wagmi/hooks";
+import { useBeraWallet as useBeraWallet4, usePublicClient as usePublicClient8 } from "@berachain/wagmi/hooks";
 
 // src/hooks/pol/useRewardVaultFromToken.ts
-import { isAddress as isAddress2, zeroAddress as zeroAddress11 } from "viem";
+import { isAddress as isAddress4, zeroAddress as zeroAddress14 } from "viem";
 import { rewardVaultFactoryAbi } from "@berachain/abis/pol/rewards/rewardVaultFactory";
-import { usePublicClient as usePublicClient5 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient7 } from "@berachain/wagmi/hooks";
 function useRewardVaultFromToken({
   tokenAddress
 }, {
   isEnabled = true
 } = {}) {
-  const publicClient = usePublicClient5();
-  const QUERY_KEY = publicClient && tokenAddress && isAddress2(tokenAddress) && isEnabled ? ["useRewardVaultFromToken", tokenAddress] : null;
+  const publicClient = usePublicClient7();
+  const QUERY_KEY = publicClient && tokenAddress && isAddress4(tokenAddress) && isEnabled ? ["useRewardVaultFromToken", tokenAddress] : null;
   return useSWRImmutable(
     QUERY_KEY,
     async ([, tokenAddress2]) => {
@@ -2283,7 +2509,7 @@ function useRewardVaultFromToken({
         functionName: "getVault",
         args: [tokenAddress2]
       });
-      return res === zeroAddress11 ? void 0 : res;
+      return res === zeroAddress14 ? void 0 : res;
     }
   );
 }
@@ -2293,12 +2519,11 @@ function useRewardVaultBalanceFromStakingToken({
   stakingToken,
   rewardVaultAddress: _rewardVaultAddress
 }, options) {
-  const { address: account } = useBeraWallet3();
-  const publicClient = usePublicClient6();
+  const { address: account } = useBeraWallet4();
+  const publicClient = usePublicClient8();
   const isEnabled = options?.isEnabled ?? true;
   const {
     data: rewardVaultAddress = _rewardVaultAddress,
-    error,
     refresh: mutateRewardVaultAddress,
     isLoading: isLoadingRewardVaultAddress
   } = useRewardVaultFromToken(
@@ -2310,10 +2535,10 @@ function useRewardVaultBalanceFromStakingToken({
     }
   );
   const swrResponse = useSWR(
-    rewardVaultAddress && account && publicClient && isAddress3(rewardVaultAddress) && isAddress3(account) ? ["useVaultBalanceFromStakingToken", rewardVaultAddress, account] : null,
+    rewardVaultAddress && account && publicClient && isAddress5(rewardVaultAddress) && isAddress5(account) ? ["useVaultBalanceFromStakingToken", rewardVaultAddress, account] : null,
     async ([, rewardVaultAddress2, account2]) => {
       assertPublicClient(publicClient);
-      if (rewardVaultAddress2 === zeroAddress12) {
+      if (rewardVaultAddress2 === zeroAddress15) {
         return {
           address: rewardVaultAddress2,
           balance: 0n
@@ -2342,106 +2567,6 @@ function useRewardVaultBalanceFromStakingToken({
   };
 }
 
-// src/hooks/tokens/usePollBalance.ts
-import {
-  erc20Abi,
-  formatEther as formatEther2,
-  formatUnits as formatUnits5,
-  isAddress as isAddress5,
-  zeroAddress as zeroAddress14
-} from "viem";
-import { defaultChainId as defaultChainId3 } from "@berachain/config/internal";
-import { useBeraWallet as useBeraWallet4, usePublicClient as usePublicClient8 } from "@berachain/wagmi/hooks";
-
-// src/hooks/tokens/useTokenInformation.ts
-import { isAddress as isAddress4, zeroAddress as zeroAddress13 } from "viem";
-import { defaultChainId as defaultChainId2 } from "@berachain/config/internal";
-import { usePublicClient as usePublicClient7 } from "@berachain/wagmi/hooks";
-function useTokenInformation(args, options) {
-  const publicClient = usePublicClient7({
-    chainId: args.chainId
-  });
-  const QUERY_KEY = args?.address && publicClient && isAddress4(args.address) ? ["useTokenInformation", args.address, args.chainId] : null;
-  return useSWRImmutable(
-    QUERY_KEY,
-    async ([_, address, chainId2 = defaultChainId2]) => {
-      if (isToken(address, "BERA")) {
-        return {
-          address: zeroAddress13,
-          decimals: beraToken.decimals,
-          name: beraToken.name,
-          symbol: beraToken.symbol,
-          chainId: chainId2
-        };
-      }
-      assertPublicClient(publicClient);
-      return await getTokenInformation({
-        address,
-        publicClient,
-        chainId: chainId2
-      });
-    },
-    { ...options }
-  );
-}
-
-// src/hooks/tokens/usePollBalance.ts
-function usePollBalance({
-  address: addressString,
-  owner,
-  chainId: chainId2 = defaultChainId3
-}, options) {
-  let address = addressString;
-  if (isToken(address, "ETH")) {
-    address = zeroAddress14;
-  }
-  const publicClient = usePublicClient8({ chainId: chainId2 });
-  const { address: account } = useBeraWallet4();
-  const assetOwner = owner ?? account;
-  const QUERY_KEY = publicClient && assetOwner && isAddress5(assetOwner) && address && isAddress5(address) ? ["usePollBalance", assetOwner, address, chainId2] : null;
-  const { data: tokenInformation, isLoading: isLoadingTokenInformation } = useTokenInformation({ address, chainId: chainId2 });
-  const isNativeToken = isToken(address, "BERA");
-  const { isLoading, data, error, ...rest } = useSWR(
-    QUERY_KEY,
-    async ([, assetOwner2, address2]) => {
-      assertPublicClient(publicClient);
-      if (!isToken(address2, "BERA")) {
-        return await publicClient.readContract({
-          address: address2,
-          abi: erc20Abi,
-          functionName: "balanceOf",
-          args: [assetOwner2]
-        });
-      }
-      return await publicClient.getBalance({
-        address: assetOwner2
-      });
-    },
-    {
-      refreshInterval: 1e4 /* FAST */,
-      ...options
-    }
-  );
-  const formattedBalance = !error && data ? isToken(address, "BERA") ? formatEther2(data) : tokenInformation && !isLoadingTokenInformation ? formatUnits5(data, tokenInformation.decimals) : void 0 : void 0;
-  const tokenBalance = {
-    chainId: chainId2,
-    balance: data ? {
-      raw: data.toString(),
-      formatted: formattedBalance ?? "0"
-    } : { raw: "0", formatted: "0" },
-    address,
-    decimals: isNativeToken ? beraToken.decimals : tokenInformation?.decimals ?? 0,
-    symbol: isNativeToken ? beraToken.symbol : tokenInformation?.symbol ?? "",
-    name: isNativeToken ? beraToken.name : tokenInformation?.name ?? ""
-  };
-  return {
-    ...rest,
-    isLoading: isLoading || isNativeToken ? isLoadingTokenInformation : false,
-    error: error || !isNativeToken ? error : void 0,
-    data: tokenBalance
-  };
-}
-
 // src/hooks/dex/useLpPosition.ts
 function useLpPosition({ pool, vaultAddress }, options) {
   const { data: userPosition, ...rest } = usePollBalance({
@@ -2491,9 +2616,9 @@ function useLpPosition({ pool, vaultAddress }, options) {
         balance: {
           raw: userVaultTokenBalance.balance.toString(),
           // Pools always use the 18 decimals
-          formatted: formatEther3(userVaultTokenBalance.balance)
+          formatted: formatEther4(userVaultTokenBalance.balance)
         },
-        usdValue: Number(formatEther3(userVaultTokenBalance.balance)) * lpTokenPrice
+        usdValue: Number(formatEther4(userVaultTokenBalance.balance)) * lpTokenPrice
       } : void 0
     },
     ...rest,
@@ -2506,7 +2631,7 @@ function useLpPosition({ pool, vaultAddress }, options) {
 
 // src/hooks/dex/useMultipleTokenApprovalsWithSlippage.ts
 import { useMemo as useMemo3 } from "react";
-import { parseUnits as parseUnits4, zeroAddress as zeroAddress15 } from "viem";
+import { parseUnits as parseUnits4, zeroAddress as zeroAddress16 } from "viem";
 
 // src/hooks/tokens/usePollAllowances.ts
 import { useBeraWallet as useBeraWallet5, useConfig as useConfig2 } from "@berachain/wagmi/hooks";
@@ -2542,7 +2667,7 @@ function calculateMaxAmountIn({
 function useMultipleTokenApprovalsWithSlippage(tokenInput, options) {
   const { slippage } = options ?? {};
   const items = useMemo3(
-    () => tokenInput.filter((token) => token.token.address !== zeroAddress15).filter((token) => bignumber_js_default(token.amount.formatted).gt(0)),
+    () => tokenInput.filter((token) => token.token.address !== zeroAddress16).filter((token) => bignumber_js_default(token.amount.formatted).gt(0)),
     [tokenInput]
   );
   const {
@@ -2595,40 +2720,49 @@ function useMultipleTokenApprovalsWithSlippage(tokenInput, options) {
 
 // src/hooks/dex/useOnChainPoolData.ts
 import { useMemo as useMemo5 } from "react";
-import { formatUnits as formatUnits6, isAddress as isAddress8 } from "viem";
+import { formatUnits as formatUnits6, isAddress as isAddress7 } from "viem";
 import { usePublicClient as usePublicClient10 } from "@berachain/wagmi/hooks";
 
 // src/hooks/tokens/useMultipleTokenInformation.ts
-import { isAddress as isAddress6 } from "viem";
 import { defaultChainId as defaultChainId4 } from "@berachain/config/internal";
 import { usePublicClient as usePublicClient9 } from "@berachain/wagmi/hooks";
-function useMultipleTokenInformation(args, options) {
-  const publicClient = usePublicClient9();
-  const QUERY_KEY = publicClient && args.addresses ? [
-    "useMultipleTokenInformation",
-    args.addresses,
-    args.chainId ?? defaultChainId4
-  ] : null;
-  return useSWRImmutable(
+async function fetchMultipleTokenInformation({
+  addresses,
+  publicClient,
+  chainId: chainId2
+}) {
+  const settled = await Promise.allSettled(
+    addresses.map(async (address) => {
+      assertAddress(address, "address");
+      const tk = await getTokenInformation({
+        address,
+        publicClient,
+        chainId: chainId2
+      });
+      if (!tk) {
+        throw new Error(`Token ${address} not found`);
+      }
+      return tk;
+    })
+  );
+  return settled.filter((r) => r.status === "fulfilled").map((r) => r.value);
+}
+function useMultipleTokenInformation(args, options) {
+  const publicClient = usePublicClient9();
+  const QUERY_KEY = publicClient && args.addresses ? [
+    "useMultipleTokenInformation",
+    args.addresses,
+    args.chainId ?? defaultChainId4
+  ] : null;
+  return useSWRImmutable(
     QUERY_KEY,
     async ([, addresses, chainId2]) => {
       assertPublicClient(publicClient);
-      return Promise.all(
-        addresses.map(async (address) => {
-          if (!address || !isAddress6(address, { strict: false })) {
-            throw new Error("Invalid address");
-          }
-          const tk = await getTokenInformation({
-            address,
-            publicClient,
-            chainId: chainId2
-          });
-          if (!tk) {
-            throw new Error(`Token ${address} not found`);
-          }
-          return tk;
-        })
-      );
+      return fetchMultipleTokenInformation({
+        addresses,
+        publicClient,
+        chainId: chainId2
+      });
     },
     { ...options }
   );
@@ -2636,7 +2770,7 @@ function useMultipleTokenInformation(args, options) {
 
 // src/hooks/tokens/useTokenCurrentPrices.ts
 import { useMemo as useMemo4 } from "react";
-import { isAddress as isAddress7, zeroAddress as zeroAddress16 } from "viem";
+import { isAddress as isAddress6, zeroAddress as zeroAddress17 } from "viem";
 import { defaultChainId as defaultChainId5 } from "@berachain/config/internal";
 
 // src/hooks/tokens/useTokens.ts
@@ -2674,7 +2808,7 @@ function useTokenCurrentPrices({
     const addresses2 = [];
     if (addressIn) {
       addresses2.push(
-        ...addressIn.filter((a) => isAddress7(a))
+        ...addressIn.filter((a) => isAddress6(a))
       );
     }
     return addresses2.map((a) => a.toLowerCase());
@@ -2684,7 +2818,7 @@ function useTokenCurrentPrices({
       tokenList?.map((token) => token.address.toLowerCase())
     );
     if (tokenList.some((token) => isToken(token, "WBERA"))) {
-      tokenSet.add(zeroAddress16);
+      tokenSet.add(zeroAddress17);
     }
     return beraAddresses?.some((a) => !tokenSet.has(a));
   }, [beraAddresses, tokenList]);
@@ -2746,7 +2880,7 @@ function useTokenCurrentPrices({
 // src/hooks/dex/useOnChainPoolData.ts
 function useOnChainPoolDataQueryKey(args) {
   const address = "poolId" in args ? args.poolId?.slice(0, 42) : args.address;
-  const isAddressValid = isAddress8(address);
+  const isAddressValid = isAddress7(address);
   const isValid = isAddressValid;
   return isValid && address ? ["useOnChainPoolData", address] : null;
 }
@@ -2780,18 +2914,15 @@ function useOnChainPoolData(poolId) {
     if (!poolData || !tokenInformation) {
       return void 0;
     }
-    const pool2 = {
-      address: address.toLowerCase(),
-      id: poolId.toLowerCase(),
-      type: poolData.type,
-      factory: poolData.factory,
-      totalShares: poolData.totalSupply,
-      totalLiquidity: "0",
-      // overwritten below
-      swapFee: poolData.swapFee,
-      createTime: 0,
-      name: poolData.name,
-      tokens: tokenInformation.map((token, idx) => ({
+    const infoByAddress = new Map(
+      tokenInformation.map(
+        (token) => [token.address.toLowerCase(), token]
+      )
+    );
+    const tokens = poolData.poolTokens[0].map((rawAddress, idx) => {
+      const token = infoByAddress.get(rawAddress.toLowerCase());
+      if (!token) return null;
+      return {
         address: token.address.toLowerCase(),
         name: token.name,
         decimals: token.decimals,
@@ -2807,7 +2938,23 @@ function useOnChainPoolData(poolId) {
           token,
           latestUSDPrice: tokenPrices?.[token.address]
         }
-      })),
+      };
+    });
+    if (tokens.some((token) => token === null)) {
+      return void 0;
+    }
+    const pool2 = {
+      address: address.toLowerCase(),
+      id: poolId.toLowerCase(),
+      type: poolData.type,
+      factory: poolData.factory,
+      totalShares: poolData.totalSupply,
+      totalLiquidity: "0",
+      // overwritten below
+      swapFee: poolData.swapFee,
+      createTime: 0,
+      name: poolData.name,
+      tokens,
       amplificationParameter: poolData?.amplificationParameter && {
         // For example, if value is 300000n and precision is 1000n, the user-set amplification parameter would be 300000n / 1000n = 300n.
         currentFormattedValue: Number(poolData.amplificationParameter[0]) / Number(poolData.amplificationParameter[2])
@@ -3122,10 +3269,10 @@ import {
   ethAddress,
   formatUnits as formatUnits7,
   getAddress,
-  zeroAddress as zeroAddress17
+  zeroAddress as zeroAddress18
 } from "viem";
 function toEnsoAddress(address) {
-  return address === zeroAddress17 ? ethAddress : address;
+  return address === zeroAddress18 ? ethAddress : address;
 }
 function toBigIntOrUndefined(value) {
   if (value === null || value === void 0) {
@@ -3133,52 +3280,6 @@ function toBigIntOrUndefined(value) {
   }
   return typeof value === "bigint" ? value : BigInt(value);
 }
-async function getTransactionsFromBundle({
-  fromAddress,
-  amountIn,
-  tokenIn,
-  chainId: chainId2,
-  ensoClient,
-  bundle,
-  publicClient
-}) {
-  const transactions = [];
-  if (tokenIn !== ethAddress) {
-    const approvalRequest = await ensoClient.getApprovalData({
-      fromAddress,
-      tokenAddress: tokenIn,
-      chainId: chainId2,
-      amount: amountIn
-    });
-    let requiresApproval = true;
-    if (publicClient) {
-      const currentAllowance = await publicClient.readContract({
-        address: tokenIn,
-        abi: erc20Abi2,
-        functionName: "allowance",
-        args: [fromAddress, approvalRequest.spender]
-      });
-      requiresApproval = currentAllowance < BigInt(amountIn);
-    }
-    if (requiresApproval) {
-      const approvalValue = toBigIntOrUndefined(approvalRequest.tx.value) ?? 0n;
-      transactions.push({
-        to: approvalRequest.tx.to,
-        data: approvalRequest.tx.data,
-        value: approvalValue,
-        gasLimit: BigInt(approvalRequest.gas)
-      });
-    }
-  }
-  const bundleValue = toBigIntOrUndefined(bundle.tx.value) ?? 0n;
-  transactions.push({
-    to: bundle.tx.to,
-    data: bundle.tx.data,
-    value: bundleValue,
-    gasLimit: BigInt(bundle.gas)
-  });
-  return transactions;
-}
 async function getEnsoWalletTransactionsWithApproval({
   fromAddress,
   amountIn,
@@ -3813,7 +3914,6 @@ async function getBendMultiplyBundle({
     leverageMultiplier,
     slippage
   });
-  const CALLBACK_IDX_ROUTE_LOAN_TO_COLLATERAL = 0;
   const CALLBACK_IDX_BALANCE_COLLATERAL = 1;
   const depositOnlyActions = [
     {
@@ -4039,152 +4139,8 @@ function useBendMultiply({
 }
 
 // src/hooks/enso/useBendZapSupply.ts
-import { formatEther as formatEther4, parseUnits as parseUnits7, zeroAddress as zeroAddress19 } from "viem";
-import { defaultChainId as berachainChainId } from "@berachain/config/internal";
+import { parseUnits as parseUnits7, zeroAddress as zeroAddress19 } from "viem";
 import { useBeraWallet as useBeraWallet12, usePublicClient as usePublicClient16 } from "@berachain/wagmi/hooks";
-
-// src/actions/dex/aggregators/enso/ensoErc4626.ts
-import { ethAddress as ethAddress2, zeroAddress as zeroAddress18 } from "viem";
-var EnsoErc4626Aggregator = class extends BaseAggregator {
-  name = "Enso (Mint)" /* EnsoErc4626 */;
-  supportedChains = null;
-  type = "rest";
-  needsAccountForQuote = true;
-  notFoundMessages = [
-    "Could not build shortcuts for route",
-    "Could not quote shortcuts for route",
-    "Swap not found for a required underlying of defi route,",
-    "No route found from"
-  ];
-  async getQuote({
-    tokenIn,
-    tokenOut,
-    amount,
-    slippage,
-    account = zeroAddress18,
-    aggregatorsFeeBps,
-    proxyAggregatorsThroughVercel = false,
-    rewardVault,
-    underlyingToken
-  }) {
-    this.assertChainSupport({ tokenIn, tokenOut });
-    assertAddress(account, "account");
-    const ensoClient = getEnsoClient({
-      baseURL: proxyAggregatorsThroughVercel ? "/api/enso" : void 0
-    });
-    if (tokenIn.address === zeroAddress18) tokenIn.address = ethAddress2;
-    if (tokenOut.address === zeroAddress18) tokenOut.address = ethAddress2;
-    const zapTokenOut = underlyingToken ?? tokenOut;
-    const bundleActions = [
-      // this is the base route action, which will swap the token in to the zap token out
-      // it handles cross-chain swaps and refunds the user if the swap fails
-      // this might even be the only action if no underlying token or reward vault is provided
-      {
-        protocol: "enso",
-        action: "route",
-        args: {
-          tokenIn: tokenIn.address,
-          tokenOut: zapTokenOut.address,
-          destinationChainId: (
-            // must be undefined if the token is the same chain
-            tokenIn.chainId === zapTokenOut.chainId ? void 0 : zapTokenOut.chainId
-          ),
-          refundReceiver: account,
-          amountIn: amount,
-          slippage: slippage * 100
-          // Enso expects slippage in basis points
-        }
-      }
-    ];
-    if (underlyingToken) {
-      bundleActions.push({
-        protocol: "erc4626",
-        action: "deposit",
-        args: {
-          amountIn: { useOutputOfCallAt: 0 },
-          tokenIn: underlyingToken.address,
-          primaryAddress: tokenOut.address,
-          tokenOut: tokenOut.address
-        }
-      });
-    }
-    if (rewardVault) {
-      const offset = bundleActions.length;
-      bundleActions.push(
-        {
-          protocol: "enso",
-          action: "balance",
-          args: {
-            token: tokenOut.address
-          }
-        },
-        {
-          protocol: "erc20",
-          action: "approve",
-          args: {
-            amount: { useOutputOfCallAt: offset },
-            spender: rewardVault,
-            token: tokenOut.address
-          }
-        },
-        {
-          protocol: "enso",
-          action: "call",
-          args: {
-            address: rewardVault,
-            args: [account, { useOutputOfCallAt: offset }],
-            method: "stakeOnBehalf",
-            abi: "function stakeOnBehalf(address account, uint256 amount) external"
-          }
-        },
-        {
-          protocol: "enso",
-          action: "balance",
-          args: {
-            token: rewardVault
-          }
-        }
-      );
-    }
-    const bundle = await ensoClient.getBundleData(
-      {
-        fromAddress: account,
-        receiver: account,
-        spender: account,
-        chainId: tokenIn.chainId,
-        routingStrategy: "router"
-      },
-      bundleActions
-    );
-    const tokenOutAddress = rewardVault?.toLowerCase() ?? tokenOut.address.toLowerCase();
-    const amountOut = (
-      // @ts-expect-error enso has not typed this but is returned sometimes from API.
-      bundle.minAmountsOut?.[tokenOutAddress] ?? bundle.amountsOut[tokenOutAddress] ?? "0"
-    );
-    return {
-      amountOut,
-      amountIn: amount,
-      allowanceRequirements: this.parseAllowanceRequirements({
-        tokenIn,
-        rawAmount: amount,
-        spender: bundle.tx.to
-      }),
-      name: this.name,
-      swapFeeBps: 0,
-      priceImpactPercentage: bundle.priceImpact ? bundle.priceImpact / 100 : null,
-      getCalldata: () => ({
-        address: bundle.tx.to,
-        data: bundle.tx.data,
-        value: BigInt(bundle.tx.value ?? 0)
-        // not returning gas limit because it's usually underestimated by enso.
-        // gasLimit: BigInt(bundle.gas),
-      })
-    };
-  }
-};
-var ensoErc4626 = new EnsoErc4626Aggregator();
-
-// src/hooks/enso/useBendZapSupply.ts
 function useBendZapSupply({
   tokenIn,
   loanToken,
@@ -4193,9 +4149,6 @@ function useBendZapSupply({
   amount,
   slippage
 }, options) {
-  const { getTokenPrice } = useTokenPrices({
-    tokens: tokenIn && loanToken ? [tokenIn, loanToken] : void 0
-  });
   const swrResponse = useBendZapSupplyHelper(
     {
       tokenIn,
@@ -4224,21 +4177,12 @@ function useBendZapSupply({
       formattedAmountOut: zapSupplyAmount?.formatted ?? "0"
     }
   );
-  const isCrossChain = tokenIn?.chainId && tokenIn.chainId !== berachainChainId;
-  const { data: nativeBalanceData, isLoading: isNativeBalanceLoading } = usePollBalance(
-    {
-      address: zeroAddress19,
-      chainId: isCrossChain ? tokenIn?.chainId : void 0
-    },
-    { isEnabled: !!isCrossChain }
-  );
+  const isCrossChain = swrResponse.data?.isCrossChain;
   const transactionValue = swrResponse.data?.getCalldata?.({ account: zeroAddress19 })?.value ?? 0n;
-  const nativeBalance = nativeBalanceData?.balance ?? {
-    raw: "0",
-    formatted: "0"
-  };
-  const hasInsufficientNativeBalance = isCrossChain && transactionValue > 0n && !isNativeBalanceLoading && transactionValue > BigInt(nativeBalance.raw);
-  const nativeFee = isCrossChain && transactionValue > 0n ? formatEther4(transactionValue) : void 0;
+  const { hasInsufficientNativeBalance, nativeFee } = useCrossChainNativeFee({
+    srcChainId: isCrossChain ? swrResponse.data?.srcChainId : void 0,
+    value: transactionValue
+  });
   return {
     ...swrResponse,
     zapSupplyAmount,
@@ -4313,187 +4257,10 @@ function useBendZapSupplyHelper({
   );
 }
 
-// src/hooks/enso/useEnsoSwapBundle.ts
-import { getPublicClient as getPublicClient2 } from "@wagmi/core";
-import { parseUnits as parseUnits8 } from "viem";
-import { defaultChainId as berachainChainId2 } from "@berachain/config/internal";
-import { useBeraWallet as useBeraWallet14, useConfig as useConfig4 } from "@berachain/wagmi/hooks";
-
-// src/actions/enso/getEnsoSwapBundle.ts
-import { ethAddress as ethAddress3, zeroAddress as zeroAddress20 } from "viem";
-async function getEnsoSwapBundle({
-  fromAddress,
-  amountIn,
-  tokenIn,
-  tokenOut,
-  chainId: chainId2,
-  ensoClient,
-  destinationChainId,
-  slippage,
-  publicClient
-}) {
-  assertAddress(fromAddress, "fromAddress");
-  if (tokenOut === zeroAddress20) tokenOut = ethAddress3;
-  const bundleAction = {
-    protocol: "enso",
-    action: "route",
-    args: {
-      tokenIn,
-      tokenOut,
-      amountIn,
-      slippage: slippage * 100
-      // Enso expects slippage in basis points
-    }
-  };
-  if (destinationChainId && destinationChainId !== chainId2) {
-    bundleAction.args = {
-      ...bundleAction.args,
-      destinationChainId,
-      refundReceiver: fromAddress
-    };
-  }
-  const bundle = await ensoClient.getBundleData(
-    {
-      fromAddress,
-      receiver: fromAddress,
-      spender: fromAddress,
-      chainId: chainId2,
-      routingStrategy: "router"
-    },
-    [bundleAction]
-  );
-  const transactions = await getTransactionsFromBundle({
-    fromAddress,
-    amountIn,
-    tokenIn,
-    chainId: chainId2,
-    ensoClient,
-    bundle,
-    publicClient
-  });
-  return {
-    bundle,
-    transactions
-  };
-}
-
-// src/hooks/tokens/usePollWalletBalances.ts
-import { useMemo as useMemo9 } from "react";
-import {
-  useBeraWallet as useBeraWallet13,
-  useConfig as useConfig3,
-  usePublicClient as usePublicClient17
-} from "@berachain/wagmi/hooks";
-function usePollWalletBalances(args, options) {
-  const publicClient = usePublicClient17();
-  const wagmiConfig = useConfig3();
-  const { address: connectedAccount } = useBeraWallet13();
-  const { tokenList, refresh } = useTokens();
-  const wallet = args?.walletAddress ?? connectedAccount;
-  const tokens = useMemo9(() => {
-    return new Map(
-      (args?.tokens ?? tokenList)?.map((t) => [t.address.toLowerCase(), t]) ?? []
-    );
-  }, [tokenList, args?.tokens]);
-  const QUERY_KEY = publicClient && tokenList !== void 0 && wallet ? [
-    "usePollWalletBalances",
-    wallet,
-    // TODO: adding the whole list to the query is very inefficient, we should only add the tokens addresses
-    Array.from(tokens.values())
-  ] : null;
-  const swrResponse = useSWR(
-    QUERY_KEY,
-    async ([, wallet2, tokenList2]) => {
-      return getWalletBalances({
-        account: wallet2,
-        tokenList: tokenList2,
-        wagmiConfig
-      });
-    },
-    {
-      refreshInterval: 1e5 /* NORMAL */,
-      ...options
-    }
-  );
-  return {
-    ...swrResponse,
-    refresh: () => {
-      swrResponse?.refresh();
-      refresh();
-    }
-  };
-}
-
-// src/hooks/enso/useEnsoSwapBundle.ts
-function useEnsoSwapBundle({
-  tokenIn,
-  tokenOut,
-  amount,
-  slippage
-}) {
-  const { address: fromAddress } = useBeraWallet14();
-  const wagmiConfig = useConfig4();
-  const proxyAggregatorsThroughVercel = useBeraFlag(
-    "proxyAggregatorsThroughVercel"
-  );
-  const ensoClient = getEnsoClient({
-    baseURL: proxyAggregatorsThroughVercel ? "/api/enso" : void 0
-  });
-  const { refresh: refreshBalances } = usePollWalletBalances();
-  const isEnabled = !!tokenIn && !!tokenOut && !!amount && Number(amount) > 0 && !!slippage && !!fromAddress && !!tokenIn.chainId;
-  const QUERY_KEY = isEnabled ? [
-    "useEnsoSwapBundle",
-    fromAddress,
-    tokenIn,
-    tokenOut,
-    amount,
-    slippage,
-    proxyAggregatorsThroughVercel ?? false
-  ] : null;
-  const swrResponse = useSWR(
-    QUERY_KEY,
-    async ([, fromAddress2, tokenIn2, tokenOut2, amount2, slippage2]) => {
-      assertAddress(fromAddress2, "fromAddress");
-      assertAddress(tokenIn2?.address, "tokenInAddress");
-      assertDefined(tokenIn2?.chainId, "tokenInChainId");
-      assertAddress(tokenOut2?.address, "tokenOutAddress");
-      assertAmount(amount2, "amount");
-      assertAmount(slippage2, "slippage");
-      const publicClient = getPublicClient2(wagmiConfig, {
-        chainId: tokenIn2.chainId
-      });
-      assertPublicClient(publicClient);
-      const rawAmount = parseUnits8(amount2, tokenIn2.decimals).toString();
-      return getEnsoSwapBundle({
-        fromAddress: fromAddress2,
-        amountIn: rawAmount,
-        tokenIn: tokenIn2.address,
-        tokenOut: tokenOut2.address,
-        chainId: tokenIn2.chainId,
-        ensoClient,
-        destinationChainId: berachainChainId2,
-        slippage: slippage2,
-        publicClient
-      });
-    },
-    {
-      refreshInterval: 1e5 /* NORMAL */,
-      isEnabled
-    }
-  );
-  return {
-    ...swrResponse,
-    refresh: () => {
-      swrResponse.refresh();
-      refreshBalances();
-    }
-  };
-}
-
 // src/hooks/enso/useZapStakeBera.ts
-import { formatUnits as formatUnits9, parseUnits as parseUnits9 } from "viem";
+import { formatUnits as formatUnits9, parseUnits as parseUnits8 } from "viem";
 import { chainConfigs, defaultChainId as defaultChainId9 } from "@berachain/config/internal";
-import { useBeraWallet as useBeraWallet15 } from "@berachain/wagmi/hooks";
+import { useBeraWallet as useBeraWallet13 } from "@berachain/wagmi/hooks";
 function useZapStakeBera({
   inputToken,
   amount,
@@ -4501,7 +4268,7 @@ function useZapStakeBera({
   slippage,
   tokenOut
 }, options) {
-  const { address: account } = useBeraWallet15();
+  const { address: account } = useBeraWallet13();
   const quoteAccount = account ?? chainConfigs[defaultChainId9].bex.aggregatorsRouterExecutor;
   const isEnabled = !!inputToken && !!amount && Number(amount) > 0 && !!inputToken.chainId && !!underlyingToken && !!slippage;
   const QUERY_KEY = isEnabled ? [
@@ -4524,7 +4291,7 @@ function useZapStakeBera({
       underlyingToken2,
       tokenOut2
     ]) => {
-      const rawAmount = parseUnits9(amount2, inputToken2.decimals).toString();
+      const rawAmount = parseUnits8(amount2, inputToken2.decimals).toString();
       return ensoErc4626.getQuote({
         account: quoteAccount2,
         amount: rawAmount,
@@ -4553,13 +4320,13 @@ function useZapStakeBera({
     data: {
       ...swrResponse.data,
       priceImpactPercentage,
-      isCrossChain: inputToken && tokenOut.chainId !== inputToken?.chainId
+      isCrossChain: swrResponse.data?.isCrossChain
     }
   };
 }
 
 // src/hooks/honey/useCappedGlobally.ts
-import { usePublicClient as usePublicClient18 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient17 } from "@berachain/wagmi/hooks";
 
 // src/hooks/honey/usePythLatestPrices.ts
 function usePythLatestPrices({
@@ -4584,7 +4351,7 @@ function useCappedGlobally({
   isMint,
   isBasketModeEnabled: isBasketModeEnabled2
 }, options) {
-  const publicClient = usePublicClient18();
+  const publicClient = usePublicClient17();
   const { priceFeedMap, flags } = useHoneyConfig();
   const { data: latestPrices } = usePythLatestPrices(
     {
@@ -4633,14 +4400,14 @@ function useCappedGlobally({
 }
 
 // src/hooks/honey/useCappedRelatively.ts
-import { usePublicClient as usePublicClient19 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient18 } from "@berachain/wagmi/hooks";
 function useCappedRelatively({
   asset,
   amount,
   isMint,
   isBasketModeEnabled: isBasketModeEnabled2
 }, options) {
-  const publicClient = usePublicClient19();
+  const publicClient = usePublicClient18();
   const { collateralList, referenceCollateral } = useHoneyConfig();
   const QUERY_KEY = asset && amount ? [
     "useCappedRelatively",
@@ -4690,11 +4457,11 @@ function useCappedRelatively({
 }
 
 // src/hooks/honey/useCollateralWeights.ts
-import { usePublicClient as usePublicClient20 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient19 } from "@berachain/wagmi/hooks";
 function useCollateralWeights({
   collateralList
 }, options) {
-  const publicClient = usePublicClient20();
+  const publicClient = usePublicClient19();
   const QUERY_KEY = publicClient && collateralList ? ["useCollateralWeights", collateralList] : void 0;
   return useSWR(
     QUERY_KEY,
@@ -4721,19 +4488,19 @@ function useHoney24hVolume() {
 }
 
 // src/hooks/honey/useHoneyAlerts.ts
-import { useMemo as useMemo10 } from "react";
+import { useMemo as useMemo9 } from "react";
 
 // src/hooks/honey/useHoneyBalances.ts
 import {
-  useBeraWallet as useBeraWallet16,
-  useConfig as useConfig5,
-  usePublicClient as usePublicClient21
+  useBeraWallet as useBeraWallet14,
+  useConfig as useConfig3,
+  usePublicClient as usePublicClient20
 } from "@berachain/wagmi/hooks";
 function useHoneyBalances() {
-  const publicClient = usePublicClient21();
-  const { address: account } = useBeraWallet16();
+  const publicClient = usePublicClient20();
+  const { address: account } = useBeraWallet14();
   const { collateralList } = useHoneyConfig();
-  const wagmiConfig = useConfig5();
+  const wagmiConfig = useConfig3();
   const QUERY_KEY = account && collateralList && publicClient ? ["useHoneyBalances", account, collateralList] : null;
   return useSWR(
     QUERY_KEY,
@@ -4761,9 +4528,9 @@ function useHoneyBalances() {
 }
 
 // src/hooks/honey/useHoneyVaultsBalance.ts
-import { usePublicClient as usePublicClient22 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient21 } from "@berachain/wagmi/hooks";
 function useHoneyVaultsBalance(options) {
-  const publicClient = usePublicClient22();
+  const publicClient = usePublicClient21();
   const { collateralList } = useHoneyConfig();
   const QUERY_KEY = collateralList && publicClient ? ["useHoneyVaultsBalance", collateralList] : null;
   return useSWR(
@@ -4780,9 +4547,9 @@ function useHoneyVaultsBalance(options) {
 }
 
 // src/hooks/honey/useIsBadCollateralAsset.ts
-import { usePublicClient as usePublicClient23 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient22 } from "@berachain/wagmi/hooks";
 function useIsBadCollateralAsset({ collateral }, options) {
-  const publicClient = usePublicClient23();
+  const publicClient = usePublicClient22();
   const { priceFeedMap, flags } = useHoneyConfig();
   const { data: latestPrices } = usePythLatestPrices(
     {
@@ -4947,7 +4714,7 @@ function useHoneyAlerts({
   const redeemedVaultBalance = vaultsBalances?.find(
     (vault) => vault.address.toLowerCase() === redeemedCollateral.toLowerCase()
   );
-  const [isLiquidityDepleted, isLowLiquidity] = useMemo10(() => {
+  const [isLiquidityDepleted, isLowLiquidity] = useMemo9(() => {
     const isDepleted = getIsLiquidityLowerThan({
       lowerThan: 1,
       vaultsBalances,
@@ -4965,7 +4732,7 @@ function useHoneyAlerts({
   const {
     isMore: isRedeemMoreThanLiquidity,
     isRedeemMoreThanLiquidityCollaterals
-  } = useMemo10(() => {
+  } = useMemo9(() => {
     return getRedeemMoreThanLiquidity({
       vaultsBalances,
       redeemedVaultBalance,
@@ -4973,7 +4740,7 @@ function useHoneyAlerts({
       collateralList
     });
   }, [vaultsBalances, redeemedVaultBalance, state, collateralList]);
-  const isExceedingBalance = useMemo10(
+  const isExceedingBalance = useMemo9(
     () => getExceedingBalance({
       state,
       honeyBalances
@@ -5008,9 +4775,9 @@ import { formatUnits as formatUnits10 } from "viem";
 import { defaultChainId as defaultChainId10 } from "@berachain/config/internal";
 
 // src/hooks/honey/useIsBasketModeEnabled.ts
-import { usePublicClient as usePublicClient24 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient23 } from "@berachain/wagmi/hooks";
 function useIsBasketModeEnabled({ state }, options) {
-  const publicClient = usePublicClient24();
+  const publicClient = usePublicClient23();
   const { priceFeedMap, flags, collateralList } = useHoneyConfig();
   const { data: latestPrices } = usePythLatestPrices(
     {
@@ -5184,12 +4951,12 @@ function useHoneySwapState() {
 }
 
 // src/hooks/perps/usePythUpdateFee.ts
-import { usePublicClient as usePublicClient25 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient24 } from "@berachain/wagmi/hooks";
 function usePythUpdateFee({
   pythPriceFeedCalldata,
   tokenListLength
 }, options) {
-  const publicClient = usePublicClient25();
+  const publicClient = usePublicClient24();
   const QUERY_KEY = pythPriceFeedCalldata && pythPriceFeedCalldata.length > 0 ? ["usePythUpdateFee", pythPriceFeedCalldata] : null;
   const { data = getPythDefaultUpdateFee(tokenListLength), isLoading } = useSWRImmutable(
     QUERY_KEY,
@@ -5210,11 +4977,11 @@ function usePythUpdateFee({
 }
 
 // src/hooks/pol/useAutoclaimedIncentives.ts
-import { useBeraWallet as useBeraWallet17 } from "@berachain/wagmi/hooks";
+import { useBeraWallet as useBeraWallet15 } from "@berachain/wagmi/hooks";
 function useAutoclaimedIncentives({
   enabled
 }) {
-  const { address: account } = useBeraWallet17();
+  const { address: account } = useBeraWallet15();
   const QUERY_KEY = enabled && account ? ["useAutoclaimedIncentives", account] : null;
   return useSWR(
     QUERY_KEY,
@@ -5228,11 +4995,11 @@ function useAutoclaimedIncentives({
 }
 
 // src/hooks/pol/useAutoclaimedIncentivesTxHash.ts
-import { useBeraWallet as useBeraWallet18 } from "@berachain/wagmi/hooks";
+import { useBeraWallet as useBeraWallet16 } from "@berachain/wagmi/hooks";
 function useAutoclaimedIncentivesTxHash({
   enabled
 }) {
-  const { address: account } = useBeraWallet18();
+  const { address: account } = useBeraWallet16();
   const QUERY_KEY = enabled && account ? ["useAutoclaimedIncentivesTxHash", account] : null;
   return useSWR(
     QUERY_KEY,
@@ -5251,9 +5018,9 @@ function useAutoclaimedIncentivesTxHash({
 }
 
 // src/hooks/pol/useBgtAprSimulation.ts
-import { useMemo as useMemo11 } from "react";
+import { useMemo as useMemo10 } from "react";
 function useBgtAprSimulation(args) {
-  return useMemo11(() => {
+  return useMemo10(() => {
     if (!args) {
       return void 0;
     }
@@ -5261,29 +5028,13 @@ function useBgtAprSimulation(args) {
   }, [args]);
 }
 
-// src/hooks/pol/useBgtIncentiveDistributorPaused.ts
-import { usePublicClient as usePublicClient26 } from "@berachain/wagmi/hooks";
-function useBgtIncentiveDistributorPaused(options) {
-  const publicClient = usePublicClient26();
-  const QUERY_KEY = publicClient ? ["useBgtIncentiveDistributorPaused", publicClient.chain?.id] : null;
-  return swr_default(
-    QUERY_KEY,
-    async () => getBgtIncentiveDistributorPaused({ publicClient }).catch(() => false),
-    {
-      revalidateOnFocus: false,
-      revalidateOnReconnect: false,
-      ...options
-    }
-  );
-}
-
 // src/hooks/pol/useBgtUnstakedBalance.ts
 import { formatEther as formatEther5 } from "viem";
 import { bgtAbi } from "@berachain/abis/pol/bgt";
-import { useBeraWallet as useBeraWallet19, usePublicClient as usePublicClient27 } from "@berachain/wagmi/hooks";
+import { useBeraWallet as useBeraWallet17, usePublicClient as usePublicClient25 } from "@berachain/wagmi/hooks";
 function useBgtUnstakedBalance(options) {
-  const { address: account } = useBeraWallet19();
-  const publicClient = usePublicClient27();
+  const { address: account } = useBeraWallet17();
+  const publicClient = usePublicClient25();
   const QUERY_KEY = account && publicClient ? ["useBgtUnstakedBalance", account] : null;
   return useSWR(
     QUERY_KEY,
@@ -5309,10 +5060,10 @@ function useBgtUnstakedBalance(options) {
 
 // src/hooks/pol/useClaimableFees.ts
 import { formatUnits as formatUnits11 } from "viem";
-import { useBeraWallet as useBeraWallet20, usePublicClient as usePublicClient28 } from "@berachain/wagmi/hooks";
+import { useBeraWallet as useBeraWallet18, usePublicClient as usePublicClient26 } from "@berachain/wagmi/hooks";
 function useClaimableFees() {
-  const { address: account } = useBeraWallet20();
-  const publicClient = usePublicClient28();
+  const { address: account } = useBeraWallet18();
+  const publicClient = usePublicClient26();
   const QUERY_KEY = account && publicClient ? ["useClaimableFees", account] : null;
   return useSWR(
     QUERY_KEY,
@@ -5341,7 +5092,7 @@ import {
 } from "@berachain/graphql/pol/api";
 
 // src/hooks/pol/useRewardVaults.ts
-import { usePublicClient as usePublicClient29 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient27 } from "@berachain/wagmi/hooks";
 function useRewardVaultsQueryKey(filter, onChainIncentives = false) {
   return ["useRewardVaults", filter, onChainIncentives];
 }
@@ -5350,7 +5101,7 @@ function useRewardVaults(args, options) {
     args.filter,
     args.onChainIncentives
   );
-  const publicClient = usePublicClient29();
+  const publicClient = usePublicClient27();
   return useSWR(
     QUERY_KEY,
     async ([, filter, onChainIncentives]) => {
@@ -5388,9 +5139,9 @@ function useHighestVaultsAPR(where = {}, { isEnabled = true } = {}) {
 }
 
 // src/hooks/pol/usePollGlobalData.ts
-import { usePublicClient as usePublicClient30 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient28 } from "@berachain/wagmi/hooks";
 function usePollGlobalData(options) {
-  const publicClient = usePublicClient30();
+  const publicClient = usePublicClient28();
   return useSWR(
     publicClient ? "usePollGlobalData" : null,
     async () => {
@@ -5423,15 +5174,15 @@ function usePollMarkets(options) {
 }
 
 // src/hooks/pol/useQueuedBeraUnlock.ts
-import { isAddress as isAddress9 } from "viem";
-import { usePublicClient as usePublicClient31 } from "@berachain/wagmi/hooks";
+import { isAddress as isAddress8 } from "viem";
+import { usePublicClient as usePublicClient29 } from "@berachain/wagmi/hooks";
 function useQueuedBeraUnlock({
   receiptTokenAddresses,
   account,
   version
 }, options) {
-  const publicClient = usePublicClient31();
-  const QUERY_KEY = receiptTokenAddresses && account && publicClient && isAddress9(account) && version ? [
+  const publicClient = usePublicClient29();
+  const QUERY_KEY = receiptTokenAddresses && account && publicClient && isAddress8(account) && version ? [
     "useQueuedBeraUnlock",
     receiptTokenAddresses,
     account,
@@ -5461,12 +5212,12 @@ function useQueuedBeraUnlock({
 
 // src/hooks/pol/useRewardTokenToBeraRate.ts
 import { defaultChainId as defaultChainId11 } from "@berachain/config/internal";
-import { usePublicClient as usePublicClient32 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient30 } from "@berachain/wagmi/hooks";
 function useRewardTokenToBeraRate({
   address
 }, opt) {
-  const QUERY_KEY = address ? ["useRewardTokenToBeraRate", address] : null;
-  const publicClient = usePublicClient32({ chainId: defaultChainId11 });
+  const publicClient = usePublicClient30({ chainId: defaultChainId11 });
+  const QUERY_KEY = address && publicClient ? ["useRewardTokenToBeraRate", address] : null;
   return useSWR(
     QUERY_KEY,
     async ([_, address2]) => {
@@ -5484,9 +5235,9 @@ function useRewardTokenToBeraRate({
 }
 
 // src/hooks/pol/useOnChainRewardVault.ts
-import { erc20Abi as erc20Abi4, formatUnits as formatUnits13, isAddress as isAddress10 } from "viem";
+import { erc20Abi as erc20Abi4, formatUnits as formatUnits13, isAddress as isAddress9 } from "viem";
 import { beraChefAbi } from "@berachain/abis/pol/rewards/beraChef";
-import { usePublicClient as usePublicClient33 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient31 } from "@berachain/wagmi/hooks";
 
 // src/actions/pol/getStakingTokenInformation.ts
 import { erc20Abi as erc20Abi3, formatUnits as formatUnits12 } from "viem";
@@ -5532,12 +5283,12 @@ async function getStakingTokenInformation({
 
 // src/hooks/pol/useOnChainRewardVault.ts
 function useOnChainRewardVaultQueryKey(address) {
-  return address && isAddress10(address) ? ["onChainRewardVault", address.toLowerCase()] : null;
+  return address && isAddress9(address) ? ["onChainRewardVault", address.toLowerCase()] : null;
 }
 function useOnChainRewardVault({
   address
 }, opt) {
-  const publicClient = usePublicClient33();
+  const publicClient = usePublicClient31();
   const QUERY_KEY = useOnChainRewardVaultQueryKey(address);
   return useSWR(
     publicClient ? QUERY_KEY : null,
@@ -5649,12 +5400,12 @@ function useRewardVault(id, options) {
 }
 
 // src/hooks/pol/useRewardVaultIncentives.ts
-import { usePublicClient as usePublicClient34 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient32 } from "@berachain/wagmi/hooks";
 function useRewardVaultIncentives({
   address,
   stakingToken
 }) {
-  const publicClient = usePublicClient34();
+  const publicClient = usePublicClient32();
   const QUERY_KEY = publicClient && address && stakingToken ? ["useRewardVaultIncentives", address, stakingToken] : null;
   return useSWR(QUERY_KEY, async ([, address2, stakingToken2]) => {
     assertPublicClient(publicClient);
@@ -5667,9 +5418,9 @@ function useRewardVaultIncentives({
 }
 
 // src/hooks/pol/useRewardVaultRewards.ts
-import { usePublicClient as usePublicClient35 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient33 } from "@berachain/wagmi/hooks";
 function useRewardVaultRewards(address, options) {
-  const publicClient = usePublicClient35();
+  const publicClient = usePublicClient33();
   const QUERY_KEY = publicClient && address ? ["useRewardVaultRewards", address] : null;
   return useSWR(
     QUERY_KEY,
@@ -5705,11 +5456,11 @@ function dailyResolution(data) {
   return dailyData;
 }
 
-// src/hooks/pol/useStakedAPR.ts
-function useStakedAPR({
+// src/hooks/pol/useStakedAPY.ts
+function useStakedAPY({
   range
 }) {
-  const QUERY_KEY = range ? ["useStakedAPR", range] : null;
+  const QUERY_KEY = range ? ["useStakedAPY", range] : null;
   return useSWR(QUERY_KEY, async ([, range2]) => {
     const unsortedStakedBeraSnapshots = await getStakedBeraSnapshots({
       range: range2
@@ -5719,18 +5470,67 @@ function useStakedAPR({
     );
     return sortedStakedBeraSnapshots.map((item) => ({
       timestamp: item.timestamp,
-      apr: item.apr
+      apy: item.apy
     }));
   });
 }
 
 // src/hooks/pol/useStakedData.ts
 import { useMemo as useMemo12 } from "react";
-import { useBeraWallet as useBeraWallet21, usePublicClient as usePublicClient36 } from "@berachain/wagmi/hooks";
+import { useBeraWallet as useBeraWallet20, usePublicClient as usePublicClient35 } from "@berachain/wagmi/hooks";
+
+// src/hooks/tokens/usePollWalletBalances.ts
+import { useMemo as useMemo11 } from "react";
+import {
+  useBeraWallet as useBeraWallet19,
+  useConfig as useConfig4,
+  usePublicClient as usePublicClient34
+} from "@berachain/wagmi/hooks";
+function usePollWalletBalances(args, options) {
+  const publicClient = usePublicClient34();
+  const wagmiConfig = useConfig4();
+  const { address: connectedAccount } = useBeraWallet19();
+  const { tokenList, refresh } = useTokens();
+  const wallet = args?.walletAddress ?? connectedAccount;
+  const tokens = useMemo11(() => {
+    return new Map(
+      (args?.tokens ?? tokenList)?.map((t) => [t.address.toLowerCase(), t]) ?? []
+    );
+  }, [tokenList, args?.tokens]);
+  const QUERY_KEY = publicClient && tokenList !== void 0 && wallet ? [
+    "usePollWalletBalances",
+    wallet,
+    // TODO: adding the whole list to the query is very inefficient, we should only add the tokens addresses
+    Array.from(tokens.values())
+  ] : null;
+  const swrResponse = useSWR(
+    QUERY_KEY,
+    async ([, wallet2, tokenList2]) => {
+      return getWalletBalances({
+        account: wallet2,
+        tokenList: tokenList2,
+        wagmiConfig
+      });
+    },
+    {
+      refreshInterval: 1e5 /* NORMAL */,
+      ...options
+    }
+  );
+  return {
+    ...swrResponse,
+    refresh: () => {
+      swrResponse?.refresh();
+      refresh();
+    }
+  };
+}
+
+// src/hooks/pol/useStakedData.ts
 function useStakedData(stakingConfigs) {
   const window2 = useBeraFlag("swberaAprWindow");
-  const publicClient = usePublicClient36();
-  const { address: account } = useBeraWallet21();
+  const publicClient = usePublicClient35();
+  const { address: account } = useBeraWallet20();
   const receiptTokens = useMemo12(
     () => stakingConfigs.map((config) => config.receiptToken),
     [stakingConfigs]
@@ -5739,11 +5539,10 @@ function useStakedData(stakingConfigs) {
     () => stakingConfigs.map((config) => config.inputTokens[0]),
     [stakingConfigs]
   );
-  const aprKey = window2 ? ["useStakedData:apr", window2] : null;
-  const { data: apr } = useSWR(
-    aprKey,
-    async ([, window3]) => getStakedBeraAPR({ window: window3 }),
-    { refreshInterval: 1e5 /* NORMAL */ }
+  const apyKey = window2 ? ["useStakedData:apy", window2] : null;
+  const { data: apy } = useSWRImmutable(
+    apyKey,
+    async ([, window3]) => getStakedBeraAPY({ window: window3 })
   );
   const {
     data: walletBalances,
@@ -5811,7 +5610,7 @@ function useStakedData(stakingConfigs) {
       const stakedAmountUsd = inputTokenPrice === void 0 ? void 0 : stakedAmount.multipliedBy(inputTokenPrice).toNumber();
       return {
         token: inputToken,
-        apr,
+        apy,
         stakedAmount: stakedAmount.toNumber(),
         stakedAmountUsd,
         earnedAmount: 0,
@@ -5823,7 +5622,7 @@ function useStakedData(stakingConfigs) {
     walletBalances,
     exchangeRates,
     stakingConfigs,
-    apr,
+    apy,
     getTokenPrice,
     earningsSettled
   ]);
@@ -5847,14 +5646,14 @@ function useStakedData(stakingConfigs) {
       const earnedAmountUsd = inputTokenPrice === void 0 ? void 0 : earnedAmount.multipliedBy(inputTokenPrice).toNumber();
       return {
         token: inputToken,
-        apr,
+        apy,
         stakedAmount: stakedAmount.toNumber(),
         earnedAmount: earnedAmount.toNumber(),
         stakedAmountUsd,
         earnedAmountUsd
       };
     });
-  }, [positionsRaw, walletBalances, stakingConfigs, apr, getTokenPrice]);
+  }, [positionsRaw, walletBalances, stakingConfigs, apy, getTokenPrice]);
   return {
     /** Fast path: staked amounts + USD values (no earnings) */
     balances,
@@ -5868,7 +5667,7 @@ function useStakedData(stakingConfigs) {
     /**
      * Hard error: the RPC fast-path could not produce staked balances (wallet
      * balances or exchange-rate reads failed). Price and earnings backend
-     * failures are intentionally excluded — those degrade gracefully (USD/APR
+     * failures are intentionally excluded — those degrade gracefully (USD/APY
      * render as "—", earnings stop loading) so RPC-derived amounts still show.
      */
     error: walletBalancesError ?? exchangeRatesError,
@@ -5923,22 +5722,19 @@ function useStakedSnapshots({
 }
 
 // src/hooks/pol/useStakingVaultsMetadata.ts
-import { usePublicClient as usePublicClient37 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient36 } from "@berachain/wagmi/hooks";
 function useStakingVaultsMetadata(vaults = []) {
-  const publicClient = usePublicClient37();
-  const blockTime = useBlockTime();
-  const QUERY_KEY = vaults.length > 0 && publicClient && blockTime ? ["useStakingVaultMetadata", vaults, publicClient, blockTime] : null;
+  const publicClient = usePublicClient36();
+  const QUERY_KEY = vaults.length > 0 && publicClient ? ["useStakingVaultMetadata", vaults] : null;
   return useSWR(
     QUERY_KEY,
-    async ([, vaults2, publicClient2, blockTime2]) => {
-      assertPublicClient(publicClient2);
+    async ([, vaults2]) => {
+      assertPublicClient(publicClient);
       return Promise.all(
         vaults2.map(
           (vault) => getSWBeraVaultMetadata({
             address: vault.address,
-            underlyingAsset: vault.underlyingAsset,
-            publicClient: publicClient2,
-            blockTime: blockTime2
+            publicClient
           })
         )
       );
@@ -5948,11 +5744,11 @@ function useStakingVaultsMetadata(vaults = []) {
 }
 
 // src/hooks/pol/useTotalStakedAmount.ts
-import { usePublicClient as usePublicClient38 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient37 } from "@berachain/wagmi/hooks";
 function useTotalStakedAmount({
   vaultAddresses
 }) {
-  const publicClient = usePublicClient38();
+  const publicClient = usePublicClient37();
   return useSWR(
     vaultAddresses && publicClient ? ["useTotalStakedAmount", vaultAddresses] : null,
     ([, vaultAddresses2]) => {
@@ -5962,10 +5758,10 @@ function useTotalStakedAmount({
 }
 
 // src/hooks/pol/useUserVaultInfo.ts
-import { useBeraWallet as useBeraWallet22, usePublicClient as usePublicClient39 } from "@berachain/wagmi/hooks";
+import { useBeraWallet as useBeraWallet21, usePublicClient as usePublicClient38 } from "@berachain/wagmi/hooks";
 function useUserVaultInfo(args, options) {
-  const { address: account } = useBeraWallet22();
-  const publicClient = usePublicClient39();
+  const { address: account } = useBeraWallet21();
+  const publicClient = usePublicClient38();
   const QUERY_KEY = account && publicClient && args.vaultAddress ? ["useUserVaultInfo", account, args.vaultAddress] : null;
   return useSWR(
     QUERY_KEY,
@@ -5985,10 +5781,10 @@ function useUserVaultInfo(args, options) {
 }
 
 // src/hooks/pol/useUserVaults.ts
-import { useBeraWallet as useBeraWallet23, usePublicClient as usePublicClient40 } from "@berachain/wagmi/hooks";
+import { useBeraWallet as useBeraWallet22, usePublicClient as usePublicClient39 } from "@berachain/wagmi/hooks";
 function useUserVaults(options) {
-  const { address: account } = useBeraWallet23();
-  const publicClient = usePublicClient40();
+  const { address: account } = useBeraWallet22();
+  const publicClient = usePublicClient39();
   const QUERY_KEY = account && publicClient ? ["useUserVaults", account] : null;
   return useSWR(
     QUERY_KEY,
@@ -6008,9 +5804,9 @@ function useUserVaults(options) {
 }
 
 // src/hooks/pol/useVaultAddress.ts
-import { usePublicClient as usePublicClient41 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient40 } from "@berachain/wagmi/hooks";
 function useVaultAddress(vaultAddress) {
-  const publicClient = usePublicClient41();
+  const publicClient = usePublicClient40();
   const QUERY_KEY = vaultAddress && publicClient ? ["useVaultAddress", vaultAddress] : null;
   return useSWR(QUERY_KEY, async ([, vaultAddress2]) => {
     assertPublicClient(publicClient);
@@ -6078,17 +5874,17 @@ function useBeraCurrentPrice(opts) {
 }
 
 // src/hooks/tokens/useStakingTokenInformation.ts
-import { isAddress as isAddress11, zeroAddress as zeroAddress21 } from "viem";
-import { usePublicClient as usePublicClient42 } from "@berachain/wagmi/hooks";
+import { isAddress as isAddress10, zeroAddress as zeroAddress20 } from "viem";
+import { usePublicClient as usePublicClient41 } from "@berachain/wagmi/hooks";
 function useStakingTokenInformation(args, options) {
-  const publicClient = usePublicClient42();
-  const QUERY_KEY = args?.address && publicClient && isAddress11(args.address) ? ["useStakingTokenInformation", args.address] : null;
+  const publicClient = usePublicClient41();
+  const QUERY_KEY = args?.address && publicClient && isAddress10(args.address) ? ["useStakingTokenInformation", args.address] : null;
   return useSWRImmutable(
     QUERY_KEY,
     async ([_, address]) => {
       if (isToken(address, "BERA")) {
         return {
-          address: zeroAddress21,
+          address: zeroAddress20,
           decimals: beraToken.decimals,
           name: beraToken.name,
           symbol: beraToken.symbol
@@ -6105,9 +5901,9 @@ function useStakingTokenInformation(args, options) {
 
 // src/hooks/tokens/useTotalSupply.ts
 import { erc20Abi as erc20Abi5 } from "viem";
-import { usePublicClient as usePublicClient43 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient42 } from "@berachain/wagmi/hooks";
 function useTotalSupply({ address }) {
-  const publicClient = usePublicClient43();
+  const publicClient = usePublicClient42();
   return useSWR(
     address && publicClient ? ["useTotalSupply", address] : null,
     ([, address2]) => {
@@ -6123,9 +5919,9 @@ function useTotalSupply({ address }) {
 }
 
 // src/hooks/useBlockToTimestamp.ts
-import { useBlockNumber, usePublicClient as usePublicClient44 } from "@berachain/wagmi/hooks";
+import { useBlockNumber, usePublicClient as usePublicClient43 } from "@berachain/wagmi/hooks";
 function useBlockToTimestamp(inputBlock) {
-  const publicClient = usePublicClient44();
+  const publicClient = usePublicClient43();
   const { config } = parseBaseArgs({ chainId: publicClient?.chain.id });
   const { data: currentBlock, isLoading } = useBlockNumber({
     cacheTime: seconds(config.averageBlockTime)
@@ -6154,7 +5950,7 @@ function useBlockToTimestamp(inputBlock) {
 
 // src/hooks/useContractWrite/useBeraContractWrite.ts
 import { useCallback as useCallback2, useReducer as useReducer2 } from "react";
-import { useBeraWagmi as useBeraWagmi3, useConfig as useConfig6 } from "@berachain/wagmi/hooks";
+import { useBeraWagmi as useBeraWagmi3, useConfig as useConfig5 } from "@berachain/wagmi/hooks";
 
 // src/hooks/useContractWrite/stateReducer.ts
 var initialState = {
@@ -6205,7 +6001,7 @@ function useBeraContractWrite({
 } = {}) {
   const [state, dispatch] = useReducer2(reducer2, initialState);
   const { account, onSmartAccountRejection } = useBeraWagmi3();
-  const wagmiConfig = useConfig6();
+  const wagmiConfig = useConfig5();
   const txConfirmationTimeout = account?.wallet?.isContract ? 6e4 * 10 : 12e4;
   const reset = useCallback2(() => {
     dispatch({ type: "confirm_reset" /* RESET */ });
@@ -6280,7 +6076,7 @@ function useBeraContractWrite({
 }
 
 // src/hooks/useGetVerifiedAbi.ts
-import { isAddress as isAddress12, zeroAddress as zeroAddress22 } from "viem";
+import { isAddress as isAddress11, zeroAddress as zeroAddress21 } from "viem";
 import { chainId } from "@berachain/config/internal";
 async function fetchVerifiedAbi(address) {
   const data = await beraFetchJson({
@@ -6295,8 +6091,8 @@ async function fetchVerifiedAbi(address) {
 }
 function useGetVerifiedAbi(address) {
   return useSWRImmutable(
-    address && isAddress12(address) && // Address zero can't be a contract for sure
-    address !== zeroAddress22 ? ["useGetVerifiedAbi", address] : null,
+    address && isAddress11(address) && // Address zero can't be a contract for sure
+    address !== zeroAddress21 ? ["useGetVerifiedAbi", address] : null,
     () => address ? fetchVerifiedAbi(address) : Promise.resolve(""),
     {}
   );
@@ -6405,7 +6201,7 @@ function useApiValidator(id, options) {
 }
 
 // src/hooks/validators/useBaselineRewardAllocation.ts
-import { usePublicClient as usePublicClient45 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient44 } from "@berachain/wagmi/hooks";
 
 // src/actions/validators/getBaselineRewardAllocation.ts
 import { rewardAllocatorFactoryAbi as rewardAllocationFactoryAbi } from "@berachain/abis/pol/rewards/rewardAllocatorFactory";
@@ -6427,7 +6223,7 @@ async function getBaselineRewardAllocation({
 
 // src/hooks/validators/useBaselineRewardAllocation.ts
 function useBaselineRewardAllocation() {
-  const publicClient = usePublicClient45();
+  const publicClient = usePublicClient44();
   return useSWR(publicClient ? ["baselineRewardAllocation"] : null, () => {
     assertPublicClient(publicClient);
     return getBaselineRewardAllocation({
@@ -6438,10 +6234,10 @@ function useBaselineRewardAllocation() {
 
 // src/hooks/validators/useManagedValidatorRole.ts
 import { useMemo as useMemo13 } from "react";
-import { useBeraWallet as useBeraWallet24, usePublicClient as usePublicClient46 } from "@berachain/wagmi/hooks";
+import { useBeraWallet as useBeraWallet23, usePublicClient as usePublicClient45 } from "@berachain/wagmi/hooks";
 
 // src/actions/validators/getValidatorRewardAllocatorAddress.ts
-import { zeroAddress as zeroAddress23 } from "viem";
+import { zeroAddress as zeroAddress22 } from "viem";
 import { beraChefAbi as beraChefAbi2 } from "@berachain/abis/pol/rewards/beraChef";
 async function getValidatorRewardAllocatorAddress({
   client,
@@ -6456,7 +6252,7 @@ async function getValidatorRewardAllocatorAddress({
       functionName: "valRewardAllocator",
       args: [pubKey]
     });
-    if (result === zeroAddress23) {
+    if (result === zeroAddress22) {
       return null;
     }
     return result;
@@ -6485,13 +6281,13 @@ function useManagedValidatorRole({
   pubKey,
   account: accountAddress
 }, options) {
-  const publicClient = usePublicClient46();
+  const publicClient = usePublicClient45();
   const mockValidatorOperator = useBeraFlag("mockValidatorOperator");
   const mockValidatorRewardAllocator = useBeraFlag(
     "mockValidatorRewardAllocator"
   );
   const QUERY_KEY = publicClient && pubKey ? ["useManagedValidatorRole", pubKey] : null;
-  const { address: connectedAccount } = useBeraWallet24();
+  const { address: connectedAccount } = useBeraWallet23();
   const account = accountAddress ?? connectedAccount;
   const swrResponse = useSWR(
     QUERY_KEY,
@@ -6533,12 +6329,12 @@ function useManagedValidatorRole({
 }
 
 // src/hooks/validators/useStakingPoolBatch.ts
-import { usePublicClient as usePublicClient47 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient46 } from "@berachain/wagmi/hooks";
 function useStakingPoolBatch({
   valPubKey,
   options
 }) {
-  const publicClient = usePublicClient47();
+  const publicClient = usePublicClient46();
   const QUERY_KEY = publicClient && valPubKey ? ["useStakingPoolBatch", valPubKey] : null;
   return useSWR(
     QUERY_KEY,
@@ -6557,16 +6353,29 @@ function useStakingPoolBatch({
 }
 
 // src/hooks/validators/useUserActiveValidators.ts
-import { useBeraWallet as useBeraWallet25, usePublicClient as usePublicClient48 } from "@berachain/wagmi/hooks";
+import { useMemo as useMemo14 } from "react";
+import { useBeraWallet as useBeraWallet24, usePublicClient as usePublicClient47 } from "@berachain/wagmi/hooks";
 function useUserActiveValidators(options) {
-  const { address: account } = useBeraWallet25();
-  const publicClient = usePublicClient48();
-  const QUERY_KEY = publicClient && account ? ["useUserActiveValidators", account] : null;
-  return useSWR(
-    QUERY_KEY,
+  const { address: account } = useBeraWallet24();
+  const publicClient = usePublicClient47();
+  const apiSwr = useSWR(
+    account ? ["useUserActiveValidatorsApi", account] : null,
     async ([, account2]) => {
-      return await getUserActiveValidators({
+      return await getUserActiveValidatorsApi({ account: account2 });
+    },
+    {
+      ...options,
+      refreshInterval: options?.refreshInterval ?? 18e4 /* SLOW */,
+      keepPreviousData: true
+    }
+  );
+  const validators = apiSwr.data;
+  const onChainSwr = useSWR(
+    publicClient && account && validators ? ["useUserActiveValidatorsOnChain", account, validators] : null,
+    async ([, account2, validators2]) => {
+      return await getUserActiveValidatorsOnChain({
         account: account2,
+        validators: validators2,
         publicClient
       });
     },
@@ -6576,16 +6385,35 @@ function useUserActiveValidators(options) {
       keepPreviousData: true
     }
   );
+  const onChainBoosts = onChainSwr.data;
+  const data = useMemo14(() => {
+    if (!validators || !onChainBoosts) return void 0;
+    return mergeUserActiveValidators({ validators, onChainBoosts });
+  }, [validators, onChainBoosts]);
+  return {
+    ...apiSwr,
+    data,
+    isLoading: apiSwr.isLoading || onChainSwr.isLoading,
+    isValidating: apiSwr.isValidating || onChainSwr.isValidating,
+    error: apiSwr.error ?? onChainSwr.error,
+    refresh: () => {
+      apiSwr.refresh();
+      onChainSwr.refresh();
+    },
+    refreshOnChain: () => {
+      onChainSwr.refresh();
+    }
+  };
 }
 
 // src/hooks/validators/useUserBoostsOnValidator.ts
-import { useBeraWallet as useBeraWallet26, usePublicClient as usePublicClient49 } from "@berachain/wagmi/hooks";
+import { useBeraWallet as useBeraWallet25, usePublicClient as usePublicClient48 } from "@berachain/wagmi/hooks";
 function useUserBoostsOnValidator({
   pubkey,
   ...args
 }) {
-  const { address: connectedAccount } = useBeraWallet26();
-  const publicClient = usePublicClient49();
+  const { address: connectedAccount } = useBeraWallet25();
+  const publicClient = usePublicClient48();
   const account = args.account ?? connectedAccount;
   const QUERY_KEY = account && pubkey ? ["useUserBoostsOnValidator", pubkey, account] : null;
   return useSWR(
@@ -6603,128 +6431,6 @@ function useUserBoostsOnValidator({
   );
 }
 
-// src/hooks/validators/useUserClaimableIncentives.ts
-import { useCallback as useCallback4, useMemo as useMemo14 } from "react";
-import { useBeraWallet as useBeraWallet27 } from "@berachain/wagmi/hooks";
-
-// src/utils/formatIncentivesTokenMap.ts
-function formatIncentivesTokenMap(allRewards) {
-  const tokenMap = /* @__PURE__ */ new Set();
-  for (const item of allRewards) {
-    if (Array.isArray(item.rewards)) {
-      for (const reward of item.rewards) {
-        if (reward.token) {
-          tokenMap.add(reward.token);
-        }
-      }
-    }
-  }
-  return tokenMap;
-}
-
-// src/hooks/validators/useUserClaimableIncentives.ts
-function useUserClaimableIncentives() {
-  const { address: account } = useBeraWallet27();
-  const REWARDS_QUERY_KEY = account ? ["useUserClaimableIncentives", account] : null;
-  const allRewardsResponse = useSWR(
-    REWARDS_QUERY_KEY,
-    async ([, account2]) => {
-      if (!account2) {
-        throw new BeraError({
-          message: "useUserClaimableIncentives needs a logged in account",
-          level: "error"
-        });
-      }
-      return await getUserClaimableIncentives({
-        account: account2
-      });
-    },
-    {
-      revalidateOnFocus: false,
-      revalidateOnReconnect: false,
-      revalidateIfStale: false,
-      refreshInterval: 18e4 /* SLOW */
-    }
-  );
-  const allRewards = allRewardsResponse?.data;
-  const tokenMap = useMemo14(() => {
-    if (!allRewards) {
-      return void 0;
-    }
-    if (!Array.isArray(allRewards)) {
-      BeraMonitoring.captureException(
-        new BeraError({
-          message: "Incorrect aggregated incentives data receieved.",
-          level: "error",
-          extra: {
-            allRewards,
-            account
-          }
-        })
-      );
-      return void 0;
-    }
-    return formatIncentivesTokenMap(allRewards);
-  }, [allRewards, account]);
-  const QUERY_KEY = account && allRewards ? ["useUserClaimableIncentives", account, allRewards] : null;
-  const swrResponse = useSWR(
-    QUERY_KEY,
-    async ([, account2, allRewards2]) => {
-      if (!account2) {
-        throw new InvalidArgumentError({
-          property: "account",
-          value: account2,
-          expected: "Address"
-        });
-      }
-      if (!allRewards2) {
-        return [];
-      }
-      if (!Array.isArray(allRewards2)) {
-        throw new InvalidArgumentError({
-          message: "Incorrect aggregated incentives data receieved to calculate proofs.",
-          property: "allRewards",
-          value: allRewards2,
-          expected: "Array",
-          level: "error"
-        });
-      }
-      const validatorsSet = new Set(allRewards2.map((item) => item.validator));
-      const validatorAddresses = Array.from(validatorsSet);
-      return await Promise.all(
-        validatorAddresses.map(async (validator) => {
-          const proofsData = await getRewardProofsByValidator({
-            account: account2,
-            validator,
-            page: 1,
-            perPage: 1e4
-          });
-          return {
-            ...proofsData,
-            validator
-          };
-        })
-      );
-    },
-    {
-      revalidateOnFocus: false,
-      revalidateOnReconnect: false,
-      revalidateIfStale: false,
-      refreshInterval: 18e4 /* SLOW */
-    }
-  );
-  const refresh = useCallback4(() => {
-    allRewardsResponse?.refresh();
-    swrResponse?.refresh();
-  }, [allRewardsResponse, swrResponse]);
-  return {
-    ...swrResponse,
-    isLoading: allRewardsResponse?.isLoading || swrResponse?.isLoading,
-    tokenMap,
-    refresh
-  };
-}
-
 // src/hooks/validators/useUserStakingPositions.ts
 function useUserStakingPositions({
   account,
@@ -6753,9 +6459,9 @@ import { keccak256 as keccak2562 } from "viem";
 import { beaconDepositAbi } from "@berachain/abis/pol/beaconDeposit";
 import { bgtAbi as bgtAbi2 } from "@berachain/abis/pol/bgt";
 import { beraChefAbi as beraChefAbi3 } from "@berachain/abis/pol/rewards/beraChef";
-import { usePublicClient as usePublicClient50 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient49 } from "@berachain/wagmi/hooks";
 function useOnChainValidator({ pubkey }, options) {
-  const publicClient = usePublicClient50();
+  const publicClient = usePublicClient49();
   const QUERY_KEY = pubkey ? ["useOnChainValidator", pubkey] : null;
   return useSWR(
     publicClient ? QUERY_KEY : null,
@@ -6838,30 +6544,10 @@ function useValidator({ pubkey }, options) {
   };
 }
 
-// src/hooks/validators/useValidatorAnalytics.ts
-function useValidatorAnalytics({
-  pubkey,
-  dayRange
-}) {
-  const QUERY_KEY = pubkey && dayRange ? ["useValidatorAnalytics", pubkey, dayRange] : null;
-  return useSWR(
-    QUERY_KEY,
-    async ([, pubkey2, dayRange2]) => {
-      return await getValidatorAnalytics({
-        pubkey: pubkey2,
-        dayRange: dayRange2
-      });
-    },
-    {
-      refreshInterval: 18e4 /* SLOW */
-    }
-  );
-}
-
 // src/hooks/validators/useValidatorCommission.ts
-import { usePublicClient as usePublicClient51 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient50 } from "@berachain/wagmi/hooks";
 function useValidatorCommission(pubKey, options) {
-  const publicClient = usePublicClient51();
+  const publicClient = usePublicClient50();
   const QUERY_KEY = publicClient && pubKey ? ["useValidatorCommission", pubKey] : null;
   return swr_default(
     QUERY_KEY,
@@ -6946,9 +6632,9 @@ function useValidatorIncentiveDistribution({
 }
 
 // src/hooks/validators/useValidatorQueuedCommission.ts
-import { usePublicClient as usePublicClient52 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient51 } from "@berachain/wagmi/hooks";
 function useValidatorQueuedCommission(pubKey, options) {
-  const publicClient = usePublicClient52();
+  const publicClient = usePublicClient51();
   const QUERY_KEY = publicClient && pubKey ? ["useValidatorQueuedCommission", pubKey] : null;
   return useSWR(
     QUERY_KEY,
@@ -6966,9 +6652,9 @@ function useValidatorQueuedCommission(pubKey, options) {
 }
 
 // src/hooks/validators/useValidatorQueuedOperatorAddress.ts
-import { usePublicClient as usePublicClient53 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient52 } from "@berachain/wagmi/hooks";
 function useValidatorQueuedOperatorAddress(pubKey, options) {
-  const publicClient = usePublicClient53();
+  const publicClient = usePublicClient52();
   const QUERY_KEY = publicClient && pubKey ? ["useValidatorQueuedOperatorAddress", pubKey] : null;
   return useSWR(
     QUERY_KEY,
@@ -6985,9 +6671,9 @@ function useValidatorQueuedOperatorAddress(pubKey, options) {
 }
 
 // src/hooks/validators/useValidatorQueuedRewardAllocation.ts
-import { usePublicClient as usePublicClient54 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient53 } from "@berachain/wagmi/hooks";
 function useValidatorQueuedRewardAllocation(pubKey, options) {
-  const publicClient = usePublicClient54();
+  const publicClient = usePublicClient53();
   const QUERY_KEY = publicClient && pubKey ? ["useValidatorQueuedRewardAllocation", pubKey] : null;
   return useSWR(
     QUERY_KEY,
@@ -7004,9 +6690,9 @@ function useValidatorQueuedRewardAllocation(pubKey, options) {
 }
 
 // src/hooks/validators/useValidatorRewardAllocation.ts
-import { usePublicClient as usePublicClient55 } from "@berachain/wagmi/hooks";
+import { usePublicClient as usePublicClient54 } from "@berachain/wagmi/hooks";
 function useValidatorRewardAllocation(pubKey, options) {
-  const publicClient = usePublicClient55();
+  const publicClient = usePublicClient54();
   const QUERY_KEY = publicClient && pubKey ? ["useValidatorRewardAllocation", pubKey] : null;
   return useSWR(
     QUERY_KEY,
@@ -7024,6 +6710,8 @@ function useValidatorRewardAllocation(pubKey, options) {
 export {
   OracleMode,
   USE_AGGREGATORS_QUOTES_QUERY_KEY,
+  fetchMultipleTokenInformation,
+  isNativeFeeInsufficient,
   reducer,
   useAggregatorsQuotes,
   useAggregatorsRouterFeeBps,
@@ -7047,7 +6735,6 @@ export {
   useBeraCurrentPrice,
   useBexStatus,
   useBgtAprSimulation,
-  useBgtIncentiveDistributorPaused,
   useBgtUnstakedBalance,
   useBlockToTimestamp,
   useCappedGlobally,
@@ -7055,7 +6742,7 @@ export {
   useClaimableFees,
   useCollateralWeights,
   useCreatePool,
-  useEnsoSwapBundle,
+  useCrossChainNativeFee,
   useEnsoUserTokensWithBalances,
   useGetConvertToAssets,
   useGetVerifiedAbi,
@@ -7104,7 +6791,7 @@ export {
   useRewardVaults,
   useRewardVaultsQueryKey,
   useSingleAggregatorQuote,
-  useStakedAPR,
+  useStakedAPY,
   useStakedData,
   useStakedSnapshots,
   useStakingPoolBatch,
@@ -7119,12 +6806,10 @@ export {
   useTotalSupply,
   useUserActiveValidators,
   useUserBoostsOnValidator,
-  useUserClaimableIncentives,
   useUserStakingPositions,
   useUserVaultInfo,
   useUserVaults,
   useValidator,
-  useValidatorAnalytics,
   useValidatorCommission,
   useValidatorEstimatedBgtPerYear,
   useValidatorIncentiveDistribution,