fix(keys): align key retrieval function with key creation (#974)

dymensionxyz · Sep 18, 2024 · d6ceb6c · d6ceb6c
1 parent 838b0a0
commit d6ceb6c
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/cmd/config/export/bech32.go b/cmd/config/export/bech32.go
@@ -1,7 +1,6 @@
 package export
 
 import (
-	"path/filepath"
 	"strings"
 
 	"github.com/dymensionxyz/roller/cmd/consts"
@@ -12,9 +11,11 @@ import (
 func getBech32Prefix(rlpCfg config.RollappConfig) (string, error) {
 	rollappSeqAddrInfo, err := utils.GetAddressInfoBinary(
 		utils.KeyConfig{
-			Dir: filepath.Join(rlpCfg.Home, consts.ConfigDirName.Rollapp),
-			ID:  consts.KeysIds.RollappSequencer,
-		}, rlpCfg.RollappBinary,
+			Dir:         consts.ConfigDirName.Rollapp,
+			ID:          consts.KeysIds.RollappSequencer,
+			ChainBinary: consts.Executables.RollappEVM,
+			Type:        "",
+		}, rlpCfg.Home,
 	)
 	if err != nil {
 		return "", err

diff --git a/cmd/eibc/fulfill/order/order.go b/cmd/eibc/fulfill/order/order.go
@@ -66,7 +66,6 @@ func Cmd() *cobra.Command {
 				pterm.Error.Println("failed to fulfill order: ", err)
 				return
 			}
-			fmt.Println(gCmd.String())
 
 			txOutput, err := bash.ExecCommandWithInput(gCmd, "signatures")
 			if err != nil {

diff --git a/cmd/keys/list/list.go b/cmd/keys/list/list.go
@@ -44,9 +44,10 @@ func Cmd() *cobra.Command {
 
 			hubSeqInfo, err := utils.GetAddressInfoBinary(
 				utils.KeyConfig{
-					Dir: filepath.Join(rollappConfig.Home, consts.ConfigDirName.HubKeys),
-					ID:  consts.KeysIds.HubSequencer,
-				}, consts.Executables.Dymension,
+					Dir:         consts.ConfigDirName.HubKeys,
+					ChainBinary: consts.Executables.Dymension,
+					ID:          consts.KeysIds.HubSequencer,
+				}, rollappConfig.Home,
 			)
 			errorhandling.PrettifyErrorIfExists(err)
 			addresses = append(
@@ -58,9 +59,10 @@ func Cmd() *cobra.Command {
 
 			raSeqInfo, err := utils.GetAddressInfoBinary(
 				utils.KeyConfig{
-					Dir: filepath.Join(rollappConfig.Home, consts.ConfigDirName.Rollapp),
-					ID:  consts.KeysIds.RollappSequencer,
-				}, rollappConfig.RollappBinary,
+					Dir:         filepath.Join(rollappConfig.Home, consts.ConfigDirName.Rollapp),
+					ChainBinary: consts.Executables.RollappEVM,
+					ID:          consts.KeysIds.RollappSequencer,
+				}, rollappConfig.Home,
 			)
 			errorhandling.PrettifyErrorIfExists(err)
 			addresses = append(

diff --git a/cmd/rollapp/sequencer/metadata/export/export.go b/cmd/rollapp/sequencer/metadata/export/export.go
@@ -61,7 +61,7 @@ func Cmd() *cobra.Command {
 				Type:        consts.SDK_ROLLAPP,
 			}
 
-			seqAddrInfo, err := utils.GetAddressInfoBinary(hubSeqKC, hubSeqKC.ChainBinary)
+			seqAddrInfo, err := utils.GetAddressInfoBinary(hubSeqKC, rollappConfig.Home)
 			if err != nil {
 				pterm.Error.Println("failed to get address info: ", err)
 				return

diff --git a/cmd/rollapp/setup/setup.go b/cmd/rollapp/setup/setup.go
@@ -138,7 +138,7 @@ func Cmd() *cobra.Command {
 					ChainBinary: consts.Executables.Dymension,
 					Type:        consts.SDK_ROLLAPP,
 				}
-				seqAddrInfo, err := utils.GetAddressInfoBinary(hubSeqKC, hubSeqKC.ChainBinary)
+				seqAddrInfo, err := utils.GetAddressInfoBinary(hubSeqKC, rollappConfig.Home)
 				if err != nil {
 					pterm.Error.Println("failed to get address info: ", err)
 					return

diff --git a/cmd/utils/key_info.go b/cmd/utils/key_info.go
@@ -67,16 +67,16 @@ func ParseAddressFromOutput(output bytes.Buffer) (*KeyInfo, error) {
 	return key, nil
 }
 
-func GetAddressInfoBinary(keyConfig KeyConfig, binaryPath string) (*KeyInfo, error) {
+func GetAddressInfoBinary(keyConfig KeyConfig, home string) (*KeyInfo, error) {
 	showKeyCommand := exec.Command(
-		binaryPath,
+		keyConfig.ChainBinary,
 		"keys",
 		"show",
 		keyConfig.ID,
 		"--keyring-backend",
 		"test",
 		"--keyring-dir",
-		keyConfig.Dir,
+		filepath.Join(home, keyConfig.Dir),
 		"--output",
 		"json",
 	)

diff --git a/utils/eibc/eibc.go b/utils/eibc/eibc.go
@@ -75,13 +75,13 @@ func GetFulfillOrderCmd(orderId, fee string, hd consts.HubData) (*exec.Cmd, erro
 func EnsureWhaleAccount() error {
 	home, _ := os.UserHomeDir()
 	kc := utils.KeyConfig{
-		Dir:         filepath.Join(home, consts.ConfigDirName.Eibc),
+		Dir:         consts.ConfigDirName.Eibc,
 		ID:          consts.KeysIds.Eibc,
 		ChainBinary: consts.Executables.Dymension,
 		Type:        "",
 	}
 
-	_, err := utils.GetAddressInfoBinary(kc, consts.Executables.Dymension)
+	_, err := utils.GetAddressInfoBinary(kc, home)
 	if err != nil {
 		pterm.Info.Println("whale account not found in the keyring, creating it now")
 		addressInfo, err := keys.CreateAddressBinary(kc, home)