viem 2.0.0-alpha.1 → 2.0.0-alpha.11

package/_types/utils/rpc.d.ts

@@ -1,4 +1,4 @@
-import { WebSocket } from 'unws';
+import WebSocket from 'isomorphic-ws';
 type SuccessResult<T> = {
     method?: never;
     result: T;
@@ -46,8 +46,8 @@ export type Socket = WebSocket & {
     requests: CallbackMap;
     subscriptions: CallbackMap;
 };
-export declare const socketsCache: Map<string, Socket>;
-export declare function getSocket(url: string): Promise<Socket>;
+export declare const socketsCache: Map<string, any>;
+export declare function getSocket(url: string): Promise<any>;
 export type WebSocketOptions = {
     /** The RPC request body. */
     body: RpcRequest;

package/_types/utils/rpc.d.ts.map

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

package/_types/wallet/index.d.ts

@@ -0,0 +1,11 @@
+export { addChain, type AddChainParameters, } from '../actions/wallet/addChain.js';
+export { getAddresses, type GetAddressesReturnType, } from '../actions/wallet/getAddresses.js';
+export { getPermissions, type GetPermissionsReturnType, } from '../actions/wallet/getPermissions.js';
+export { requestAddresses, type RequestAddressesReturnType, } from '../actions/wallet/requestAddresses.js';
+export { requestPermissions, type RequestPermissionsReturnType, } from '../actions/wallet/requestPermissions.js';
+export { sendTransaction, type SendTransactionParameters, type SendTransactionReturnType, } from '../actions/wallet/sendTransaction.js';
+export { signMessage, type SignMessageParameters, type SignMessageReturnType, } from '../actions/wallet/signMessage.js';
+export { signTypedData, type SignTypedDataParameters, type SignTypedDataReturnType, } from '../actions/wallet/signTypedData.js';
+export { switchChain, type SwitchChainParameters, } from '../actions/wallet/switchChain.js';
+export { watchAsset, type WatchAssetParameters, type WatchAssetReturnType, } from '../actions/wallet/watchAsset.js';
+//# sourceMappingURL=index.d.ts.map

package/_types/wallet/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../wallet/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EACR,KAAK,kBAAkB,GACxB,MAAM,+BAA+B,CAAA;AACtC,OAAO,EACL,YAAY,EACZ,KAAK,sBAAsB,GAC5B,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EACL,cAAc,EACd,KAAK,wBAAwB,GAC9B,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EACL,gBAAgB,EAChB,KAAK,0BAA0B,GAChC,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EACL,kBAAkB,EAClB,KAAK,4BAA4B,GAClC,MAAM,yCAAyC,CAAA;AAChD,OAAO,EACL,eAAe,EACf,KAAK,yBAAyB,EAC9B,KAAK,yBAAyB,GAC/B,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EACL,WAAW,EACX,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,GAC3B,MAAM,kCAAkC,CAAA;AACzC,OAAO,EACL,aAAa,EACb,KAAK,uBAAuB,EAC5B,KAAK,uBAAuB,GAC7B,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EACL,WAAW,EACX,KAAK,qBAAqB,GAC3B,MAAM,kCAAkC,CAAA;AACzC,OAAO,EACL,UAAU,EACV,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,GAC1B,MAAM,iCAAiC,CAAA"}

package/_types/window/index.d.ts

@@ -0,0 +1,2 @@
+import '../types/window.js';
+//# sourceMappingURL=index.d.ts.map

package/_types/window/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../window/index.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAA"}

package/{abi.ts → abi/index.ts}

@@ -1,15 +1,5 @@
-export {
-  type DecodeAbiParametersReturnType,
-  decodeAbiParameters,
-} from './utils/abi/decodeAbiParameters.js'
-export {
-  type EncodeAbiParametersReturnType,
-  encodeAbiParameters,
-} from './utils/abi/encodeAbiParameters.js'
-export {
-  type GetAbiItemParameters,
-  getAbiItem,
-} from './utils/abi/getAbiItem.js'
+// TODO(v2): Remove this entrypoint. Favor importing from root entrypoint (`viem`).
+
 export {
   type ParseAbi,
   type ParseAbiItem,
@@ -20,4 +10,16 @@ export {
   parseAbiParameter,
   parseAbiParameters,
 } from 'abitype'
-export { encodePacked } from './utils/abi/encodePacked.js'
+export {
+  type DecodeAbiParametersReturnType,
+  decodeAbiParameters,
+} from '../utils/abi/decodeAbiParameters.js'
+export {
+  type EncodeAbiParametersReturnType,
+  encodeAbiParameters,
+} from '../utils/abi/encodeAbiParameters.js'
+export {
+  type GetAbiItemParameters,
+  getAbiItem,
+} from '../utils/abi/getAbiItem.js'
+export { encodePacked } from '../utils/abi/encodePacked.js'

package/abi/package.json

@@ -0,0 +1,6 @@
+{
+  "type": "module",
+  "types": "../_types/abi/index.d.ts",
+  "module": "../_esm/abi/index.js",
+  "main": "../_cjs/abi/index.js"
+}

package/accounts/package.json

@@ -0,0 +1,6 @@
+{
+  "type": "module",
+  "types": "../_types/accounts/index.d.ts",
+  "module": "../_esm/accounts/index.js",
+  "main": "../_cjs/accounts/index.js"
+}

package/actions/getContract.ts

@@ -41,6 +41,11 @@ import {
   type EstimateContractGasReturnType,
   estimateContractGas,
 } from './public/estimateContractGas.js'
+import {
+  type GetContractEventsParameters,
+  type GetContractEventsReturnType,
+  getContractEvents,
+} from './public/getContractEvents.js'
 import {
   type ReadContractParameters,
   type ReadContractReturnType,
@@ -84,6 +89,7 @@ export type GetContractParameters<
    *
    * - [`createEventFilter`](https://viem.sh/docs/contract/createContractEventFilter.html)
    * - [`estimateGas`](https://viem.sh/docs/contract/estimateContractGas.html)
+   * - [`getEvents`](https://viem.sh/docs/contract/getContractEvents.html)
    * - [`read`](https://viem.sh/docs/contract/readContract.html)
    * - [`simulate`](https://viem.sh/docs/contract/simulateContract.html)
    * - [`watchEvent`](https://viem.sh/docs/contract/watchContractEvent.html)
@@ -270,6 +276,33 @@ export type GetContractReturnType<
                       : never
                   >
                 }
+                /**
+                 * Creates a Filter to retrieve event logs that can be used with [`getFilterChanges`](https://viem.sh/docs/actions/public/getFilterChanges.html) or [`getFilterLogs`](https://viem.sh/docs/actions/public/getFilterLogs.html).
+                 *
+                 * @example
+                 * import { createPublicClient, getContract, http, parseAbi } from 'viem'
+                 * import { mainnet } from 'viem/chains'
+                 *
+                 * const publicClient = createPublicClient({
+                 *   chain: mainnet,
+                 *   transport: http(),
+                 * })
+                 * const contract = getContract({
+                 *   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
+                 *   abi: parseAbi(['event Transfer(address indexed, address indexed, uint256)']),
+                 *   publicClient,
+                 * })
+                 * const filter = await contract.createEventFilter.Transfer()
+                 */
+                getEvents: {
+                  [EventName in _EventNames]: GetEventsFunction<
+                    _Narrowable,
+                    TAbi,
+                    EventName extends ContractEventName<TAbi>
+                      ? EventName
+                      : never
+                  >
+                }
                 /**
                  * Watches and returns emitted contract event logs.
                  *
@@ -450,6 +483,7 @@ export function getContract<
       | 'address'
       | 'createEventFilter'
       | 'estimateGas'
+      | 'getEvents'
       | 'read'
       | 'simulate'
       | 'watchEvent'
@@ -556,6 +590,37 @@ export function getContract<
           },
         },
       )
+      contract.getEvents = new Proxy(
+        {},
+        {
+          get(_, eventName: string) {
+            return (
+              ...parameters: [
+                args?: readonly unknown[] | object,
+                options?: Omit<
+                  GetContractEventsParameters,
+                  'abi' | 'address' | 'eventName'
+                >,
+              ]
+            ) => {
+              const abiEvent = (abi as readonly AbiEvent[]).find(
+                (x: AbiEvent) => x.type === 'event' && x.name === eventName,
+              )
+              const { args, options } = getEventParameters(
+                parameters,
+                abiEvent!,
+              )
+              return getContractEvents(publicClient, {
+                abi,
+                address,
+                eventName,
+                args,
+                ...options,
+              } as unknown as GetContractEventsParameters)
+            }
+          },
+        },
+      )
       contract.watchEvent = new Proxy(
         {},
         {
@@ -952,6 +1017,36 @@ type GetEventFilter<
           ]
     ) => Promise<CreateContractEventFilterReturnType>
 
+type GetEventsFunction<
+  Narrowable extends boolean,
+  TAbi extends Abi | readonly unknown[],
+  TEventName extends ContractEventName<TAbi>,
+  TAbiEvent extends AbiEvent = TAbi extends Abi
+    ? ExtractAbiEvent<TAbi, TEventName>
+    : AbiEvent,
+  Args = AbiEventParametersToPrimitiveTypes<TAbiEvent['inputs']>,
+  Options = Prettify<
+    Omit<
+      GetContractEventsParameters<TAbi, TEventName>,
+      'abi' | 'address' | 'args' | 'eventName'
+    >
+  >,
+  IndexedInputs = Extract<TAbiEvent['inputs'][number], { indexed: true }>,
+> = Narrowable extends true
+  ? (
+      ...parameters: IsNever<IndexedInputs> extends true
+        ? [options?: Options]
+        : [args?: Args, options?: Options]
+    ) => Promise<GetContractEventsReturnType<TAbi, TEventName>>
+  : (
+      ...parameters:
+        | [options?: Options]
+        | [
+            args?: readonly unknown[] | WatchContractEventOptions,
+            options?: Options,
+          ]
+    ) => Promise<GetContractEventsReturnType<TAbi, TEventName>>
+
 type GetWatchEvent<
   Narrowable extends boolean,
   TAbi extends Abi | readonly unknown[],

package/actions/package.json

@@ -0,0 +1,6 @@
+{
+  "type": "module",
+  "types": "../_types/actions/index.d.ts",
+  "module": "../_esm/actions/index.js",
+  "main": "../_cjs/actions/index.js"
+}

package/actions/public/createContractEventFilter.ts

@@ -35,7 +35,7 @@ export type CreateContractEventFilterParameters<
    * Whether or not the logs must match the indexed/non-indexed arguments in the event ABI item.
    * @default false
    */
-  strict?: strict
+  strict?: strict | boolean | undefined
   toBlock?: toBlock | BlockNumber | BlockTag
 } & (undefined extends eventName
   ? {

package/actions/public/estimateFeesPerGas.ts

@@ -106,10 +106,11 @@ export async function internal_estimateFeesPerGas<
   })()
   if (baseFeeMultiplier < 1) throw new BaseFeeScalarError()
 
-  const decimals = baseFeeMultiplier.toString().split('.')[1].length
+  const decimals = baseFeeMultiplier.toString().split('.')[1]?.length ?? 0
   const denominator = 10 ** decimals
   const multiply = (base: bigint) =>
-    (base * BigInt(baseFeeMultiplier * denominator)) / BigInt(denominator)
+    (base * BigInt(Math.ceil(baseFeeMultiplier * denominator))) /
+    BigInt(denominator)
 
   const block = block_ ? block_ : await getBlock(client)
 

package/actions/public/getContractEvents.ts

@@ -0,0 +1,155 @@
+import type { Abi, Address } from 'abitype'
+
+import type { Client } from '../../clients/createClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { BlockNumber, BlockTag } from '../../types/block.js'
+import type { Chain } from '../../types/chain.js'
+import type {
+  ContractEventArgs,
+  ContractEventName,
+} from '../../types/contract.js'
+import type { Log } from '../../types/log.js'
+import type { Hash } from '../../types/misc.js'
+import {
+  type GetAbiItemParameters,
+  getAbiItem,
+} from '../../utils/abi/getAbiItem.js'
+import { getLogs } from './getLogs.js'
+import type { GetLogsParameters } from './getLogs.js'
+
+export type GetContractEventsParameters<
+  abi extends Abi | readonly unknown[] = Abi,
+  eventName extends ContractEventName<abi> | undefined =
+    | ContractEventName<abi>
+    | undefined,
+  strict extends boolean | undefined = undefined,
+  fromBlock extends BlockNumber | BlockTag | undefined = undefined,
+  toBlock extends BlockNumber | BlockTag | undefined = undefined,
+> = {
+  /** The address of the contract. */
+  address?: Address | Address[]
+  /** Contract ABI. */
+  abi: abi
+  args?:
+    | ContractEventArgs<
+        abi,
+        eventName extends ContractEventName<abi>
+          ? eventName
+          : ContractEventName<abi>
+      >
+    | undefined
+  /** Contract event. */
+  eventName?: eventName | ContractEventName<abi> | undefined
+  /**
+   * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
+   * @default false
+   */
+  strict?: strict | boolean | undefined
+} & (
+  | {
+      /** Block number or tag after which to include logs */
+      fromBlock?: fromBlock | BlockNumber | BlockTag
+      /** Block number or tag before which to include logs */
+      toBlock?: toBlock | BlockNumber | BlockTag
+      blockHash?: undefined
+    }
+  | {
+      fromBlock?: undefined
+      toBlock?: undefined
+      /** Hash of block to include logs from */
+      blockHash?: Hash
+    }
+)
+
+export type GetContractEventsReturnType<
+  abi extends Abi | readonly unknown[] = readonly unknown[],
+  eventName extends ContractEventName<abi> | undefined =
+    | ContractEventName<abi>
+    | undefined,
+  strict extends boolean | undefined = undefined,
+  fromBlock extends BlockNumber | BlockTag | undefined = undefined,
+  toBlock extends BlockNumber | BlockTag | undefined = undefined,
+  ///
+  isPending extends boolean =
+    | (fromBlock extends 'pending' ? true : false)
+    | (toBlock extends 'pending' ? true : false),
+> = Log<bigint, number, isPending, undefined, strict, abi, eventName>[]
+
+/**
+ * Returns a list of event logs emitted by a contract.
+ *
+ * - Docs: https://viem.sh/docs/actions/public/getContractEvents.html
+ * - JSON-RPC Methods: [`eth_getLogs`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getlogs)
+ *
+ * @param client - Client to use
+ * @param parameters - {@link GetContractEventsParameters}
+ * @returns A list of event logs. {@link GetContractEventsReturnType}
+ *
+ * @example
+ * import { createClient, http } from 'viem'
+ * import { mainnet } from 'viem/chains'
+ * import { getContractEvents } from 'viem/public'
+ * import { wagmiAbi } from './abi'
+ *
+ * const client = createClient({
+ *   chain: mainnet,
+ *   transport: http(),
+ * })
+ * const logs = await getContractEvents(client, {
+ *  address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
+ *  abi: wagmiAbi,
+ *  eventName: 'Transfer'
+ * })
+ */
+export async function getContractEvents<
+  chain extends Chain | undefined,
+  const abi extends Abi | readonly unknown[],
+  eventName extends ContractEventName<abi> | undefined = undefined,
+  TStrict extends boolean | undefined = undefined,
+  TFromBlock extends BlockNumber | BlockTag | undefined = undefined,
+  TToBlock extends BlockNumber | BlockTag | undefined = undefined,
+>(
+  client: Client<Transport, chain>,
+  parameters: GetContractEventsParameters<
+    abi,
+    eventName,
+    TStrict,
+    TFromBlock,
+    TToBlock
+  >,
+): Promise<
+  GetContractEventsReturnType<abi, eventName, TStrict, TFromBlock, TToBlock>
+> {
+  const {
+    abi,
+    address,
+    args,
+    blockHash,
+    eventName,
+    fromBlock,
+    toBlock,
+    strict,
+  } = parameters
+  const event = eventName
+    ? getAbiItem({ abi, name: eventName } as GetAbiItemParameters)
+    : undefined
+  const events = !event
+    ? (abi as Abi).filter((x) => x.type === 'event')
+    : undefined
+  return getLogs(client, {
+    address,
+    args,
+    blockHash,
+    event,
+    events,
+    fromBlock,
+    toBlock,
+    strict,
+  } as {} as GetLogsParameters) as unknown as GetContractEventsReturnType<
+    abi,
+    eventName,
+    TStrict,
+    TFromBlock,
+    TToBlock
+  >
+}

package/actions/public/multicall.ts

@@ -28,7 +28,7 @@ export type MulticallParameters<
     properties?: Record<string, any>
   } = {},
 > = Pick<CallParameters, 'blockNumber' | 'blockTag'> & {
-  allowFailure?: allowFailure | undefined
+  allowFailure?: allowFailure | boolean | undefined
   batchSize?: number | undefined
   contracts: MulticallContracts<
     Narrow<contracts>,
@@ -254,5 +254,5 @@ export async function multicall<
 
   if (results.length !== contracts.length)
     throw new BaseError('multicall results mismatch')
-  return results as MulticallResults<contracts, allowFailure>
+  return results as MulticallReturnType<contracts, allowFailure>
 }

package/actions/public/readContract.ts

@@ -10,6 +10,7 @@ import type {
   ContractFunctionParameters,
   ContractFunctionReturnType,
 } from '../../types/contract.js'
+import type { UnionEvaluate } from '../../types/utils.js'
 import { decodeFunctionResult } from '../../utils/abi/decodeFunctionResult.js'
 import { encodeFunctionData } from '../../utils/abi/encodeFunctionData.js'
 import { getContractError } from '../../utils/errors/getContractError.js'
@@ -26,7 +27,9 @@ export type ReadContractParameters<
     'pure' | 'view',
     functionName
   > = ContractFunctionArgs<abi, 'pure' | 'view', functionName>,
-> = Pick<CallParameters, 'account' | 'blockNumber' | 'blockTag'> &
+> = UnionEvaluate<
+  Pick<CallParameters, 'account' | 'blockNumber' | 'blockTag'>
+> &
   ContractFunctionParameters<abi, 'pure' | 'view', functionName, args>
 
 export type ReadContractReturnType<

package/actions/public/waitForTransactionReceipt.ts

@@ -146,7 +146,11 @@ export async function waitForTransactionReceipt<
               // If we already have a valid receipt, let's check if we have enough
               // confirmations. If we do, then we can resolve.
               if (receipt) {
-                if (blockNumber - receipt.blockNumber + 1n < confirmations)
+                if (
+                  confirmations > 1 &&
+                  (!receipt.blockNumber ||
+                    blockNumber - receipt.blockNumber + 1n < confirmations)
+                )
                   return
 
                 done(() => emit.resolve(receipt))
@@ -178,8 +182,9 @@ export async function waitForTransactionReceipt<
 
               // Check if we have enough confirmations. If not, continue polling.
               if (
-                confirmations > 0 &&
-                blockNumber - receipt.blockNumber + 1n < confirmations
+                confirmations > 1 &&
+                (!receipt.blockNumber ||
+                  blockNumber - receipt.blockNumber + 1n < confirmations)
               )
                 return
 
@@ -218,7 +223,11 @@ export async function waitForTransactionReceipt<
                   })
 
                   // Check if we have enough confirmations. If not, continue polling.
-                  if (blockNumber - receipt.blockNumber + 1n < confirmations)
+                  if (
+                    confirmations > 1 &&
+                    (!receipt.blockNumber ||
+                      blockNumber - receipt.blockNumber + 1n < confirmations)
+                  )
                     return
 
                   let reason: ReplacementReason = 'replaced'

package/actions/public/watchContractEvent.ts

@@ -1,4 +1,4 @@
-import type { Abi, AbiEvent, Address, ExtractAbiEvent } from 'abitype'
+import type { Abi, Address, ExtractAbiEvent } from 'abitype'
 
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
@@ -21,18 +21,17 @@ import {
   type EncodeEventTopicsParameters,
   encodeEventTopics,
 } from '../../utils/abi/encodeEventTopics.js'
-import {
-  type GetAbiItemParameters,
-  getAbiItem,
-} from '../../utils/abi/getAbiItem.js'
 import { formatLog } from '../../utils/formatters/log.js'
 import { observe } from '../../utils/observe.js'
 import { poll } from '../../utils/poll.js'
 import { stringify } from '../../utils/stringify.js'
 import { createContractEventFilter } from './createContractEventFilter.js'
 import { getBlockNumber } from './getBlockNumber.js'
+import {
+  type GetContractEventsParameters,
+  getContractEvents,
+} from './getContractEvents.js'
 import { getFilterChanges } from './getFilterChanges.js'
-import { getLogs } from './getLogs.js'
 import { uninstallFilter } from './uninstallFilter.js'
 
 export type WatchContractEventOnLogsParameter<
@@ -85,7 +84,7 @@ export type WatchContractEventParameters<
    * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
    * @default false
    */
-  strict?: strict | undefined
+  strict?: strict | boolean | undefined
 } & GetPollOptions<transport>
 
 export type WatchContractEventReturnType = () => void
@@ -194,16 +193,14 @@ export function watchContractEvent<
               // If the block number doesn't exist, we are yet to reach the first poll interval,
               // so do not emit any logs.
               if (previousBlockNumber && previousBlockNumber !== blockNumber) {
-                logs = await getLogs(client, {
+                logs = await getContractEvents(client, {
+                  abi,
                   address,
                   args: args as any,
                   fromBlock: previousBlockNumber + 1n,
                   toBlock: blockNumber,
-                  event: getAbiItem({
-                    abi,
-                    name: eventName,
-                  } as unknown as GetAbiItemParameters) as AbiEvent,
-                })
+                  strict,
+                } as {} as GetContractEventsParameters)
               } else {
                 logs = []
               }

package/actions/wallet/signTypedData.ts

@@ -20,8 +20,10 @@ export type SignTypedDataParameters<
   typedData extends TypedData | Record<string, unknown> = TypedData,
   primaryType extends keyof typedData | 'EIP712Domain' = keyof typedData,
   account extends Account | undefined = undefined,
-> = TypedDataDefinition<typedData, primaryType> &
-  ([account] extends [never] ? unknown : GetAccountParameter<account>)
+  ///
+  primaryTypes = typedData extends TypedData ? keyof typedData : string,
+> = TypedDataDefinition<typedData, primaryType, primaryTypes> &
+  GetAccountParameter<account>
 
 export type SignTypedDataReturnType = Hex
 

package/actions/wallet/writeContract.ts

@@ -12,7 +12,7 @@ import type {
   GetValue,
 } from '../../types/contract.js'
 import type { Hex } from '../../types/misc.js'
-import type { UnionOmit } from '../../types/utils.js'
+import type { Prettify, UnionEvaluate, UnionOmit } from '../../types/utils.js'
 import { encodeFunctionData } from '../../utils/abi/encodeFunctionData.js'
 import type { FormattedTransactionRequest } from '../../utils/formatters/transactionRequest.js'
 import {
@@ -35,34 +35,41 @@ export type WriteContractParameters<
   chain extends Chain | undefined = Chain,
   account extends Account | undefined = Account | undefined,
   chainOverride extends Chain | undefined = Chain | undefined,
+  ///
+  allFunctionNames = ContractFunctionName<abi, 'nonpayable' | 'payable'>,
 > = ContractFunctionParameters<
   abi,
   'nonpayable' | 'payable',
   functionName,
-  args
+  args,
+  allFunctionNames
 > &
-  UnionOmit<
-    FormattedTransactionRequest<
-      chainOverride extends Chain ? chainOverride : chain
-    >,
-    'data' | 'from' | 'to' | 'value'
+  Prettify<
+    GetAccountParameter<account> &
+      GetChain<chain, chainOverride> &
+      GetValue<
+        abi,
+        functionName,
+        SendTransactionParameters<
+          chain,
+          account,
+          chainOverride
+        > extends SendTransactionParameters
+          ? SendTransactionParameters<chain, account, chainOverride>['value']
+          : SendTransactionParameters['value']
+      > & {
+        /** Data to append to the end of the calldata. Useful for adding a ["domain" tag](https://opensea.notion.site/opensea/Seaport-Order-Attributions-ec2d69bf455041a5baa490941aad307f). */
+        dataSuffix?: Hex
+      }
   > &
-  GetAccountParameter<account> &
-  GetChain<chain, chainOverride> &
-  GetValue<
-    abi,
-    functionName,
-    SendTransactionParameters<
-      chain,
-      account,
-      chainOverride
-    > extends SendTransactionParameters
-      ? SendTransactionParameters<chain, account, chainOverride>['value']
-      : SendTransactionParameters['value']
-  > & {
-    /** Data to append to the end of the calldata. Useful for adding a ["domain" tag](https://opensea.notion.site/opensea/Seaport-Order-Attributions-ec2d69bf455041a5baa490941aad307f). */
-    dataSuffix?: Hex
-  }
+  UnionEvaluate<
+    UnionOmit<
+      FormattedTransactionRequest<
+        chainOverride extends Chain ? chainOverride : chain
+      >,
+      'data' | 'from' | 'to' | 'value'
+    >
+  >
 
 export type WriteContractReturnType = SendTransactionReturnType