Merge pull request #207 from terra-money/fix/v2.7/tokenfactory

fix: querying token factory from LCD
terra-money · Nov 10, 2023 · 23a8809 · 23a8809
2 parents 02da49a + 1497f75
commit 23a8809
Show file tree

Hide file tree

Showing 4 changed files with 341 additions and 6 deletions.
diff --git a/proto/osmosis/tokenfactory/v1beta1/query.proto b/proto/osmosis/tokenfactory/v1beta1/query.proto
@@ -16,8 +16,10 @@ service Query {
     option (google.api.http).get = "/osmosis/tokenfactory/v1beta1/params";
   }
 
-  // DenomAuthorityMetadata defines a gRPC query method for fetching
-  // DenomAuthorityMetadata for a particular denom.
+  // Given the denom, returns the authority metadata for the denom.
+  // This method can receive both the denom encoded to URL (for the LCD requests)
+  // and the denom not encoded:
+  // e.g. factory%2Fterra1v0eee20gjl68fuk0chyrkch2z7suw2mhg3wkxf%2Futoken931
   rpc DenomAuthorityMetadata(QueryDenomAuthorityMetadataRequest)
       returns (QueryDenomAuthorityMetadataResponse) {
     option (google.api.http).get =

diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go
@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"context"
+	"net/url"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
@@ -19,6 +20,10 @@ func (k Keeper) Params(ctx context.Context, req *types.QueryParamsRequest) (*typ
 
 func (k Keeper) DenomAuthorityMetadata(ctx context.Context, req *types.QueryDenomAuthorityMetadataRequest) (*types.QueryDenomAuthorityMetadataResponse, error) {
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
+	decodedDenom, err := url.QueryUnescape(req.Denom)
+	if err == nil {
+		req.Denom = decodedDenom
+	}
 
 	authorityMetadata, err := k.GetAuthorityMetadata(sdkCtx, req.GetDenom())
 	if err != nil {

diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go
diff --git a/x/wasmd/types/executed_contracts.pb.go b/x/wasmd/types/executed_contracts.pb.go