thirdweb 5.83.2-nightly-5c554730d0df7272cc527a759313918ce8e28a37-20250112000334 → 5.84.0-nightly-0fdfb8aa778a344aa847503f668e48feb5f72548-20250115000312

package/src/exports/react.native.ts

@@ -86,7 +86,7 @@ export {
 
 // Components
 export { AutoConnect } from "../react/native/ui/AutoConnect/AutoConnect.js";
-export type { AutoConnectProps } from "../react/core/hooks/connection/types.js";
+export type { AutoConnectProps } from "../wallets/connection/types.js";
 
 export { TransactionButton } from "../react/native/ui/transaction/TransactionButton.js";
 export type { TransactionButtonProps } from "../react/core/hooks/transaction/transaction-button-utils.js";

package/src/exports/react.ts

@@ -121,7 +121,7 @@ export {
 } from "../react/core/hooks/pay/usePostOnrampQuote.js";
 
 export { AutoConnect } from "../react/web/ui/AutoConnect/AutoConnect.js";
-export type { AutoConnectProps } from "../react/core/hooks/connection/types.js";
+export type { AutoConnectProps } from "../wallets/connection/types.js";
 
 // auth
 export type { SiweAuthOptions } from "../react/core/hooks/auth/useSiweAuth.js";

package/src/exports/utils.ts

@@ -167,7 +167,7 @@ export { stringify } from "../utils/json.js";
 // ------------------------------------------------
 // values
 // ------------------------------------------------
-export { maxUint256 } from "viem";
+export { maxUint256 } from "ox/Solidity";
 
 // ------------------------------------------------
 // jwt
@@ -208,3 +208,6 @@ export type {
 
 export { shortenLargeNumber } from "../utils/shortenLargeNumber.js";
 export { formatNumber } from "../utils/formatNumber.js";
+
+// ENS
+export { isValidENSName } from "../utils/ens/isValidENSName.js";

package/src/exports/wallets.ts

@@ -161,4 +161,6 @@ export { injectedProvider } from "../wallets/injected/mipdStore.js";
 
 export type { ConnectionManager } from "../wallets/manager/index.js";
 
+export type { AutoConnectProps } from "../wallets/connection/types.js";
+export { autoConnect } from "../wallets/connection/autoConnect.js";
 export { deploySmartAccount } from "../wallets/smart/lib/signing.js";

package/src/extensions/ens/resolve-l2-name.ts

@@ -1,5 +1,10 @@
 import type { Address } from "abitype";
-import { type Hex, encodePacked, keccak256, namehash } from "viem";
+import * as ox__AbiParameters from "ox/AbiParameters";
+import * as ox__Bytes from "ox/Bytes";
+import * as ox__Ens from "ox/Ens";
+import * as ox__Hash from "ox/Hash";
+import * as ox__Hex from "ox/Hex";
+import { keccak256 } from "viem";
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
 import { getContract } from "../../contract/contract.js";
@@ -23,15 +28,26 @@ export type ResolveL2NameOptions = {
  */
 const convertReverseNodeToBytes = (address: Address, chainId: number) => {
   const addressFormatted = address.toLocaleLowerCase() as Address;
-  const addressNode = keccak256(addressFormatted.substring(2) as Hex);
+  // We temporarily need to use the raw hashing function from noble due to a bug in ox
+  const addressNode = ox__Hex.fromBytes(
+    ox__Hash.keccak256(
+      ox__Bytes.fromString(addressFormatted.slice(2) as string),
+    ),
+  );
   const cointype = (0x80000000 | chainId) >>> 0;
 
   const chainCoinType = cointype.toString(16).toLocaleUpperCase();
-  const reverseNode = namehash(`${chainCoinType.toLocaleUpperCase()}.reverse`);
+  const reverseNode = ox__Ens.namehash(
+    `${chainCoinType.toLocaleUpperCase()}.reverse`,
+  );
 
-  const addressReverseNode = keccak256(
-    encodePacked(["bytes32", "bytes32"], [reverseNode, addressNode]),
+  const addressReverseNode = ox__Hash.keccak256(
+    ox__AbiParameters.encodePacked(
+      ["bytes32", "bytes32"],
+      [reverseNode, addressNode],
+    ),
   );
+  keccak256;
   return addressReverseNode;
 };
 

package/src/extensions/erc1155/read/getNFTs.ts

@@ -1,4 +1,4 @@
-import { maxUint256 } from "viem";
+import { maxUint256 } from "ox/Solidity";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { min } from "../../../utils/bigint.js";
 import type { NFT } from "../../../utils/nft/parseNft.js";

package/src/extensions/erc1155/write/mintTo.ts

@@ -1,4 +1,4 @@
-import { maxUint256 } from "viem";
+import { maxUint256 } from "ox/Solidity";
 import type {
   BaseTransactionOptions,
   WithOverrides,

package/src/extensions/erc1155/write/mintToBatch.ts

@@ -1,4 +1,4 @@
-import { maxUint256 } from "viem";
+import { maxUint256 } from "ox/Solidity";
 import { multicall } from "../../../extensions/common/__generated__/IMulticall/write/multicall.js";
 import { upload } from "../../../storage/upload.js";
 import type {

package/src/extensions/erc1155/write/sigMint.ts

@@ -1,5 +1,5 @@
 import type { AbiParameterToPrimitiveType, Address } from "abitype";
-import { maxUint256 } from "viem";
+import { maxUint256 } from "ox/Solidity";
 import {
   NATIVE_TOKEN_ADDRESS,
   isNativeTokenAddress,

package/src/extensions/modules/ClaimableERC1155/setClaimConditions.ts

@@ -1,4 +1,5 @@
-import { encodePacked, maxUint256 } from "viem";
+import { maxUint256 } from "ox/Solidity";
+import { encodePacked } from "viem";
 import { NATIVE_TOKEN_ADDRESS } from "../../../constants/addresses.js";
 import { upload } from "../../../storage/upload.js";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";

package/src/extensions/modules/MintableERC1155/mintWithRole.ts

@@ -1,4 +1,4 @@
-import { maxUint256 } from "viem";
+import { maxUint256 } from "ox/Solidity";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { getAddress } from "../../../utils/address.js";
 import {

package/src/extensions/modules/MintableERC1155/mintWithSignature.ts

@@ -1,4 +1,4 @@
-import { maxUint256 } from "viem";
+import { maxUint256 } from "ox/Solidity";
 import { NATIVE_TOKEN_ADDRESS } from "../../../constants/addresses.js";
 import type { ThirdwebContract } from "../../../contract/contract.js";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";

package/src/react/core/hooks/wallets/useAutoConnect.ts

@@ -1,26 +1,14 @@
 "use client";
 
 import { useQuery } from "@tanstack/react-query";
-import type { Chain } from "../../../../chains/types.js";
-import type { ThirdwebClient } from "../../../../client/client.js";
 import type { AsyncStorage } from "../../../../utils/storage/AsyncStorage.js";
-import { isEcosystemWallet } from "../../../../wallets/ecosystem/is-ecosystem-wallet.js";
-import { ClientScopedStorage } from "../../../../wallets/in-app/core/authentication/client-scoped-storage.js";
-import type { AuthStoredTokenWithCookieReturnType } from "../../../../wallets/in-app/core/authentication/types.js";
-import { getUrlToken } from "../../../../wallets/in-app/web/lib/get-url-token.js";
+import { autoConnectCore } from "../../../../wallets/connection/autoConnectCore.js";
+import type { AutoConnectProps } from "../../../../wallets/connection/types.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
-import {
-  getLastConnectedChain,
-  getStoredActiveWalletId,
-  getStoredConnectedWalletIds,
-} from "../../../../wallets/manager/index.js";
 import type { WalletId } from "../../../../wallets/wallet-types.js";
 import { useConnectionManagerCtx } from "../../providers/connection-manager.js";
 import { setLastAuthProvider } from "../../utils/storage.js";
-import { timeoutPromise } from "../../utils/timeoutPromise.js";
-import type { AutoConnectProps } from "../connection/types.js";
 import { useConnect } from "./useConnect.js";
-import { useSetActiveWalletConnectionStatus } from "./useSetActiveWalletConnectionStatus.js";
 
 export function useAutoConnectCore(
   storage: AsyncStorage,
@@ -29,161 +17,27 @@ export function useAutoConnectCore(
   getInstalledWallets?: () => Wallet[],
 ) {
   const manager = useConnectionManagerCtx("useAutoConnect");
-  const setConnectionStatus = useSetActiveWalletConnectionStatus();
   const { connect } = useConnect({
     client: props.client,
     accountAbstraction: props.accountAbstraction,
   });
-  const { isAutoConnecting } = manager;
-  const { wallets, onConnect } = props;
-  const timeout = props.timeout ?? 15000;
-  // get the supported wallets from thirdweb provider
-  // check the storage for last connected wallets and connect them all
-  // check the storage for last active wallet and set it as active
-  const autoConnect = async (): Promise<boolean> => {
-    let autoConnected = false;
-    isAutoConnecting.setValue(true);
-    let [lastConnectedWalletIds, lastActiveWalletId] = await Promise.all([
-      getStoredConnectedWalletIds(storage),
-      getStoredActiveWalletId(storage),
-    ]);
-
-    const { authResult, walletId, authProvider, authCookie } = getUrlToken();
-    const wallet = wallets.find((w) => w.id === walletId);
-
-    // If an auth cookie is found and this site supports the wallet, we'll set the auth cookie in the client storage
-    if (authCookie && wallet) {
-      const clientStorage = new ClientScopedStorage({
-        storage,
-        clientId: props.client.clientId,
-        ecosystem: isEcosystemWallet(wallet)
-          ? {
-              id: wallet.id,
-              partnerId: wallet.getConfig()?.partnerId,
-            }
-          : undefined,
-      });
-      await clientStorage.saveAuthCookie(authCookie);
-    }
-
-    if (walletId) {
-      lastActiveWalletId = walletId;
-      lastConnectedWalletIds = lastConnectedWalletIds?.includes(walletId)
-        ? lastConnectedWalletIds
-        : [walletId, ...(lastConnectedWalletIds || [])];
-    }
-    if (authProvider) {
-      await setLastAuthProvider(authProvider, storage);
-    }
-
-    // if no wallets were last connected or we didn't receive an auth token
-    if (!lastConnectedWalletIds) {
-      return autoConnected;
-    }
-
-    // this flow can actually be used for a first connection in the case of a redirect
-    // in that case, we default to the passed chain to connect to
-    const lastConnectedChain =
-      (await getLastConnectedChain(storage)) || props.chain;
-
-    const availableWallets = [...wallets, ...(getInstalledWallets?.() ?? [])];
-    const activeWallet =
-      lastActiveWalletId &&
-      (availableWallets.find((w) => w.id === lastActiveWalletId) ||
-        createWalletFn(lastActiveWalletId));
-
-    if (activeWallet) {
-      try {
-        setConnectionStatus("connecting"); // only set connecting status if we are connecting the last active EOA
-        await timeoutPromise(
-          handleWalletConnection({
-            wallet: activeWallet,
-            client: props.client,
-            lastConnectedChain,
-            authResult,
-          }),
-          {
-            ms: timeout,
-            message: `AutoConnect timeout: ${timeout}ms limit exceeded.`,
-          },
-        ).catch((err) => {
-          console.warn(err.message);
-          if (props.onTimeout) {
-            props.onTimeout();
-          }
-        });
-
-        // connected wallet could be activeWallet or smart wallet
-        const connectedWallet = await connect(activeWallet);
-
-        if (connectedWallet) {
-          if (onConnect) {
-            try {
-              onConnect(connectedWallet);
-              autoConnected = true;
-            } catch {
-              // ignore
-            }
-          }
-        } else {
-          setConnectionStatus("disconnected");
-        }
-      } catch (e) {
-        if (e instanceof Error) {
-          console.warn("Error auto connecting wallet:", e.message);
-        }
-        setConnectionStatus("disconnected");
-      }
-    } else {
-      setConnectionStatus("disconnected");
-    }
-
-    // then connect wallets that were last connected but were not set as active
-    const otherWallets = availableWallets.filter(
-      (w) =>
-        w.id !== lastActiveWalletId && lastConnectedWalletIds.includes(w.id),
-    );
-
-    for (const wallet of otherWallets) {
-      try {
-        await handleWalletConnection({
-          wallet,
-          client: props.client,
-          lastConnectedChain,
-          authResult,
-        });
-        manager.addConnectedWallet(wallet);
-      } catch {
-        // no-op
-      }
-    }
-    isAutoConnecting.setValue(false);
-    return autoConnected; // useQuery needs a return value
-  };
 
   // trigger the auto connect on first mount only
   const query = useQuery({
     queryKey: ["autoConnect", props.client.clientId],
-    queryFn: autoConnect,
+    queryFn: () =>
+      autoConnectCore({
+        createWalletFn,
+        manager,
+        props,
+        storage,
+        connectOverride: connect,
+        getInstalledWallets,
+        setLastAuthProvider,
+      }),
     refetchOnMount: false,
     refetchOnWindowFocus: false,
   });
 
   return query;
 }
-
-/**
- * @internal
- */
-export async function handleWalletConnection(props: {
-  wallet: Wallet;
-  client: ThirdwebClient;
-  authResult: AuthStoredTokenWithCookieReturnType | undefined;
-  lastConnectedChain: Chain | undefined;
-}) {
-  return props.wallet.autoConnect({
-    client: props.client,
-    chain: props.lastConnectedChain,
-    authResult: props.authResult,
-  });
-}

package/src/react/core/hooks/wallets/useAutoConnectCore.test.tsx

@@ -6,15 +6,11 @@ import { TEST_CLIENT } from "~test/test-clients.js";
 import { TEST_ACCOUNT_A } from "~test/test-wallets.js";
 import { createWalletAdapter } from "../../../../adapters/wallet-adapter.js";
 import { ethereum } from "../../../../chains/chain-definitions/ethereum.js";
-import { isAddress } from "../../../../utils/address.js";
 import { createConnectionManager } from "../../../../wallets/manager/index.js";
 import type { WalletId } from "../../../../wallets/wallet-types.js";
 import { ThirdwebProvider } from "../../../web/providers/thirdweb-provider.js";
 import { ConnectionManagerCtx } from "../../providers/connection-manager.js";
-import {
-  handleWalletConnection,
-  useAutoConnectCore,
-} from "./useAutoConnect.js";
+import { useAutoConnectCore } from "./useAutoConnect.js";
 
 describe("useAutoConnectCore", () => {
   const mockStorage = new MockStorage();
@@ -159,29 +155,3 @@ describe("useAutoConnectCore", () => {
     );
   });
 });
-
-describe("handleWalletConnection", () => {
-  const wallet = createWalletAdapter({
-    adaptedAccount: TEST_ACCOUNT_A,
-    client: TEST_CLIENT,
-    chain: ethereum,
-    onDisconnect: () => {},
-    switchChain: () => {},
-  });
-  it("should return the correct result", async () => {
-    const result = await handleWalletConnection({
-      client: TEST_CLIENT,
-      lastConnectedChain: ethereum,
-      authResult: undefined,
-      wallet,
-    });
-
-    expect("address" in result).toBe(true);
-    expect(isAddress(result.address)).toBe(true);
-    expect("sendTransaction" in result).toBe(true);
-    expect(typeof result.sendTransaction).toBe("function");
-    expect("signMessage" in result).toBe(true);
-    expect("signTypedData" in result).toBe(true);
-    expect("signTransaction" in result).toBe(true);
-  });
-});

package/src/react/core/hooks/wallets/useSendToken.ts

@@ -6,6 +6,7 @@ import { transfer } from "../../../../extensions/erc20/write/transfer.js";
 import { sendTransaction } from "../../../../transaction/actions/send-transaction.js";
 import { prepareTransaction } from "../../../../transaction/prepare-transaction.js";
 import { isAddress } from "../../../../utils/address.js";
+import { isValidENSName } from "../../../../utils/ens/isValidENSName.js";
 import { toWei } from "../../../../utils/units.js";
 import { useActiveWallet } from "./useActiveWallet.js";
 
@@ -53,7 +54,7 @@ export function useSendToken(client: ThirdwebClient) {
       // input validation
       if (
         !receiverAddress ||
-        (!receiverAddress.endsWith(".eth") && !isAddress(receiverAddress))
+        (!isValidENSName(receiverAddress) && !isAddress(receiverAddress))
       ) {
         throw new Error("Invalid receiver address");
       }

package/src/react/native/hooks/wallets/useAutoConnect.ts

@@ -1,6 +1,6 @@
 import { nativeLocalStorage } from "../../../../utils/storage/nativeStorage.js";
+import type { AutoConnectProps } from "../../../../wallets/connection/types.js";
 import { createWallet } from "../../../../wallets/native/create-wallet.js";
-import type { AutoConnectProps } from "../../../core/hooks/connection/types.js";
 import { useAutoConnectCore } from "../../../core/hooks/wallets/useAutoConnect.js";
 import { getDefaultWallets } from "../../wallets/defaultWallets.js";
 

package/src/react/native/ui/AutoConnect/AutoConnect.tsx

@@ -1,5 +1,5 @@
 "use client";
-import type { AutoConnectProps } from "../../../core/hooks/connection/types.js";
+import type { AutoConnectProps } from "../../../../wallets/connection/types.js";
 import { useAutoConnect } from "../../hooks/wallets/useAutoConnect.js";
 
 /**

package/src/react/web/hooks/wallets/useAutoConnect.ts

@@ -1,9 +1,9 @@
 import { webLocalStorage } from "../../../../utils/storage/webStorage.js";
+import type { AutoConnectProps } from "../../../../wallets/connection/types.js";
 import { createWallet } from "../../../../wallets/create-wallet.js";
+import { getDefaultWallets } from "../../../../wallets/defaultWallets.js";
 import { getInstalledWalletProviders } from "../../../../wallets/injected/mipdStore.js";
-import type { AutoConnectProps } from "../../../core/hooks/connection/types.js";
 import { useAutoConnectCore } from "../../../core/hooks/wallets/useAutoConnect.js";
-import { getDefaultWallets } from "../../wallets/defaultWallets.js";
 
 /**
  * Autoconnect the last previously connected wallet.

package/src/react/web/ui/AutoConnect/AutoConnect.tsx

@@ -1,5 +1,5 @@
 "use client";
-import type { AutoConnectProps } from "../../../core/hooks/connection/types.js";
+import type { AutoConnectProps } from "../../../../wallets/connection/types.js";
 import { useAutoConnect } from "../../hooks/wallets/useAutoConnect.js";
 
 /**

package/src/react/web/ui/ConnectWallet/ConnectButton.tsx

@@ -2,6 +2,7 @@
 
 import styled from "@emotion/styled";
 import { useEffect, useMemo, useState } from "react";
+import { getDefaultWallets } from "../../../../wallets/defaultWallets.js";
 import { iconSize } from "../../../core/design-system/index.js";
 import { useSiweAuth } from "../../../core/hooks/auth/useSiweAuth.js";
 import type { ConnectButtonProps } from "../../../core/hooks/connection/ConnectButtonProps.js";
@@ -16,7 +17,6 @@ import {
 } from "../../providers/wallet-ui-states-provider.js";
 import { canFitWideModal } from "../../utils/canFitWideModal.js";
 import { usePreloadWalletProviders } from "../../utils/usePreloadWalletProviders.js";
-import { getDefaultWallets } from "../../wallets/defaultWallets.js";
 import { AutoConnect } from "../AutoConnect/AutoConnect.js";
 import { Modal } from "../components/Modal.js";
 import { Spinner } from "../components/Spinner.js";
@@ -111,6 +111,8 @@ const TW_CONNECT_WALLET = "tw-connect-wallet";
  * />;
  * ```
  *
+ * Note that this prop doesn't affect ecosystem wallets. Ecosystem wallets will only be converted to smart accounts if the ecosystem owner has enabled account abstraction.
+ *
  * ### Enabling sign in with ethereum (Auth)
  *
  * ```tsx

package/src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx

@@ -2,6 +2,7 @@
 import { useEffect, useMemo } from "react";
 import type { Chain } from "../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../client/client.js";
+import { getDefaultWallets } from "../../../../../wallets/defaultWallets.js";
 import type { Wallet } from "../../../../../wallets/interfaces/wallet.js";
 import type { SmartWalletOptions } from "../../../../../wallets/smart/types.js";
 import {
@@ -21,7 +22,6 @@ import { useConnectionManager } from "../../../../core/providers/connection-mana
 import { WalletUIStatesProvider } from "../../../providers/wallet-ui-states-provider.js";
 import { canFitWideModal } from "../../../utils/canFitWideModal.js";
 import { usePreloadWalletProviders } from "../../../utils/usePreloadWalletProviders.js";
-import { getDefaultWallets } from "../../../wallets/defaultWallets.js";
 import { LoadingScreen } from "../../../wallets/shared/LoadingScreen.js";
 import { AutoConnect } from "../../AutoConnect/AutoConnect.js";
 import { DynamicHeight } from "../../components/DynamicHeight.js";
@@ -110,6 +110,7 @@ import { useSetupScreen } from "./screen.js";
  * }}
  * />;
  * ```
+ * Note that this prop doesn't affect ecosystem wallets. Ecosystem wallets will only be converted to smart accounts if the ecosystem owner has enabled account abstraction.
  *
  * ### Enabling sign in with ethereum (Auth)
  *

package/src/react/web/ui/ConnectWallet/screens/WalletSwitcherConnectionScreen.tsx

@@ -1,11 +1,11 @@
 import type { Chain } from "../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../client/client.js";
+import { getDefaultWallets } from "../../../../../wallets/defaultWallets.js";
 import type { Wallet } from "../../../../../wallets/interfaces/wallet.js";
 import type { SmartWalletOptions } from "../../../../../wallets/smart/types.js";
 import type { AppMetadata } from "../../../../../wallets/types.js";
 import type { WalletId } from "../../../../../wallets/wallet-types.js";
 import { useConnectedWallets } from "../../../../core/hooks/wallets/useConnectedWallets.js";
-import { getDefaultWallets } from "../../../wallets/defaultWallets.js";
 import { ConnectModalContent } from "../Modal/ConnectModalContent.js";
 import { useSetupScreen } from "../Modal/screen.js";
 import type { ConnectLocale } from "../locale/types.js";

package/src/react/web/ui/ConnectWallet/useConnectModal.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useContext, useMemo, useState } from "react";
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
+import { getDefaultWallets } from "../../../../wallets/defaultWallets.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
 import type { SmartWalletOptions } from "../../../../wallets/smart/types.js";
 import type { AppMetadata } from "../../../../wallets/types.js";
@@ -8,7 +9,6 @@ import type { Theme } from "../../../core/design-system/index.js";
 import { SetRootElementContext } from "../../../core/providers/RootElementContext.js";
 import { WalletUIStatesProvider } from "../../providers/wallet-ui-states-provider.js";
 import { canFitWideModal } from "../../utils/canFitWideModal.js";
-import { getDefaultWallets } from "../../wallets/defaultWallets.js";
 import type { LocaleId } from "../types.js";
 import ConnectModal from "./Modal/ConnectModal.js";
 import { getConnectLocale } from "./locale/getConnectLocale.js";

package/src/react/web/wallets/in-app/WalletAuth.tsx

@@ -1,6 +1,7 @@
 import { Suspense, useRef, useState } from "react";
 import { defineChain } from "../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
+import { getDefaultWallets } from "../../../../wallets/defaultWallets.js";
 import { isEcosystemWallet } from "../../../../wallets/ecosystem/is-ecosystem-wallet.js";
 import { linkProfile } from "../../../../wallets/in-app/web/lib/auth/index.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
@@ -13,7 +14,6 @@ import type { ConnectLocale } from "../../ui/ConnectWallet/locale/types.js";
 import { Spacer } from "../../ui/components/Spacer.js";
 import { WalletImage } from "../../ui/components/WalletImage.js";
 import { Container, ModalHeader } from "../../ui/components/basic.js";
-import { getDefaultWallets } from "../defaultWallets.js";
 import { ErrorState } from "../shared/ErrorState.js";
 import { LoadingScreen } from "../shared/LoadingScreen.js";
 import { LoadingState } from "../shared/LoadingState.js";

package/src/utils/abi/encodeAbiParameters.ts

@@ -3,7 +3,7 @@ import type {
   AbiParameterToPrimitiveType,
   AbiParametersToPrimitiveTypes,
 } from "abitype";
-import { concat, slice } from "viem/utils";
+import * as ox__Hex from "ox/Hex";
 import { isAddress } from "../address.js";
 import { byteSize } from "../encoding/helpers/byte-size.js";
 import {
@@ -149,7 +149,7 @@ function encodeParams(preparedParams: PreparedParam[]): Hex {
   }
 
   // 3. Concatenate static and dynamic parts.
-  return concat([...staticParams, ...dynamicParams]);
+  return ox__Hex.concat(...[...staticParams, ...dynamicParams]);
 }
 
 /////////////////////////////////////////////////////////////////
@@ -200,7 +200,10 @@ function encodeArray<const TParam extends AbiParameter>(
       const length_ = numberToHex(preparedParams.length, { size: 32 });
       return {
         dynamic: true,
-        encoded: preparedParams.length > 0 ? concat([length_, data]) : length_,
+        encoded:
+          preparedParams.length > 0
+            ? ox__Hex.concat(...[length_, data])
+            : length_,
       };
     }
     if (dynamicChild) {
@@ -209,7 +212,7 @@ function encodeArray<const TParam extends AbiParameter>(
   }
   return {
     dynamic: false,
-    encoded: concat(preparedParams.map(({ encoded }) => encoded)),
+    encoded: ox__Hex.concat(...preparedParams.map(({ encoded }) => encoded)),
   };
 }
 
@@ -231,7 +234,9 @@ function encodeBytes<const TParam extends AbiParameter>(
     }
     return {
       dynamic: true,
-      encoded: concat([padHex(numberToHex(bytesSize, { size: 32 })), value_]),
+      encoded: ox__Hex.concat(
+        ...[padHex(numberToHex(bytesSize, { size: 32 })), value_],
+      ),
     };
   }
   if (bytesSize !== Number.parseInt(paramSize)) {
@@ -263,17 +268,16 @@ function encodeString(value: string): PreparedParam {
   const parts: Hex[] = [];
   for (let i = 0; i < partsLength; i++) {
     parts.push(
-      padHex(slice(hexValue, i * 32, (i + 1) * 32), {
+      padHex(ox__Hex.slice(hexValue, i * 32, (i + 1) * 32), {
         dir: "right",
       }),
     );
   }
   return {
     dynamic: true,
-    encoded: concat([
-      padHex(numberToHex(byteSize(hexValue), { size: 32 })),
-      ...parts,
-    ]),
+    encoded: ox__Hex.concat(
+      ...[padHex(numberToHex(byteSize(hexValue), { size: 32 })), ...parts],
+    ),
   };
 }
 
@@ -304,7 +308,7 @@ function encodeTuple<
     dynamic,
     encoded: dynamic
       ? encodeParams(preparedParams)
-      : concat(preparedParams.map(({ encoded }) => encoded)),
+      : ox__Hex.concat(...preparedParams.map(({ encoded }) => encoded)),
   };
 }