modfiy the 7002 eip spec along with the new contract and debug and fix the test including fixing a logs bloom bug in the generate fields block generation

Author: g11tech

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

@@ -1,6 +1,5 @@
 import { createBlock } from '@ethereumjs/block'
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
-import { RLP } from '@ethereumjs/rlp'
 import { createLegacyTx } from '@ethereumjs/tx'
 import {
   Account,
@@ -15,7 +14,7 @@ import {
 } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
-import { bytesToBigInt } from '../../../../util/src/bytes.js'
+import { CLRequestType } from '../../../../util/src/request.js'
 import { runBlock } from '../../../src/index.js'
 import { setupVM } from '../utils.js'
 
@@ -33,11 +32,11 @@ const deploymentTxData = {
   gasLimit: BigInt('0x3d090'),
   gasPrice: BigInt('0xe8d4a51000'),
   data: hexToBytes(
-    '0x61049d5f556101af80600f5f395ff33373fffffffffffffffffffffffffffffffffffffffe1460a0573615156028575f545f5260205ff35b36603814156101ab5760115f54600182026001905f5b5f82111560595781019083028483029004916001019190603e565b9093900434106101ab57600154600101600155600354806003026004013381556001015f35815560010160203590553360601b5f5260385f601437604c5fa0600101600355005b6003546002548082038060101160b4575060105b5f5b8181146101585780604c02838201600302600401805490600101805490600101549160601b83528260140152807fffffffffffffffffffffffffffffffff0000000000000000000000000000000016826034015260401c906044018160381c81600701538160301c81600601538160281c81600501538160201c81600401538160181c81600301538160101c81600201538160081c81600101535360010160b6565b910180921461016a5790600255610175565b90505f6002555f6003555b5f548061049d141561018457505f5b6001546002828201116101995750505f61019f565b01600290035b5f555f600155604c025ff35b5f5ffd',
+    '0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5f556101f480602d5f395ff33373fffffffffffffffffffffffffffffffffffffffe1460c7573615156028575f545f5260205ff35b36603814156101f05760115f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff146101f057600182026001905f5b5f821115608057810190830284830290049160010191906065565b9093900434106101f057600154600101600155600354806003026004013381556001015f35815560010160203590553360601b5f5260385f601437604c5fa0600101600355005b6003546002548082038060101160db575060105b5f5b81811461017f5780604c02838201600302600401805490600101805490600101549160601b83528260140152807fffffffffffffffffffffffffffffffff0000000000000000000000000000000016826034015260401c906044018160381c81600701538160301c81600601538160281c81600501538160201c81600401538160181c81600301538160101c81600201538160081c81600101535360010160dd565b9101809214610191579060025561019c565b90505f6002555f6003555b5f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14156101c957505f5b6001546002828201116101de5750505f6101e4565b01600290035b5f555f600155604c025ff35b5f5ffd',
   ),
   v: BigInt('0x1b'),
   r: BigInt('0x539'),
-  s: BigInt('0x48655fec580f6877'),
+  s: BigInt('0x10e740537d4d36b9'),
 }
 
 const deploymentTx = createLegacyTx(deploymentTxData)
@@ -111,29 +110,34 @@ describe('EIP-7002 tests', () => {
       generatedBlock = e.block
     })
 
-    await runBlock(vm, {
+    let runBlockResults = await runBlock(vm, {
       block: block2,
       skipHeaderValidation: true,
       skipBlockValidation: true,
       generate: true,
     })
 
     // Ensure the request is generated
-    assert.ok(generatedBlock!.requests!.length === 1)
-
-    const requestDecoded = RLP.decode(generatedBlock!.requests![0].serialize().slice(1))
+    assert.ok(runBlockResults.requests!.length === 1)
+    assert.equal(
+      generatedBlock!.transactions.length,
+      1,
+      'withdrawal transaction should be included',
+    )
 
-    const sourceAddressRequest = requestDecoded[0] as Uint8Array
-    const validatorPubkeyRequest = requestDecoded[1] as Uint8Array
-    const amountRequest = requestDecoded[2] as Uint8Array
+    const withdrawalRequest = runBlockResults.requests![0]
+    assert(withdrawalRequest.type, CLRequestType.Withdrawal, 'make sure its withdrawal request')
 
+    // amount is in le when contract pack it in requests
+    const expectedRequestData = concatBytes(
+      tx.getSenderAddress().bytes,
+      validatorPubkey,
+      amountBytes.reverse(),
+    )
     // Ensure the requests are correct
-    assert.ok(equalsBytes(sourceAddressRequest, tx.getSenderAddress().bytes))
-    assert.ok(equalsBytes(validatorPubkey, validatorPubkeyRequest))
-    // the direct byte comparison fails because leading zeros have been stripped
-    // off the amountBytes because it was serialized in request from bigint
-    assert.equal(bytesToBigInt(amountBytes), bytesToBigInt(amountRequest))
+    assert.ok(equalsBytes(expectedRequestData, withdrawalRequest.data))
 
+    // generated block should be valid
     await runBlock(vm, { block: generatedBlock!, skipHeaderValidation: true, root })
 
     // Run block with 2 requests
@@ -152,7 +156,7 @@ describe('EIP-7002 tests', () => {
       { common },
     )
 
-    await runBlock(vm, {
+    runBlockResults = await runBlock(vm, {
       block: block3,
       skipHeaderValidation: true,
       skipBlockValidation: true,
@@ -161,7 +165,12 @@ describe('EIP-7002 tests', () => {
 
     // Note: generatedBlock is now overridden with the new generated block (this is thus block number 3)
     // Ensure there are 2 requests
-    assert.ok(generatedBlock!.requests!.length === 2)
+    assert.ok(runBlockResults.requests!.length === 1)
+    assert.equal(
+      generatedBlock!.transactions.length,
+      2,
+      'withdrawal transactions should be included',
+    )
   })
 
   it('should throw when contract is not deployed', async () => {

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

@@ -2,7 +2,7 @@ import { createBlock, genRequestsRoot } from '@ethereumjs/block'
 import { createBlockchain } from '@ethereumjs/blockchain'
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
 import { KECCAK256_RLP, createDepositRequest, hexToBytes, randomBytes } from '@ethereumjs/util'
-import { keccak256 } from 'ethereum-cryptography/keccak.js'
+import { sha256 } from 'ethereum-cryptography/keccak.js'
 import { assert, describe, expect, it } from 'vitest'
 
 import { buildBlock, createVM, runBlock } from '../../../src/index.js'
@@ -49,7 +49,7 @@ describe('EIP-7685 runBlock tests', () => {
   it('should not throw invalid requestsRoot error when valid requests are provided', async () => {
     const vm = await setupVM({ common })
     const request = getRandomDepositRequest()
-    const requestsRoot = await genRequestsRoot([request], keccak256)
+    const requestsRoot = genRequestsRoot([request], sha256)
     const block = createBlock(
       {
         requests: [request],