@wagmi/core 2.0.0-alpha.3 → 2.0.0-alpha.4

package/src/createConfig.ts

@@ -1,3 +1,4 @@
+import { type EIP6963ProviderDetail, createStore as createMipd } from 'mipd'
 import {
   type Address,
   type Chain,
@@ -12,7 +13,8 @@ import { createStore } from 'zustand/vanilla'
 import {
   type ConnectorEventMap,
   type CreateConnectorFn,
-} from './createConnector.js'
+} from './connectors/createConnector.js'
+import { injected } from './connectors/injected.js'
 import { Emitter, type EventData, createEmitter } from './createEmitter.js'
 import { type Storage, createStorage, noopStorage } from './createStorage.js'
 import { ChainNotConfiguredError } from './errors/config.js'
@@ -29,7 +31,7 @@ export type CreateConfigParameters<
   {
     chains: chains
     connectors?: CreateConnectorFn[] | undefined
-    reconnectOnMount?: boolean | undefined
+    multiInjectedProviderDiscovery?: boolean | undefined
     storage?: Storage | null | undefined
     syncConnectedChain?: boolean | undefined
   } & OneOf<
@@ -45,14 +47,7 @@ export type CreateConfigParameters<
           chains[number]
         >
       }
-  > &
-    OneOf<
-      | {
-          /** @deprecated Use `reconnectOnMount` instead */
-          autoConnect?: boolean | undefined
-        }
-      | { reconnectOnMount?: boolean | undefined }
-    >
+  >
 >
 
 export function createConfig<
@@ -62,9 +57,8 @@ export function createConfig<
   parameters: CreateConfigParameters<chains, transports>,
 ): Config<chains, transports> {
   const {
-    autoConnect,
     chains,
-    reconnectOnMount = autoConnect ?? true,
+    multiInjectedProviderDiscovery = true,
     storage = createStorage({
       storage:
         typeof window !== 'undefined' && window.localStorage
@@ -79,7 +73,17 @@ export function createConfig<
   // Set up connectors, clients, etc.
   /////////////////////////////////////////////////////////////////////////////////////////////////
 
-  const connectors = createStore(() => (rest.connectors ?? []).map(setup))
+  const mipd =
+    typeof window !== 'undefined' && multiInjectedProviderDiscovery
+      ? createMipd()
+      : undefined
+
+  const connectors = createStore(() =>
+    [
+      ...(rest.connectors ?? []),
+      ...(mipd?.getProviders().map(providerDetailToConnector) ?? []),
+    ].map(setup),
+  )
   function setup(connectorFn: CreateConnectorFn) {
     // Set up emitter with uid and add to connector so they are "linked" together.
     const emitter = createEmitter<ConnectorEventMap>(uid())
@@ -89,13 +93,19 @@ export function createConfig<
       uid: emitter.uid,
     }
 
-    // Start listening for `connect` events if `reconnectOnMount` is switched on.
+    // Start listening for `connect` events on connector setup
     // This allows connectors to "connect" themselves without user interaction (e.g. MetaMask's "Manually connect to current site")
-    if (reconnectOnMount) emitter.on('connect', connect)
+    emitter.on('connect', connect)
     connector.setup?.()
 
     return connector
   }
+  function providerDetailToConnector(providerDetail: EIP6963ProviderDetail) {
+    const { info, provider } = providerDetail
+    return injected({
+      target: { ...info, id: info.rdns, provider: provider as any },
+    })
+  }
 
   const clients = new Map<number, Client<Transport, chains[number]>>()
   function getClient<chainId extends chains[number]['id']>(
@@ -164,9 +174,11 @@ export function createConfig<
         ? persist(() => initialState, {
             name: 'store',
             partialize(state) {
-              return state satisfies PartializedState
+              return {
+                chainId: state.chainId,
+                current: state.current,
+              } satisfies PartializedState
             },
-            skipHydration: !reconnectOnMount,
             storage: storage as Storage<Record<string, unknown>>,
             version: 1,
           })
@@ -195,6 +207,14 @@ export function createConfig<
       },
     )
 
+  // EIP-6963 subscribe for new wallet providers
+  mipd?.subscribe((providerDetails) => {
+    for (const providerDetail of providerDetails) {
+      const connector = setup(providerDetailToConnector(providerDetail))
+      connectors.setState((x) => [...x, connector])
+    }
+  })
+
   /////////////////////////////////////////////////////////////////////////////////////////////////
   // Emitter listeners
   /////////////////////////////////////////////////////////////////////////////////////////////////
@@ -215,8 +235,12 @@ export function createConfig<
     })
   }
   function connect(data: EventData<ConnectorEventMap, 'connect'>) {
-    // Disable handling if reconnecting
-    if (store.getState().status === 'reconnecting') return
+    // Disable handling if reconnecting/connecting
+    if (
+      store.getState().status === 'connecting' ||
+      store.getState().status === 'reconnecting'
+    )
+      return
 
     store.setState((x) => {
       const connector = connectors.getState().find((x) => x.uid === data.uid)
@@ -268,6 +292,7 @@ export function createConfig<
     },
     storage,
 
+    getClient,
     get state() {
       return store.getState() as unknown as State<chains>
     },
@@ -287,32 +312,25 @@ export function createConfig<
       return store.subscribe(
         selector as unknown as (state: State) => any,
         listener,
-        options,
+        options
+          ? { ...options, fireImmediately: options.emitOnBegin }
+          : undefined,
       )
     },
 
-    getClient,
-
     _internal: {
-      reconnectOnMount,
       syncConnectedChain,
       transports: rest.transports as transports,
-      change,
-      connect,
-      disconnect,
       connectors: {
         setup,
-        setState(value) {
-          let newState: Connector[]
-          if (typeof value === 'function')
-            newState = value(connectors.getState())
-          else newState = value
-          connectors.setState(newState, true)
-        },
-        subscribe(listener) {
-          return connectors.subscribe(listener)
-        },
+        setState: (value) =>
+          connectors.setState(
+            typeof value === 'function' ? value(connectors.getState()) : value,
+            true,
+          ),
+        subscribe: (listener) => connectors.subscribe(listener),
       },
+      events: { change, connect, disconnect },
     },
   }
 }
