@b3dotfun/sdk 0.1.70-alpha.2 → 0.1.70-alpha.21

package/src/anyspend/react/components/common/PureTransferView.tsx

@@ -0,0 +1,212 @@
+"use client";
+
+import { getChainName, getPaymentUrl, ZERO_ADDRESS } from "@b3dotfun/sdk/anyspend";
+import type { components } from "@b3dotfun/sdk/anyspend/types/api";
+import { CopyToClipboard } from "@b3dotfun/sdk/global-account/react";
+import { cn } from "@b3dotfun/sdk/shared/utils/cn";
+import { ChevronLeft, Loader2, X } from "lucide-react";
+import { QRCodeSVG } from "qrcode.react";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import type { TransferResult } from "../../hooks/useWatchTransfer";
+import { useWatchTransfer } from "../../hooks/useWatchTransfer";
+import { ChainWarningText, WarningText } from "./WarningText";
+import { TransferResultScreen } from "./TransferResultScreen";
+
+export interface PureTransferViewProps {
+  mode?: "modal" | "page";
+  /** The recipient address where funds will land (the user's own wallet) */
+  recipientAddress: string;
+  /** Chain ID to watch on */
+  chainId: number;
+  /** Token the user sends — drives the QR code and balance watcher */
+  token: components["schemas"]["Token"];
+  /** Human-readable amount to display (display-only; skip row if empty or "0") */
+  displayAmount?: string;
+  /** Whether this panel is the currently active panel; gates the balance watcher */
+  isActive?: boolean;
+  /** Callback when back chevron is clicked */
+  onBack?: () => void;
+  /** Callback when X close button is clicked */
+  onClose?: () => void;
+  /** Callback when an incoming transfer is detected */
+  onTransferDetected?: (result: TransferResult) => void;
+}
+
+/**
+ * A self-contained view that shows the recipient address as a QR code + copy button and
+ * watches for an incoming same-chain/same-token transfer via `useWatchTransfer`. When a
+ * transfer is detected it renders `TransferResultScreen`.
+ *
+ * This is the "TRANSFER_CRYPTO" path for same-token AnySpend deposits — no relayer order,
+ * no fee; the user simply sends the token directly to their own address.
+ */
+export function PureTransferView({
+  mode = "modal",
+  recipientAddress,
+  chainId,
+  token,
+  displayAmount,
+  isActive,
+  onBack,
+  onClose,
+  onTransferDetected,
+}: PureTransferViewProps) {
+  const [transferResult, setTransferResult] = useState<TransferResult | null>(null);
+
+  // Fix 4: reset transferResult when the panel becomes active again
+  useEffect(() => {
+    if (isActive) setTransferResult(null);
+  }, [isActive]);
+
+  // Fix 3: stabilize the callback so it doesn't re-run the watcher effect every render
+  const handleTransferDetected = useCallback(
+    (result: TransferResult) => {
+      setTransferResult(result);
+      onTransferDetected?.(result);
+    },
+    [onTransferDetected],
+  );
+
+  const { isWatching } = useWatchTransfer({
+    address: recipientAddress,
+    chainId,
+    tokenAddress: token.address,
+    tokenDecimals: token.decimals,
+    // Fix 1: also require a non-empty recipient before enabling the watcher
+    enabled: !!recipientAddress && !transferResult && isActive,
+    onTransferDetected: handleTransferDetected,
+  });
+
+  // Fix 2: guard qrValue when recipientAddress is empty
+  const qrValue = useMemo(
+    () =>
+      recipientAddress
+        ? getPaymentUrl(
+            recipientAddress,
+            undefined,
+            token.address === ZERO_ADDRESS ? "ETH" : token.address,
+            chainId,
+            token.decimals,
+          )
+        : "",
+    [recipientAddress, token.address, token.decimals, chainId],
+  );
+
+  const chainName = useMemo(() => {
+    try {
+      return getChainName(chainId);
+    } catch {
+      return "the specified chain";
+    }
+  }, [chainId]);
+
+  // Guard: if no address yet, render nothing
+  if (!recipientAddress) return null;
+
+  // Once a transfer is detected, hand off to the shared success screen
+  if (transferResult) {
+    return (
+      <TransferResultScreen
+        mode={mode}
+        transferResult={transferResult}
+        token={token}
+        chainId={chainId}
+        recipientAddress={recipientAddress}
+        onBack={onBack}
+        onClose={onClose}
+      />
+    );
+  }
+
+  return (
+    <div
+      className={cn(
+        "anyspend-container anyspend-pure-transfer font-inter bg-as-surface-primary mx-auto w-full max-w-[460px] p-6",
+      )}
+    >
+      <div className="anyspend-pure-transfer-content flex flex-col gap-4">
+        {/* Header */}
+        <div className="anyspend-pure-transfer-header flex items-center justify-between">
+          {onBack ? (
+            <button
+              onClick={onBack}
+              className="anyspend-pure-transfer-back text-as-secondary hover:text-as-primary"
+              aria-label="Go back"
+            >
+              <ChevronLeft className="h-5 w-5" />
+            </button>
+          ) : (
+            <div className="w-5" />
+          )}
+          <h2 className="anyspend-pure-transfer-title text-as-primary text-base font-semibold">Send {token.symbol}</h2>
+          {onClose ? (
+            <button
+              onClick={onClose}
+              className="anyspend-pure-transfer-close text-as-secondary hover:text-as-primary"
+              aria-label="Close"
+            >
+              <X className="h-5 w-5" />
+            </button>
+          ) : (
+            <div className="w-5" />
+          )}
+        </div>
+
+        {/* Optional amount badge */}
+        {displayAmount && (
+          <div className="anyspend-pure-transfer-amount-badge border-as-border-secondary bg-as-surface-secondary flex items-center justify-center rounded-xl border px-4 py-2">
+            <span className="text-as-primary text-sm font-medium">{displayAmount}</span>
+          </div>
+        )}
+
+        {/* QR Code and address block — mirrors QRDeposit ~lines 413-453 */}
+        <div className="anyspend-pure-transfer-qr-content border-as-stroke flex items-start gap-4 rounded-xl border p-4">
+          {/* QR Code */}
+          <div className="anyspend-pure-transfer-qr-code-container flex flex-col items-center gap-2">
+            <div className="anyspend-pure-transfer-qr-code rounded-lg bg-white p-2">
+              <QRCodeSVG value={qrValue} size={120} level="M" marginSize={0} />
+            </div>
+            <span className="anyspend-pure-transfer-qr-scan-hint text-as-secondary text-xs">
+              SCAN WITH <span className="inline-block">🦊</span>
+            </span>
+          </div>
+
+          {/* Address info */}
+          <div className="anyspend-pure-transfer-address-container flex flex-1 flex-col gap-1">
+            <span className="anyspend-pure-transfer-address-label text-as-secondary text-sm">Deposit address:</span>
+            <div className="anyspend-pure-transfer-address-row flex items-start gap-1">
+              <span className="anyspend-pure-transfer-address text-as-primary break-all font-mono text-sm leading-relaxed">
+                {recipientAddress}
+              </span>
+              <CopyToClipboard
+                text={recipientAddress}
+                className="anyspend-pure-transfer-copy-icon text-as-secondary hover:text-as-primary mt-0.5 shrink-0"
+              />
+            </div>
+          </div>
+        </div>
+
+        {/* Warnings — mirrors QRDeposit ~lines 456-460 */}
+        <ChainWarningText chainId={chainId} />
+        <WarningText>
+          Only send {token.symbol} on {chainName}. Other tokens will not be converted.
+        </WarningText>
+
+        {/* Watching indicator — mirrors QRDeposit ~lines 462-473 */}
+        {isWatching && (
+          <div className="anyspend-pure-transfer-watching bg-as-brand/10 flex items-center justify-center gap-2 rounded-lg p-3">
+            <Loader2 className="text-as-brand h-4 w-4 animate-spin" />
+            <span className="text-as-brand text-sm">Watching for incoming transfer...</span>
+          </div>
+        )}
+
+        {/* Full-width copy button — mirrors QRDeposit ~lines 476-484 */}
+        <CopyToClipboard text={recipientAddress}>
+          <button className="anyspend-pure-transfer-copy-button bg-as-brand hover:bg-as-brand/90 flex w-full items-center justify-center gap-2 rounded-xl py-3.5 font-medium text-white transition-all">
+            Copy deposit address
+          </button>
+        </CopyToClipboard>
+      </div>
+    </div>
+  );
+}

