Problem: url encoded characters are not properly handled in contract_by_denom

CHANGELOG.md

@@ -36,6 +36,7 @@
 
 * [#1520](https://github.com/crypto-org-chain/cronos/pull/1520) Avoid invalid chain id for signer error when rpc call before chain id set in BeginBlock.
 * [#1539](https://github.com/crypto-org-chain/cronos/pull/1539) Fix go-block-stm bug that causes app hash mismatch.
+* [#1560](https://github.com/crypto-org-chain/cronos/pull/1560) Ensure url encoded characters are properly handled in contract_by_denom api.
 
 *Jun 18, 2024*
 

integration_tests/configs/genesis_token_mapping.jsonnet

@@ -56,6 +56,10 @@ config {
               denom: 'gravity0x0000000000000000000000000000000000000000',
               contract: '0x68542BD12B41F5D51D6282Ec7D91D7d0D78E4503',
             },
+            {
+              denom: 'ibc/6B5A664BF0AF4F71B2F0BAA33141E2F1321242FBD5D19762F541EC971ACB0865',
+              contract: '0x0000000000000000000000000000000000000000',
+            },
           ],
           auto_contracts: [
             {

integration_tests/test_exported_genesis.py

@@ -1,7 +1,10 @@
 import json
+import urllib.parse
 from pathlib import Path
 
 import pytest
+import requests
+from pystarport import ports
 
 from .network import setup_custom_cronos
 from .utils import ADDRS, CONTRACTS
@@ -34,3 +37,16 @@ def test_exported_token_mapping(custom_cronos):
     )
     assert rsp["contract"] == "0x68542BD12B41F5D51D6282Ec7D91D7d0D78E4503"
     assert rsp["auto_contract"] == "0x68542BD12B41F5D51D6282Ec7D91D7d0D78E4503"
+    denom = "ibc/6B5A664BF0AF4F71B2F0BAA33141E2F1321242FBD5D19762F541EC971ACB0865"
+    rsp = cli.query_contract_by_denom(denom)
+    expected = {
+        "contract": "0x0000000000000000000000000000000000000000",
+        "auto_contract": "",
+    }
+    assert rsp == expected
+    port = ports.api_port(custom_cronos.base_port(0))
+    param = urllib.parse.quote(denom, safe="")
+    param = urllib.parse.quote(param, safe="")
+    url = f"http://127.0.0.1:{port}/cronos/v1/contract_by_denom/{param}"
+    rsp = requests.get(url).json()
+    assert rsp == expected

x/cronos/keeper/grpc_query.go

@@ -4,6 +4,7 @@
 	"context"
 	"fmt"
 	"math/big"
+	"net/url"
 
 	errorsmod "cosmossdk.io/errors"
 	"google.golang.org/grpc/codes"
@@ -21,18 +22,22 @@
 
 // ContractByDenom query contract by denom, returns both external contract and auto deployed contract
 func (k Keeper) ContractByDenom(goCtx context.Context, req *types.ContractByDenomRequest) (*types.ContractByDenomResponse, error) {
+	decoded, err := url.QueryUnescape(req.Denom)
+	if err != nil {
+		return nil, fmt.Errorf("fail to decode coin denom %s", req.Denom)
+	}
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	rsp := types.ContractByDenomResponse{}
-	contract, found := k.getExternalContractByDenom(ctx, req.Denom)
+	contract, found := k.getExternalContractByDenom(ctx, decoded)
 	if found {
 		rsp.Contract = contract.String()
 	}
-	autoContract, found := k.getAutoContractByDenom(ctx, req.Denom)
+	autoContract, found := k.getAutoContractByDenom(ctx, decoded)
 	if found {
 		rsp.AutoContract = autoContract.String()
 	}
 	if len(rsp.Contract) == 0 && len(rsp.AutoContract) == 0 {
-		return nil, fmt.Errorf("contract for the coin denom %s is not found", req.Denom)
+		return nil, fmt.Errorf("contract for the coin denom %s is not found", decoded)
 	}
 	return &rsp, nil
 }