@bananapus/nana-sdk-react 12.0.0 → 13.0.0

package/dist/index.js

@@ -1,8 +1,14 @@
+"use client";
+"use client";
+
 // src/components/NativeTokenValue.tsx
 import { NATIVE_TOKEN_DECIMALS, formatUnits } from "@bananapus/nana-sdk-core";
 
 // src/hooks/token/useNativeTokenSymbol.ts
-import { DEFAULT_NATIVE_TOKEN_SYMBOL, JB_CHAINS } from "@bananapus/nana-sdk-core";
+import {
+  DEFAULT_NATIVE_TOKEN_SYMBOL,
+  JB_CHAINS
+} from "@bananapus/nana-sdk-core";
 
 // src/contexts/JBChainContext/JBChainContext.tsx
 import { debug } from "@bananapus/nana-sdk-core";
@@ -25,7 +31,8 @@ var JBChainProvider = ({
 
 // src/hooks/token/useNativeTokenSymbol.ts
 function useNativeTokenSymbol(chainId) {
-  const _chainId = chainId ?? useJBChainId();
+  const contextChainId = useJBChainId();
+  const _chainId = chainId ?? contextChainId;
   if (!_chainId) {
     return DEFAULT_NATIVE_TOKEN_SYMBOL;
   }
@@ -34,7 +41,10 @@ function useNativeTokenSymbol(chainId) {
 
 // src/components/NativeTokenValue.tsx
 import { Fragment, jsxs } from "react/jsx-runtime";
-function NativeTokenValue({ wei, decimals = 4 }) {
+function NativeTokenValue({
+  wei,
+  decimals = 4
+}) {
   const symbol = useNativeTokenSymbol();
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     formatUnits(wei, NATIVE_TOKEN_DECIMALS, {
@@ -47,20 +57,28 @@ function NativeTokenValue({ wei, decimals = 4 }) {
 
 // src/contexts/JBContractContext/JBContractContext.tsx
 import {
-  NATIVE_TOKEN as NATIVE_TOKEN4,
+  NATIVE_TOKEN as NATIVE_TOKEN5,
   debug as debug10,
   USDC_ADDRESSES,
-  jbDirectoryAbi,
-  jbControllerAbi as jbControllerAbi5,
+  jbDirectoryAbi as jbDirectoryAbi2,
+  jbControllerAbi as jbControllerAbi6,
   jbContractAddress as jbContractAddress2,
-  JBCoreContracts as JBCoreContracts3,
-  getJBContractAddress as getJBContractAddress2
+  JBCoreContracts as JBCoreContracts4,
+  getJBContractAddress as getJBContractAddress3
 } from "@bananapus/nana-sdk-core";
-import { createContext as createContext8, useCallback, useContext as useContext8, useMemo as useMemo5 } from "react";
+import {
+  createContext as createContext8,
+  useCallback,
+  useContext as useContext8,
+  useMemo as useMemo5
+} from "react";
 import { isAddressEqual as isAddressEqual4, zeroAddress as zeroAddress4 } from "viem";
 
 // src/hooks/usePreparePayMetadata.ts
-import { DEFAULT_ALLOW_OVERSPENDING, createHookMetadata } from "@bananapus/nana-sdk-core";
+import {
+  DEFAULT_ALLOW_OVERSPENDING,
+  createHookMetadata
+} from "@bananapus/nana-sdk-core";
 import { encodeAbiParameters } from "viem";
 
 // src/hooks/jb721Hook/helpers.ts
@@ -103,7 +121,10 @@ function encodeJB721HookPayMetadata(metadata) {
     metadata.allowOverspending ?? DEFAULT_ALLOW_OVERSPENDING,
     metadata.tierIdsToMint.map(Number)
   ];
-  const encoded = encodeAbiParameters([{ type: "bool" }, { type: "uint16[]" }], args);
+  const encoded = encodeAbiParameters(
+    [{ type: "bool" }, { type: "uint16[]" }],
+    args
+  );
   return encoded;
 }
 function usePreparePayMetadata({
@@ -222,8 +243,12 @@ function useResolveDataHook({
         resolvedDataHook = tiered721Hook;
       } else if (extraDataHook && !isAddressEqual(extraDataHook, zeroAddress)) {
         resolvedDataHook = extraDataHook;
+      } else if (tiered721Hook === void 0 || extraDataHook === void 0) {
+        resolvedDataHook = void 0;
       }
-    } else if (legacyDataHookQuery.data?.[2]) {
+    } else if (legacyDataHookQuery.data === void 0) {
+      resolvedDataHook = void 0;
+    } else if (legacyDataHookQuery.data[2]) {
       resolvedDataHook = legacyDataHookQuery.data[2];
     }
   }
@@ -254,16 +279,20 @@ function useJBRulesetMetadata() {
   const { rulesetMetadata } = useJBRulesetContext();
   return rulesetMetadata;
 }
-var JBRulesetProvider = ({ children }) => {
+var JBRulesetProvider = ({
+  children
+}) => {
   const { contracts, projectId, version } = useJBContractContext();
   const chainId = useJBChainId();
+  const controllerAddress = contracts.controller.data ?? void 0;
   const { data: ruleset, isLoading } = useReadContract3({
     chainId,
     abi: jbControllerAbi,
     functionName: "currentRulesetOf",
-    address: contracts.controller.data ?? void 0,
+    address: controllerAddress,
     args: [projectId],
     query: {
+      enabled: !!controllerAddress,
       select([ruleset2, rulesetMetadata]) {
         return {
           data: {
@@ -274,7 +303,9 @@ var JBRulesetProvider = ({ children }) => {
           metadata: {
             ...rulesetMetadata,
             cashOutTaxRate: new CashOutTaxRate(rulesetMetadata.cashOutTaxRate),
-            reservedPercent: new ReservedPercent(rulesetMetadata.reservedPercent),
+            reservedPercent: new ReservedPercent(
+              rulesetMetadata.reservedPercent
+            ),
             // v4/v5 store the INVERSE flag (`useTotalSurplusForCashOuts`) in this slot;
             // normalize to the v6 field's semantics.
             scopeCashOutsToLocalBalances: version === 6 ? rulesetMetadata.scopeCashOutsToLocalBalances : !rulesetMetadata.scopeCashOutsToLocalBalances
@@ -283,38 +314,31 @@ var JBRulesetProvider = ({ children }) => {
       }
     }
   });
-  const { resolvedDataHook } = useResolveDataHook({
-    dataHookAddress: ruleset?.metadata?.dataHook,
-    projectId,
-    chainId,
-    rulesetId: BigInt(ruleset?.data.id ?? 0)
-  });
-  const rulesetMetadataWithResolvedDataHook = ruleset?.metadata && {
-    ...ruleset.metadata,
-    dataHook: resolvedDataHook
+  const { resolvedDataHook, isLoading: isDataHookLoading } = useResolveDataHook(
+    {
+      dataHookAddress: ruleset?.metadata?.dataHook,
+      projectId,
+      chainId,
+      rulesetId: ruleset?.data.id === void 0 ? void 0 : BigInt(ruleset.data.id)
+    }
+  );
+  const isRulesetLoading = Boolean(isLoading || contracts.controller.isLoading);
+  const rulesetMetadataWithResolvedDataHook = ruleset?.metadata && resolvedDataHook ? { ...ruleset.metadata, dataHook: resolvedDataHook } : void 0;
+  const rulesetState = { data: ruleset?.data, isLoading: isRulesetLoading };
+  const rulesetMetadataState = {
+    data: rulesetMetadataWithResolvedDataHook,
+    isLoading: Boolean(isRulesetLoading || isDataHookLoading)
   };
   debug3("JBRulesetContext", {
-    ruleset: {
-      data: ruleset?.data,
-      isLoading
-    },
-    rulesetMetadata: {
-      data: rulesetMetadataWithResolvedDataHook,
-      isLoading
-    }
+    ruleset: rulesetState,
+    rulesetMetadata: rulesetMetadataState
   });
   return /* @__PURE__ */ jsx2(
     JBRulesetContext.Provider,
     {
       value: {
-        ruleset: {
-          data: ruleset?.data,
-          isLoading
-        },
-        rulesetMetadata: {
-          data: rulesetMetadataWithResolvedDataHook,
-          isLoading
-        }
+        ruleset: rulesetState,
+        rulesetMetadata: rulesetMetadataState
       },
       children
     }
@@ -354,7 +378,8 @@ function useFind721DataHook() {
   const { data } = useJBDataHookContext();
   const { projectId, version } = useJBContractContext();
   const { ruleset } = useJBRulesetContext();
-  const publicClient = usePublicClient();
+  const chainId = useJBChainId();
+  const publicClient = usePublicClient({ chainId });
   const rulesetId = ruleset.data?.id;
   const dataHookAddress = data?.dataHookAddress;
   debug5("useFind721DataHook::args", {
@@ -364,7 +389,17 @@ function useFind721DataHook() {
     publicClient
   });
   const jb721DataHookQuery = useQuery({
-    queryKey: ["dataHook", projectId, rulesetId, dataHookAddress],
+    // Chain and version are read inputs, and with `staleTime: Infinity` a key
+    // that omits them serves one chain's (or version's) hook for another's.
+    queryKey: [
+      "dataHook",
+      chainId,
+      version,
+      projectId,
+      rulesetId,
+      dataHookAddress
+    ],
+    enabled: !!chainId && !!rulesetId && !!dataHookAddress,
     staleTime: Infinity,
     queryFn: async () => {
       if (!rulesetId || !dataHookAddress) return null;
@@ -410,14 +445,19 @@ function JBCurrentDataHookProvider({
 }
 
 // src/contexts/JBProjectMetadataContext/JBProjectMetadataContext.tsx
-import { debug as debug7, getProjectMetadata } from "@bananapus/nana-sdk-core";
+import {
+  debug as debug7,
+  getProjectMetadata
+} from "@bananapus/nana-sdk-core";
 import { createContext as createContext4, useContext as useContext4 } from "react";
 import { usePublicClient as usePublicClient2 } from "wagmi";
 import { useQuery as useQuery2 } from "wagmi/query";
 import { jsx as jsx5 } from "react/jsx-runtime";
-var JBProjectMetadataContext = createContext4({
-  metadata: AsyncDataNone
-});
+var JBProjectMetadataContext = createContext4(
+  {
+    metadata: AsyncDataNone
+  }
+);
 function useJBProjectMetadataContext() {
   return useContext4(JBProjectMetadataContext);
 }
@@ -429,13 +469,18 @@ function useProjectMetadata({
   const chainId = useJBChainId();
   const publicClient = usePublicClient2({ chainId });
   return useQuery2({
+    // The chain is part of the read's identity: the same project id resolves to
+    // a different project on every chain, so omitting it lets one chain's name
+    // and logo be served for another's project.
     queryKey: [
       "juice-sdk",
       "useProjectMetadata",
+      chainId,
       projectId?.toString(),
       jbControllerAddress,
       ipfsGatewayHostname
     ],
+    enabled: !!chainId && !!projectId && !!jbControllerAddress,
     queryFn: async () => {
       if (!projectId || !jbControllerAddress) return null;
       if (!publicClient) {
@@ -519,13 +564,19 @@ var JBTokenProvider = ({
     version,
     contracts: { controller }
   } = useJBContractContext();
-  const { data: tokenAddress } = useReadContract4({
-    address: getJBContractAddress(JBCoreContracts.JBTokens, version, chainId),
+  let jbTokensAddress;
+  try {
+    jbTokensAddress = chainId ? getJBContractAddress(JBCoreContracts.JBTokens, version, chainId) : void 0;
+  } catch {
+    jbTokensAddress = void 0;
+  }
+  const { data: tokenAddress, isLoading: isTokenAddressLoading } = useReadContract4({
+    address: jbTokensAddress,
     abi: jbTokensAbi,
     functionName: "tokenOf",
     chainId,
     args: [projectId],
-    query: { enabled: !!projectId && !!chainId && !!version }
+    query: { enabled: !!projectId && !!jbTokensAddress }
   });
   const fetchTokenEnabled = Boolean(
     tokenAddress && !isAddressEqual2(tokenAddress, zeroAddress2)
@@ -550,10 +601,18 @@ var JBTokenProvider = ({
     JBTokenContext.Provider,
     {
       value: {
-        token,
+        // The ERC-20 read is disabled until `tokenOf` answers, which would
+        // otherwise publish `isLoading: false, data: undefined` — "this project
+        // has no token" — on every page load.
+        token: {
+          ...token,
+          isLoading: Boolean(token.isLoading || isTokenAddressLoading)
+        },
         totalOutstanding: {
           data: totalOutstandingData,
-          isLoading: totalOutstandingRes?.isLoading
+          isLoading: Boolean(
+            totalOutstandingRes?.isLoading || controller?.isLoading
+          )
         }
       },
       children
@@ -567,7 +626,10 @@ import { debug as debug8 } from "@bananapus/nana-sdk-core";
 // src/contexts/JBTerminalContext/JBTerminalContext.tsx
 import { jbMultiTerminalAbi } from "@bananapus/nana-sdk-core";
 import { createContext as createContext6, useContext as useContext6 } from "react";
-import { isAddressEqual as isAddressEqual3, zeroAddress as zeroAddress3 } from "viem";
+import {
+  isAddressEqual as isAddressEqual3,
+  zeroAddress as zeroAddress3
+} from "viem";
 import { useReadContract as useReadContract5 } from "wagmi";
 import { jsx as jsx7 } from "react/jsx-runtime";
 var JBTerminalContext = createContext6({
@@ -578,7 +640,10 @@ var JBTerminalContext = createContext6({
 function useJBTerminalContext() {
   return useContext6(JBTerminalContext);
 }
-var JBTerminalProvider = ({ address, children }) => {
+var JBTerminalProvider = ({
+  address,
+  children
+}) => {
   const chainId = useJBChainId();
   const { data: store, isLoading: isStoreLoading } = useReadContract5({
     abi: jbMultiTerminalAbi,
@@ -617,15 +682,16 @@ function JBPrimaryNativeTerminalProvider({
   children
 }) {
   const { contracts } = useJBContractContext();
-  const terminalAddress = contracts?.primaryNativeTerminal?.data;
+  const terminalAddress = contracts?.primaryNativeTerminal?.data ?? void 0;
   debug8("JBPrimaryNativeTerminalProvider", { terminalAddress });
-  if (!terminalAddress) return children;
   return /* @__PURE__ */ jsx8(JBTerminalProvider, { address: terminalAddress, children });
 }
 
 // src/contexts/JBProjectProvider/JBProjectProvider.tsx
 import { jsx as jsx9 } from "react/jsx-runtime";
-var JBProjectContext = createContext7(void 0);
+var JBProjectContext = createContext7(
+  void 0
+);
 var JBProjectProvider = ({
   projectId,
   chainId,
@@ -634,24 +700,43 @@ var JBProjectProvider = ({
   version,
   bendystraw
 }) => {
-  return /* @__PURE__ */ jsx9(JBProjectContext.Provider, { value: { chainId, projectId, version, bendystraw }, children: /* @__PURE__ */ jsx9(JBChainProvider, { chainId, children: /* @__PURE__ */ jsx9(JBContractProvider, { projectId, version, ...ctxProps?.contract, children: /* @__PURE__ */ jsx9(JBRulesetProvider, { children: /* @__PURE__ */ jsx9(JBProjectMetadataProvider, { ...ctxProps?.metadata, children: /* @__PURE__ */ jsx9(JBCurrentDataHookProvider, { children: /* @__PURE__ */ jsx9(JBPrimaryNativeTerminalProvider, { children: /* @__PURE__ */ jsx9(JBTokenProvider, { ...ctxProps?.token, children }) }) }) }) }) }) }) });
+  return /* @__PURE__ */ jsx9(
+    JBProjectContext.Provider,
+    {
+      value: { chainId, projectId, version, bendystraw },
+      children: /* @__PURE__ */ jsx9(JBChainProvider, { chainId, children: /* @__PURE__ */ jsx9(
+        JBContractProvider,
+        {
+          projectId,
+          version,
+          ...ctxProps?.contract,
+          children: /* @__PURE__ */ jsx9(JBRulesetProvider, { children: /* @__PURE__ */ jsx9(JBProjectMetadataProvider, { ...ctxProps?.metadata, children: /* @__PURE__ */ jsx9(JBCurrentDataHookProvider, { children: /* @__PURE__ */ jsx9(JBPrimaryNativeTerminalProvider, { children: /* @__PURE__ */ jsx9(JBTokenProvider, { ...ctxProps?.token, children }) }) }) }) })
+        }
+      ) })
+    }
+  );
 };
 function useJBProject() {
-  return useContext7(JBProjectContext);
+  const context = useContext7(JBProjectContext);
+  if (!context) return void 0;
+  const { bendystraw: _bendystraw, ...project } = context;
+  return project;
 }
 function useBendystrawConfig() {
   return useContext7(JBProjectContext)?.bendystraw;
 }
 
 // src/lib/bendystraw/getBendystrawUrl.ts
-import { arbitrum, base, mainnet as mainnet2, optimism } from "viem/chains";
+import { JB_CHAINS as JB_CHAINS2 } from "@bananapus/nana-sdk-core";
 var bendystrawUrl = "https://bendystraw.xyz";
 var testnetBendystrawUrl = "https://testnet.bendystraw.xyz";
 function getBendystrawUrl(chainId, config) {
   const { url, apiKey } = config;
-  if (url) return `${url}/${apiKey}`;
-  const isMainnet = [mainnet2, base, arbitrum, optimism].some((c) => c.id === chainId);
-  return `${isMainnet ? bendystrawUrl : testnetBendystrawUrl}${apiKey !== "" ? `/${apiKey}` : ""}`;
+  const keyPath = apiKey !== "" ? `/${apiKey}` : "";
+  if (url) return `${url}${keyPath}`;
+  const chain = JB_CHAINS2[chainId]?.chain;
+  const isMainnet = chain ? !chain.testnet : false;
+  return `${isMainnet ? bendystrawUrl : testnetBendystrawUrl}${keyPath}`;
 }
 
 // src/lib/bendystraw/useBendystrawQuery.ts
@@ -684,21 +769,21 @@ function useBendystrawQuery(document, ...[variables, options]) {
 
 // src/hooks/suckers/useSuckers.ts
 import {
-  arbitrum as arbitrum2,
+  arbitrum,
   arbitrumSepolia,
-  base as base2,
+  base,
   baseSepolia,
-  mainnet as mainnet3,
-  optimism as optimism2,
+  mainnet as mainnet2,
+  optimism,
   optimismSepolia,
   sepolia
 } from "viem/chains";
 import { useMemo as useMemo2 } from "react";
 var chainOrder = [
-  mainnet3.id,
-  base2.id,
-  optimism2.id,
-  arbitrum2.id,
+  mainnet2.id,
+  base.id,
+  optimism.id,
+  arbitrum.id,
   sepolia.id,
   baseSepolia.id,
   optimismSepolia.id,
@@ -3387,7 +3472,9 @@ function useNativeTokenSurplus({
     version,
     contracts: { primaryNativeTerminal }
   } = useJBContractContext();
-  const _chainId = chainId ?? useJBChainId();
+  const contextChainId = useJBChainId();
+  const _chainId = chainId ?? contextChainId;
+  const isContextChain = !!_chainId && _chainId === contextChainId;
   const v6Query = useReadContract6({
     chainId: _chainId,
     abi: jbMultiTerminalAbi2,
@@ -3399,7 +3486,7 @@ function useNativeTokenSurplus({
       BigInt(NATIVE_TOKEN_DECIMALS2),
       BigInt(ETH_CURRENCY_ID)
     ],
-    query: { enabled: version === 6 }
+    query: { enabled: version === 6 && isContextChain }
   });
   const legacyQuery = useReadContract6({
     chainId: _chainId,
@@ -3418,7 +3505,7 @@ function useNativeTokenSurplus({
       BigInt(NATIVE_TOKEN_DECIMALS2),
       BigInt(ETH_CURRENCY_ID)
     ],
-    query: { enabled: version !== 6 }
+    query: { enabled: version !== 6 && isContextChain }
   });
   return version === 6 ? v6Query : legacyQuery;
 }
@@ -3504,14 +3591,31 @@ function useSuckersNativeTokenSurplus() {
 import {
   applyJbDaoCashOutFee,
   ETH_CURRENCY_ID as ETH_CURRENCY_ID3,
+  getJBContractAddress as getJBContractAddress2,
   getProjectTerminalStore,
+  getTokenCashOutQuoteEth,
+  jbController4_1Abi,
+  jbControllerAbi as jbControllerAbi3,
+  jbControllerV5Abi,
+  JBCoreContracts as JBCoreContracts2,
+  jbDirectoryAbi,
   jbTerminalStoreAbi,
   jbTerminalStoreV5Abi,
+  NATIVE_TOKEN as NATIVE_TOKEN3,
   NATIVE_TOKEN_DECIMALS as NATIVE_TOKEN_DECIMALS4
 } from "@bananapus/nana-sdk-core";
 import { getContract as getContract2 } from "viem";
 import { useConfig as useConfig2 } from "wagmi";
 import { useQuery as useQuery5 } from "wagmi/query";
+var V6_NATIVE_TOKEN_CURRENCY_ID = Number(BigInt(NATIVE_TOKEN3) & 0xffffffffn);
+function nativeCurrencyId(version) {
+  return version === 6 ? V6_NATIVE_TOKEN_CURRENCY_ID : ETH_CURRENCY_ID3;
+}
+function controllerAbi(version) {
+  if (version === 6) return jbControllerAbi3;
+  if (version === 5) return jbControllerV5Abi;
+  return jbController4_1Abi;
+}
 function useSuckersCashOutQuote(tokenAmountWei) {
   const config = useConfig2();
   const chainId = useJBChainId();
@@ -3529,41 +3633,86 @@ function useSuckersCashOutQuote(tokenAmountWei) {
     enabled: Boolean(!isLoading && chainId),
     queryFn: async () => {
       if (!chainId) return null;
-      const quotes = await Promise.all(
-        pairs.map(async ({ peerChainId, projectId: projectId2 }) => {
-          return getTokenRedemptionQuote(
-            config,
-            peerChainId,
-            projectId2,
-            tokenAmountWei,
-            version
-          );
-        }) ?? []
-      );
-      return quotes.reduce((acc, quote) => acc + quote, 0n);
+      const members = pairs.length > 0 ? pairs : [{ peerChainId: chainId, projectId }];
+      const [totals, cashOutTaxRate] = await Promise.all([
+        Promise.all(
+          members.map(
+            ({ peerChainId, projectId: projectId2 }) => getChainSurplusAndSupply(
+              config,
+              peerChainId,
+              projectId2,
+              version
+            )
+          )
+        ),
+        getCashOutTaxRate(config, chainId, projectId, version)
+      ]);
+      return getTokenCashOutQuoteEth(tokenAmountWei, {
+        overflowWei: totals.reduce((acc, { surplus }) => acc + surplus, 0n),
+        totalSupply: totals.reduce(
+          (acc, { totalSupply }) => acc + totalSupply,
+          0n
+        ),
+        cashOutTaxRate,
+        // `totalTokenSupplyWithReservedTokensOf` already includes pending
+        // reserved tokens.
+        tokensReserved: 0n
+      });
     }
   });
-  const netTotal = applyJbDaoCashOutFee(suckersQuote.data ?? 0n);
+  const netTotal = suckersQuote.data != null ? applyJbDaoCashOutFee(suckersQuote.data) : void 0;
   return {
     data: netTotal,
     isLoading: suckersQuote.isLoading || isLoading,
     errors: [error, suckersQuote.error].filter(Boolean)
   };
 }
-async function getTokenRedemptionQuote(config, chainId, projectId, tokenAmountWei, version) {
-  const contract = getContract2({
+async function getChainSurplusAndSupply(config, chainId, projectId, version) {
+  const client = config.getClient({ chainId });
+  const terminalStore = getContract2({
     address: getProjectTerminalStore(chainId, version),
     abi: version === 6 ? jbTerminalStoreAbi : jbTerminalStoreV5Abi,
-    client: config.getClient({ chainId })
+    client
   });
-  return await contract.read.currentReclaimableSurplusOf([
-    projectId,
-    tokenAmountWei,
-    [],
-    [],
-    BigInt(NATIVE_TOKEN_DECIMALS4),
-    BigInt(ETH_CURRENCY_ID3)
+  const [surplus, controller] = await Promise.all([
+    terminalStore.read.currentTotalSurplusOf([
+      projectId,
+      BigInt(NATIVE_TOKEN_DECIMALS4),
+      BigInt(nativeCurrencyId(version))
+    ]),
+    getControllerAddress(config, chainId, projectId, version)
   ]);
+  const totalSupply = await getContract2({
+    address: controller,
+    abi: controllerAbi(version),
+    client
+  }).read.totalTokenSupplyWithReservedTokensOf([projectId]);
+  return { surplus, totalSupply };
+}
+async function getCashOutTaxRate(config, chainId, projectId, version) {
+  const controller = await getControllerAddress(
+    config,
+    chainId,
+    projectId,
+    version
+  );
+  const [, metadata] = await getContract2({
+    address: controller,
+    abi: controllerAbi(version),
+    client: config.getClient({ chainId })
+  }).read.currentRulesetOf([projectId]);
+  return Number(metadata.cashOutTaxRate);
+}
+async function getControllerAddress(config, chainId, projectId, version) {
+  return await getContract2({
+    address: getJBContractAddress2(
+      JBCoreContracts2.JBDirectory,
+      version,
+      chainId
+    ),
+    abi: jbDirectoryAbi,
+    client: config.getClient({ chainId })
+  }).read.controllerOf([projectId]);
 }
 
 // src/hooks/token/useTokenCashOutQuoteEth.ts
@@ -3580,13 +3729,22 @@ function useTokenCashOutQuoteEth(tokenAmountWei, { chainId }) {
   const { store } = useJBTerminalContext();
   const jbChainId = useJBChainId();
   const _chainId = chainId ?? jbChainId;
+  const isContextChain = !!_chainId && _chainId === jbChainId;
   return useReadContract7({
     abi: version === 6 ? jbTerminalStoreAbi2 : jbTerminalStoreV5Abi2,
     functionName: "currentReclaimableSurplusOf",
     chainId: _chainId,
     address: store.data ?? void 0,
-    args: tokenAmountWei ? [projectId, tokenAmountWei, [], [], BigInt(NATIVE_TOKEN_DECIMALS5), BigInt(ETH_CURRENCY_ID4)] : void 0,
+    args: tokenAmountWei ? [
+      projectId,
+      tokenAmountWei,
+      [],
+      [],
+      BigInt(NATIVE_TOKEN_DECIMALS5),
+      BigInt(ETH_CURRENCY_ID4)
+    ] : void 0,
     query: {
+      enabled: isContextChain && !!store.data && !!tokenAmountWei,
       select(data) {
         return applyJbDaoCashOutFee2(data);
       }
@@ -3601,50 +3759,91 @@ import { formatEther } from "viem";
 // src/hooks/useEtherPrice.ts
 import { useQuery as useQuery6 } from "wagmi/query";
 var PRICE_REFRESH_INTERVAL = 60 * 1e3 * 5;
-function useEtherPrice() {
+var DEFAULT_ETHER_PRICE_ENDPOINT = "https://juicebox.money/api/juicebox/prices/ethusd";
+function useEtherPrice({
+  endpoint = DEFAULT_ETHER_PRICE_ENDPOINT
+} = {}) {
   return useQuery6({
-    queryKey: ["juice-sdk", "etherPrice"],
+    queryKey: ["juice-sdk", "etherPrice", endpoint],
     queryFn: async () => {
-      return fetch("https://juicebox.money/api/juicebox/prices/ethusd").then((res) => res.json()).then((data) => data.price);
+      const response = await fetch(endpoint);
+      if (!response.ok) {
+        throw new Error(`Ether price request failed (${response.status}).`);
+      }
+      const { price } = await response.json();
+      return price;
     },
-    staleTime: PRICE_REFRESH_INTERVAL
+    staleTime: PRICE_REFRESH_INTERVAL,
+    // `staleTime` alone only marks the price stale; nothing refetches it on a
+    // page that stays mounted, so the quoted price silently ages.
+    refetchInterval: PRICE_REFRESH_INTERVAL
   });
 }
 
 // src/hooks/token/useSuckersTokenCashOutValue.ts
-function useSuckersTokenCashOutValue({ targetCurrency }) {
-  const { data: ethPrice, isLoading: isEthLoading } = useEtherPrice();
-  const { data: quote, isLoading: isQuoteLoading, errors } = useSuckersCashOutQuote(ONE_JB_TOKEN);
+function useSuckersTokenCashOutValue({
+  targetCurrency
+}) {
+  const {
+    data: ethPrice,
+    isLoading: isEthLoading,
+    error: ethPriceError
+  } = useEtherPrice();
+  const {
+    data: quote,
+    isLoading: isQuoteLoading,
+    errors
+  } = useSuckersCashOutQuote(ONE_JB_TOKEN);
   const loading = isQuoteLoading || isEthLoading;
   if (loading) {
     return { loading: true, data: void 0 };
   }
-  const quoteEth = parseFloat(formatEther(quote ?? 0n));
-  const data = targetCurrency === "eth" ? quoteEth : quoteEth * (ethPrice ?? 0);
+  if (quote == null) {
+    return { loading, data: void 0, errors };
+  }
+  const quoteEth = parseFloat(formatEther(quote));
+  if (targetCurrency === "eth") {
+    return { loading, data: quoteEth, errors };
+  }
+  const allErrors = ethPriceError ? [...errors, ethPriceError] : errors;
+  if (ethPrice === void 0) {
+    return { loading, data: void 0, errors: allErrors };
+  }
   return {
     loading,
-    data,
-    errors
+    data: quoteEth * ethPrice,
+    errors: allErrors
   };
 }
 
 // src/hooks/token/useSuckersUserTokenBalance.ts
-import { JBCoreContracts as JBCoreContracts2, JBProjectToken as JBProjectToken2, jbTokensAbi as jbTokensAbi2 } from "@bananapus/nana-sdk-core";
+import {
+  JBCoreContracts as JBCoreContracts3,
+  JBProjectToken as JBProjectToken2,
+  jbTokensAbi as jbTokensAbi2
+} from "@bananapus/nana-sdk-core";
 import { getContract as getContract3 } from "viem";
 import { useAccount as useAccount2, useConfig as useConfig3, useReadContract as useReadContract8 } from "wagmi";
 import { useQuery as useQuery7 } from "wagmi/query";
 function useSuckersUserTokenBalance() {
   const config = useConfig3();
   const chainId = useJBChainId();
-  const { projectId, contractAddress } = useJBContractContext();
+  const { projectId, version, contractAddress } = useJBContractContext();
   const { address: userAddress } = useAccount2();
+  let jbTokensAddress;
+  try {
+    jbTokensAddress = chainId ? contractAddress(JBCoreContracts3.JBTokens) : void 0;
+  } catch {
+    jbTokensAddress = void 0;
+  }
   const currentChainQuery = useReadContract8({
     abi: jbTokensAbi2,
     functionName: "totalBalanceOf",
-    address: contractAddress(JBCoreContracts2.JBTokens),
+    address: jbTokensAddress,
     chainId,
     args: userAddress ? [userAddress, projectId] : void 0,
     query: {
+      enabled: !!userAddress && !!jbTokensAddress,
       select(data) {
         return new JBProjectToken2(data);
       }
@@ -3652,10 +3851,15 @@ function useSuckersUserTokenBalance() {
   });
   const { data: pairs = [], isLoading, isError } = useSuckers();
   const balanceQuery = useQuery7({
+    // The balances are keyed to a wallet and a protocol version as much as to a
+    // project: without them a previous account's (or version's) balances are
+    // served to the next one.
     queryKey: [
       "suckersUserTokenBalance",
       projectId.toString(),
       chainId?.toString(),
+      version,
+      userAddress,
       currentChainQuery.data?.value.toString(),
       pairs?.map((pair) => pair.peerChainId).join(",")
     ],
@@ -3673,11 +3877,14 @@ function useSuckersUserTokenBalance() {
         pairs.map(async (pair) => {
           const { peerChainId, projectId: projectId2 } = pair;
           const contract = getContract3({
-            address: contractAddress(JBCoreContracts2.JBTokens, peerChainId),
+            address: contractAddress(JBCoreContracts3.JBTokens, peerChainId),
             abi: jbTokensAbi2,
             client: config.getClient({ chainId: peerChainId })
           });
-          const balance = await contract.read.totalBalanceOf([userAddress, projectId2]);
+          const balance = await contract.read.totalBalanceOf([
+            userAddress,
+            projectId2
+          ]);
           return {
             balance: new JBProjectToken2(balance),
             chainId: peerChainId,
@@ -3703,7 +3910,7 @@ import {
   getPrimaryNativeTerminal as getPrimaryNativeTerminal2,
   getProjectTerminalStore as getProjectTerminalStore2,
   jbTerminalStoreAbi as jbTerminalStoreAbi3,
-  NATIVE_TOKEN as NATIVE_TOKEN3
+  NATIVE_TOKEN as NATIVE_TOKEN4
 } from "@bananapus/nana-sdk-core";
 import { getContract as getContract4 } from "viem";
 import { useConfig as useConfig4 } from "wagmi";
@@ -3714,10 +3921,13 @@ function useSuckersNativeTokenBalance() {
   const { projectId, version } = useJBContractContext();
   const { data: pairs = [], isLoading, isError } = useSuckers();
   const balanceQuery = useQuery8({
+    // The terminal store address is version-specific, so the version is part of
+    // the read's identity (as it already is in `useSuckersCashOutQuote`).
     queryKey: [
       "suckersNativeTokenBalance",
       projectId.toString(),
       chainId?.toString(),
+      version,
       pairs.map((pair) => pair.peerChainId).join(",")
     ],
     queryFn: async () => {
@@ -3726,13 +3936,22 @@ function useSuckersNativeTokenBalance() {
       const balances = await Promise.all(
         pairs.map(async (pair) => {
           const { peerChainId, projectId: projectId2 } = pair;
-          const terminal = await getPrimaryNativeTerminal2(config, peerChainId, projectId2, version);
+          const terminal = await getPrimaryNativeTerminal2(
+            config,
+            peerChainId,
+            projectId2,
+            version
+          );
           const contract = getContract4({
             address: getProjectTerminalStore2(peerChainId, version),
             abi: jbTerminalStoreAbi3,
             client: config.getClient({ chainId: peerChainId })
           });
-          const balance = await contract.read.balanceOf([terminal, projectId2, NATIVE_TOKEN3]);
+          const balance = await contract.read.balanceOf([
+            terminal,
+            projectId2,
+            NATIVE_TOKEN4
+          ]);
           return { balance, chainId: peerChainId, projectId: projectId2 };
         })
       );
@@ -3749,7 +3968,7 @@ function useSuckersNativeTokenBalance() {
 // src/hooks/ruleset/useJBRuleset.ts
 import {
   CashOutTaxRate as CashOutTaxRate2,
-  jbControllerAbi as jbControllerAbi3,
+  jbControllerAbi as jbControllerAbi4,
   ReservedPercent as ReservedPercent2,
   RulesetWeight as RulesetWeight2,
   WeightCutPercent as WeightCutPercent2
@@ -3762,7 +3981,7 @@ function useJBRuleset({
   const { contracts, version } = useJBContractContext();
   const query = useReadContract9({
     chainId,
-    abi: jbControllerAbi3,
+    abi: jbControllerAbi4,
     functionName: "currentRulesetOf",
     address: contracts?.controller?.data ?? void 0,
     args: projectId ? [projectId] : void 0,
@@ -3778,7 +3997,9 @@ function useJBRuleset({
           metadata: {
             ...rulesetMetadata,
             cashOutTaxRate: new CashOutTaxRate2(rulesetMetadata.cashOutTaxRate),
-            reservedPercent: new ReservedPercent2(rulesetMetadata.reservedPercent),
+            reservedPercent: new ReservedPercent2(
+              rulesetMetadata.reservedPercent
+            ),
             // v4/v5 store the INVERSE flag (`useTotalSurplusForCashOuts`) in this slot;
             // normalize to the v6 field's semantics.
             scopeCashOutsToLocalBalances: version === 6 ? rulesetMetadata.scopeCashOutsToLocalBalances : !rulesetMetadata.scopeCashOutsToLocalBalances
@@ -3787,26 +4008,35 @@ function useJBRuleset({
       }
     }
   });
-  const { resolvedDataHook } = useResolveDataHook({
-    dataHookAddress: query.data?.metadata?.dataHook,
-    projectId,
-    chainId,
-    rulesetId: BigInt(query.data?.data?.id ?? 0)
-  });
+  const rulesetId = query.data?.data?.id;
+  const { resolvedDataHook, isLoading: isDataHookLoading } = useResolveDataHook(
+    {
+      dataHookAddress: query.data?.metadata?.dataHook,
+      projectId,
+      chainId,
+      // Ruleset 0 is not a ruleset. Passing it as a real id would query the
+      // deployer for a ruleset that cannot exist.
+      rulesetId: rulesetId === void 0 ? void 0 : BigInt(rulesetId)
+    }
+  );
   return {
     ruleset: query.data?.data,
-    rulesetMetadata: query.data?.metadata && {
-      ...query.data.metadata,
-      dataHook: resolvedDataHook
-    },
-    ...query
+    // Withhold the metadata until the data hook behind the omnichain deployer
+    // is known, rather than publishing the deployer address as the hook.
+    rulesetMetadata: query.data?.metadata && resolvedDataHook ? { ...query.data.metadata, dataHook: resolvedDataHook } : void 0,
+    ...query,
+    // A read disabled while its controller is still resolving reports
+    // `isLoading: false`, which reads as "this project has no ruleset".
+    isLoading: Boolean(
+      query.isLoading || contracts?.controller?.isLoading || isDataHookLoading
+    )
   };
 }
 
 // src/hooks/ruleset/useJBUpcomingRuleset.ts
 import {
   CashOutTaxRate as CashOutTaxRate3,
-  jbControllerAbi as jbControllerAbi4,
+  jbControllerAbi as jbControllerAbi5,
   ReservedPercent as ReservedPercent3,
   RulesetWeight as RulesetWeight3,
   WeightCutPercent as WeightCutPercent3
@@ -3817,40 +4047,40 @@ function useJBUpcomingRuleset({
   chainId
 }) {
   const { contracts, version } = useJBContractContext();
+  const controllerAddress = contracts.controller?.data ?? void 0;
   const { data, isLoading } = useReadContract10({
-    abi: jbControllerAbi4,
+    abi: jbControllerAbi5,
     functionName: "upcomingRulesetOf",
-    address: contracts.controller?.data ?? void 0,
+    address: controllerAddress,
     args: projectId ? [projectId] : void 0,
     chainId
   });
   const _latestUpcomingRuleset = data?.[0];
   const _latestUpcomingRulesetMetadata = data?.[1];
-  const { resolvedDataHook } = useResolveDataHook({
-    dataHookAddress: _latestUpcomingRulesetMetadata?.dataHook,
-    projectId,
-    chainId,
-    rulesetId: BigInt(_latestUpcomingRuleset?.id ?? 0)
-  });
-  const upcomingWeight = new RulesetWeight3(_latestUpcomingRuleset?.weight ?? 0n);
-  const upcomingWeightCutPercent = new WeightCutPercent3(
-    _latestUpcomingRuleset?.weightCutPercent ?? 0
+  const { resolvedDataHook, isLoading: isDataHookLoading } = useResolveDataHook(
+    {
+      dataHookAddress: _latestUpcomingRulesetMetadata?.dataHook,
+      projectId,
+      chainId,
+      // Ruleset 0 is not a ruleset; don't fabricate one for the deployer lookup.
+      rulesetId: _latestUpcomingRuleset?.id === void 0 ? void 0 : BigInt(_latestUpcomingRuleset.id)
+    }
   );
   const latestUpcomingRuleset = _latestUpcomingRuleset ? {
     ..._latestUpcomingRuleset,
-    weight: upcomingWeight,
-    weightCutPercent: upcomingWeightCutPercent
+    weight: new RulesetWeight3(_latestUpcomingRuleset.weight),
+    weightCutPercent: new WeightCutPercent3(
+      _latestUpcomingRuleset.weightCutPercent
+    )
   } : void 0;
-  const upcomingReservedPercent = new ReservedPercent3(
-    _latestUpcomingRulesetMetadata?.reservedPercent ?? 0
-  );
-  const upcomingCashOutTaxRate = new CashOutTaxRate3(
-    _latestUpcomingRulesetMetadata?.cashOutTaxRate ?? 0
-  );
-  const latestUpcomingRulesetMetadata = _latestUpcomingRulesetMetadata ? {
+  const latestUpcomingRulesetMetadata = _latestUpcomingRulesetMetadata && resolvedDataHook ? {
     ..._latestUpcomingRulesetMetadata,
-    reservedPercent: upcomingReservedPercent,
-    cashOutTaxRate: upcomingCashOutTaxRate,
+    reservedPercent: new ReservedPercent3(
+      _latestUpcomingRulesetMetadata.reservedPercent
+    ),
+    cashOutTaxRate: new CashOutTaxRate3(
+      _latestUpcomingRulesetMetadata.cashOutTaxRate
+    ),
     // v4/v5 store the INVERSE flag (`useTotalSurplusForCashOuts`) in this slot;
     // normalize to the v6 field's semantics.
     scopeCashOutsToLocalBalances: version === 6 ? _latestUpcomingRulesetMetadata.scopeCashOutsToLocalBalances : !_latestUpcomingRulesetMetadata.scopeCashOutsToLocalBalances,
@@ -3859,19 +4089,32 @@ function useJBUpcomingRuleset({
   return {
     ruleset: latestUpcomingRuleset,
     rulesetMetadata: latestUpcomingRulesetMetadata,
-    isLoading
+    // A read disabled while its controller is still resolving reports
+    // `isLoading: false`, which reads as "there is no upcoming ruleset".
+    isLoading: Boolean(
+      isLoading || contracts.controller?.isLoading || isDataHookLoading
+    )
   };
 }
 
 // src/contexts/JBContractContext/JBContractContext.tsx
 import { useReadContract as useReadContract11 } from "wagmi";
 import { jsx as jsx10 } from "react/jsx-runtime";
+function outsideProvider() {
+  throw new Error(
+    "JBContractContext was read outside a JBContractProvider. Wrap the tree in JBProjectProvider or JBContractProvider."
+  );
+}
 var JBContractContext = createContext8({
   /**
    * The project id of the Juicebox project.
    */
-  projectId: 0n,
-  version: 5,
+  get projectId() {
+    return outsideProvider();
+  },
+  get version() {
+    return outsideProvider();
+  },
   /**
    * The addresses of the contracts for the project.
    */
@@ -3883,7 +4126,7 @@ var JBContractContext = createContext8({
     tokens: AsyncDataNone,
     splits: AsyncDataNone
   },
-  contractAddress: () => zeroAddress4
+  contractAddress: outsideProvider
 });
 function useJBContractContext() {
   return useContext8(JBContractContext);
@@ -3904,7 +4147,9 @@ function useJBProjectId(chainId) {
   if (!chainId || currentChainId === chainId || !suckers) {
     return { projectId: currentProjectId, chainId: currentChainId, version };
   }
-  const projectId = suckers.find((suckerPair) => suckerPair.peerChainId === chainId)?.projectId;
+  const projectId = suckers.find(
+    (suckerPair) => suckerPair.peerChainId === chainId
+  )?.projectId;
   return { projectId, chainId, version };
 }
 var JBContractProvider = ({
@@ -3921,28 +4166,38 @@ var JBContractProvider = ({
     },
     [include]
   );
-  const jbDirectoryAddress = chainId ? jbContractAddress2[version][JBCoreContracts3.JBDirectory][chainId] : void 0;
+  const jbDirectoryAddress = chainId ? jbContractAddress2[version][JBCoreContracts4.JBDirectory][chainId] : void 0;
   const primaryNativeTerminalEth = useReadContract11({
     address: jbDirectoryAddress,
-    abi: jbDirectoryAbi,
+    abi: jbDirectoryAbi2,
     functionName: "primaryTerminalOf",
     chainId,
-    args: enabled([1 /* PrimaryNativePaymentTerminal */]) ? [projectId, NATIVE_TOKEN4] : void 0
+    args: enabled([1 /* PrimaryNativePaymentTerminal */]) ? [projectId, NATIVE_TOKEN5] : void 0
   });
+  const usdcAddress = chainId ? USDC_ADDRESSES[chainId] : void 0;
   const primaryNativeTerminalUsdc = useReadContract11({
     address: jbDirectoryAddress,
-    abi: jbDirectoryAbi,
+    abi: jbDirectoryAbi2,
     functionName: "primaryTerminalOf",
     chainId,
-    args: enabled([1 /* PrimaryNativePaymentTerminal */]) ? [projectId, chainId ? USDC_ADDRESSES[chainId] : zeroAddress4] : void 0
+    args: usdcAddress && enabled([1 /* PrimaryNativePaymentTerminal */]) ? [projectId, usdcAddress] : void 0
   });
   const primaryNativeTerminal = useMemo5(() => {
-    return primaryNativeTerminalEth.data !== zeroAddress4 ? primaryNativeTerminalEth : primaryNativeTerminalUsdc;
+    const isTerminal = (address) => address !== void 0 && !isAddressEqual4(address, zeroAddress4);
+    if (isTerminal(primaryNativeTerminalEth.data))
+      return primaryNativeTerminalEth;
+    if (isTerminal(primaryNativeTerminalUsdc.data))
+      return primaryNativeTerminalUsdc;
+    return {
+      ...primaryNativeTerminalEth,
+      data: void 0,
+      isLoading: primaryNativeTerminalEth.isLoading || primaryNativeTerminalUsdc.isLoading
+    };
   }, [primaryNativeTerminalEth, primaryNativeTerminalUsdc]);
   const controller = useReadContract11({
     chainId,
     address: jbDirectoryAddress,
-    abi: jbDirectoryAbi,
+    abi: jbDirectoryAbi2,
     functionName: "controllerOf",
     args: [projectId],
     query: {
@@ -3952,82 +4207,79 @@ var JBContractProvider = ({
   });
   const controllerAddress = useMemo5(() => controller.data, [controller.data]);
   const hasController = useMemo5(() => {
-    return controllerAddress && !isAddressEqual4(controllerAddress, zeroAddress4);
+    return Boolean(
+      controllerAddress && !isAddressEqual4(controllerAddress, zeroAddress4)
+    );
   }, [controllerAddress]);
-  const normalizedControllerAddress = useMemo5(() => {
-    return hasController ? controllerAddress : zeroAddress4;
+  const resolvedControllerAddress = useMemo5(() => {
+    return hasController ? controllerAddress : void 0;
   }, [controllerAddress, hasController]);
   const fundAccessLimits = useReadContract11({
     chainId,
-    address: normalizedControllerAddress,
-    abi: jbControllerAbi5,
+    address: resolvedControllerAddress,
+    abi: jbControllerAbi6,
     functionName: "FUND_ACCESS_LIMITS",
     query: {
-      enabled: enabled([0 /* Controller */, 2 /* FundAccessLimits */]),
+      enabled: hasController && enabled([0 /* Controller */, 2 /* FundAccessLimits */]),
       staleTime: Infinity
     }
   });
   const rulesets = useReadContract11({
     chainId,
-    address: normalizedControllerAddress,
-    abi: jbControllerAbi5,
+    address: resolvedControllerAddress,
+    abi: jbControllerAbi6,
     functionName: "RULESETS",
     query: {
-      enabled: enabled([0 /* Controller */, 5 /* Rulesets */]),
+      enabled: hasController && enabled([0 /* Controller */, 5 /* Rulesets */]),
       staleTime: Infinity
     }
   });
   const tokens = useReadContract11({
     chainId,
-    address: normalizedControllerAddress,
-    abi: jbControllerAbi5,
+    address: resolvedControllerAddress,
+    abi: jbControllerAbi6,
     functionName: "TOKENS",
     query: {
-      enabled: enabled([0 /* Controller */, 3 /* Tokens */]),
+      enabled: hasController && enabled([0 /* Controller */, 3 /* Tokens */]),
       staleTime: Infinity
     }
   });
   const splits = useReadContract11({
     chainId,
-    address: normalizedControllerAddress,
-    abi: jbControllerAbi5,
+    address: resolvedControllerAddress,
+    abi: jbControllerAbi6,
     functionName: "SPLITS",
     query: {
-      enabled: enabled([0 /* Controller */, 4 /* Splits */]),
+      enabled: hasController && enabled([0 /* Controller */, 4 /* Splits */]),
       staleTime: Infinity
     }
   });
+  const dependent = (query) => ({
+    ...query,
+    isLoading: Boolean(query.isLoading || controller.isLoading)
+  });
   const contractAddress = useCallback(
     (contract, _chainId) => {
-      return getJBContractAddress2(contract, version, _chainId || chainId);
+      return getJBContractAddress3(contract, version, _chainId || chainId);
     },
     [version, chainId]
   );
-  debug10("JBContractContext", {
-    projectId,
-    contracts: {
-      controller,
-      fundAccessLimits,
-      primaryNativeTerminal,
-      rulesets,
-      tokens,
-      splits
-    }
-  });
+  const contracts = {
+    controller,
+    fundAccessLimits: dependent(fundAccessLimits),
+    primaryNativeTerminal,
+    rulesets: dependent(rulesets),
+    tokens: dependent(tokens),
+    splits: dependent(splits)
+  };
+  debug10("JBContractContext", { projectId, contracts });
   return /* @__PURE__ */ jsx10(
     JBContractContext.Provider,
     {
       value: {
         version,
         projectId,
-        contracts: {
-          controller,
-          fundAccessLimits,
-          primaryNativeTerminal,
-          rulesets,
-          tokens,
-          splits
-        },
+        contracts,
         contractAddress
       },
       children
@@ -4040,7 +4292,9 @@ var API = "https://api.relayr.ba5ed.com";
 var DASHBOARD = "https://relayr.ba5ed.com";
 
 // src/lib/relayr/hooks/useRequestRelayrQuote.ts
-import { jbContractAddress as jbContractAddress3 } from "@bananapus/nana-sdk-core";
+import {
+  jbContractAddress as jbContractAddress3
+} from "@bananapus/nana-sdk-core";
 import { useMutation } from "wagmi/query";
 function useRequestRelayrQuote() {
   const { version: contextVersion } = useJBContractContext();
@@ -4226,7 +4480,9 @@ function useGetRelayrTxBundle() {
     hasFailed,
     uuid,
     response: getRelayrTxBundle.data,
-    isPolling: !!uuid && !isComplete && !hasFailed,
+    // A bundle whose fetches keep erroring is not still polling: without the
+    // error term a consumer's spinner never stops.
+    isPolling: !!uuid && !isComplete && !hasFailed && !getRelayrTxBundle.error,
     isFetching: getRelayrTxBundle.isFetching,
     error: getRelayrTxBundle.error
   };
@@ -4241,25 +4497,20 @@ function useSendRelayrTx() {
   const _sendTransaction = useSendTransaction();
   const sendRelayrTx = useCallback3(
     async (chainPayment) => {
-      try {
-        if (chainId !== chainPayment.chain) {
-          try {
-            await switchChainAsync({ chainId: chainPayment.chain });
-          } catch (e) {
-            console.error(e);
-            throw new Error("Failed to switch to correct chain");
-          }
+      if (chainId !== chainPayment.chain) {
+        try {
+          await switchChainAsync({ chainId: chainPayment.chain });
+        } catch (e) {
+          console.error(e);
+          throw new Error("Failed to switch to correct chain");
         }
-        const tx = await _sendTransaction.sendTransactionAsync({
-          chainId: chainPayment.chain,
-          to: chainPayment.target,
-          value: BigInt(chainPayment.amount),
-          data: chainPayment.calldata
-        });
-        return tx;
-      } catch (error) {
-        throw error;
       }
+      return await _sendTransaction.sendTransactionAsync({
+        chainId: chainPayment.chain,
+        to: chainPayment.target,
+        value: BigInt(chainPayment.amount),
+        data: chainPayment.calldata
+      });
     },
     [_sendTransaction.sendTransactionAsync, chainId, switchChainAsync]
   );
@@ -4274,6 +4525,7 @@ function useSendRelayrTx() {
 export {
   API,
   DASHBOARD,
+  DEFAULT_ETHER_PRICE_ENDPOINT,
   DynamicContract,
   JBChainContext,
   JBChainProvider,