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

package/src/actions/getAccount.ts

@@ -1,4 +1,4 @@
-import { type Address } from 'viem'
+import { type Address, type Chain } from 'viem'
 
 import { type Config, type Connector } from '../createConfig.js'
 
@@ -6,6 +6,7 @@ export type GetAccountReturnType =
   | {
       address: Address
       addresses: readonly [Address, ...Address[]]
+      chain: Chain | undefined
       chainId: number
       connector: Connector
       isConnected: true
@@ -17,6 +18,7 @@ export type GetAccountReturnType =
   | {
       address: Address | undefined
       addresses: readonly Address[] | undefined
+      chain: Chain | undefined
       chainId: number | undefined
       connector: Connector | undefined
       isConnected: boolean
@@ -28,6 +30,7 @@ export type GetAccountReturnType =
   | {
       address: Address | undefined
       addresses: readonly Address[] | undefined
+      chain: Chain | undefined
       chainId: number | undefined
       connector: Connector | undefined
       isConnected: false
@@ -39,6 +42,7 @@ export type GetAccountReturnType =
   | {
       address: undefined
       addresses: undefined
+      chain: Chain | undefined
       chainId: undefined
       connector: undefined
       isConnected: false
@@ -54,6 +58,7 @@ export function getAccount(config: Config): GetAccountReturnType {
   const connection = config.state.connections.get(uid)
   const addresses = connection?.accounts
   const address = addresses?.[0]
+  const chain = config.chains.find((chain) => chain.id === connection?.chainId)
   const status = config.state.status
 
   switch (status) {
@@ -61,6 +66,7 @@ export function getAccount(config: Config): GetAccountReturnType {
       return {
         address: address!,
         addresses: addresses!,
+        chain,
         chainId: connection?.chainId!,
         connector: connection?.connector!,
         isConnected: true,
@@ -73,6 +79,7 @@ export function getAccount(config: Config): GetAccountReturnType {
       return {
         address,
         addresses,
+        chain,
         chainId: connection?.chainId,
         connector: connection?.connector,
         isConnected: !!address,
@@ -85,6 +92,7 @@ export function getAccount(config: Config): GetAccountReturnType {
       return {
         address,
         addresses,
+        chain,
         chainId: connection?.chainId,
         connector: connection?.connector,
         isConnected: false,
@@ -97,6 +105,7 @@ export function getAccount(config: Config): GetAccountReturnType {
       return {
         address: undefined,
         addresses: undefined,
+        chain,
         chainId: undefined,
         connector: undefined,
         isConnected: false,

package/src/actions/reconnect.ts

@@ -1,7 +1,7 @@
 import type { Address } from 'viem'
 
+import { type CreateConnectorFn } from '../connectors/createConnector.js'
 import type { Config, Connection, Connector } from '../createConfig.js'
-import { type CreateConnectorFn } from '../createConnector.js'
 import type { Evaluate } from '../types/utils.js'
 
 export type ReconnectParameters = {
@@ -63,10 +63,14 @@ export async function reconnect(
     const isAuthorized = await connector.isAuthorized()
     if (!isAuthorized) continue
 
-    const data = await connector.connect()
-    connector.emitter.off('connect', config._internal.connect)
-    connector.emitter.on('change', config._internal.change)
-    connector.emitter.on('disconnect', config._internal.disconnect)
+    const data = await connector
+      .connect({ isReconnecting: true })
+      .catch(() => null)
+    if (!data) continue
+
+    connector.emitter.off('connect', config._internal.events.connect)
+    connector.emitter.on('change', config._internal.events.change)
+    connector.emitter.on('disconnect', config._internal.events.disconnect)
 
     config.setState((x) => {
       const connections = new Map(connected ? x.connections : new Map()).set(

package/src/actions/watchBlockNumber.ts

@@ -66,9 +66,7 @@ export function watchBlockNumber<
   if (syncConnectedChain && !parameters.chainId)
     unsubscribe = config.subscribe(
       ({ chainId }) => chainId,
-      async (chainId) => {
-        return listener(chainId)
-      },
+      async (chainId) => listener(chainId),
     )
 
   return () => {

package/src/actions/watchBlocks.ts

@@ -75,9 +75,7 @@ export function watchBlocks<
   if (syncConnectedChain && !parameters.chainId)
     unsubscribe = config.subscribe(
       ({ chainId }) => chainId,
-      async (chainId) => {
-        return listener(chainId)
-      },
+      async (chainId) => listener(chainId),
     )
 
   return () => {

package/src/actions/watchContractEvent.ts

@@ -86,9 +86,7 @@ export function watchContractEvent<
   if (syncConnectedChain && !parameters.chainId)
     unsubscribe = config.subscribe(
       ({ chainId }) => chainId,
-      async (chainId) => {
-        return listener(chainId)
-      },
+      async (chainId) => listener(chainId),
     )
 
   return () => {

package/src/actions/watchPendingTransactions.ts

@@ -67,9 +67,7 @@ export function watchPendingTransactions<
   if (syncConnectedChain && !parameters.chainId)
     unsubscribe = config.subscribe(
       ({ chainId }) => chainId,
-      async (chainId) => {
-        return listener(chainId)
-      },
+      async (chainId) => listener(chainId),
     )
 
   return () => {

package/src/actions/writeContract.ts

@@ -15,7 +15,7 @@ import type {
   ChainIdParameter,
   ConnectorParameter,
 } from '../types/properties.js'
-import type { Evaluate, UnionOmit } from '../types/utils.js'
+import type { Evaluate, UnionEvaluate, UnionOmit } from '../types/utils.js'
 import { assertActiveChain } from '../utils/assertActiveChain.js'
 import { getConnectorClient } from './getConnectorClient.js'
 import {
@@ -39,22 +39,24 @@ export type WriteContractParameters<
   ///
   allFunctionNames = ContractFunctionName<abi, 'nonpayable' | 'payable'>,
   chains extends readonly Chain[] = SelectChains<config, chainId>,
-> = {
-  [key in keyof chains]: UnionOmit<
-    viem_WriteContractParameters<
-      abi,
-      functionName,
-      args,
-      chains[key],
-      Account,
-      chains[key],
-      allFunctionNames
-    >,
-    'chain'
-  >
-}[number] &
-  Evaluate<ChainIdParameter<config, chainId>> &
-  ConnectorParameter & { __mode?: 'prepared' }
+> = UnionEvaluate<
+  {
+    [key in keyof chains]: UnionOmit<
+      viem_WriteContractParameters<
+        abi,
+        functionName,
+        args,
+        chains[key],
+        Account,
+        chains[key],
+        allFunctionNames
+      >,
+      'chain'
+    >
+  }[number] &
+    Evaluate<ChainIdParameter<config, chainId>> &
+    ConnectorParameter & { __mode?: 'prepared' }
+>
 
 export type WriteContractReturnType = viem_WriteContractReturnType
 
@@ -91,13 +93,7 @@ export async function writeContract<
   } else {
     const { request: simulateRequest } = await simulateContract(
       config,
-      rest as unknown as SimulateContractParameters<
-        abi,
-        functionName,
-        args,
-        config,
-        chainId
-      >,
+      rest as SimulateContractParameters,
     )
     request = simulateRequest
   }

package/src/{createConnector.ts → connectors/createConnector.ts}

@@ -6,9 +6,9 @@ import {
   type ProviderMessage,
 } from 'viem'
 
-import { Emitter } from './createEmitter.js'
-import { type Storage } from './createStorage.js'
-import { type Evaluate } from './types/utils.js'
+import { Emitter } from '../createEmitter.js'
+import { type Storage } from '../createStorage.js'
+import { type Evaluate } from '../types/utils.js'
 
 export type ConnectorEventMap = {
   change: {
@@ -31,12 +31,15 @@ export type CreateConnectorFn<
   storage?: Evaluate<Storage<storageItem>> | null | undefined
 }) => Evaluate<
   {
+    readonly icon?: string | undefined
     readonly id: string
     readonly name: string
 
     setup?(): Promise<void>
     connect(
-      parameters?: { chainId?: number | undefined } | undefined,
+      parameters?:
+        | { chainId?: number | undefined; isReconnecting?: boolean | undefined }
+        | undefined,
     ): Promise<{
       accounts: readonly Address[]
       chainId: number