update configs and paths to store

ssvlabs · Sep 19, 2023 · 79805c5 · 79805c5
1 parent 18c0b58
commit 79805c5
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ssv-dkg-tool
+# ssv-dkg
 
 ### Build
 

diff --git a/cli/flags/flags.go b/cli/flags/flags.go
@@ -280,15 +280,15 @@ func GetNetworkFlag(c *cobra.Command) (string, error) {
 }
 
 func AddDepositResultStorePathFlag(c *cobra.Command) {
-	AddPersistentStringFlag(c, depositResultsPath, "", "Path to store deposit result file json", false)
+	AddPersistentStringFlag(c, depositResultsPath, "./", "Path to store deposit result file json", false)
 }
 
 func GetDepositResultStorePathFlag(c *cobra.Command) (string, error) {
 	return c.Flags().GetString(depositResultsPath)
 }
 
 func AddSSVPayloadResultStorePathFlag(c *cobra.Command) {
-	AddPersistentStringFlag(c, ssvPayloadResultsPath, "", "Path to store ssv contract payload file json", false)
+	AddPersistentStringFlag(c, ssvPayloadResultsPath, "./", "Path to store ssv contract payload file json", false)
 }
 
 func GetSSVPayloadResultStorePathFlag(c *cobra.Command) (string, error) {

diff --git a/cli/initiator/initiator.go b/cli/initiator/initiator.go
@@ -87,7 +87,7 @@ var StartDKG = &cobra.Command{
 			logger.Fatal(err.Error())
 		}
 		if configPath != "" {
-			viper.AddConfigPath(configPath)
+			viper.SetConfigFile(configPath)
 		} else {
 			viper.AddConfigPath("./config")
 		}
@@ -101,17 +101,17 @@ var StartDKG = &cobra.Command{
 			logger.Fatal("failed to get deposit result path flag value", zap.Error(err))
 		}
 		_, err = os.Stat(depositResultsPath)
-		if !os.IsNotExist(err) {
-			logger.Fatal("Deposit file at provided path already exist", zap.Error(err))
+		if os.IsNotExist(err) {
+			logger.Fatal("Folder to store deposit file does not exist", zap.Error(err))
 		}
 		// Check paths for results
 		ssvPayloadResultsPath := viper.GetString("ssvPayloadResultsPath")
 		if ssvPayloadResultsPath == "" {
 			logger.Fatal("failed to get ssv payload path flag value", zap.Error(err))
 		}
 		_, err = os.Stat(ssvPayloadResultsPath)
-		if !os.IsNotExist(err) {
-			logger.Fatal("SSV payload file at provided path already exist", zap.Error(err))
+		if os.IsNotExist(err) {
+			logger.Fatal("Folder to store SSV payload file does not exist", zap.Error(err))
 		}
 		// Load operators TODO: add more sources.
 		operatorFile := viper.GetString("operatorsInfoPath")
@@ -202,13 +202,13 @@ var StartDKG = &cobra.Command{
 		}
 		// Save deposit file
 		logger.Info("DKG finished. All data is validated. Writing deposit data json to file %s\n", zap.String("path", depositResultsPath))
-		err = utils.WriteJSON(depositResultsPath, []initiator.DepositDataJson{*depositData})
+		err = utils.WriteJSON(depositResultsPath+"deposit_"+fmt.Sprint(depositData.PubKey)+".json", []initiator.DepositDataJson{*depositData})
 		if err != nil {
 			logger.Warn("Failed writing deposit data file", zap.Error(err))
 		}
 
 		logger.Info("DKG finished. All data is validated. Writing keyshares to file: %s\n", zap.String("path", ssvPayloadResultsPath))
-		err = utils.WriteJSON(ssvPayloadResultsPath, keyShares)
+		err = utils.WriteJSON(ssvPayloadResultsPath+"payload_"+fmt.Sprint(depositData.PubKey)+".json", keyShares)
 		if err != nil {
 			logger.Warn("Failed writing keyshares file", zap.Error(err))
 		}

diff --git a/cli/operator/operator.go b/cli/operator/operator.go
@@ -57,7 +57,7 @@ var StartDKGOperator = &cobra.Command{
 			logger.Fatal(err.Error())
 		}
 		if configPath != "" {
-			viper.AddConfigPath(configPath)
+			viper.SetConfigFile(configPath)
 		} else {
 			viper.AddConfigPath("./config")
 		}

diff --git a/examples/config/initiator.example.yaml b/examples/config/initiator.example.yaml
@@ -4,7 +4,7 @@ owner: "0x81592c3de184a3e2c0dcb5a261bc107bfa91f494"
 nonce: 4
 fork: "mainnet"
 operatorsInfoPath: /data/docker_operators.json
-depositResultsPath: /data/deposit.json
-ssvPayloadResultsPath: /data/payload.json
+depositResultsPath: /data/output/
+ssvPayloadResultsPath: /data/output/
 initiatorPrivKey: /data/initiator/encrypted_private_key.json
 initiatorPrivKeyPassword: /data/initiator/password
diff --git a/examples/config/operator1.example.yaml b/examples/config/operator1.example.yaml
@@ -1,4 +1,4 @@
-privKey: ./encrypted_private_key.json
-password: ./password
+privKey: /data/operator1/encrypted_private_key.json
+password: /data/operator1/password
 port: 3030
 storeShare: true
diff --git a/examples/config/operator2.example.yaml b/examples/config/operator2.example.yaml
@@ -1,4 +1,4 @@
-privKey: ./encrypted_private_key.json
-password: ./password
-port: 3031
+privKey: /data/operator2/encrypted_private_key.json
+password: /data/operator2/password
+port: 3030
 storeShare: true
diff --git a/examples/config/operator3.example.yaml b/examples/config/operator3.example.yaml
@@ -1,4 +1,4 @@
-privKey: ./encrypted_private_key.json
-password: ./password
-port: 3032
+privKey: /data/operator3/encrypted_private_key.json
+password: /data/operator3/password
+port: 3030
 storeShare: true
diff --git a/examples/config/operator4.example.yaml b/examples/config/operator4.example.yaml
@@ -1,4 +1,4 @@
-privKey: ./encrypted_private_key.json
-password: ./password
-port: 3033
+privKey: /data/operator4/encrypted_private_key.json
+password: /data/operator4/password
+port: 3030
 storeShare: true