rollback ICQ messages renaming

proto/neutron/interchainqueries/query.proto

@@ -26,11 +26,11 @@ service Query {
     option (google.api.http).get = "/neutron/interchainqueries/registered_query";
   }
   // Queries the last successfully submitted result of an Interchain Query.
-  rpc QueryResult(QueryQueryResultRequest) returns (QueryQueryResultResponse) {
+  rpc QueryResult(QueryRegisteredQueryResultRequest) returns (QueryRegisteredQueryResultResponse) {
     option (google.api.http).get = "/neutron/interchainqueries/query_result";
   }
   // Queries the last height of a remote chain known to the IBC client behind a given connection ID.
-  rpc LastRemoteHeight(QueryLastRemoteHeightRequest) returns (QueryLastRemoteHeightResponse) {
+  rpc LastRemoteHeight(QueryLastRemoteHeight) returns (QueryLastRemoteHeightResponse) {
     option (google.api.http).get = "/neutron/interchainqueries/remote_height";
   }
 }
@@ -81,19 +81,27 @@ message QueryRegisteredQueryResponse {
 }
 
 // Request type for the Query/QueryResult RPC method.
-message QueryQueryResultRequest {
+message QueryRegisteredQueryResultRequest {
   // ID of an Interchain Query.
   uint64 query_id = 1;
 }
 
 // Response type for the Query/QueryResult RPC method.
-message QueryQueryResultResponse {
+message QueryRegisteredQueryResultResponse {
   // The last successfully submitted result of an Interchain Query.
   QueryResult result = 1;
 }
 
+message Transaction {
+  option deprecated = true;
+
+  uint64 id = 1;
+  uint64 height = 2;
+  bytes data = 3;
+}
+
 // Request type for the Query/LastRemoteHeight RPC method.
-message QueryLastRemoteHeightRequest {
+message QueryLastRemoteHeight {
   // Connection ID of an IBC connection to a remote chain. Determines the IBC client used in query
   // handling.
   string connection_id = 1;

proto/neutron/interchainqueries/tx.proto

@@ -32,9 +32,9 @@ service Msg {
   // Removes a given Interchain Query and its results from the module. Can be removed only by the
   // owner of the query during the query's submit timeout, and by anyone after the query has been
   // timed out. The query deposit is returned to the caller on a success call.
-  rpc RemoveInterchainQuery(MsgRemoveInterchainQuery) returns (MsgRemoveInterchainQueryResponse);
+  rpc RemoveInterchainQuery(MsgRemoveInterchainQueryRequest) returns (MsgRemoveInterchainQueryResponse);
   // Updates parameters of a registered Interchain Query. Only callable by the owner of the query.
-  rpc UpdateInterchainQuery(MsgUpdateInterchainQuery) returns (MsgUpdateInterchainQueryResponse);
+  rpc UpdateInterchainQuery(MsgUpdateInterchainQueryRequest) returns (MsgUpdateInterchainQueryResponse);
   // Updates params of the interchainqueries module. Only callable by the module's authority.
   rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
 }
@@ -152,7 +152,7 @@ message TxValue {
 message MsgSubmitQueryResultResponse {}
 
 // Request type for the Msg/RemoveInterchainQuery RPC method.
-message MsgRemoveInterchainQuery {
+message MsgRemoveInterchainQueryRequest {
   option (cosmos.msg.v1.signer) = "sender";
   // The ID of the query to remove.
   uint64 query_id = 1;
@@ -164,7 +164,7 @@ message MsgRemoveInterchainQuery {
 message MsgRemoveInterchainQueryResponse {}
 
 // Request type for the Msg/UpdateInterchainQuery RPC method.
-message MsgUpdateInterchainQuery {
+message MsgUpdateInterchainQueryRequest {
   option (cosmos.msg.v1.signer) = "sender";
   // The ID of the query to update.
   uint64 query_id = 1;

wasmbinding/message_plugin.go

@@ -351,7 +351,7 @@ func (m *CustomMessenger) updateInterchainQuery(ctx sdk.Context, contractAddr sd
 }
 
 func (m *CustomMessenger) performUpdateInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, updateQuery *bindings.UpdateInterchainQuery) (*icqtypes.MsgUpdateInterchainQueryResponse, error) {
-	msg := icqtypes.MsgUpdateInterchainQuery{
+	msg := icqtypes.MsgUpdateInterchainQueryRequest{
 		QueryId:               updateQuery.QueryId,
 		NewKeys:               updateQuery.NewKeys,
 		NewUpdatePeriod:       updateQuery.NewUpdatePeriod,
@@ -402,7 +402,7 @@ func (m *CustomMessenger) removeInterchainQuery(ctx sdk.Context, contractAddr sd
 }
 
 func (m *CustomMessenger) performRemoveInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, updateQuery *bindings.RemoveInterchainQuery) (*icqtypes.MsgRemoveInterchainQueryResponse, error) {
-	msg := icqtypes.MsgRemoveInterchainQuery{
+	msg := icqtypes.MsgRemoveInterchainQueryRequest{
 		QueryId: updateQuery.QueryId,
 		Sender:  contractAddr.String(),
 	}

wasmbinding/stargate_allowlist.go

@@ -66,7 +66,7 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedQueries {
 		"/neutron.interchainqueries.Query/Params":            &interchainqueriestypes.QueryParamsResponse{},
 		"/neutron.interchainqueries.Query/RegisteredQueries": &interchainqueriestypes.QueryRegisteredQueriesResponse{},
 		"/neutron.interchainqueries.Query/RegisteredQuery":   &interchainqueriestypes.QueryRegisteredQueryResponse{},
-		"/neutron.interchainqueries.Query/QueryResult":       &interchainqueriestypes.QueryQueryResultResponse{},
+		"/neutron.interchainqueries.Query/QueryResult":       &interchainqueriestypes.QueryRegisteredQueryResultRequest{},
 		"/neutron.interchainqueries.Query/LastRemoteHeight":  &interchainqueriestypes.QueryLastRemoteHeightResponse{},
 
 		// feeburner

x/interchainqueries/client/cli/query.go

@@ -119,7 +119,7 @@ func CmdQueryRegisteredQueryResult() *cobra.Command {
 				return fmt.Errorf("failed to parse query id: %w", err)
 			}
 
-			res, err := queryClient.QueryResult(context.Background(), &types.QueryQueryResultRequest{QueryId: queryID})
+			res, err := queryClient.QueryResult(context.Background(), &types.QueryRegisteredQueryResultRequest{QueryId: queryID})
 			if err != nil {
 				return err
 			}
@@ -142,7 +142,7 @@ func CmdQueryLastRemoteHeight() *cobra.Command {
 			clientCtx := client.GetClientContextFromCmd(cmd)
 			connectionID := args[0]
 			queryClient := types.NewQueryClient(clientCtx)
-			res, err := queryClient.LastRemoteHeight(context.Background(), &types.QueryLastRemoteHeightRequest{ConnectionId: connectionID})
+			res, err := queryClient.LastRemoteHeight(context.Background(), &types.QueryLastRemoteHeight{ConnectionId: connectionID})
 			if err != nil {
 				return err
 			}

x/interchainqueries/client/cli/tx.go

@@ -48,7 +48,7 @@ func RemoveInterchainQueryCmd() *cobra.Command {
 				return fmt.Errorf("failed to parse query id: %w", err)
 			}
 
-			msg := types.NewMsgRemoveInterchainQuery(sender, queryID)
+			msg := types.NewMsgRemoveInterchainQueryRequest(sender, queryID)
 
 			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), &msg)
 		},

x/interchainqueries/keeper/grpc_query.go

@@ -75,7 +75,7 @@ func (k Keeper) GetRegisteredQueries(ctx sdk.Context, req *types.QueryRegistered
 	return &types.QueryRegisteredQueriesResponse{RegisteredQueries: queries, Pagination: pageRes}, nil
 }
 
-func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryQueryResultRequest) (*types.QueryQueryResultResponse, error) {
+func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryRegisteredQueryResultRequest) (*types.QueryRegisteredQueryResultResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if !k.checkRegisteredQueryExists(ctx, request.QueryId) {
@@ -86,10 +86,10 @@ func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryQueryResu
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get query result by query id: %v", err)
 	}
-	return &types.QueryQueryResultResponse{Result: result}, nil
+	return &types.QueryRegisteredQueryResultResponse{Result: result}, nil
 }
 
-func (k Keeper) LastRemoteHeight(goCtx context.Context, request *types.QueryLastRemoteHeightRequest) (*types.QueryLastRemoteHeightResponse, error) {
+func (k Keeper) LastRemoteHeight(goCtx context.Context, request *types.QueryLastRemoteHeight) (*types.QueryLastRemoteHeightResponse, error) {
 	req := contypes.QueryConnectionClientStateRequest{ConnectionId: request.ConnectionId}
 	r, err := k.ibcKeeper.ConnectionClientState(goCtx, &req)
 	if err != nil {

x/interchainqueries/keeper/msg_server.go

@@ -92,7 +92,7 @@ func (m msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.Msg
 	return &types.MsgRegisterInterchainQueryResponse{Id: lastID}, nil
 }
 
-func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRemoveInterchainQuery) (*types.MsgRemoveInterchainQueryResponse, error) {
+func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRemoveInterchainQueryRequest) (*types.MsgRemoveInterchainQueryResponse, error) {
 	if err := msg.Validate(); err != nil {
 		return nil, errors.Wrap(err, "failed to validate MsgRemoveInterchainQueryRequest")
 	}
@@ -119,7 +119,7 @@ func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRe
 	return &types.MsgRemoveInterchainQueryResponse{}, nil
 }
 
-func (m msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUpdateInterchainQuery) (*types.MsgUpdateInterchainQueryResponse, error) {
+func (m msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUpdateInterchainQueryRequest) (*types.MsgUpdateInterchainQueryResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	ctx.Logger().Debug("UpdateInterchainQuery", "msg", msg)
 	params := m.GetParams(ctx)
@@ -316,7 +316,7 @@ func (m msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit
 // with the query type.
 func (m msgServer) validateUpdateInterchainQueryParams(
 	query *types.RegisteredQuery,
-	msg *types.MsgUpdateInterchainQuery,
+	msg *types.MsgUpdateInterchainQueryRequest,
 ) error {
 	queryType := types.InterchainQueryType(query.GetQueryType())
 	newKvKeysSet := len(msg.GetNewKeys()) != 0

x/interchainqueries/types/codec.go

@@ -17,8 +17,8 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 		(*sdk.Msg)(nil),
 		&MsgRegisterInterchainQuery{},
 		&MsgSubmitQueryResult{},
-		&MsgUpdateInterchainQuery{},
-		&MsgRemoveInterchainQuery{},
+		&MsgUpdateInterchainQueryRequest{},
+		&MsgRemoveInterchainQueryRequest{},
 		&MsgUpdateParams{},
 	)
 	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)

x/interchainqueries/types/message_remove_interchain_query.go

@@ -9,24 +9,24 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
-var _ sdk.Msg = &MsgRemoveInterchainQuery{}
+var _ sdk.Msg = &MsgRemoveInterchainQueryRequest{}
 
-func NewMsgRemoveInterchainQuery(sender string, queryID uint64) MsgRemoveInterchainQuery {
-	return MsgRemoveInterchainQuery{
+func NewMsgRemoveInterchainQueryRequest(sender string, queryID uint64) MsgRemoveInterchainQueryRequest {
+	return MsgRemoveInterchainQueryRequest{
 		QueryId: queryID,
 		Sender:  sender,
 	}
 }
 
-func (msg MsgRemoveInterchainQuery) Route() string {
+func (msg MsgRemoveInterchainQueryRequest) Route() string {
 	return RouterKey
 }
 
-func (msg MsgRemoveInterchainQuery) Type() string {
+func (msg MsgRemoveInterchainQueryRequest) Type() string {
 	return "remove-interchain-query"
 }
 
-func (msg MsgRemoveInterchainQuery) Validate() error {
+func (msg MsgRemoveInterchainQueryRequest) Validate() error {
 	if msg.GetQueryId() == 0 {
 		return errors.Wrap(ErrInvalidQueryID, "query_id cannot be empty or equal to 0")
 	}
@@ -42,11 +42,11 @@ func (msg MsgRemoveInterchainQuery) Validate() error {
 	return nil
 }
 
-func (msg MsgRemoveInterchainQuery) GetSignBytes() []byte {
+func (msg MsgRemoveInterchainQueryRequest) GetSignBytes() []byte {
 	return ModuleCdc.MustMarshalJSON(&msg)
 }
 
-func (msg MsgRemoveInterchainQuery) GetSigners() []sdk.AccAddress {
+func (msg MsgRemoveInterchainQueryRequest) GetSigners() []sdk.AccAddress {
 	senderAddr, err := sdk.AccAddressFromBech32(msg.Sender)
 	if err != nil { // should never happen as valid basic rejects invalid addresses
 		panic(err.Error())