viem 2.7.22 → 2.8.1

package/utils/transaction/serializeTransaction.ts

@@ -3,29 +3,56 @@ import {
   type InvalidLegacyVErrorType,
 } from '../../errors/transaction.js'
 import type { ErrorType } from '../../errors/utils.js'
-import type { Signature } from '../../types/misc.js'
+import type {
+  ByteArray,
+  Hex,
+  Signature,
+  SignatureLegacy,
+} from '../../types/misc.js'
 import type {
   TransactionSerializable,
   TransactionSerializableEIP1559,
   TransactionSerializableEIP2930,
+  TransactionSerializableEIP4844,
+  TransactionSerializableGeneric,
   TransactionSerializableLegacy,
   TransactionSerialized,
   TransactionSerializedEIP1559,
   TransactionSerializedEIP2930,
+  TransactionSerializedEIP4844,
   TransactionSerializedLegacy,
   TransactionType,
 } from '../../types/transaction.js'
+import type { OneOf } from '../../types/utils.js'
+import {
+  type BlobsToCommitmentsErrorType,
+  blobsToCommitments,
+} from '../blob/blobsToCommitments.js'
+import {
+  blobsToProofs,
+  type blobsToProofsErrorType,
+} from '../blob/blobsToProofs.js'
+import {
+  type CommitmentsToVersionedHashesErrorType,
+  commitmentsToVersionedHashes,
+} from '../blob/commitmentsToVersionedHashes.js'
+import {
+  type ToBlobSidecarsErrorType,
+  toBlobSidecars,
+} from '../blob/toBlobSidecars.js'
 import { type ConcatHexErrorType, concatHex } from '../data/concat.js'
 import { trim } from '../data/trim.js'
-import { type ToHexErrorType, toHex } from '../encoding/toHex.js'
+import { type ToHexErrorType, bytesToHex, toHex } from '../encoding/toHex.js'
 import { type ToRlpErrorType, toRlp } from '../encoding/toRlp.js'
 
 import {
   type AssertTransactionEIP1559ErrorType,
   type AssertTransactionEIP2930ErrorType,
+  type AssertTransactionEIP4844ErrorType,
   type AssertTransactionLegacyErrorType,
   assertTransactionEIP1559,
   assertTransactionEIP2930,
+  assertTransactionEIP4844,
   assertTransactionLegacy,
 } from './assertTransaction.js'
 import {
@@ -39,48 +66,153 @@ import {
 } from './serializeAccessList.js'
 
 export type SerializedTransactionReturnType<
-  TTransactionSerializable extends
-    TransactionSerializable = TransactionSerializable,
-  TTransactionType extends
-    TransactionType = GetTransactionType<TTransactionSerializable>,
-> = TransactionSerialized<TTransactionType>
+  transaction extends TransactionSerializable = TransactionSerializable,
+  ///
+  _transactionType extends TransactionType = GetTransactionType<transaction>,
+> = TransactionSerialized<_transactionType>
 
 export type SerializeTransactionFn<
-  TTransactionSerializable extends
-    TransactionSerializable = TransactionSerializable,
-> = typeof serializeTransaction<TTransactionSerializable>
+  transaction extends TransactionSerializableGeneric = TransactionSerializable,
+  ///
+  _transactionType extends TransactionType = never,
+> = typeof serializeTransaction<
+  OneOf<TransactionSerializable | transaction>,
+  _transactionType
+>
 
 export type SerializeTransactionErrorType =
   | GetTransationTypeErrorType
   | SerializeTransactionEIP1559ErrorType
   | SerializeTransactionEIP2930ErrorType
+  | SerializeTransactionEIP4844ErrorType
   | SerializeTransactionLegacyErrorType
   | ErrorType
 
 export function serializeTransaction<
-  TTransactionSerializable extends TransactionSerializable,
+  const transaction extends TransactionSerializable,
+  ///
+  _transactionType extends TransactionType = GetTransactionType<transaction>,
 >(
-  transaction: TTransactionSerializable,
+  transaction: transaction,
   signature?: Signature,
-): SerializedTransactionReturnType<TTransactionSerializable> {
+): SerializedTransactionReturnType<transaction, _transactionType> {
   const type = getTransactionType(transaction) as GetTransactionType
 
   if (type === 'eip1559')
     return serializeTransactionEIP1559(
       transaction as TransactionSerializableEIP1559,
       signature,
-    ) as SerializedTransactionReturnType<TTransactionSerializable>
+    ) as SerializedTransactionReturnType<transaction>
 
   if (type === 'eip2930')
     return serializeTransactionEIP2930(
       transaction as TransactionSerializableEIP2930,
       signature,
-    ) as SerializedTransactionReturnType<TTransactionSerializable>
+    ) as SerializedTransactionReturnType<transaction>
+
+  if (type === 'eip4844')
+    return serializeTransactionEIP4844(
+      transaction as TransactionSerializableEIP4844,
+      signature,
+    ) as SerializedTransactionReturnType<transaction>
 
   return serializeTransactionLegacy(
     transaction as TransactionSerializableLegacy,
-    signature,
-  ) as SerializedTransactionReturnType<TTransactionSerializable>
+    signature as SignatureLegacy,
+  ) as SerializedTransactionReturnType<transaction>
+}
+
+type SerializeTransactionEIP4844ErrorType =
+  | AssertTransactionEIP4844ErrorType
+  | BlobsToCommitmentsErrorType
+  | CommitmentsToVersionedHashesErrorType
+  | blobsToProofsErrorType
+  | ToBlobSidecarsErrorType
+  | ConcatHexErrorType
+  | InvalidLegacyVErrorType
+  | ToHexErrorType
+  | ToRlpErrorType
+  | SerializeAccessListErrorType
+  | ErrorType
+
+function serializeTransactionEIP4844(
+  transaction: TransactionSerializableEIP4844,
+  signature?: Signature,
+): TransactionSerializedEIP4844 {
+  const {
+    chainId,
+    gas,
+    nonce,
+    to,
+    value,
+    maxFeePerBlobGas,
+    maxFeePerGas,
+    maxPriorityFeePerGas,
+    accessList,
+    data,
+  } = transaction
+
+  assertTransactionEIP4844(transaction)
+
+  let blobVersionedHashes = transaction.blobVersionedHashes
+  let sidecars = transaction.sidecars
+  // If `blobs` are passed, we will need to compute the KZG commitments & proofs.
+  if (transaction.blobs) {
+    const blobs = (
+      typeof transaction.blobs[0] === 'string'
+        ? transaction.blobs
+        : (transaction.blobs as ByteArray[]).map((x) => bytesToHex(x))
+    ) as Hex[]
+    const kzg = transaction.kzg!
+    const commitments = blobsToCommitments({
+      blobs,
+      kzg,
+    })
+    const proofs = blobsToProofs({ blobs, commitments, kzg })
+    blobVersionedHashes = commitmentsToVersionedHashes({
+      commitments,
+    })
+
+    if (sidecars !== false)
+      sidecars = toBlobSidecars({ blobs, commitments, proofs })
+  }
+
+  const serializedAccessList = serializeAccessList(accessList)
+
+  const serializedTransaction = [
+    toHex(chainId),
+    nonce ? toHex(nonce) : '0x',
+    maxPriorityFeePerGas ? toHex(maxPriorityFeePerGas) : '0x',
+    maxFeePerGas ? toHex(maxFeePerGas) : '0x',
+    gas ? toHex(gas) : '0x',
+    to ?? '0x',
+    value ? toHex(value) : '0x',
+    data ?? '0x',
+    serializedAccessList,
+    maxFeePerBlobGas ? toHex(maxFeePerBlobGas) : '0x',
+    blobVersionedHashes ?? [],
+    ...toYParitySignatureArray(transaction, signature),
+  ] as const
+
+  const blobs: Hex[] = []
+  const commitments: Hex[] = []
+  const proofs: Hex[] = []
+  if (sidecars)
+    for (let i = 0; i < sidecars.length; i++) {
+      const { blob, commitment, proof } = sidecars[i]
+      blobs.push(blob)
+      commitments.push(commitment)
+      proofs.push(proof)
+    }
+
+  return concatHex([
+    '0x03',
+    sidecars
+      ? // If sidecars are enabled, envelope turns into a "wrapper":
+        toRlp([serializedTransaction, blobs, commitments, proofs])
+      : // If sidecars are disabled, standard envelope is used:
+        toRlp(serializedTransaction),
+  ]) as TransactionSerializedEIP4844
 }
 
 type SerializeTransactionEIP1559ErrorType =
