diff --git a/api/proto/message/message.pb.go b/api/proto/message/message.pb.go index 4010e9541..03566e668 100644 --- a/api/proto/message/message.pb.go +++ b/api/proto/message/message.pb.go @@ -58,16 +58,19 @@ type ServiceType int32 const ( ServiceType_CONSENSUS ServiceType = 0 ServiceType_STAKING ServiceType = 1 + ServiceType_DRAND ServiceType = 2 ) var ServiceType_name = map[int32]string{ 0: "CONSENSUS", 1: "STAKING", + 2: "DRAND", } var ServiceType_value = map[string]int32{ "CONSENSUS": 0, "STAKING": 1, + "DRAND": 2, } func (x ServiceType) String() string { @@ -88,6 +91,8 @@ const ( MessageType_PREPARED MessageType = 3 MessageType_COMMIT MessageType = 4 MessageType_COMMITTED MessageType = 5 + MessageType_DRAND_INIT MessageType = 6 + MessageType_DRAND_COMMIT MessageType = 7 ) var MessageType_name = map[int32]string{ @@ -97,6 +102,8 @@ var MessageType_name = map[int32]string{ 3: "PREPARED", 4: "COMMIT", 5: "COMMITTED", + 6: "DRAND_INIT", + 7: "DRAND_COMMIT", } var MessageType_value = map[string]int32{ @@ -106,6 +113,8 @@ var MessageType_value = map[string]int32{ "PREPARED": 3, "COMMIT": 4, "COMMITTED": 5, + "DRAND_INIT": 6, + "DRAND_COMMIT": 7, } func (x MessageType) String() string { @@ -129,6 +138,7 @@ type Message struct { // Types that are valid to be assigned to Request: // *Message_Staking // *Message_Consensus + // *Message_Drand Request isMessage_Request `protobuf_oneof:"request"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -200,10 +210,16 @@ type Message_Consensus struct { Consensus *ConsensusRequest `protobuf:"bytes,6,opt,name=consensus,proto3,oneof"` } +type Message_Drand struct { + Drand *DrandRequest `protobuf:"bytes,7,opt,name=drand,proto3,oneof"` +} + func (*Message_Staking) isMessage_Request() {} func (*Message_Consensus) isMessage_Request() {} +func (*Message_Drand) isMessage_Request() {} + func (m *Message) GetRequest() isMessage_Request { if m != nil { return m.Request @@ -225,11 +241,19 @@ func (m *Message) GetConsensus() *ConsensusRequest { return nil } +func (m *Message) GetDrand() *DrandRequest { + if x, ok := m.GetRequest().(*Message_Drand); ok { + return x.Drand + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*Message) XXX_OneofWrappers() []interface{} { return []interface{}{ (*Message_Staking)(nil), (*Message_Consensus)(nil), + (*Message_Drand)(nil), } } @@ -281,8 +305,6 @@ func (m *StakingRequest) GetNodeId() string { return "" } -// Consensus request. -// TODO: Will organize more later. type ConsensusRequest struct { ConsensusId uint32 `protobuf:"varint,1,opt,name=consensus_id,json=consensusId,proto3" json:"consensus_id,omitempty"` BlockHash []byte `protobuf:"bytes,2,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty"` @@ -346,6 +368,61 @@ func (m *ConsensusRequest) GetPayload() []byte { return nil } +type DrandRequest struct { + SenderId uint32 `protobuf:"varint,1,opt,name=sender_id,json=senderId,proto3" json:"sender_id,omitempty"` + BlockHash []byte `protobuf:"bytes,2,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty"` + Payload []byte `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DrandRequest) Reset() { *m = DrandRequest{} } +func (m *DrandRequest) String() string { return proto.CompactTextString(m) } +func (*DrandRequest) ProtoMessage() {} +func (*DrandRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_33c57e4bae7b9afd, []int{3} +} + +func (m *DrandRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DrandRequest.Unmarshal(m, b) +} +func (m *DrandRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DrandRequest.Marshal(b, m, deterministic) +} +func (m *DrandRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_DrandRequest.Merge(m, src) +} +func (m *DrandRequest) XXX_Size() int { + return xxx_messageInfo_DrandRequest.Size(m) +} +func (m *DrandRequest) XXX_DiscardUnknown() { + xxx_messageInfo_DrandRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_DrandRequest proto.InternalMessageInfo + +func (m *DrandRequest) GetSenderId() uint32 { + if m != nil { + return m.SenderId + } + return 0 +} + +func (m *DrandRequest) GetBlockHash() []byte { + if m != nil { + return m.BlockHash + } + return nil +} + +func (m *DrandRequest) GetPayload() []byte { + if m != nil { + return m.Payload + } + return nil +} + func init() { proto.RegisterEnum("message.ReceiverType", ReceiverType_name, ReceiverType_value) proto.RegisterEnum("message.ServiceType", ServiceType_name, ServiceType_value) @@ -353,40 +430,45 @@ func init() { proto.RegisterType((*Message)(nil), "message.Message") proto.RegisterType((*StakingRequest)(nil), "message.StakingRequest") proto.RegisterType((*ConsensusRequest)(nil), "message.ConsensusRequest") + proto.RegisterType((*DrandRequest)(nil), "message.DrandRequest") } func init() { proto.RegisterFile("message.proto", fileDescriptor_33c57e4bae7b9afd) } var fileDescriptor_33c57e4bae7b9afd = []byte{ - // 477 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x93, 0xcf, 0x6e, 0x9b, 0x40, - 0x10, 0xc6, 0x8d, 0xed, 0x98, 0x30, 0xe0, 0x68, 0xb5, 0x6a, 0x1b, 0xf7, 0x9f, 0xe4, 0xfa, 0xe4, - 0xfa, 0x90, 0x43, 0x72, 0xa8, 0xda, 0x1b, 0xb6, 0x57, 0x0d, 0x8a, 0xbd, 0x44, 0x0b, 0x69, 0x8f, - 0x88, 0xc0, 0xca, 0x46, 0x49, 0xc0, 0x65, 0x71, 0x24, 0x3f, 0x43, 0x9f, 0xaa, 0x6f, 0x56, 0xed, - 0x02, 0x86, 0xe4, 0xc6, 0xf7, 0xcd, 0xfc, 0xe6, 0x5b, 0xcd, 0x08, 0x18, 0x3e, 0x71, 0x21, 0xc2, - 0x0d, 0xbf, 0xd8, 0xe5, 0x59, 0x91, 0x61, 0xbd, 0x92, 0x93, 0x7f, 0x5d, 0xd0, 0xd7, 0xe5, 0x37, - 0xfe, 0x01, 0xc3, 0x9c, 0x47, 0x3c, 0x79, 0xe6, 0x79, 0x50, 0x1c, 0x76, 0x7c, 0xa4, 0x8d, 0xb5, - 0xe9, 0xd9, 0xe5, 0xdb, 0x8b, 0x9a, 0x65, 0x55, 0xd5, 0x3f, 0xec, 0x38, 0xb3, 0xf2, 0x96, 0xc2, - 0xdf, 0xc0, 0x12, 0x3c, 0x7f, 0x4e, 0x22, 0x5e, 0xa2, 0x5d, 0x85, 0xbe, 0x39, 0xa2, 0x5e, 0x59, - 0x54, 0xa4, 0x29, 0x1a, 0x81, 0xa7, 0xd0, 0x57, 0x40, 0xef, 0x15, 0x50, 0x3d, 0x4a, 0x01, 0xaa, - 0x03, 0x7f, 0x02, 0x43, 0x24, 0x9b, 0x34, 0x2c, 0xf6, 0x39, 0x1f, 0xf5, 0xc7, 0xda, 0xd4, 0x62, - 0x8d, 0x81, 0xaf, 0x40, 0x17, 0x45, 0xf8, 0x90, 0xa4, 0x9b, 0xd1, 0xc9, 0x58, 0x9b, 0x9a, 0x97, - 0xe7, 0x4d, 0x76, 0xe9, 0x33, 0xfe, 0x67, 0xcf, 0x45, 0x71, 0xdd, 0x61, 0x75, 0x27, 0xfe, 0x0e, - 0x46, 0x94, 0xa5, 0x82, 0xa7, 0x62, 0x2f, 0x46, 0x03, 0x85, 0xbd, 0x3f, 0x62, 0x8b, 0xba, 0xd2, - 0x80, 0x4d, 0xf7, 0xdc, 0x00, 0x3d, 0x2f, 0xfd, 0xc9, 0x0d, 0x9c, 0xbd, 0x8c, 0xc0, 0x63, 0x30, - 0x8b, 0x3c, 0x4c, 0x45, 0x18, 0x15, 0x49, 0x96, 0xaa, 0x3d, 0x5a, 0xac, 0x6d, 0xe1, 0x73, 0xd0, - 0xd3, 0x2c, 0xe6, 0x41, 0x12, 0xab, 0x55, 0x19, 0x6c, 0x20, 0xa5, 0x13, 0x4f, 0xfe, 0x6a, 0x80, - 0x5e, 0x27, 0xe3, 0x2f, 0x60, 0x1d, 0x93, 0x25, 0x22, 0x07, 0x0e, 0x99, 0x79, 0xf4, 0x9c, 0x18, - 0x7f, 0x06, 0xb8, 0x7f, 0xcc, 0xa2, 0x87, 0x60, 0x1b, 0x8a, 0xad, 0x9a, 0x69, 0x31, 0x43, 0x39, - 0xd7, 0xa1, 0xd8, 0xe2, 0x8f, 0x60, 0x08, 0x9e, 0xc6, 0x3c, 0x97, 0x78, 0x4f, 0xe1, 0xa7, 0xa5, - 0xe1, 0xc4, 0x78, 0x04, 0xfa, 0x2e, 0x3c, 0x3c, 0x66, 0x61, 0x5c, 0xed, 0xb5, 0x96, 0xb3, 0x39, - 0x58, 0xed, 0xa3, 0x63, 0x13, 0x74, 0x4a, 0x7e, 0x53, 0x77, 0x49, 0x50, 0x07, 0x03, 0x0c, 0x56, - 0xc4, 0x5e, 0x12, 0x86, 0x34, 0x3c, 0x04, 0xe3, 0x97, 0xbd, 0x72, 0x96, 0xb6, 0xef, 0x32, 0xd4, - 0x95, 0xa5, 0xc5, 0xca, 0x21, 0xd4, 0x47, 0xbd, 0xd9, 0x57, 0x30, 0x5b, 0xd7, 0x97, 0x9d, 0x0b, - 0x97, 0x7a, 0x84, 0x7a, 0x77, 0x1e, 0xea, 0xc8, 0x89, 0x9e, 0x6f, 0xdf, 0x38, 0xf4, 0x27, 0xd2, - 0x66, 0x4f, 0x60, 0xb6, 0xee, 0x8e, 0x3f, 0xc0, 0xbb, 0x2a, 0x2d, 0x98, 0x13, 0x7b, 0xe1, 0xd2, - 0xa0, 0x6e, 0xed, 0x60, 0x0b, 0x4e, 0x6d, 0x4a, 0xdd, 0x3b, 0xba, 0x20, 0x48, 0x93, 0x53, 0x6e, - 0x19, 0xb9, 0xb5, 0x19, 0x41, 0x5d, 0x59, 0xaa, 0xc4, 0x12, 0xf5, 0xd4, 0x53, 0xdc, 0xf5, 0xda, - 0xf1, 0x51, 0xbf, 0xcc, 0x96, 0xdf, 0x3e, 0x59, 0xa2, 0x93, 0xfb, 0x81, 0xfa, 0x19, 0xae, 0xfe, - 0x07, 0x00, 0x00, 0xff, 0xff, 0x7d, 0xa5, 0x0e, 0x87, 0x1d, 0x03, 0x00, 0x00, + // 541 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xcf, 0x6e, 0xda, 0x40, + 0x10, 0xc6, 0x31, 0x04, 0x1c, 0x8f, 0x4d, 0xb4, 0x1a, 0xb5, 0x8d, 0xfb, 0x4f, 0xa2, 0x9c, 0x50, + 0xa4, 0xe6, 0x90, 0x54, 0xaa, 0xda, 0x9b, 0xc1, 0x56, 0x63, 0x05, 0xd6, 0xd1, 0xe2, 0xb4, 0x47, + 0xcb, 0xc1, 0x2b, 0xb0, 0x92, 0xda, 0xd4, 0x6b, 0x22, 0xf1, 0x0c, 0x3d, 0xf4, 0x55, 0xfb, 0x08, + 0x95, 0xd7, 0x06, 0x1b, 0x2e, 0xbd, 0xed, 0xf7, 0xcd, 0xfc, 0x66, 0x3e, 0x96, 0x35, 0xf4, 0x7f, + 0x72, 0x21, 0xc2, 0x25, 0xbf, 0x5c, 0x67, 0x69, 0x9e, 0xa2, 0x5a, 0xc9, 0xe1, 0xdf, 0x36, 0xa8, + 0xb3, 0xf2, 0x8c, 0x5f, 0xa1, 0x9f, 0xf1, 0x05, 0x8f, 0x9f, 0x79, 0x16, 0xe4, 0xdb, 0x35, 0x37, + 0x95, 0x81, 0x32, 0x3a, 0xbb, 0x7a, 0x79, 0xb9, 0x63, 0x59, 0x55, 0xf5, 0xb7, 0x6b, 0xce, 0x8c, + 0xac, 0xa1, 0xf0, 0x33, 0x18, 0x82, 0x67, 0xcf, 0xf1, 0x82, 0x97, 0x68, 0x5b, 0xa2, 0x2f, 0xf6, + 0xe8, 0xbc, 0x2c, 0x4a, 0x52, 0x17, 0xb5, 0xc0, 0x11, 0x9c, 0x48, 0xa0, 0x73, 0x04, 0x54, 0xa1, + 0x24, 0x20, 0x3b, 0xf0, 0x1d, 0x68, 0x22, 0x5e, 0x26, 0x61, 0xbe, 0xc9, 0xb8, 0x79, 0x32, 0x50, + 0x46, 0x06, 0xab, 0x0d, 0xbc, 0x06, 0x55, 0xe4, 0xe1, 0x63, 0x9c, 0x2c, 0xcd, 0xee, 0x40, 0x19, + 0xe9, 0x57, 0xe7, 0xf5, 0xee, 0xd2, 0x67, 0xfc, 0xd7, 0x86, 0x8b, 0xfc, 0xa6, 0xc5, 0x76, 0x9d, + 0xf8, 0x05, 0xb4, 0x45, 0x9a, 0x08, 0x9e, 0x88, 0x8d, 0x30, 0x7b, 0x12, 0x7b, 0xbd, 0xc7, 0x26, + 0xbb, 0x4a, 0x0d, 0xd6, 0xdd, 0xf8, 0x11, 0xba, 0x51, 0x16, 0x26, 0x91, 0xa9, 0x4a, 0xac, 0xbe, + 0x24, 0xbb, 0x70, 0x6b, 0xa4, 0xec, 0x1a, 0x6b, 0xa0, 0x66, 0xa5, 0x37, 0xbc, 0x85, 0xb3, 0xc3, + 0x44, 0x38, 0x00, 0x3d, 0xcf, 0xc2, 0x44, 0x84, 0x8b, 0x3c, 0x4e, 0x13, 0x79, 0xed, 0x06, 0x6b, + 0x5a, 0x78, 0x0e, 0x6a, 0x92, 0x46, 0x3c, 0x88, 0x23, 0x79, 0xb3, 0x1a, 0xeb, 0x15, 0xd2, 0x8d, + 0x86, 0xbf, 0x15, 0x20, 0xc7, 0x41, 0xf1, 0x03, 0x18, 0xfb, 0xa0, 0x05, 0x52, 0x0c, 0xec, 0x33, + 0x7d, 0xef, 0xb9, 0x11, 0xbe, 0x07, 0x78, 0x78, 0x4a, 0x17, 0x8f, 0xc1, 0x2a, 0x14, 0x2b, 0x39, + 0xd3, 0x60, 0x9a, 0x74, 0x6e, 0x42, 0xb1, 0xc2, 0xb7, 0xa0, 0x09, 0x9e, 0x44, 0x3c, 0x2b, 0xf0, + 0x8e, 0xc4, 0x4f, 0x4b, 0xc3, 0x8d, 0xd0, 0x04, 0x75, 0x1d, 0x6e, 0x9f, 0xd2, 0x30, 0xaa, 0xfe, + 0x86, 0x9d, 0x1c, 0x46, 0x60, 0x34, 0x7f, 0xfe, 0xe1, 0x18, 0xe5, 0x68, 0xcc, 0x7f, 0x22, 0x34, + 0xb6, 0x74, 0x0e, 0xb6, 0x5c, 0x8c, 0xc1, 0x68, 0xbe, 0x44, 0xd4, 0x41, 0xa5, 0xce, 0x0f, 0xea, + 0xd9, 0x0e, 0x69, 0x21, 0x40, 0x6f, 0xea, 0x58, 0xb6, 0xc3, 0x88, 0x82, 0x7d, 0xd0, 0xbe, 0x5b, + 0x53, 0xd7, 0xb6, 0x7c, 0x8f, 0x91, 0x76, 0x51, 0x9a, 0x4c, 0x5d, 0x87, 0xfa, 0xa4, 0x73, 0xf1, + 0x09, 0xf4, 0xc6, 0x93, 0x2c, 0x3a, 0x27, 0x1e, 0x9d, 0x3b, 0x74, 0x7e, 0x3f, 0x27, 0xad, 0x62, + 0xe2, 0xdc, 0xb7, 0x6e, 0x5d, 0xfa, 0x8d, 0x28, 0xa8, 0x41, 0xd7, 0x66, 0x16, 0xb5, 0x49, 0xfb, + 0xe2, 0x8f, 0x02, 0x7a, 0xe3, 0x61, 0xe2, 0x1b, 0x78, 0x55, 0x6d, 0x0e, 0xc6, 0x8e, 0x35, 0xf1, + 0x68, 0xb0, 0xc3, 0x5a, 0x68, 0xc0, 0xa9, 0x45, 0xa9, 0x77, 0x4f, 0x27, 0x0e, 0x51, 0x8a, 0x89, + 0x77, 0xcc, 0xb9, 0xb3, 0x98, 0x43, 0xda, 0x45, 0xa9, 0x12, 0x36, 0xe9, 0xc8, 0x58, 0xde, 0x6c, + 0xe6, 0xfa, 0xe4, 0xa4, 0xcc, 0x51, 0x9c, 0x7d, 0xc7, 0x26, 0x5d, 0x3c, 0x03, 0x90, 0xab, 0x03, + 0x97, 0xba, 0x3e, 0xe9, 0x21, 0x01, 0xa3, 0xd4, 0x15, 0xa0, 0x3e, 0xf4, 0xe4, 0xf7, 0x7c, 0xfd, + 0x2f, 0x00, 0x00, 0xff, 0xff, 0xa7, 0xfe, 0xce, 0xbf, 0xe0, 0x03, 0x00, 0x00, } diff --git a/api/proto/message/message.proto b/api/proto/message/message.proto index 21d66a89f..c5a2c4ecf 100644 --- a/api/proto/message/message.proto +++ b/api/proto/message/message.proto @@ -13,6 +13,7 @@ enum ReceiverType { enum ServiceType { CONSENSUS = 0; STAKING = 1; + DRAND = 2; } // MessageType indicates what is the type of this message. @@ -23,6 +24,8 @@ enum MessageType { PREPARED = 3; COMMIT = 4; COMMITTED = 5; + DRAND_INIT = 6; + DRAND_COMMIT = 7; } // This is universal message for all communication protocols. @@ -38,6 +41,7 @@ message Message { oneof request { StakingRequest staking = 5; ConsensusRequest consensus = 6; + DrandRequest drand = 7; } } @@ -47,11 +51,15 @@ message StakingRequest { string node_id = 2; } -// Consensus request. -// TODO: Will organize more later. message ConsensusRequest { uint32 consensus_id = 1; bytes block_hash = 2; uint32 sender_id = 3; bytes payload = 4; } + +message DrandRequest { + uint32 sender_id = 1; // TODO: make it public key + bytes block_hash = 2; + bytes payload = 3; +} \ No newline at end of file