util: replace unnecessary toBytes usage (#4014)

* util: replace some toBytes usage

* client: more hexToBytes

* chore: remove more toBytes

* chore: remove toBytes usage

* lint: remove unused imports

* chore: remove unused import

* chore: remove unused import

Author: gabrocheleau

packages/block/test/header.spec.ts

@@ -320,7 +320,7 @@ describe('[Block]: Header functions', () => {
     const common = new Common({ chain: goerliChainConfig, hardfork: Hardfork.Istanbul })
     const blockchain = new Mockchain()
 
-    const genesisRlp = toBytes(testDataPreLondon.genesisRLP)
+    const genesisRlp = hexToBytes(testDataPreLondon.genesisRLP)
     const block = createBlockFromRLP(genesisRlp, { common })
     await blockchain.putBlock(block)
 

packages/client/src/miner/pendingBlock.ts

@@ -9,7 +9,6 @@ import {
   concatBytes,
   createZeroAddress,
   equalsBytes,
-  toBytes,
   toType,
 } from '@ethereumjs/util'
 import { BuildStatus, buildBlock } from '@ethereumjs/vm'
@@ -145,19 +144,18 @@ export class PendingBlock {
 
     const keccakFunction = this.config.chainCommon.customCrypto.keccak256 ?? keccak256
 
-    const payloadIdBytes = toBytes(
-      keccakFunction(
-        concatBytes(
-          parentBlock.hash(),
-          mixHashBuf,
-          timestampBuf,
-          gasLimitBuf,
-          parentBeaconBlockRootBuf,
-          coinbaseBuf,
-          withdrawalsBuf,
-        ),
-      ).subarray(0, 8),
-    )
+    const payloadIdBytes = keccakFunction(
+      concatBytes(
+        parentBlock.hash(),
+        mixHashBuf,
+        timestampBuf,
+        gasLimitBuf,
+        parentBeaconBlockRootBuf,
+        coinbaseBuf,
+        withdrawalsBuf,
+      ),
+    ).subarray(0, 8)
+
     const payloadId = bytesToHex(payloadIdBytes)
 
     // If payload has already been triggered, then return the payloadid

packages/client/src/rpc/modules/engine/engine.ts

@@ -6,7 +6,6 @@ import {
   bytesToUnprefixedHex,
   equalsBytes,
   hexToBytes,
-  toBytes,
 } from '@ethereumjs/util'
 
 import { ExecStatus } from '../../../execution/index.ts'
@@ -911,7 +910,7 @@ export class Engine {
      */
     let headBlock: Block | undefined
     try {
-      const head = toBytes(headBlockHash)
+      const head = hexToBytes(headBlockHash)
       headBlock =
         this.remoteBlocks.get(headBlockHash.slice(2)) ??
         (await this.skeleton.getBlockByHash(head, true)) ??

packages/client/src/rpc/modules/web3.ts

@@ -1,4 +1,4 @@
-import { bytesToHex, hexToBytes, toBytes } from '@ethereumjs/util'
+import { bytesToHex, hexToBytes } from '@ethereumjs/util'
 import { keccak256 } from 'ethereum-cryptography/keccak.js'
 
 import { getClientVersion } from '../../util/index.ts'
@@ -45,7 +45,7 @@ export class Web3 {
    * @param params The data to convert into a SHA3 hash
    */
   sha3(params: PrefixedHexString[]): PrefixedHexString {
-    const hexEncodedDigest = bytesToHex(keccak256(toBytes(hexToBytes(params[0]))))
+    const hexEncodedDigest = bytesToHex(keccak256(hexToBytes(params[0])))
     return hexEncodedDigest
   }
 }

packages/client/test/rpc/mockBlockchain.ts

@@ -1,27 +1,33 @@
 import { createBlock } from '@ethereumjs/block'
 import { createLegacyTx } from '@ethereumjs/tx'
-import { equalsBytes, toBytes } from '@ethereumjs/util'
+import { type PrefixedHexString, equalsBytes, hexToBytes } from '@ethereumjs/util'
 
 import { dummy } from './helpers.ts'
 
-import type { LegacyTx } from '@ethereumjs/tx'
+import type { JSONTx, LegacyTx, TypedTransaction } from '@ethereumjs/tx'
 
-export function mockBlockchain(options: any = {}) {
-  const number = options.number ?? '0x444444'
-  const blockHash =
+export function mockBlockchain(
+  options: {
+    number?: PrefixedHexString
+    hash?: PrefixedHexString
+    transactions?: TypedTransaction[] | JSONTx[]
+  } = {},
+) {
+  const number: PrefixedHexString = options.number ?? '0x444444'
+  const blockHash: PrefixedHexString =
     options.hash ?? '0x910abca1728c53e8d6df870dd7af5352e974357dc58205dea1676be17ba6becf'
   const transactions = options.transactions ?? [createLegacyTx({}).sign(dummy.privKey)]
   const block = {
-    hash: () => toBytes(blockHash),
+    hash: () => hexToBytes(blockHash),
     serialize: () => createBlock({ header: { number }, transactions }).serialize(),
     header: {
       number: BigInt(number),
-      hash: () => toBytes(blockHash),
+      hash: () => hexToBytes(blockHash),
     },
     toJSON: () => ({
       ...createBlock({ header: { number } }).toJSON(),
       hash: options.hash ?? blockHash,
-      transactions: transactions.map((t: LegacyTx) => t.toJSON()),
+      transactions: transactions.map((t) => (t as LegacyTx).toJSON()),
     }),
     transactions,
     uncleHeaders: [],

packages/mpt/src/util/encoding.ts

@@ -1,4 +1,4 @@
-import { concatBytes, hexToBytes, toBytes, unprefixedHexToBytes } from '@ethereumjs/util'
+import { concatBytes, hexToBytes, unprefixedHexToBytes } from '@ethereumjs/util'
 
 import { nibblesTypeToPackedBytes } from './nibbles.ts'
 
@@ -129,12 +129,11 @@ export const nibbleTypeToByteType = (arr: Nibbles): Uint8Array => {
  * @returns Nibble typed nibble array
  */
 export const byteTypeToNibbleType = (key: Uint8Array): Nibbles => {
-  const bKey = toBytes(key)
   const nibbles = [] as Nibbles
 
-  for (let i = 0; i < bKey.length; i++) {
+  for (let i = 0; i < key.length; i++) {
     const q = i
-    nibbles[q] = bKey[i] % 16
+    nibbles[q] = key[i] % 16
   }
 
   return nibbles

packages/mpt/src/util/nibbles.ts

@@ -1,5 +1,3 @@
-import { toBytes } from '@ethereumjs/util'
-
 import type { Nibbles } from '../types.ts'
 
 /**
@@ -8,14 +6,13 @@ import type { Nibbles } from '../types.ts'
  * @param key
  */
 export function bytesToNibbles(key: Uint8Array): Nibbles {
-  const bKey = toBytes(key)
   const nibbles = [] as Nibbles
 
-  for (let i = 0; i < bKey.length; i++) {
+  for (let i = 0; i < key.length; i++) {
     let q = i * 2
-    nibbles[q] = bKey[i] >> 4
+    nibbles[q] = key[i] >> 4
     ++q
-    nibbles[q] = bKey[i] % 16
+    nibbles[q] = key[i] % 16
   }
 
   return nibbles

packages/mpt/test/proof/range.spec.ts

@@ -3,9 +3,9 @@ import {
   compareBytes,
   concatBytes,
   hexToBytes,
+  intToBytes,
   randomBytes,
   setLengthLeft,
-  toBytes,
 } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
@@ -28,8 +28,9 @@ async function randomTrie(db: DB<string, string>, addKey: boolean = true) {
 
   if (addKey) {
     for (let i = 0; i < 100; i++) {
-      const key = setLengthLeft(toBytes(i), 32)
-      const val = toBytes(i)
+      const indexBytes = intToBytes(i)
+      const key = setLengthLeft(indexBytes, 32)
+      const val = indexBytes
       await trie.put(key, val)
       entries.push([key, val])
     }
@@ -62,15 +63,15 @@ function getRandomIntInclusive(min: number, max: number): number {
 function decreaseKey(key: Uint8Array) {
   for (let i = key.length - 1; i >= 0; i--) {
     if (key[i] > 0) {
-      return concatBytes(key.slice(0, i), toBytes(key[i] - 1), key.slice(i + 1))
+      return concatBytes(key.slice(0, i), intToBytes(key[i] - 1), key.slice(i + 1))
     }
   }
 }
 
 function increaseKey(key: Uint8Array) {
   for (let i = key.length - 1; i >= 0; i--) {
     if (key[i] < 255) {
-      return concatBytes(key.slice(0, i), toBytes(key[i] + 1), key.slice(i + 1))
+      return concatBytes(key.slice(0, i), intToBytes(key[i] + 1), key.slice(i + 1))
     }
   }
 }
@@ -323,8 +324,9 @@ describe('simple merkle range proofs generation and verification', () => {
     const trie = new MerklePatriciaTrie()
     const entries: [Uint8Array, Uint8Array][] = []
     for (let i = 0; i < 10; i++) {
-      const key = setLengthLeft(toBytes(i), 32)
-      const val = toBytes(i)
+      const indexBytes = intToBytes(i)
+      const key = setLengthLeft(indexBytes, 32)
+      const val = indexBytes
       await trie.put(key, val)
       entries.push([key, val])
     }

packages/statemanager/src/statelessVerkleStateManager.ts

@@ -21,7 +21,6 @@ import {
   setLengthLeft,
   setLengthRight,
   short,
-  toBytes,
 } from '@ethereumjs/util'
 import debugDefault from 'debug'
 import { keccak256 } from 'ethereum-cryptography/keccak.js'
@@ -351,7 +350,8 @@ export class StatelessVerkleStateManager implements StateManagerInterface {
       BigInt(bytesToHex(key)),
       this.verkleCrypto,
     )
-    const storageValue = toBytes(this._state[bytesToHex(storageKey)])
+    const rawStorageValue = this._state[bytesToHex(storageKey)]
+    const storageValue = rawStorageValue === null ? new Uint8Array() : hexToBytes(rawStorageValue)
 
     this._caches?.storage?.put(address, key, storageValue ?? hexToBytes('0x80'))
 

packages/tx/examples/custom-chain-id-tx.ts

@@ -1,8 +1,8 @@
 import { Hardfork, Mainnet, createCustomCommon } from '@ethereumjs/common'
 import { createLegacyTxFromRLP } from '@ethereumjs/tx'
-import { toBytes } from '@ethereumjs/util'
+import { hexToBytes, toBytes } from '@ethereumjs/util'
 
-const txData = toBytes(
+const txData = hexToBytes(
   '0xf9010b82930284d09dc30083419ce0942d18de92e0f9aee1a29770c3b15c6cf8ac5498e580b8a42f43f4fb0000000000000000000000000000000000000000000000000000016b78998da900000000000000000000000000000000000000000000000000000000000cb1b70000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000001363e4f00000000000000000000000000000000000000000000000000000000000186a029a0fac36e66d329af0e831b2e61179b3ec8d7c7a8a2179e303cfed3364aff2bc3e4a07cb73d56e561ccbd838818dd3dea5fa0b5158577ffc61c0e6ec1f0ed55716891',
 )