fix: align BytesToAddress in parseHexAddress (#276)

* fix: align BytesToAddress in parseHexAddress

that requires exact 20-byte instead of direct Address conversion

* test

---------

Co-authored-by: Vlad J <[email protected]>

Author: mmsqe

precompiles/common/balance_handler.go

@@ -84,7 +84,7 @@ func parseHexAddress(event sdk.Event, key string) (common.Address, error) {
 		return common.Address{}, fmt.Errorf("invalid address %q: %w", attr.Value, err)
 	}
 
-	return common.Address(accAddr.Bytes()), nil
+	return common.BytesToAddress(accAddr), nil
 }
 
 func parseAmount(event sdk.Event) (*uint256.Int, error) {

precompiles/common/balance_handler_test.go

@@ -5,9 +5,11 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/tracing"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/holiman/uint256"
 	"github.com/stretchr/testify/require"
 
+	"github.com/cosmos/evm/crypto/ethsecp256k1"
 	testutil "github.com/cosmos/evm/testutil"
 	testconstants "github.com/cosmos/evm/testutil/constants"
 	"github.com/cosmos/evm/x/vm/statedb"
@@ -31,7 +33,11 @@ func setupBalanceHandlerTest(t *testing.T) {
 }
 
 func TestParseHexAddress(t *testing.T) {
-	var accAddr sdk.AccAddress
+	// account key, use a constant account to keep unit test deterministic.
+	priv, err := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
+	require.NoError(t, err)
+	privKey := &ethsecp256k1.PrivKey{Key: crypto.FromECDSA(priv)}
+	accAddr := sdk.AccAddress(privKey.PubKey().Address().Bytes())
 
 	testCases := []struct {
 		name     string
@@ -46,6 +52,16 @@ func TestParseHexAddress(t *testing.T) {
 				return sdk.NewEvent("bank", sdk.NewAttribute(banktypes.AttributeKeySpender, accAddr.String()))
 			},
 			key:      banktypes.AttributeKeySpender,
+			expAddr:  common.BytesToAddress(accAddr),
+			expError: false,
+		},
+		{
+			name: "valid address - BytesToAddress",
+			maleate: func() sdk.Event {
+				return sdk.NewEvent("bank", sdk.NewAttribute(banktypes.AttributeKeySpender, "cosmos1ddjhjcmgv95kutgqqqqqqqqqqqqsjugwrg"))
+			},
+			key:      banktypes.AttributeKeySpender,
+			expAddr:  common.HexToAddress("0x0000006B6579636861696e2d0000000000000001"),
 			expError: false,
 		},
 		{
@@ -70,10 +86,6 @@ func TestParseHexAddress(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			setupBalanceHandlerTest(t)
 
-			_, addrs, err := testutil.GeneratePrivKeyAddressPairs(1)
-			require.NoError(t, err)
-			accAddr = addrs[0]
-
 			event := tc.maleate()
 
 			addr, err := parseHexAddress(event, tc.key)
@@ -83,7 +95,7 @@ func TestParseHexAddress(t *testing.T) {
 			}
 
 			require.NoError(t, err)
-			require.Equal(t, common.Address(accAddr.Bytes()), addr)
+			require.Equal(t, tc.expAddr, addr)
 		})
 	}
 }
@@ -148,8 +160,8 @@ func TestAfterBalanceChange(t *testing.T) {
 	require.NoError(t, err)
 	spenderAcc := addrs[0]
 	receiverAcc := addrs[1]
-	spender := common.Address(spenderAcc.Bytes())
-	receiver := common.Address(receiverAcc.Bytes())
+	spender := common.BytesToAddress(spenderAcc)
+	receiver := common.BytesToAddress(receiverAcc)
 
 	// initial balance for spender
 	stateDB.AddBalance(spender, uint256.NewInt(5), tracing.BalanceChangeUnspecified)

tests/integration/precompiles/ics20/test_integration.go

@@ -73,7 +73,7 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, evmAppCreator ibctesting.A
 			Expect(err).To(BeNil())
 			Expect(res.Code).To(BeZero(), "Failed to deploy ICS20 caller contract: %s", res.Log)
 
-			ics20CallerAddr = crypto.CreateAddress(common.Address(sender.Bytes()), sentEthTx.AsTransaction().Nonce())
+			ics20CallerAddr = crypto.CreateAddress(common.BytesToAddress(sender), sentEthTx.AsTransaction().Nonce())
 			evmAppA := s.chainA.App.(evm.EvmApp)
 			Expect(isContractDeployed(s.chainA.GetContext(), evmAppA, ics20CallerAddr)).To(BeTrue(), "Contract was not deployed successfully")
 
@@ -124,7 +124,7 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, evmAppCreator ibctesting.A
 			sourcePortID := path.EndpointA.ChannelConfig.PortID
 			sourceChannelID := path.EndpointA.ChannelID
 			sourceBondDenom := s.chainABondDenom
-			sender := common.Address(s.chainA.SenderAccount.GetAddress().Bytes())
+			sender := common.BytesToAddress(s.chainA.SenderAccount.GetAddress())
 
 			callArgs := testutiltypes.CallArgs{
 				ContractABI: ics20CallerContract.ABI,