Fix resource leaks, dead code, and variable shadowing in frax DA integration

Author: 0xalex88

frax-da/client.go

@@ -46,10 +46,10 @@ func (c DAClient) Read(ctx context.Context, id []byte) ([]byte, error) {
 		return nil, fmt.Errorf("unable to create request to fetch data from DA: %w", err)
 	}
 	resp, err := c.httpClient.Do(request)
-
 	if err != nil {
 		return nil, fmt.Errorf("unable to fetch DA data: %w", err)
 	}
+	defer resp.Body.Close()
 	if resp.StatusCode != 200 {
 		return nil, fmt.Errorf("unable to fetch DA data, got status code %d", resp.StatusCode)
 	}
@@ -69,10 +69,10 @@ func (c DAClient) ReadCelestia(ctx context.Context, hexString string) ([]byte, e
 		return nil, fmt.Errorf("unable to create request to fetch celestia data from DA: %w", err)
 	}
 	resp, err := c.httpClient.Do(request)
-
 	if err != nil {
 		return nil, fmt.Errorf("unable to fetch DA celestia data: %w", err)
 	}
+	defer resp.Body.Close()
 	if resp.StatusCode != 200 {
 		return nil, fmt.Errorf("unable to fetch DA celestia data, got status code %d", resp.StatusCode)
 	}
@@ -94,10 +94,10 @@ func (c DAClient) Write(ctx context.Context, data []byte) ([]byte, error) {
 	}
 
 	resp, err := c.httpClient.Do(request)
-
 	if err != nil {
 		return nil, fmt.Errorf("unable to submit data to DA: %w", err)
 	}
+	defer resp.Body.Close()
 	if resp.StatusCode > 299 {
 		return nil, fmt.Errorf("unable to submit data to DA, got status code %d", resp.StatusCode)
 	}

op-batcher/batcher/service.go

@@ -20,7 +20,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	"github.com/ethereum-optimism/optimism/op-node/params"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
-	"github.com/ethereum-optimism/optimism/op-service/bgpo"
 	"github.com/ethereum-optimism/optimism/op-service/cliapp"
 	"github.com/ethereum-optimism/optimism/op-service/dial"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
@@ -83,10 +82,7 @@ type BatcherService struct {
 
 	NotSubmittingOnStart bool
 
-	// BlobGasPriceOracle tracks blob base gas prices for dynamic pricing
-	blobTipOracle *bgpo.BlobTipOracle
-	oracleStopCh  chan struct{}
-	DAClient      *fraxda.DAClient
+	DAClient *fraxda.DAClient
 }
 
 type DriverSetupOption func(setup *DriverSetup)

op-node/rollup/derive/calldata_source.go

@@ -115,23 +115,25 @@ func DataFromEVMTransactions(dsCfg DataSourceConfig, batcherAddr common.Address,
 			default:
 				switch data[0] {
 				case fraxda.DerivationVersionFraxDa:
-					log.Info("fraxda: requesting data", "id", hex.EncodeToString(data))
+					id := hex.EncodeToString(data)
+					log.Info("fraxda: requesting data", "id", id)
 					ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-					data, err := daClient.Read(ctx, data[1:])
+					daData, err := daClient.Read(ctx, data[1:])
 					cancel()
 					if err != nil {
-						return nil, NewResetError(fmt.Errorf("fraxda: failed to fetch data for id %s: %w", hex.EncodeToString(data), err))
+						return nil, NewResetError(fmt.Errorf("fraxda: failed to fetch data for id %s: %w", id, err))
 					}
-					out = append(out, data)
+					out = append(out, daData)
 				case fraxda.DerivationVersionCelestia:
-					log.Info("fraxda: requesting old celestia data", "id", hex.EncodeToString(data))
+					id := hex.EncodeToString(data)
+					log.Info("fraxda: requesting old celestia data", "id", id)
 					ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-					data, err := daClient.ReadCelestia(ctx, hex.EncodeToString(data[1:]))
+					daData, err := daClient.ReadCelestia(ctx, hex.EncodeToString(data[1:]))
 					cancel()
 					if err != nil {
-						return nil, NewResetError(fmt.Errorf("fraxda: failed to fetch celestia data for id %s: %w", hex.EncodeToString(data), err))
+						return nil, NewResetError(fmt.Errorf("fraxda: failed to fetch celestia data for id %s: %w", id, err))
 					}
-					out = append(out, data)
+					out = append(out, daData)
 				default:
 					out = append(out, data)
 					log.Info("fraxda: using eth fallback")