Skip to content

fix(execution): clear omitted payload envelope optionals #3439

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
tac0turtle merged 2 commits into from
Aug 31, 2026
Merged

fix(execution): clear omitted payload envelope optionals #3439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8754b43
fix(execution): clear omitted payload envelope optionals
elonfliter Aug 31, 2026
9a51f90
Merge branch 'main' into feature_for_elon
tac0turtle Aug 31, 2026
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
5 changes: 2 additions & 3 deletions execution/evm/engine_payload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,14 @@ func (e *EnginePayloadEnvelope) UnmarshalJSON(input []byte) error {
e.BlockValue = (*big.Int)(dec.BlockValue)
e.BlobsBundle = dec.BlobsBundle

e.Requests = nil
if dec.Requests != nil {
e.Requests = make([][]byte, len(dec.Requests))
for i, request := range dec.Requests {
e.Requests[i] = request
}
}
if dec.Override != nil {
e.Override = *dec.Override
}
e.Override = dec.Override != nil && *dec.Override
e.Witness = dec.Witness
return nil
}
Expand Down
23 changes: 23 additions & 0 deletions execution/evm/engine_rpc_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,29 @@ func TestEnginePayloadEnvelope_MarshalJSON_UsesWireFieldNames(t *testing.T) {
require.JSONEq(t, string(envelope.RawExecutionPayload), string(decoded.RawExecutionPayload))
}

func TestEnginePayloadEnvelope_UnmarshalClearsOmittedFields(t *testing.T) {
withOptionals := strings.ReplaceAll(minimalPayloadEnvelopeJSON,
`"executionRequests": []`, `"executionRequests": ["0x01"]`)
withOptionals = strings.ReplaceAll(withOptionals,
`"shouldOverrideBuilder": false`, `"shouldOverrideBuilder": true`)

var envelope EnginePayloadEnvelope
require.NoError(t, json.Unmarshal([]byte(withOptionals), &envelope))
require.NotEmpty(t, envelope.Requests)
require.True(t, envelope.Override)

var withoutOptionals map[string]json.RawMessage
require.NoError(t, json.Unmarshal([]byte(minimalPayloadEnvelopeJSON), &withoutOptionals))
delete(withoutOptionals, "executionRequests")
delete(withoutOptionals, "shouldOverrideBuilder")
encoded, err := json.Marshal(withoutOptionals)
require.NoError(t, err)

require.NoError(t, json.Unmarshal(encoded, &envelope))
require.Nil(t, envelope.Requests)
require.False(t, envelope.Override)
}

func TestIsUnsupportedForkErr(t *testing.T) {
tests := []struct {
name string
Expand Down
Loading