updated to latest signer package

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

cmd/a_common.go

@@ -117,3 +117,45 @@ func GetAppsBySelectionCriteria(cmd *cobra.Command, criteria AppSelectionCriteri
 	}
 	return selectedApps
 }
+
+type BoolStringCombinedFlag struct {
+	valueB bool
+	valueS string
+}
+
+// String is required for pflag.Value interface.
+func (i *BoolStringCombinedFlag) String() string {
+	return i.valueS
+}
+
+// Set is required for pflag.Value interface.
+func (i *BoolStringCombinedFlag) Set(value string) error {
+	i.valueS = value
+	i.valueB = value != "" && value != "false"
+	return nil
+}
+
+func (i *BoolStringCombinedFlag) IsBoolFlag() bool { return true }
+
+func (i *BoolStringCombinedFlag) Type() string {
+	return "[string]"
+}
+
+func (i *BoolStringCombinedFlag) IsTrue() bool {
+	return i.valueB
+}
+
+func (i *BoolStringCombinedFlag) HasValue() bool {
+	return i.valueS != "" && i.valueS != "false" && i.valueS != "true"
+}
+
+func (i *BoolStringCombinedFlag) Value() string {
+	return i.valueS
+}
+
+func addCombinedFlag(cmd *cobra.Command, name string, value string, usage string) *BoolStringCombinedFlag {
+	flag := &BoolStringCombinedFlag{valueS: value}
+	f := cmd.Flags().VarPF(flag, name, "", usage)
+	f.NoOptDefVal = "true"
+	return flag
+}

cmd/setup-ledger.go

