viem 0.0.0-w-20230829165118 → 0.0.0-w-20230904201641

package/dist/types/utils/signature/verifyMessage.d.ts

@@ -1,10 +1,10 @@
 import type { Address } from 'abitype';
-import type { ByteArray, Hex } from '../../types/misc.js';
+import type { ByteArray, Hex, SignableMessage } from '../../types/misc.js';
 export type VerifyMessageParameters = {
     /** The address that signed the original message. */
     address: Address;
     /** The message to be verified. */
-    message: string;
+    message: SignableMessage;
     /** The signature that was generated by signing the message with the address's private key. */
     signature: Hex | ByteArray;
 };

package/dist/types/utils/signature/verifyMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verifyMessage.d.ts","sourceRoot":"","sources":["../../../../src/utils/signature/verifyMessage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAMzD,MAAM,MAAM,uBAAuB,GAAG;IACpC,oDAAoD;IACpD,OAAO,EAAE,OAAO,CAAA;IAChB,kCAAkC;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,8FAA8F;IAC9F,SAAS,EAAE,GAAG,GAAG,SAAS,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAA;AAE7C;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAO,EACP,OAAO,EACP,SAAS,GACV,EAAE,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAK5D"}
+{"version":3,"file":"verifyMessage.d.ts","sourceRoot":"","sources":["../../../../src/utils/signature/verifyMessage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAM1E,MAAM,MAAM,uBAAuB,GAAG;IACpC,oDAAoD;IACpD,OAAO,EAAE,OAAO,CAAA;IAChB,kCAAkC;IAClC,OAAO,EAAE,eAAe,CAAA;IACxB,8FAA8F;IAC9F,SAAS,EAAE,GAAG,GAAG,SAAS,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAA;AAE7C;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAO,EACP,OAAO,EACP,SAAS,GACV,EAAE,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAK5D"}

package/dist/types/utils/typedData.d.ts

@@ -1,4 +1,11 @@
-import type { TypedData } from 'abitype';
+import type { TypedData, TypedDataDomain, TypedDataParameter } from 'abitype';
+import type { Hex } from '../types/misc.js';
 import type { TypedDataDefinition } from '../types/typedData.js';
 export declare function validateTypedData<const typedData extends TypedData | Record<string, unknown>, primaryType extends keyof typedData | 'EIP712Domain'>(parameters: TypedDataDefinition<typedData, primaryType>): void;
+export declare function getTypesForEIP712Domain({ domain, }: {
+    domain?: TypedDataDomain;
+}): TypedDataParameter[];
+export declare function domainSeparator({ domain }: {
+    domain: TypedDataDomain;
+}): Hex;
 //# sourceMappingURL=typedData.d.ts.map

package/dist/types/utils/typedData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typedData.d.ts","sourceRoot":"","sources":["../../../src/utils/typedData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAsB,MAAM,SAAS,CAAA;AAK5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAOhE,wBAAgB,iBAAiB,CAC/B,KAAK,CAAC,SAAS,SAAS,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,WAAW,SAAS,MAAM,SAAS,GAAG,cAAc,EACpD,UAAU,EAAE,mBAAmB,CAAC,SAAS,EAAE,WAAW,CAAC,QAoDxD"}
+{"version":3,"file":"typedData.d.ts","sourceRoot":"","sources":["../../../src/utils/typedData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAI7E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAQhE,wBAAgB,iBAAiB,CAC/B,KAAK,CAAC,SAAS,SAAS,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,WAAW,SAAS,MAAM,SAAS,GAAG,cAAc,EACpD,UAAU,EAAE,mBAAmB,CAAC,SAAS,EAAE,WAAW,CAAC,QAoDxD;AAED,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,GACP,EAAE;IAAE,MAAM,CAAC,EAAE,eAAe,CAAA;CAAE,GAAG,kBAAkB,EAAE,CAcrD;AAED,wBAAgB,eAAe,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,GAAG,GAAG,CAO5E"}

package/package.json

@@ -2,15 +2,15 @@
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
   "dependencies": {
-    "@adraffy/ens-normalize": "1.9.0",
-    "@noble/curves": "1.1.0",
-    "@noble/hashes": "1.3.0",
-    "@scure/bip32": "1.3.0",
-    "@scure/bip39": "1.2.0",
-    "@types/ws": "8.5.4",
+    "@adraffy/ens-normalize": "1.9.4",
+    "@noble/curves": "1.2.0",
+    "@noble/hashes": "1.3.2",
+    "@scure/bip32": "1.3.2",
+    "@scure/bip39": "1.2.1",
+    "@types/ws": "^8.5.5",
     "abitype": "0.9.8",
     "isomorphic-ws": "5.0.0",
-    "ws": "8.12.0"
+    "ws": "8.13.0"
   },
   "peerDependencies": {
     "typescript": ">=5.0.4"
@@ -20,7 +20,7 @@
       "optional": true
     }
   },
-  "version": "0.0.0-w-20230829165118",
+  "version": "0.0.0-w-20230904201641",
   "files": [
     "dist",
     "!dist/**/*.tsbuildinfo",

package/src/accounts/index.ts

@@ -1,5 +1,15 @@
 export type { Address } from 'abitype'
 export { HDKey } from '@scure/bip32'
+export { wordlist as czech } from '@scure/bip39/wordlists/czech'
+export { wordlist as english } from '@scure/bip39/wordlists/english'
+export { wordlist as french } from '@scure/bip39/wordlists/french'
+export { wordlist as italian } from '@scure/bip39/wordlists/italian'
+export { wordlist as japanese } from '@scure/bip39/wordlists/japanese'
+export { wordlist as korean } from '@scure/bip39/wordlists/korean'
+export { wordlist as simplifiedChinese } from '@scure/bip39/wordlists/simplified-chinese'
+export { wordlist as spanish } from '@scure/bip39/wordlists/spanish'
+export { wordlist as traditionalChinese } from '@scure/bip39/wordlists/traditional-chinese'
+
 export { generateMnemonic } from './generateMnemonic.js'
 export { generatePrivateKey } from './generatePrivateKey.js'
 export { hdKeyToAccount } from './hdKeyToAccount.js'
@@ -36,12 +46,3 @@ export {
 export { parseAccount } from './utils/parseAccount.js'
 export { publicKeyToAddress } from './utils/publicKeyToAddress.js'
 export { privateKeyToAddress } from './utils/privateKeyToAddress.js'
-export { czech } from './wordlists/czech.js'
-export { english } from './wordlists/english.js'
-export { french } from './wordlists/french.js'
-export { italian } from './wordlists/italian.js'
-export { japanese } from './wordlists/japanese.js'
-export { korean } from './wordlists/korean.js'
-export { simplifiedChinese } from './wordlists/simplifiedChinese.js'
-export { spanish } from './wordlists/spanish.js'
-export { traditionalChinese } from './wordlists/traditionalChinese.js'

package/src/actions/getContract.ts

@@ -17,6 +17,7 @@ import type { Transport } from '../clients/transports/createTransport.js'
 import type { Chain } from '../types/chain.js'
 import type {
   AbiEventParametersToPrimitiveTypes,
+  ContractEventName,
   ContractFunctionArgs,
   ContractFunctionName,
   MaybeExtractEventArgsFromAbi,
@@ -297,7 +298,9 @@ export type GetContractReturnType<
                   [EventName in _EventNames]: GetWatchEvent<
                     _Narrowable,
                     TAbi,
-                    EventName
+                    EventName extends ContractEventName<TAbi>
+                      ? EventName
+                      : never
                   >
                 }
               })
@@ -950,7 +953,7 @@ type GetEventFilter<
 type GetWatchEvent<
   Narrowable extends boolean,
   TAbi extends Abi | readonly unknown[],
-  TEventName extends string,
+  TEventName extends ContractEventName<TAbi>,
   TAbiEvent extends AbiEvent = TAbi extends Abi
     ? ExtractAbiEvent<TAbi, TEventName>
     : AbiEvent,

package/src/actions/public/call.ts

@@ -89,7 +89,7 @@ export async function call<TChain extends Chain | undefined>(
   args: CallParameters<TChain>,
 ): Promise<CallReturnType> {
   const {
-    account: account_,
+    account: account_ = client.account,
     batch = Boolean(client.batch?.multicall),
     blockNumber,
     blockTag = 'latest',

package/src/actions/public/getLogs.ts

@@ -1,4 +1,4 @@
-import type { Abi, AbiEvent, Address } from 'abitype'
+import type { AbiEvent, Address } from 'abitype'
 
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
@@ -191,9 +191,9 @@ export async function getLogs<
       try {
         const { eventName, args } = events
           ? decodeEventLog({
-              abi: events as Abi,
+              abi: events,
               data: log.data,
-              topics: log.topics as any,
+              topics: log.topics,
               strict,
             })
           : { eventName: undefined, args: undefined }

package/src/actions/public/multicall.ts

@@ -4,7 +4,7 @@ import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import { multicall3Abi } from '../../constants/abis.js'
 import { AbiDecodingZeroDataError } from '../../errors/abi.js'
-import type { BaseError } from '../../errors/base.js'
+import { BaseError } from '../../errors/base.js'
 import { RawContractError } from '../../errors/contract.js'
 import type { Chain } from '../../types/chain.js'
 import type { ContractFunctionParameters } from '../../types/contract.js'
@@ -138,8 +138,17 @@ export async function multicall<
     const { abi, address, args, functionName } = contracts[i]
     try {
       const callData = encodeFunctionData({ abi, args, functionName })
-      currentChunkSize += callData.length
-      if (batchSize > 0 && currentChunkSize > batchSize) {
+
+      currentChunkSize += (callData.length - 2) / 2
+      // Check to see if we need to create a new chunk.
+      if (
+        // Check if batching is enabled.
+        batchSize > 0 &&
+        // Check if the current size of the batch exceeds the size limit.
+        currentChunkSize > batchSize &&
+        // Check if the current chunk is not already empty.
+        chunkedCalls[currentChunk].length > 0
+      ) {
         currentChunk++
         currentChunkSize = (callData.length - 2) / 2
         chunkedCalls[currentChunk] = []
@@ -173,7 +182,7 @@ export async function multicall<
     }
   }
 
-  const results = await Promise.all(
+  const aggregate3Results = await Promise.allSettled(
     chunkedCalls.map((calls) =>
       readContract(client, {
         abi: multicall3Abi,
@@ -186,30 +195,64 @@ export async function multicall<
     ),
   )
 
-  return results.flat().map(({ returnData, success }, i) => {
-    const calls = chunkedCalls.flat()
-    const { callData } = calls[i]
-    const { abi, address, functionName, args } = contracts[i]
-    try {
-      if (callData === '0x') throw new AbiDecodingZeroDataError()
-      if (!success) throw new RawContractError({ data: returnData })
-      const result = decodeFunctionResult({
-        abi,
-        args,
-        data: returnData,
-        functionName,
-      })
-      return allowFailure ? { result, status: 'success' } : result
-    } catch (err) {
-      const error = getContractError(err as BaseError, {
-        abi,
-        address,
-        args,
-        docsPath: '/docs/contract/multicall',
-        functionName,
-      })
-      if (!allowFailure) throw error
-      return { error, result: undefined, status: 'failure' }
+  const results = []
+  for (let i = 0; i < aggregate3Results.length; i++) {
+    const result = aggregate3Results[i]
+
+    // If an error occurred in a `readContract` invocation (ie. network error),
+    // then append the failure reason to each contract result.
+    if (result.status === 'rejected') {
+      if (!allowFailure) throw result.reason
+      for (let j = 0; j < chunkedCalls[i].length; j++) {
+        results.push({
+          status: 'failure',
+          error: result.reason,
+          result: undefined,
+        })
+      }
+      continue
+    }
+
+    // If the `readContract` call was successful, then decode the results.
+    const aggregate3Result = result.value
+    for (let j = 0; j < aggregate3Result.length; j++) {
+      // Extract the response from `readContract`
+      const { returnData, success } = aggregate3Result[j]
+
+      // Extract the request call data from the original call.
+      const { callData } = chunkedCalls[i][j]
+
+      // Extract the contract config for this call from the `contracts` argument
+      // for decoding.
+      const { abi, address, functionName, args } = contracts[
+        results.length
+      ] as ContractFunctionParameters
+
+      try {
+        if (callData === '0x') throw new AbiDecodingZeroDataError()
+        if (!success) throw new RawContractError({ data: returnData })
+        const result = decodeFunctionResult({
+          abi,
+          args,
+          data: returnData,
+          functionName,
+        })
+        results.push(allowFailure ? { result, status: 'success' } : result)
+      } catch (err) {
+        const error = getContractError(err as BaseError, {
+          abi,
+          address,
+          args,
+          docsPath: '/docs/contract/multicall',
+          functionName,
+        })
+        if (!allowFailure) throw error
+        results.push({ error, result: undefined, status: 'failure' })
+      }
     }
-  }) as MulticallResults<contracts, allowFailure>
+  }
+
+  if (results.length !== contracts.length)
+    throw new BaseError('multicall results mismatch')
+  return results as MulticallResults<contracts, allowFailure>
 }

package/src/actions/public/watchContractEvent.ts

@@ -3,7 +3,10 @@ import type { Abi, AbiEvent, Address, ExtractAbiEvent } from 'abitype'
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
-import type { GetEventArgs, InferEventName } from '../../types/contract.js'
+import type {
+  ContractEventArgs,
+  ContractEventName,
+} from '../../types/contract.js'
 import type { Filter } from '../../types/filter.js'
 import type { Log } from '../../types/log.js'
 import type { GetTransportConfig } from '../../types/transport.js'
@@ -37,74 +40,75 @@ import { getFilterChanges } from './getFilterChanges.js'
 import { getLogs } from './getLogs.js'
 import { uninstallFilter } from './uninstallFilter.js'
 
-type PollOptions = {
-  /**
-   * Whether or not the transaction hashes should be batched on each invocation.
-   * @default true
-   */
-  batch?: boolean
-  /**
-   * Polling frequency (in ms). Defaults to Client's pollingInterval config.
-   * @default client.pollingInterval
-   */
-  pollingInterval?: number
-}
-
 export type WatchContractEventOnLogsParameter<
-  TAbi extends Abi | readonly unknown[] = readonly unknown[],
-  TEventName extends string = string,
-  TStrict extends boolean | undefined = undefined,
-> = TAbi extends Abi
-  ? Log<bigint, number, false, ExtractAbiEvent<TAbi, TEventName>, TStrict>[]
+  abi extends Abi | readonly unknown[] = Abi,
+  eventName extends ContractEventName<abi> = ContractEventName<abi>,
+  strict extends boolean | undefined = undefined,
+> = abi extends Abi
+  ? Abi extends abi
+    ? Log[]
+    : Log<bigint, number, false, ExtractAbiEvent<abi, eventName>, strict>[]
   : Log[]
+
 export type WatchContractEventOnLogsFn<
-  TAbi extends Abi | readonly unknown[] = readonly unknown[],
-  TEventName extends string = string,
-  TStrict extends boolean | undefined = undefined,
-> = (logs: WatchContractEventOnLogsParameter<TAbi, TEventName, TStrict>) => void
+  abi extends Abi | readonly unknown[] = Abi,
+  eventName extends ContractEventName<abi> = ContractEventName<abi>,
+  strict extends boolean | undefined = undefined,
+> = (logs: WatchContractEventOnLogsParameter<abi, eventName, strict>) => void
 
 export type WatchContractEventParameters<
-  TAbi extends Abi | readonly unknown[] = readonly unknown[],
-  TEventName extends string = string,
-  TStrict extends boolean | undefined = undefined,
+  abi extends Abi | readonly unknown[] = Abi,
+  eventName extends ContractEventName<abi> = ContractEventName<abi>,
+  strict extends boolean | undefined = undefined,
 > = {
   /** The address of the contract. */
-  address?: Address | Address[]
+  address?: Address | Address[] | undefined
   /** Contract ABI. */
-  abi: TAbi
-  args?: GetEventArgs<TAbi, TEventName>
+  abi: abi
+  args?: ContractEventArgs<abi, eventName> | undefined
   /** Contract event. */
-  eventName?: InferEventName<TAbi, TEventName>
+  eventName?: eventName | ContractEventName<abi> | undefined
   /** The callback to call when an error occurred when trying to get for a new block. */
-  onError?: (error: Error) => void
+  onError?: ((error: Error) => void) | undefined
   /** The callback to call when new event logs are received. */
-  onLogs: WatchContractEventOnLogsFn<TAbi, TEventName, TStrict>
+  onLogs: WatchContractEventOnLogsFn<abi, eventName, strict>
   /**
    * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
    * @default false
    */
-  strict?: TStrict
+  strict?: strict | undefined
 } & (GetTransportConfig<Transport>['type'] extends 'webSocket'
   ?
       | {
-          batch?: never
+          batch?: undefined
           /**
            * Whether or not the WebSocket Transport should poll the JSON-RPC, rather than using `eth_subscribe`.
            * @default false
            */
-          poll?: false
-          pollingInterval?: never
+          poll?: false | undefined
+          pollingInterval?: undefined
         }
       | (PollOptions & {
           /**
            * Whether or not the WebSocket Transport should poll the JSON-RPC, rather than using `eth_subscribe`.
            * @default true
            */
-          poll?: true
+          poll?: true | undefined
         })
-  : PollOptions & {
-      poll?: true
-    })
+  : PollOptions & { poll?: true | undefined })
+
+type PollOptions = {
+  /**
+   * Whether or not the transaction hashes should be batched on each invocation.
+   * @default true
+   */
+  batch?: boolean | undefined
+  /**
+   * Polling frequency (in ms). Defaults to Client's pollingInterval config.
+   * @default client.pollingInterval
+   */
+  pollingInterval?: number | undefined
+}
 
 export type WatchContractEventReturnType = () => void
 
@@ -139,13 +143,15 @@ export type WatchContractEventReturnType = () => void
  * })
  */
 export function watchContractEvent<
-  TChain extends Chain | undefined,
-  const TAbi extends Abi | readonly unknown[],
-  TEventName extends string,
-  TStrict extends boolean | undefined = undefined,
+  chain extends Chain | undefined,
+  const abi extends Abi | readonly unknown[],
+  eventName extends ContractEventName<abi>,
+  strict extends boolean | undefined = undefined,
 >(
-  client: Client<Transport, TChain>,
-  {
+  client: Client<Transport, chain>,
+  parameters: WatchContractEventParameters<abi, eventName, strict>,
+): WatchContractEventReturnType {
+  const {
     abi,
     address,
     args,
@@ -156,8 +162,8 @@ export function watchContractEvent<
     poll: poll_,
     pollingInterval = client.pollingInterval,
     strict: strict_,
-  }: WatchContractEventParameters<TAbi, TEventName, TStrict>,
-): WatchContractEventReturnType {
+  } = parameters
+
   const enablePolling =
     typeof poll_ !== 'undefined' ? poll_ : client.transport.type !== 'webSocket'
 
@@ -175,7 +181,7 @@ export function watchContractEvent<
 
     return observe(observerId, { onLogs, onError }, (emit) => {
       let previousBlockNumber: bigint
-      let filter: Filter<'event', TAbi, TEventName> | undefined
+      let filter: Filter<'event', abi, eventName> | undefined
       let initialized = false
 
       const unwatch = poll(
@@ -190,8 +196,8 @@ export function watchContractEvent<
                 strict,
               } as unknown as CreateContractEventFilterParameters)) as Filter<
                 'event',
-                TAbi,
-                TEventName
+                abi,
+                eventName
               >
             } catch {}
             initialized = true
@@ -215,7 +221,7 @@ export function watchContractEvent<
               if (previousBlockNumber && previousBlockNumber !== blockNumber) {
                 logs = await getLogs(client, {
                   address,
-                  args,
+                  args: args as any,
                   fromBlock: previousBlockNumber + 1n,
                   toBlock: blockNumber,
                   event: getAbiItem({

package/src/actions/public/watchEvent.ts

@@ -1,4 +1,4 @@
-import type { Abi, AbiEvent, Address } from 'abitype'
+import type { AbiEvent, Address } from 'abitype'
 
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
@@ -312,15 +312,12 @@ export function watchEvent<
             const log = data.result
             try {
               const { eventName, args } = decodeEventLog({
-                abi: events_ as Abi,
+                abi: events_ ?? [],
                 data: log.data,
-                topics: log.topics as any,
+                topics: log.topics,
                 strict,
               })
-              const formatted = formatLog(log, {
-                args,
-                eventName: eventName as string,
-              })
+              const formatted = formatLog(log, { args, eventName })
               onLogs([formatted] as any)
             } catch (err) {
               let eventName

package/src/actions/wallet/deployContract.ts

@@ -5,9 +5,9 @@ import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
 import type { GetChain } from '../../types/chain.js'
-import type { GetConstructorArgs } from '../../types/contract.js'
+import type { ContractConstructorArgs } from '../../types/contract.js'
 import type { Hex } from '../../types/misc.js'
-import type { UnionOmit } from '../../types/utils.js'
+import type { UnionEvaluate, UnionOmit } from '../../types/utils.js'
 import { encodeDeployData } from '../../utils/abi/encodeDeployData.js'
 
 import {
@@ -17,18 +17,25 @@ import {
 } from './sendTransaction.js'
 
 export type DeployContractParameters<
-  TAbi extends Abi | readonly unknown[] = Abi,
-  TChain extends Chain | undefined = Chain | undefined,
-  TAccount extends Account | undefined = Account | undefined,
-  TChainOverride extends Chain | undefined = Chain | undefined,
+  abi extends Abi | readonly unknown[] = Abi,
+  chain extends Chain | undefined = Chain | undefined,
+  account extends Account | undefined = Account | undefined,
+  chainOverride extends Chain | undefined = Chain | undefined,
+  ///
+  allArgs = ContractConstructorArgs<abi>,
 > = UnionOmit<
-  SendTransactionParameters<TChain, TAccount, TChainOverride>,
+  SendTransactionParameters<chain, account, chainOverride>,
   'accessList' | 'chain' | 'to' | 'data'
-> & {
-  abi: TAbi
-  bytecode: Hex
-} & GetChain<TChain, TChainOverride> &
-  GetConstructorArgs<TAbi>
+> &
+  GetChain<chain, chainOverride> &
+  UnionEvaluate<
+    readonly [] extends allArgs
+      ? { args?: allArgs | undefined }
+      : { args: allArgs }
+  > & {
+    abi: abi
+    bytecode: Hex
+  }
 
 export type DeployContractReturnType = SendTransactionReturnType
 
@@ -60,31 +67,19 @@ export type DeployContractReturnType = SendTransactionReturnType
  * })
  */
 export function deployContract<
-  const TAbi extends Abi | readonly unknown[],
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
-  TChainOverride extends Chain | undefined,
+  const abi extends Abi | readonly unknown[],
+  chain extends Chain | undefined,
+  account extends Account | undefined,
+  chainOverride extends Chain | undefined,
 >(
-  walletClient: Client<Transport, TChain, TAccount>,
-  {
-    abi,
-    args,
-    bytecode,
-    ...request
-  }: DeployContractParameters<TAbi, TChain, TAccount, TChainOverride>,
+  walletClient: Client<Transport, chain, account>,
+  parameters: DeployContractParameters<abi, chain, account, chainOverride>,
 ): Promise<DeployContractReturnType> {
-  const calldata = encodeDeployData({
-    abi,
-    args,
-    bytecode,
-  } as unknown as DeployContractParameters<
-    TAbi,
-    TChain,
-    TAccount,
-    TChainOverride
-  >)
+  const { abi, args, bytecode, ...request } =
+    parameters as DeployContractParameters
+  const calldata = encodeDeployData({ abi, args, bytecode })
   return sendTransaction(walletClient, {
     ...request,
     data: calldata,
-  } as unknown as SendTransactionParameters<TChain, TAccount, TChainOverride>)
+  } as unknown as SendTransactionParameters<chain, account, chainOverride>)
 }

package/src/actions/wallet/prepareTransactionRequest.ts

@@ -41,11 +41,8 @@ export type PrepareTransactionRequestReturnType<
   TChain extends Chain | undefined = Chain | undefined,
   TAccount extends Account | undefined = Account | undefined,
   TChainOverride extends Chain | undefined = Chain | undefined,
-> = UnionOmit<
-  FormattedTransactionRequest<
-    TChainOverride extends Chain ? TChainOverride : TChain
-  >,
-  'from'
+> = FormattedTransactionRequest<
+  TChainOverride extends Chain ? TChainOverride : TChain
 > &
   GetAccountParameter<TAccount> &
   GetChain<TChain, TChainOverride>
@@ -171,7 +168,7 @@ export async function prepareTransactionRequest<
 
   assertRequest(request as AssertRequestParameters)
 
-  return request as PrepareTransactionRequestReturnType<
+  return request as unknown as PrepareTransactionRequestReturnType<
     TChain,
     TAccount,
     TChainOverride

package/src/actions/wallet/signTypedData.ts

@@ -11,7 +11,10 @@ import type { Hex } from '../../types/misc.js'
 import type { TypedDataDefinition } from '../../types/typedData.js'
 import { isHex } from '../../utils/data/isHex.js'
 import { stringify } from '../../utils/stringify.js'
-import { validateTypedData } from '../../utils/typedData.js'
+import {
+  getTypesForEIP712Domain,
+  validateTypedData,
+} from '../../utils/typedData.js'
 
 export type SignTypedDataParameters<
   typedData extends TypedData | Record<string, unknown> = TypedData,
@@ -143,19 +146,7 @@ export async function signTypedData<
   const account = parseAccount(account_)
 
   const types = {
-    EIP712Domain: [
-      typeof domain?.name === 'string' && { name: 'name', type: 'string' },
-      domain?.version && { name: 'version', type: 'string' },
-      typeof domain?.chainId === 'number' && {
-        name: 'chainId',
-        type: 'uint256',
-      },
-      domain?.verifyingContract && {
-        name: 'verifyingContract',
-        type: 'address',
-      },
-      domain?.salt && { name: 'salt', type: 'bytes32' },
-    ].filter(Boolean),
+    EIP712Domain: getTypesForEIP712Domain({ domain }),
     ...parameters.types,
   }