package/src/anyspend/react/components/common/TokenBalance.tsx

@@ -1,7 +1,7 @@
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
-import { getNativeRequired } from "@b3dotfun/sdk/anyspend/utils/chain";
+import { getNativeRequired, toRegistryChainId } from "@b3dotfun/sdk/anyspend/utils/chain";
 import { isNativeToken } from "@b3dotfun/sdk/anyspend/utils/token";
-import { useSimTokenBalance } from "@b3dotfun/sdk/global-account/react";
+import { usePortfolioTokenBalance } from "@b3dotfun/sdk/global-account/react";
 import { formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
 import { useMemo } from "react";
 import { formatUnits } from "viem";
@@ -15,11 +15,14 @@ export function TokenBalance({
   walletAddress: string | undefined;
   onChangeInput: (value: string) => void;
 }) {
-  const tokenAddress = isNativeToken(token.address) ? "native" : token.address;
-  const { data, isLoading } = useSimTokenBalance(walletAddress, tokenAddress, token.chainId);
+  // `token.chainId` is Relay-numbered; balance rows are keyed by the chain registry's id.
+  const {
+    data: balance,
+    isLoading,
+    isError,
+  } = usePortfolioTokenBalance(walletAddress, token.address, toRegistryChainId(token.chainId));
 
   const { rawBalance, formattedBalance } = useMemo(() => {
-    const balance = data?.balances?.[0];
     if (!balance?.amount) {
       return { rawBalance: null, formattedBalance: "0" };
     }
@@ -28,7 +31,7 @@ export function TokenBalance({
       rawBalance: raw,
       formattedBalance: formatTokenAmount(raw, balance.decimals),
     };
-  }, [data]);
+  }, [balance]);
 
   const handlePercentageClick = (percentage: number) => {
     if (!rawBalance) return;
@@ -59,7 +62,7 @@ export function TokenBalance({
       {!isLoading && (
         <>
           <div className="text-as-primary/50 inline-flex rounded-lg text-sm">
-            {rawBalance ? `Balance: ${formattedBalance}` : `Balance: 0`}
+            {isError ? "Balance: —" : rawBalance ? `Balance: ${formattedBalance}` : `Balance: 0`}
           </div>
 
           {!!rawBalance && (

package/src/anyspend/react/hooks/useAnyspendQuote.ts

@@ -26,20 +26,20 @@ export function useAnyspendQuote(req: GetQuoteRequest): UseAnyspendQuoteResult {
     },
     enabled: Boolean(
       req.srcChain &&
-        req.dstChain &&
-        req.srcTokenAddress &&
-        req.dstTokenAddress &&
-        BigInt(
-          req.type === "swap" || req.type === "hype_duel" || req.type === "x402_swap" || req.type === "custom_exact_in"
-            ? req.amount
-            : req.type === "mint_nft"
+      req.dstChain &&
+      req.srcTokenAddress &&
+      req.dstTokenAddress &&
+      BigInt(
+        req.type === "swap" || req.type === "hype_duel" || req.type === "x402_swap" || req.type === "custom_exact_in"
+          ? req.amount
+          : req.type === "mint_nft"
+            ? req.price
+            : req.type === "join_tournament"
               ? req.price
-              : req.type === "join_tournament"
-                ? req.price
-                : req.type === "fund_tournament"
-                  ? req.fundAmount
-                  : req.payload.amount,
-        ) !== BigInt(0),
+              : req.type === "fund_tournament"
+                ? req.fundAmount
+                : req.payload.amount,
+      ) !== BigInt(0),
     ),
     refetchInterval: 10000,
     retry: false,

package/src/anyspend/react/hooks/useCreateDepositFirstOrder.ts

@@ -1,13 +1,13 @@
 import { anyspendService } from "@b3dotfun/sdk/anyspend/services/anyspend";
-import { components } from "@b3dotfun/sdk/anyspend/types/api";
-import { CreateOrderResponse } from "@b3dotfun/sdk/anyspend/types/api_req_res";
-import { VisitorData } from "@b3dotfun/sdk/anyspend/types/fingerprint";
+import type { components } from "@b3dotfun/sdk/anyspend/types/api";
+import type { CreateOrderResponse } from "@b3dotfun/sdk/anyspend/types/api_req_res";
+import type { VisitorData } from "@b3dotfun/sdk/anyspend/types/fingerprint";
 import { normalizeAddress } from "@b3dotfun/sdk/anyspend/utils";
 import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { useVisitorData } from "@fingerprintjs/fingerprintjs-pro-react";
 import { useMutation } from "@tanstack/react-query";
 import { useMemo } from "react";
-import { DepositContractConfig } from "../components/AnySpendDeposit";
+import type { DepositContractConfig } from "../components/AnySpendDeposit";
 
 export type CreateDepositFirstOrderParams = {
   recipientAddress: string;

package/src/anyspend/services/gas.test.ts

@@ -1,31 +1,108 @@
-import { describe, it, expect } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { GasOracleResponse } from "../types/gas";
 import { gasService, isGasOracleSupported } from "./gas";
 
+const RESPONSES: Readonly<Record<number, GasOracleResponse>> = {
+  1: {
+    chainId: 1,
+    chainName: "Ethereum",
+    timestamp: "2026-01-01T00:00:00.000Z",
+    source: "blocknative",
+    gasPrice: { low: "7", standard: "8", fast: "9" },
+    eip1559: {
+      baseFee: "6",
+      maxPriorityFee: { low: "1", standard: "2", fast: "3" },
+      maxFee: { low: "8", standard: "10", fast: "12" },
+    },
+    analysis: {
+      level: "elevated",
+      percentile: 80,
+      vs1h: 1.5,
+      vs4h: 1.4,
+      vs24h: 1.3,
+      recommendation: "Wait if possible.",
+    },
+    cached: false,
+  },
+  8453: {
+    chainId: 8453,
+    chainName: "Base",
+    timestamp: "2026-01-01T00:00:00.000Z",
+    source: "rpc",
+    gasPrice: { low: "0.004", standard: "0.005", fast: "0.006" },
+    eip1559: {
+      baseFee: "0.003",
+      maxPriorityFee: { low: "0.001", standard: "0.002", fast: "0.003" },
+      maxFee: { low: "0.005", standard: "0.007", fast: "0.009" },
+    },
+    analysis: {
+      level: "low",
+      percentile: 20,
+      vs1h: 0.8,
+      vs4h: 0.9,
+      vs24h: 0.7,
+      recommendation: "Good time to transact.",
+    },
+    cached: true,
+    cacheAge: 10,
+  },
+};
+
 describe("gasService", () => {
-  it("should check supported chains", () => {
-    expect(isGasOracleSupported(8453)).toBe(true); // Base
-    expect(isGasOracleSupported(1)).toBe(true); // Ethereum
-    expect(isGasOracleSupported(999999)).toBe(false); // Unknown
+  beforeEach(() => {
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(async (input: string | URL | Request) => {
+        const url = new URL(input instanceof Request ? input.url : String(input));
+        const chainId = Number(url.pathname.split("/").at(-1));
+        const response = RESPONSES[chainId];
+
+        return response ? Response.json(response) : new Response(null, { status: 404 });
+      }),
+    );
   });
 
-  it("should fetch gas price for Base", async () => {
-    const gas = await gasService.fetch(8453);
+  afterEach(() => {
+    vi.unstubAllGlobals();
+  });
 
-    console.log("Gas data:", gas);
+  it("checks supported chains", () => {
+    expect(isGasOracleSupported(8453)).toBe(true);
+    expect(isGasOracleSupported(1)).toBe(true);
+    expect(isGasOracleSupported(999999)).toBe(false);
+  });
+
+  it("fetches and transforms Base gas data", async () => {
+    const gas = await gasService.fetch(8453);
 
-    expect(gas.chainId).toBe(8453);
-    expect(gas.chainName).toBe("Base");
-    expect(gas.level).toMatch(/low|normal|elevated|high|spike/);
-    expect(typeof gas.gasPriceGwei).toBe("string");
-    expect(typeof gas.isSpike).toBe("boolean");
+    expect(gas).toEqual({
+      chainId: 8453,
+      chainName: "Base",
+      gasPriceGwei: "0.005",
+      baseFeeGwei: "0.003",
+      level: "low",
+      isSpike: false,
+      recommendation: "Good time to transact.",
+      vsMedian: 0.8,
+      source: "rpc",
+      timestamp: "2026-01-01T00:00:00.000Z",
+    });
   });
 
-  it("should fetch gas price for Ethereum", async () => {
+  it("fetches and transforms Ethereum gas data", async () => {
     const gas = await gasService.fetch(1);
 
-    console.log("ETH Gas:", gas);
-
-    expect(gas.chainId).toBe(1);
-    expect(gas.source).toBe("blocknative"); // ETH uses Blocknative
+    expect(gas).toEqual({
+      chainId: 1,
+      chainName: "Ethereum",
+      gasPriceGwei: "8",
+      baseFeeGwei: "6",
+      level: "elevated",
+      isSpike: true,
+      recommendation: "Wait if possible.",
+      vsMedian: 1.5,
+      source: "blocknative",
+      timestamp: "2026-01-01T00:00:00.000Z",
+    });
   });
 });

package/src/anyspend/types/api_req_res.ts

@@ -1,12 +1,17 @@
 import { paths } from "./api";
 
-export type GetOrderAndTxsResponse = paths["/orders/{orderId}"]["get"]["responses"]["200"]["content"]["application/json"];
+export type GetOrderAndTxsResponse =
+  paths["/orders/{orderId}"]["get"]["responses"]["200"]["content"]["application/json"];
 export type GetQuoteRequest = paths["/orders/quote"]["post"]["requestBody"]["content"]["application/json"];
 export type GetQuoteResponse = paths["/orders/quote"]["post"]["responses"]["200"]["content"]["application/json"];
 
-export type GetCoinbaseOnrampOptionsResponse = paths["/onramp/coinbase/options"]["get"]["responses"]["200"]["content"]["application/json"];
+export type GetCoinbaseOnrampOptionsResponse =
+  paths["/onramp/coinbase/options"]["get"]["responses"]["200"]["content"]["application/json"];
 export type GetOrderHistoryResponse = paths["/orders"]["get"]["responses"]["200"]["content"]["application/json"];
-export type GetTokenListResponse = paths["/chains/{chainId}/tokens"]["get"]["responses"]["200"]["content"]["application/json"];
+export type GetTokenListResponse =
+  paths["/chains/{chainId}/tokens"]["get"]["responses"]["200"]["content"]["application/json"];
 export type CreateOrderResponse = paths["/orders"]["post"]["responses"]["200"]["content"]["application/json"];
-export type GetStripeSupportedResponse = paths["/onramp/stripe/supported"]["get"]["responses"]["200"]["content"]["application/json"];
-export type GetStripeClientSecret = paths["/stripe/clientSecret"]["get"]["responses"]["200"]["content"]["application/json"];
+export type GetStripeSupportedResponse =
+  paths["/onramp/stripe/supported"]["get"]["responses"]["200"]["content"]["application/json"];
+export type GetStripeClientSecret =
+  paths["/stripe/clientSecret"]["get"]["responses"]["200"]["content"]["application/json"];

package/src/anyspend/utils/__tests__/address.test.ts

@@ -0,0 +1,39 @@
+import { describe, expect, it } from "vitest";
+import { RELAY_SOLANA_MAINNET_CHAIN_ID } from "../../constants";
+import { HYPERLIQUID_CHAIN_ID } from "../token";
+import { isSameChainAndToken } from "../address";
+
+const SOLANA_CHAIN_ID = 7565164;
+const WRAPPED_SOL = "So11111111111111111111111111111111111111112";
+
+describe("isSameChainAndToken", () => {
+  it("compares Solana mint addresses byte-for-byte", () => {
+    const caseMutatedMint = `s${WRAPPED_SOL.slice(1)}`;
+
+    expect(isSameChainAndToken(SOLANA_CHAIN_ID, WRAPPED_SOL, SOLANA_CHAIN_ID, caseMutatedMint)).toBe(false);
+    const invalidBase58Mutation = `SO${WRAPPED_SOL.slice(2)}`;
+    expect(
+      isSameChainAndToken(
+        RELAY_SOLANA_MAINNET_CHAIN_ID,
+        invalidBase58Mutation,
+        RELAY_SOLANA_MAINNET_CHAIN_ID,
+        invalidBase58Mutation.toLowerCase(),
+      ),
+    ).toBe(false);
+  });
+
+  it("compares EVM contract addresses case-insensitively on the same chain", () => {
+    const checksumAddress = "0xdAC17F958D2ee523a2206206994597C13D831ec7";
+
+    expect(isSameChainAndToken(1, checksumAddress, 1, checksumAddress.toLowerCase())).toBe(true);
+    expect(isSameChainAndToken(1, checksumAddress, 8453, checksumAddress)).toBe(false);
+  });
+
+  it("preserves case-insensitive token matching on Hyperliquid", () => {
+    const mixedCaseAddress = "0xAbCdEf0123456789AbCdEf0123456789";
+
+    expect(
+      isSameChainAndToken(HYPERLIQUID_CHAIN_ID, mixedCaseAddress, HYPERLIQUID_CHAIN_ID, mixedCaseAddress.toLowerCase()),
+    ).toBe(true);
+  });
+});

package/src/anyspend/utils/__tests__/deprecatedChains.test.ts

@@ -0,0 +1,44 @@
+/**
+ * Deprecated chains must disappear from the chain picker but stay in ALL_CHAINS.
+ *
+ * Those are two different questions. ALL_CHAINS answers "what is this chain" and is needed to
+ * render every order that ever existed — anyspend has ~1,400 historical orders on B3 and Plume, and
+ * getChainName throws on an unknown id. getAvailableChainIds answers "can a new order use this",
+ * which is what the deprecation actually changes.
+ */
+import { describe, expect, it } from "vitest";
+
+import { ALL_CHAINS, DEPRECATED_CHAIN_IDS, getAvailableChainIds, isDeprecatedChain } from "../chain";
+
+describe("deprecated chains", () => {
+  it("covers B3 and Plume", () => {
+    expect(DEPRECATED_CHAIN_IDS).toContain(8333);
+    expect(DEPRECATED_CHAIN_IDS).toContain(98866);
+    expect(isDeprecatedChain(8333)).toBe(true);
+    expect(isDeprecatedChain(98866)).toBe(true);
+    expect(isDeprecatedChain(8453)).toBe(false);
+    expect(isDeprecatedChain(undefined)).toBe(false);
+  });
+
+  // Offering a chain the API rejects lets a user pick something that then fails at order creation.
+  it("are absent from the picker in both directions", () => {
+    for (const context of ["from", "to"] as const) {
+      const available = getAvailableChainIds(context);
+      for (const chainId of DEPRECATED_CHAIN_IDS) {
+        expect(available).not.toContain(chainId);
+      }
+    }
+  });
+
+  it("still leaves the picker with the chains that do work", () => {
+    expect(getAvailableChainIds("to")).toContain(8453);
+    expect(getAvailableChainIds("from")).toContain(1);
+  });
+
+  // Removing the entry would make getChainName and friends throw while rendering old orders.
+  it("remain in ALL_CHAINS so historical orders still render", () => {
+    for (const chainId of DEPRECATED_CHAIN_IDS) {
+      expect(ALL_CHAINS[chainId]).toBeDefined();
+    }
+  });
+});

package/src/anyspend/utils/__tests__/toRegistryChainId.test.ts

@@ -0,0 +1,17 @@
+import { describe, expect, it } from "vitest";
+import { RELAY_SOLANA_MAINNET_CHAIN_ID } from "@b3dotfun/sdk/anyspend/constants";
+import { toRegistryChainId } from "../chain";
+import { SOLANA_CHAIN_ID } from "@b3dotfun/sdk/shared/utils/zerionPositions";
+
+describe("toRegistryChainId", () => {
+  it("translates Relay's Solana id to the registry's", () => {
+    expect(RELAY_SOLANA_MAINNET_CHAIN_ID).not.toBe(SOLANA_CHAIN_ID);
+    expect(toRegistryChainId(RELAY_SOLANA_MAINNET_CHAIN_ID)).toBe(SOLANA_CHAIN_ID);
+  });
+
+  it("leaves EVM chain ids alone — those are universal", () => {
+    for (const chainId of [1, 8453, 42161, 137, 999]) {
+      expect(toRegistryChainId(chainId)).toBe(chainId);
+    }
+  });
+});

package/src/anyspend/utils/address.ts

@@ -1,11 +1,9 @@
+import { chainTypeForIdentifier, isSolanaAddress } from "@b3/chain-registry/runtime";
 import { isAddress } from "viem";
+import { RELAY_SOLANA_MAINNET_CHAIN_ID } from "../constants";
 import { HYPERLIQUID_CHAIN_ID } from "./token";
 
-export function isSolanaAddress(address: string): boolean {
-  // Solana addresses are 32-byte base58 strings (usually 32-44 characters)
-  const solanaAddressRegex = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
-  return solanaAddressRegex.test(address);
-}
+export { isSolanaAddress };
 
 export function isEvmOrSolanaAddress(address: string): boolean {
   return isAddress(address) || isSolanaAddress(address);
@@ -49,5 +47,9 @@ export function isSameChainAndToken(
   destinationChainId: number,
   destinationTokenAddress: string,
 ): boolean {
-  return sourceChainId === destinationChainId && eqci(sourceTokenAddress, destinationTokenAddress);
+  if (sourceChainId !== destinationChainId) return false;
+  if (chainTypeForIdentifier(String(sourceChainId)) === "solana" || sourceChainId === RELAY_SOLANA_MAINNET_CHAIN_ID) {
+    return sourceTokenAddress === destinationTokenAddress;
+  }
+  return sourceTokenAddress.toLowerCase() === destinationTokenAddress.toLowerCase();
 }