@b3dotfun/sdk 0.0.62 → 0.0.63-alpha.0

package/src/anyspend/utils/orderPayload.ts

@@ -1,5 +1,5 @@
-import { normalizeAddress } from "@b3dotfun/sdk/anyspend/utils";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
+import { normalizeAddress } from "@b3dotfun/sdk/anyspend/utils";
 
 export type OrderParams = {
   orderType: components["schemas"]["Order"]["type"];
@@ -48,6 +48,8 @@ export const buildPayload = (orderType: components["schemas"]["Order"]["type"],
       };
     case "custom":
       return { ...payload };
+    case "custom_exact_in":
+      return { ...payload, expectedDstAmount };
     case "hype_duel":
       return {
         expectedDstAmount,
@@ -73,6 +75,8 @@ export const buildMetadata = (orderType: components["schemas"]["Order"]["type"],
       return { ...baseMetadata, tournament };
     case "custom":
       return { ...baseMetadata, action: payload.action };
+    case "custom_exact_in":
+      return { ...baseMetadata, action: payload.action };
     case "hype_duel":
       return { ...baseMetadata };
     default:

package/src/global-account/react/components/B3DynamicModal.tsx

@@ -5,16 +5,19 @@ import {
   AnySpendNFT,
   AnyspendSignatureMint,
   AnySpendStakeB3,
+  AnySpendStakeB3ExactIn,
   AnySpendTournament,
   OrderHistory,
 } from "@b3dotfun/sdk/anyspend/react";
 import { AnySpendDepositHype } from "@b3dotfun/sdk/anyspend/react/components/AnyspendDepositHype";
 import { AnySpendStakeUpside } from "@b3dotfun/sdk/anyspend/react/components/AnySpendStakeUpside";
+import { AnySpendStakeUpsideExactIn } from "@b3dotfun/sdk/anyspend/react/components/AnySpendStakeUpsideExactIn";
 import { useGlobalWalletState } from "@b3dotfun/sdk/anyspend/utils";
 import { useIsMobile, useModalStore } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useEffect, useRef } from "react";
+import { useSetActiveWallet } from "thirdweb/react";
 import { AvatarEditor } from "./AvatarEditor/AvatarEditor";
 import { useB3 } from "./B3Provider/useB3";
 import { LinkAccount } from "./LinkAccount/LinkAccount";
@@ -23,7 +26,6 @@ import { RequestPermissions } from "./RequestPermissions/RequestPermissions";
 import { SignInWithB3Flow } from "./SignInWithB3/SignInWithB3Flow";
 import { Dialog, DialogContent, DialogDescription, DialogTitle } from "./ui/dialog";
 import { Drawer, DrawerContent, DrawerDescription, DrawerTitle } from "./ui/drawer";
-import { useSetActiveWallet } from "thirdweb/react";
 
 const debug = debugB3React("B3DynamicModal");
 
@@ -56,7 +58,9 @@ export function B3DynamicModal() {
     "anySpendJoinTournament",
     "anySpendFundTournament",
     "anySpendStakeB3",
+    "anySpendStakeB3ExactIn",
     "anySpendStakeUpside",
+    "anySpendStakeUpsideExactIn",
     "anySpendBuySpin",
     "anySpendOrderHistory",
     "signInWithB3",
@@ -71,7 +75,9 @@ export function B3DynamicModal() {
     "anySpendJoinTournament",
     "anySpendFundTournament",
     "anySpendStakeB3",
+    "anySpendStakeB3ExactIn",
     "anySpendStakeUpside",
+    "anySpendStakeUpsideExactIn",
     "anySpendBuySpin",
     "anySpendSignatureMint",
     "anySpendBondKit",
@@ -120,8 +126,12 @@ export function B3DynamicModal() {
         return <OrderHistory onBack={() => {}} mode="modal" />;
       case "anySpendStakeB3":
         return <AnySpendStakeB3 {...contentType} mode="modal" />;
+      case "anySpendStakeB3ExactIn":
+        return <AnySpendStakeB3ExactIn {...contentType} mode="modal" />;
       case "anySpendStakeUpside":
         return <AnySpendStakeUpside {...contentType} mode="modal" />;
+      case "anySpendStakeUpsideExactIn":
+        return <AnySpendStakeUpsideExactIn {...contentType} mode="modal" />;
       case "anySpendBuySpin":
         return <AnySpendBuySpin {...contentType} mode="modal" />;
       case "anySpendSignatureMint":

package/src/global-account/react/components/SignInWithB3/SignInWithB3Flow.tsx

@@ -39,6 +39,7 @@ export function SignInWithB3Flow({
   const { setB3ModalContentType, setB3ModalOpen, isOpen } = useModalStore();
   const account = useActiveAccount();
   const isAuthenticating = useAuthStore(state => state.isAuthenticating);
+  const isAuthenticated = useAuthStore(state => state.isAuthenticated);
   const isConnected = useAuthStore(state => state.isConnected);
   const [refetchCount, setRefetchCount] = useState(0);
   const [refetchError, setRefetchError] = useState<string | null>(null);
@@ -92,7 +93,7 @@ export function SignInWithB3Flow({
       source,
     });
 
-    if (isConnected) {
+    if (isConnected && isAuthenticated) {
       // Check if we already have a signer for this partner
       const hasExistingSigner = signers?.some(signer => signer.partner.id === partnerId);
       if (hasExistingSigner) {
@@ -139,6 +140,7 @@ export function SignInWithB3Flow({
     signersEnabled,
     isConnected,
     isAuthenticating,
+    isAuthenticated,
     isOpen,
   ]);
 

package/src/global-account/react/components/SignInWithB3/steps/LoginStep.tsx

@@ -86,8 +86,8 @@ export function LoginStep({ onSuccess, chain }: LoginStepProps) {
           titleIcon: "https://cdn.b3.fun/b3_logo.svg",
         }}
         className="b3-login-step"
-        onConnect={async wallet => {
-          await onConnect(wallet);
+        onConnect={async (wallet, allConnectedWallets) => {
+          await onConnect(wallet, allConnectedWallets);
           const account = wallet.getAccount();
           if (!account) throw new Error("No account found");
           await onSuccess(account);

package/src/global-account/react/hooks/index.ts

@@ -38,11 +38,12 @@ export { useSearchParamsSSR } from "./useSearchParamsSSR";
 export { useSimBalance } from "./useSimBalance";
 export { useSiwe } from "./useSiwe";
 export { useTokenBalance } from "./useTokenBalance";
+export { useTokenBalanceDirect } from "./useTokenBalanceDirect";
 export { useTokenBalancesByChain } from "./useTokenBalancesByChain";
 export { useTokenData } from "./useTokenData";
 export { useTokenFromUrl } from "./useTokenFromUrl";
 export { useTokenPrice } from "./useTokenPrice";
 export { useTokenPriceWithFallback } from "./useTokenPriceWithFallback";
 export { useTokensFromAddress } from "./useTokensFromAddress";
-export { useUnifiedChainSwitchAndExecute } from "./useUnifiedChainSwitchAndExecute";
 export { useURLParams } from "./useURLParams";
+export { useUnifiedChainSwitchAndExecute } from "./useUnifiedChainSwitchAndExecute";

package/src/global-account/react/hooks/useAuthentication.ts

@@ -164,7 +164,15 @@ export function useAuthentication(partnerId: string) {
   );
 
   const onConnect = useCallback(
-    async (wallet: Wallet) => {
+    async (_walleAutoConnectedWith: Wallet, allConnectedWallets: Wallet[]) => {
+      debug("@@useAuthentication:onConnect", { _walleAutoConnectedWith, allConnectedWallets });
+
+      const wallet = allConnectedWallets.find(wallet => wallet.id.startsWith("ecosystem."));
+
+      if (!wallet) {
+        throw new Error("No smart wallet found during auto-connect");
+      }
+
       debug("@@useAuthentication:onConnect", { wallet });
 
       try {
@@ -243,7 +251,7 @@ export function useAuthentication(partnerId: string) {
   const { isLoading: useAutoConnectLoading } = useAutoConnect({
     client,
     wallets: [wallet],
-    onConnect: onConnect,
+    onConnect,
   });
 
   /**

package/src/global-account/react/hooks/useSimBalance.ts

@@ -26,10 +26,11 @@ export interface SimBalanceResponse {
   balances: SimBalanceItem[];
 }
 
-async function fetchSimBalance(address: string): Promise<SimBalanceResponse> {
+async function fetchSimBalance(address: string, chainIdsParam: number[]): Promise<SimBalanceResponse> {
   if (!address) throw new Error("Address is required");
 
-  let url = `https://simdune-api.sean-430.workers.dev/?url=https://api.sim.dune.com/v1/evm/balances/${address}?metadata=logo&chain_ids=mainnet`;
+  const chainIds = chainIdsParam.length === 0 ? "mainnet" : chainIdsParam.join(",");
+  let url = `https://simdune-api.sean-430.workers.dev/?url=https://api.sim.dune.com/v1/evm/balances/${address}?metadata=logo&chain_ids=${chainIds}`;
   if (process.env.NEXT_PUBLIC_LOCAL_KEY) {
     url += `&localkey=${process.env.NEXT_PUBLIC_LOCAL_KEY}`;
   }
@@ -44,12 +45,12 @@ async function fetchSimBalance(address: string): Promise<SimBalanceResponse> {
   return balanceData;
 }
 
-export function useSimBalance(address?: string) {
+export function useSimBalance(address?: string, chainIdsParam?: number[]) {
   return useQuery({
-    queryKey: ["simBalance", address],
+    queryKey: ["simBalance", address, chainIdsParam],
     queryFn: () => {
       if (!address) throw new Error("Address is required");
-      return fetchSimBalance(address);
+      return fetchSimBalance(address, chainIdsParam || []);
     },
     enabled: Boolean(address),
   });

package/src/global-account/react/hooks/useTokenBalanceDirect.tsx

@@ -0,0 +1,84 @@
+"use client";
+
+import { isNativeToken } from "@b3dotfun/sdk/anyspend";
+import { components } from "@b3dotfun/sdk/anyspend/types/api";
+import { useAccountWallet } from "@b3dotfun/sdk/global-account/react";
+import { formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
+import { getERC20Balances, getNativeTokenBalance } from "@b3dotfun/sdk/shared/utils/thirdweb-insights";
+import { useQuery } from "@tanstack/react-query";
+import { useEffect } from "react";
+
+interface UseTokenBalanceProps {
+  token: components["schemas"]["Token"];
+  address?: string;
+}
+
+export interface TokenBalanceResult {
+  rawBalance: bigint | null;
+  formattedBalance: string;
+  isLoading: boolean;
+}
+
+export function useTokenBalanceDirect({ token, address }: UseTokenBalanceProps): TokenBalanceResult {
+  const account = useAccountWallet();
+
+  const effectiveAddress = address || account?.address;
+
+  const {
+    data: tokenBalance,
+    isLoading,
+    isFetching,
+    refetch,
+  } = useQuery({
+    queryKey: ["tokenBalance", effectiveAddress, token.chainId, token.address],
+    queryFn: async (): Promise<{ formatted: string; raw: bigint | null }> => {
+      if (!effectiveAddress) return { formatted: "0", raw: null };
+
+      if (isNativeToken(token.address)) {
+        const nativeToken = await getNativeTokenBalance(effectiveAddress, token.chainId);
+        if (nativeToken && nativeToken.balance) {
+          const rawBalance = nativeToken.balance;
+          return {
+            formatted: formatTokenAmount(BigInt(rawBalance), Number(nativeToken.decimals || 18)),
+            raw: BigInt(rawBalance),
+          };
+        }
+        return { formatted: "0", raw: null };
+      }
+
+      const response = await getERC20Balances(effectiveAddress, {
+        chainIds: [token.chainId],
+        includeSpam: false,
+      });
+      const tokenBalance = response.data?.find(t => t.token_address === token.address);
+      if (tokenBalance?.balance) {
+        return {
+          formatted: formatTokenAmount(BigInt(tokenBalance.balance), Number(tokenBalance.decimals || 18)),
+          raw: BigInt(tokenBalance.balance),
+        };
+      }
+      return { formatted: "0", raw: null };
+    },
+    enabled: !!effectiveAddress,
+    staleTime: 30000,
+    gcTime: 5 * 60 * 1000,
+    retry: 2,
+    structuralSharing: false,
+  });
+
+  // Force a refetch when the wallet or token changes
+  useEffect(() => {
+    if (effectiveAddress) {
+      refetch();
+    }
+  }, [effectiveAddress, token.address, token.chainId, token.symbol, refetch]);
+
+  // Determine if we're actually loading
+  const isActuallyLoading = !effectiveAddress || isLoading || (isFetching && !tokenBalance);
+
+  return {
+    rawBalance: tokenBalance?.raw || BigInt(0),
+    formattedBalance: tokenBalance?.formatted || "0",
+    isLoading: isActuallyLoading,
+  };
+}

package/src/global-account/react/hooks/useTokenFromUrl.tsx

@@ -1,9 +1,9 @@
 "use client";
 
+import { components } from "@b3dotfun/sdk/anyspend/types/api";
 import { getCoingeckoChainInfo } from "@b3dotfun/sdk/shared/constants/chains/supported";
 import { useSearchParams } from "@b3dotfun/sdk/shared/react/hooks";
 import { useQuery } from "@tanstack/react-query";
-import { components } from "@b3dotfun/sdk/anyspend/types/api";
 
 interface UseTokenFromUrlOptions {
   /**
@@ -59,14 +59,15 @@ export function useTokenFromUrl({ defaultToken, prefix }: UseTokenFromUrlOptions
   const currencyParam = searchParams.get(`${prefix}Currency`);
   const chainIdParam = searchParams.get(`${prefix}ChainId`);
 
+  // Determine network based on chainId
+  const chainInfo = chainIdParam ? getCoingeckoChainInfo(Number(chainIdParam)) : null;
+  const network = chainInfo?.coingecko_id || "";
+
   // Determine if we should fetch token info
   const shouldFetchToken = Boolean(
-    currencyParam && chainIdParam && currencyParam.toLowerCase() !== defaultToken.address.toLowerCase(),
+    currencyParam && chainIdParam && chainInfo && currencyParam.toLowerCase() !== defaultToken.address.toLowerCase(),
   );
 
-  // Determine network based on chainId
-  const network = chainIdParam ? getCoingeckoChainInfo(Number(chainIdParam)).coingecko_id : "";
-
   const { data: tokenInfo, isError } = useQuery({
     queryKey: ["tokenInfo", network, currencyParam],
     queryFn: () => fetchTokenInfo(network, currencyParam || ""),

package/src/global-account/react/stores/useModalStore.ts

@@ -223,6 +223,21 @@ export interface AnySpendStakeB3Props extends BaseModalProps {
   onSuccess?: () => void;
 }
 
+/**
+ * Props for the AnySpend Stake B3 (Custom Exact In) modal
+ * Handles B3 token staking operations using the custom exact in flow
+ */
+export interface AnySpendStakeB3ExactInProps extends BaseModalProps {
+  /** Modal type identifier */
+  type: "anySpendStakeB3ExactIn";
+  /** Recipient address to stake B3 for */
+  recipientAddress: string;
+  /** Stake amount */
+  stakeAmount?: string;
+  /** Callback function called when the stake is successful */
+  onSuccess?: () => void;
+}
+
 /**
  * Props for the AnySpend Stake Contract modal
  * Handles token staking operations to a given contract
@@ -244,6 +259,23 @@ export interface AnySpendStakeUpsideProps extends BaseModalProps {
   onSuccess?: () => void;
 }
 
+/**
+ * Props for the AnySpend Stake Upside (Exact In) modal
+ * Handles token staking operations using the custom exact in flow
+ */
+export interface AnySpendStakeUpsideExactInProps extends BaseModalProps {
+  /** Modal type identifier */
+  type: "anySpendStakeUpsideExactIn";
+  /** Recipient address to stake tokens for */
+  recipientAddress: string;
+  /** Staking contract address */
+  stakingContractAddress: string;
+  /** Token to stake */
+  token: components["schemas"]["Token"];
+  /** Callback function called when the stake is successful */
+  onSuccess?: () => void;
+}
+
 /**
  * Props for the AnySpend Buy Spin modal
  * Handles spin wheel entry purchases
@@ -355,7 +387,9 @@ export type ModalContentType =
   | AnySpendFundTournamentProps
   | AnySpendOrderHistoryProps
   | AnySpendStakeB3Props
+  | AnySpendStakeB3ExactInProps
   | AnySpendStakeUpsideProps
+  | AnySpendStakeUpsideExactInProps
   | AnySpendBuySpinProps
   | AnySpendSignatureMintProps
   | AnySpendBondKitProps