@wagmi/core 2.5.0 → 2.6.1

package/src/actions/call.ts

@@ -7,6 +7,7 @@ import { call as viem_call } from 'viem/actions'
 
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
+import { getAction } from '../utils/getAction.js'
 
 export type CallParameters<config extends Config = Config> =
   viem_CallParameters & ChainIdParameter<config>
@@ -21,5 +22,6 @@ export async function call<config extends Config,>(
 ): Promise<CallReturnType> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_call(client, rest)
+  const action = getAction(client, viem_call, 'call')
+  return action(rest)
 }

package/src/actions/estimateFeesPerGas.ts

@@ -17,6 +17,7 @@ import { type ChainIdParameter } from '../types/properties.js'
 import { type Unit } from '../types/unit.js'
 import { type Evaluate } from '../types/utils.js'
 import type { UnionEvaluate, UnionLooseOmit } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 import { getUnit } from '../utils/getUnit.js'
 
 export type EstimateFeesPerGasParameters<
@@ -57,9 +58,16 @@ export async function estimateFeesPerGas<
   const { chainId, formatUnits: units = 'gwei', ...rest } = parameters
 
   const client = config.getClient({ chainId })
+  const action = getAction(
+    client,
+    viem_estimateFeesPerGas,
+    'estimateFeesPerGas',
+  )
 
-  const { gasPrice, maxFeePerGas, maxPriorityFeePerGas } =
-    await viem_estimateFeesPerGas(client, rest)
+  const { gasPrice, maxFeePerGas, maxPriorityFeePerGas } = await action({
+    ...rest,
+    chain: client.chain,
+  })
 
   const unit = getUnit(units)
   const formatted = {

package/src/actions/estimateGas.ts

@@ -14,6 +14,7 @@ import type {
   ConnectorParameter,
 } from '../types/properties.js'
 import { type UnionEvaluate, type UnionLooseOmit } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 import {
   type GetConnectorClientErrorType,
   getConnectorClient,
@@ -67,8 +68,6 @@ export async function estimateGas<
   }
 
   const client = config.getClient({ chainId })
-  return viem_estimateGas(client, {
-    ...(rest as viem_EstimateGasParameters),
-    account,
-  })
+  const action = getAction(client, viem_estimateGas, 'estimateGas')
+  return action({ ...(rest as viem_EstimateGasParameters), account })
 }

package/src/actions/estimateMaxPriorityFeePerGas.ts

@@ -9,6 +9,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate, type UnionLooseOmit } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type EstimateMaxPriorityFeePerGasParameters<
   config extends Config = Config,
@@ -37,5 +38,10 @@ export async function estimateMaxPriorityFeePerGas<
 ): Promise<EstimateMaxPriorityFeePerGasReturnType> {
   const { chainId } = parameters
   const client = config.getClient({ chainId })
-  return viem_estimateMaxPriorityFeePerGas(client)
+  const action = getAction(
+    client,
+    viem_estimateMaxPriorityFeePerGas,
+    'estimateMaxPriorityFeePerGas',
+  )
+  return action({ chain: client.chain })
 }

package/src/actions/getBalance.ts

@@ -16,6 +16,7 @@ import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Unit } from '../types/unit.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 import { getUnit } from '../utils/getUnit.js'
 import { readContracts } from './readContracts.js'
 
@@ -82,8 +83,8 @@ export async function getBalance<config extends Config>(
   }
 
   const client = config.getClient({ chainId })
-  const value = await viem_getBalance(
-    client,
+  const action = getAction(client, viem_getBalance, 'getBalance')
+  const value = await action(
     blockNumber ? { address, blockNumber } : { address, blockTag },
   )
   const chain = config.chains.find((x) => x.id === chainId) ?? client.chain!

package/src/actions/getBlock.ts

@@ -10,6 +10,7 @@ import { type Config } from '../createConfig.js'
 import type { SelectChains } from '../types/chain.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate, type IsNarrowable } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetBlockParameters<
   includeTransactions extends boolean = false,
@@ -58,7 +59,8 @@ export async function getBlock<
 ): Promise<GetBlockReturnType<includeTransactions, blockTag, config, chainId>> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  const block = await viem_getBlock(client, rest)
