fix: apply multi decode functions instead of string contains check in HexAddressFromBech32String (#454)

* fix: apply multi decode functions instead of string contains check in HexAddressFromBech32String

* align for account, validator, and consensus addresses like sdk
* https://github.com/cosmos/cosmos-sdk/blob/release/v0.53.x/client/debug/main.go#L262

* test

Author: mmsqe

CHANGELOG.md

@@ -22,6 +22,7 @@
 - [\#376](https://github.com/cosmos/evm/pull/376) Fix precompile initialization for local node development script
 - [\#384](https://github.com/cosmos/evm/pull/384) Fix debug_traceTransaction RPC failing with block height mismatch errors
 - [\#441](https://github.com/cosmos/evm/pull/441) Align precompiles map with available static check to Prague.
+- [\#454](https://github.com/cosmos/evm/pull/454) Align multi decode functions instead of string contains check in HexAddressFromBech32String.
 
 ### IMPROVEMENTS
 

utils/utils.go

@@ -63,21 +63,40 @@ func Bech32StringFromHexAddress(hexAddr string) string {
 }
 
 // HexAddressFromBech32String converts a hex address to a bech32 encoded address.
-func HexAddressFromBech32String(addr string) (res common.Address, err error) {
-	if strings.Contains(addr, sdk.PrefixValidator) {
-		valAddr, err := sdk.ValAddressFromBech32(addr)
-		if err != nil {
-			return res, err
-		}
-		return common.BytesToAddress(valAddr.Bytes()), nil
+func HexAddressFromBech32String(addr string) (common.Address, error) {
+	decodeFns := []func(string) ([]byte, error){
+		func(s string) ([]byte, error) {
+			accAddr, err := sdk.AccAddressFromBech32(s)
+			if err != nil {
+				return nil, err
+			}
+			return accAddr.Bytes(), nil
+		},
+		func(s string) ([]byte, error) {
+			valAddr, err := sdk.ValAddressFromBech32(s)
+			if err != nil {
+				return nil, err
+			}
+			return valAddr.Bytes(), nil
+		},
+		func(s string) ([]byte, error) {
+			consAddr, err := sdk.ConsAddressFromBech32(s)
+			if err != nil {
+				return nil, err
+			}
+			return consAddr.Bytes(), nil
+		},
 	}
 
-	accAddr, err := sdk.AccAddressFromBech32(addr)
-	if err != nil {
-		return res, err
+	var lastErr error
+	for _, fn := range decodeFns {
+		bz, err := fn(addr)
+		if err == nil {
+			return common.BytesToAddress(bz), nil
+		}
+		lastErr = err
 	}
-
-	return common.BytesToAddress(accAddr), nil
+	return common.Address{}, errorsmod.Wrapf(lastErr, "failed to convert bech32 string to address")
 }
 
 // IsSupportedKey returns true if the pubkey type is supported by the chain

utils/utils_test.go

@@ -742,3 +742,35 @@ func TestCalcBaseFee(t *testing.T) {
 		})
 	}
 }
+
+func TestHexAddressFromBech32String(t *testing.T) {
+	accAddr := "cosmos16val7w9lc7wltqvpt0kscaul4xd6l2l43nhcq4"
+	valAddr := "cosmosvaloper16val7w9lc7wltqvpt0kscaul4xd6l2l458rdvx"
+	consAddr := "cosmosvalcons16val7w9lc7wltqvpt0kscaul4xd6l2l4q5s3q8"
+	invalidAddr := "invalid1address"
+	expectedHex := "0xd33bFF38Bfc79df581815BED0c779FA99BaFAbf5"
+
+	testCases := []struct {
+		name      string
+		input     string
+		wantHex   string
+		wantError bool
+	}{
+		{"account address", accAddr, expectedHex, false},
+		{"validator address", valAddr, expectedHex, false},
+		{"consensus address", consAddr, expectedHex, false},
+		{"invalid address", invalidAddr, "", true},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			addr, err := utils.HexAddressFromBech32String(tc.input)
+			if tc.wantError {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+				require.Equal(t, tc.wantHex, addr.Hex())
+			}
+		})
+	}
+}