chore: Remove the configurable address prefix flag (#27)

dymensionxyz · Jun 4, 2023 · e7f4d56 · e7f4d56
1 parent c89328b
commit e7f4d56
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 47 deletions.
diff --git a/cmd/config/init/consts.go b/cmd/config/init/consts.go
@@ -4,15 +4,13 @@ var flagNames = struct {
 	Home              string
 	LightNodeEndpoint string
 	Denom             string
-	KeyPrefix         string
 	Decimals          string
 	RollappBinary     string
 	HubRPC            string
 }{
 	Home:              "home",
 	LightNodeEndpoint: "light-node-endpoint",
 	Denom:             "denom",
-	KeyPrefix:         "key-prefix",
 	Decimals:          "decimals",
 	RollappBinary:     "rollapp-binary",
 	HubRPC:            "hub-rpc",
@@ -32,14 +30,14 @@ var keyNames = struct {
 	HubRelayer:       "relayer-hub-key",
 }
 
-var keyPrefixes = struct {
-	Hub string
+var addressPrefixes = struct {
+	Hub     string
 	Rollapp string
-	DA  string
+	DA      string
 }{
 	Rollapp: "rol",
-	Hub: "dym",
-	DA:  "celestia",
+	Hub:     "dym",
+	DA:      "celestia",
 }
 
 var configDirName = struct {

diff --git a/cmd/config/init/init.go b/cmd/config/init/init.go
@@ -5,13 +5,13 @@ import (
 )
 
 type InitConfig struct {
-	Home            string
-	RollappID       string
-	RollappBinary   string
+	Home              string
+	RollappID         string
+	RollappBinary     string
 	CreateDALightNode bool
-	Denom           string
-	HubID           string
-	Decimals        uint64
+	Denom             string
+	HubID             string
+	Decimals          uint64
 }
 
 func InitCmd() *cobra.Command {
@@ -22,18 +22,17 @@ func InitCmd() *cobra.Command {
 			rollappId := args[0]
 			denom := args[1]
 			home := cmd.Flag(flagNames.Home).Value.String()
-			rollappKeyPrefix := getKeyPrefix(cmd, rollappId)
 			createLightNode := !cmd.Flags().Changed(lightNodeEndpointFlag)
 			rollappBinaryPath := getRollappBinaryPath(cmd)
 			decimals := getDecimals(cmd)
 			initConfig := InitConfig{
-				Home:            home,
-				RollappID:       rollappId,
-				RollappBinary:   rollappBinaryPath,
+				Home:              home,
+				RollappID:         rollappId,
+				RollappBinary:     rollappBinaryPath,
 				CreateDALightNode: createLightNode,
-				Denom:           denom,
-				HubID:           defaultHubId,
-				Decimals:        decimals,
+				Denom:             denom,
+				HubID:             defaultHubId,
+				Decimals:          decimals,
 			}
 
 			addresses := initializeKeys(initConfig)
@@ -48,15 +47,15 @@ func InitCmd() *cobra.Command {
 			}
 
 			if err := initializeRelayerConfig(ChainConfig{
-				ID:        rollappId,
-				RPC:       defaultRollappRPC,
-				Denom:     denom,
-				KeyPrefix: rollappKeyPrefix,
+				ID:            rollappId,
+				RPC:           defaultRollappRPC,
+				Denom:         denom,
+				AddressPrefix: addressPrefixes.Rollapp,
 			}, ChainConfig{
-				ID:        defaultHubId,
-				RPC:       cmd.Flag(flagNames.HubRPC).Value.String(),
-				Denom:     "udym",
-				KeyPrefix: keyPrefixes.Hub,
+				ID:            defaultHubId,
+				RPC:           cmd.Flag(flagNames.HubRPC).Value.String(),
+				Denom:         "udym",
+				AddressPrefix: addressPrefixes.Hub,
 			}, initConfig); err != nil {
 				panic(err)
 			}
@@ -79,7 +78,6 @@ func InitCmd() *cobra.Command {
 func addFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP(flagNames.HubRPC, "", defaultHubRPC, "Dymension Hub rpc endpoint")
 	cmd.Flags().StringP(flagNames.LightNodeEndpoint, "", "", "The data availability light node endpoint. Runs an Arabica Celestia light node if not provided")
-	cmd.Flags().StringP(flagNames.KeyPrefix, "", "", "The `bech32` prefix of the rollapp keys. Defaults to the first three characters of the chain-id")
 	cmd.Flags().StringP(flagNames.RollappBinary, "", "", "The rollapp binary. Should be passed only if you built a custom rollapp")
 	cmd.Flags().Uint64P(flagNames.Decimals, "", 18, "The number of decimal places a rollapp token supports")
 	cmd.Flags().StringP(flagNames.Home, "", getRollerRootDir(), "The directory of the roller config files")
@@ -116,11 +114,3 @@ func getRollappBinaryPath(cmd *cobra.Command) string {
 	}
 	return rollappBinaryPath
 }
-
-func getKeyPrefix(cmd *cobra.Command, rollappID string) string {
-	keyPrefix := cmd.Flag(flagNames.KeyPrefix).Value.String()
-	if keyPrefix == "" {
-		return rollappID[:3]
-	}
-	return keyPrefix
-}
diff --git a/cmd/config/init/keys.go b/cmd/config/init/keys.go
@@ -72,31 +72,31 @@ func getDefaultKeysConfig(initConfig InitConfig) []KeyConfig {
 			dir:      configDirName.Rollapp,
 			keyId:    keyNames.HubSequencer,
 			coinType: cosmosDefaultCointype,
-			prefix:   keyPrefixes.Hub,
+			prefix:   addressPrefixes.Hub,
 		},
 		{
 			dir:      configDirName.Rollapp,
 			keyId:    keyNames.RollappSequencer,
 			coinType: evmCoinType,
-			prefix:   keyPrefixes.Rollapp,
+			prefix:   addressPrefixes.Rollapp,
 		},
 		{
 			dir:      path.Join(configDirName.Relayer, relayerKeysDirName, initConfig.RollappID),
 			keyId:    keyNames.HubRelayer,
 			coinType: cosmosDefaultCointype,
-			prefix:   keyPrefixes.Hub,
+			prefix:   addressPrefixes.Hub,
 		},
 		{
 			dir:      path.Join(configDirName.Relayer, relayerKeysDirName, initConfig.HubID),
 			keyId:    keyNames.RollappRelayer,
 			coinType: evmCoinType,
-			prefix:   keyPrefixes.Rollapp,
+			prefix:   addressPrefixes.Rollapp,
 		}, {
 
 			dir:      path.Join(configDirName.DALightNode, relayerKeysDirName),
 			keyId:    keyNames.DALightNode,
 			coinType: cosmosDefaultCointype,
-			prefix:   keyPrefixes.DA,
+			prefix:   addressPrefixes.DA,
 		},
 	}
 }
diff --git a/cmd/config/init/relayer.go b/cmd/config/init/relayer.go
@@ -28,10 +28,10 @@ type RelayerFileChainConfigValue struct {
 }
 
 type ChainConfig struct {
-	ID        string
-	RPC       string
-	Denom     string
-	KeyPrefix string
+	ID            string
+	RPC           string
+	Denom         string
+	AddressPrefix string
 }
 
 type RelayerChainConfig struct {
@@ -60,7 +60,7 @@ func getRelayerFileChainConfig(relayerChainConfig RelayerChainConfig) RelayerFil
 			Key:            relayerChainConfig.KeyName,
 			ChainID:        relayerChainConfig.ChainConfig.ID,
 			RpcAddr:        relayerChainConfig.ChainConfig.RPC,
-			AccountPrefix:  relayerChainConfig.ChainConfig.KeyPrefix,
+			AccountPrefix:  relayerChainConfig.ChainConfig.AddressPrefix,
 			KeyringBackend: "test",
 			GasAdjustment:  1.2,
 			GasPrices:      relayerChainConfig.GasPrices,