Skip to content

execution/engineapi: return INVALID for undecodable blockAccessList #23633

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

Open
nerolation wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −11
Open

execution/engineapi: return INVALID for undecodable blockAccessList #23633

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
18 changes: 8 additions & 10 deletions execution/engineapi/engine_api_bal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,11 +1144,9 @@ func findStorageChange(sc *types.SlotChanges, index uint32) *types.StorageChange
return nil
}

// TestEngineApiNewPayloadBALMalformedVsInvalid pins the EIP-7928 newPayload
// error split: a blockAccessList param that is not decodable RLP is a
// malformed request (-32602 invalid params), while a decodable one that
// violates EIP-7928 ordering rules is an invalid block ({status: INVALID}).
func TestEngineApiNewPayloadBALMalformedVsInvalid(t *testing.T) {
// TestEngineApiNewPayloadBALInvalid pins that both an undecodable blockAccessList
// and a decodable one violating EIP-7928 make the block invalid.
func TestEngineApiNewPayloadBALInvalid(t *testing.T) {
if !dbg.Exec3Parallel {
t.Skip("requires parallel exec")
}
Expand Down Expand Up @@ -1191,11 +1189,11 @@ func TestEngineApiNewPayloadBALMalformedVsInvalid(t *testing.T) {
"string not list": {0x80},
"truncated list": {0xc1},
} {
_, err := sendWithBAL(malformed)
require.Errorf(t, err, "%s: expected invalid-params error", name)
var rpcErr rpc.Error
require.ErrorAsf(t, err, &rpcErr, "%s: expected rpc error, got: %v", name, err)
require.Equalf(t, -32602, rpcErr.ErrorCode(), "%s: %v", name, err)
status, err := sendWithBAL(malformed)
require.NoErrorf(t, err, "%s: expected INVALID status, got error: %v", name, err)
require.Equalf(t, enginetypes.InvalidStatus, status.Status, "%s", name)
require.NotNilf(t, status.ValidationError, "%s", name)
require.ErrorContainsf(t, status.ValidationError.Error(), "undecodable blockAccessList", "%s", name)
}
account := append([]byte{0xda, 0x94}, make([]byte, 20)...)
account = append(account, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0)
Expand Down
5 changes: 4 additions & 1 deletion execution/engineapi/engine_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,10 @@ func (s *EngineServer) newPayload(ctx context.Context, req *engine_types.Executi
blockAccessList, err = types.DecodeBlockAccessListSidecarOwned(balBytes)
if err != nil {
s.logger.Debug("[NewPayload] failed to decode blockAccessList", "err", err, "raw", hex.EncodeToString(balBytes))
return nil, &rpc.InvalidParamsError{Message: fmt.Sprintf("undecodable blockAccessList: %v", err)}
return &engine_types.PayloadStatus{
Status: engine_types.InvalidStatus,
ValidationError: engine_types.NewStringifiedErrorFromString(fmt.Sprintf("undecodable blockAccessList: %v", err)),
}, nil
}
hash, err := blockAccessList.Hash()
if err != nil {
Expand Down
Loading