@@ -122,18 +254,9 @@ function serializeTransactionEIP1559(
     value ? toHex(value) : '0x',
     data ?? '0x',
     serializedAccessList,
+    ...toYParitySignatureArray(transaction, signature),
   ]
 
-  if (signature) {
-    const yParity = (() => {
-      if (signature.v === 0n) return '0x'
-      if (signature.v === 1n) return toHex(1)
-
-      return signature.v === 27n ? '0x' : toHex(1)
-    })()
-    serializedTransaction.push(yParity, trim(signature.r), trim(signature.s))
-  }
-
   return concatHex([
     '0x02',
     toRlp(serializedTransaction),
@@ -169,18 +292,9 @@ function serializeTransactionEIP2930(
     value ? toHex(value) : '0x',
     data ?? '0x',
     serializedAccessList,
+    ...toYParitySignatureArray(transaction, signature),
   ]
 
-  if (signature) {
-    const yParity = (() => {
-      if (signature.v === 0n) return '0x'
-      if (signature.v === 1n) return toHex(1)
-
-      return signature.v === 27n ? '0x' : toHex(1)
-    })()
-    serializedTransaction.push(yParity, trim(signature.r), trim(signature.s))
-  }
-
   return concatHex([
     '0x01',
     toRlp(serializedTransaction),
@@ -196,7 +310,7 @@ type SerializeTransactionLegacyErrorType =
 
 function serializeTransactionLegacy(
   transaction: TransactionSerializableLegacy,
-  signature?: Signature,
+  signature?: SignatureLegacy,
 ): TransactionSerializedLegacy {
   const { chainId = 0, gas, data, nonce, to, value, gasPrice } = transaction
 
@@ -245,5 +359,24 @@ function serializeTransactionLegacy(
     ]
   }
 
-  return toRlp(serializedTransaction)
+  return toRlp(serializedTransaction) as TransactionSerializedLegacy
+}
+
+export function toYParitySignatureArray(
+  transaction: TransactionSerializableGeneric,
+  signature?: Signature,
+) {
+  const { r, s, v, yParity } = signature ?? transaction
+  if (typeof r === 'undefined') return []
+  if (typeof s === 'undefined') return []
+  if (typeof v === 'undefined' && typeof yParity === 'undefined') return []
+
+  const yParity_ = (() => {
+    if (typeof yParity === 'number') return yParity ? toHex(1) : '0x'
+    if (v === 0n) return '0x'
+    if (v === 1n) return toHex(1)
+
+    return v === 27n ? '0x' : toHex(1)
+  })()
+  return [yParity_, trim(r), trim(s)]
 }