viem 0.0.0-w-20230821171049 → 0.0.0-w-20230828183856

package/src/clients/decorators/wallet.ts

@@ -22,6 +22,11 @@ import {
   type GetPermissionsReturnType,
   getPermissions,
 } from '../../actions/wallet/getPermissions.js'
+import {
+  type PrepareTransactionRequestParameters,
+  type PrepareTransactionRequestReturnType,
+  prepareTransactionRequest,
+} from '../../actions/wallet/prepareTransactionRequest.js'
 import {
   type RequestAddressesReturnType,
   requestAddresses,
@@ -31,6 +36,11 @@ import {
   type RequestPermissionsReturnType,
   requestPermissions,
 } from '../../actions/wallet/requestPermissions.js'
+import {
+  type SendRawTransactionParameters,
+  type SendRawTransactionReturnType,
+  sendRawTransaction,
+} from '../../actions/wallet/sendRawTransaction.js'
 import {
   type SendTransactionParameters,
   type SendTransactionReturnType,
@@ -41,6 +51,11 @@ import {
   type SignMessageReturnType,
   signMessage,
 } from '../../actions/wallet/signMessage.js'
+import {
+  type SignTransactionParameters,
+  type SignTransactionReturnType,
+  signTransaction,
+} from '../../actions/wallet/signTransaction.js'
 import {
   type SignTypedDataParameters,
   type SignTypedDataReturnType,
@@ -179,6 +194,47 @@ export type WalletActions<
    * const permissions = await client.getPermissions()
    */
   getPermissions: () => Promise<GetPermissionsReturnType>
+  /**
+   * Prepares a transaction request for signing.
+   *
+   * - Docs: https://viem.sh/docs/actions/wallet/prepareTransactionRequest.html
+   *
+   * @param args - {@link PrepareTransactionRequestParameters}
+   * @returns The transaction request. {@link PrepareTransactionRequestReturnType}
+   *
+   * @example
+   * import { createWalletClient, custom } from 'viem'
+   * import { mainnet } from 'viem/chains'
+   *
+   * const client = createWalletClient({
+   *   chain: mainnet,
+   *   transport: custom(window.ethereum),
+   * })
+   * const request = await client.prepareTransactionRequest({
+   *   account: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
+   *   to: '0x0000000000000000000000000000000000000000',
+   *   value: 1n,
+   * })
+   *
+   * @example
+   * // Account Hoisting
+   * import { createWalletClient, http } from 'viem'
+   * import { privateKeyToAccount } from 'viem/accounts'
+   * import { mainnet } from 'viem/chains'
+   *
+   * const client = createWalletClient({
+   *   account: privateKeyToAccount('0x…'),
+   *   chain: mainnet,
+   *   transport: custom(window.ethereum),
+   * })
+   * const request = await client.prepareTransactionRequest({
+   *   to: '0x0000000000000000000000000000000000000000',
+   *   value: 1n,
+   * })
+   */
+  prepareTransactionRequest: <TChainOverride extends Chain | undefined,>(
+    args: PrepareTransactionRequestParameters<TChain, TAccount, TChainOverride>,
+  ) => Promise<PrepareTransactionRequestReturnType>
   /**
    * Requests a list of accounts managed by a wallet.
    *
@@ -226,6 +282,33 @@ export type WalletActions<
   requestPermissions: (
     args: RequestPermissionsParameters,
   ) => Promise<RequestPermissionsReturnType>
+  /**
+   * Sends a **signed** transaction to the network
+   *
+   * - Docs: https://viem.sh/docs/actions/wallet/sendRawTransaction.html
+   * - JSON-RPC Method: [`eth_sendRawTransaction`](https://ethereum.github.io/execution-apis/api-documentation/)
+   *
+   * @param client - Client to use
+   * @param parameters - {@link SendRawTransactionParameters}
+   * @returns The transaction hash. {@link SendRawTransactionReturnType}
+   *
+   * @example
+   * import { createWalletClient, custom } from 'viem'
+   * import { mainnet } from 'viem/chains'
+   * import { sendRawTransaction } from 'viem/wallet'
+   *
+   * const client = createWalletClient({
+   *   chain: mainnet,
+   *   transport: custom(window.ethereum),
+   * })
+   *
+   * const hash = await client.sendRawTransaction({
+   *   serializedTransaction: '0x02f850018203118080825208808080c080a04012522854168b27e5dc3d5839bab5e6b39e1a0ffd343901ce1622e3d64b48f1a04e00902ae0502c4728cbf12156290df99c3ed7de85b1dbfe20b5c36931733a33'
+   * })
+   */
+  sendRawTransaction: (
+    args: SendRawTransactionParameters,
+  ) => Promise<SendRawTransactionReturnType>
   /**
    * Creates, signs, and sends a new transaction to the network.
    *
@@ -317,6 +400,52 @@ export type WalletActions<
   signMessage: (
     args: SignMessageParameters<TAccount>,
   ) => Promise<SignMessageReturnType>
+  /**
+   * Signs a transaction.
+   *
+   * - Docs: https://viem.sh/docs/actions/wallet/signTransaction.html
+   * - JSON-RPC Methods:
+   *   - JSON-RPC Accounts: [`eth_signTransaction`](https://ethereum.github.io/execution-apis/api-documentation/)
+   *   - Local Accounts: Signs locally. No JSON-RPC request.
+   *
+   * @param args - {@link SignTransactionParameters}
+   * @returns The signed message. {@link SignTransactionReturnType}
+   *
+   * @example
+   * import { createWalletClient, custom } from 'viem'
+   * import { mainnet } from 'viem/chains'
+   *
+   * const client = createWalletClient({
+   *   chain: mainnet,
+   *   transport: custom(window.ethereum),
+   * })
+   * const request = await client.prepareTransactionRequest({
+   *   account: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
+   *   to: '0x0000000000000000000000000000000000000000',
+   *   value: 1n,
+   * })
+   * const signature = await client.signTransaction(request)
+   *
+   * @example
+   * // Account Hoisting
+   * import { createWalletClient, http } from 'viem'
+   * import { privateKeyToAccount } from 'viem/accounts'
+   * import { mainnet } from 'viem/chains'
+   *
+   * const client = createWalletClient({
+   *   account: privateKeyToAccount('0x…'),
+   *   chain: mainnet,
+   *   transport: custom(window.ethereum),
+   * })
+   * const request = await client.prepareTransactionRequest({
+   *   to: '0x0000000000000000000000000000000000000000',
+   *   value: 1n,
+   * })
+   * const signature = await client.signTransaction(request)
+   */
+  signTransaction: <TChainOverride extends Chain | undefined,>(
+    args: SignTransactionParameters<TChain, TAccount, TChainOverride>,
+  ) => Promise<SignTransactionReturnType>
   /**
    * Signs typed data and calculates an Ethereum-specific signature in [EIP-191 format](https://eips.ethereum.org/EIPS/eip-191): `keccak256("\x19Ethereum Signed Message:\n" + len(message) + message))`.
    *
@@ -542,10 +671,14 @@ export function walletActions<
     getAddresses: () => getAddresses(client),
     getChainId: () => getChainId(client),
     getPermissions: () => getPermissions(client),
+    prepareTransactionRequest: (args) =>
+      prepareTransactionRequest(client as any, args as any),
     requestAddresses: () => requestAddresses(client),
     requestPermissions: (args) => requestPermissions(client, args),
+    sendRawTransaction: (args) => sendRawTransaction(client, args),
     sendTransaction: (args) => sendTransaction(client, args),
     signMessage: (args) => signMessage(client, args),
+    signTransaction: (args) => signTransaction(client, args),
     signTypedData: (args) => signTypedData(client, args),
     switchChain: (args) => switchChain(client, args),
     watchAsset: (args) => watchAsset(client, args),

package/src/errors/fee.ts

@@ -0,0 +1,27 @@
+import { formatGwei } from '../utils/unit/formatGwei.js'
+import { BaseError } from './base.js'
+
+export class BaseFeeScalarError extends BaseError {
+  override name = 'BaseFeeScalarError'
+  constructor() {
+    super('`baseFeeMultiplier` must be greater than 1.')
+  }
+}
+
+export class Eip1559FeesNotSupportedError extends BaseError {
+  override name = 'Eip1559FeesNotSupportedError'
+  constructor() {
+    super('Chain does not support EIP-1559 fees.')
+  }
+}
+
+export class MaxFeePerGasTooLowError extends BaseError {
+  override name = 'MaxFeePerGasTooLowError'
+  constructor({ maxPriorityFeePerGas }: { maxPriorityFeePerGas: bigint }) {
+    super(
+      `\`maxFeePerGas\` cannot be less than the \`maxPriorityFeePerGas\` (${formatGwei(
+        maxPriorityFeePerGas,
+      )} gwei).`,
+    )
+  }
+}

package/src/errors/rpc.ts

@@ -60,7 +60,7 @@ export type ProviderRpcErrorCode =
   | 4200 // Unsupported Method
   | 4900 // Disconnected
   | 4901 // Chain Disconnected
-  | 4902 // Chain Not Recongnized
+  | 4902 // Chain Not Recognized
 
 /**
  * Error subclass implementing Ethereum Provider errors per EIP-1193.

package/src/index.ts

@@ -71,6 +71,14 @@ export type {
   EstimateGasParameters,
   EstimateGasReturnType,
 } from './actions/public/estimateGas.js'
+export type {
+  EstimateFeesPerGasParameters,
+  EstimateFeesPerGasReturnType,
+} from './actions/public/estimateFeesPerGas.js'
+export type {
+  EstimateMaxPriorityFeePerGasParameters,
+  EstimateMaxPriorityFeePerGasReturnType,
+} from './actions/public/estimateMaxPriorityFeePerGas.js'
 export type { GetAddressesReturnType } from './actions/wallet/getAddresses.js'
 export type {
   GetBalanceParameters,
@@ -202,6 +210,12 @@ export type {
   SendTransactionParameters,
   SendTransactionReturnType,
 } from './actions/wallet/sendTransaction.js'
+export type {
+  PrepareTransactionRequestParameters,
+  PrepareTransactionRequestReturnType,
+  /** @deprecated import `prepareTransactionRequest` from `viem/actions` instead. */
+  prepareTransactionRequest as prepareRequest,
+} from './actions/wallet/prepareTransactionRequest.js'
 export type {
   SendUnsignedTransactionParameters,
   SendUnsignedTransactionReturnType,
@@ -252,6 +266,29 @@ export type {
   WriteContractParameters,
   WriteContractReturnType,
 } from './actions/wallet/writeContract.js'
+export type {
+  Chain,
+  ChainContract,
+  ChainFees,
+  ChainFormatter,
+  /** @deprecated use `ChainFormatter` instead. */
+  ChainFormatter as Formatter,
+  ChainFormatters,
+  /** @deprecated use `ChainFormatters` instead. */
+  ChainFormatters as Formatters,
+  ChainSerializers,
+  /** @deprecated use `ChainSerializers` instead. */
+  ChainSerializers as Serializers,
+  ExtractChainFormatterExclude,
+  /** @deprecated use `ExtractChainFormatterExclude` instead. */
+  ExtractChainFormatterExclude as ExtractFormatterExclude,
+  ExtractChainFormatterParameters,
+  /** @deprecated use `ExtractChainFormatterParameters` instead. */
+  ExtractChainFormatterParameters as ExtractFormatterParameters,
+  ExtractChainFormatterReturnType,
+  /** @deprecated use `ExtractChainFormatterReturnType` instead. */
+  ExtractChainFormatterReturnType as ExtractFormatterReturnType,
+} from './types/chain.js'
 export {
   type Client,
   type ClientConfig,
@@ -442,6 +479,11 @@ export {
   ContractFunctionZeroDataError,
   RawContractError,
 } from './errors/contract.js'
+export {
+  BaseFeeScalarError,
+  Eip1559FeesNotSupportedError,
+  MaxFeePerGasTooLowError,
+} from './errors/fee.js'
 export {
   ChainDisconnectedError,
   InternalRpcError,
@@ -581,32 +623,10 @@ export type {
   Signature,
   SignableMessage,
 } from './types/misc.js'
-export type {
-  Chain,
-  ChainContract,
-  ChainFees,
-  ChainFormatter,
-  /** @deprecated use `ChainFormatter` instead. */
-  ChainFormatter as Formatter,
-  ChainFormatters,
-  /** @deprecated use `ChainFormatters` instead. */
-  ChainFormatters as Formatters,
-  ChainSerializers,
-  /** @deprecated use `ChainSerializers` instead. */
-  ChainSerializers as Serializers,
-  ExtractChainFormatterExclude,
-  /** @deprecated use `ExtractChainFormatterExclude` instead. */
-  ExtractChainFormatterExclude as ExtractFormatterExclude,
-  ExtractChainFormatterParameters,
-  /** @deprecated use `ExtractChainFormatterParameters` instead. */
-  ExtractChainFormatterParameters as ExtractFormatterParameters,
-  ExtractChainFormatterReturnType,
-  /** @deprecated use `ExtractChainFormatterReturnType` instead. */
-  ExtractChainFormatterReturnType as ExtractFormatterReturnType,
-  GetChain,
-} from './types/chain.js'
+export type { GetChain } from './types/chain.js'
 export type {
   AddEthereumChainParameter,
+  EIP1193EventMap,
   EIP1193Events,
   EIP1193Parameters,
   EIP1193Provider,
@@ -630,6 +650,7 @@ export type {
   FeeValues,
   FeeValuesEIP1559,
   FeeValuesLegacy,
+  FeeValuesType,
 } from './types/fee.js'
 export type { Filter } from './types/filter.js'
 export type { TypedDataDefinition } from './types/typedData.js'
@@ -728,6 +749,7 @@ export {
   type FormattedTransactionRequest,
   defineTransactionRequest,
   formatTransactionRequest,
+  rpcTransactionType,
 } from './utils/formatters/transactionRequest.js'
 export {
   type GetAbiItemParameters,
@@ -850,7 +872,6 @@ export { parseEther } from './utils/unit/parseEther.js'
 export { parseGwei } from './utils/unit/parseGwei.js'
 export { parseTransaction } from './utils/transaction/parseTransaction.js'
 export { parseUnits } from './utils/unit/parseUnits.js'
-export { prepareRequest } from './utils/transaction/prepareRequest.js'
 export { serializeAccessList } from './utils/transaction/serializeAccessList.js'
 export {
   serializeTransaction,

package/src/public.ts

@@ -53,6 +53,11 @@ export {
   type GetFeeHistoryParameters,
   type GetFeeHistoryReturnType,
 } from './actions/public/getFeeHistory.js'
+export {
+  estimateFeesPerGas,
+  type EstimateFeesPerGasParameters,
+  type EstimateFeesPerGasReturnType,
+} from './actions/public/estimateFeesPerGas.js'
 export {
   getFilterChanges,
   type GetFilterChangesParameters,
@@ -68,6 +73,11 @@ export {
   getGasPrice,
   type GetGasPriceReturnType,
 } from './actions/public/getGasPrice.js'
+export {
+  estimateMaxPriorityFeePerGas,
+  type EstimateMaxPriorityFeePerGasParameters,
+  type EstimateMaxPriorityFeePerGasReturnType,
+} from './actions/public/estimateMaxPriorityFeePerGas.js'
 export {
   getTransaction,
   type GetTransactionParameters,

package/src/types/chain.ts

@@ -1,13 +1,18 @@
 import type { Address } from 'abitype'
 
-import type { FormattedBlock } from '../utils/formatters/block.js'
-import type { PrepareRequestParameters } from '../utils/transaction/prepareRequest.js'
-import type { SerializeTransactionFn } from '../utils/transaction/serializeTransaction.js'
+import type { EstimateFeesPerGasReturnType } from '../actions/public/estimateFeesPerGas.js'
+import type { PrepareTransactionRequestParameters } from '../actions/wallet/prepareTransactionRequest.js'
+import type { Client } from '../clients/createClient.js'
+import type { Transport } from '../clients/transports/createTransport.js'
+import type { Account } from '../types/account.js'
+import type { FeeValuesType } from '../types/fee.js'
 import type {
   TransactionSerializable,
   TransactionSerializableGeneric,
-} from './transaction.js'
-import type { IsUndefined, Prettify } from './utils.js'
+} from '../types/transaction.js'
+import type { IsUndefined, Prettify } from '../types/utils.js'
+import type { FormattedBlock } from '../utils/formatters/block.js'
+import type { SerializeTransactionFn } from '../utils/transaction/serializeTransaction.js'
 
 export type Chain<
   formatters extends ChainFormatters | undefined = ChainFormatters | undefined,
@@ -16,8 +21,14 @@ export type Chain<
 export type ChainConfig<
   formatters extends ChainFormatters | undefined = ChainFormatters | undefined,
 > = {
+  /**
+   * Modifies how chain data structures (ie. Blocks, Transactions, etc)
+   * are formatted & typed.
+   */
   formatters?: formatters | undefined
+  /** Modifies how data (ie. Transactions) is serialized. */
   serializers?: ChainSerializers<formatters> | undefined
+  /** Modifies how fees are derived. */
   fees?: ChainFees<formatters> | undefined
 }
 
@@ -29,20 +40,42 @@ export type ChainContract = {
 export type ChainFees<
   formatters extends ChainFormatters | undefined = ChainFormatters | undefined,
 > = {
-  defaultPriorityFee:
+  /**
+   * The fee multiplier to use to account for fee fluctuations.
+   * Used in the [`estimateFeesPerGas` Action](/docs/actions/public/estimateFeesPerGas).
+   *
+   * @default 1.2
+   */
+  baseFeeMultiplier?:
+    | number
+    | ((args: ChainFeesFnParameters<formatters>) => Promise<number> | number)
+  /**
+   * The default `maxPriorityFeePerGas` to use when a priority
+   * fee is not defined upon sending a transaction.
+   *
+   * Overrides the return value in the [`estimateMaxPriorityFeePerGas` Action](/docs/actions/public/estimateMaxPriorityFeePerGas).
+   */
+  defaultPriorityFee?:
     | bigint
-    | ((args: {
-        block: Prettify<FormattedBlock<{ formatters: formatters }>>
-        request: PrepareRequestParameters<
-          Omit<Chain, 'formatters'> & { formatters: formatters }
-        >
-      }) => Promise<bigint> | bigint)
+    | ((args: ChainFeesFnParameters<formatters>) => Promise<bigint> | bigint)
+  /**
+   * Allows customization of fee per gas values (e.g. `maxFeePerGas`/`maxPriorityFeePerGas`).
+   *
+   * Overrides the return value in the [`estimateFeesPerGas` Action](/docs/actions/public/estimateFeesPerGas).
+   */
+  estimateFeesPerGas?: (
+    args: ChainEstimateFeesPerGasFnParameters<formatters>,
+  ) => Promise<EstimateFeesPerGasReturnType> | bigint
 }
 
 export type ChainFormatters = {
+  /** Modifies how the Block structure is formatted & typed. */
   block?: ChainFormatter<'block'>
+  /** Modifies how the Transaction structure is formatted & typed. */
   transaction?: ChainFormatter<'transaction'>
+  /** Modifies how the TransactionReceipt structure is formatted & typed. */
   transactionReceipt?: ChainFormatter<'transactionReceipt'>
+  /** Modifies how the TransactionRequest structure is formatted & typed. */
   transactionRequest?: ChainFormatter<'transactionRequest'>
 }
 
@@ -54,6 +87,7 @@ export type ChainFormatter<type extends string = string> = {
 export type ChainSerializers<
   formatters extends ChainFormatters | undefined = undefined,
 > = {
+  /** Modifies how Transactions are serialized. */
   transaction?: SerializeTransactionFn<
     formatters extends ChainFormatters
       ? formatters['transactionRequest'] extends ChainFormatter
@@ -64,6 +98,40 @@ export type ChainSerializers<
   >
 }
 
+/////////////////////////////////////////////////////////////////////
+// Parameters
+
+export type ChainFeesFnParameters<
+  formatters extends ChainFormatters | undefined = ChainFormatters | undefined,
+> = {
+  /** The latest block. */
+  block: Prettify<FormattedBlock<{ formatters: formatters }>>
+  client: Client<Transport, Chain>
+  /**
+   * A transaction request. This value will be undefined if the caller
+   * is outside of a transaction request context (e.g. a direct call to
+   * the `estimateFeesPerGas` Action).
+   */
+  request?: PrepareTransactionRequestParameters<
+    Omit<Chain, 'formatters'> & { formatters: formatters },
+    Account | undefined,
+    undefined
+  >
+}
+
+export type ChainEstimateFeesPerGasFnParameters<
+  formatters extends ChainFormatters | undefined = ChainFormatters | undefined,
+> = {
+  /**
+   * A function to multiply the base fee based on the `baseFeeMultiplier` value.
+   */
+  multiply(x: bigint): bigint
+  /**
+   * The type of fees to return.
+   */
+  type: FeeValuesType
+} & ChainFeesFnParameters<formatters>
+
 /////////////////////////////////////////////////////////////////////
 // Utils
 

package/src/types/contract.ts

@@ -217,9 +217,9 @@ export type GetValue<
   _Narrowable extends boolean = IsNarrowable<TAbi, Abi>,
 > = _Narrowable extends true
   ? TAbiFunction['stateMutability'] extends 'payable'
-    ? { value: NoUndefined<TValueType> }
+    ? { value?: NoUndefined<TValueType> }
     : TAbiFunction['payable'] extends true
-    ? { value: NoUndefined<TValueType> }
+    ? { value?: NoUndefined<TValueType> }
     : { value?: never }
   : { value?: TValueType }
 

package/src/types/eip1193.ts

@@ -51,7 +51,7 @@ export type ProviderMessage = {
   data: unknown
 }
 
-type EIP1193EventMap = {
+export type EIP1193EventMap = {
   accountsChanged(accounts: Address[]): void
   chainChanged(chainId: string): void
   connect(connectInfo: ProviderConnectInfo): void
@@ -571,6 +571,18 @@ export type PublicRpcSchema = [
     Parameters: [block: BlockNumber | BlockTag]
     ReturnType: Quantity
   },
+  /**
+   * @description Returns the current maxPriorityFeePerGas in wei.
+   * @link https://ethereum.github.io/execution-apis/api-documentation/
+   * @example
+   * provider.request({ method: 'eth_maxPriorityFeePerGas' })
+   * // => '0x5f5e100'
+   */
+  {
+    Method: 'eth_maxPriorityFeePerGas'
+    Parameters?: undefined
+    ReturnType: Quantity
+  },
   /**
    * @description Creates a filter to listen for new blocks that can be used with `eth_getFilterChanges`
    * @link https://eips.ethereum.org/EIPS/eip-1474
@@ -627,7 +639,7 @@ export type PublicRpcSchema = [
     ReturnType: string
   },
   /**
-   * @description Sends and already-signed transaction to the network
+   * @description Sends a **signed** transaction to the network
    * @link https://eips.ethereum.org/EIPS/eip-1474
    * @example
    * provider.request({ method: 'eth_sendRawTransaction', params: ['0x...'] })

package/src/types/fee.ts

@@ -31,3 +31,5 @@ export type FeeValuesEIP1559<TQuantity = bigint> = {
 export type FeeValues<TQuantity = bigint> =
   | FeeValuesLegacy<TQuantity>
   | FeeValuesEIP1559<TQuantity>
+
+export type FeeValuesType = 'legacy' | 'eip1559'

package/src/utils/chain.ts

@@ -9,7 +9,7 @@ import type {
   ChainContract,
   ChainFormatters,
 } from '../types/chain.js'
-import type { Assign } from '../types/utils.js'
+import type { Assign, Prettify } from '../types/utils.js'
 
 export type AssertCurrentChainParameters = {
   chain?: Chain
@@ -31,7 +31,7 @@ export function defineChain<
 >(
   chain: chain,
   config: ChainConfig<formatters> = {},
-): Assign<chain, ChainConfig<formatters>> {
+): Prettify<Assign<chain, ChainConfig<formatters>>> {
   const {
     fees = chain.fees,
     formatters = chain.formatters,

package/src/utils/data/isBytesEqual.ts

@@ -1,6 +1,9 @@
-import { type ByteArray, type Hex, isHex, toBytes } from '../../index.js'
 import { equalBytes } from '@noble/curves/abstract/utils'
 
+import type { ByteArray, Hex } from '../../types/misc.js'
+import { toBytes } from '../encoding/toBytes.js'
+import { isHex } from './isHex.js'
+
 export function isBytesEqual(a_: ByteArray | Hex, b_: ByteArray | Hex) {
   const a = isHex(a_) ? toBytes(a_) : a_
   const b = isHex(b_) ? toBytes(b_) : b_

package/src/utils/ens/encodeLabelhash.ts

@@ -1,4 +1,4 @@
-import type { Hex } from '../../index.js'
+import type { Hex } from '../../types/misc.js'
 
 export function encodeLabelhash(hash: Hex): `[${string}]` {
   return `[${hash.slice(2)}]`

package/src/utils/ens/encodedLabelToLabelhash.ts

@@ -1,5 +1,5 @@
-import type { Hex } from '../../index.js'
-import { isHex } from '../index.js'
+import type { Hex } from '../../types/misc.js'
+import { isHex } from '../data/isHex.js'
 
 export function encodedLabelToLabelhash(label: string): Hex | null {
   if (label.length !== 66) return null

package/src/utils/formatters/transactionRequest.ts

@@ -15,6 +15,12 @@ export type FormattedTransactionRequest<
   TransactionRequest
 >
 
+export const rpcTransactionType = {
+  legacy: '0x0',
+  eip2930: '0x1',
+  eip1559: '0x2',
+} as const
+
 export function formatTransactionRequest(
   transactionRequest: Partial<TransactionRequest>,
 ) {
@@ -40,6 +46,10 @@ export function formatTransactionRequest(
       typeof transactionRequest.nonce !== 'undefined'
         ? numberToHex(transactionRequest.nonce)
         : undefined,
+    type:
+      typeof transactionRequest.type !== 'undefined'
+        ? rpcTransactionType[transactionRequest.type]
+        : undefined,
     value:
       typeof transactionRequest.value !== 'undefined'
         ? numberToHex(transactionRequest.value)

package/src/utils/index.ts

@@ -230,7 +230,10 @@ export {
   assertTransactionLegacy,
 } from './transaction/assertTransaction.js'
 export { parseTransaction } from './transaction/parseTransaction.js'
-export { prepareRequest } from './transaction/prepareRequest.js'
+export {
+  /** @deprecated import `prepareTransactionRequest` from `viem/actions` instead. */
+  prepareTransactionRequest,
+} from '../actions/wallet/prepareTransactionRequest.js'
 export {
   serializeTransaction,
   type SerializeTransactionFn,