@multiplatform.one/web3 7.28.0 → 7.29.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/web3",
-  "version": "7.28.0",
+  "version": "7.29.0",
   "description": "Web3 wallet integration for multiplatform.one ecosystem with ConnectKit and wagmi",
   "keywords": [
     "connectkit",
@@ -113,10 +113,10 @@
   "dependencies": {
     "@aave/account": "^0.2.0",
     "@metamask/connect-evm": "^2.1.1",
-    "@multiplatform.one/connectkit": "7.28.0",
-    "@multiplatform.one/gpg": "7.28.0",
-    "@multiplatform.one/platform": "7.28.0",
-    "@multiplatform.one/theme": "7.28.0",
+    "@multiplatform.one/connectkit": "7.29.0",
+    "@multiplatform.one/gpg": "7.29.0",
+    "@multiplatform.one/platform": "7.29.0",
+    "@multiplatform.one/theme": "7.29.0",
     "@noble/curves": "^1.9.7",
     "@solana/kit": "^8.3.0",
     "@solana/wallet-adapter-base": "^0.9.27",
@@ -124,8 +124,6 @@
     "@solana/wallet-adapter-react": "^0.15.39",
     "@solana/wallet-adapter-solflare": "^0.6.33",
     "@solana/web3.js": "^1.98.4",
-    "@wagmi/connectors": "^8.0.22",
-    "@wagmi/core": "^3.5.0",
     "bs58": "^6.0.0",
     "buffer": "^6.0.3",
     "detect-browser": "^5.3.0",
@@ -140,7 +138,7 @@
     "wagmi": "^3.7.1"
   },
   "devDependencies": {
-    "@multiplatform.one/config": "7.28.0",
+    "@multiplatform.one/config": "7.29.0",
     "@tamagui/build": "2.7.6",
     "@tanstack/react-query": "^5.100.7",
     "@testing-library/jest-dom": "^6.9.1",

package/src/bridge/AuthBridge.ts

@@ -42,11 +42,13 @@ export interface AuthSignInOptions extends RequestOptions {
  */
 export class AuthBridge {
   private pending: AuthBrowserLogin | null = null;
+  private readonly bridge: BridgeClient;
+  private readonly options: AuthBridgeOptions;
 
-  constructor(
-    private readonly bridge: BridgeClient,
-    private readonly options: AuthBridgeOptions,
-  ) {}
+  constructor(bridge: BridgeClient, options: AuthBridgeOptions) {
+    this.bridge = bridge;
+    this.options = options;
+  }
 
   async signIn(
     params: Partial<AuthSignInParams> = {},

package/src/bridge/BridgeClient.ts

@@ -30,11 +30,12 @@ export class BridgeClient {
   private readonly listeners = new Set<EventHandler>();
   private readonly unsubscribe: () => void;
   private disposed = false;
+  private readonly transport: Transport;
+  private readonly opts: { timeoutMs?: number };
 
-  constructor(
-    private readonly transport: Transport,
-    private readonly opts: { timeoutMs?: number } = {},
-  ) {
+  constructor(transport: Transport, opts: { timeoutMs?: number } = {}) {
+    this.transport = transport;
+    this.opts = opts;
     this.unsubscribe = transport.subscribe(this.onMessage);
   }
 

package/src/bridge/BridgeHost.ts

@@ -24,8 +24,10 @@ export type RequestHandler = (method: string, params: unknown) => Promise<unknow
 export class BridgeHost {
   private readonly handlers = new Map<Namespace, RequestHandler>();
   private readonly unsubscribe: () => void;
+  private readonly transport: Transport;
 
-  constructor(private readonly transport: Transport) {
+  constructor(transport: Transport) {
+    this.transport = transport;
     this.unsubscribe = transport.subscribe(this.onMessage);
   }
 

package/src/bridge/GpgBridge.ts

@@ -16,7 +16,11 @@ const GPG_TIMEOUT_MS = 15 * 60_000;
  * native host that draws its own paste box calls `submit` instead.
  */
 export class GpgBridge {
-  constructor(private readonly bridge: BridgeClient) {}
+  private readonly bridge: BridgeClient;
+
+  constructor(bridge: BridgeClient) {
+    this.bridge = bridge;
+  }
 
   /** Resolves with the armored signature followed by the armored public key. */
   async signMessage(message: string, options: RequestOptions = {}): Promise<string> {

package/src/bridge/SolanaBridge.ts

@@ -9,7 +9,11 @@ import type { BridgeClient } from "./BridgeClient";
  * WalletProvider (later plan); this class is the testable transport core.
  */
 export class SolanaBridge {
-  constructor(private readonly bridge: BridgeClient) {}
+  private readonly bridge: BridgeClient;
+
+  constructor(bridge: BridgeClient) {
+    this.bridge = bridge;
+  }
 
   async connect(): Promise<{ publicKey: string }> {
     return (await this.bridge.request("solana", "connect")) as { publicKey: string };

package/src/bridge/SuiBridge.ts

@@ -6,7 +6,11 @@ import type { BridgeClient, RequestOptions } from "./BridgeClient";
  * base64, which is what the Keycloak Sui verifier takes as the login username.
  */
 export class SuiBridge {
-  constructor(private readonly bridge: BridgeClient) {}
+  private readonly bridge: BridgeClient;
+
+  constructor(bridge: BridgeClient) {
+    this.bridge = bridge;
+  }
 
   async connect(options?: RequestOptions): Promise<{ address: string }> {
     return (await this.bridge.request("sui", "connect", undefined, options)) as {

package/src/bridge/bridgeConnector.ts

@@ -1,4 +1,4 @@
-import { createConnector } from "wagmi";
+import { type CreateConnectorFn, createConnector } from "wagmi";
 import type { Address } from "viem";
 import type { BridgeClient } from "./BridgeClient";
 import { createBridgeProvider, type BridgeProvider } from "./eip1193";
@@ -9,7 +9,7 @@ import { createBridgeProvider, type BridgeProvider } from "./eip1193";
  * native — wagmi only sees an ordinary EIP-1193 provider; the wallet lives in the
  * WebView on the other side of the bridge.
  */
-export function createBridgeConnector(bridge: BridgeClient) {
+export function createBridgeConnector(bridge: BridgeClient): CreateConnectorFn {
   return createConnector((config) => {
     let provider: BridgeProvider | undefined;
 

package/src/clients/evm.ts

@@ -82,12 +82,14 @@ export interface EvmWaitOptions {
  */
 export class ReceiptPendingError extends Error {
   readonly mayStillLand = true as const;
+  readonly hash: Hash;
+  readonly chainId: number;
   readonly explorerUrl: string | undefined;
   /** Known once the node has seen the transaction. Keep it with the hash to resume the wait. */
   readonly nonce: number | undefined;
   constructor(
-    readonly hash: Hash,
-    readonly chainId: number,
+    hash: Hash,
+    chainId: number,
     options: {
       detail: string;
       explorerUrl?: string;
@@ -101,6 +103,8 @@ export class ReceiptPendingError extends Error {
       { cause: options.cause },
     );
     this.name = "ReceiptPendingError";
+    this.hash = hash;
+    this.chainId = chainId;
     this.explorerUrl = options.explorerUrl;
     this.nonce = options.nonce;
   }
@@ -112,28 +116,29 @@ export class ReceiptPendingError extends Error {
  */
 export class ReceiptWaitAbortedError extends Error {
   readonly mayStillLand = true as const;
-  constructor(
-    readonly hash: Hash,
-    readonly chainId: number,
-    readonly nonce: number | undefined,
-    cause: unknown,
-  ) {
+  readonly hash: Hash;
+  readonly chainId: number;
+  readonly nonce: number | undefined;
+  constructor(hash: Hash, chainId: number, nonce: number | undefined, cause: unknown) {
     super(`stopped waiting for transaction ${hash} on chain ${chainId}`, { cause });
     this.name = "AbortError";
+    this.hash = hash;
+    this.chainId = chainId;
+    this.nonce = nonce;
   }
 }
 
 /** Mined and reverted: it spent gas and moved nothing. A retry is a new transaction. */
 export class TransactionRevertedError extends Error {
   readonly mayStillLand = false as const;
+  readonly receipt: TransactionReceipt;
+  readonly chainId: number;
   readonly hash: Hash;
-  constructor(
-    readonly receipt: TransactionReceipt,
-    readonly chainId: number,
-    label = "transaction",
-  ) {
+  constructor(receipt: TransactionReceipt, chainId: number, label = "transaction") {
     super(`${label} ${receipt.transactionHash} reverted in block ${receipt.blockNumber}`);
     this.name = "TransactionRevertedError";
+    this.receipt = receipt;
+    this.chainId = chainId;
     this.hash = receipt.transactionHash;
   }
 }
@@ -156,12 +161,16 @@ export type EvmReplacementReason = "cancelled" | "replaced" | "unmatched";
  */
 export class TransactionReplacedError extends Error {
   readonly mayStillLand = false as const;
+  readonly hash: Hash;
+  readonly chainId: number;
+  readonly reason: EvmReplacementReason;
+  /** The transaction that took the nonce, when it was found. */
+  readonly replacement: TransactionReceipt | undefined;
   constructor(
-    readonly hash: Hash,
-    readonly chainId: number,
-    readonly reason: EvmReplacementReason,
-    /** The transaction that took the nonce, when it was found. */
-    readonly replacement: TransactionReceipt | undefined,
+    hash: Hash,
+    chainId: number,
+    reason: EvmReplacementReason,
+    replacement: TransactionReceipt | undefined,
   ) {
     super(
       `transaction ${hash} was ${reason === "unmatched" ? "superseded" : reason}${
@@ -169,6 +178,10 @@ export class TransactionReplacedError extends Error {
       }: another transaction took its nonce`,
     );
     this.name = "TransactionReplacedError";
+    this.hash = hash;
+    this.chainId = chainId;
+    this.reason = reason;
+    this.replacement = replacement;
   }
 }
 

package/src/clients/solana.ts

@@ -102,12 +102,14 @@ export type SolanaCommitmentStatus = "processed" | "confirmed" | "finalized";
  * same submission again rather than sending a new one.
  */
 export class SolanaConfirmationError extends Error {
+  readonly signature: Signature;
+  readonly reason: SolanaConfirmationFailure;
   readonly mayStillLand: boolean;
   /** The last confirmationStatus the poll saw, or null when it never saw the signature. */
   readonly lastStatus: SolanaCommitmentStatus | null;
   constructor(
-    readonly signature: Signature,
-    readonly reason: SolanaConfirmationFailure,
+    signature: Signature,
+    reason: SolanaConfirmationFailure,
     detail: string,
     options: { lastStatus?: SolanaCommitmentStatus | null; cause?: unknown } = {},
   ) {
@@ -121,6 +123,8 @@ export class SolanaConfirmationError extends Error {
       { cause: options.cause },
     );
     this.name = "SolanaConfirmationError";
+    this.signature = signature;
+    this.reason = reason;
     this.mayStillLand = mayStillLand;
     this.lastStatus = options.lastStatus ?? null;
   }

package/src/clients/types.ts

@@ -32,13 +32,13 @@ export interface ChainClient<F extends ClientFamily = ClientFamily> {
 
 /** A client method the family does not implement yet. */
 export class UnsupportedClientMethodError extends Error {
-  constructor(
-    readonly family: ClientFamily,
-    readonly method: string,
-    detail?: string,
-  ) {
+  readonly family: ClientFamily;
+  readonly method: string;
+  constructor(family: ClientFamily, method: string, detail?: string) {
     super(`${family} client: ${method} is not supported${detail ? ` (${detail})` : ""}`);
     this.name = "UnsupportedClientMethodError";
+    this.family = family;
+    this.method = method;
   }
 }
 

package/src/connectkit/connectors/aaveAccountConnector.spec.ts

@@ -1,5 +1,5 @@
 // @vitest-environment happy-dom
-import { createConfig, createStorage, http } from "@wagmi/core";
+import { createConfig, createStorage, http } from "wagmi";
 import { mainnet } from "viem/chains";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -9,7 +9,7 @@ const { providerBuilt } = vi.hoisted(() => ({ providerBuilt: vi.fn() }));
 // Its own aaveAccountConnector() builds that provider as soon as it is called, which
 // is what the pre-fix defaultConnectors used.
 vi.mock("@aave/account", async () => {
-  const { injected } = await import("@wagmi/connectors/injected");
+  const { injected } = await import("wagmi/connectors/injected");
   class EthereumProvider {
     constructor(options?: unknown) {
       providerBuilt(options);

package/src/connectkit/connectors/aaveAccountConnector.ts

@@ -5,7 +5,7 @@
 // Keycloak login page (MPO-378). This builds the provider only when the user picks
 // Aave Account, or when wagmi reconnects the Aave Account it connected last.
 import { EthereumProvider, type EthereumProviderOptions } from "@aave/account";
-import { injected } from "@wagmi/connectors/injected";
+import { injected } from "wagmi/connectors/injected";
 import type { CreateConnectorFn } from "wagmi";
 
 export const aaveAccountConnectorId = "aaveAccountProvider";

package/src/connectkit/connectors/metaMaskConnectConnector.spec.ts

@@ -1,10 +1,10 @@
 import type { EventHandlers } from "@metamask/connect-evm";
-import { connect, createConfig, http, reconnect } from "@wagmi/core";
-import { createEmitter } from "@wagmi/core/internal";
 import type { Chain } from "viem";
 import { getAddress, SwitchChainError } from "viem";
 import { base, mainnet, polygon } from "viem/chains";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createConfig, http } from "wagmi";
+import { connect, reconnect } from "wagmi/actions";
 
 import {
   metaMaskConnect,
@@ -43,7 +43,7 @@ function build(chains: readonly Chain[]) {
   const transports = Object.fromEntries(chains.map((chain) => [chain.id, http()]));
   return metaMaskConnect({ dapp: { name: "test", url: "https://example.test" } })({
     chains: chains as [Chain, ...Chain[]],
-    emitter: createEmitter("metaMaskSDK"),
+    emitter: { uid: "metaMaskSDK", emit: vi.fn(), on: vi.fn(), once: vi.fn(), off: vi.fn() },
     transports,
   } as never);
 }

package/src/connectkit/connectors/metaMaskConnectConnector.ts

@@ -12,12 +12,7 @@
 // and ConnectWithInjector's display_uri listener all key off it, and so does
 // every consumer's persisted "recent connector".
 import type { EIP1193Provider, MetamaskConnectEVM } from "@metamask/connect-evm";
-import {
-  ChainNotConfiguredError,
-  type CreateConnectorFn,
-  createConnector,
-  extractRpcUrls,
-} from "@wagmi/core";
+import { ChainNotConfiguredError, type CreateConnectorFn, createConnector } from "wagmi";
 import {
   type Address,
   type Chain,
@@ -58,12 +53,25 @@ export function metaMaskNetworks(
   const networks: Record<Hex, string> = {};
   for (const chain of chains) {
     if (isSyntheticChainId(chain.id)) continue;
-    const url = extractRpcUrls({ chain, transports })?.[0] ?? chain.rpcUrls.default?.http[0];
+    const url = transportUrl(chain, transports) || chain.rpcUrls.default?.http[0];
     if (url && isUrl(url)) networks[numberToHex(chain.id)] = url;
   }
   return networks;
 }
 
+/**
+ * The URL wagmi's transport for `chain` talks to, the first one of a `fallback`.
+ * @wagmi/core's extractRpcUrls does this, and wagmi does not re-export it.
+ */
+function transportUrl(
+  chain: Chain,
+  transports?: ConnectorConfig["transports"],
+): string | undefined {
+  const transport = transports?.[chain.id]?.({ chain });
+  const first = (transport?.value?.transports as (typeof transport)[] | undefined)?.[0];
+  return (first ?? transport)?.value?.url;
+}
+
 function isUrl(value: string): boolean {
   try {
     new URL(value);

package/src/connectkit/connectors/walletAdapterConnector.ts

@@ -1,4 +1,4 @@
-import { createConnector } from "wagmi";
+import { type CreateConnectorFn, createConnector } from "wagmi";
 import type { Address } from "viem";
 import type { WalletAdapter } from "../adapters/types";
 import { syntheticChainIdByEcosystem } from "./syntheticChains";
@@ -30,7 +30,7 @@ type ProviderListener = (payload?: unknown) => void;
  *
  * @deprecated The wagmi shim for Solana, Sui and Bitcoin wallets, which goes in 8.0.0 when the connect modal reads the connection store (MPO-385). Use the `sol()`, `sui()` and `btc()` families and `useConnection()`.
  */
-export function walletAdapterConnector(entry: WalletConnectorEntry) {
+export function walletAdapterConnector(entry: WalletConnectorEntry): CreateConnectorFn {
   const chainId = syntheticChainIdByEcosystem[entry.ecosystem];
 
   return createConnector((config) => {

package/src/connectkit/defaultConfig.ts

@@ -1,7 +1,6 @@
-import { http } from "wagmi";
-import { type CreateConfigParameters } from "@wagmi/core";
+import { type CreateConfigParameters, http } from "wagmi";
 import { mainnet, polygon, optimism, arbitrum } from "wagmi/chains";
-import type { CoinbaseWalletParameters } from "@wagmi/connectors/coinbaseWallet";
+import type { CoinbaseWalletParameters } from "wagmi/connectors/coinbaseWallet";
 import { EthereumProviderOptions as AaveAccountOptions } from "@aave/account";
 
 import { setAppMeta } from "@multiplatform.one/connectkit";

package/src/connectkit/defaultConnectors.ts

@@ -1,8 +1,8 @@
 import { CreateConnectorFn } from "wagmi";
 // Per-connector subpaths: the package root re-exports every wagmi connector, and a
 // bundler that doesn't tree-shake (the webview, the login bundles) ships them all.
-import { coinbaseWallet, type CoinbaseWalletParameters } from "@wagmi/connectors/coinbaseWallet";
-import { safe } from "@wagmi/connectors/safe";
+import { coinbaseWallet, type CoinbaseWalletParameters } from "wagmi/connectors/coinbaseWallet";
+import { safe } from "wagmi/connectors/safe";
 import { metaMaskConnect } from "./connectors/metaMaskConnectConnector";
 import {
   isEmbeddedDesktopWebview,

package/src/connectkit/defaultTransports.ts

@@ -6,8 +6,7 @@
  *
  */
 
-import { fallback, http, webSocket } from "wagmi";
-import { type CreateConfigParameters } from "@wagmi/core";
+import { type CreateConfigParameters, fallback, http, webSocket } from "wagmi";
 import { type Chain, mainnet, polygon, optimism, arbitrum } from "wagmi/chains";
 import { type HttpTransport, type WebSocketTransport } from "viem";
 

package/src/connectkit/hooks/useConnect.tsx

@@ -5,6 +5,7 @@
 
 import {
   type UseConnectParameters,
+  type UseConnectReturnType,
   useConnect as wagmiUseConnect,
   CreateConnectorFn,
   Connector,
@@ -12,7 +13,18 @@ import {
 import { useContext } from "@multiplatform.one/connectkit";
 import { isWalletConnector } from "@multiplatform.one/connectkit";
 
-export function useConnect({ ...props }: UseConnectParameters = {}) {
+interface ConnectArgs {
+  connector: CreateConnectorFn | Connector;
+  chainId?: number;
+  mutation?: UseConnectParameters["mutation"];
+}
+
+type UseConnectReturn = Omit<UseConnectReturnType, "connect" | "connectAsync"> & {
+  connect(args: ConnectArgs): void;
+  connectAsync(args: ConnectArgs): ReturnType<UseConnectReturnType["connectAsync"]>;
+};
+
+export function useConnect({ ...props }: UseConnectParameters = {}): UseConnectReturn {
   const context = useContext();
 
   const { connect, connectAsync, connectors, ...rest } = wagmiUseConnect({
@@ -32,15 +44,7 @@ export function useConnect({ ...props }: UseConnectParameters = {}) {
   });
 
   return {
-    connect: ({
-      connector,
-      chainId,
-      mutation,
-    }: {
-      connector: CreateConnectorFn | Connector;
-      chainId?: number;
-      mutation?: UseConnectParameters["mutation"];
-    }) => {
+    connect: ({ connector, chainId, mutation }: ConnectArgs) => {
       return connect(
         {
           connector,
@@ -50,15 +54,7 @@ export function useConnect({ ...props }: UseConnectParameters = {}) {
         mutation,
       );
     },
-    connectAsync: async ({
-      connector,
-      chainId,
-      mutation,
-    }: {
-      connector: CreateConnectorFn | Connector;
-      chainId?: number;
-      mutation?: UseConnectParameters["mutation"];
-    }) => {
+    connectAsync: async ({ connector, chainId, mutation }: ConnectArgs) => {
       return connectAsync(
         {
           connector,

package/src/connectkit/hooks/useEnsFallbackConfig.ts

@@ -1,5 +1,4 @@
-import type { Config } from "@wagmi/core";
-import { http, createConfig } from "wagmi";
+import { type Config, http, createConfig } from "wagmi";
 import { mainnet } from "wagmi/chains";
 import { useChainIsSupported } from "../hooks/useChainIsSupported";
 

package/src/connectkit/siwe/SIWEContext.tsx

@@ -2,13 +2,14 @@ import { createContext } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { Address } from "viem";
 
-export enum StatusState {
-  READY = "ready",
-  LOADING = "loading",
-  SUCCESS = "success",
-  REJECTED = "rejected",
-  ERROR = "error",
-}
+export const StatusState = {
+  READY: "ready",
+  LOADING: "loading",
+  SUCCESS: "success",
+  REJECTED: "rejected",
+  ERROR: "error",
+} as const;
+export type StatusState = (typeof StatusState)[keyof typeof StatusState];
 
 export type SIWESession = {
   address: Address;

package/src/connectkit/wallets/index.ts

@@ -1,5 +1,5 @@
 import { CreateConnectorFn } from "wagmi";
-import { injected } from "@wagmi/connectors/injected";
+import { injected } from "wagmi/connectors/injected";
 
 import { walletConfigs } from "./walletConfigs";
 

package/src/families/eth.ts

@@ -1,4 +1,4 @@
-import type { Config } from "@wagmi/core";
+import type { Config } from "wagmi";
 import { defineWalletFamily, type WalletFamily } from "../core/family";
 import { wagmiDriver } from "../wagmi/driver";
 import { withHosting } from "./host";

package/src/families/host.ts

@@ -1,4 +1,4 @@
-import type { Config } from "@wagmi/core";
+import type { Config } from "wagmi";
 import type { SolanaChain } from "../clients/solanaMessage";
 import type { WalletFamily } from "../core/family";
 

package/src/keycloak/nonceReset.spec.tsx

@@ -2,7 +2,7 @@
 import { GpgContext, GpgProvider, type GpgContextValue } from "@multiplatform.one/gpg";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { act, render, renderHook, waitFor } from "@testing-library/react";
-import { connect } from "@wagmi/core";
+import { connect } from "wagmi/actions";
 import { type ReactNode, useContext } from "react";
 import { describe, expect, it } from "vitest";
 import { WagmiProvider, createConfig, http } from "wagmi";

package/src/providers/WalletProvider.spec.tsx

@@ -2,7 +2,7 @@
 import { useContext as useConnectKitContext } from "@multiplatform.one/connectkit";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { act, cleanup, render, waitFor } from "@testing-library/react";
-import { connect as wagmiConnect } from "@wagmi/core";
+import { connect as wagmiConnect } from "wagmi/actions";
 import { verifyMessage, type Address } from "viem";
 import { createContext, useContext } from "react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";

package/src/providers/mockConnector.ts

@@ -1,6 +1,6 @@
 import { type Address, type Hex, hexToString } from "viem";
 import { generatePrivateKey, privateKeyToAccount } from "viem/accounts";
-import { createConnector } from "wagmi";
+import { type CreateConnectorFn, createConnector } from "wagmi";
 
 /**
  * A self-contained EVM wallet connector for END-TO-END TESTS ONLY, used by the
@@ -13,7 +13,7 @@ import { createConnector } from "wagmi";
  * This is the web `src/` analogue of webview/wiring/mockWallet.ts (which serves
  * the isolated WebView build); kept here so the native import graph stays clean.
  */
-export function createMockConnector() {
+export function createMockConnector(): CreateConnectorFn {
   const account = privateKeyToAccount(generatePrivateKey());
 
   const provider = {

package/src/wagmi/driver.spec.ts

@@ -1,4 +1,5 @@
-import { connect, type Config } from "@wagmi/core";
+import type { Config } from "wagmi";
+import { connect } from "wagmi/actions";
 import { getAddress, verifyMessage, type Hex } from "viem";
 import { describe, expect, it, vi } from "vitest";
 import {

package/src/wagmi/driver.ts

@@ -1,13 +1,11 @@
+import type { Config, Connection, Connector } from "wagmi";
 import {
   connect,
   getPublicClient,
   getWalletClient,
   switchConnection,
   watchConnectors,
-  type Config,
-  type Connection,
-  type Connector,
-} from "@wagmi/core";
+} from "wagmi/actions";
 import type { Address, PublicClient } from "viem";
 import { connectorAdapter } from "../clients/adapter";
 import { evmClient, type EvmClient, type EvmWalletClient } from "../clients/evm";

package/src/wagmi/host.spec.tsx

@@ -1,11 +1,11 @@
 // @vitest-environment happy-dom
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { act, cleanup, render, waitFor } from "@testing-library/react";
-import { connect, createConnector, disconnect } from "@wagmi/core";
 import { StrictMode, type ReactNode } from "react";
 import { getAddress, verifyMessage, type Hex } from "viem";
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { WagmiProvider, type Config } from "wagmi";
+import { WagmiProvider, createConnector, type Config } from "wagmi";
+import { connect, disconnect } from "wagmi/actions";
 import { createWallets } from "../../tests/core/driverContract";
 import { deferred, testDriver } from "../../tests/core/testDriver";
 import { accountFor, keys, scriptedConnector, wagmiConfig } from "../../tests/core/wagmiWallets";

package/src/wagmi/host.tsx

@@ -1,6 +1,5 @@
-import type { Connector } from "@wagmi/core";
 import { createContext, useContext, useEffect, useState, type ReactNode } from "react";
-import { type Config, useConfig } from "wagmi";
+import { type Config, type Connector, useConfig } from "wagmi";
 import { connectorAdapter } from "../clients/adapter";
 import { clientForConnector } from "../clients/connector";
 import { defineWalletFamily, type WalletFamily } from "../core/family";

package/types/bridge/AuthBridge.d.ts

@@ -30,9 +30,9 @@ export interface AuthSignInOptions extends RequestOptions {
  * in a loop. After the user finishes there, the next `signIn` succeeds.
  */
 export declare class AuthBridge {
+    private pending;
     private readonly bridge;
     private readonly options;
-    private pending;
     constructor(bridge: BridgeClient, options: AuthBridgeOptions);
     signIn(params?: Partial<AuthSignInParams>, options?: AuthSignInOptions): Promise<AuthSignInOutcome>;
     refresh(params?: {