@@ -1,39 +1,160 @@
 package cmd
 
 import (
+	"fmt"
+	"path"
+
+	"github.com/tez-capital/tezbake/ami"
 	"github.com/tez-capital/tezbake/apps"
+	"github.com/tez-capital/tezbake/cli"
+	"github.com/tez-capital/tezbake/constants"
+	"github.com/tez-capital/tezbake/system"
 	"github.com/tez-capital/tezbake/util"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
+var (
+	platform  *BoolStringCombinedFlag
+	importKey *BoolStringCombinedFlag
+)
+
 var setupLedgerCmd = &cobra.Command{
 	Use:   "setup-ledger",
 	Short: "Setup ledger for baking.",
 	Long:  "Setups ledger for baking.",
 	Run: func(cmd *cobra.Command, args []string) {
-		amiArgs := make([]string, 0)
-		amiArgs = append(amiArgs, "setup-ledger")
-
-		mainChainId, _ := cmd.Flags().GetString("main-chain-id")
-		if mainChainId != "" {
-			amiArgs = append(amiArgs, "--main-chain-id="+mainChainId)
+		if platform.IsTrue() {
+			system.RequireElevatedUser()
 		}
 
-		mainHwm, _ := cmd.Flags().GetString("main-hwm")
-		if mainHwm != "" {
-			amiArgs = append(amiArgs, "--main-hwm="+mainHwm)
+		shouldOperateOnSigner, _ := cmd.Flags().GetBool("signer")
+		shouldOperateOnNode, _ := cmd.Flags().GetBool("node")
+		force, _ := cmd.Flags().GetBool("force")
+		keyAlias, _ := cmd.Flags().GetString("key-alias")
+
+		if (shouldOperateOnSigner || !shouldOperateOnNode) && !cli.IsRemoteInstance && apps.Signer.IsInstalled() {
+			log.Info("setting up ledger for signer...")
+			wasRunning, _ := apps.Signer.IsServiceStatus(constants.SignerAppServiceId, "running")
+			if wasRunning {
+				exitCode, err := apps.Signer.Stop()
+				util.AssertEE(err, "Failed to stop signer!", exitCode)
+			}
+
+			amiArgs := []string{"setup-ledger"}
+			if platform.HasValue() {
+				amiArgs = append(amiArgs, "--platform="+platform.String())
+			} else if platform.IsTrue() {
+				amiArgs = append(amiArgs, "--platform")
+			}
+
+			noUdev, _ := cmd.Flags().GetString("no-udev")
+			if noUdev != "" {
+				amiArgs = append(amiArgs, "--no-udev")
+			}
+
+			if importKey.HasValue() {
+				amiArgs = append(amiArgs, "--import-key="+importKey.String())
+			} else if importKey.IsTrue() {
+				amiArgs = append(amiArgs, "--import-key")
+			}
+
+			ledgerId, _ := cmd.Flags().GetString("ledger-id")
+			if ledgerId != "" {
+				amiArgs = append(amiArgs, "--ledger-id="+ledgerId)
+			}
+
+			amiArgs = append(amiArgs, fmt.Sprintf("--key-alias=%s", keyAlias))
+
+			authorize, _ := cmd.Flags().GetBool("authorize")
+			if authorize {
+				amiArgs = append(amiArgs, "--authorize")
+			}
+			chainId, _ := cmd.Flags().GetString("chain-id")
+			if chainId != "" {
+				amiArgs = append(amiArgs, "--chain-id="+chainId)
+			}
+
+			hwm, _ := cmd.Flags().GetString("main-hwm")
+			if hwm != "" {
+				amiArgs = append(amiArgs, "--hwm="+hwm)
+			}
+
+			if force {
+				amiArgs = append(amiArgs, "--force")
+			}
+
+			exitCode, err := apps.Signer.Execute(amiArgs...)
+			util.AssertEE(err, "Failed to import key to signer!", exitCode)
+
+			signerDef, _, err := apps.Signer.LoadAppDefinition()
+			util.AssertEE(err, "Failed to load signer definition!", constants.ExitInvalidUser)
+			signerUser, ok := signerDef["user"].(string)
+
+			util.AssertBE(ok, "Failed to get username from signer!", constants.ExitInvalidUser)
+			util.ChownR(signerUser, path.Join(apps.Signer.GetPath(), "data"))
+
+			if wasRunning {
+				apps.Signer.Start()
+			}
 		}
 
-		log.Info("To complete setup process you have to confirm operation on your ledger...")
-		exitCode, err := apps.Signer.Execute(amiArgs...)
-		util.AssertEE(err, "Failed to import key!", exitCode)
+		if (shouldOperateOnNode || !shouldOperateOnSigner) && apps.Node.IsInstalled() {
+			if importKey.IsTrue() { // node only imports key
+				var wasSignerRunning bool
+				if !cli.IsRemoteInstance {
+					log.Info("Importing key to the node...")
+					wasSignerRunning, _ = apps.Signer.IsServiceStatus(constants.SignerAppServiceId, "running")
+					exitCode, err := apps.Signer.Start()
+					util.AssertEE(err, "Failed to start signer!", exitCode)
+
+					isSignerRunning, _ := apps.Signer.IsServiceStatus(constants.SignerAppServiceId, "running")
+					util.AssertBE(isSignerRunning, "Signer is not running. Please start signer services.", constants.ExitSignerNotOperational)
+				}
+
+				bakerAddr, exitCode, err := apps.Signer.GetKeyHash(keyAlias)
+				util.AssertEE(err, "Failed to get baker key hash!", exitCode)
+				ami.REMOTE_VARS[ami.BAKER_KEY_HASH_REMOTE_VAR] = bakerAddr
+				amiArgs := []string{"import-key", bakerAddr}
+				if force {
+					amiArgs = append(amiArgs, "--force")
+				}
+				amiArgs = append(amiArgs, fmt.Sprintf("--alias=%s", keyAlias))
+				exitCode, err = apps.Node.Execute(amiArgs...)
+				util.AssertEE(err, "Failed to import key to node!", exitCode)
+
+				if isRemote := apps.Node.IsRemoteApp(); !isRemote {
+					nodeDef, _, err := apps.Node.LoadAppDefinition()
+					util.AssertEE(err, "Failed to load node definition!", constants.ExitAppConfigurationLoadFailed)
+					nodeUser, ok := nodeDef["user"].(string)
+					util.AssertBE(ok, "Failed to get username from node!", constants.ExitInvalidUser)
+					util.ChownR(nodeUser, path.Join(apps.Node.GetPath(), "data"))
+				}
+				if !wasSignerRunning && !cli.IsRemoteInstance {
+					apps.Signer.Stop()
+				}
+			}
+		}
 	},
 }
 
 func init() {
-	setupLedgerCmd.Flags().String("main-chain-id", "", "Id of chain to be used for baking.")
-	setupLedgerCmd.Flags().String("main-hwm", "", "High watermark to be used during baking.")
+	setupLedgerCmd.Flags().BoolP("node", "n", false, "Import key to node (affects import-key only)")
+	setupLedgerCmd.Flags().BoolP("signer", "s", false, "Import key to signer (affects import-key only)")
+
+	importKey = addCombinedFlag(setupLedgerCmd, "import-key", "", "Import key from ledger (optionally specify derivation path)")
+	setupLedgerCmd.Flags().String("ledger-id", "", "Ledger id to import key from (affects import-key only)")
+	setupLedgerCmd.Flags().String("key-alias", "baker", "Alias ofkey to be imported")
+
+	setupLedgerCmd.Flags().Bool("authorize", false, "Authorize ledger for baking.")
+	setupLedgerCmd.Flags().String("chain-id", "", "Id of chain to be used for baking.")
+	setupLedgerCmd.Flags().String("hwm", "", "High watermark to be used during baking.")
+
+	platform = addCombinedFlag(setupLedgerCmd, "platform", "", "Prepare platform for ledger (optionally specify platform to override)")
+	setupLedgerCmd.Flags().String("no-udev", "", "Skip udev rules installation. (linux only)")
+
+	setupLedgerCmd.Flags().BoolP("force", "f", false, "Force key import. (overwrites existing)")
+
 	RootCmd.AddCommand(setupLedgerCmd)
 }

constants/common.go

@@ -1,7 +1,7 @@
 package constants
 
 const (
-	VERSION = "0.14.1-beta"
+	VERSION = "0.15.0-beta"
 
 	DefaultBBDirectory       string = "/bake-buddy"
 	DefaultRemoteBBDirectory string = DefaultBBDirectory