From 7230dfd1150edc7c08be6f97a46c1184a0b2d289 Mon Sep 17 00:00:00 2001 From: maskpp Date: Tue, 17 Sep 2024 16:14:26 +0800 Subject: [PATCH] fix(taiko-client): fix blob server API URL when fetching blob data (#18109) --- packages/taiko-client/pkg/rpc/blob_datasource.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/taiko-client/pkg/rpc/blob_datasource.go b/packages/taiko-client/pkg/rpc/blob_datasource.go index 814bb802c2..b1d208e76a 100644 --- a/packages/taiko-client/pkg/rpc/blob_datasource.go +++ b/packages/taiko-client/pkg/rpc/blob_datasource.go @@ -3,6 +3,7 @@ package rpc import ( "context" "encoding/json" + "errors" "fmt" "net/url" @@ -87,7 +88,9 @@ func (ds *BlobDataSource) GetBlobs( sidecars, err = ds.client.L1Beacon.GetBlobs(ctx, timestamp) } if err != nil { - log.Info("Failed to get blobs from beacon, try to use blob server.", "error", err.Error()) + if !errors.Is(err, pkg.ErrBeaconNotFound) { + log.Info("Failed to get blobs from beacon, try to use blob server.", "error", err.Error()) + } if ds.blobServerEndpoint == nil && ds.socialScanEndpoint == nil { log.Info("No blob server endpoint set") return nil, err @@ -115,7 +118,7 @@ func (ds *BlobDataSource) getBlobFromServer(ctx context.Context, blobHash common err error ) if ds.socialScanEndpoint != nil { - route = "/blob/" + blobHash.String() + route = "/blobs/" + blobHash.String() requestURL, err = url.JoinPath(ds.socialScanEndpoint.String(), route) } else { route = "/blobs/" + blobHash.String() @@ -131,7 +134,7 @@ func (ds *BlobDataSource) getBlobFromServer(ctx context.Context, blobHash common SetHeader("Accept", "application/json"). Get(requestURL) if err != nil { - return nil, err + return nil, fmt.Errorf("failed to get blob from server, request_url: %s, err: %w", requestURL, err) } if !resp.IsSuccess() { return nil, fmt.Errorf(