@wagmi/connectors 6.1.4 → 7.0.0

package/src/coinbaseWallet.ts

@@ -1,6 +1,5 @@
 import type {
   createCoinbaseWalletSDK,
-  Preference,
   ProviderInterface,
 } from '@coinbase/wallet-sdk'
 import {
@@ -8,11 +7,7 @@ import {
   type Connector,
   createConnector,
 } from '@wagmi/core'
-import type { Compute, Mutable, Omit } from '@wagmi/core/internal'
-import type {
-  CoinbaseWalletProvider as CBW_Provider,
-  CoinbaseWalletSDK as CBW_SDK,
-} from 'cbw-sdk'
+import type { Mutable, Omit } from '@wagmi/core/internal'
 import {
   type AddEthereumChainParameter,
   type Address,
@@ -24,59 +19,20 @@ import {
   UserRejectedRequestError,
 } from 'viem'
 
-type Version = '3' | '4'
-
-export type CoinbaseWalletParameters<version extends Version = '3'> =
-  version extends '4'
-    ? Compute<
-        {
-          headlessMode?: false | undefined
-          /** Coinbase Wallet SDK version */
-          version?: version | '3' | undefined
-        } & Version4Parameters
-      >
-    : Compute<
-        {
-          /**
-           * @deprecated `headlessMode` will be removed in the next major version. Upgrade to `version: '4'`.
-           */
-          headlessMode?: true | undefined
-          /**
-           * Coinbase Wallet SDK version
-           * @deprecated Version 3 will be removed in the next major version. Upgrade to `version: '4'`.
-           * @default '4'
-           */
-          version?: version | '4' | undefined
-        } & Version3Parameters
-      >
-
-coinbaseWallet.type = 'coinbaseWallet' as const
-export function coinbaseWallet<version extends Version>(
-  parameters: CoinbaseWalletParameters<version> = {} as any,
-): version extends '4'
-  ? ReturnType<typeof version4>
-  : ReturnType<typeof version3> {
-  if (parameters.version === '3' || parameters.headlessMode)
-    return version3(parameters as Version3Parameters) as any
-  return version4(parameters as Version4Parameters) as any
-}
-
-type Version4Parameters = Mutable<
+export type CoinbaseWalletParameters<
+  /** @deprecated remove */
+  _ = unknown,
+> = Mutable<
   Omit<
     Parameters<typeof createCoinbaseWalletSDK>[0],
-    | 'appChainIds' // set via wagmi config
-    | 'preference'
-  > & {
-    // TODO(v3): Remove `Preference['options']`
-    /**
-     * Preference for the type of wallet to display.
-     * @default 'all'
-     */
-    preference?: Preference['options'] | Compute<Preference> | undefined
-  }
+    'appChainIds' // set via wagmi config
+  >
 >
 
-function version4(parameters: Version4Parameters) {
+coinbaseWallet.type = 'coinbaseWallet' as const
+export function coinbaseWallet(
+  parameters: CoinbaseWalletParameters = {} as any,
+) {
   type Provider = ProviderInterface & {
     // for backwards compatibility
     close?(): void
@@ -195,20 +151,14 @@ function version4(parameters: Version4Parameters) {
     },
     async getProvider() {
       if (!walletProvider) {
-        const preference = (() => {
-          if (typeof parameters.preference === 'string')
-            return { options: parameters.preference }
-          return {
-            ...parameters.preference,
-            options: parameters.preference?.options ?? 'all',
-          }
-        })()
-
         const { createCoinbaseWalletSDK } = await import('@coinbase/wallet-sdk')
         const sdk = createCoinbaseWalletSDK({
           ...parameters,
           appChainIds: config.chains.map((x) => x.id),
-          preference,
+          preference: {
+            options: 'all',
+            ...(parameters.preference ?? {}),
+          },
         })
 
         walletProvider = sdk.getProvider()
@@ -308,253 +258,3 @@ function version4(parameters: Version4Parameters) {
     },
   }))
 }
-
-type Version3Parameters = Mutable<
-  Omit<
-    ConstructorParameters<typeof CBW_SDK>[0],
-    'reloadOnDisconnect' // remove property since TSDoc says default is `true`
-  >
-> & {
-  /**
-   * Fallback Ethereum JSON RPC URL
-   * @default ""
-   */
-  jsonRpcUrl?: string | undefined
-  /**
-   * Fallback Ethereum Chain ID
-   * @default 1
-   */
-  chainId?: number | undefined
-  /**
-   * Whether or not to reload dapp automatically after disconnect.
-   * @default false
-   */
-  reloadOnDisconnect?: boolean | undefined
-}
-
-function version3(parameters: Version3Parameters) {
-  const reloadOnDisconnect = false
-
-  type Provider = CBW_Provider
-
-  let sdk: CBW_SDK | undefined
-  let walletProvider: Provider | undefined
-
-  let accountsChanged: Connector['onAccountsChanged'] | undefined
-  let chainChanged: Connector['onChainChanged'] | undefined
-  let disconnect: Connector['onDisconnect'] | undefined
-
-  return createConnector<Provider>((config) => ({
-    id: 'coinbaseWalletSDK',
-    name: 'Coinbase Wallet',
-    rdns: 'com.coinbase.wallet',
-    type: coinbaseWallet.type,
-    async connect({ chainId, withCapabilities } = {}) {
-      try {
-        const provider = await this.getProvider()
-        const accounts = (
-          (await provider.request({
-            method: 'eth_requestAccounts',
-          })) as string[]
-        ).map((x) => getAddress(x))
-
-        if (!accountsChanged) {
-          accountsChanged = this.onAccountsChanged.bind(this)
-          provider.on('accountsChanged', accountsChanged)
-        }
-        if (!chainChanged) {
-          chainChanged = this.onChainChanged.bind(this)
-          provider.on('chainChanged', chainChanged)
-        }
-        if (!disconnect) {
-          disconnect = this.onDisconnect.bind(this)
-          provider.on('disconnect', disconnect)
-        }
-
-        // Switch to chain if provided
-        let currentChainId = await this.getChainId()
-        if (chainId && currentChainId !== chainId) {
-          const chain = await this.switchChain!({ chainId }).catch((error) => {
-            if (error.code === UserRejectedRequestError.code) throw error
-            return { id: currentChainId }
-          })
-          currentChainId = chain?.id ?? currentChainId
-        }
-
-        return {
-          accounts: (withCapabilities
-            ? accounts.map((address) => ({ address, capabilities: {} }))
-            : accounts) as never,
-          chainId: currentChainId,
-        }
-      } catch (error) {
-        if (
-          /(user closed modal|accounts received is empty|user denied account)/i.test(
-            (error as Error).message,
-          )
-        )
-          throw new UserRejectedRequestError(error as Error)
-        throw error
-      }
-    },
-    async disconnect() {
-      const provider = await this.getProvider()
-
-      if (accountsChanged) {
-        provider.removeListener('accountsChanged', accountsChanged)
-        accountsChanged = undefined
-      }
-      if (chainChanged) {
-        provider.removeListener('chainChanged', chainChanged)
-        chainChanged = undefined
-      }
-      if (disconnect) {
-        provider.removeListener('disconnect', disconnect)
-        disconnect = undefined
-      }
-
-      provider.disconnect()
-      provider.close()
-    },
-    async getAccounts() {
-      const provider = await this.getProvider()
-      return (
-        await provider.request<string[]>({
-          method: 'eth_accounts',
-        })
-      ).map((x) => getAddress(x))
-    },
-    async getChainId() {
-      const provider = await this.getProvider()
-      const chainId = await provider.request<Hex>({
-        method: 'eth_chainId',
-      })
-      return Number(chainId)
-    },
-    async getProvider() {
-      if (!walletProvider) {
-        // Unwrapping import for Vite compatibility.
-        // See: https://github.com/vitejs/vite/issues/9703
-        const CoinbaseWalletSDK = await (async () => {
-          const { default: SDK } = await import('cbw-sdk')
-          if (typeof SDK !== 'function' && typeof SDK.default === 'function')
-            return SDK.default
-          return SDK as unknown as typeof SDK.default
-        })()
-
-        sdk = new CoinbaseWalletSDK({ ...parameters, reloadOnDisconnect })
-
-        // Force types to retrieve private `walletExtension` method from the Coinbase Wallet SDK.
-        const walletExtensionChainId = (
-          sdk as unknown as {
-            get walletExtension(): { getChainId(): number } | undefined
-          }
-        ).walletExtension?.getChainId()
-
-        const chain =
-          config.chains.find((chain) =>
-            parameters.chainId
-              ? chain.id === parameters.chainId
-              : chain.id === walletExtensionChainId,
-          ) || config.chains[0]
-        const chainId = parameters.chainId || chain?.id
-        const jsonRpcUrl =
-          parameters.jsonRpcUrl || chain?.rpcUrls.default.http[0]
-
-        walletProvider = sdk.makeWeb3Provider(jsonRpcUrl, chainId)
-      }
-
-      return walletProvider
-    },
-    async isAuthorized() {
-      try {
-        const accounts = await this.getAccounts()
-        return !!accounts.length
-      } catch {
-        return false
-      }
-    },
-    async switchChain({ addEthereumChainParameter, chainId }) {
-      const chain = config.chains.find((chain) => chain.id === chainId)
-      if (!chain) throw new SwitchChainError(new ChainNotConfiguredError())
-
-      const provider = await this.getProvider()
-
-      try {
-        await provider.request({
-          method: 'wallet_switchEthereumChain',
-          params: [{ chainId: numberToHex(chain.id) }],
-        })
-        return chain
-      } catch (error) {
-        // Indicates chain is not added to provider
-        if ((error as ProviderRpcError).code === 4902) {
-          try {
-            let blockExplorerUrls: string[] | undefined
-            if (addEthereumChainParameter?.blockExplorerUrls)
-              blockExplorerUrls = addEthereumChainParameter.blockExplorerUrls
-            else
-              blockExplorerUrls = chain.blockExplorers?.default.url
-                ? [chain.blockExplorers?.default.url]
-                : []
-
-            let rpcUrls: readonly string[]
-            if (addEthereumChainParameter?.rpcUrls?.length)
-              rpcUrls = addEthereumChainParameter.rpcUrls
-            else rpcUrls = [chain.rpcUrls.default?.http[0] ?? '']
-
-            const addEthereumChain = {
-              blockExplorerUrls,
-              chainId: numberToHex(chainId),
-              chainName: addEthereumChainParameter?.chainName ?? chain.name,
-              iconUrls: addEthereumChainParameter?.iconUrls,
-              nativeCurrency:
-                addEthereumChainParameter?.nativeCurrency ??
-                chain.nativeCurrency,
-              rpcUrls,
-            } satisfies AddEthereumChainParameter
-
-            await provider.request({
-              method: 'wallet_addEthereumChain',
-              params: [addEthereumChain],
-            })
-
-            return chain
-          } catch (error) {
-            throw new UserRejectedRequestError(error as Error)
-          }
-        }
-
-        throw new SwitchChainError(error as Error)
-      }
-    },
-    onAccountsChanged(accounts) {
-      if (accounts.length === 0) this.onDisconnect()
-      else
-        config.emitter.emit('change', {
-          accounts: accounts.map((x) => getAddress(x)),
-        })
-    },
-    onChainChanged(chain) {
-      const chainId = Number(chain)
-      config.emitter.emit('change', { chainId })
-    },
-    async onDisconnect(_error) {
-      config.emitter.emit('disconnect')
-
-      const provider = await this.getProvider()
-      if (accountsChanged) {
-        provider.removeListener('accountsChanged', accountsChanged)
-        accountsChanged = undefined
-      }
-      if (chainChanged) {
-        provider.removeListener('chainChanged', chainChanged)
-        chainChanged = undefined
-      }
-      if (disconnect) {
-        provider.removeListener('disconnect', disconnect)
-        disconnect = undefined
-      }
-    },
-  }))
-}

package/src/gemini.ts

@@ -1,5 +1,4 @@
 import type { AppMetadata, ProviderInterface } from '@gemini-wallet/core'
-import { GeminiWalletProvider } from '@gemini-wallet/core'
 import {
   ChainNotConfiguredError,
   type Connector,
@@ -110,6 +109,7 @@ export function gemini(parameters: GeminiParameters = {}) {
     },
     async getProvider() {
       if (!walletProvider) {
+        const { GeminiWalletProvider } = await import('@gemini-wallet/core')
         walletProvider = new GeminiWalletProvider({
           appMetadata: parameters.appMetadata ?? {},
           chain: {

package/src/metaMask.ts

@@ -61,16 +61,7 @@ type WagmiMetaMaskSDKOptions = Compute<
       | 'useDeeplink'
       | 'readonlyRPCMap'
     >
-  > & {
-    /** @deprecated */
-    forceDeleteProvider?: MetaMaskSDKOptions['forceDeleteProvider']
-    /** @deprecated */
-    forceInjectProvider?: MetaMaskSDKOptions['forceInjectProvider']
-    /** @deprecated */
-    injectProvider?: MetaMaskSDKOptions['injectProvider']
-    /** @deprecated */
-    useDeeplink?: MetaMaskSDKOptions['useDeeplink']
-  }
+  >
 >
 
 metaMask.type = 'metaMask' as const
@@ -259,12 +250,12 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
           })?.[0]
 
         sdk = new MetaMaskSDK({
+          // Workaround cast since MetaMask SDK does not support `'exactOptionalPropertyTypes'`
+          ...(parameters as RemoveUndefined<typeof parameters>),
           _source: 'wagmi',
           forceDeleteProvider: false,
           forceInjectProvider: false,
           injectProvider: false,
-          // Workaround cast since MetaMask SDK does not support `'exactOptionalPropertyTypes'`
-          ...(parameters as RemoveUndefined<typeof parameters>),
           readonlyRPCMap,
           dappMetadata: {
             ...parameters.dappMetadata,
@@ -278,7 +269,7 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
                 ? window.location.origin
                 : 'https://wagmi.sh',
           },
-          useDeeplink: parameters.useDeeplink ?? true,
+          useDeeplink: true,
         })
         const result = await sdk.init()
         // On initial load, sometimes `sdk.getProvider` does not return provider.

package/src/porto.ts

@@ -4,8 +4,7 @@ import {
   createConnector,
 } from '@wagmi/core'
 import type { ExactPartial } from '@wagmi/core/internal'
-import { type Porto, RpcSchema } from 'porto'
-import { z } from 'porto/internal'
+import type { Porto, RpcSchema } from 'porto'
 import {
   type Address,
   getAddress,
@@ -89,6 +88,8 @@ export function porto(parameters: PortoParameters = {}) {
 
         try {
           if (!accounts?.length && !isReconnecting) {
+            const { RpcSchema } = await import('porto')
+            const { z } = await import('porto/internal')
             const res = await provider.request({
               method: 'wallet_connect',
               params: [

package/src/version.ts

@@ -1 +1 @@
-export const version = '6.1.4'
+export const version = '7.0.0'

package/src/walletConnect.ts

@@ -73,53 +73,6 @@ export type WalletConnectParameters = Compute<
 >
 
 walletConnect.type = 'walletConnect' as const
-/**
- * @deprecated **NOTE: This connector uses a vulnerable dependency downstream** (`@walletconnect/ethereum-provider@2.21.1` > `@reown/appkit@1.8.9` > `@reown/appkit-utils@1.8.9` > `@walletconnect/logger@2.1.2` > `pino@7.11.0`). You should override `pino` to a secure version via your package manager:
- *
- * ### npm
- * ```json
- * {
- *   "overrides": {
- *     "@walletconnect/logger": {
- *       "pino": "10.0.0"
- *     }
- *   }
- * }
- * ```
- *
- * ### pnpm
- * ```json
- * {
- *   "pnpm": {
- *     "overrides": {
- *       "@walletconnect/logger>pino": "10.0.0"
- *     }
- *   }
- * }
- * ```
- *
- * ### yarn
- * ```json
- * {
- *   "resolutions": {
- *     "@walletconnect/logger/pino": "10.0.0"
- *   }
- * }
- * ```
- *
- * ### bun
- * ```json
- * {
- *   "overrides": {
- *     "@walletconnect/logger": {
- *       "pino": "10.0.0"
- *     }
- *   }
- * }
- * ```
- *
- * Normally the Wagmi team would upgrade `@walletconnect/ethereum-provider` to a fixed version for you, but `@walletconnect/ethereum-provider` was relicensed recently from Apache to a [non-permissive license](https://github.com/reown-com/appkit/blob/main/LICENSE.md). We are trying to get the WalletConnect team to release a version that closes the vulnerability under the old Apache license.
- */
 export function walletConnect(parameters: WalletConnectParameters) {
   const isNewChainsStale = parameters.isNewChainsStale ?? true