chore: move SignerCLIConfig into op-service

op-service/crypto/signature.go

@@ -18,6 +18,7 @@ import (
 
 	hdwallet "github.com/ethereum-optimism/go-ethereum-hdwallet"
 	opsigner "github.com/ethereum-optimism/optimism/op-signer/client"
+	optls "github.com/ethereum-optimism/optimism/op-service/tls"
 )
 
 func PrivateKeySignerFn(key *ecdsa.PrivateKey, chainID *big.Int) bind.SignerFn {
@@ -43,9 +44,9 @@ type SignerFn func(context.Context, common.Address, *types.Transaction) (*types.
 type SignerFactory func(chainID *big.Int) SignerFn
 
 // SignerFactoryFromConfig considers three ways that signers are created & then creates single factory from those config options.
-// It can either take a remote signer (via opsigner.CLIConfig) or it can be provided either a mnemonic + derivation path or a private key.
+// It can either take a remote signer (via optls.SignerCLIConfig) or it can be provided either a mnemonic + derivation path or a private key.
 // It prefers the remote signer, then the mnemonic or private key (only one of which can be provided).
-func SignerFactoryFromConfig(l log.Logger, privateKey, mnemonic, hdPath string, signerConfig opsigner.CLIConfig) (SignerFactory, common.Address, error) {
+func SignerFactoryFromConfig(l log.Logger, privateKey, mnemonic, hdPath string, signerConfig optls.SignerCLIConfig) (SignerFactory, common.Address, error) {
 	var signer SignerFactory
 	var fromAddress common.Address
 	if signerConfig.Enabled() {

op-service/tls/cli.go

@@ -108,3 +108,26 @@ func ReadCLIConfigWithPrefix(ctx *cli.Context, flagPrefix string) CLIConfig {
 		TLSKey:    ctx.String(prefixFunc(TLSKeyFlagName)),
 	}
 }
+
+type SignerCLIConfig struct {
+	Endpoint  string
+	Address   string
+	TLSConfig CLIConfig
+}
+
+func (c SignerCLIConfig) Check() error {
+	if err := c.TLSConfig.Check(); err != nil {
+		return err
+	}
+	if !((c.Endpoint == "" && c.Address == "") || (c.Endpoint != "" && c.Address != "")) {
+		return errors.New("signer endpoint and address must both be set or not set")
+	}
+	return nil
+}
+
+func (c SignerCLIConfig) Enabled() bool {
+	if c.Endpoint != "" && c.Address != "" {
+		return true
+	}
+	return false
+}

op-signer/client/client.go

@@ -78,7 +78,7 @@ func NewSignerClient(logger log.Logger, endpoint string, tlsConfig optls.CLIConf
 	return signer, nil
 }
 
-func NewSignerClientFromConfig(logger log.Logger, config CLIConfig) (*SignerClient, error) {
+func NewSignerClientFromConfig(logger log.Logger, config optls.SignerCLIConfig) (*SignerClient, error) {
 	return NewSignerClient(logger, config.Endpoint, config.TLSConfig)
 }
 

op-signer/client/config.go

 package client
 
 import (
-	"errors"
-
 	"github.com/urfave/cli/v2"
 
 	opservice "github.com/ethereum-optimism/optimism/op-service"
@@ -32,37 +30,15 @@ func CLIFlags(envPrefix string) []cli.Flag {
 	return flags
 }
 
-type CLIConfig struct {
-	Endpoint  string
-	Address   string
-	TLSConfig optls.CLIConfig
-}
-
-func NewCLIConfig() CLIConfig {
-	return CLIConfig{
+func NewCLIConfig() optls.SignerCLIConfig {
+	return optls.SignerCLIConfig{
 		TLSConfig: optls.NewCLIConfig(),
 	}
 }
 
-func (c CLIConfig) Check() error {
-	if err := c.TLSConfig.Check(); err != nil {
-		return err
-	}
-	if !((c.Endpoint == "" && c.Address == "") || (c.Endpoint != "" && c.Address != "")) {
-		return errors.New("signer endpoint and address must both be set or not set")
-	}
-	return nil
-}
-
-func (c CLIConfig) Enabled() bool {
-	if c.Endpoint != "" && c.Address != "" {
-		return true
-	}
-	return false
-}
 
-func ReadCLIConfig(ctx *cli.Context) CLIConfig {
-	cfg := CLIConfig{
+func ReadCLIConfig(ctx *cli.Context) optls.SignerCLIConfig {
+	cfg := optls.SignerCLIConfig{
 		Endpoint:  ctx.String(EndpointFlagName),
 		Address:   ctx.String(AddressFlagName),
 		TLSConfig: optls.ReadCLIConfigWithPrefix(ctx, "signer"),