forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 14:46:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

eth/catalyst: rework error message

Browse source
This commit is contained in:
MariusVanDerWijden 2025-04-29 19:08:00 +02:00
parent 0fc4112947
commit 10e76e820e
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
eth/catalyst/api.go
View file

@ -515,11 +515,7 @@ func (api *ConsensusAPI) GetPayloadV3(payloadID engine.PayloadID) (*engine.Execu
if !payloadID.Is(engine.PayloadV3) {
return nil, engine.UnsupportedFork
}
envelope, err := api.getPayload(payloadID, false)
if err != nil {
return nil, err
}
return envelope, nil
return api.getPayload(payloadID, false)
}
// GetPayloadV4 returns a cached payload by id.
@ -527,11 +523,7 @@ func (api *ConsensusAPI) GetPayloadV4(payloadID engine.PayloadID) (*engine.Execu
if !payloadID.Is(engine.PayloadV3) {
return nil, engine.UnsupportedFork
}
envelope, err := api.getPayload(payloadID, false)
if err != nil {
return nil, err
}
return envelope, nil
return api.getPayload(payloadID, false)
}
// GetPayloadV4 returns a cached payload by id.
@ -539,11 +531,7 @@ func (api *ConsensusAPI) GetPayloadV5(payloadID engine.PayloadID) (*engine.Execu
if !payloadID.Is(engine.PayloadV3) {
return nil, engine.UnsupportedFork
}
envelope, err := api.getPayload(payloadID, false)
if err != nil {
return nil, err
}
return envelope, nil
return api.getPayload(payloadID, false)
}
func (api *ConsensusAPI) getPayload(payloadID engine.PayloadID, full bool) (*engine.ExecutionPayloadEnvelope, error) {
@ -618,8 +606,8 @@ func (api *ConsensusAPI) GetBlobsV2(hashes []common.Hash) ([]*engine.BlobAndProo
// not found, return empty response
return nil, nil
}
if len(sidecar.Proofs) != len(sidecar.Blobs)*kzg4844.CellProofsPerBlob {
return nil, errors.New("NORMAL PROOFS IN GETBLOBSV2, THIS SHOULD NEVER HAPPEN, PLEASE REPORT")
if sidecar.Version != 1 {
return nil, fmt.Errorf("GetBlobs queried V0 transaction: index %v, blobhashes %v", index, sidecar.BlobHashes())
}
blobHashes := sidecar.BlobHashes()
for bIdx, hash := range blobHashes {