Skip to content

Adopt latest changes to request hash computation #6718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tersec merged 2 commits into from
Nov 24, 2024
Merged

Adopt latest changes to request hash computation #6718

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34faa72
Adopt latest changes to request hash computation
etan-status Nov 21, 2024
0660dc9
Avoid nested computeDigest scopes
etan-status Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions beacon_chain/spec/helpers.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,15 +460,16 @@ func computeRequestsHash(
WITHDRAWAL_REQUEST_TYPE = 0x01'u8 # EIP-7002
CONSOLIDATION_REQUEST_TYPE = 0x02'u8 # EIP-7251

template individualHash(requestType, requestList): Digest =
computeDigest:
h.update([requestType.byte])
for request in requestList:
h.update SSZ.encode(request)

let requestsHash = computeDigest:
template mixInRequests(requestType, requestList): untyped =
block:
let hash = computeDigest:
bind h
h.update([requestType.byte])
for request in requestList:
h.update SSZ.encode(request)
h.update(hash.data)
if requestList.len > 0:
h.update(individualHash(requestType, requestList).data)

static:
doAssert DEPOSIT_REQUEST_TYPE < WITHDRAWAL_REQUEST_TYPE
Expand Down
Loading