modify init

Author: tac0turtle

pkg/cmd/init.go

@@ -1,13 +1,16 @@
 package cmd
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	rollconf "github.com/evstack/ev-node/pkg/config"
 	"github.com/evstack/ev-node/pkg/hash"
 	"github.com/evstack/ev-node/pkg/p2p/key"
+	"github.com/evstack/ev-node/pkg/signer"
 	"github.com/evstack/ev-node/pkg/signer/file"
 )
 
@@ -18,18 +21,54 @@ func CreateSigner(config *rollconf.Config, homePath string, passphrase string) (
 			return nil, fmt.Errorf("passphrase is required when using local file signer")
 		}
 
-		signerDir := filepath.Join(homePath, "config")
-		if err := os.MkdirAll(signerDir, 0o750); err != nil {
+		signerPath := config.Signer.SignerPath
+		if signerPath == "" {
+			signerPath = filepath.Join("config")
+		}
+		if !filepath.IsAbs(signerPath) {
+			signerPath = filepath.Join(homePath, signerPath)
+		}
+		if strings.HasSuffix(strings.ToLower(signerPath), "signer.json") {
+			signerPath = filepath.Dir(signerPath)
+		}
+
+		if info, err := os.Stat(signerPath); err == nil {
+			if !info.IsDir() {
+				return nil, fmt.Errorf("signer path %s must be a directory", signerPath)
+			}
+		} else if err != nil && !errors.Is(err, os.ErrNotExist) {
+			return nil, fmt.Errorf("failed to inspect signer path: %w", err)
+		}
+
+		if err := os.MkdirAll(signerPath, 0o750); err != nil {
 			return nil, fmt.Errorf("failed to create signer directory: %w", err)
 		}
 
-		config.Signer.SignerPath = signerDir
+		keyFile := filepath.Join(signerPath, "signer.json")
 
-		signer, err := file.CreateFileSystemSigner(config.Signer.SignerPath, []byte(passphrase))
-		if err != nil {
-			return nil, fmt.Errorf("failed to initialize signer: %w", err)
+		var (
+			signer signer.Signer
+			err    error
+		)
+
+		if _, err = os.Stat(keyFile); err != nil {
+			if !errors.Is(err, os.ErrNotExist) {
+				return nil, fmt.Errorf("failed to check signer file: %w", err)
+			}
+
+			signer, err = file.CreateFileSystemSigner(signerPath, []byte(passphrase))
+			if err != nil {
+				return nil, fmt.Errorf("failed to initialize signer: %w", err)
+			}
+		} else {
+			signer, err = file.LoadFileSystemSigner(signerPath, []byte(passphrase))
+			if err != nil {
+				return nil, fmt.Errorf("failed to load signer: %w", err)
+			}
 		}
 
+		config.Signer.SignerPath = signerPath
+
 		pubKey, err := signer.GetPublic()
 		if err != nil {
 			return nil, fmt.Errorf("failed to get public key: %w", err)

pkg/cmd/init_test.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/evstack/ev-node/pkg/cmd"
 	rollconf "github.com/evstack/ev-node/pkg/config"
+	file "github.com/evstack/ev-node/pkg/signer/file"
 )
 
 // Test CreateSigner scenarios
@@ -46,6 +47,29 @@ func TestCreateSigner(t *testing.T) {
 		assert.NoError(err, "signer file should exist")
 	})
 
+	// Case 2b: File signer, Aggregator, existing signer -> Reuse existing key
+	t.Run("FileSigner_Aggregator_ExistingKey", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		signerDir := filepath.Join(tmpDir, "mounted")
+		_, err := file.CreateFileSystemSigner(signerDir, []byte("testpass"))
+		require.NoError(err)
+
+		cfg := &rollconf.Config{
+			Signer: rollconf.SignerConfig{SignerType: "file", SignerPath: signerDir},
+			Node:   rollconf.NodeConfig{Aggregator: true},
+		}
+
+		addr, err := cmd.CreateSigner(cfg, tmpDir, "testpass")
+		require.NoError(err)
+		require.NotNil(addr)
+
+		addr2, err := cmd.CreateSigner(cfg, tmpDir, "testpass")
+		require.NoError(err)
+		require.NotNil(addr2)
+		assert.Equal(addr, addr2)
+		assert.Equal(signerDir, cfg.Signer.SignerPath)
+	})
+
 	// Case 3: Non-File signer, Aggregator -> Error (Remote signer not implemented)
 	t.Run("RemoteSigner_Aggregator", func(t *testing.T) {
 		tmpDir := t.TempDir()
@@ -85,7 +109,7 @@ func TestCreateSigner(t *testing.T) {
 		}
 		_, err = cmd.CreateSigner(cfg, tmpDir, "testpass")
 		require.Error(err)
-		assert.Contains(err.Error(), "failed to create signer directory")
+		assert.Contains(err.Error(), "must be a directory")
 	})
 }