diff --git a/turbo/engineapi/engine_server.go b/turbo/engineapi/engine_server.go index 95bbca4fe7a..54ea74c8087 100644 --- a/turbo/engineapi/engine_server.go +++ b/turbo/engineapi/engine_server.go @@ -171,14 +171,6 @@ func (s *EngineServer) newPayload(ctx context.Context, req *engine_types.Executi return nil, &rpc.UnsupportedForkError{Message: "Unsupported fork"} } - if s.config.IsCancun(header.Time) && (header.BlobGasUsed == nil || header.ExcessBlobGas == nil) { - return nil, &rpc.InvalidParamsError{Message: "blobGasUsed/excessBlobGas missing"} - } - - if s.config.IsCancun(header.Time) && header.ParentBeaconBlockRoot == nil { - return nil, &rpc.InvalidParamsError{Message: "parentBeaconBlockRoot missing"} - } - blockHash := req.BlockHash if header.Hash() != blockHash { m3, _ := header.MarshalJSON() @@ -213,6 +205,9 @@ func (s *EngineServer) newPayload(ctx context.Context, req *engine_types.Executi for _, tx := range transactions { actualBlobHashes = append(actualBlobHashes, tx.GetBlobHashes()...) } + if expectedBlobHashes == nil { + return nil, &rpc.InvalidParamsError{Message: "nil blob hashes array"} + } if !reflect.DeepEqual(actualBlobHashes, expectedBlobHashes) { s.logger.Warn("[NewPayload] mismatch in blob hashes", "expectedBlobHashes", expectedBlobHashes, "actualBlobHashes", actualBlobHashes) diff --git a/turbo/jsonrpc/eth_receipts.go b/turbo/jsonrpc/eth_receipts.go index 4ea9d1cfac0..d374815c3d2 100644 --- a/turbo/jsonrpc/eth_receipts.go +++ b/turbo/jsonrpc/eth_receipts.go @@ -775,7 +775,7 @@ func marshalReceipt(receipt *types.Receipt, txn types.Transaction, chainConfig * log.Error(err.Error()) } fields["blobGasPrice"] = blobGasPrice - fields["blobGasUsed"] = misc.GetBlobGasUsed(numBlobs) + fields["blobGasUsed"] = hexutil.Uint64(misc.GetBlobGasUsed(numBlobs)) } } return fields