Skip to content

Replace INVALID_BLOCK_HASH with INVALID #6671

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
yperbasis merged 1 commit into from
Jan 23, 2023
Merged

Replace INVALID_BLOCK_HASH with INVALID #6671

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
7 changes: 4 additions & 3 deletions ethdb/privateapi/ethbackend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,15 +319,17 @@ func (s *EthBackendServer) EngineNewPayload(ctx context.Context, req *types2.Exe
blockHash := gointerfaces.ConvertH256ToHash(req.BlockHash)
if header.Hash() != blockHash {
log.Error("[NewPayload] invalid block hash", "stated", libcommon.Hash(blockHash), "actual", header.Hash())
return &remote.EnginePayloadStatus{Status: remote.EngineStatus_INVALID_BLOCK_HASH}, nil
return &remote.EnginePayloadStatus{
Status: remote.EngineStatus_INVALID,
ValidationError: "invalid block hash",
}, nil
}

for _, txn := range req.Transactions {
if types.TypedTransactionMarshalledAsRlpString(txn) {
log.Warn("[NewPayload] typed txn marshalled as RLP string", "txn", common.Bytes2Hex(txn))
return &remote.EnginePayloadStatus{
Status: remote.EngineStatus_INVALID,
LatestValidHash: nil,
ValidationError: "typed txn marshalled as RLP string",
}, nil
}
Expand All @@ -338,7 +340,6 @@ func (s *EthBackendServer) EngineNewPayload(ctx context.Context, req *types2.Exe
log.Warn("[NewPayload] failed to decode transactions", "err", err)
return &remote.EnginePayloadStatus{
Status: remote.EngineStatus_INVALID,
LatestValidHash: nil,
ValidationError: err.Error(),
}, nil
}
Expand Down