fix GetBlobSidecarsEnhanced

corey · corey · commit 132d3e696550 · 2025-12-08T14:51:00.000+08:00
diff --git a/node/derivation/beacon.go b/node/derivation/beacon.go
@@ -131,8 +131,11 @@ func (cl *L1BeaconClient) GetBlobSidecars(ctx context.Context, ref L1BlockRef, h
 	if err := cl.apiReq(ctx, &resp, builder.String()); err != nil {
 		return nil, fmt.Errorf("%w: failed to fetch blob sidecars for slot %v block %v", err, slot, ref)
 	}
-	if len(hashes) != len(resp.Data) {
-		return nil, fmt.Errorf("expected %v sidecars but got %v", len(hashes), len(resp.Data))
+	// Some Beacon nodes may ignore the indices parameter and return all sidecars for the slot.
+	// We only need to ensure we have at least the number of sidecars we requested.
+	// The sidecarFromSidecars function will filter and match the correct ones by index.
+	if len(resp.Data) < len(hashes) {
+		return nil, fmt.Errorf("expected at least %v sidecars but got %v", len(hashes), len(resp.Data))
 	}
 
 	return resp.Data, nil
diff --git a/node/derivation/beacon_test.go b/node/derivation/beacon_test.go
@@ -41,14 +41,14 @@ func TestGetBlob(t *testing.T) {
 			fmt.Println(indexedBlobHashes)
 			header, err := l1Client.HeaderByNumber(context.Background(), big.NewInt(int64(lg.BlockNumber)))
 			require.NoError(t, err)
-			var bts eth.BlobTxSidecar
+			var bts []*BlobSidecar
 			if len(indexedBlobHashes) != 0 {
-				bts, err = l1BeaconClient.GetBlobSidecar(context.Background(), L1BlockRef{
+				bts, err = l1BeaconClient.GetBlobSidecarsEnhanced(context.Background(), L1BlockRef{
 					Time: header.Time,
 				}, indexedBlobHashes)
 				require.NoError(t, err)
 			}
-			t.Log(len(bts.Blobs))
+			t.Log(len(bts))
 		}
 
 	}

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,11 @@ func (cl *L1BeaconClient) GetBlobSidecars(ctx context.Context, ref L1BlockRef, h`
`131`	`131`	`if err := cl.apiReq(ctx, &resp, builder.String()); err != nil {`
`132`	`132`	`return nil, fmt.Errorf("%w: failed to fetch blob sidecars for slot %v block %v", err, slot, ref)`
`133`	`133`	`}`
`134`		`- if len(hashes) != len(resp.Data) {`
`135`		`- return nil, fmt.Errorf("expected %v sidecars but got %v", len(hashes), len(resp.Data))`
	`134`	`+ // Some Beacon nodes may ignore the indices parameter and return all sidecars for the slot.`
	`135`	`+ // We only need to ensure we have at least the number of sidecars we requested.`
	`136`	`+ // The sidecarFromSidecars function will filter and match the correct ones by index.`
	`137`	`+ if len(resp.Data) < len(hashes) {`
	`138`	`+ return nil, fmt.Errorf("expected at least %v sidecars but got %v", len(hashes), len(resp.Data))`
`136`	`139`	`}`
`137`	`140`
`138`	`141`	`return resp.Data, nil`
Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,14 @@ func TestGetBlob(t *testing.T) {`
`41`	`41`	`fmt.Println(indexedBlobHashes)`
`42`	`42`	`header, err := l1Client.HeaderByNumber(context.Background(), big.NewInt(int64(lg.BlockNumber)))`
`43`	`43`	`require.NoError(t, err)`
`44`		`- var bts eth.BlobTxSidecar`
	`44`	`+ var bts []*BlobSidecar`
`45`	`45`	`if len(indexedBlobHashes) != 0 {`
`46`		`- bts, err = l1BeaconClient.GetBlobSidecar(context.Background(), L1BlockRef{`
	`46`	`+ bts, err = l1BeaconClient.GetBlobSidecarsEnhanced(context.Background(), L1BlockRef{`
`47`	`47`	`Time: header.Time,`
`48`	`48`	`}, indexedBlobHashes)`
`49`	`49`	`require.NoError(t, err)`
`50`	`50`	`}`
`51`		`- t.Log(len(bts.Blobs))`
	`51`	`+ t.Log(len(bts))`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`}`