diff --git a/proto/composable/ibctransfermiddleware/v1beta1/query.proto b/proto/composable/ibctransfermiddleware/v1beta1/query.proto index 7f0f5c45..94053a69 100644 --- a/proto/composable/ibctransfermiddleware/v1beta1/query.proto +++ b/proto/composable/ibctransfermiddleware/v1beta1/query.proto @@ -13,6 +13,10 @@ service Query { rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { option (google.api.http).get = "/composable/ibctransfermiddleware/params"; } + + rpc FeeConfigByChannelAndDenom(QueryFeeConfigByChannelAndDenomRequest) returns (QueryFeeConfigByChannelAndDenomResponse) { + option (google.api.http).get = "/composable/ibctransfermiddleware/feeconfigbychannelanddenom"; + } } // QueryParamsRequest is the request type for the Query/Params RPC method. @@ -23,3 +27,13 @@ message QueryParamsResponse { // params defines the parameters of the module. Params params = 1 [ (gogoproto.nullable) = false ]; } + +message QueryFeeConfigByChannelAndDenomRequest { + string channel = 1; + string denom = 2; +} + +message QueryFeeConfigByChannelAndDenomResponse { + // params defines the parameters of the module. + CoinItem fees = 1 [ (gogoproto.nullable) = false ]; +} diff --git a/x/ibctransfermiddleware/client/cli/query.go b/x/ibctransfermiddleware/client/cli/query.go index 7edb4054..eae42ae2 100644 --- a/x/ibctransfermiddleware/client/cli/query.go +++ b/x/ibctransfermiddleware/client/cli/query.go @@ -1,10 +1,13 @@ package cli import ( + "fmt" + "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/version" "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" ) @@ -20,6 +23,7 @@ func GetQueryCmd() *cobra.Command { ibctransfermiddlewareParamsQueryCmd.AddCommand( GetCmdQueryParams(), + GetFeeConfigByChannelAndDenom(), ) return ibctransfermiddlewareParamsQueryCmd @@ -53,3 +57,34 @@ func GetCmdQueryParams() *cobra.Command { return cmd } + +func GetFeeConfigByChannelAndDenom() *cobra.Command { + cmd := &cobra.Command{ + Use: "FeeConfigByChannelAndDenom", + Short: "Query bridge fee config by channel and denom", + Args: cobra.MatchAll(cobra.ExactArgs(2), cobra.OnlyValidArgs), + Example: fmt.Sprintf("%s query ibctransfermiddleware FeeConfigByChannelAndDenom [channel] [denom]", version.AppName), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + queryClient := types.NewQueryClient(clientCtx) + + params := &types.QueryFeeConfigByChannelAndDenomRequest{ + Channel: args[0], + Denom: args[1], + } + res, err := queryClient.FeeConfigByChannelAndDenom(cmd.Context(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(&res.Fees) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/ibctransfermiddleware/keeper/grpc_query.go b/x/ibctransfermiddleware/keeper/grpc_query.go index b95c1d2f..e2b36685 100644 --- a/x/ibctransfermiddleware/keeper/grpc_query.go +++ b/x/ibctransfermiddleware/keeper/grpc_query.go @@ -2,6 +2,7 @@ package keeper import ( "context" + "fmt" sdk "github.com/cosmos/cosmos-sdk/types" @@ -17,3 +18,20 @@ func (k Keeper) Params(c context.Context, _ *types.QueryParamsRequest) (*types.Q return &types.QueryParamsResponse{Params: params}, nil } + +// ChannelFees returns channel fees of the staking middleware module. +func (k Keeper) FeeConfigByChannelAndDenom(c context.Context, req *types.QueryFeeConfigByChannelAndDenomRequest) (*types.QueryFeeConfigByChannelAndDenomResponse, error) { + ctx := sdk.UnwrapSDKContext(c) + feeConfig := k.GetCoin(ctx, req.Channel, req.Denom) + if feeConfig == nil { + return nil, fmt.Errorf("fee configuration not found for channel %s and denom %s", req.Channel, req.Denom) + } else { + ret_fee_config := types.CoinItem{ + MinFee: feeConfig.MinFee, + Percentage: feeConfig.Percentage, + TxPriorityFee: feeConfig.TxPriorityFee, + } + return &types.QueryFeeConfigByChannelAndDenomResponse{Fees: ret_fee_config}, nil + } + +} diff --git a/x/ibctransfermiddleware/types/query.pb.go b/x/ibctransfermiddleware/types/query.pb.go index 3781ce2b..b2aceb75 100644 --- a/x/ibctransfermiddleware/types/query.pb.go +++ b/x/ibctransfermiddleware/types/query.pb.go @@ -112,9 +112,112 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } +type QueryFeeConfigByChannelAndDenomRequest struct { + Channel string `protobuf:"bytes,1,opt,name=channel,proto3" json:"channel,omitempty"` + Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"` +} + +func (m *QueryFeeConfigByChannelAndDenomRequest) Reset() { + *m = QueryFeeConfigByChannelAndDenomRequest{} +} +func (m *QueryFeeConfigByChannelAndDenomRequest) String() string { return proto.CompactTextString(m) } +func (*QueryFeeConfigByChannelAndDenomRequest) ProtoMessage() {} +func (*QueryFeeConfigByChannelAndDenomRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_488b65e78926913a, []int{2} +} +func (m *QueryFeeConfigByChannelAndDenomRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryFeeConfigByChannelAndDenomRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryFeeConfigByChannelAndDenomRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryFeeConfigByChannelAndDenomRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFeeConfigByChannelAndDenomRequest.Merge(m, src) +} +func (m *QueryFeeConfigByChannelAndDenomRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryFeeConfigByChannelAndDenomRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFeeConfigByChannelAndDenomRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryFeeConfigByChannelAndDenomRequest proto.InternalMessageInfo + +func (m *QueryFeeConfigByChannelAndDenomRequest) GetChannel() string { + if m != nil { + return m.Channel + } + return "" +} + +func (m *QueryFeeConfigByChannelAndDenomRequest) GetDenom() string { + if m != nil { + return m.Denom + } + return "" +} + +type QueryFeeConfigByChannelAndDenomResponse struct { + // params defines the parameters of the module. + Fees CoinItem `protobuf:"bytes,1,opt,name=fees,proto3" json:"fees"` +} + +func (m *QueryFeeConfigByChannelAndDenomResponse) Reset() { + *m = QueryFeeConfigByChannelAndDenomResponse{} +} +func (m *QueryFeeConfigByChannelAndDenomResponse) String() string { return proto.CompactTextString(m) } +func (*QueryFeeConfigByChannelAndDenomResponse) ProtoMessage() {} +func (*QueryFeeConfigByChannelAndDenomResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_488b65e78926913a, []int{3} +} +func (m *QueryFeeConfigByChannelAndDenomResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryFeeConfigByChannelAndDenomResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryFeeConfigByChannelAndDenomResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryFeeConfigByChannelAndDenomResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFeeConfigByChannelAndDenomResponse.Merge(m, src) +} +func (m *QueryFeeConfigByChannelAndDenomResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryFeeConfigByChannelAndDenomResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFeeConfigByChannelAndDenomResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryFeeConfigByChannelAndDenomResponse proto.InternalMessageInfo + +func (m *QueryFeeConfigByChannelAndDenomResponse) GetFees() CoinItem { + if m != nil { + return m.Fees + } + return CoinItem{} +} + func init() { proto.RegisterType((*QueryParamsRequest)(nil), "composable.ibctransfermiddleware.v1beta1.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "composable.ibctransfermiddleware.v1beta1.QueryParamsResponse") + proto.RegisterType((*QueryFeeConfigByChannelAndDenomRequest)(nil), "composable.ibctransfermiddleware.v1beta1.QueryFeeConfigByChannelAndDenomRequest") + proto.RegisterType((*QueryFeeConfigByChannelAndDenomResponse)(nil), "composable.ibctransfermiddleware.v1beta1.QueryFeeConfigByChannelAndDenomResponse") } func init() { @@ -122,25 +225,34 @@ func init() { } var fileDescriptor_488b65e78926913a = []byte{ - // 286 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x49, 0xce, 0xcf, 0x2d, - 0xc8, 0x2f, 0x4e, 0x4c, 0xca, 0x49, 0xd5, 0xcf, 0x4c, 0x4a, 0x2e, 0x29, 0x4a, 0xcc, 0x2b, 0x4e, - 0x4b, 0x2d, 0xca, 0xcd, 0x4c, 0x49, 0xc9, 0x49, 0x2d, 0x4f, 0x2c, 0x4a, 0xd5, 0x2f, 0x33, 0x4c, - 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0x2c, 0x4d, 0x2d, 0xaa, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, - 0x17, 0xd2, 0x40, 0xe8, 0xd2, 0xc3, 0xaa, 0x4b, 0x0f, 0xaa, 0x4b, 0x4a, 0x24, 0x3d, 0x3f, 0x3d, - 0x1f, 0xac, 0x49, 0x1f, 0xc4, 0x82, 0xe8, 0x97, 0x92, 0x49, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, - 0x4f, 0x2c, 0xc8, 0xd4, 0x4f, 0xcc, 0xcb, 0xcb, 0x2f, 0x49, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0x86, - 0xca, 0xba, 0x10, 0xed, 0x26, 0xec, 0x76, 0x83, 0x4d, 0x51, 0x12, 0xe1, 0x12, 0x0a, 0x04, 0x39, - 0x39, 0x20, 0xb1, 0x28, 0x31, 0xb7, 0x38, 0x28, 0xb5, 0xb0, 0x34, 0xb5, 0xb8, 0x44, 0x29, 0x95, - 0x4b, 0x18, 0x45, 0xb4, 0xb8, 0x20, 0x3f, 0xaf, 0x38, 0x55, 0xc8, 0x8f, 0x8b, 0xad, 0x00, 0x2c, - 0x22, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0x64, 0xa0, 0x47, 0xac, 0x0f, 0xf5, 0x20, 0x26, 0x39, - 0xb1, 0x9c, 0xb8, 0x27, 0xcf, 0x10, 0x04, 0x35, 0xc5, 0xe8, 0x20, 0x23, 0x17, 0x2b, 0xd8, 0x1e, - 0xa1, 0xed, 0x8c, 0x5c, 0x6c, 0x10, 0x25, 0x42, 0x36, 0xc4, 0x1b, 0x8a, 0xe9, 0x72, 0x29, 0x5b, - 0x32, 0x75, 0x43, 0x7c, 0xa8, 0x64, 0xd0, 0x74, 0xf9, 0xc9, 0x64, 0x26, 0x2d, 0x21, 0x0d, 0x7d, - 0x82, 0xa1, 0x0b, 0xf1, 0x83, 0x93, 0xf9, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, - 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, - 0x44, 0xc9, 0x56, 0xe0, 0xd0, 0x59, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x8e, 0x00, 0x63, - 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x68, 0x06, 0x43, 0xc4, 0x5c, 0x02, 0x00, 0x00, + // 422 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x41, 0x8b, 0xd3, 0x40, + 0x14, 0xc7, 0x93, 0xda, 0x56, 0x1c, 0x6f, 0x63, 0x0f, 0x25, 0x68, 0x94, 0x1c, 0xb4, 0x78, 0x48, + 0xda, 0x2a, 0x78, 0xa9, 0x82, 0x6d, 0x11, 0x04, 0x91, 0xb6, 0x27, 0xf1, 0x36, 0x49, 0x5e, 0x62, + 0x20, 0x99, 0x49, 0x33, 0x53, 0x6b, 0xae, 0x5e, 0xbc, 0x0a, 0x7e, 0x18, 0xbf, 0x42, 0xc1, 0x4b, + 0xc1, 0xcb, 0x9e, 0x96, 0xa5, 0xdd, 0x0f, 0xb2, 0x74, 0x32, 0x65, 0x59, 0xb6, 0x25, 0xd9, 0x65, + 0x6f, 0x99, 0x37, 0xf9, 0xff, 0xdf, 0xff, 0x97, 0xf7, 0x82, 0x5e, 0x7b, 0x2c, 0x49, 0x19, 0x27, + 0x6e, 0x0c, 0x4e, 0xe4, 0x7a, 0x22, 0x23, 0x94, 0x07, 0x90, 0x25, 0x91, 0xef, 0xc7, 0xb0, 0x24, + 0x19, 0x38, 0xdf, 0x7b, 0x2e, 0x08, 0xd2, 0x73, 0xe6, 0x0b, 0xc8, 0x72, 0x3b, 0xcd, 0x98, 0x60, + 0xb8, 0x73, 0xa9, 0xb2, 0x0f, 0xaa, 0x6c, 0xa5, 0x32, 0x5a, 0x21, 0x0b, 0x99, 0x14, 0x39, 0xbb, + 0xa7, 0x42, 0x6f, 0x3c, 0x0e, 0x19, 0x0b, 0x63, 0x70, 0x48, 0x1a, 0x39, 0x84, 0x52, 0x26, 0x88, + 0x88, 0x18, 0xe5, 0xea, 0x76, 0x5c, 0x39, 0xd3, 0xe1, 0xde, 0xd2, 0xc5, 0x6a, 0x21, 0x3c, 0xdd, + 0x45, 0x9e, 0x90, 0x8c, 0x24, 0x7c, 0x06, 0xf3, 0x05, 0x70, 0x61, 0x01, 0x7a, 0x74, 0xa5, 0xca, + 0x53, 0x46, 0x39, 0xe0, 0xcf, 0xa8, 0x99, 0xca, 0x4a, 0x5b, 0x7f, 0xa6, 0x77, 0x1e, 0xf6, 0xbb, + 0x76, 0x55, 0x42, 0xbb, 0x70, 0x1a, 0xd6, 0x57, 0xa7, 0x4f, 0xb5, 0x99, 0x72, 0xb1, 0xbe, 0xa0, + 0xe7, 0xb2, 0xcd, 0x07, 0x80, 0x11, 0xa3, 0x41, 0x14, 0x0e, 0xf3, 0xd1, 0x37, 0x42, 0x29, 0xc4, + 0xef, 0xa9, 0x3f, 0x06, 0xca, 0x12, 0x15, 0x08, 0xb7, 0xd1, 0x7d, 0xaf, 0xb8, 0x91, 0xad, 0x1f, + 0xcc, 0xf6, 0x47, 0xdc, 0x42, 0x0d, 0x7f, 0xf7, 0x66, 0xbb, 0x26, 0xeb, 0xc5, 0xc1, 0x5a, 0xa2, + 0x17, 0xa5, 0xce, 0x0a, 0xea, 0x13, 0xaa, 0x07, 0x00, 0x7b, 0xa4, 0x7e, 0x75, 0xa4, 0x11, 0x8b, + 0xe8, 0x47, 0x01, 0x89, 0x82, 0x92, 0x2e, 0xfd, 0x7f, 0xf7, 0x50, 0x43, 0x76, 0xc6, 0x7f, 0x75, + 0xd4, 0x2c, 0xa8, 0xf1, 0xa0, 0xba, 0xe9, 0xf5, 0x61, 0x18, 0x6f, 0x6f, 0xa9, 0x2e, 0xf8, 0xac, + 0xee, 0xcf, 0xff, 0xe7, 0x7f, 0x6a, 0x2f, 0x71, 0xc7, 0x29, 0x5d, 0x98, 0x62, 0x2c, 0xf8, 0x57, + 0x0d, 0x19, 0xc7, 0x3f, 0x1c, 0x9e, 0xdc, 0x30, 0x4f, 0xe9, 0x74, 0x8d, 0xe9, 0x1d, 0x3a, 0x2a, + 0xea, 0xb1, 0xa4, 0x7e, 0x87, 0x07, 0xe5, 0xd4, 0x01, 0x80, 0x27, 0xdd, 0xdc, 0x5c, 0x2d, 0x15, + 0xa1, 0xbe, 0x5c, 0xa3, 0xe1, 0x9b, 0xd5, 0xc6, 0xd4, 0xd7, 0x1b, 0x53, 0x3f, 0xdb, 0x98, 0xfa, + 0xef, 0xad, 0xa9, 0xad, 0xb7, 0xa6, 0x76, 0xb2, 0x35, 0xb5, 0xaf, 0x4f, 0x7e, 0x1c, 0x71, 0x13, + 0x79, 0x0a, 0xdc, 0x6d, 0xca, 0xbf, 0xeb, 0xd5, 0x45, 0x00, 0x00, 0x00, 0xff, 0xff, 0x42, 0xd5, + 0xe2, 0xae, 0x39, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -157,6 +269,7 @@ const _ = grpc.SupportPackageIsVersion4 type QueryClient interface { // Params returns the total set of minting parameters. Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) + FeeConfigByChannelAndDenom(ctx context.Context, in *QueryFeeConfigByChannelAndDenomRequest, opts ...grpc.CallOption) (*QueryFeeConfigByChannelAndDenomResponse, error) } type queryClient struct { @@ -176,10 +289,20 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . return out, nil } +func (c *queryClient) FeeConfigByChannelAndDenom(ctx context.Context, in *QueryFeeConfigByChannelAndDenomRequest, opts ...grpc.CallOption) (*QueryFeeConfigByChannelAndDenomResponse, error) { + out := new(QueryFeeConfigByChannelAndDenomResponse) + err := c.cc.Invoke(ctx, "/composable.ibctransfermiddleware.v1beta1.Query/FeeConfigByChannelAndDenom", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // QueryServer is the server API for Query service. type QueryServer interface { // Params returns the total set of minting parameters. Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) + FeeConfigByChannelAndDenom(context.Context, *QueryFeeConfigByChannelAndDenomRequest) (*QueryFeeConfigByChannelAndDenomResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -189,6 +312,9 @@ type UnimplementedQueryServer struct { func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } +func (*UnimplementedQueryServer) FeeConfigByChannelAndDenom(ctx context.Context, req *QueryFeeConfigByChannelAndDenomRequest) (*QueryFeeConfigByChannelAndDenomResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method FeeConfigByChannelAndDenom not implemented") +} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) @@ -212,6 +338,24 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf return interceptor(ctx, in, info, handler) } +func _Query_FeeConfigByChannelAndDenom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryFeeConfigByChannelAndDenomRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).FeeConfigByChannelAndDenom(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/composable.ibctransfermiddleware.v1beta1.Query/FeeConfigByChannelAndDenom", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).FeeConfigByChannelAndDenom(ctx, req.(*QueryFeeConfigByChannelAndDenomRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "composable.ibctransfermiddleware.v1beta1.Query", HandlerType: (*QueryServer)(nil), @@ -220,6 +364,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "Params", Handler: _Query_Params_Handler, }, + { + MethodName: "FeeConfigByChannelAndDenom", + Handler: _Query_FeeConfigByChannelAndDenom_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "composable/ibctransfermiddleware/v1beta1/query.proto", @@ -281,6 +429,76 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *QueryFeeConfigByChannelAndDenomRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryFeeConfigByChannelAndDenomRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryFeeConfigByChannelAndDenomRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Denom) > 0 { + i -= len(m.Denom) + copy(dAtA[i:], m.Denom) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom))) + i-- + dAtA[i] = 0x12 + } + if len(m.Channel) > 0 { + i -= len(m.Channel) + copy(dAtA[i:], m.Channel) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Channel))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryFeeConfigByChannelAndDenomResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryFeeConfigByChannelAndDenomResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryFeeConfigByChannelAndDenomResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.Fees.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { offset -= sovQuery(v) base := offset @@ -312,6 +530,34 @@ func (m *QueryParamsResponse) Size() (n int) { return n } +func (m *QueryFeeConfigByChannelAndDenomRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Channel) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.Denom) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryFeeConfigByChannelAndDenomResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.Fees.Size() + n += 1 + l + sovQuery(uint64(l)) + return n +} + func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -451,6 +697,203 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *QueryFeeConfigByChannelAndDenomRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryFeeConfigByChannelAndDenomRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryFeeConfigByChannelAndDenomRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Channel", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Channel = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Denom = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryFeeConfigByChannelAndDenomResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryFeeConfigByChannelAndDenomResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryFeeConfigByChannelAndDenomResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Fees", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Fees.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/ibctransfermiddleware/types/query.pb.gw.go b/x/ibctransfermiddleware/types/query.pb.gw.go index fcde2bfc..b599936e 100644 --- a/x/ibctransfermiddleware/types/query.pb.gw.go +++ b/x/ibctransfermiddleware/types/query.pb.gw.go @@ -51,6 +51,42 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } +var ( + filter_Query_FeeConfigByChannelAndDenom_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_FeeConfigByChannelAndDenom_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryFeeConfigByChannelAndDenomRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_FeeConfigByChannelAndDenom_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.FeeConfigByChannelAndDenom(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_FeeConfigByChannelAndDenom_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryFeeConfigByChannelAndDenomRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_FeeConfigByChannelAndDenom_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.FeeConfigByChannelAndDenom(ctx, &protoReq) + return msg, metadata, err + +} + // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". // UnaryRPC :call QueryServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. @@ -80,6 +116,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_FeeConfigByChannelAndDenom_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_FeeConfigByChannelAndDenom_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_FeeConfigByChannelAndDenom_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -141,13 +200,37 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_FeeConfigByChannelAndDenom_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_FeeConfigByChannelAndDenom_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_FeeConfigByChannelAndDenom_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } var ( pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"composable", "ibctransfermiddleware", "params"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_FeeConfigByChannelAndDenom_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"composable", "ibctransfermiddleware", "feeconfigbychannelanddenom"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( forward_Query_Params_0 = runtime.ForwardResponseMessage + + forward_Query_FeeConfigByChannelAndDenom_0 = runtime.ForwardResponseMessage )