Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: wrong denom check at RegisterCoin #78

Merged
merged 2 commits into from
Jul 27, 2024
Merged

Fix: wrong denom check at RegisterCoin #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d01eab0
fix: wrong denom check at RegisterCoin
zsystm Jul 25, 2024
83188a0
chore: recover missing test codes and refactoring
zsystm Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions x/erc20/keeper/evm_hooks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ import (
)

const (
erc20Name = "Coin Token"
erc20Symbol = "CTKN"
erc20Decimals = uint8(18)
cosmosTokenBase = "acoin"
cosmosTokenDisplay = "coin"
cosmosDecimals = uint8(6)
defaultExponent = uint32(18)
zeroExponent = uint32(0)
ibcBase = "ibc/7F1D3FCF4AE79E1554D670D1AD949A9BA4E4A3C76C63093E17E446A46061A7A2"
erc20Name = "Coin Token"
erc20Symbol = "CTKN"
erc20Decimals = uint8(18)
cosmosTokenBase = "acoin"
cosmosDecimals = uint8(6)
defaultExponent = uint32(18)
zeroExponent = uint32(0)
ibcBase = "ibc/7F1D3FCF4AE79E1554D670D1AD949A9BA4E4A3C76C63093E17E446A46061A7A2"
)

func (suite *KeeperTestSuite) setupRegisterCoin() (banktypes.Metadata, *types.TokenPair) {
Expand Down
2 changes: 1 addition & 1 deletion x/erc20/keeper/proposals.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func (k Keeper) RegisterCoin(
}

// Check if denomination is already registered
if k.IsDenomRegistered(ctx, coinMetadata.Name) {
if k.IsDenomRegistered(ctx, coinMetadata.Base) {
return nil, errorsmod.Wrapf(
types.ErrTokenPairAlreadyExists, "coin denomination already registered: %s", coinMetadata.Name,
)
Expand Down
101 changes: 54 additions & 47 deletions x/erc20/keeper/proposals_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,32 @@ import (
inflationtypes "github.com/Canto-Network/Canto/v7/x/inflation/types"
)

// The following constants are based on query result of mainnet denoms metadata query.
const (
gravitonIBCDenom = "ibc/FC9D92EC12BC974E8B6179D411351524CD5C2EBC3CE29D5BA856414FEFA47093"
gravitonDenom = "graviton"
gravitonName = "Graviton"
gravitonSymbol = "GRAV"
)

func (suite KeeperTestSuite) TestRegisterCoin() {
metadata := banktypes.Metadata{
Description: "description",
Base: cosmosTokenBase,
Base: gravitonIBCDenom,
// NOTE: Denom units MUST be increasing
DenomUnits: []*banktypes.DenomUnit{
{
Denom: cosmosTokenBase,
Denom: gravitonIBCDenom,
Exponent: 0,
},
{
Denom: cosmosTokenDisplay,
Denom: gravitonDenom,
Exponent: defaultExponent,
},
},
Name: cosmosTokenBase,
Symbol: erc20Symbol,
Display: cosmosTokenDisplay,
Name: gravitonName,
Symbol: gravitonSymbol,
Display: gravitonDenom,
}

testCases := []struct {
Expand All @@ -46,7 +54,7 @@ func (suite KeeperTestSuite) TestRegisterCoin() {
expPass bool
}{
{
"conversion is disabled globally",
"fail: conversion is disabled globally",
func() {
params := types.DefaultParams()
params.EnableErc20 = false
Expand All @@ -55,42 +63,27 @@ func (suite KeeperTestSuite) TestRegisterCoin() {
false,
},
{
"denom already registered",
"fail: denom already registered",
func() {
regPair := types.NewTokenPair(tests.GenerateAddress(), metadata.Base, true, types.OWNER_MODULE)
suite.app.Erc20Keeper.SetTokenPair(suite.ctx, regPair)
suite.app.Erc20Keeper.SetTokenPairIdByDenom(suite.ctx, regPair.Denom, regPair.GetID())
suite.Commit()
},
false,
},
{
"token doesn't have supply",
"fail :token doesn't have supply",
func() {
},
false,
},
{
"metadata different that stored",
"fail: metadata different that stored",
func() {
metadata.Base = cosmosTokenBase
validMetadata := banktypes.Metadata{
Description: "description",
Base: cosmosTokenBase,
// NOTE: Denom units MUST be increasing
DenomUnits: []*banktypes.DenomUnit{
{
Denom: cosmosTokenBase,
Exponent: 0,
},
{
Denom: cosmosTokenDisplay,
Exponent: uint32(18),
},
},
Name: erc20Name,
Symbol: erc20Symbol,
Display: cosmosTokenDisplay,
}
metadata.Base = gravitonDenom
validMetadata := metadata
validMetadata.Name = "different"

err := suite.app.BankKeeper.MintCoins(suite.ctx, inflationtypes.ModuleName, sdk.Coins{sdk.NewInt64Coin(validMetadata.Base, 1)})
suite.Require().NoError(err)
Expand All @@ -108,16 +101,7 @@ func (suite KeeperTestSuite) TestRegisterCoin() {
false,
},
{
"evm denom registration - CANTO",
func() {
metadata.Base = "CANTO"
err := suite.app.BankKeeper.MintCoins(suite.ctx, inflationtypes.ModuleName, sdk.Coins{sdk.NewInt64Coin(metadata.Base, 1)})
suite.Require().NoError(err)
},
false,
},
{
"evm denom registration - aCANTO",
"fail: evm denom registration - aCANTO",
func() {
metadata.Base = "aCANTO"
err := suite.app.BankKeeper.MintCoins(suite.ctx, inflationtypes.ModuleName, sdk.Coins{sdk.NewInt64Coin(metadata.Base, 1)})
Expand All @@ -126,7 +110,7 @@ func (suite KeeperTestSuite) TestRegisterCoin() {
false,
},
{
"evm denom registration - wCANTO",
"fail: evm denom registration - wCANTO",
func() {
metadata.Base = "wCANTO"
err := suite.app.BankKeeper.MintCoins(suite.ctx, inflationtypes.ModuleName, sdk.Coins{sdk.NewInt64Coin(metadata.Base, 1)})
Expand All @@ -137,16 +121,16 @@ func (suite KeeperTestSuite) TestRegisterCoin() {
{
"ok",
func() {
metadata.Base = cosmosTokenBase
metadata.Base = gravitonIBCDenom
err := suite.app.BankKeeper.MintCoins(suite.ctx, inflationtypes.ModuleName, sdk.Coins{sdk.NewInt64Coin(metadata.Base, 1)})
suite.Require().NoError(err)
},
true,
},
{
"force fail evm",
"fail: force fail evm",
func() {
metadata.Base = cosmosTokenBase
metadata.Base = gravitonDenom
err := suite.app.BankKeeper.MintCoins(suite.ctx, inflationtypes.ModuleName, sdk.Coins{sdk.NewInt64Coin(metadata.Base, 1)})
suite.Require().NoError(err)

Expand All @@ -160,9 +144,9 @@ func (suite KeeperTestSuite) TestRegisterCoin() {
false,
},
{
"force delete module account evm",
"fail: force delete module account evm",
func() {
metadata.Base = cosmosTokenBase
metadata.Base = gravitonIBCDenom
err := suite.app.BankKeeper.MintCoins(suite.ctx, inflationtypes.ModuleName, sdk.Coins{sdk.NewInt64Coin(metadata.Base, 1)})
suite.Require().NoError(err)

Expand All @@ -171,6 +155,29 @@ func (suite KeeperTestSuite) TestRegisterCoin() {
},
false,
},
{
"fail: token pair already exists with same denom",
func() {
metadata.Base = gravitonIBCDenom
err := suite.app.BankKeeper.MintCoins(suite.ctx, inflationtypes.ModuleName, sdk.Coins{sdk.NewInt64Coin(metadata.Base, 1)})
suite.Require().NoError(err)

tokenPair, err := suite.app.Erc20Keeper.RegisterCoin(suite.ctx, metadata)
suite.Require().NoError(err)
suite.Commit()

// check token pair is stored
suite.Require().Equal(types.OWNER_MODULE, tokenPair.ContractOwner)
suite.Require().Equal(metadata.Base, tokenPair.Denom)
suite.Require().Equal(true, tokenPair.Enabled)

// check indexes are stored
id := tokenPair.GetID()
suite.Require().Equal(id, suite.app.Erc20Keeper.GetTokenPairIdByDenom(suite.ctx, tokenPair.Denom))
suite.Require().Equal(id, suite.app.Erc20Keeper.GetTokenPairIdByERC20Addr(suite.ctx, common.HexToAddress(tokenPair.Erc20Address)))
},
false,
},
}
for _, tc := range testCases {
suite.Run(fmt.Sprintf("Case %s", tc.name), func() {
Expand All @@ -183,9 +190,9 @@ func (suite KeeperTestSuite) TestRegisterCoin() {

expPair := &types.TokenPair{
Erc20Address: "0x80b5a32E4F032B2a058b4F29EC95EEfEEB87aDcd",
Denom: "acoin",
Denom: gravitonIBCDenom,
Enabled: true,
ContractOwner: 1,
ContractOwner: types.OWNER_MODULE,
}

if tc.expPass {
Expand Down
Loading