Fix vm api tests

Author: am1r021

packages/block/test/eip7685block.spec.ts

@@ -1,13 +1,14 @@
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
 import {
+  CLRequestType,
   KECCAK256_RLP,
   SHA256_NULL,
   bytesToBigInt,
-  createDepositRequest,
+  createCLRequest,
   createWithdrawalRequest,
   randomBytes,
 } from '@ethereumjs/util'
-import { sha256 } from 'ethereum-cryptography/keccak.js'
+import { sha256 } from 'ethereum-cryptography/sha256.js'
 import { assert, describe, expect, it } from 'vitest'
 
 import { genRequestsRoot } from '../src/helpers.js'
@@ -20,7 +21,7 @@ import {
 } from '../src/index.js'
 
 import type { JSONRPCBlock } from '../src/index.js'
-import type { CLRequest, CLRequestType } from '@ethereumjs/util'
+import type { CLRequest } from '@ethereumjs/util'
 
 function getRandomDepositRequest(): CLRequest<CLRequestType> {
   const depositRequestData = {
@@ -30,7 +31,17 @@ function getRandomDepositRequest(): CLRequest<CLRequestType> {
     signature: randomBytes(96),
     index: randomBytes(8),
   }
-  return createDepositRequest(depositRequestData) as CLRequest<CLRequestType>
+  // return createDepositRequest(depositRequestData) as CLRequest<CLRequestType>
+
+  // flatten request bytes as per EIP-7685
+  const depositRequestBytes = new Uint8Array(
+    Object.values(depositRequestData)
+      .map((arr) => Array.from(arr)) // Convert Uint8Arrays to regular arrays
+      .reduce((acc, curr) => acc.concat(curr), []), // Concatenate arrays
+  )
+  return createCLRequest(
+    new Uint8Array([CLRequestType.Deposit, ...depositRequestBytes]),
+  ) as CLRequest<CLRequestType.Deposit>
 }
 
 function getRandomWithdrawalRequest(): CLRequest<CLRequestType> {

packages/vm/test/api/EIPs/eip-2935-historical-block-hashes.spec.ts

@@ -182,7 +182,7 @@ describe('EIP 2935: historical block hashes', () => {
         timestamp: 1,
       })
       const genesis = (await vm.blockchain.getBlock(0)) as Block
-      const block = await (
+      const { block } = await (
         await buildBlock(vm, {
           parentBlock: genesis,
           blockOpts: {
@@ -220,7 +220,7 @@ describe('EIP 2935: historical block hashes', () => {
       await vm.stateManager.putCode(historyAddress, contract2935Code)
       let lastBlock = (await vm.blockchain.getBlock(0)) as Block
       for (let i = 1; i <= blocksToBuild; i++) {
-        lastBlock = await (
+        const buildResult = await (
           await buildBlock(vm, {
             parentBlock: lastBlock,
             blockOpts: {
@@ -232,6 +232,7 @@ describe('EIP 2935: historical block hashes', () => {
             },
           })
         ).build()
+        lastBlock = buildResult.block
         await vm.blockchain.putBlock(lastBlock)
         await runBlock(vm, {
           block: lastBlock,

packages/vm/test/api/EIPs/eip-4844-blobs.spec.ts

@@ -82,7 +82,7 @@ describe('EIP4844 tests', () => {
 
     await blockBuilder.addTransaction(signedTx)
 
-    const block = await blockBuilder.build()
+    const { block } = await blockBuilder.build()
     assert.equal(block.transactions.length, 1, 'blob transaction should be included')
     assert.equal(
       bytesToHex(block.transactions[0].hash()),

packages/vm/test/api/EIPs/eip-4895-withdrawals.spec.ts

@@ -226,7 +226,7 @@ describe('EIP4895 tests', () => {
       },
     })
 
-    const block = await blockBuilder.build()
+    const { block } = await blockBuilder.build()
 
     assert.equal(
       bytesToHex(block.header.stateRoot),