Merge branch 'devnet4-contracts' into 7702-devnet-4-plus-t8ntool

jochem-brouwer · jochem-brouwer · commit 1c4c24e985ee · 2024-10-13T19:07:19.000+02:00
diff --git a/packages/block/src/header/constructors.ts b/packages/block/src/header/constructors.ts
@@ -25,7 +25,7 @@ export function createBlockHeader(headerData: HeaderData = {}, opts: BlockOption
  */
 export function createBlockHeaderFromBytesArray(values: BlockHeaderBytes, opts: BlockOptions = {}) {
   const headerData = valuesArrayToHeaderData(values)
-  const { number, baseFeePerGas, excessBlobGas, blobGasUsed, parentBeaconBlockRoot, requestsRoot } =
+  const { number, baseFeePerGas, excessBlobGas, blobGasUsed, parentBeaconBlockRoot, requestsHash } =
     headerData
   const header = createBlockHeader(headerData, opts)
   if (header.common.isActivatedEIP(1559) && baseFeePerGas === undefined) {
@@ -48,8 +48,8 @@ export function createBlockHeaderFromBytesArray(values: BlockHeaderBytes, opts:
     throw new Error('invalid header. parentBeaconBlockRoot should be provided')
   }
 
-  if (header.common.isActivatedEIP(7685) && requestsRoot === undefined) {
-    throw new Error('invalid header. requestsRoot should be provided')
+  if (header.common.isActivatedEIP(7685) && requestsHash === undefined) {
+    throw new Error('invalid header. requestsHash should be provided')
   }
   return header
 }
@@ -118,7 +118,7 @@ export function createBlockHeaderFromRPC(blockParams: JSONRPCBlock, options?: Bl
     blobGasUsed,
     excessBlobGas,
     parentBeaconBlockRoot,
-    requestsRoot,
+    requestsHash,
   } = blockParams
 
   const blockHeader = new BlockHeader(
@@ -143,7 +143,7 @@ export function createBlockHeaderFromRPC(blockParams: JSONRPCBlock, options?: Bl
       blobGasUsed,
       excessBlobGas,
       parentBeaconBlockRoot,
-      requestsRoot,
+      requestsHash,
     },
     options,
   )
diff --git a/packages/block/src/header/header.ts b/packages/block/src/header/header.ts
@@ -60,7 +60,7 @@ export class BlockHeader {
   public readonly blobGasUsed?: bigint
   public readonly excessBlobGas?: bigint
   public readonly parentBeaconBlockRoot?: Uint8Array
-  public readonly requestsRoot?: Uint8Array
+  public readonly requestsHash?: Uint8Array
 
   public readonly common: Common
 
@@ -163,7 +163,7 @@ export class BlockHeader {
       parentBeaconBlockRoot: this.common.isActivatedEIP(4788) ? new Uint8Array(32) : undefined,
       // TODO: not sure what the default should be here becuase it would depends on activated EIPs
       // as even empty requests will produce data to sha hash
-      requestsRoot: this.common.isActivatedEIP(7685) ? KECCAK256_RLP : undefined,
+      requestsHash: this.common.isActivatedEIP(7685) ? KECCAK256_RLP : undefined,
     }
 
     const baseFeePerGas =
@@ -177,8 +177,8 @@ export class BlockHeader {
     const parentBeaconBlockRoot =
       toType(headerData.parentBeaconBlockRoot, TypeOutput.Uint8Array) ??
       hardforkDefaults.parentBeaconBlockRoot
-    const requestsRoot =
-      toType(headerData.requestsRoot, TypeOutput.Uint8Array) ?? hardforkDefaults.requestsRoot
+    const requestsHash =
+      toType(headerData.requestsHash, TypeOutput.Uint8Array) ?? hardforkDefaults.requestsHash
 
     if (!this.common.isActivatedEIP(1559) && baseFeePerGas !== undefined) {
       throw new Error('A base fee for a block can only be set with EIP1559 being activated')
@@ -206,8 +206,8 @@ export class BlockHeader {
       )
     }
 
-    if (!this.common.isActivatedEIP(7685) && requestsRoot !== undefined) {
-      throw new Error('requestsRoot can only be provided with EIP 7685 activated')
+    if (!this.common.isActivatedEIP(7685) && requestsHash !== undefined) {
+      throw new Error('requestsHash can only be provided with EIP 7685 activated')
     }
 
     this.parentHash = parentHash
@@ -230,7 +230,7 @@ export class BlockHeader {
     this.blobGasUsed = blobGasUsed
     this.excessBlobGas = excessBlobGas
     this.parentBeaconBlockRoot = parentBeaconBlockRoot
-    this.requestsRoot = requestsRoot
+    this.requestsHash = requestsHash
     this._genericFormatValidation()
     this._validateDAOExtraData()
 
@@ -346,8 +346,8 @@ export class BlockHeader {
     }
 
     if (this.common.isActivatedEIP(7685)) {
-      if (this.requestsRoot === undefined) {
-        const msg = this._errorMsg('EIP7685 block has no requestsRoot field')
+      if (this.requestsHash === undefined) {
+        const msg = this._errorMsg('EIP7685 block has no requestsHash field')
         throw new Error(msg)
       }
     }
@@ -628,7 +628,7 @@ export class BlockHeader {
       rawItems.push(this.parentBeaconBlockRoot!)
     }
     if (this.common.isActivatedEIP(7685)) {
-      rawItems.push(this.requestsRoot!)
+      rawItems.push(this.requestsHash!)
     }
 
     return rawItems
@@ -770,7 +770,7 @@ export class BlockHeader {
       JSONDict.parentBeaconBlockRoot = bytesToHex(this.parentBeaconBlockRoot!)
     }
     if (this.common.isActivatedEIP(7685)) {
-      JSONDict.requestsRoot = bytesToHex(this.requestsRoot!)
+      JSONDict.requestsHash = bytesToHex(this.requestsHash!)
     }
     return JSONDict
   }
diff --git a/packages/block/src/helpers.ts b/packages/block/src/helpers.ts
@@ -47,7 +47,7 @@ export function valuesArrayToHeaderData(values: BlockHeaderBytes): HeaderData {
     blobGasUsed,
     excessBlobGas,
     parentBeaconBlockRoot,
-    requestsRoot,
+    requestsHash,
   ] = values
 
   if (values.length > 21) {
@@ -82,7 +82,7 @@ export function valuesArrayToHeaderData(values: BlockHeaderBytes): HeaderData {
     blobGasUsed,
     excessBlobGas,
     parentBeaconBlockRoot,
-    requestsRoot,
+    requestsHash,
   }
 }
 
diff --git a/packages/block/src/types.ts b/packages/block/src/types.ts
@@ -108,7 +108,7 @@ export interface HeaderData {
   blobGasUsed?: BigIntLike
   excessBlobGas?: BigIntLike
   parentBeaconBlockRoot?: BytesLike
-  requestsRoot?: BytesLike
+  requestsHash?: BytesLike
 }
 
 /**
@@ -191,7 +191,7 @@ export interface JSONHeader {
   blobGasUsed?: PrefixedHexString
   excessBlobGas?: PrefixedHexString
   parentBeaconBlockRoot?: PrefixedHexString
-  requestsRoot?: PrefixedHexString
+  requestsHash?: PrefixedHexString
 }
 
 /*
@@ -225,7 +225,7 @@ export interface JSONRPCBlock {
   excessBlobGas?: PrefixedHexString // If EIP-4844 is enabled for this block, returns the excess blob gas for the block
   parentBeaconBlockRoot?: PrefixedHexString // If EIP-4788 is enabled for this block, returns parent beacon block root
   executionWitness?: VerkleExecutionWitness | null // If Verkle is enabled for this block
-  requestsRoot?: PrefixedHexString // If EIP-7685 is enabled for this block, returns the requests root
+  requestsHash?: PrefixedHexString // If EIP-7685 is enabled for this block, returns the requests root
 }
 
 export type WithdrawalV1 = {
diff --git a/packages/block/test/eip7685block.spec.ts b/packages/block/test/eip7685block.spec.ts
@@ -49,30 +49,30 @@ const common = new Common({
 describe('7685 tests', () => {
   it('should instantiate block with defaults', () => {
     const block = createBlock({}, { common })
-    assert.deepEqual(block.header.requestsRoot, KECCAK256_RLP)
+    assert.deepEqual(block.header.requestsHash, KECCAK256_RLP)
     const block2 = new Block(undefined, undefined, undefined, undefined, { common })
-    assert.deepEqual(block.header.requestsRoot, KECCAK256_RLP)
+    assert.deepEqual(block.header.requestsHash, KECCAK256_RLP)
     assert.equal(block2.requests?.length, 0)
   })
   it('should instantiate a block with requests', async () => {
     const request = getRandomDepositRequest()
-    const requestsRoot = genRequestsRoot([request], sha256)
+    const requestsHash = genRequestsRoot([request], sha256)
     const block = createBlock(
       {
         requests: [request],
-        header: { requestsRoot },
+        header: { requestsHash },
       },
       { common },
     )
     assert.equal(block.requests?.length, 1)
-    assert.deepEqual(block.header.requestsRoot, requestsRoot)
+    assert.deepEqual(block.header.requestsHash, requestsHash)
   })
-  it('RequestsRootIsValid should return false when requestsRoot is invalid', async () => {
+  it('RequestsRootIsValid should return false when requestsHash is invalid', async () => {
     const request = getRandomDepositRequest()
     const block = createBlock(
       {
         requests: [request],
-        header: { requestsRoot: randomBytes(32) },
+        header: { requestsHash: randomBytes(32) },
       },
       { common },
     )
@@ -84,14 +84,14 @@ describe('7685 tests', () => {
     const request2 = getRandomDepositRequest()
     const request3 = getRandomWithdrawalRequest()
     const requests = [request1, request2, request3]
-    const requestsRoot = genRequestsRoot(requests, sha256)
+    const requestsHash = genRequestsRoot(requests, sha256)
 
     // Construct block with requests in correct order
 
     const block = createBlock(
       {
         requests,
-        header: { requestsRoot },
+        header: { requestsHash },
       },
       { common },
     )
@@ -103,7 +103,7 @@ describe('7685 tests', () => {
       createBlock(
         {
           requests: [request1, request3, request2],
-          header: { requestsRoot },
+          header: { requestsHash },
         },
         { common },
       ),
@@ -119,23 +119,23 @@ describe('createWithdrawalFromBytesArray tests', () => {
         common,
       },
     )
-    assert.deepEqual(block.header.requestsRoot, KECCAK256_RLP)
+    assert.deepEqual(block.header.requestsHash, KECCAK256_RLP)
   })
   it('should construct a block with a valid requests array', async () => {
     const request1 = getRandomDepositRequest()
     const request2 = getRandomWithdrawalRequest()
     const request3 = getRandomWithdrawalRequest()
     const requests = [request1, request2, request3]
-    const requestsRoot = genRequestsRoot(requests, sha256)
+    const requestsHash = genRequestsRoot(requests, sha256)
     const serializedRequests = [request1.serialize(), request2.serialize(), request3.serialize()]
 
     const block = createBlockFromBytesArray(
-      [createBlockHeader({ requestsRoot }, { common }).raw(), [], [], [], serializedRequests],
+      [createBlockHeader({ requestsHash }, { common }).raw(), [], [], [], serializedRequests],
       {
         common,
       },
     )
-    assert.deepEqual(block.header.requestsRoot, requestsRoot)
+    assert.deepEqual(block.header.requestsHash, requestsHash)
     assert.equal(block.requests?.length, 3)
   })
 })
@@ -146,11 +146,11 @@ describe('fromRPC tests', () => {
     const request2 = getRandomDepositRequest()
     const request3 = getRandomWithdrawalRequest()
     const requests = [request1, request2, request3]
-    const requestsRoot = genRequestsRoot(requests, sha256)
+    const requestsHash = genRequestsRoot(requests, sha256)
     const serializedRequests = [request1.serialize(), request2.serialize(), request3.serialize()]
 
     const block = createBlockFromBytesArray(
-      [createBlockHeader({ requestsRoot }, { common }).raw(), [], [], [], serializedRequests],
+      [createBlockHeader({ requestsHash }, { common }).raw(), [], [], [], serializedRequests],
       {
         common,
       },
diff --git a/packages/blockchain/src/blockchain.ts b/packages/blockchain/src/blockchain.ts
@@ -581,8 +581,8 @@ export class Blockchain implements BlockchainInterface {
     }
 
     if (header.common.isActivatedEIP(7685)) {
-      if (header.requestsRoot === undefined) {
-        throw new Error(`requestsRoot must be provided when EIP-7685 is active`)
+      if (header.requestsHash === undefined) {
+        throw new Error(`requestsHash must be provided when EIP-7685 is active`)
       }
     }
   }
diff --git a/packages/blockchain/test/blockValidation.spec.ts b/packages/blockchain/test/blockValidation.spec.ts
@@ -390,7 +390,7 @@ describe('[Blockchain]: Block validation tests', () => {
   })
 })
 describe('EIP 7685: requests field validation tests', () => {
-  it('should throw when putting a block with an invalid requestsRoot', async () => {
+  it('should throw when putting a block with an invalid requestsHash', async () => {
     const common = new Common({
       chain: Mainnet,
       hardfork: Hardfork.Cancun,
@@ -403,7 +403,7 @@ describe('EIP 7685: requests field validation tests', () => {
       {
         header: {
           number: 1n,
-          requestsRoot: randomBytes(32),
+          requestsHash: randomBytes(32),
           withdrawalsRoot: KECCAK256_RLP,
           parentHash: blockchain.genesisBlock.hash(),
           timestamp: blockchain.genesisBlock.header.timestamp + 1n,
@@ -413,13 +413,13 @@ describe('EIP 7685: requests field validation tests', () => {
       { common },
     )
 
-    await expect(async () => blockchain.putBlock(block)).rejects.toThrow('invalid requestsRoot')
+    await expect(async () => blockchain.putBlock(block)).rejects.toThrow('invalid requestsHash')
 
     const blockWithRequest = createBlock(
       {
         header: {
           number: 1n,
-          requestsRoot: randomBytes(32),
+          requestsHash: randomBytes(32),
           withdrawalsRoot: KECCAK256_RLP,
           parentHash: blockchain.genesisBlock.hash(),
           timestamp: blockchain.genesisBlock.header.timestamp + 1n,
@@ -430,7 +430,7 @@ describe('EIP 7685: requests field validation tests', () => {
       { common },
     )
     await expect(async () => blockchain.putBlock(blockWithRequest)).rejects.toThrow(
-      'invalid requestsRoot',
+      'invalid requestsHash',
     )
   })
 })
diff --git a/packages/client/src/rpc/modules/engine/util/newPayload.ts b/packages/client/src/rpc/modules/engine/util/newPayload.ts
@@ -140,12 +140,12 @@ export const validate7685ExecutionRequests = (
   // Collect versioned hashes in the flat array `txVersionedHashes` to match with received
   const requests = executionRequests.map((req) => createCLRequest(hexToBytes(req)))
   const sha256Function = headBlock.common.customCrypto.sha256 ?? sha256
-  const requestsRoot = genRequestsRoot(requests, sha256Function)
+  const requestsHash = genRequestsRoot(requests, sha256Function)
 
-  if (!equalsBytes(requestsRoot, headBlock.header.requestsRoot!)) {
-    validationError = `Invalid requestsRoot received=${bytesToHex(
-      headBlock.header.requestsRoot!,
-    )} expected=${bytesToHex(requestsRoot)}`
+  if (!equalsBytes(requestsHash, headBlock.header.requestsHash!)) {
+    validationError = `Invalid requestsHash received=${bytesToHex(
+      headBlock.header.requestsHash!,
+    )} expected=${bytesToHex(requestsHash)}`
   }
   return validationError
 }
diff --git a/packages/client/src/rpc/modules/eth.ts b/packages/client/src/rpc/modules/eth.ts
@@ -152,7 +152,7 @@ const toJSONRPCBlock = async (
     blobGasUsed: header.blobGasUsed,
     excessBlobGas: header.excessBlobGas,
     parentBeaconBlockRoot: header.parentBeaconBlockRoot,
-    requestsRoot: header.requestsRoot,
+    requestsHash: header.requestsHash,
   }
 }
 
diff --git a/packages/vm/src/buildBlock.ts b/packages/vm/src/buildBlock.ts
@@ -343,11 +343,11 @@ export class BlockBuilder {
     }
 
     let requests
-    let requestsRoot
+    let requestsHash
     if (this.vm.common.isActivatedEIP(7685)) {
       const sha256Function = this.vm.common.customCrypto.sha256 ?? sha256
       requests = await accumulateRequests(this.vm, this.transactionResults)
-      requestsRoot = genRequestsRoot(requests, sha256Function)
+      requestsHash = genRequestsRoot(requests, sha256Function)
     }
 
     // get stateRoot after all the accumulateRequests etc have been done
@@ -363,7 +363,7 @@ export class BlockBuilder {
       timestamp,
       // correct excessBlobGas should already be part of headerData used above
       blobGasUsed,
-      requestsRoot,
+      requestsHash,
     }
 
     if (consensusType === ConsensusType.ProofOfWork) {
diff --git a/packages/vm/src/runBlock.ts b/packages/vm/src/runBlock.ts
diff --git a/packages/vm/src/types.ts b/packages/vm/src/types.ts
diff --git a/packages/vm/test/api/EIPs/eip-7685.spec.ts b/packages/vm/test/api/EIPs/eip-7685.spec.ts
diff --git a/packages/vm/test/t8n/t8ntool.ts b/packages/vm/test/t8n/t8ntool.ts

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ export class BlockHeader {`
`60`	`60`	`public readonly blobGasUsed?: bigint`
`61`	`61`	`public readonly excessBlobGas?: bigint`
`62`	`62`	`public readonly parentBeaconBlockRoot?: Uint8Array`
`63`		`- public readonly requestsRoot?: Uint8Array`
	`63`	`+ public readonly requestsHash?: Uint8Array`
`64`	`64`
`65`	`65`	`public readonly common: Common`
`66`	`66`
`@@ -163,7 +163,7 @@ export class BlockHeader {`
`163`	`163`	`parentBeaconBlockRoot: this.common.isActivatedEIP(4788) ? new Uint8Array(32) : undefined,`
`164`	`164`	`// TODO: not sure what the default should be here becuase it would depends on activated EIPs`
`165`	`165`	`// as even empty requests will produce data to sha hash`
`166`		`- requestsRoot: this.common.isActivatedEIP(7685) ? KECCAK256_RLP : undefined,`
	`166`	`+ requestsHash: this.common.isActivatedEIP(7685) ? KECCAK256_RLP : undefined,`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`const baseFeePerGas =`
`@@ -177,8 +177,8 @@ export class BlockHeader {`
`177`	`177`	`const parentBeaconBlockRoot =`
`178`	`178`	`toType(headerData.parentBeaconBlockRoot, TypeOutput.Uint8Array) ??`
`179`	`179`	`hardforkDefaults.parentBeaconBlockRoot`
`180`		`- const requestsRoot =`
`181`		`- toType(headerData.requestsRoot, TypeOutput.Uint8Array) ?? hardforkDefaults.requestsRoot`
	`180`	`+ const requestsHash =`
	`181`	`+ toType(headerData.requestsHash, TypeOutput.Uint8Array) ?? hardforkDefaults.requestsHash`
`182`	`182`
`183`	`183`	`if (!this.common.isActivatedEIP(1559) && baseFeePerGas !== undefined) {`
`184`	`184`	`throw new Error('A base fee for a block can only be set with EIP1559 being activated')`
`@@ -206,8 +206,8 @@ export class BlockHeader {`
`206`	`206`	`)`
`207`	`207`	`}`
`208`	`208`
`209`		`- if (!this.common.isActivatedEIP(7685) && requestsRoot !== undefined) {`
`210`		`- throw new Error('requestsRoot can only be provided with EIP 7685 activated')`
	`209`	`+ if (!this.common.isActivatedEIP(7685) && requestsHash !== undefined) {`
	`210`	`+ throw new Error('requestsHash can only be provided with EIP 7685 activated')`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`this.parentHash = parentHash`
`@@ -230,7 +230,7 @@ export class BlockHeader {`
`230`	`230`	`this.blobGasUsed = blobGasUsed`
`231`	`231`	`this.excessBlobGas = excessBlobGas`
`232`	`232`	`this.parentBeaconBlockRoot = parentBeaconBlockRoot`
`233`		`- this.requestsRoot = requestsRoot`
	`233`	`+ this.requestsHash = requestsHash`
`234`	`234`	`this._genericFormatValidation()`
`235`	`235`	`this._validateDAOExtraData()`
`236`	`236`
`@@ -346,8 +346,8 @@ export class BlockHeader {`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`if (this.common.isActivatedEIP(7685)) {`
`349`		`- if (this.requestsRoot === undefined) {`
`350`		`- const msg = this._errorMsg('EIP7685 block has no requestsRoot field')`
	`349`	`+ if (this.requestsHash === undefined) {`
	`350`	`+ const msg = this._errorMsg('EIP7685 block has no requestsHash field')`
`351`	`351`	`throw new Error(msg)`
`352`	`352`	`}`
`353`	`353`	`}`
`@@ -628,7 +628,7 @@ export class BlockHeader {`
`628`	`628`	`rawItems.push(this.parentBeaconBlockRoot!)`
`629`	`629`	`}`
`630`	`630`	`if (this.common.isActivatedEIP(7685)) {`
`631`		`- rawItems.push(this.requestsRoot!)`
	`631`	`+ rawItems.push(this.requestsHash!)`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`return rawItems`
`@@ -770,7 +770,7 @@ export class BlockHeader {`
`770`	`770`	`JSONDict.parentBeaconBlockRoot = bytesToHex(this.parentBeaconBlockRoot!)`
`771`	`771`	`}`
`772`	`772`	`if (this.common.isActivatedEIP(7685)) {`
`773`		`- JSONDict.requestsRoot = bytesToHex(this.requestsRoot!)`
	`773`	`+ JSONDict.requestsHash = bytesToHex(this.requestsHash!)`
`774`	`774`	`}`
`775`	`775`	`return JSONDict`
`776`	`776`	`}`
Original file line number	Diff line number	Diff line change
`@@ -581,8 +581,8 @@ export class Blockchain implements BlockchainInterface {`
`581`	`581`	`}`
`582`	`582`
`583`	`583`	`if (header.common.isActivatedEIP(7685)) {`
`584`		`- if (header.requestsRoot === undefined) {`
`585`		- throw new Error(`requestsRoot must be provided when EIP-7685 is active`)
	`584`	`+ if (header.requestsHash === undefined) {`
	`585`	+ throw new Error(`requestsHash must be provided when EIP-7685 is active`)
`586`	`586`	`}`
`587`	`587`	`}`
`588`	`588`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ const toJSONRPCBlock = async (`
`152`	`152`	`blobGasUsed: header.blobGasUsed,`
`153`	`153`	`excessBlobGas: header.excessBlobGas,`
`154`	`154`	`parentBeaconBlockRoot: header.parentBeaconBlockRoot,`
`155`		`- requestsRoot: header.requestsRoot,`
	`155`	`+ requestsHash: header.requestsHash,`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`
Original file line number	Diff line number	Diff line change
`@@ -343,11 +343,11 @@ export class BlockBuilder {`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`let requests`
`346`		`- let requestsRoot`
	`346`	`+ let requestsHash`
`347`	`347`	`if (this.vm.common.isActivatedEIP(7685)) {`
`348`	`348`	`const sha256Function = this.vm.common.customCrypto.sha256 ?? sha256`
`349`	`349`	`requests = await accumulateRequests(this.vm, this.transactionResults)`
`350`		`- requestsRoot = genRequestsRoot(requests, sha256Function)`
	`350`	`+ requestsHash = genRequestsRoot(requests, sha256Function)`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`// get stateRoot after all the accumulateRequests etc have been done`
`@@ -363,7 +363,7 @@ export class BlockBuilder {`
`363`	`363`	`timestamp,`
`364`	`364`	`// correct excessBlobGas should already be part of headerData used above`
`365`	`365`	`blobGasUsed,`
`366`		`- requestsRoot,`
	`366`	`+ requestsHash,`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`if (consensusType === ConsensusType.ProofOfWork) {`