client/util/vm: simplify CLRequest

ethereumjs · Oct 31, 2024 · 5446fb8 · 5446fb8
1 parent 46ec57d
commit 5446fb8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 42 deletions.
diff --git a/packages/client/src/rpc/modules/engine/util/newPayload.ts b/packages/client/src/rpc/modules/engine/util/newPayload.ts
@@ -1,12 +1,6 @@
 import { createBlockFromExecutionPayload, genRequestsRoot } from '@ethereumjs/block'
 import { Blob4844Tx } from '@ethereumjs/tx'
-import {
-  ConsolidationRequest,
-  DepositRequest,
-  WithdrawalRequest,
-  bytesToHex,
-  hexToBytes,
-} from '@ethereumjs/util'
+import { CLRequest, CLRequestType, bytesToHex, hexToBytes } from '@ethereumjs/util'
 import { sha256 } from 'ethereum-cryptography/sha256'
 
 import { short } from '../../../../util/index.js'
@@ -18,7 +12,7 @@ import type { Chain } from '../../../../blockchain/index.js'
 import type { ChainCache, PayloadStatusV1 } from '../types.js'
 import type { Block, ExecutionPayload } from '@ethereumjs/block'
 import type { Common } from '@ethereumjs/common'
-import type { CLRequest, CLRequestType, PrefixedHexString } from '@ethereumjs/util'
+import type { PrefixedHexString } from '@ethereumjs/util'
 
 type CLData = {
   parentBeaconBlockRoot?: PrefixedHexString
@@ -68,15 +62,19 @@ export const validateAndGen7685RequestsHash = (
   const requests: CLRequest<CLRequestType>[] = []
   let requestIndex = 0
   if (common.isActivatedEIP(6110)) {
-    requests.push(new DepositRequest(hexToBytes(executionRequests[requestIndex])))
+    requests.push(new CLRequest(CLRequestType.Deposit, hexToBytes(executionRequests[requestIndex])))
     requestIndex++
   }
   if (common.isActivatedEIP(7002)) {
-    requests.push(new WithdrawalRequest(hexToBytes(executionRequests[requestIndex])))
+    requests.push(
+      new CLRequest(CLRequestType.Withdrawal, hexToBytes(executionRequests[requestIndex])),
+    )
     requestIndex++
   }
   if (common.isActivatedEIP(7251)) {
-    requests.push(new ConsolidationRequest(hexToBytes(executionRequests[requestIndex])))
+    requests.push(
+      new CLRequest(CLRequestType.Consolidation, hexToBytes(executionRequests[requestIndex])),
+    )
     requestIndex++
   }
 

diff --git a/packages/util/src/request.ts b/packages/util/src/request.ts
@@ -32,32 +32,14 @@ export class CLRequest<T extends CLRequestType> {
   }
 }
 
-export class DepositRequest extends CLRequest<CLRequestType.Deposit> {
-  constructor(requestData: Uint8Array) {
-    super(CLRequestType.Deposit, requestData)
-  }
-}
-
-export class WithdrawalRequest extends CLRequest<CLRequestType.Withdrawal> {
-  constructor(requestData: Uint8Array) {
-    super(CLRequestType.Withdrawal, requestData)
-  }
-}
-
-export class ConsolidationRequest extends CLRequest<CLRequestType.Consolidation> {
-  constructor(requestData: Uint8Array) {
-    super(CLRequestType.Consolidation, requestData)
-  }
-}
-
-export function createCLRequest<T extends CLRequestType>(bytes: Uint8Array): CLRequest<T> {
+export function createCLRequest(bytes: Uint8Array): CLRequest<CLRequestType> {
   switch (bytes[0]) {
     case CLRequestType.Deposit:
-      return new DepositRequest(bytes.subarray(1)) as CLRequest<T>
+      return new CLRequest(CLRequestType.Deposit, bytes.subarray(1))
     case CLRequestType.Withdrawal:
-      return new WithdrawalRequest(bytes.subarray(1)) as CLRequest<T>
+      return new CLRequest(CLRequestType.Withdrawal, bytes.subarray(1))
     case CLRequestType.Consolidation:
-      return new ConsolidationRequest(bytes.subarray(1)) as CLRequest<T>
+      return new CLRequest(CLRequestType.Consolidation, bytes.subarray(1))
     default:
       throw Error(`Invalid request type=${bytes[0]}`)
   }

diff --git a/packages/vm/src/requests.ts b/packages/vm/src/requests.ts
@@ -1,8 +1,7 @@
 import { Mainnet } from '@ethereumjs/common'
 import {
-  ConsolidationRequest,
-  DepositRequest,
-  WithdrawalRequest,
+  CLRequest,
+  CLRequestType,
   bigIntToAddressBytes,
   bigIntToBytes,
   bytesToHex,
@@ -14,7 +13,6 @@ import {
 
 import type { RunTxResult } from './types.js'
 import type { VM } from './vm.js'
-import type { CLRequest, CLRequestType } from '@ethereumjs/util'
 
 /**
  * This helper method generates a list of all CL requests that can be included in a pending block
@@ -69,7 +67,7 @@ const accumulateWithdrawalsRequest = async (
   const originalAccount = await vm.stateManager.getAccount(withdrawalsAddress)
 
   if (originalAccount === undefined) {
-    return new WithdrawalRequest(new Uint8Array())
+    return new CLRequest(CLRequestType.Withdrawal, new Uint8Array())
   }
 
   const results = await vm.evm.runCall({
@@ -85,7 +83,7 @@ const accumulateWithdrawalsRequest = async (
   }
 
   const resultsBytes = results.execResult.returnValue
-  return new WithdrawalRequest(resultsBytes)
+  return new CLRequest(CLRequestType.Withdrawal, resultsBytes)
 }
 
 const accumulateConsolidationsRequest = async (
@@ -105,7 +103,7 @@ const accumulateConsolidationsRequest = async (
   const originalAccount = await vm.stateManager.getAccount(consolidationsAddress)
 
   if (originalAccount === undefined) {
-    return new ConsolidationRequest(new Uint8Array(0))
+    return new CLRequest(CLRequestType.Consolidation, new Uint8Array(0))
   }
 
   const results = await vm.evm.runCall({
@@ -121,7 +119,7 @@ const accumulateConsolidationsRequest = async (
   }
 
   const resultsBytes = results.execResult.returnValue
-  return new ConsolidationRequest(resultsBytes)
+  return new CLRequest(CLRequestType.Consolidation, resultsBytes)
 }
 
 const accumulateDepositsRequest = (
@@ -148,7 +146,7 @@ const accumulateDepositsRequest = (
     }
   }
 
-  return new DepositRequest(resultsBytes)
+  return new CLRequest(CLRequestType.Deposit, resultsBytes)
 }
 
 function parseDepositLog(requestData: Uint8Array) {