@wagmi/core 2.0.0 → 2.0.2

package/src/actions/writeContract.ts

@@ -4,22 +4,28 @@ import type {
   Chain,
   ContractFunctionArgs,
   ContractFunctionName,
-  WriteContractParameters as viem_WriteContractParameters,
-  WriteContractReturnType as viem_WriteContractReturnType,
 } from 'viem'
-import { writeContract as viem_writeContract } from 'viem/actions'
+import {
+  type WriteContractErrorType as viem_WriteContractErrorType,
+  type WriteContractParameters as viem_WriteContractParameters,
+  type WriteContractReturnType as viem_WriteContractReturnType,
+  writeContract as viem_writeContract,
+} from 'viem/actions'
 
-import type { Config } from '../createConfig.js'
-import type { SelectChains } from '../types/chain.js'
-import type {
-  ChainIdParameter,
-  ConnectorParameter,
+import { type Config } from '../createConfig.js'
+import { type BaseErrorType, type ErrorType } from '../errors/base.js'
+import { type SelectChains } from '../types/chain.js'
+import {
+  type ChainIdParameter,
+  type ConnectorParameter,
 } from '../types/properties.js'
-import type { Evaluate, UnionOmit } from '../types/utils.js'
-import { assertActiveChain } from '../utils/assertActiveChain.js'
-import { getConnectorClient } from './getConnectorClient.js'
+import type { Evaluate, UnionEvaluate, UnionOmit } from '../types/utils.js'
 import {
-  type SimulateContractParameters,
+  type GetConnectorClientErrorType,
+  getConnectorClient,
+} from './getConnectorClient.js'
+import {
+  type SimulateContractErrorType,
   simulateContract,
 } from './simulateContract.js'
 
@@ -37,28 +43,41 @@ export type WriteContractParameters<
   config extends Config = Config,
   chainId extends config['chains'][number]['id'] = config['chains'][number]['id'],
   ///
+  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]
-    >,
-    '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
 
-export type WriteContractError = Error
+export type WriteContractErrorType =
+  // getConnectorClient()
+  | GetConnectorClientErrorType
+  // simulateContract()
+  | SimulateContractErrorType
+  // base
+  | BaseErrorType
+  | ErrorType
+  // viem
+  | viem_WriteContractErrorType
 
-/** https://alpha.wagmi.sh/core/api/actions/writeContract */
+/** https://wagmi.sh/core/api/actions/writeContract */
 export async function writeContract<
   config extends Config,
   const abi extends Abi | readonly unknown[],
@@ -82,29 +101,18 @@ export async function writeContract<
   })
 
   let request
-  if (__mode === 'prepared') {
-    if (chainId)
-      assertActiveChain(config, { activeChainId: client.chain.id, chainId })
-    request = rest
-  } else {
+  if (__mode === 'prepared') request = rest
+  else {
     const { request: simulateRequest } = await simulateContract(
       config,
-      rest as unknown as SimulateContractParameters<
-        abi,
-        functionName,
-        args,
-        config,
-        chainId
-      >,
+      rest as any,
     )
     request = simulateRequest
   }
 
   const hash = await viem_writeContract(client, {
     ...(request as any),
-    // Setting to `null` to not validate inside `viem_writeContract` since we
-    // already validated above with `assertActiveChain` and in `simulateContract`
-    chain: null,
+    chain: chainId ? { id: chainId } : null,
   })
 
   return hash

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,16 @@ export type CreateConnectorFn<
   storage?: Evaluate<Storage<storageItem>> | null | undefined
 }) => Evaluate<
   {
+    readonly icon?: string | undefined
     readonly id: string
     readonly name: string
+    readonly type: string
 
     setup?(): Promise<void>
     connect(
-      parameters?: { chainId?: number | undefined } | undefined,
+      parameters?:
+        | { chainId?: number | undefined; isReconnecting?: boolean | undefined }
+        | undefined,
     ): Promise<{
       accounts: readonly Address[]
       chainId: number
@@ -45,18 +49,10 @@ export type CreateConnectorFn<
     getAccounts(): Promise<readonly Address[]>
     getChainId(): Promise<number>
     getProvider(
-      parameters?:
-        | {
-            chainId?: number | undefined
-          }
-        | undefined,
+      parameters?: { chainId?: number | undefined } | undefined,
     ): Promise<provider>
     getClient?(
-      parameters?:
-        | {
-            chainId?: number | undefined
-          }
-        | undefined,
+      parameters?: { chainId?: number | undefined } | undefined,
     ): Promise<Client>
     isAuthorized(): Promise<boolean>
     switchChain?(parameters: { chainId: number }): Promise<Chain>
@@ -73,6 +69,6 @@ export function createConnector<
   provider,
   properties extends Record<string, unknown> = {},
   storageItem extends Record<string, unknown> = {},
->(fn: CreateConnectorFn<provider, properties, storageItem>) {
-  return fn
+>(createConnectorFn: CreateConnectorFn<provider, properties, storageItem>) {
+  return createConnectorFn
 }