+  const action = getAction(client, viem_getBlock, 'getBlock')
+  const block = await action(rest)
   return {
     ...(block as GetBlockReturnType<
       includeTransactions,

package/src/actions/getBlockNumber.ts

@@ -8,6 +8,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetBlockNumberParameters<
   config extends Config = Config,
@@ -28,5 +29,6 @@ export function getBlockNumber<
 ): Promise<GetBlockNumberReturnType> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getBlockNumber(client, rest)
+  const action = getAction(client, viem_getBlockNumber, 'getBlockNumber')
+  return action(rest)
 }

package/src/actions/getBlockTransactionCount.ts

@@ -8,6 +8,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type UnionEvaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetBlockTransactionCountParameters<
   config extends Config = Config,
@@ -32,5 +33,10 @@ export function getBlockTransactionCount<
 ): Promise<GetBlockTransactionCountReturnType> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getBlockTransactionCount(client, rest)
+  const action = getAction(
+    client,
+    viem_getBlockTransactionCount,
+    'getBlockTransactionCount',
+  )
+  return action(rest)
 }

package/src/actions/getBytecode.ts

@@ -8,6 +8,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetBytecodeParameters<config extends Config = Config> = Evaluate<
   viem_GetBytecodeParameters & ChainIdParameter<config>
@@ -24,5 +25,6 @@ export async function getBytecode<config extends Config>(
 ): Promise<GetBytecodeReturnType> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getBytecode(client, rest)
+  const action = getAction(client, viem_getBytecode, 'getBytecode')
+  return action(rest)
 }

package/src/actions/getClient.ts

@@ -2,29 +2,51 @@ import { type Client } from 'viem'
 
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
-import { type Evaluate } from '../types/utils.js'
+import { type Evaluate, type IsNarrowable } from '../types/utils.js'
 
 export type GetClientParameters<
   config extends Config = Config,
-  chainId extends config['chains'][number]['id'] = config['chains'][number]['id'],
+  chainId extends
+    | config['chains'][number]['id']
+    | number
+    | undefined = config['chains'][number]['id'],
 > = ChainIdParameter<config, chainId>
 
 export type GetClientReturnType<
   config extends Config = Config,
-  chainId extends config['chains'][number]['id'] = config['chains'][number]['id'],
-> = Evaluate<
-  Client<
-    config['_internal']['transports'][chainId],
-    Extract<config['chains'][number], { id: chainId }>
-  >
->
+  chainId extends
+    | config['chains'][number]['id']
+    | undefined = config['chains'][number]['id'],
+  ///
+  resolvedChainId extends
+    | config['chains'][number]['id']
+    | undefined = IsNarrowable<
+    config['chains'][number]['id'],
+    number
+  > extends true
+    ? IsNarrowable<chainId, number> extends true
+      ? chainId
+      : config['chains'][number]['id']
+    : config['chains'][number]['id'] | undefined,
+> = resolvedChainId extends config['chains'][number]['id']
+  ? Evaluate<
+      Client<
+        config['_internal']['transports'][resolvedChainId],
+        Extract<config['chains'][number], { id: resolvedChainId }>
+      >
+    >
+  : undefined
 
 export function getClient<
   config extends Config,
-  chainId extends config['chains'][number]['id'],
+  chainId extends config['chains'][number]['id'] | number | undefined,
 >(
   config: config,
   parameters: GetClientParameters<config, chainId> = {},
 ): GetClientReturnType<config, chainId> {
-  return config.getClient(parameters) as GetClientReturnType<config, chainId>
+  let client = undefined
+  try {
+    client = config.getClient(parameters)
+  } catch {}
+  return client as GetClientReturnType<config, chainId>
 }

package/src/actions/getEnsAddress.ts

@@ -8,6 +8,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetEnsAddressParameters<config extends Config = Config> = Evaluate<
   viem_GetEnsAddressParameters & ChainIdParameter<config>
@@ -24,5 +25,6 @@ export function getEnsAddress<config extends Config>(
 ): Promise<GetEnsAddressReturnType> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getEnsAddress(client, rest)
+  const action = getAction(client, viem_getEnsAddress, 'getEnsAddress')
+  return action(rest)
 }

