From 8f9189ae753d87fc678ff0d58368f8d2f6f0d226 Mon Sep 17 00:00:00 2001
From: Jeffery Walsh <cyberhorsey@gmail.com>
Date: Tue, 21 May 2024 10:23:55 -0700
Subject: [PATCH] build on pr + always use blobserver

---
 .github/workflows/taiko-client--docker.yml    |  3 ++
 .../taiko-client/pkg/rpc/blob_datasource.go   | 38 +++++++++----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/taiko-client--docker.yml b/.github/workflows/taiko-client--docker.yml
index 77f656daf8d..ca9bc3bdecc 100644
--- a/.github/workflows/taiko-client--docker.yml
+++ b/.github/workflows/taiko-client--docker.yml
@@ -7,6 +7,9 @@ on:
       - "taiko-client-v*"
     paths:
       - "packages/taiko-client/**"
+  pull_request:
+    paths:
+      - "packages/taiko-client/**"
 
 jobs:
   push-docker-image:
diff --git a/packages/taiko-client/pkg/rpc/blob_datasource.go b/packages/taiko-client/pkg/rpc/blob_datasource.go
index 0bff5a4ed96..b95177fdb0c 100644
--- a/packages/taiko-client/pkg/rpc/blob_datasource.go
+++ b/packages/taiko-client/pkg/rpc/blob_datasource.go
@@ -61,29 +61,29 @@ func (ds *BlobDataSource) GetBlobs(
 		sidecars []*blob.Sidecar
 		err      error
 	)
-	if ds.client.L1Beacon == nil {
-		sidecars, err = nil, pkg.ErrBeaconNotFound
-	} else {
-		sidecars, err = ds.client.L1Beacon.GetBlobs(ctx, meta.Timestamp)
+	// if ds.client.L1Beacon == nil {
+	// 	sidecars, err = nil, pkg.ErrBeaconNotFound
+	// } else {
+	// 	sidecars, err = ds.client.L1Beacon.GetBlobs(ctx, meta.Timestamp)
+	// }
+	// if err != nil {
+	log.Info("Failed to get blobs from beacon, try to use blob server.", "error", err.Error())
+	if ds.blobServerEndpoint == nil {
+		log.Info("No blob server endpoint set")
+		return nil, err
 	}
+	blobs, err := ds.getBlobFromServer(ctx, meta.BlobHash)
 	if err != nil {
-		log.Info("Failed to get blobs from beacon, try to use blob server.", "error", err.Error())
-		if ds.blobServerEndpoint == nil {
-			log.Info("No blob server endpoint set")
-			return nil, err
-		}
-		blobs, err := ds.getBlobFromServer(ctx, meta.BlobHash)
-		if err != nil {
-			return nil, err
-		}
-		sidecars = make([]*blob.Sidecar, len(blobs.Data))
-		for index, value := range blobs.Data {
-			sidecars[index] = &blob.Sidecar{
-				KzgCommitment: value.KzgCommitment,
-				Blob:          value.Blob,
-			}
+		return nil, err
+	}
+	sidecars = make([]*blob.Sidecar, len(blobs.Data))
+	for index, value := range blobs.Data {
+		sidecars[index] = &blob.Sidecar{
+			KzgCommitment: value.KzgCommitment,
+			Blob:          value.Blob,
 		}
 	}
+	// }
 	return sidecars, nil
 }