Feat: add enableCustomRpc parameter

packages/adapters/ethers/src/tests/client.test.ts

@@ -80,7 +80,8 @@ const mockAuthProvider = {
 const mockNetworks = [mainnet]
 const mockCaipNetworks = CaipNetworksUtil.extendCaipNetworks(mockNetworks, {
   projectId: 'test-project-id',
-  customNetworkImageUrls: {}
+  customNetworkImageUrls: {},
+  enableCustomRpc: true
 })
 
 describe('EthersAdapter', () => {

packages/adapters/ethers5/src/tests/client.test.ts

@@ -72,7 +72,8 @@ const mockAuthProvider = {
 const mockNetworks = [mainnet]
 const mockCaipNetworks = CaipNetworksUtil.extendCaipNetworks(mockNetworks, {
   projectId: 'test-project-id',
-  customNetworkImageUrls: {}
+  customNetworkImageUrls: {},
+  enableCustomRpc: true
 })
 
 describe('Ethers5Adapter', () => {

packages/adapters/solana/src/tests/client.test.ts

@@ -58,7 +58,8 @@ const mockAuthProvider = {
 const mockNetworks = [solana]
 const mockCaipNetworks = CaipNetworksUtil.extendCaipNetworks(mockNetworks, {
   projectId: 'test-project-id',
-  customNetworkImageUrls: {}
+  customNetworkImageUrls: {},
+  enableCustomRpc: true
 })
 
 describe('SolanaAdapter', () => {

packages/adapters/wagmi/src/client.ts

@@ -1,60 +1,60 @@
-import type UniversalProvider from '@walletconnect/universal-provider'
 import type { AppKitNetwork, BaseNetwork, CaipNetwork } from '@reown/appkit-common'
-import { AdapterBlueprint } from '@reown/appkit/adapters'
 import { CoreHelperUtil } from '@reown/appkit-core'
+import { AdapterBlueprint } from '@reown/appkit/adapters'
 import {
   connect,
-  disconnect as wagmiDisconnect,
   createConfig,
-  type Config,
-  type CreateConfigParameters,
-  type CreateConnectorFn,
-  getConnections,
-  switchChain,
-  injected,
-  type Connector,
-  watchAccount,
-  watchConnections,
+  getAccount,
   getBalance,
-  getEnsName,
+  getConnections,
   getEnsAvatar,
+  getEnsName,
+  injected,
+  prepareTransactionRequest,
+  reconnect,
   signMessage,
+  switchChain,
+  disconnect as wagmiDisconnect,
   estimateGas as wagmiEstimateGas,
-  sendTransaction as wagmiSendTransaction,
   getEnsAddress as wagmiGetEnsAddress,
+  sendTransaction as wagmiSendTransaction,
   writeContract as wagmiWriteContract,
   waitForTransactionReceipt,
-  getAccount,
-  prepareTransactionRequest,
-  reconnect,
+  watchAccount,
+  watchConnections,
+  type Config,
+  type Connector,
+  type CreateConfigParameters,
+  type CreateConnectorFn,
   watchPendingTransactions
 } from '@wagmi/core'
 import { type Chain } from '@wagmi/core/chains'
+import type UniversalProvider from '@walletconnect/universal-provider'
 
+import { AppKit, WcHelpersUtil, type AppKitOptions } from '@reown/appkit'
 import {
   ConstantsUtil as CommonConstantsUtil,
   isReownName,
   NetworkUtil
 } from '@reown/appkit-common'
-import { authConnector } from './connectors/AuthConnector.js'
-import { AppKit, WcHelpersUtil, type AppKitOptions } from '@reown/appkit'
-import { walletConnect } from './connectors/UniversalConnector.js'
-import { coinbaseWallet } from '@wagmi/connectors'
 import {
   ConstantsUtil as CoreConstantsUtil,
   type ConnectorType,
   type Provider
 } from '@reown/appkit-core'
 import { CaipNetworksUtil, ConstantsUtil, PresetsUtil } from '@reown/appkit-utils'
+import type { W3mFrameProvider } from '@reown/appkit-wallet'
+import { coinbaseWallet } from '@wagmi/connectors'
 import {
   formatUnits,
   parseUnits,
   type GetEnsAddressReturnType,
   type Hex,
   type HttpTransport
 } from 'viem'
-import type { W3mFrameProvider } from '@reown/appkit-wallet'
 import { normalize } from 'viem/ens'
+import { authConnector } from './connectors/AuthConnector.js'
+import { walletConnect } from './connectors/UniversalConnector.js'
 import { parseWalletCapabilities } from './utils/helpers.js'
 
 export class WagmiAdapter extends AdapterBlueprint {
@@ -66,21 +66,24 @@ export class WagmiAdapter extends AdapterBlueprint {
     configParams: Partial<CreateConfigParameters> & {
       networks: AppKitNetwork[]
       projectId: string
+      enableCustomRpc?: boolean
     }
   ) {
     super({
       projectId: configParams.projectId,
       networks: CaipNetworksUtil.extendCaipNetworks(configParams.networks, {
         projectId: configParams.projectId,
-        customNetworkImageUrls: {}
+        customNetworkImageUrls: {},
+        enableCustomRpc: configParams.enableCustomRpc
       }) as [CaipNetwork, ...CaipNetwork[]]
     })
     this.namespace = CommonConstantsUtil.CHAIN.EVM
     this.createConfig({
       ...configParams,
       networks: CaipNetworksUtil.extendCaipNetworks(configParams.networks, {
         projectId: configParams.projectId,
-        customNetworkImageUrls: {}
+        customNetworkImageUrls: {},
+        enableCustomRpc: configParams.enableCustomRpc
       }) as [CaipNetwork, ...CaipNetwork[]],
       projectId: configParams.projectId
     })
@@ -119,11 +122,13 @@ export class WagmiAdapter extends AdapterBlueprint {
     configParams: Partial<CreateConfigParameters> & {
       networks: CaipNetwork[]
       projectId: string
+      enableCustomRpc?: boolean
     }
   ) {
     this.caipNetworks = CaipNetworksUtil.extendCaipNetworks(configParams.networks, {
       projectId: configParams.projectId,
-      customNetworkImageUrls: {}
+      customNetworkImageUrls: {},
+      enableCustomRpc: configParams.enableCustomRpc
     }) as [CaipNetwork, ...CaipNetwork[]]
 
     this.wagmiChains = this.caipNetworks.filter(

packages/adapters/wagmi/src/tests/client.test.ts

@@ -1,25 +1,25 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest'
-import { WagmiAdapter } from '../client'
+import { CaipNetworksUtil } from '@reown/appkit-utils'
 import type { Config } from '@wagmi/core'
 import {
-  disconnect as wagmiDisconnect,
-  getConnections,
-  switchChain,
+  estimateGas,
+  getAccount,
   getBalance,
-  getEnsName,
+  getConnections,
   getEnsAvatar,
+  getEnsName,
   signMessage,
-  estimateGas,
-  sendTransaction as wagmiSendTransaction,
+  switchChain,
+  disconnect as wagmiDisconnect,
   getEnsAddress as wagmiGetEnsAddress,
+  sendTransaction as wagmiSendTransaction,
   writeContract as wagmiWriteContract,
   waitForTransactionReceipt,
-  getAccount,
   watchPendingTransactions
 } from '@wagmi/core'
 import { mainnet } from '@wagmi/core/chains'
-import { CaipNetworksUtil } from '@reown/appkit-utils'
 import type UniversalProvider from '@walletconnect/universal-provider'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { WagmiAdapter } from '../client'
 
 vi.mock('@wagmi/core', async () => {
   const actual = await vi.importActual('@wagmi/core')
@@ -55,7 +55,8 @@ const mockProjectId = 'test-project-id'
 const mockNetworks = [mainnet]
 const mockCaipNetworks = CaipNetworksUtil.extendCaipNetworks(mockNetworks, {
   projectId: mockProjectId,
-  customNetworkImageUrls: {}
+  customNetworkImageUrls: {},
+  enableCustomRpc: false
 })
 
 const mockWagmiConfig = {
@@ -95,7 +96,21 @@ describe('WagmiAdapter', () => {
       expect(adapter.adapterType).toBe('wagmi')
       expect(adapter.namespace).toBe('eip155')
     })
-
+    it('should be set to reown RPC by default', () => {
+      expect(adapter.wagmiChains?.[0].rpcUrls.default.http[0]).toBe(
+        `https://rpc.walletconnect.org/v1/?chainId=eip155%3A1&projectId=${mockProjectId}`
+      )
+    })
+    it('should be set to customRPC rpc if enableCustomRpc is true', () => {
+      const adapterWithCustomRpc = new WagmiAdapter({
+        networks: mockNetworks,
+        projectId: mockProjectId,
+        enableCustomRpc: true
+      })
+      expect(adapterWithCustomRpc.wagmiChains?.[0].rpcUrls.default.http[0]).toBe(
+        `https://cloudflare-eth.com`
+      )
+    })
     it('should not set info property for injected connector', () => {
       const mockConnectors = [
         {

packages/appkit-new/src/client.ts

@@ -1,62 +1,56 @@
 /* eslint-disable max-depth */
 import {
-  type EventsControllerState,
-  type PublicStateControllerState,
-  type ThemeControllerState,
-  type ModalControllerState,
-  type ConnectedWalletInfo,
-  type RouterControllerState,
-  type ChainAdapter,
-  type SdkVersion,
-  type UseAppKitAccountReturn,
-  type UseAppKitNetworkReturn,
-  type NetworkControllerClient,
-  type ConnectionControllerClient,
-  ConstantsUtil as CoreConstantsUtil,
-  type ConnectorType,
-  type WriteContractArgs,
-  type Provider,
-  type SendTransactionArgs,
-  type EstimateGasTransactionArgs,
-  type AccountControllerState,
-  type AdapterNetworkState,
-  SIWXUtil
-} from '@reown/appkit-core'
+  ConstantsUtil,
+  SafeLocalStorage,
+  SafeLocalStorageKeys,
+  type CaipAddress,
+  type CaipNetwork,
+  type CaipNetworkId,
+  type ChainNamespace
+} from '@reown/appkit-common'
 import {
   AccountController,
+  AlertController,
+  ApiController,
+  AssetUtil,
   BlockchainApiController,
+  ChainController,
   ConnectionController,
   ConnectorController,
+  ConstantsUtil as CoreConstantsUtil,
   CoreHelperUtil,
+  EnsController,
   EventsController,
   ModalController,
-  ChainController,
+  OptionsController,
   PublicStateController,
-  ThemeController,
-  SnackController,
   RouterController,
-  EnsController,
-  OptionsController,
-  AssetUtil,
-  ApiController,
-  AlertController,
-  StorageUtil
+  SIWXUtil,
+  SnackController,
+  StorageUtil,
+  ThemeController,
+  type AccountControllerState,
+  type AdapterNetworkState,
+  type ChainAdapter,
+  type ConnectedWalletInfo,
+  type ConnectionControllerClient,
+  type ConnectorType,
+  type EstimateGasTransactionArgs,
+  type EventsControllerState,
+  type ModalControllerState,
+  type NetworkControllerClient,
+  type Provider,
+  type PublicStateControllerState,
+  type RouterControllerState,
+  type SdkVersion,
+  type SendTransactionArgs,
+  type ThemeControllerState,
+  type UseAppKitAccountReturn,
+  type UseAppKitNetworkReturn,
+  type WriteContractArgs
 } from '@reown/appkit-core'
+import type { AppKitNetwork } from '@reown/appkit-new/networks'
 import { setColorTheme, setThemeVariables } from '@reown/appkit-ui-new'
-import {
-  ConstantsUtil,
-  type CaipNetwork,
-  type ChainNamespace,
-  SafeLocalStorage,
-  SafeLocalStorageKeys,
-  type CaipAddress,
-  type CaipNetworkId
-} from '@reown/appkit-common'
-import type { AppKitOptions } from './utils/TypesUtil.js'
-import {
-  UniversalAdapter,
-  UniversalAdapter as UniversalAdapterClient
-} from './universal-adapter/client.js'
 import {
   CaipNetworksUtil,
   ErrorUtil,
@@ -68,13 +62,17 @@ import {
   type W3mFrameProvider,
   type W3mFrameTypes
 } from '@reown/appkit-wallet'
-import { ProviderUtil } from './store/ProviderUtil.js'
-import type { AppKitNetwork } from '@reown/appkit-new/networks'
-import type { AdapterBlueprint } from './adapters/ChainAdapterBlueprint.js'
-import UniversalProvider from '@walletconnect/universal-provider'
 import type { SessionTypes } from '@walletconnect/types'
 import type { UniversalProviderOpts } from '@walletconnect/universal-provider'
+import UniversalProvider from '@walletconnect/universal-provider'
+import type { AdapterBlueprint } from './adapters/ChainAdapterBlueprint.js'
 import { W3mFrameProviderSingleton } from './auth-provider/W3MFrameProviderSingleton.js'
+import { ProviderUtil } from './store/ProviderUtil.js'
+import {
+  UniversalAdapter,
+  UniversalAdapter as UniversalAdapterClient
+} from './universal-adapter/client.js'
+import type { AppKitOptions } from './utils/TypesUtil.js'
 
 declare global {
   interface Window {
@@ -685,7 +683,8 @@ export class AppKit {
   private extendCaipNetworks(options: AppKitOptions) {
     const extendedNetworks = CaipNetworksUtil.extendCaipNetworks(options.networks, {
       customNetworkImageUrls: options.chainImages,
-      projectId: options.projectId
+      projectId: options.projectId,
+      enableCustomRpc: options.enableCustomRpc
     })
 
     return extendedNetworks
@@ -696,7 +695,8 @@ export class AppKit {
     const extendedNetwork = defaultNetwork
       ? CaipNetworksUtil.extendCaipNetwork(defaultNetwork, {
           customNetworkImageUrls: options.chainImages,
-          projectId: options.projectId
+          projectId: options.projectId,
+          enableCustomRpc: options.enableCustomRpc
         })
       : undefined
 

packages/appkit-new/src/utils/TypesUtil.ts

@@ -72,6 +72,8 @@ export type AppKitOptions = {
    * @see https://cloud.walletconnect.com/
    */
   metadata?: Metadata
+
+  enableCustomRpc?: boolean
 } & OptionsControllerState
 
 export type AppKitOptionsWithCaipNetworks = Omit<AppKitOptions, 'defaultNetwork' | 'networks'> & {