@@ -446,29 +446,15 @@ proc computeTransactionsTrieRoot(
446446 payload: ForkyExecutionPayload ): EthHash32 =
447447 orderedTrieRoot (payload.transactions.asSeq)
448448
449- func append * (w: var RlpWriter , request: electra.DepositRequest ) =
450- w.append EthDepositRequest (
451- pubkey: Bytes48 request.pubkey.blob,
452- withdrawalCredentials: Bytes32 request.withdrawal_credentials.data,
453- amount: distinctBase (request.amount),
454- signature: Bytes96 request.signature.blob,
455- index: request.index)
456-
457- func append * (w: var RlpWriter , request: electra.WithdrawalRequest ) =
458- w.append EthWithdrawalRequest (
459- sourceAddress: Address request.source_address.data,
460- validatorPubkey: Bytes48 request.validator_pubkey.blob,
461- amount: distinctBase (request.amount))
462-
463- func append * (w: var RlpWriter , request: electra.ConsolidationRequest ) =
464- w.append EthConsolidationRequest (
465- sourceAddress: Address request.source_address.data,
466- sourcePubkey: Bytes48 request.source_pubkey.blob,
467- targetPubkey: Bytes48 request.target_pubkey.blob)
468-
469449# https://eips.ethereum.org/EIPS/eip-7685
470450func computeRequestsHash (
471451 requests: electra.ExecutionRequests ): EthHash32 =
452+
453+ const
454+ DEPOSIT_REQUEST_TYPE = 0x 00 'u8 # EIP-6110
455+ WITHDRAWAL_REQUEST_TYPE = 0x 01 'u8 # EIP-7002
456+ CONSOLIDATION_REQUEST_TYPE = 0x 02 'u8 # EIP-7251
457+
472458 let requestsHash = computeDigest:
473459 template mixInRequests (requestType, requestList): untyped =
474460 block :
0 commit comments