Merge pull request #4902 from conduit-xyz/develop

Make tlsconfig optional for op-signer client

op-signer/client/client.go

@@ -25,35 +25,43 @@ type SignerClient struct {
 }
 
 func NewSignerClient(logger log.Logger, endpoint string, tlsConfig optls.CLIConfig) (*SignerClient, error) {
-	caCert, err := os.ReadFile(tlsConfig.TLSCaCert)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read tls.ca: %w", err)
-	}
-	caCertPool := x509.NewCertPool()
-	caCertPool.AppendCertsFromPEM(caCert)
+	var httpClient *http.Client
+	if tlsConfig.TLSCaCert != "" {
+		logger.Info("tlsConfig specified, loading tls config")
+		caCert, err := os.ReadFile(tlsConfig.TLSCaCert)
+		if err != nil {
+			return nil, fmt.Errorf("failed to read tls.ca: %w", err)
+		}
+		caCertPool := x509.NewCertPool()
+		caCertPool.AppendCertsFromPEM(caCert)
 
-	// certman watches for newer client certifictes and automatically reloads them
-	cm, err := certman.New(logger, tlsConfig.TLSCert, tlsConfig.TLSKey)
-	if err != nil {
-		logger.Error("failed to read tls cert or key", "err", err)
-		return nil, err
-	}
-	if err := cm.Watch(); err != nil {
-		logger.Error("failed to start certman watcher", "err", err)
-		return nil, err
-	}
+		// certman watches for newer client certifictes and automatically reloads them
+		cm, err := certman.New(logger, tlsConfig.TLSCert, tlsConfig.TLSKey)
+		if err != nil {
+			logger.Error("failed to read tls cert or key", "err", err)
+			return nil, err
+		}
+		if err := cm.Watch(); err != nil {
+			logger.Error("failed to start certman watcher", "err", err)
+			return nil, err
+		}
 
-	httpClient := &http.Client{
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{
-				MinVersion: tls.VersionTLS13,
-				RootCAs:    caCertPool,
-				GetClientCertificate: func(_ *tls.CertificateRequestInfo) (*tls.Certificate, error) {
-					return cm.GetCertificate(nil)
+		httpClient = &http.Client{
+			Transport: &http.Transport{
+				TLSClientConfig: &tls.Config{
+					MinVersion: tls.VersionTLS13,
+					RootCAs:    caCertPool,
+					GetClientCertificate: func(_ *tls.CertificateRequestInfo) (*tls.Certificate, error) {
+						return cm.GetCertificate(nil)
+					},
 				},
 			},
-		},
+		}
+	} else {
+		logger.Info("no tlsConfig specified, using default http client")
+		httpClient = http.DefaultClient
 	}
+
 	rpcClient, err := rpc.DialOptions(context.Background(), endpoint, rpc.WithHTTPClient(httpClient))
 	if err != nil {
 		return nil, err