From b3c895d039ffc5e539d61aca9e9e3e06efdf73f0 Mon Sep 17 00:00:00 2001
From: huanglins <1261190152@qq.com>
Date: Tue, 25 Aug 2020 20:16:31 +0800
Subject: [PATCH] fix default account addr prefix (#472)

---
 types/config_test.go      | 7 +++++++
 x/evm/client/cli/utils.go | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/types/config_test.go b/types/config_test.go
index 2c6d65c7..d7717e04 100644
--- a/types/config_test.go
+++ b/types/config_test.go
@@ -24,4 +24,11 @@ func TestSetBech32Prefixes(t *testing.T) {
 	require.Equal(t, Bech32PrefixValPub, config.GetBech32ValidatorPubPrefix())
 	require.Equal(t, Bech32PrefixConsAddr, config.GetBech32ConsensusAddrPrefix())
 	require.Equal(t, Bech32PrefixConsPub, config.GetBech32ConsensusPubPrefix())
+
+	require.Equal(t, sdk.GetConfig().GetBech32AccountAddrPrefix(), config.GetBech32AccountAddrPrefix())
+	require.Equal(t, sdk.GetConfig().GetBech32AccountPubPrefix(), config.GetBech32AccountPubPrefix())
+	require.Equal(t, sdk.GetConfig().GetBech32ValidatorAddrPrefix(), config.GetBech32ValidatorAddrPrefix())
+	require.Equal(t, sdk.GetConfig().GetBech32ValidatorPubPrefix(), config.GetBech32ValidatorPubPrefix())
+	require.Equal(t, sdk.GetConfig().GetBech32ConsensusAddrPrefix(), config.GetBech32ConsensusAddrPrefix())
+	require.Equal(t, sdk.GetConfig().GetBech32ConsensusPubPrefix(), config.GetBech32ConsensusPubPrefix())
 }
diff --git a/x/evm/client/cli/utils.go b/x/evm/client/cli/utils.go
index ef3fd5cd..6114246c 100644
--- a/x/evm/client/cli/utils.go
+++ b/x/evm/client/cli/utils.go
@@ -12,7 +12,7 @@ import (
 )
 
 func accountToHex(addr string) (string, error) {
-	if strings.HasPrefix(addr, sdk.Bech32PrefixAccAddr) {
+	if strings.HasPrefix(addr, sdk.GetConfig().GetBech32AccountAddrPrefix()) {
 		// Check to see if address is Cosmos bech32 formatted
 		toAddr, err := sdk.AccAddressFromBech32(addr)
 		if err != nil {
@@ -47,7 +47,7 @@ func formatKeyToHash(key string) string {
 }
 
 func cosmosAddressFromArg(addr string) (sdk.AccAddress, error) {
-	if strings.HasPrefix(addr, sdk.Bech32PrefixAccAddr) {
+	if strings.HasPrefix(addr, sdk.GetConfig().GetBech32AccountAddrPrefix()) {
 		// Check to see if address is Cosmos bech32 formatted
 		toAddr, err := sdk.AccAddressFromBech32(addr)
 		if err != nil {