From 7c95e1e1a0e5859e465a6c13ca0a51754c38c6dc Mon Sep 17 00:00:00 2001
From: artpav <19916123+artemijspavlovs@users.noreply.github.com>
Date: Tue, 24 Sep 2024 11:53:34 +0300
Subject: [PATCH] fix: coin type should be 60 for all keys (#1035)

---
 cmd/config/export/export.go | 5 +----
 cmd/config/init/keys.go     | 9 +++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/cmd/config/export/export.go b/cmd/config/export/export.go
index 4a9ddd17..60ff9733 100644
--- a/cmd/config/export/export.go
+++ b/cmd/config/export/export.go
@@ -33,10 +33,7 @@ func Cmd() *cobra.Command {
 			}
 			baseDenom := rlpCfg.Denom
 
-			coinType := 118
-			if rlpCfg.VMType == consts.EVM_ROLLAPP {
-				coinType = 60
-			}
+			coinType := 60
 			rly := relayer.NewRelayer(rlpCfg.Home, rlpCfg.RollappID, rlpCfg.HubData.ID)
 			_, _, err = rly.LoadActiveChannel()
 			if err != nil || rly.SrcChannel == "" || rly.DstChannel == "" {
diff --git a/cmd/config/init/keys.go b/cmd/config/init/keys.go
index 1238dd44..7586e377 100644
--- a/cmd/config/init/keys.go
+++ b/cmd/config/init/keys.go
@@ -10,7 +10,7 @@ import (
 	"github.com/dymensionxyz/roller/cmd/utils"
 	"github.com/dymensionxyz/roller/utils/bash"
 	"github.com/dymensionxyz/roller/utils/config"
-	keys2 "github.com/dymensionxyz/roller/utils/keys"
+	keyutils "github.com/dymensionxyz/roller/utils/keys"
 )
 
 func GenerateSequencersKeys(initConfig config.RollappConfig) ([]utils.KeyInfo, error) {
@@ -19,7 +19,7 @@ func GenerateSequencersKeys(initConfig config.RollappConfig) ([]utils.KeyInfo, e
 	for _, key := range keys {
 		var address *utils.KeyInfo
 		var err error
-		address, err = keys2.CreateAddressBinary(key, initConfig.Home)
+		address, err = keyutils.CreateAddressBinary(key, initConfig.Home)
 		if err != nil {
 			return nil, err
 		}
@@ -150,10 +150,7 @@ func GenerateRelayerKeys(rollappConfig config.RollappConfig) ([]utils.KeyInfo, e
 }
 
 func getAddRlyKeyCmd(keyConfig utils.KeyConfig, chainID string) *exec.Cmd {
-	coinType := "118"
-	if keyConfig.Type == consts.EVM_ROLLAPP {
-		coinType = "60"
-	}
+	coinType := "60"
 	return exec.Command(
 		consts.Executables.Relayer,
 		"keys",