EIP 6110 fixes

packages/block/src/block.ts

@@ -657,24 +657,26 @@ export class Block {
     return result
   }
 
-  async requestsTrieIsValid(): Promise<boolean> {
+  async requestsTrieIsValid(requestsInput?: CLRequest[]): Promise<boolean> {
     if (!this.common.isActivatedEIP(7685)) {
       throw new Error('EIP 7685 is not activated')
     }
 
-    let result
-    if (this.requests!.length === 0) {
-      result = equalsBytes(this.header.requestsRoot!, KECCAK256_RLP)
-      return result
-    }
+    const requests = requestsInput ?? this.requests!
 
-    if (this.cache.requestsRoot === undefined) {
-      this.cache.requestsRoot = await Block.genRequestsTrieRoot(this.requests!)
+    if (requests!.length === 0) {
+      return equalsBytes(this.header.requestsRoot!, KECCAK256_RLP)
     }
 
-    result = equalsBytes(this.cache.requestsRoot, this.header.requestsRoot!)
-
-    return result
+    if (requestsInput === undefined) {
+      if (this.cache.requestsRoot === undefined) {
+        this.cache.requestsRoot = await Block.genRequestsTrieRoot(this.requests!)
+      }
+      return equalsBytes(this.cache.requestsRoot, this.header.requestsRoot!)
+    } else {
+      const reportedRoot = await Block.genRequestsTrieRoot(requests)
+      return equalsBytes(reportedRoot, this.header.requestsRoot!)
+    }
   }
   /**
    * Validates transaction signatures and minimum gas requirements.

packages/vm/src/requests.ts

@@ -2,8 +2,10 @@ import { Common } from '@ethereumjs/common'
 import { RLP } from '@ethereumjs/rlp'
 import {
   Address,
+  BIGINT_0,
   CLRequest,
   bigIntToBytes,
+  bytesToBigInt,
   bytesToHex,
   bytesToInt,
   setLengthLeft,
@@ -125,9 +127,51 @@ const accumulateDeposits = async (
           withdrawalCredsIdx + 32,
           withdrawalCredsIdx + 32 + withdrawalCredsSize
         )
-        const amount = log[2].slice(amountIdx + 32, amountIdx + 32 + amountSize)
+        const amountBytes = log[2].slice(amountIdx + 32, amountIdx + 32 + amountSize)
+        const amountBytesBigEndian = new Uint8Array([
+          amountBytes[7],
+          amountBytes[6],
+          amountBytes[5],
+          amountBytes[4],
+          amountBytes[3],
+          amountBytes[2],
+          amountBytes[1],
+          amountBytes[0],
+        ])
+        const amountBigInt = bytesToBigInt(amountBytesBigEndian)
+
+        let amount: Uint8Array
+        if (amountBigInt === BIGINT_0) {
+          amount = new Uint8Array()
+        } else {
+          amount = bigIntToBytes(amountBigInt)
+        }
+
         const signature = log[2].slice(sigIdx + 32, sigIdx + 32 + sigSize)
-        const index = log[2].slice(indexIdx + 32, indexIdx + 32 + indexSize)
+
+        const indexBytes = log[2].slice(indexIdx + 32, indexIdx + 32 + indexSize)
+
+        // Convert the little-endian array to big-endian array
+        const indexBytesBigEndian = new Uint8Array([
+          indexBytes[7],
+          indexBytes[6],
+          indexBytes[5],
+          indexBytes[4],
+          indexBytes[3],
+          indexBytes[2],
+          indexBytes[1],
+          indexBytes[0],
+        ])
+        const indexBigInt = bytesToBigInt(indexBytesBigEndian)
+
+        let index: Uint8Array
+
+        if (indexBigInt === BIGINT_0) {
+          index = new Uint8Array()
+        } else {
+          index = bigIntToBytes(indexBigInt)
+        }
+
         requests.push(
           new CLRequest(0x0, RLP.encode([pubkey, withdrawalCreds, amount, signature, index]))
         )

packages/vm/src/runBlock.ts

@@ -232,9 +232,9 @@ export async function runBlock(this: VM, opts: RunBlockOpts): Promise<RunBlockRe
     block = Block.fromBlockData(blockData, { common: this.common })
   } else {
     if (this.common.isActivatedEIP(7685)) {
-      const valid = await block.requestsTrieIsValid()
+      const valid = await block.requestsTrieIsValid(requests)
       if (!valid) {
-        const validRoot = await Block.genRequestsTrieRoot(block.requests!)
+        const validRoot = await Block.genRequestsTrieRoot(requests!)
         if (this.DEBUG)
           debug(
             `Invalid requestsRoot received=${bytesToHex(

packages/vm/test/api/EIPs/eip-7685.spec.ts

@@ -62,7 +62,7 @@ describe('EIP-7685 runBlock tests', () => {
       },
       { common }
     )
-    await expect(async () => vm.runBlock({ block })).rejects.toThrow('invalid block stateRoot')
+    await expect(async () => vm.runBlock({ block })).rejects.toThrow(/invalid requestsRoot/)
   })
   it('should error when requestsRoot does not match requests provided', async () => {
     const vm = await setupVM({ common })