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.

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

bugfix: Update utils.go #530

Merged
merged 6 commits into from
Apr 28, 2022
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
6 changes: 5 additions & 1 deletion x/erc20/keeper/proposals.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,11 @@ func (k Keeper) DeployERC20Contract(
ctx sdk.Context,
coinMetadata banktypes.Metadata,
) (common.Address, error) {
decimals := uint8(coinMetadata.DenomUnits[0].Exponent)
decimals := uint8(0)
if len(coinMetadata.DenomUnits) > 0 {
decimalsIdx := len(coinMetadata.DenomUnits) - 1
decimals = uint8(coinMetadata.DenomUnits[decimalsIdx].Exponent)
}
ctorArgs, err := contracts.ERC20MinterBurnerDecimalsContract.ABI.Pack(
"",
coinMetadata.Name,
Expand Down
20 changes: 19 additions & 1 deletion x/erc20/types/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package types

import (
"fmt"
"sort"
"strings"

banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
Expand All @@ -26,7 +27,7 @@ func EqualMetadata(a, b banktypes.Metadata) error {
}

for i, v := range a.DenomUnits {
if v != b.DenomUnits[i] {
if (v.Exponent != b.DenomUnits[i].Exponent) || (v.Denom != b.DenomUnits[i].Denom) || !EqualStringSlice(v.Aliases, b.DenomUnits[i].Aliases) {
return fmt.Errorf("metadata provided has different denom unit from stored, %s ≠ %s", a.DenomUnits[i], b.DenomUnits[i])
}
}
Expand All @@ -35,3 +36,20 @@ func EqualMetadata(a, b banktypes.Metadata) error {
}
return fmt.Errorf("metadata provided is different from stored")
}

// EqualStringSlice checks if two string slices are equal.
func EqualStringSlice(a, b []string) bool {
fedekunze marked this conversation as resolved.
Show resolved Hide resolved
if len(a) != len(b) {
return false
}

sort.Strings(a)
sort.Strings(b)
for idx := len(a) - 1; idx > -1; idx-- {
if a[idx] != b[idx] {
return false
}
}

return true
}
89 changes: 89 additions & 0 deletions x/erc20/types/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package types
import (
"testing"

banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/stretchr/testify/require"
)

Expand All @@ -25,3 +26,91 @@ func TestSanitizeERC20Name(t *testing.T) {
require.Equal(t, tc.expErc20Name, name, tc.name)
}
}

func TestEqualMetadata(t *testing.T) {
fedekunze marked this conversation as resolved.
Show resolved Hide resolved

base := "CoinBase"
display := "CoinDisplay"
name := "CoinName"
symbol := "CoinATOM"
description := "ATOM Coin"
decimal := uint32(18)

// for metadata_A
denomUnits_A := []*banktypes.DenomUnit{
{
Denom: base,
Exponent: 0,
Aliases: []string{base, "moreInfo"},
},
{
Denom: display,
Exponent: decimal,
Aliases: []string{display, "moreInfo"},
}}
metadata_A := banktypes.Metadata{
Base: base,
Display: display,
Name: name,
Symbol: symbol,
Description: description,
DenomUnits: denomUnits_A,
}

// for metadata_B
denomUnits_B := []*banktypes.DenomUnit{
{
Denom: base,
Exponent: 0,
Aliases: []string{"moreInfo", base},
},
{
Denom: display,
Exponent: decimal,
Aliases: []string{display, "moreInfo"},
}}
metadata_B := banktypes.Metadata{
Base: base,
Display: display,
Name: name,
Symbol: symbol,
Description: description,
DenomUnits: denomUnits_B,
}

// for metadata_C
denomUnits_C := []*banktypes.DenomUnit{
{
Denom: base,
Exponent: 0,
Aliases: []string{"moreInfo_YES", base},
},
{
Denom: display,
Exponent: decimal,
Aliases: []string{display, "moreInfo"},
}}
metadata_C := banktypes.Metadata{
Base: base,
Display: display,
Name: name,
Symbol: symbol,
Description: description,
DenomUnits: denomUnits_C,
}

// metadata list
metadataList := []*banktypes.Metadata{
&metadata_A,
&metadata_B,
&metadata_C,
}

// validate each metadata
for _, md := range metadataList {
require.NoError(t, md.Validate())
}

require.NoError(t, EqualMetadata(metadata_A, metadata_B))
require.NotEqual(t, EqualMetadata(metadata_A, metadata_C), nil)
}