@@ -341,8 +359,8 @@ export type Config<
     listener: (state: state, previousState: state) => void,
     options?:
       | {
+          emitOnBegin?: boolean | undefined
           equalityFn?: ((a: state, b: state) => boolean) | undefined
-          fireImmediately?: boolean | undefined
         }
       | undefined,
   ): () => void
@@ -352,14 +370,9 @@ export type Config<
   }): Client<transports[chainId], Extract<chains[number], { id: chainId }>>
 
   _internal: {
-    readonly reconnectOnMount: boolean
     readonly syncConnectedChain: boolean
     readonly transports: transports
 
-    change(data: EventData<ConnectorEventMap, 'change'>): void
-    connect(data: EventData<ConnectorEventMap, 'connect'>): void
-    disconnect(data: EventData<ConnectorEventMap, 'disconnect'>): void
-
     connectors: {
       setup(connectorFn: CreateConnectorFn): Connector
       setState(value: Connector[] | ((state: Connector[]) => Connector[])): void
@@ -370,6 +383,11 @@ export type Config<
         ) => void,
       ): () => void
     }
+    events: {
+      change(data: EventData<ConnectorEventMap, 'change'>): void
+      connect(data: EventData<ConnectorEventMap, 'connect'>): void
+      disconnect(data: EventData<ConnectorEventMap, 'disconnect'>): void
+    }
   }
 }
 

package/src/exports/index.ts

@@ -292,6 +292,20 @@ export {
   writeContract,
 } from '../actions/writeContract.js'
 
+////////////////////////////////////////////////////////////////////////////////
+// connectors
+
+export {
+  type InjectedParameters,
+  injected,
+} from '../connectors/injected.js'
+
+export {
+  type ConnectorEventMap,
+  type CreateConnectorFn,
+  createConnector,
+} from '../connectors/createConnector.js'
+
 ////////////////////////////////////////////////////////////////////////////////
 // createConfig
 
@@ -304,15 +318,6 @@ export {
   createConfig,
 } from '../createConfig.js'
 
-////////////////////////////////////////////////////////////////////////////////
-// createConnector
-
-export {
-  type ConnectorEventMap,
-  type CreateConnectorFn,
-  createConnector,
-} from '../createConnector.js'
-
 ////////////////////////////////////////////////////////////////////////////////
 // createStorage
 

package/src/version.ts

@@ -1 +1 @@
-export const version = '2.0.0-alpha.3'
+export const version = '2.0.0-alpha.4'

package/dist/esm/createConnector.js

@@ -1,8 +0,0 @@
-import {} from 'viem';
-import { Emitter } from './createEmitter.js';
-import {} from './createStorage.js';
-import {} from './types/utils.js';
-export function createConnector(fn) {
-    return fn;
-}
-//# sourceMappingURL=createConnector.js.map

package/dist/esm/createConnector.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"createConnector.js","sourceRoot":"","sources":["../../src/createConnector.ts"],"names":[],"mappings":"AAAA,OAAO,EAMN,MAAM,MAAM,CAAA;AAEb,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,EAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAiB,MAAM,kBAAkB,CAAA;AAqDhD,MAAM,UAAU,eAAe,CAI7B,EAAwD;IACxD,OAAO,EAAE,CAAA;AACX,CAAC"}

package/dist/types/createConnector.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"createConnector.d.ts","sourceRoot":"","sources":["../../src/createConnector.ts"],"names":[],"mappings":"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"}