Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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 core/types/transaction_signing.go
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,10 @@ func (sg Signer) SenderWithContext(context *secp256k1.Context, tx Transaction) (
V.Add(&t.V, u256.Num27)
R, S = &t.R, &t.S
case *BlobTx:
if !sg.blob {
return libcommon.Address{}, fmt.Errorf("blob tx is not supported by signer %s", sg)
}
// TODO: Fix the commented out code below
// if !sg.blob {
// return libcommon.Address{}, fmt.Errorf("blob tx is not supported by signer %s", sg)
// }
if t.ChainID == nil {
if !sg.chainID.IsZero() {
return libcommon.Address{}, ErrInvalidChainId
Expand Down
11 changes: 4 additions & 7 deletions turbo/engineapi/engine_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +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 {
Expand Down Expand Up @@ -210,9 +203,13 @@ func (s *EngineServer) newPayload(ctx context.Context, req *engine_types.Executi
}
if version >= clparams.DenebVersion {
actualBlobHashes := []libcommon.Hash{}

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)
Expand Down
2 changes: 1 addition & 1 deletion turbo/jsonrpc/eth_receipts.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"] = uint256.NewInt(misc.GetBlobGasUsed(numBlobs))
}
}
return fields
Expand Down