viem 2.23.15 → 2.24.1

package/types/rpc.ts

@@ -1,6 +1,5 @@
 import type { Address } from 'abitype'
 
-import type { RpcAuthorizationList } from '../experimental/eip7702/types/rpc.js'
 import type {
   Block,
   BlockIdentifier,
@@ -38,6 +37,21 @@ export type TransactionType =
   | '0x4'
   | (string & {})
 
+export type RpcAuthorization = {
+  /** Address of the contract to set as code for the Authority. */
+  address: Address
+  /** Chain ID to authorize. */
+  chainId: Hex
+  /** Nonce of the Authority to authorize. */
+  nonce: Hex
+  /** ECDSA r value. */
+  r: Hex
+  /** ECDSA s value. */
+  s: Hex
+  /** y parity. */
+  yParity: Hex
+}
+export type RpcAuthorizationList = readonly RpcAuthorization[]
 export type RpcBlock<
   blockTag extends BlockTag = BlockTag,
   includeTransactions extends boolean = boolean,

package/types/transaction.ts

@@ -3,7 +3,7 @@ import type { Address } from 'abitype'
 import type {
   AuthorizationList,
   SignedAuthorizationList,
-} from '../experimental/eip7702/types/authorization.js'
+} from './authorization.js'
 import type { BlobSidecar } from './eip4844.js'
 import type {
   FeeValuesEIP1559,

package/{experimental/eip7702/utils → utils/authorization}/hashAuthorization.ts

@@ -1,30 +1,19 @@
-import type { ErrorType } from '../../../errors/utils.js'
-import type { ByteArray, Hex } from '../../../types/misc.js'
-import {
-  type ConcatHexErrorType,
-  concatHex,
-} from '../../../utils/data/concat.js'
-import {
-  type HexToBytesErrorType,
-  hexToBytes,
-} from '../../../utils/encoding/toBytes.js'
-import {
-  type NumberToHexErrorType,
-  numberToHex,
-} from '../../../utils/encoding/toHex.js'
-import { type ToRlpErrorType, toRlp } from '../../../utils/encoding/toRlp.js'
-import {
-  type Keccak256ErrorType,
-  keccak256,
-} from '../../../utils/hash/keccak256.js'
-import type { Authorization } from '../types/authorization.js'
+import type { ErrorType } from '../../errors/utils.js'
+import type { AuthorizationRequest } from '../../types/authorization.js'
+import type { ByteArray, Hex } from '../../types/misc.js'
+import { type ConcatHexErrorType, concatHex } from '../data/concat.js'
+import { type HexToBytesErrorType, hexToBytes } from '../encoding/toBytes.js'
+import { type NumberToHexErrorType, numberToHex } from '../encoding/toHex.js'
+import { type ToRlpErrorType, toRlp } from '../encoding/toRlp.js'
+import { type Keccak256ErrorType, keccak256 } from '../hash/keccak256.js'
 
 type To = 'hex' | 'bytes'
 
-export type HashAuthorizationParameters<to extends To> = Authorization & {
-  /** Output format. @default "hex" */
-  to?: to | To | undefined
-}
+export type HashAuthorizationParameters<to extends To> =
+  AuthorizationRequest & {
+    /** Output format. @default "hex" */
+    to?: to | To | undefined
+  }
 
 export type HashAuthorizationReturnType<to extends To> =
   | (to extends 'bytes' ? ByteArray : never)
@@ -44,13 +33,14 @@ export type HashAuthorizationErrorType =
 export function hashAuthorization<to extends To = 'hex'>(
   parameters: HashAuthorizationParameters<to>,
 ): HashAuthorizationReturnType<to> {
-  const { chainId, contractAddress, nonce, to } = parameters
+  const { chainId, nonce, to } = parameters
+  const address = parameters.contractAddress ?? parameters.address
   const hash = keccak256(
     concatHex([
       '0x05',
       toRlp([
         chainId ? numberToHex(chainId) : '0x',
-        contractAddress,
+        address,
         nonce ? numberToHex(nonce) : '0x',
       ]),
     ]),

package/{experimental/eip7702/utils → utils/authorization}/recoverAuthorizationAddress.ts

@@ -1,25 +1,26 @@
 import type { Address } from 'abitype'
 
-import type { ErrorType } from '../../../errors/utils.js'
-import type { ByteArray, Hex, Signature } from '../../../types/misc.js'
-import type { OneOf } from '../../../types/utils.js'
-import {
-  type RecoverAddressErrorType,
-  recoverAddress,
-} from '../../../utils/signature/recoverAddress.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type {
   Authorization,
+  AuthorizationRequest,
   SignedAuthorization,
-} from '../types/authorization.js'
+} from '../../types/authorization.js'
+import type { ByteArray, Hex, Signature } from '../../types/misc.js'
+import type { OneOf } from '../../types/utils.js'
+import {
+  type RecoverAddressErrorType,
+  recoverAddress,
+} from '../signature/recoverAddress.js'
 import {
   type HashAuthorizationErrorType,
   hashAuthorization,
 } from './hashAuthorization.js'
 
 export type RecoverAuthorizationAddressParameters<
-  authorization extends OneOf<Authorization | SignedAuthorization> = OneOf<
-    Authorization | SignedAuthorization
-  >,
+  authorization extends OneOf<
+    Authorization | AuthorizationRequest | SignedAuthorization
+  > = OneOf<Authorization | AuthorizationRequest | SignedAuthorization>,
   //
   _signature = Hex | ByteArray | OneOf<Signature | SignedAuthorization>,
 > = {
@@ -29,7 +30,9 @@ export type RecoverAuthorizationAddressParameters<
    * - If an unsigned `authorization` is provided, the `signature` property is required.
    * - If a signed `authorization` is provided, the `signature` property does not need to be provided.
    */
-  authorization: authorization | OneOf<Authorization | SignedAuthorization>
+  authorization:
+    | authorization
+    | OneOf<Authorization | AuthorizationRequest | SignedAuthorization>
 } & (authorization extends SignedAuthorization
   ? {
       /** Signature of the Authorization. Not required if the `authorization` is signed. */
@@ -48,14 +51,16 @@ export type RecoverAuthorizationAddressErrorType =
   | ErrorType
 
 export async function recoverAuthorizationAddress<
-  const authorization extends OneOf<Authorization | SignedAuthorization>,
+  const authorization extends OneOf<
+    Authorization | AuthorizationRequest | SignedAuthorization
+  >,
 >(
   parameters: RecoverAuthorizationAddressParameters<authorization>,
 ): Promise<RecoverAuthorizationAddressReturnType> {
   const { authorization, signature } = parameters
 
   return recoverAddress({
-    hash: hashAuthorization(authorization as Authorization),
+    hash: hashAuthorization(authorization as AuthorizationRequest),
     signature: (signature ?? authorization) as Signature,
   })
 }

package/{experimental/eip7702/utils → utils/authorization}/serializeAuthorizationList.ts

@@ -1,10 +1,10 @@
-import type { ErrorType } from '../../../errors/utils.js'
-import { toHex } from '../../../utils/encoding/toHex.js'
-import { toYParitySignatureArray } from '../../../utils/transaction/serializeTransaction.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type {
   AuthorizationList,
   SerializedAuthorizationList,
-} from '../types/authorization.js'
+} from '../../types/authorization.js'
+import { toHex } from '../encoding/toHex.js'
+import { toYParitySignatureArray } from '../transaction/serializeTransaction.js'
 
 export type SerializeAuthorizationListReturnType = SerializedAuthorizationList
 
@@ -20,7 +20,8 @@ export function serializeAuthorizationList(
 
   const serializedAuthorizationList = []
   for (const authorization of authorizationList) {
-    const { contractAddress, chainId, nonce, ...signature } = authorization
+    const { chainId, nonce, ...signature } = authorization
+    const contractAddress = authorization.address
     serializedAuthorizationList.push([
       chainId ? toHex(chainId) : '0x',
       contractAddress,

package/{experimental/eip7702/utils → utils/authorization}/verifyAuthorization.ts

@@ -1,14 +1,11 @@
 import type { Address } from 'abitype'
 
-import type { ErrorType } from '../../../errors/utils.js'
-import {
-  type GetAddressErrorType,
-  getAddress,
-} from '../../../utils/address/getAddress.js'
+import type { ErrorType } from '../../errors/utils.js'
+import { type GetAddressErrorType, getAddress } from '../address/getAddress.js'
 import {
   type IsAddressEqualErrorType,
   isAddressEqual,
-} from '../../../utils/address/isAddressEqual.js'
+} from '../address/isAddressEqual.js'
 import {
   type RecoverAuthorizationAddressErrorType,
   type RecoverAuthorizationAddressParameters,

package/utils/ens/namehash.ts

@@ -1,4 +1,5 @@
 import type { ErrorType } from '../../errors/utils.js'
+import type { ByteArray } from '../../types/misc.js'
 import { type ConcatErrorType, concat } from '../data/concat.js'
 import {
   type StringToBytesErrorType,
@@ -34,7 +35,7 @@ export type NamehashErrorType =
  * @link https://eips.ethereum.org/EIPS/eip-137
  */
 export function namehash(name: string) {
-  let result = new Uint8Array(32).fill(0)
+  let result = new Uint8Array(32).fill(0) as ByteArray
   if (!name) return bytesToHex(result)
 
   const labels = name.split('.')

package/utils/formatters/transaction.ts

@@ -1,6 +1,5 @@
 import type { ErrorType } from '../../errors/utils.js'
-import type { SignedAuthorizationList } from '../../experimental/eip7702/types/authorization.js'
-import type { RpcAuthorizationList } from '../../experimental/eip7702/types/rpc.js'
+import type { SignedAuthorizationList } from '../../types/authorization.js'
 import type { BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
 import type {
@@ -8,7 +7,7 @@ import type {
   ExtractChainFormatterReturnType,
 } from '../../types/chain.js'
 import type { Hex } from '../../types/misc.js'
-import type { RpcTransaction } from '../../types/rpc.js'
+import type { RpcAuthorizationList, RpcTransaction } from '../../types/rpc.js'
 import type { Transaction, TransactionType } from '../../types/transaction.js'
 import type { ExactPartial, UnionLooseOmit } from '../../types/utils.js'
 import { hexToNumber } from '../encoding/fromHex.js'
@@ -128,7 +127,7 @@ function formatAuthorizationList(
   authorizationList: RpcAuthorizationList,
 ): SignedAuthorizationList {
   return authorizationList.map((authorization) => ({
-    contractAddress: (authorization as any).address,
+    address: (authorization as any).address,
     chainId: Number(authorization.chainId),
     nonce: Number(authorization.nonce),
     r: authorization.r,

package/utils/formatters/transactionRequest.ts

@@ -1,12 +1,14 @@
 import type { ErrorType } from '../../errors/utils.js'
-import type { AuthorizationList } from '../../experimental/eip7702/types/authorization.js'
-import type { RpcAuthorizationList } from '../../experimental/eip7702/types/rpc.js'
+import type { AuthorizationList } from '../../types/authorization.js'
 import type {
   Chain,
   ExtractChainFormatterParameters,
 } from '../../types/chain.js'
 import type { ByteArray } from '../../types/misc.js'
-import type { RpcTransactionRequest } from '../../types/rpc.js'
+import type {
+  RpcAuthorizationList,
+  RpcTransactionRequest,
+} from '../../types/rpc.js'
 import type { TransactionRequest } from '../../types/transaction.js'
 import type { ExactPartial } from '../../types/utils.js'
 import { bytesToHex, numberToHex } from '../encoding/toHex.js'
@@ -90,7 +92,7 @@ function formatAuthorizationList(
   return authorizationList.map(
     (authorization) =>
       ({
-        address: authorization.contractAddress,
+        address: authorization.address,
         r: authorization.r
           ? numberToHex(BigInt(authorization.r))
           : authorization.r,

package/utils/index.ts

@@ -162,6 +162,29 @@ export {
   formatAbiItem,
   formatAbiParams,
 } from './abi/formatAbiItem.js'
+export {
+  type HashAuthorizationErrorType,
+  type HashAuthorizationParameters,
+  type HashAuthorizationReturnType,
+  hashAuthorization,
+} from './authorization/hashAuthorization.js'
+export {
+  type RecoverAuthorizationAddressErrorType,
+  type RecoverAuthorizationAddressParameters,
+  type RecoverAuthorizationAddressReturnType,
+  recoverAuthorizationAddress,
+} from './authorization/recoverAuthorizationAddress.js'
+export {
+  type SerializeAuthorizationListErrorType,
+  type SerializeAuthorizationListReturnType,
+  serializeAuthorizationList,
+} from './authorization/serializeAuthorizationList.js'
+export {
+  type VerifyAuthorizationErrorType,
+  type VerifyAuthorizationParameters,
+  type VerifyAuthorizationReturnType,
+  verifyAuthorization,
+} from './authorization/verifyAuthorization.js'
 export {
   type ParseAccountErrorType,
   parseAccount,

package/utils/rpc/ipc.ts

@@ -57,7 +57,7 @@ export async function getIpcRpcClient(
         socket.off('connect', onOpen)
       }
 
-      let lastRemaining = Buffer.alloc(0)
+      let lastRemaining = Buffer.alloc(0) as Buffer
       function onData(buffer: Buffer) {
         const [messages, remaining] = extractMessages(
           Buffer.concat([

package/utils/transaction/assertTransaction.ts

@@ -48,9 +48,9 @@ export function assertTransactionEIP7702(
   const { authorizationList } = transaction
   if (authorizationList) {
     for (const authorization of authorizationList) {
-      const { contractAddress, chainId } = authorization
-      if (!isAddress(contractAddress))
-        throw new InvalidAddressError({ address: contractAddress })
+      const { chainId } = authorization
+      const address = authorization.address
+      if (!isAddress(address)) throw new InvalidAddressError({ address })
       if (chainId < 0) throw new InvalidChainIdError({ chainId })
     }
   }

package/utils/transaction/parseTransaction.ts

@@ -12,7 +12,7 @@ import type { ErrorType } from '../../errors/utils.js'
 import type {
   SerializedAuthorizationList,
   SignedAuthorizationList,
-} from '../../experimental/eip7702/types/authorization.js'
+} from '../../types/authorization.js'
 import type { Hex, Signature } from '../../types/misc.js'
 import type {
   AccessList,
@@ -576,12 +576,12 @@ function parseAuthorizationList(
 ): SignedAuthorizationList {
   const authorizationList: Mutable<SignedAuthorizationList> = []
   for (let i = 0; i < serializedAuthorizationList.length; i++) {
-    const [chainId, contractAddress, nonce, yParity, r, s] =
+    const [chainId, address, nonce, yParity, r, s] =
       serializedAuthorizationList[i]
 
     authorizationList.push({
+      address,
       chainId: hexToNumber(chainId),
-      contractAddress,
       nonce: hexToNumber(nonce),
       ...parseEIP155Signature([yParity, r, s]),
     })

package/utils/transaction/serializeTransaction.ts

@@ -26,6 +26,10 @@ import type {
   TransactionType,
 } from '../../types/transaction.js'
 import type { OneOf } from '../../types/utils.js'
+import {
+  type SerializeAuthorizationListErrorType,
+  serializeAuthorizationList,
+} from '../authorization/serializeAuthorizationList.js'
 import {
   type BlobsToCommitmentsErrorType,
   blobsToCommitments,
@@ -47,10 +51,6 @@ import { trim } from '../data/trim.js'
 import { type ToHexErrorType, bytesToHex, toHex } from '../encoding/toHex.js'
 import { type ToRlpErrorType, toRlp } from '../encoding/toRlp.js'
 
-import {
-  type SerializeAuthorizationListErrorType,
-  serializeAuthorizationList,
-} from '../../experimental/eip7702/utils/serializeAuthorizationList.js'
 import {
   type AssertTransactionEIP1559ErrorType,
   type AssertTransactionEIP2930ErrorType,

package/zksync/actions/deployContract.ts

@@ -31,9 +31,9 @@ export type DeployContractParameters<
   chainOverride extends ChainEIP712 | undefined = ChainEIP712 | undefined,
   allArgs = ContractConstructorArgs<abi>,
 > = DeployContractParameters_<abi, chain, account, chainOverride, allArgs> & {
-  deploymentType?: ContractDeploymentType
-  factoryDeps?: Hex[]
-  salt?: Hash
+  deploymentType?: ContractDeploymentType | undefined
+  factoryDeps?: Hex[] | undefined
+  salt?: Hash | undefined
 }
 
 export type DeployContractReturnType = SendEip712TransactionReturnType