replace erc20 native coin's prefix

from: erc20/
to: erc20

Author: zsystm

x/erc20/keeper/integration_test.go

@@ -1,7 +1,6 @@
 package keeper_test
 
 import (
-	"fmt"
 	"math/big"
 	"testing"
 
@@ -183,7 +182,7 @@ var _ = Describe("ERC20:", Ordered, func() {
 				})
 
 				It("should send coins to the receiver account", func() {
-					balRes, err := s.handler.GetBalanceFromBank(s.keyring.GetAccAddr(0), fmt.Sprintf("erc20/%s", contract.Hex()))
+					balRes, err := s.handler.GetBalanceFromBank(s.keyring.GetAccAddr(0), types.ModuleName+contract.Hex())
 					Expect(err).To(BeNil())
 					balanceCoin := balRes.Balance
 					Expect(balanceCoin.Amount).To(Equal(amt))

x/erc20/types/proposal.go

@@ -41,19 +41,22 @@ func CreateDenomDescription(address string) string {
 
 // CreateDenom generates a string the module name plus the address to avoid conflicts with names staring with a number
 func CreateDenom(address string) string {
-	return fmt.Sprintf("%s/%s", ModuleName, address)
+	return fmt.Sprintf("%s%s", ModuleName, address)
 }
 
-// ValidateErc20Denom checks if a denom is a valid erc20/
-// denomination
+// ValidateErc20Denom checks if a denom is a valid erc20 denomination.
+// Example: "erc200xabc..."
 func ValidateErc20Denom(denom string) error {
-	denomSplit := strings.SplitN(denom, "/", 2)
-
-	if len(denomSplit) != 2 || denomSplit[0] != ModuleName {
-		return fmt.Errorf("invalid denom. %s denomination should be prefixed with the format 'erc20/", denom)
+	if strings.HasPrefix(denom, ModuleName) {
+		trimmed := strings.TrimPrefix(denom, ModuleName)
+		if len(trimmed) > 0 && trimmed[0] == '/' {
+			// backward compatibility with old denom format ("erc20/0xabc...")
+			return cosmosevmtypes.ValidateAddress(trimmed[1:])
+		}
+		return cosmosevmtypes.ValidateAddress(trimmed)
 	}
 
-	return cosmosevmtypes.ValidateAddress(denomSplit[1])
+	return fmt.Errorf("invalid denom. %s denomination should be prefixed with the format 'erc20", denom)
 }
 
 // NewRegisterERC20Proposal returns new instance of RegisterERC20Proposal

x/erc20/types/proposal_test.go

@@ -59,12 +59,12 @@ func (suite *ProposalTestSuite) TestCreateDenom() {
 		{
 			"with valid address",
 			"0xdac17f958d2ee523a2206206994597c13d831ec7",
-			"erc20/0xdac17f958d2ee523a2206206994597c13d831ec7",
+			"erc200xdac17f958d2ee523a2206206994597c13d831ec7",
 		},
 		{
 			"with empty string",
 			"",
-			"erc20/",
+			"erc20",
 		},
 	}
 	for _, tc := range testCases {
@@ -79,6 +79,11 @@ func (suite *ProposalTestSuite) TestValidateErc20Denom() {
 		denom   string
 		expPass bool
 	}{
+		{
+			"fail: invalid address",
+			"0xdac17f958d2ee523a22",
+			false,
+		},
 		{
 			"- instead of /",
 			"erc20-0xdac17f958d2ee523a2206206994597c13d831ec7",
@@ -104,6 +109,11 @@ func (suite *ProposalTestSuite) TestValidateErc20Denom() {
 			"erc20/0xdac17f958d2ee523a2206206994597c13d831ec7",
 			true,
 		},
+		{
+			"pass",
+			"erc200xdac17f958d2ee523a2206206994597c13d831ec7",
+			true,
+		},
 	}
 	for _, tc := range testCases {
 		err := types.ValidateErc20Denom(tc.denom)

x/ibc/transfer/keeper/msg_server_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/cosmos/evm/testutil/integration/os/keyring"
 	testutils "github.com/cosmos/evm/testutil/integration/os/utils"
+	erc20types "github.com/cosmos/evm/x/erc20/types"
 	"github.com/cosmos/evm/x/ibc/transfer/keeper"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
 	"github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
@@ -55,7 +56,7 @@ func (suite *KeeperTestSuite) TestTransfer() {
 				contractAddr, err := suite.DeployContract("coin", "token", uint8(6))
 				suite.Require().NoError(err)
 
-				transferMsg := types.NewMsgTransfer(types.PortID, chan0, sdk.NewCoin("erc20/"+contractAddr.String(), math.NewInt(10)), addr, receiver.String(), timeoutHeight, 0, "")
+				transferMsg := types.NewMsgTransfer(types.PortID, chan0, sdk.NewCoin(erc20types.ModuleName+contractAddr.String(), math.NewInt(10)), addr, receiver.String(), timeoutHeight, 0, "")
 				return transferMsg
 			},
 			false,
@@ -189,7 +190,7 @@ func (suite *KeeperTestSuite) TestTransfer() {
 				suite.Require().NoError(err)
 				suite.Require().True(len(res) == 1)
 				pair := res[0]
-				suite.Require().Equal("erc20/"+pair.Erc20Address, pair.Denom)
+				suite.Require().Equal(erc20types.ModuleName+pair.Erc20Address, pair.Denom)
 
 				amt := math.NewInt(10)
 				_, err = suite.MintERC20Token(contractAddr, sender.Addr, amt.BigInt())