rebase develop

cmd/zetacored/main.go

@@ -1,13 +1,14 @@
 package main
 
 import (
+	"fmt"
 	"os"
+	"strings"
 
 	"github.com/cosmos/cosmos-sdk/server"
-	cmdcfg "github.com/zeta-chain/zetacore/cmd/zetacored/config"
-
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 	"github.com/zeta-chain/zetacore/app"
+	cmdcfg "github.com/zeta-chain/zetacore/cmd/zetacored/config"
 )
 
 func main() {
@@ -16,12 +17,37 @@ func main() {
 	rootCmd, _ := NewRootCmd()
 
 	if err := svrcmd.Execute(rootCmd, "", app.DefaultNodeHome); err != nil {
+
 		switch e := err.(type) {
 		case server.ErrorCode:
 			os.Exit(e.Code)
 
 		default:
+			processError(e)
 			os.Exit(1)
 		}
 	}
 }
+
+func processError(err error) {
+	// --ledger flag can't be used with Ethereum HD path
+	if strings.Contains(err.Error(), "cannot set custom bip32 path with ledger") {
+		printNotice([]string{
+			"note: --ledger flag can't be used with Ethereum HD path (used by default)",
+			"use --hd-path=\"\" in the command to use Cosmos HD path",
+		})
+		os.Exit(1)
+	}
+}
+
+func printNotice(messages []string) {
+	if len(messages) == 0 {
+		return
+	}
+	border := strings.Repeat("*", len(messages[0])+4) // 4 to account for padding
+	fmt.Println(border)
+	for _, message := range messages {
+		fmt.Printf("* %s \n", message)
+	}
+	fmt.Println(border)
+}

cmd/zetacored/root.go

@@ -155,13 +155,12 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig appparams.EncodingConfig
 		ethermintclient.KeyCommands(app.DefaultNodeHome),
 	)
 
-	// replace the default hd-path for the key add command
+	// replace the default hd-path for the key add command with Ethereum HD Path
 	if err := SetEthereumHDPath(rootCmd); err != nil {
 		fmt.Printf("warning: unable to set default HD path: %v\n", err)
 	}
 
 	rootCmd.AddCommand(server.RosettaCommand(encodingConfig.InterfaceRegistry, encodingConfig.Codec))
-
 }
 
 func addModuleInitFlags(startCmd *cobra.Command) {