package/src/actions/getEnsAvatar.ts

@@ -8,6 +8,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetEnsAvatarParameters<config extends Config = Config> = Evaluate<
   viem_GetEnsAvatarParameters & ChainIdParameter<config>
@@ -24,5 +25,6 @@ export function getEnsAvatar<config extends Config>(
 ): Promise<GetEnsAvatarReturnType> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getEnsAvatar(client, rest)
+  const action = getAction(client, viem_getEnsAvatar, 'getEnsAvatar')
+  return action(rest)
 }

package/src/actions/getEnsName.ts

@@ -8,6 +8,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetEnsNameParameters<config extends Config = Config> = Evaluate<
   viem_GetEnsNameParameters & ChainIdParameter<config>
@@ -24,5 +25,6 @@ export function getEnsName<config extends Config>(
 ): Promise<GetEnsNameReturnType> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getEnsName(client, rest)
+  const action = getAction(client, viem_getEnsName, 'getEnsName')
+  return action(rest)
 }

package/src/actions/getEnsResolver.ts

@@ -8,6 +8,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetEnsResolverParameters<config extends Config = Config> = Evaluate<
   viem_GetEnsResolverParameters & ChainIdParameter<config>
@@ -24,5 +25,6 @@ export function getEnsResolver<config extends Config>(
 ): Promise<GetEnsResolverReturnType> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getEnsResolver(client, rest)
+  const action = getAction(client, viem_getEnsResolver, 'getEnsResolver')
+  return action(rest)
 }

package/src/actions/getEnsText.ts

@@ -8,6 +8,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetEnsTextParameters<config extends Config = Config> = Evaluate<
   viem_GetEnsTextParameters & ChainIdParameter<config>
@@ -24,5 +25,6 @@ export function getEnsText<config extends Config>(
 ): Promise<GetEnsTextReturnType> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getEnsText(client, rest)
+  const action = getAction(client, viem_getEnsText, 'getEnsText')
+  return action(rest)
 }

package/src/actions/getFeeHistory.ts

@@ -8,6 +8,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetFeeHistoryParameters<
   config extends Config = Config,
@@ -28,5 +29,6 @@ export function getFeeHistory<
 ): Promise<GetFeeHistoryReturnType> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getFeeHistory(client, rest)
+  const action = getAction(client, viem_getFeeHistory, 'getFeeHistory')
+  return action(rest)
 }

package/src/actions/getGasPrice.ts

@@ -7,6 +7,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetGasPriceParameters<
   config extends Config = Config,
@@ -27,5 +28,6 @@ export function getGasPrice<
 ): Promise<GetGasPriceReturnType> {
   const { chainId } = parameters
   const client = config.getClient({ chainId })
-  return viem_getGasPrice(client)
+  const action = getAction(client, viem_getGasPrice, 'getGasPrice')
+  return action({})
 }

package/src/actions/getProof.ts

@@ -8,6 +8,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetProofParameters<config extends Config = Config> = Evaluate<
   viem_GetProofParameters & ChainIdParameter<config>
@@ -24,5 +25,6 @@ export async function getProof<config extends Config>(
 ): Promise<GetProofReturnType> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getProof(client, rest)
+  const action = getAction(client, viem_getProof, 'getProof')
+  return action(rest)
 }

package/src/actions/getPublicClient.ts

@@ -2,32 +2,50 @@ import { type PublicClient, publicActions } from 'viem'
 
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
-import { type Evaluate } from '../types/utils.js'
+import { type Evaluate, type IsNarrowable } from '../types/utils.js'
+import { getClient } from './getClient.js'
 
 export type GetPublicClientParameters<
   config extends Config = Config,
-  chainId extends config['chains'][number]['id'] = config['chains'][number]['id'],
+  chainId extends
+    | config['chains'][number]['id']
+    | undefined = config['chains'][number]['id'],
 > = ChainIdParameter<config, chainId>
 
 export type GetPublicClientReturnType<
   config extends Config = Config,
