fix: missing parts omitted from the ibc v2 PR (cosmos#122)

dongsam · web-flow · commit f3bba339ec07 · 2025-05-07T16:38:58.000-04:00
* fix: follow-up fix for ibc v2 feature

* build: add explicit solhint version for constant ci
diff --git a/.github/workflows/solhint.yml b/.github/workflows/solhint.yml
@@ -18,7 +18,7 @@ jobs:
             **/**.sol
       - uses: actions/setup-node@v4
         if: env.GIT_DIFF
-      - run: npm install -g solhint
+      - run: npm install -g solhint@v5.0.5
         if: env.GIT_DIFF
       - run: solhint --version
         if: env.GIT_DIFF
diff --git a/ibc/testing/path.go b/ibc/testing/path.go
@@ -125,7 +125,7 @@ func (path *Path) RelayPacketWithResults(packet channeltypes.Packet) (*abci.Exec
 	return nil, nil, errors.New("packet commitment does not exist on either endpoint for provided packet")
 }
 
-// RelayPacket attempts to relay the packet first on EndpointA and then on EndpointB
+// RelayPacketV2 attempts to relay the v2 packet first on EndpointA and then on EndpointB
 // if EndpointA does not contain a packet commitment for that packet. An error is returned
 // if a relay step fails or the packet commitment does not exist on either endpoint.
 func (path *Path) RelayPacketV2(packet channeltypesv2.Packet) error {
diff --git a/precompiles/ics20/errors.go b/precompiles/ics20/errors.go
@@ -19,6 +19,6 @@ const (
 	ErrNoMatchingAllocation = "no matching allocation found for source port: %s, source channel: %s, and denom: %s"
 	// ErrDifferentOriginFromSender is raised when the origin address is not the same as the sender address.
 	ErrDifferentOriginFromSender = "origin address %s is not the same as sender address %s"
-	// ErrTraceFound is raised when the denom for the specified request does not exist.
-	ErrTraceFound = "denomination not found"
+	// ErrDenomNotFound is raised when the denom for the specified request does not exist.
+	ErrDenomNotFound = "denomination not found"
 )
diff --git a/precompiles/ics20/query.go b/precompiles/ics20/query.go
@@ -41,7 +41,7 @@ func (p Precompile) Denom(
 	res, err := p.transferKeeper.Denom(ctx, req)
 	if err != nil {
 		// if the trace does not exist, return empty array
-		if strings.Contains(err.Error(), ErrTraceFound) {
+		if strings.Contains(err.Error(), ErrDenomNotFound) {
 			return method.Outputs.Pack(transfertypes.Denom{})
 		}
 		return nil, err
@@ -85,7 +85,7 @@ func (p Precompile) DenomHash(
 	res, err := p.transferKeeper.DenomHash(ctx, req)
 	if err != nil {
 		// if the denom hash does not exist, return empty string
-		if strings.Contains(err.Error(), ErrTraceFound) {
+		if strings.Contains(err.Error(), ErrDenomNotFound) {
 			return method.Outputs.Pack("")
 		}
 		return nil, err
diff --git a/precompiles/testutil/contracts/InterchainSender.json b/precompiles/testutil/contracts/InterchainSender.json
diff --git a/precompiles/testutil/contracts/InterchainSender.sol b/precompiles/testutil/contracts/InterchainSender.sol
@@ -214,7 +214,7 @@ contract InterchainSender {
 
     function testDenom(
         string memory hash
-    ) public view returns (Denom memory denomTrace) {
+    ) public view returns (Denom memory denom) {
         return ICS20_CONTRACT.denom(hash);
     }
 
diff --git a/precompiles/testutil/contracts/InterchainSenderCaller.json b/precompiles/testutil/contracts/InterchainSenderCaller.json
diff --git a/testutil/integration/os/utils/unit.go b/testutil/integration/os/utils/unit.go
@@ -73,7 +73,7 @@ func RegisterEvmosERC20Coins(
 	return tokenPair, nil
 }
 
-// RegisterIBCERC20Coins uses the UnitNetwork to register the denomTrace as an
+// RegisterIBCERC20Coins uses the UnitNetwork to register the denom as an
 // ERC20 token. The function performs all the required steps for the registration
 // like registering the denom in the transfer keeper and minting the token
 // with the bank. Returns the TokenPair or an error.
diff --git a/utils/utils_test.go b/utils/utils_test.go
@@ -146,7 +146,7 @@ func TestEvmosCoinDenom(t *testing.T) {
 		},
 		{
 			"valid denom - ethereum address (ERC-20 contract)",
-			"erc20/0x52908400098527886e0f7030069857D2E4169EE7",
+			"erc20:0x52908400098527886e0f7030069857D2E4169EE7",
 			false,
 		},
 		{
diff --git a/x/erc20/keeper/ibc_callbacks_test.go b/x/erc20/keeper/ibc_callbacks_test.go
@@ -27,7 +27,7 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 )
 
-var erc20Denom = "erc20/0xdac17f958d2ee523a2206206994597c13d831ec7"
+var erc20Denom = "erc20:0xdac17f958d2ee523a2206206994597c13d831ec7"
 
 func (suite *KeeperTestSuite) TestOnRecvPacket() {
 	var ctx sdk.Context
diff --git a/x/erc20/types/utils.go b/x/erc20/types/utils.go
@@ -15,8 +15,8 @@ const (
 	// (?m)^(\d+) remove leading numbers
 	reLeadingNumbers = `(?m)^(\d+)`
 	// ^[^A-Za-z] forces first chars to be letters
-	// [^a-zA-Z0-9/-] deletes special characters
-	reDnmString = `^[^A-Za-z]|[^a-zA-Z0-9/-]`
+	// [^a-zA-Z0-9/:-] deletes special characters
+	reDnmString = `^[^A-Za-z]|[^a-zA-Z0-9/:-]`
 )
 
 func removeLeadingNumbers(str string) string {
@@ -37,6 +37,9 @@ func removeInvalidPrefixes(str string) string {
 	if strings.HasPrefix(str, "erc20/") {
 		return removeInvalidPrefixes(str[6:])
 	}
+	if strings.HasPrefix(str, "erc20:") {
+		return removeInvalidPrefixes(str[6:])
+	}
 	return str
 }
 
diff --git a/x/erc20/types/utils_test.go b/x/erc20/types/utils_test.go
@@ -30,9 +30,13 @@ func TestSanitizeERC20Name(t *testing.T) {
 		{"name contains '/'", "Ot/2letters", "Ot/2letters", true},
 		{"name contains '/'", "ibc/valid", "valid", true},
 		{"name contains '/'", "erc20/valid", "valid", true},
+		{"name contains ':'", "erc20:valid", "valid", true},
 		{"name contains '/'", "ibc/erc20/valid", "valid", true},
 		{"name contains '/'", "ibc/erc20/ibc/valid", "valid", true},
 		{"name contains '/'", "ibc/erc20/ibc/20invalid", "20invalid", false},
+		{"name contains '/, :'", "ibc/erc20:valid", "valid", true},
+		{"name contains '/, :'", "ibc/erc20:ibc/valid", "valid", true},
+		{"name contains '/, :'", "ibc/erc20:ibc/20invalid", "20invalid", false},
 		{"name contains '/'", "123/leadingslash", "leadingslash", true},
 		{"name contains '-'", "Dash-Coin", "Dash-Coin", true},
 		{"really long word", strings.Repeat("a", 150), strings.Repeat("a", 128), true},

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func (path Path) RelayPacketWithResults(packet channeltypes.Packet) (abci.Exec`
`125`	`125`	`return nil, nil, errors.New("packet commitment does not exist on either endpoint for provided packet")`
`126`	`126`	`}`
`127`	`127`
`128`		`-// RelayPacket attempts to relay the packet first on EndpointA and then on EndpointB`
	`128`	`+// RelayPacketV2 attempts to relay the v2 packet first on EndpointA and then on EndpointB`
`129`	`129`	`// if EndpointA does not contain a packet commitment for that packet. An error is returned`
`130`	`130`	`// if a relay step fails or the packet commitment does not exist on either endpoint.`
`131`	`131`	`func (path *Path) RelayPacketV2(packet channeltypesv2.Packet) error {`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ const (`
`19`	`19`	`ErrNoMatchingAllocation = "no matching allocation found for source port: %s, source channel: %s, and denom: %s"`
`20`	`20`	`// ErrDifferentOriginFromSender is raised when the origin address is not the same as the sender address.`
`21`	`21`	`ErrDifferentOriginFromSender = "origin address %s is not the same as sender address %s"`
`22`		`- // ErrTraceFound is raised when the denom for the specified request does not exist.`
`23`		`- ErrTraceFound = "denomination not found"`
	`22`	`+ // ErrDenomNotFound is raised when the denom for the specified request does not exist.`
	`23`	`+ ErrDenomNotFound = "denomination not found"`
`24`	`24`	`)`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ contract InterchainSender {`
`214`	`214`
`215`	`215`	`function testDenom(`
`216`	`216`	`string memory hash`
`217`		`- ) public view returns (Denom memory denomTrace) {`
	`217`	`+ ) public view returns (Denom memory denom) {`
`218`	`218`	`return ICS20_CONTRACT.denom(hash);`
`219`	`219`	`}`
`220`	`220`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func RegisterEvmosERC20Coins(`
`73`	`73`	`return tokenPair, nil`
`74`	`74`	`}`
`75`	`75`
`76`		`-// RegisterIBCERC20Coins uses the UnitNetwork to register the denomTrace as an`
	`76`	`+// RegisterIBCERC20Coins uses the UnitNetwork to register the denom as an`
`77`	`77`	`// ERC20 token. The function performs all the required steps for the registration`
`78`	`78`	`// like registering the denom in the transfer keeper and minting the token`
`79`	`79`	`// with the bank. Returns the TokenPair or an error.`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ func TestEvmosCoinDenom(t *testing.T) {`
`146`	`146`	`},`
`147`	`147`	`{`
`148`	`148`	`"valid denom - ethereum address (ERC-20 contract)",`
`149`		`- "erc20/0x52908400098527886e0f7030069857D2E4169EE7",`
	`149`	`+ "erc20:0x52908400098527886e0f7030069857D2E4169EE7",`
`150`	`150`	`false,`
`151`	`151`	`},`
`152`	`152`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"`
`28`	`28`	`)`
`29`	`29`
`30`		`-var erc20Denom = "erc20/0xdac17f958d2ee523a2206206994597c13d831ec7"`
	`30`	`+var erc20Denom = "erc20:0xdac17f958d2ee523a2206206994597c13d831ec7"`
`31`	`31`
`32`	`32`	`func (suite *KeeperTestSuite) TestOnRecvPacket() {`
`33`	`33`	`var ctx sdk.Context`