Skip to content

Fix and extract payload to header conversion #5101

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
g11tech merged 1 commit into from
Feb 7, 2023
Merged

Fix and extract payload to header conversion #5101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 15 additions & 9 deletions packages/state-transition/src/block/processExecutionPayload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,20 @@ export function processExecutionPayload(
}
}

// For blinded or full payload -> return common header
const transactionsRoot = isExecutionPayload(payload)
? ssz.bellatrix.Transactions.hashTreeRoot(payload.transactions)
: payload.transactionsRoot;
const payloadHeader = isExecutionPayload(payload) ? executionPayloadToPayloadHeader(fork, payload) : payload;

// TODO Deneb: Types are not happy by default. Since it's a generic allForks type going through ViewDU
// transformation then into allForks, probably some weird intersection incompatibility happens
state.latestExecutionPayloadHeader = state.config
.getExecutionForkTypes(state.slot)
.ExecutionPayloadHeader.toViewDU(payloadHeader) as typeof state.latestExecutionPayloadHeader;
}

export function executionPayloadToPayloadHeader(
fork: ForkSeq,
payload: allForks.ExecutionPayload
): allForks.ExecutionPayloadHeader {
const transactionsRoot = ssz.bellatrix.Transactions.hashTreeRoot(payload.transactions);

const bellatrixPayloadFields: allForks.ExecutionPayloadHeader = {
parentHash: payload.parentHash,
Expand Down Expand Up @@ -96,9 +106,5 @@ export function processExecutionPayload(
| deneb.ExecutionPayload).excessDataGas;
}

// TODO Deneb: Types are not happy by default. Since it's a generic allForks type going through ViewDU
// transformation then into allForks, probably some weird intersection incompatibility happens
state.latestExecutionPayloadHeader = state.config
.getExecutionForkTypes(state.slot)
.ExecutionPayloadHeader.toViewDU(bellatrixPayloadFields) as typeof state.latestExecutionPayloadHeader;
return bellatrixPayloadFields;
}
1 change: 1 addition & 0 deletions packages/state-transition/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ export {ExecutionPayloadStatus, DataAvailableStatus, BlockExternalData} from "./
export {becomesNewEth1Data} from "./block/processEth1Data.js";
// Withdrawals for new blocks
export {getExpectedWithdrawals} from "./block/processWithdrawals.js";
export {executionPayloadToPayloadHeader} from "./block/processExecutionPayload.js";