-  chainId extends config['chains'][number]['id'] = config['chains'][number]['id'],
-> = Evaluate<
-  PublicClient<
-    config['_internal']['transports'][chainId],
-    Extract<config['chains'][number], { id: chainId }>
-  >
->
+  chainId extends
+    | config['chains'][number]['id']
+    | undefined = config['chains'][number]['id'],
+  ///
+  resolvedChainId extends
+    | config['chains'][number]['id']
+    | undefined = IsNarrowable<
+    config['chains'][number]['id'],
+    number
+  > extends true
+    ? IsNarrowable<chainId, number> extends true
+      ? chainId
+      : config['chains'][number]['id']
+    : config['chains'][number]['id'] | undefined,
+> = resolvedChainId extends config['chains'][number]['id']
+  ? Evaluate<
+      PublicClient<
+        config['_internal']['transports'][resolvedChainId],
+        Extract<config['chains'][number], { id: resolvedChainId }>
+      >
+    >
+  : undefined
 
 export function getPublicClient<
   config extends Config,
-  chainId extends config['chains'][number]['id'],
+  chainId extends config['chains'][number]['id'] | number | undefined,
 >(
   config: config,
   parameters: GetPublicClientParameters<config, chainId> = {},
 ): GetPublicClientReturnType<config, chainId> {
-  const client = config.getClient(parameters)
-  return client.extend(publicActions) as GetPublicClientReturnType<
+  const client = getClient(config, parameters)
+  return client?.extend(publicActions) as GetPublicClientReturnType<
     config,
     chainId
   >

package/src/actions/getStorageAt.ts

@@ -8,6 +8,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetStorageAtParameters<config extends Config = Config> = Evaluate<
   viem_GetStorageAtParameters & ChainIdParameter<config>
@@ -24,5 +25,6 @@ export async function getStorageAt<config extends Config>(
 ): Promise<GetStorageAtReturnType> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getStorageAt(client, rest)
+  const action = getAction(client, viem_getStorageAt, 'getStorageAt')
+  return action(rest)
 }

package/src/actions/getTransaction.ts

@@ -10,6 +10,7 @@ import { type Config } from '../createConfig.js'
 import type { SelectChains } from '../types/chain.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate, type IsNarrowable } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetTransactionParameters<
   config extends Config = Config,
@@ -41,7 +42,8 @@ export function getTransaction<
 ): Promise<GetTransactionReturnType<config, chainId>> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getTransaction(client, rest) as unknown as Promise<
+  const action = getAction(client, viem_getTransaction, 'getTransaction')
+  return action(rest) as unknown as Promise<
     GetTransactionReturnType<config, chainId>
   >
 }

package/src/actions/getTransactionConfirmations.ts

@@ -9,6 +9,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type SelectChains } from '../types/chain.js'
 import { type ChainIdParameter } from '../types/properties.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetTransactionConfirmationsParameters<
   config extends Config = Config,
@@ -42,8 +43,10 @@ export function getTransactionConfirmations<
 ): Promise<GetTransactionConfirmationsReturnType> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getTransactionConfirmations(
+  const action = getAction(
     client,
-    rest as viem_GetTransactionConfirmationsParameters,
+    viem_getTransactionConfirmations,
+    'getTransactionConfirmations',
   )
+  return action(rest as viem_GetTransactionConfirmationsParameters)
 }

package/src/actions/getTransactionCount.ts

@@ -8,6 +8,7 @@ import {
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetTransactionCountParameters<config extends Config = Config> =
   Evaluate<ChainIdParameter<config> & viem_GetTransactionCountParameters>
@@ -24,8 +25,10 @@ export async function getTransactionCount<config extends Config>(
   const { address, blockNumber, blockTag, chainId } = parameters
 
   const client = config.getClient({ chainId })
-  return viem_getTransactionCount(
+  const action = getAction(
     client,
-    blockNumber ? { address, blockNumber } : { address, blockTag },
+    viem_getTransactionCount,
+    'getTransactionCount',
   )
+  return action(blockNumber ? { address, blockNumber } : { address, blockTag })
 }

package/src/actions/getTransactionReceipt.ts

@@ -10,6 +10,7 @@ import { type Config } from '../createConfig.js'
 import { type SelectChains } from '../types/chain.js'
 import { type ChainIdParameter } from '../types/properties.js'
 import { type Evaluate, type IsNarrowable } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 
 export type GetTransactionReceiptParameters<
   config extends Config = Config,
@@ -43,5 +44,10 @@ export async function getTransactionReceipt<
 ): Promise<GetTransactionReceiptReturnType<config, chainId>> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_getTransactionReceipt(client, rest)
+  const action = getAction(
+    client,
+    viem_getTransactionReceipt,
+    'getTransactionReceipt',
+  )
+  return action(rest)
 }

