From 2b85f0b64e9bf1bc5cb61ad9c60b752bd270d910 Mon Sep 17 00:00:00 2001 From: Vitalis Salis Date: Tue, 13 Sep 2022 08:58:40 +0800 Subject: [PATCH] btclightclient: Add BaseHeader query (#130) --- proto/babylon/btclightclient/query.proto | 13 +- x/btclightclient/client/cli/query.go | 28 +- x/btclightclient/keeper/grpc_query.go | 12 + x/btclightclient/keeper/grpc_query_test.go | 80 ++++ x/btclightclient/types/querier.go | 4 + x/btclightclient/types/query.pb.go | 427 ++++++++++++++++++--- x/btclightclient/types/query.pb.gw.go | 62 +++ 7 files changed, 579 insertions(+), 47 deletions(-) diff --git a/proto/babylon/btclightclient/query.proto b/proto/babylon/btclightclient/query.proto index dfd4d7a94..b1f175ea1 100644 --- a/proto/babylon/btclightclient/query.proto +++ b/proto/babylon/btclightclient/query.proto @@ -31,10 +31,14 @@ service Query { option (google.api.http).get = "/babylon/btclightclient/v1/mainchain"; } - // BestHeader return best header on canonical chain + // Tip return best header on canonical chain rpc Tip(QueryTipRequest) returns (QueryTipResponse) { option (google.api.http).get = "/babylon/btclightclient/v1/tip"; } + + rpc BaseHeader(QueryBaseHeaderRequest) returns (QueryBaseHeaderResponse) { + option (google.api.http).get = "/babylon/btclightclient/v1/baseheader"; + } } // QueryParamsRequest is request type for the Query/Params RPC method. @@ -91,3 +95,10 @@ message QueryTipRequest { message QueryTipResponse { BTCHeaderInfo header = 1; } + +message QueryBaseHeaderRequest { +} + +message QueryBaseHeaderResponse { + BTCHeaderInfo header = 1; +} diff --git a/x/btclightclient/client/cli/query.go b/x/btclightclient/client/cli/query.go index f6274f6fe..0cb3e0622 100644 --- a/x/btclightclient/client/cli/query.go +++ b/x/btclightclient/client/cli/query.go @@ -26,6 +26,7 @@ func GetQueryCmd(queryRoute string) *cobra.Command { cmd.AddCommand(CmdContains()) cmd.AddCommand(CmdMainChain()) cmd.AddCommand(CmdTip()) + cmd.AddCommand(CmdBaseHeader()) return cmd } @@ -146,7 +147,7 @@ func CmdMainChain() *cobra.Command { func CmdTip() *cobra.Command { cmd := &cobra.Command{ Use: "tip", - Short: "retrieve tip of btc blockchain", + Short: "retrieve tip of the bitcoin blockchain", Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { clientCtx := client.GetClientContextFromCmd(cmd) @@ -167,3 +168,28 @@ func CmdTip() *cobra.Command { return cmd } + +func CmdBaseHeader() *cobra.Command { + cmd := &cobra.Command{ + Use: "base-header", + Short: "retrieve base header of the bitcoin blockchain", + Args: cobra.NoArgs, + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx := client.GetClientContextFromCmd(cmd) + + queryClient := types.NewQueryClient(clientCtx) + + params := types.NewQueryBaseHeaderRequest() + res, err := queryClient.BaseHeader(context.Background(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/btclightclient/keeper/grpc_query.go b/x/btclightclient/keeper/grpc_query.go index b01fdab7c..78e93e270 100644 --- a/x/btclightclient/keeper/grpc_query.go +++ b/x/btclightclient/keeper/grpc_query.go @@ -160,3 +160,15 @@ func (k Keeper) Tip(ctx context.Context, req *types.QueryTipRequest) (*types.Que return &types.QueryTipResponse{Header: tip}, nil } + +func (k Keeper) BaseHeader(ctx context.Context, req *types.QueryBaseHeaderRequest) (*types.QueryBaseHeaderResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + sdkCtx := sdk.UnwrapSDKContext(ctx) + + baseHeader := k.headersState(sdkCtx).GetBaseBTCHeader() + + return &types.QueryBaseHeaderResponse{Header: baseHeader}, nil +} diff --git a/x/btclightclient/keeper/grpc_query_test.go b/x/btclightclient/keeper/grpc_query_test.go index 026a8297f..89195435d 100644 --- a/x/btclightclient/keeper/grpc_query_test.go +++ b/x/btclightclient/keeper/grpc_query_test.go @@ -318,6 +318,86 @@ func FuzzMainChainQuery(f *testing.F) { }) } +func FuzzTipQuery(f *testing.F) { + /* + Checks: + 1. If the request is nil, (nil, error) is returned + 2. The query returns the tip BTC header + + Data generation: + - Generate a random tree of headers and insert into storage + */ + datagen.AddRandomSeedsToFuzzer(f, 100) + f.Fuzz(func(t *testing.T, seed int64) { + rand.Seed(seed) + blcKeeper, ctx := testkeeper.BTCLightClientKeeper(t) + sdkCtx := sdk.WrapSDKContext(ctx) + + // Test nil input + resp, err := blcKeeper.Tip(sdkCtx, nil) + if resp != nil { + t.Errorf("Nil input led to a non-nil response") + } + if err == nil { + t.Errorf("Nil input led to a nil error") + } + + tree := genRandomTree(blcKeeper, ctx, 1, 10) + + query := types.NewQueryTipRequest() + resp, err = blcKeeper.Tip(sdkCtx, query) + if err != nil { + t.Errorf("valid input led to an error: %s", err) + } + if resp == nil { + t.Errorf("Valid input led to nil response") + } + if !resp.Header.Eq(tree.GetTip()) { + t.Errorf("Invalid header returned. Expected %s, got %s", tree.GetTip().Hash, resp.Header.Hash) + } + }) +} + +func FuzzBaseHeaderQuery(f *testing.F) { + /* + Checks: + 1. If the request is nil, (nil, error) is returned + 2. The query returns the base BTC header + + Data generation: + - Generate a random tree of headers and insert into storage. + */ + datagen.AddRandomSeedsToFuzzer(f, 100) + f.Fuzz(func(t *testing.T, seed int64) { + rand.Seed(seed) + blcKeeper, ctx := testkeeper.BTCLightClientKeeper(t) + sdkCtx := sdk.WrapSDKContext(ctx) + + // Test nil input + resp, err := blcKeeper.BaseHeader(sdkCtx, nil) + if resp != nil { + t.Errorf("Nil input led to a non-nil response") + } + if err == nil { + t.Errorf("Nil input led to a nil error") + } + + tree := genRandomTree(blcKeeper, ctx, 1, 10) + + query := types.NewQueryBaseHeaderRequest() + resp, err = blcKeeper.BaseHeader(sdkCtx, query) + if err != nil { + t.Errorf("valid input led to an error: %s", err) + } + if resp == nil { + t.Errorf("Valid input led to nil response") + } + if !resp.Header.Eq(tree.GetRoot()) { + t.Errorf("Invalid header returned. Expected %s, got %s", tree.GetRoot().Hash, resp.Header.Hash) + } + }) +} + // Constructors for PageRequest objects func constructRequestWithKeyAndLimit(key []byte, limit uint64) *query.PageRequest { // If limit is 0, set one randomly diff --git a/x/btclightclient/types/querier.go b/x/btclightclient/types/querier.go index b6ba85091..57065a3cb 100644 --- a/x/btclightclient/types/querier.go +++ b/x/btclightclient/types/querier.go @@ -32,3 +32,7 @@ func NewQueryMainChainRequest(req *query.PageRequest) *QueryMainChainRequest { func NewQueryTipRequest() *QueryTipRequest { return &QueryTipRequest{} } + +func NewQueryBaseHeaderRequest() *QueryBaseHeaderRequest { + return &QueryBaseHeaderRequest{} +} diff --git a/x/btclightclient/types/query.pb.go b/x/btclightclient/types/query.pb.go index 17a30200a..2d2664f1e 100644 --- a/x/btclightclient/types/query.pb.go +++ b/x/btclightclient/types/query.pb.go @@ -469,6 +469,86 @@ func (m *QueryTipResponse) GetHeader() *BTCHeaderInfo { return nil } +type QueryBaseHeaderRequest struct { +} + +func (m *QueryBaseHeaderRequest) Reset() { *m = QueryBaseHeaderRequest{} } +func (m *QueryBaseHeaderRequest) String() string { return proto.CompactTextString(m) } +func (*QueryBaseHeaderRequest) ProtoMessage() {} +func (*QueryBaseHeaderRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_6293be71fb7ba6c4, []int{10} +} +func (m *QueryBaseHeaderRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryBaseHeaderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryBaseHeaderRequest.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 *QueryBaseHeaderRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryBaseHeaderRequest.Merge(m, src) +} +func (m *QueryBaseHeaderRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryBaseHeaderRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryBaseHeaderRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryBaseHeaderRequest proto.InternalMessageInfo + +type QueryBaseHeaderResponse struct { + Header *BTCHeaderInfo `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` +} + +func (m *QueryBaseHeaderResponse) Reset() { *m = QueryBaseHeaderResponse{} } +func (m *QueryBaseHeaderResponse) String() string { return proto.CompactTextString(m) } +func (*QueryBaseHeaderResponse) ProtoMessage() {} +func (*QueryBaseHeaderResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_6293be71fb7ba6c4, []int{11} +} +func (m *QueryBaseHeaderResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryBaseHeaderResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryBaseHeaderResponse.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 *QueryBaseHeaderResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryBaseHeaderResponse.Merge(m, src) +} +func (m *QueryBaseHeaderResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryBaseHeaderResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryBaseHeaderResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryBaseHeaderResponse proto.InternalMessageInfo + +func (m *QueryBaseHeaderResponse) GetHeader() *BTCHeaderInfo { + if m != nil { + return m.Header + } + return nil +} + func init() { proto.RegisterType((*QueryParamsRequest)(nil), "babylon.btclightclient.v1.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "babylon.btclightclient.v1.QueryParamsResponse") @@ -480,6 +560,8 @@ func init() { proto.RegisterType((*QueryMainChainResponse)(nil), "babylon.btclightclient.v1.QueryMainChainResponse") proto.RegisterType((*QueryTipRequest)(nil), "babylon.btclightclient.v1.QueryTipRequest") proto.RegisterType((*QueryTipResponse)(nil), "babylon.btclightclient.v1.QueryTipResponse") + proto.RegisterType((*QueryBaseHeaderRequest)(nil), "babylon.btclightclient.v1.QueryBaseHeaderRequest") + proto.RegisterType((*QueryBaseHeaderResponse)(nil), "babylon.btclightclient.v1.QueryBaseHeaderResponse") } func init() { @@ -487,49 +569,52 @@ func init() { } var fileDescriptor_6293be71fb7ba6c4 = []byte{ - // 660 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x4f, 0x6b, 0x13, 0x4f, - 0x18, 0xc7, 0x33, 0xfd, 0x93, 0x5f, 0x7f, 0x53, 0x41, 0x1d, 0xab, 0xd4, 0x45, 0xb6, 0xed, 0x56, - 0x6b, 0x6d, 0x75, 0xc6, 0xb4, 0x20, 0x1e, 0x04, 0x25, 0x05, 0xad, 0x07, 0x21, 0x86, 0xe0, 0x41, - 0x04, 0x99, 0x8d, 0xe3, 0xee, 0x40, 0x33, 0xb3, 0xcd, 0x4e, 0x8b, 0xb9, 0x7a, 0xf0, 0x2c, 0x7a, - 0xf3, 0xe0, 0xcd, 0x77, 0xe0, 0x8b, 0xe8, 0xb1, 0xe0, 0x45, 0x3c, 0x14, 0x69, 0x7d, 0x11, 0x1e, - 0x65, 0x67, 0x9e, 0x4d, 0x4d, 0x24, 0xd9, 0x88, 0xbd, 0x84, 0xec, 0xe4, 0x79, 0xbe, 0xdf, 0xcf, - 0x3c, 0x3b, 0xdf, 0x09, 0x0e, 0x42, 0x1e, 0x76, 0xb6, 0xb4, 0x62, 0xa1, 0x69, 0x6e, 0xc9, 0x28, - 0xce, 0x3e, 0x85, 0x32, 0x6c, 0x7b, 0x47, 0xb4, 0x3b, 0x34, 0x69, 0x6b, 0xa3, 0xc9, 0x45, 0xa8, - 0xa1, 0xbd, 0x35, 0x74, 0xb7, 0xe2, 0xcd, 0x44, 0x3a, 0xd2, 0xb6, 0x8a, 0x65, 0xdf, 0x5c, 0x83, - 0x77, 0x29, 0xd2, 0x3a, 0xda, 0x12, 0x8c, 0x27, 0x92, 0x71, 0xa5, 0xb4, 0xe1, 0x46, 0x6a, 0x95, - 0xc2, 0xaf, 0x2b, 0x4d, 0x9d, 0xb6, 0x74, 0xca, 0x42, 0x9e, 0x0a, 0xe7, 0xc3, 0x76, 0x2b, 0xa1, - 0x30, 0xbc, 0xc2, 0x12, 0x1e, 0x49, 0x65, 0x8b, 0xa1, 0x76, 0x71, 0x00, 0x5e, 0xc2, 0xdb, 0xbc, - 0x95, 0x0b, 0xae, 0x0e, 0x28, 0xea, 0xc3, 0xb5, 0xc5, 0xc1, 0x0c, 0x26, 0x8f, 0x33, 0xcf, 0x9a, - 0x55, 0xa8, 0x8b, 0xed, 0x1d, 0x91, 0x9a, 0xe0, 0x09, 0x3e, 0xd7, 0xb3, 0x9a, 0x26, 0x5a, 0xa5, - 0x82, 0xdc, 0xc5, 0x65, 0xe7, 0x34, 0x8b, 0xe6, 0xd1, 0xf2, 0xf4, 0xda, 0x02, 0x1d, 0x38, 0x0a, - 0xea, 0x5a, 0xab, 0x13, 0x7b, 0x07, 0x73, 0xa5, 0x3a, 0xb4, 0x05, 0xcf, 0xc0, 0x6d, 0x93, 0xa7, - 0xb1, 0xc8, 0xdd, 0xc8, 0x7d, 0x8c, 0x8f, 0x77, 0x0a, 0xd2, 0x4b, 0xd4, 0x8d, 0x85, 0x66, 0x63, - 0xa1, 0x6e, 0xfc, 0x30, 0x16, 0x5a, 0xe3, 0x91, 0x80, 0xde, 0xfa, 0x6f, 0x9d, 0xc1, 0x67, 0x04, - 0xd8, 0xb9, 0x3c, 0x60, 0x37, 0x70, 0x39, 0xb6, 0x2b, 0xb3, 0x68, 0x7e, 0x7c, 0xf9, 0x54, 0xf5, - 0xce, 0xb7, 0x83, 0xb9, 0xdb, 0x91, 0x34, 0xf1, 0x4e, 0x48, 0x9b, 0xba, 0xc5, 0x60, 0x13, 0xcd, - 0x98, 0x4b, 0x95, 0x3f, 0x30, 0xd3, 0x49, 0x44, 0x4a, 0xab, 0x8d, 0x8d, 0x4d, 0xc1, 0x5f, 0x88, - 0x76, 0x26, 0x59, 0xed, 0x18, 0x91, 0xd6, 0x41, 0x8b, 0x3c, 0xe8, 0xa1, 0x1e, 0xb3, 0xd4, 0x57, - 0x0b, 0xa9, 0x1d, 0x52, 0x0f, 0x76, 0x8c, 0x67, 0x2c, 0xf5, 0x86, 0x56, 0x86, 0x4b, 0xd5, 0x1d, - 0x4b, 0x0d, 0x4f, 0x64, 0x56, 0x76, 0x20, 0xff, 0x0a, 0x6d, 0x95, 0x82, 0x75, 0x7c, 0xbe, 0xcf, - 0x09, 0x26, 0xe4, 0xe1, 0xa9, 0x26, 0xac, 0x59, 0xbb, 0xa9, 0x7a, 0xf7, 0x39, 0x78, 0x0e, 0x4d, - 0x8f, 0xb8, 0x54, 0x1b, 0x99, 0xdb, 0x49, 0xbf, 0xb6, 0x4f, 0x08, 0x5f, 0xe8, 0x77, 0x00, 0xae, - 0x2a, 0xfe, 0x2f, 0xb6, 0x3b, 0x71, 0xaf, 0x6e, 0x7a, 0x6d, 0x79, 0xc8, 0x89, 0xeb, 0x6e, 0xfb, - 0xa1, 0x7a, 0xa9, 0xeb, 0x79, 0xe3, 0xc9, 0xbd, 0xa7, 0xb3, 0xf8, 0xb4, 0xc5, 0x6c, 0xc8, 0x24, - 0xcf, 0x49, 0x03, 0x9f, 0x39, 0x5e, 0x02, 0xe6, 0x7b, 0xb8, 0xec, 0xac, 0x61, 0x24, 0xa3, 0x23, - 0x43, 0xdf, 0xda, 0xcf, 0x49, 0x3c, 0x69, 0x65, 0xc9, 0x3b, 0x84, 0xcb, 0x2e, 0x48, 0xe4, 0xc6, - 0x10, 0x99, 0x3f, 0x13, 0xec, 0xd1, 0x51, 0xcb, 0x1d, 0x75, 0x70, 0xed, 0xf5, 0x97, 0x1f, 0xef, - 0xc7, 0x16, 0xc9, 0x02, 0x1b, 0x70, 0x7b, 0xec, 0x56, 0xe0, 0x96, 0xb1, 0x50, 0x2e, 0x61, 0xc5, - 0x50, 0x3d, 0x41, 0x2f, 0x86, 0xea, 0x0d, 0xee, 0x48, 0x50, 0x90, 0xc6, 0x0f, 0x08, 0x4f, 0xe5, - 0xc7, 0x9a, 0xb0, 0x22, 0x9f, 0xbe, 0xa8, 0x79, 0x37, 0x47, 0x6f, 0x00, 0xb4, 0x55, 0x8b, 0x76, - 0x85, 0x2c, 0x0e, 0x41, 0xcb, 0x23, 0x44, 0x3e, 0x22, 0xfc, 0x7f, 0xf7, 0x70, 0x93, 0x42, 0xb3, - 0xfe, 0xa4, 0x79, 0x95, 0xbf, 0xe8, 0x00, 0xbe, 0xeb, 0x96, 0x6f, 0x89, 0x5c, 0x1e, 0xc2, 0xd7, - 0xe2, 0xd2, 0xdd, 0x1f, 0xe4, 0x0d, 0xc2, 0xe3, 0x0d, 0x99, 0x90, 0x95, 0x22, 0xa3, 0xe3, 0xb3, - 0xef, 0xad, 0x8e, 0x54, 0x0b, 0x38, 0x4b, 0x16, 0x67, 0x9e, 0xf8, 0x43, 0x70, 0x8c, 0x4c, 0xaa, - 0xb5, 0xbd, 0x43, 0x1f, 0xed, 0x1f, 0xfa, 0xe8, 0xfb, 0xa1, 0x8f, 0xde, 0x1e, 0xf9, 0xa5, 0xfd, - 0x23, 0xbf, 0xf4, 0xf5, 0xc8, 0x2f, 0x3d, 0xbd, 0x55, 0x74, 0xf7, 0xbd, 0xea, 0x97, 0xb4, 0x97, - 0x61, 0x58, 0xb6, 0xff, 0x73, 0xeb, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x5b, 0x97, 0xa6, - 0xda, 0x07, 0x00, 0x00, + // 709 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x4f, 0x6b, 0x13, 0x4f, + 0x18, 0xc7, 0x33, 0x6d, 0x7f, 0x69, 0x7f, 0x4f, 0x05, 0x75, 0xac, 0x5a, 0x17, 0xd9, 0xb6, 0x5b, + 0xfb, 0xc7, 0xd6, 0xee, 0x9a, 0x14, 0xc4, 0x83, 0xa0, 0x6c, 0x41, 0xeb, 0x41, 0x88, 0x21, 0x78, + 0x50, 0x41, 0x66, 0xe3, 0xb8, 0xbb, 0xd0, 0xec, 0x6c, 0xb3, 0xd3, 0x62, 0xae, 0x1e, 0x3c, 0x8b, + 0xde, 0x04, 0x3d, 0x08, 0xbe, 0x03, 0x5f, 0x44, 0x8f, 0x05, 0x2f, 0xe2, 0xa1, 0x48, 0xeb, 0x0b, + 0x91, 0x9d, 0x79, 0x36, 0x31, 0x29, 0xc9, 0xa6, 0xd8, 0x4b, 0xc8, 0xce, 0x3c, 0xcf, 0xf3, 0xfd, + 0xcc, 0x33, 0xf9, 0x3e, 0x1b, 0xb0, 0x3c, 0xe6, 0xb5, 0xb6, 0x44, 0xe4, 0x78, 0xb2, 0xbe, 0x15, + 0xfa, 0x41, 0xfa, 0xc9, 0x23, 0xe9, 0x6c, 0xef, 0xf0, 0x66, 0xcb, 0x8e, 0x9b, 0x42, 0x0a, 0x7a, + 0x05, 0x63, 0xec, 0xee, 0x18, 0x7b, 0xb7, 0x64, 0x4c, 0xf9, 0xc2, 0x17, 0x2a, 0xca, 0x49, 0xbf, + 0xe9, 0x04, 0xe3, 0xaa, 0x2f, 0x84, 0xbf, 0xc5, 0x1d, 0x16, 0x87, 0x0e, 0x8b, 0x22, 0x21, 0x99, + 0x0c, 0x45, 0x94, 0xe0, 0xee, 0x4a, 0x5d, 0x24, 0x0d, 0x91, 0x38, 0x1e, 0x4b, 0xb8, 0xd6, 0x71, + 0x76, 0x4b, 0x1e, 0x97, 0xac, 0xe4, 0xc4, 0xcc, 0x0f, 0x23, 0x15, 0x8c, 0xb1, 0xf3, 0x7d, 0xf0, + 0x62, 0xd6, 0x64, 0x8d, 0xac, 0xe0, 0x6a, 0x9f, 0xa0, 0x1e, 0x5c, 0x15, 0x6c, 0x4d, 0x01, 0x7d, + 0x9c, 0x6a, 0x56, 0x54, 0x85, 0x2a, 0xdf, 0xde, 0xe1, 0x89, 0xb4, 0x9e, 0xc0, 0x85, 0xae, 0xd5, + 0x24, 0x16, 0x51, 0xc2, 0xe9, 0x5d, 0x28, 0x6a, 0xa5, 0x69, 0x32, 0x4b, 0x96, 0x27, 0xcb, 0x73, + 0x76, 0xdf, 0x56, 0xd8, 0x3a, 0xd5, 0x1d, 0xdb, 0x3b, 0x98, 0x29, 0x54, 0x31, 0xcd, 0x7a, 0x8e, + 0x6a, 0x9b, 0x2c, 0x09, 0x78, 0xa6, 0x46, 0xef, 0x03, 0x74, 0x4e, 0x8a, 0xa5, 0x17, 0x6d, 0xdd, + 0x16, 0x3b, 0x6d, 0x8b, 0xad, 0xdb, 0x8f, 0x6d, 0xb1, 0x2b, 0xcc, 0xe7, 0x98, 0x5b, 0xfd, 0x2b, + 0xd3, 0xfa, 0x46, 0x10, 0x3b, 0x2b, 0x8f, 0xd8, 0x35, 0x28, 0x06, 0x6a, 0x65, 0x9a, 0xcc, 0x8e, + 0x2e, 0x9f, 0x71, 0xef, 0xfc, 0x3c, 0x98, 0xb9, 0xed, 0x87, 0x32, 0xd8, 0xf1, 0xec, 0xba, 0x68, + 0x38, 0x78, 0x88, 0x7a, 0xc0, 0xc2, 0x28, 0x7b, 0x70, 0x64, 0x2b, 0xe6, 0x89, 0xed, 0xd6, 0x36, + 0x36, 0x39, 0x7b, 0xc9, 0x9b, 0x69, 0x49, 0xb7, 0x25, 0x79, 0x52, 0xc5, 0x5a, 0xf4, 0x41, 0x17, + 0xf5, 0x88, 0xa2, 0x5e, 0xca, 0xa5, 0xd6, 0x48, 0x5d, 0xd8, 0x01, 0x4c, 0x29, 0xea, 0x0d, 0x11, + 0x49, 0x16, 0x46, 0xed, 0xb6, 0x54, 0x60, 0x2c, 0x95, 0x52, 0x0d, 0xf9, 0x57, 0x68, 0x55, 0xc9, + 0x5a, 0x87, 0x8b, 0x3d, 0x4a, 0xd8, 0x21, 0x03, 0x26, 0xea, 0xb8, 0xa6, 0xe4, 0x26, 0xaa, 0xed, + 0x67, 0xeb, 0x05, 0x26, 0x3d, 0x62, 0x61, 0xb4, 0x91, 0xaa, 0x9d, 0xf6, 0xb5, 0x7d, 0x25, 0x70, + 0xa9, 0x57, 0x01, 0xb9, 0x5c, 0x18, 0x0f, 0xd4, 0x49, 0xf4, 0xd5, 0x4d, 0x96, 0x97, 0x07, 0xfc, + 0xe2, 0xda, 0xc7, 0x7e, 0x18, 0xbd, 0x12, 0xd5, 0x2c, 0xf1, 0xf4, 0xee, 0xe9, 0x3c, 0x9c, 0x55, + 0x98, 0xb5, 0x30, 0xce, 0x7c, 0x52, 0x83, 0x73, 0x9d, 0x25, 0x64, 0xbe, 0x07, 0x45, 0x2d, 0x8d, + 0x2d, 0x19, 0x1e, 0x19, 0xf3, 0xac, 0x69, 0xec, 0x87, 0xcb, 0x12, 0xae, 0xb7, 0x33, 0xbd, 0x67, + 0x70, 0xf9, 0xd8, 0xce, 0x69, 0xc9, 0x96, 0x3f, 0x8d, 0xc3, 0x7f, 0xaa, 0x3a, 0x7d, 0x4f, 0xa0, + 0xa8, 0xfd, 0x4b, 0xd7, 0x06, 0x94, 0x39, 0x3e, 0x38, 0x0c, 0x7b, 0xd8, 0x70, 0x4d, 0x6d, 0x5d, + 0x7f, 0xf3, 0xfd, 0xf7, 0x87, 0x91, 0x79, 0x3a, 0xe7, 0xf4, 0x19, 0x5a, 0xbb, 0x25, 0x1c, 0x6e, + 0x0a, 0x4a, 0x1b, 0x3b, 0x1f, 0xaa, 0x6b, 0xbe, 0xe4, 0x43, 0x75, 0xcf, 0x8b, 0xa1, 0xa0, 0x70, + 0x08, 0x7c, 0x24, 0x30, 0x91, 0xb9, 0x89, 0x3a, 0x79, 0x3a, 0x3d, 0x0e, 0x37, 0x6e, 0x0e, 0x9f, + 0x80, 0x68, 0xab, 0x0a, 0x6d, 0x81, 0xce, 0x0f, 0x40, 0xcb, 0x9c, 0x4b, 0x3f, 0x13, 0xf8, 0xbf, + 0xed, 0x29, 0x9a, 0x2b, 0xd6, 0x6b, 0x70, 0xa3, 0x74, 0x82, 0x0c, 0xe4, 0xbb, 0xa1, 0xf8, 0x16, + 0xe9, 0xb5, 0x01, 0x7c, 0x0d, 0x16, 0xea, 0xb1, 0x45, 0xdf, 0x12, 0x18, 0xad, 0x85, 0x31, 0x5d, + 0xc9, 0x13, 0xea, 0x58, 0xce, 0x58, 0x1d, 0x2a, 0x16, 0x71, 0x16, 0x15, 0xce, 0x2c, 0x35, 0x07, + 0xe0, 0xc8, 0x30, 0xa6, 0x5f, 0x08, 0x40, 0xc7, 0x53, 0x34, 0xf7, 0xe0, 0xc7, 0x9c, 0x69, 0x94, + 0x4f, 0x92, 0x82, 0x74, 0x6b, 0x8a, 0x6e, 0x89, 0x2e, 0x0c, 0xa0, 0x4b, 0x07, 0x94, 0xf6, 0xa7, + 0x5b, 0xd9, 0x3b, 0x34, 0xc9, 0xfe, 0xa1, 0x49, 0x7e, 0x1d, 0x9a, 0xe4, 0xdd, 0x91, 0x59, 0xd8, + 0x3f, 0x32, 0x0b, 0x3f, 0x8e, 0xcc, 0xc2, 0xd3, 0x5b, 0x79, 0xef, 0x85, 0xd7, 0xbd, 0x95, 0xd5, + 0x8b, 0xc2, 0x2b, 0xaa, 0xff, 0x00, 0xeb, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x71, 0xd0, 0x1d, + 0x22, 0xf6, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -552,8 +637,9 @@ type QueryClient interface { Contains(ctx context.Context, in *QueryContainsRequest, opts ...grpc.CallOption) (*QueryContainsResponse, error) // MainChain returns the canonical chain MainChain(ctx context.Context, in *QueryMainChainRequest, opts ...grpc.CallOption) (*QueryMainChainResponse, error) - // BestHeader return best header on canonical chain + // Tip return best header on canonical chain Tip(ctx context.Context, in *QueryTipRequest, opts ...grpc.CallOption) (*QueryTipResponse, error) + BaseHeader(ctx context.Context, in *QueryBaseHeaderRequest, opts ...grpc.CallOption) (*QueryBaseHeaderResponse, error) } type queryClient struct { @@ -609,6 +695,15 @@ func (c *queryClient) Tip(ctx context.Context, in *QueryTipRequest, opts ...grpc return out, nil } +func (c *queryClient) BaseHeader(ctx context.Context, in *QueryBaseHeaderRequest, opts ...grpc.CallOption) (*QueryBaseHeaderResponse, error) { + out := new(QueryBaseHeaderResponse) + err := c.cc.Invoke(ctx, "/babylon.btclightclient.v1.Query/BaseHeader", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // QueryServer is the server API for Query service. type QueryServer interface { // Parameters queries the parameters of the module. @@ -619,8 +714,9 @@ type QueryServer interface { Contains(context.Context, *QueryContainsRequest) (*QueryContainsResponse, error) // MainChain returns the canonical chain MainChain(context.Context, *QueryMainChainRequest) (*QueryMainChainResponse, error) - // BestHeader return best header on canonical chain + // Tip return best header on canonical chain Tip(context.Context, *QueryTipRequest) (*QueryTipResponse, error) + BaseHeader(context.Context, *QueryBaseHeaderRequest) (*QueryBaseHeaderResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -642,6 +738,9 @@ func (*UnimplementedQueryServer) MainChain(ctx context.Context, req *QueryMainCh func (*UnimplementedQueryServer) Tip(ctx context.Context, req *QueryTipRequest) (*QueryTipResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Tip not implemented") } +func (*UnimplementedQueryServer) BaseHeader(ctx context.Context, req *QueryBaseHeaderRequest) (*QueryBaseHeaderResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method BaseHeader not implemented") +} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) @@ -737,6 +836,24 @@ func _Query_Tip_Handler(srv interface{}, ctx context.Context, dec func(interface return interceptor(ctx, in, info, handler) } +func _Query_BaseHeader_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryBaseHeaderRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).BaseHeader(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/babylon.btclightclient.v1.Query/BaseHeader", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).BaseHeader(ctx, req.(*QueryBaseHeaderRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "babylon.btclightclient.v1.Query", HandlerType: (*QueryServer)(nil), @@ -761,6 +878,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "Tip", Handler: _Query_Tip_Handler, }, + { + MethodName: "BaseHeader", + Handler: _Query_BaseHeader_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "babylon/btclightclient/query.proto", @@ -1116,6 +1237,64 @@ func (m *QueryTipResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *QueryBaseHeaderRequest) 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 *QueryBaseHeaderRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryBaseHeaderRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *QueryBaseHeaderResponse) 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 *QueryBaseHeaderResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryBaseHeaderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Header != nil { + { + size, err := m.Header.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 @@ -1258,6 +1437,28 @@ func (m *QueryTipResponse) Size() (n int) { return n } +func (m *QueryBaseHeaderRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *QueryBaseHeaderResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Header != nil { + l = m.Header.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -2101,6 +2302,142 @@ func (m *QueryTipResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *QueryBaseHeaderRequest) 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: QueryBaseHeaderRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryBaseHeaderRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + 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 *QueryBaseHeaderResponse) 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: QueryBaseHeaderResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryBaseHeaderResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Header", 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 m.Header == nil { + m.Header = &BTCHeaderInfo{} + } + if err := m.Header.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/btclightclient/types/query.pb.gw.go b/x/btclightclient/types/query.pb.gw.go index 7811e6661..0ca05598d 100644 --- a/x/btclightclient/types/query.pb.gw.go +++ b/x/btclightclient/types/query.pb.gw.go @@ -175,6 +175,24 @@ func local_request_Query_Tip_0(ctx context.Context, marshaler runtime.Marshaler, } +func request_Query_BaseHeader_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryBaseHeaderRequest + var metadata runtime.ServerMetadata + + msg, err := client.BaseHeader(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_BaseHeader_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryBaseHeaderRequest + var metadata runtime.ServerMetadata + + msg, err := server.BaseHeader(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. @@ -281,6 +299,26 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_BaseHeader_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.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_BaseHeader_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_BaseHeader_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -422,6 +460,26 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_BaseHeader_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_BaseHeader_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_BaseHeader_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -435,6 +493,8 @@ var ( pattern_Query_MainChain_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"babylon", "btclightclient", "v1", "mainchain"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_Tip_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"babylon", "btclightclient", "v1", "tip"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_BaseHeader_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"babylon", "btclightclient", "v1", "baseheader"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -447,4 +507,6 @@ var ( forward_Query_MainChain_0 = runtime.ForwardResponseMessage forward_Query_Tip_0 = runtime.ForwardResponseMessage + + forward_Query_BaseHeader_0 = runtime.ForwardResponseMessage )