diff --git a/cli/initiator/initiator.go b/cli/initiator/initiator.go index ec433d5f..57142347 100644 --- a/cli/initiator/initiator.go +++ b/cli/initiator/initiator.go @@ -3,9 +3,9 @@ package initiator import ( "encoding/hex" "fmt" - e2m_core "github.com/bloxapp/eth2-key-manager/core" "os" + e2m_core "github.com/bloxapp/eth2-key-manager/core" "github.com/spf13/cobra" "go.uber.org/zap" @@ -74,9 +74,9 @@ var StartDKG = &cobra.Command{ if err != nil { logger.Warn("Failed writing deposit data file: ", zap.Error(err)) } - keysharesFinalPath := fmt.Sprintf("%s/keyshares-%v-%v.json", cli_utils.OutputPath, depositData.PubKey, hex.EncodeToString(id[:])) - logger.Info("💾 Writing keyshares payload to file", zap.String("path", keysharesFinalPath)) - err = utils.WriteJSON(keysharesFinalPath, keyShares) + // Save results + logger.Info("💾 Writing keyshares payload to file") + err = cli_utils.WriteKeyShares(id, keyShares.Payload.PublicKey, keyShares) if err != nil { logger.Warn("Failed writing keyshares file: ", zap.Error(err)) } diff --git a/cli/initiator/reshare.go b/cli/initiator/reshare.go index 79d36b5f..19a220a2 100644 --- a/cli/initiator/reshare.go +++ b/cli/initiator/reshare.go @@ -1,7 +1,6 @@ package initiator import ( - "encoding/hex" "fmt" "github.com/spf13/cobra" @@ -10,7 +9,6 @@ import ( cli_utils "github.com/bloxapp/ssv-dkg/cli/utils" "github.com/bloxapp/ssv-dkg/pkgs/crypto" "github.com/bloxapp/ssv-dkg/pkgs/initiator" - "github.com/bloxapp/ssv-dkg/pkgs/utils" ) func init() { @@ -70,9 +68,8 @@ var StartReshare = &cobra.Command{ logger.Fatal("😥 Failed to initiate DKG ceremony: ", zap.Error(err)) } // Save results - keysharesFinalPath := fmt.Sprintf("%s/keyshares-reshared-%v-%v.json", cli_utils.OutputPath, keyShares.Payload.PublicKey, hex.EncodeToString(id[:])) - logger.Info("💾 Writing keyshares payload to file", zap.String("path", keysharesFinalPath)) - err = utils.WriteJSON(keysharesFinalPath, keyShares) + logger.Info("💾 Writing keyshares payload to file") + err = cli_utils.WriteKeyShares(id, keyShares.Payload.PublicKey, keyShares) if err != nil { logger.Warn("Failed writing keyshares file: ", zap.Error(err)) } diff --git a/cli/utils/utils.go b/cli/utils/utils.go index e676402c..34e5ebac 100644 --- a/cli/utils/utils.go +++ b/cli/utils/utils.go @@ -491,3 +491,12 @@ func GetOperatorDB() (basedb.Options, error) { } return DBOptions, nil } + +func WriteKeyShares(id [24]byte, PubKey string, keyShares *initiator.KeyShares) error { + keysharesFinalPath := fmt.Sprintf("%s/keyshares-%v-%v.json", OutputPath, PubKey, hex.EncodeToString(id[:])) + err := utils.WriteJSON(keysharesFinalPath, keyShares) + if err != nil { + return err + } + return nil +}