package/src/actions/multicall.ts

@@ -8,6 +8,7 @@ import { multicall as viem_multicall } from 'viem/actions'
 
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
+import { getAction } from '../utils/getAction.js'
 
 export type MulticallParameters<
   contracts extends readonly unknown[] = readonly ContractFunctionParameters[],
@@ -32,7 +33,8 @@ export async function multicall<
 ): Promise<MulticallReturnType<contracts, allowFailure>> {
   const { allowFailure = true, chainId, contracts, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_multicall(client, {
+  const action = getAction(client, viem_multicall, 'multicall')
+  return action({
     allowFailure,
     contracts,
     ...rest,

package/src/actions/prepareTransactionRequest.ts

@@ -21,6 +21,7 @@ import {
   type UnionEvaluate,
   type UnionOmit,
 } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 import { getConnectorClient } from './getConnectorClient.js'
 
 export type PrepareTransactionRequestParameters<
@@ -97,8 +98,12 @@ export async function prepareTransactionRequest<
     chainId,
     connector,
   })
-  return viem_prepareTransactionRequest(
+  const action = getAction(
     client,
+    viem_prepareTransactionRequest,
+    'prepareTransactionRequest',
+  )
+  return action(
     rest as unknown as viem_PrepareTransactionRequestParameters,
   ) as unknown as Promise<
     PrepareTransactionRequestReturnType<parameterType, config, chainId>

package/src/actions/readContract.ts

@@ -9,6 +9,7 @@ import {
 
 import { type Config } from '../createConfig.js'
 import { type ChainIdParameter } from '../types/properties.js'
+import { getAction } from '../utils/getAction.js'
 
 export type ReadContractParameters<
   abi extends Abi | readonly unknown[] = Abi,
@@ -52,5 +53,6 @@ export function readContract<
 ): Promise<ReadContractReturnType<abi, functionName, args>> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_readContract(client, rest as any)
+  const action = getAction(client, viem_readContract, 'readContract')
+  return action(rest as any)
 }

package/src/actions/sendTransaction.ts

@@ -20,6 +20,7 @@ import type {
   ConnectorParameter,
 } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 import {
   type GetConnectorClientErrorType,
   getConnectorClient,
@@ -78,17 +79,20 @@ export async function sendTransaction<
     if (gas_ === null) return undefined
 
     // Run gas estimation if no value is provided.
-    if (gas_ === undefined)
-      return viem_estimateGas(client, {
+    if (gas_ === undefined) {
+      const action = getAction(client, viem_estimateGas, 'estimateGas')
+      return action({
         ...(rest as any),
         chain: chainId ? { id: chainId } : null,
       })
+    }
 
     // Use provided gas value.
     return gas_
   })()
 
-  const hash = await viem_sendTransaction(client, {
+  const action = getAction(client, viem_sendTransaction, 'sendTransaction')
+  const hash = await action({
     ...(rest as any),
     gas,
     chain: chainId ? { id: chainId } : null,

package/src/actions/signMessage.ts

@@ -10,6 +10,7 @@ import { type Config } from '../createConfig.js'
 import type { BaseErrorType, ErrorType } from '../errors/base.js'
 import type { ConnectorParameter } from '../types/properties.js'
 import { type Evaluate } from '../types/utils.js'
+import { getAction } from '../utils/getAction.js'
 import {
   type GetConnectorClientErrorType,
   getConnectorClient,
@@ -37,5 +38,6 @@ export async function signMessage(
 ): Promise<SignMessageReturnType> {
   const { account, connector, ...rest } = parameters
   const client = await getConnectorClient(config, { account, connector })
-  return viem_signMessage(client, rest)
+  const action = getAction(client, viem_signMessage, 'signMessage')
+  return action(rest as viem_SignMessageParameters<Account>)
 }