Merge branch 'main' into backport/fpd-commit-pubrand

CHANGELOG.md

@@ -40,6 +40,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Improvements
 
 * [149](https://github.com/babylonlabs-io/finality-provider/pull/149) Remove update of config after `fpd keys add`
+* [148](https://github.com/babylonlabs-io/finality-provider/pull/148) Allow command `eotsd keys add` to use
+empty HD path to derive new key and use master private key.
 * [153](https://github.com/babylonlabs-io/finality-provider/pull/153) Add `unsafe-commit-pubrand` command
 
 ## v0.12.0

eotsmanager/cmd/eotsd/daemon/flags.go

@@ -0,0 +1,18 @@
+package daemon
+
+const (
+	forceFlag             = "force"
+	rpcListenerFlag       = "rpc-listener"
+	flagInteractive       = "interactive"
+	flagNoBackup          = "no-backup"
+	flagMultisig          = "multisig"
+	flagMultiSigThreshold = "multisig-threshold"
+	flagPubKeyBase64      = "pubkey-base64"
+	flagNoSort            = "nosort"
+	flagCoinType          = "coin-type"
+	flagAccount           = "account"
+	flagHDPath            = "hd-path"
+	flagIndex             = "index"
+	flagRecover           = "recover"
+	flagMnemonicSrc       = "source"
+)

eotsmanager/cmd/eotsd/init.go → eotsmanager/cmd/eotsd/daemon/init.go

@@ -1,4 +1,4 @@
-package main
+package daemon
 
 import (
 	"fmt"

eotsmanager/cmd/eotsd/keys.go → eotsmanager/cmd/eotsd/daemon/keys.go

@@ -1,18 +1,17 @@
-package main
+package daemon
 
 import (
 	"bytes"
 	"fmt"
 
-	"sigs.k8s.io/yaml"
-
-	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/keys"
-	"github.com/spf13/cobra"
-
 	"github.com/babylonlabs-io/finality-provider/eotsmanager"
 	"github.com/babylonlabs-io/finality-provider/eotsmanager/config"
 	"github.com/babylonlabs-io/finality-provider/log"
+	"github.com/babylonlabs-io/finality-provider/util"
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/keys"
+	"github.com/spf13/cobra"
+	"sigs.k8s.io/yaml"
 )
 
 type KeyOutput struct {
@@ -24,20 +23,21 @@ func NewKeysCmd() *cobra.Command {
 	keysCmd := keys.Commands()
 
 	// Find the "add" subcommand
-	addCmd := findSubCommand(keysCmd, "add")
+	addCmd := util.GetSubCommand(keysCmd, "add")
 	if addCmd == nil {
 		panic("failed to find keys add command")
 	}
 
-	// Wrap the original RunE function
-	originalRunE := addCmd.RunE
+	// Override the original RunE function to run almost the same as
+	// the sdk, but it allows empty hd path and allow to save the key
+	// in the name mapping
 	addCmd.RunE = func(cmd *cobra.Command, args []string) error {
 		// Create a buffer to intercept the key items
 		var buf bytes.Buffer
 		cmd.SetOut(&buf)
 
 		// Run the original command
-		err := originalRunE(cmd, args)
+		err := runAddCmdPrepare(cmd, args)
 		if err != nil {
 			return err
 		}
@@ -48,15 +48,6 @@ func NewKeysCmd() *cobra.Command {
 	return keysCmd
 }
 
-func findSubCommand(cmd *cobra.Command, name string) *cobra.Command {
-	for _, subCmd := range cmd.Commands() {
-		if subCmd.Name() == name {
-			return subCmd
-		}
-	}
-	return nil
-}
-
 func saveKeyNameMapping(cmd *cobra.Command, args []string) error {
 	clientCtx, err := client.GetClientQueryContext(cmd)
 	if err != nil {

eotsmanager/cmd/eotsd/keys_test.go → eotsmanager/cmd/eotsd/daemon/keys_test.go

@@ -1,4 +1,4 @@
-package main
+package daemon
 
 import (
 	"bytes"