chore: prefer numberToHex

Author: jxom

src/utils/transaction/serializeTransaction.ts

@@ -48,7 +48,11 @@ import {
 } from '../blob/toBlobSidecars.js'
 import { type ConcatHexErrorType, concatHex } from '../data/concat.js'
 import { trim } from '../data/trim.js'
-import { type ToHexErrorType, bytesToHex, toHex } from '../encoding/toHex.js'
+import {
+  bytesToHex,
+  numberToHex,
+  type NumberToHexErrorType,
+} from '../encoding/toHex.js'
 import { type ToRlpErrorType, toRlp } from '../encoding/toRlp.js'
 
 import {
@@ -142,7 +146,7 @@ type SerializeTransactionEIP7702ErrorType =
   | SerializeAuthorizationListErrorType
   | ConcatHexErrorType
   | InvalidLegacyVErrorType
-  | ToHexErrorType
+  | NumberToHexErrorType
   | ToRlpErrorType
   | SerializeAccessListErrorType
   | ErrorType
@@ -173,13 +177,13 @@ function serializeTransactionEIP7702(
   return concatHex([
     '0x04',
     toRlp([
-      toHex(chainId),
-      nonce ? toHex(nonce) : '0x',
-      maxPriorityFeePerGas ? toHex(maxPriorityFeePerGas) : '0x',
-      maxFeePerGas ? toHex(maxFeePerGas) : '0x',
-      gas ? toHex(gas) : '0x',
+      numberToHex(chainId),
+      nonce ? numberToHex(nonce) : '0x',
+      maxPriorityFeePerGas ? numberToHex(maxPriorityFeePerGas) : '0x',
+      maxFeePerGas ? numberToHex(maxFeePerGas) : '0x',
+      gas ? numberToHex(gas) : '0x',
       to ?? '0x',
-      value ? toHex(value) : '0x',
+      value ? numberToHex(value) : '0x',
       data ?? '0x',
       serializedAccessList,
       serializedAuthorizationList,
@@ -196,7 +200,7 @@ type SerializeTransactionEIP4844ErrorType =
   | ToBlobSidecarsErrorType
   | ConcatHexErrorType
   | InvalidLegacyVErrorType
-  | ToHexErrorType
+  | NumberToHexErrorType
   | ToRlpErrorType
   | SerializeAccessListErrorType
   | ErrorType
@@ -252,16 +256,16 @@ function serializeTransactionEIP4844(
   const serializedAccessList = serializeAccessList(accessList)
 
   const serializedTransaction = [
-    toHex(chainId),
-    nonce ? toHex(nonce) : '0x',
-    maxPriorityFeePerGas ? toHex(maxPriorityFeePerGas) : '0x',
-    maxFeePerGas ? toHex(maxFeePerGas) : '0x',
-    gas ? toHex(gas) : '0x',
+    numberToHex(chainId),
+    nonce ? numberToHex(nonce) : '0x',
+    maxPriorityFeePerGas ? numberToHex(maxPriorityFeePerGas) : '0x',
+    maxFeePerGas ? numberToHex(maxFeePerGas) : '0x',
+    gas ? numberToHex(gas) : '0x',
     to ?? '0x',
-    value ? toHex(value) : '0x',
+    value ? numberToHex(value) : '0x',
     data ?? '0x',
     serializedAccessList,
-    maxFeePerBlobGas ? toHex(maxFeePerBlobGas) : '0x',
+    maxFeePerBlobGas ? numberToHex(maxFeePerBlobGas) : '0x',
     blobVersionedHashes ?? [],
     ...toYParitySignatureArray(transaction, signature),
   ] as const
@@ -291,7 +295,7 @@ type SerializeTransactionEIP1559ErrorType =
   | AssertTransactionEIP1559ErrorType
   | ConcatHexErrorType
   | InvalidLegacyVErrorType
-  | ToHexErrorType
+  | NumberToHexErrorType
   | ToRlpErrorType
   | SerializeAccessListErrorType
   | ErrorType
@@ -317,13 +321,13 @@ function serializeTransactionEIP1559(
   const serializedAccessList = serializeAccessList(accessList)
 
   const serializedTransaction = [
-    toHex(chainId),
-    nonce ? toHex(nonce) : '0x',
-    maxPriorityFeePerGas ? toHex(maxPriorityFeePerGas) : '0x',
-    maxFeePerGas ? toHex(maxFeePerGas) : '0x',
-    gas ? toHex(gas) : '0x',
+    numberToHex(chainId),
+    nonce ? numberToHex(nonce) : '0x',
+    maxPriorityFeePerGas ? numberToHex(maxPriorityFeePerGas) : '0x',
+    maxFeePerGas ? numberToHex(maxFeePerGas) : '0x',
+    gas ? numberToHex(gas) : '0x',
     to ?? '0x',
-    value ? toHex(value) : '0x',
+    value ? numberToHex(value) : '0x',
     data ?? '0x',
     serializedAccessList,
     ...toYParitySignatureArray(transaction, signature),
@@ -339,7 +343,7 @@ type SerializeTransactionEIP2930ErrorType =
   | AssertTransactionEIP2930ErrorType
   | ConcatHexErrorType
   | InvalidLegacyVErrorType
-  | ToHexErrorType
+  | NumberToHexErrorType
   | ToRlpErrorType
   | SerializeAccessListErrorType
   | ErrorType
@@ -356,12 +360,12 @@ function serializeTransactionEIP2930(
   const serializedAccessList = serializeAccessList(accessList)
 
   const serializedTransaction = [
-    toHex(chainId),
-    nonce ? toHex(nonce) : '0x',
-    gasPrice ? toHex(gasPrice) : '0x',
-    gas ? toHex(gas) : '0x',
+    numberToHex(chainId),
+    nonce ? numberToHex(nonce) : '0x',
+    gasPrice ? numberToHex(gasPrice) : '0x',
+    gas ? numberToHex(gas) : '0x',
     to ?? '0x',
-    value ? toHex(value) : '0x',
+    value ? numberToHex(value) : '0x',
     data ?? '0x',
     serializedAccessList,
     ...toYParitySignatureArray(transaction, signature),
@@ -376,7 +380,7 @@ function serializeTransactionEIP2930(
 type SerializeTransactionLegacyErrorType =
   | AssertTransactionLegacyErrorType
   | InvalidLegacyVErrorType
-  | ToHexErrorType
+  | NumberToHexErrorType
   | ToRlpErrorType
   | ErrorType
 
@@ -389,11 +393,11 @@ function serializeTransactionLegacy(
   assertTransactionLegacy(transaction)
 
   let serializedTransaction = [
-    nonce ? toHex(nonce) : '0x',
-    gasPrice ? toHex(gasPrice) : '0x',
-    gas ? toHex(gas) : '0x',
+    nonce ? numberToHex(nonce) : '0x',
+    gasPrice ? numberToHex(gasPrice) : '0x',
+    gas ? numberToHex(gas) : '0x',
     to ?? '0x',
-    value ? toHex(value) : '0x',
+    value ? numberToHex(value) : '0x',
     data ?? '0x',
   ]
 
@@ -421,14 +425,14 @@ function serializeTransactionLegacy(
 
     serializedTransaction = [
       ...serializedTransaction,
-      toHex(v),
+      numberToHex(v),
       r === '0x00' ? '0x' : r,
       s === '0x00' ? '0x' : s,
     ]
   } else if (chainId > 0) {
     serializedTransaction = [
       ...serializedTransaction,
-      toHex(chainId),
+      numberToHex(chainId),
       '0x',
       '0x',
     ]
@@ -452,11 +456,11 @@ export function toYParitySignatureArray(
   const s = trim(signature.s)
 
   const yParity_ = (() => {
-    if (typeof yParity === 'number') return yParity ? toHex(1) : '0x'
+    if (typeof yParity === 'number') return yParity ? numberToHex(1) : '0x'
     if (v === 0n) return '0x'
-    if (v === 1n) return toHex(1)
+    if (v === 1n) return numberToHex(1)
 
-    return v === 27n ? '0x' : toHex(1)
+    return v === 27n ? '0x' : numberToHex(1)
   })()
 
   return [yParity_, r === '0x00' ? '0x' : r, s === '0x00' ? '0x' : s]