Merge branch 'master' of https://code.wuban.net.cn/odysseus/odysseus-protocol

gen/proto/go/nodemanager/v1/request_response.pb.go

@@ -24,6 +24,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 type WorkerMessage struct {
 	// Types that are valid to be assigned to Message:
+	//
 	//	*WorkerMessage_HeartbeatResponse
 	//	*WorkerMessage_SubmitTaskResult
 	//	*WorkerMessage_Status
@@ -153,6 +154,7 @@ func (*WorkerMessage) XXX_OneofWrappers() []interface{} {
 
 type ManagerMessage struct {
 	// Types that are valid to be assigned to Message:
+	//
 	//	*ManagerMessage_HeartbeatRequest
 	//	*ManagerMessage_PushTaskMessage
 	//	*ManagerMessage_ProofTaskResult

gen/proto/go/witness/v1/resource.pb.go

@@ -21,9 +21,8 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 type ValidatedProof struct {
-	Miner                string   `protobuf:"bytes,1,opt,name=miner,proto3" json:"miner,omitempty"`
-	Balance              uint64   `protobuf:"varint,2,opt,name=balance,proto3" json:"balance,omitempty"`
-	Workload             uint64   `protobuf:"varint,3,opt,name=workload,proto3" json:"workload,omitempty"`
+	Balance              uint64   `protobuf:"varint,1,opt,name=balance,proto3" json:"balance,omitempty"`
+	Workload             uint64   `protobuf:"varint,2,opt,name=workload,proto3" json:"workload,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -53,21 +52,68 @@ func (m *ValidatedProof) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ValidatedProof proto.InternalMessageInfo
 
-func (m *ValidatedProof) GetMiner() string {
+func (m *ValidatedProof) GetBalance() uint64 {
+	if m != nil {
+		return m.Balance
+	}
+	return 0
+}
+
+func (m *ValidatedProof) GetWorkload() uint64 {
+	if m != nil {
+		return m.Workload
+	}
+	return 0
+}
+
+type MinerObject struct {
+	Miner                string   `protobuf:"bytes,1,opt,name=miner,proto3" json:"miner,omitempty"`
+	Balance              uint64   `protobuf:"varint,2,opt,name=balance,proto3" json:"balance,omitempty"`
+	Workload             uint64   `protobuf:"varint,3,opt,name=workload,proto3" json:"workload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MinerObject) Reset()         { *m = MinerObject{} }
+func (m *MinerObject) String() string { return proto.CompactTextString(m) }
+func (*MinerObject) ProtoMessage()    {}
+func (*MinerObject) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8558ebcb7c19658f, []int{1}
+}
+func (m *MinerObject) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MinerObject.Unmarshal(m, b)
+}
+func (m *MinerObject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MinerObject.Marshal(b, m, deterministic)
+}
+func (m *MinerObject) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MinerObject.Merge(m, src)
+}
+func (m *MinerObject) XXX_Size() int {
+	return xxx_messageInfo_MinerObject.Size(m)
+}
+func (m *MinerObject) XXX_DiscardUnknown() {
+	xxx_messageInfo_MinerObject.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MinerObject proto.InternalMessageInfo
+
+func (m *MinerObject) GetMiner() string {
 	if m != nil {
 		return m.Miner
 	}
 	return ""
 }
 
-func (m *ValidatedProof) GetBalance() uint64 {
+func (m *MinerObject) GetBalance() uint64 {
 	if m != nil {
 		return m.Balance
 	}
 	return 0
 }
 
-func (m *ValidatedProof) GetWorkload() uint64 {
+func (m *MinerObject) GetWorkload() uint64 {
 	if m != nil {
 		return m.Workload
 	}
@@ -76,26 +122,28 @@ func (m *ValidatedProof) GetWorkload() uint64 {
 
 func init() {
 	proto.RegisterType((*ValidatedProof)(nil), "witness.v1.ValidatedProof")
+	proto.RegisterType((*MinerObject)(nil), "witness.v1.MinerObject")
 }
 
 func init() { proto.RegisterFile("witness/v1/resource.proto", fileDescriptor_8558ebcb7c19658f) }
 
 var fileDescriptor_8558ebcb7c19658f = []byte{
-	// 251 bytes of a gzipped FileDescriptorProto
+	// 270 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2c, 0xcf, 0x2c, 0xc9,
 	0x4b, 0x2d, 0x2e, 0xd6, 0x2f, 0x33, 0xd4, 0x2f, 0x4a, 0x2d, 0xce, 0x2f, 0x2d, 0x4a, 0x4e, 0xd5,
-	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x82, 0x4a, 0xe9, 0x95, 0x19, 0x2a, 0xc5, 0x70, 0xf1,
-	0x85, 0x25, 0xe6, 0x64, 0xa6, 0x24, 0x96, 0xa4, 0xa6, 0x04, 0x14, 0xe5, 0xe7, 0xa7, 0x09, 0x89,
-	0x70, 0xb1, 0xe6, 0x66, 0xe6, 0xa5, 0x16, 0x49, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x41, 0x38,
-	0x42, 0x12, 0x5c, 0xec, 0x49, 0x89, 0x39, 0x89, 0x79, 0xc9, 0xa9, 0x12, 0x4c, 0x0a, 0x8c, 0x1a,
-	0x2c, 0x41, 0x30, 0xae, 0x90, 0x14, 0x17, 0x47, 0x79, 0x7e, 0x51, 0x76, 0x4e, 0x7e, 0x62, 0x8a,
-	0x04, 0x33, 0x58, 0x0a, 0xce, 0x77, 0xda, 0xc8, 0xc8, 0xc5, 0x97, 0x9c, 0x9f, 0xab, 0x87, 0xb0,
-	0xd0, 0x89, 0x37, 0x08, 0xea, 0x98, 0x00, 0x90, 0x5b, 0x02, 0x18, 0xa3, 0xdc, 0xd3, 0x33, 0x4b,
-	0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xf3, 0x53, 0x2a, 0x8b, 0x8b, 0x53, 0x4b, 0x8b,
-	0xe1, 0x0c, 0x5d, 0xb0, 0x8b, 0x93, 0xf3, 0x73, 0xf4, 0xd3, 0x53, 0xf3, 0xf4, 0xc1, 0x1c, 0xfd,
-	0xf4, 0x7c, 0x7d, 0x84, 0xdf, 0xac, 0xa1, 0xcc, 0x32, 0xc3, 0x45, 0x4c, 0xcc, 0xe1, 0x11, 0x11,
-	0xab, 0x98, 0xb8, 0xc2, 0xa1, 0x96, 0x85, 0x19, 0x9e, 0x82, 0x73, 0x62, 0xc2, 0x0c, 0x1f, 0x31,
-	0x89, 0x21, 0x38, 0x31, 0xee, 0x01, 0x4e, 0xbe, 0xa9, 0x25, 0x89, 0x29, 0x89, 0x25, 0x89, 0xaf,
-	0x98, 0xb8, 0xa1, 0x12, 0x56, 0x56, 0x61, 0x86, 0x49, 0x6c, 0x60, 0x5b, 0x8c, 0x01, 0x01, 0x00,
-	0x00, 0xff, 0xff, 0xfc, 0xb2, 0x45, 0x84, 0x41, 0x01, 0x00, 0x00,
+	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x82, 0x4a, 0xe9, 0x95, 0x19, 0x2a, 0xb9, 0x71, 0xf1,
+	0x85, 0x25, 0xe6, 0x64, 0xa6, 0x24, 0x96, 0xa4, 0xa6, 0x04, 0x14, 0xe5, 0xe7, 0xa7, 0x09, 0x49,
+	0x70, 0xb1, 0x27, 0x25, 0xe6, 0x24, 0xe6, 0x25, 0xa7, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x04,
+	0xc1, 0xb8, 0x42, 0x52, 0x5c, 0x1c, 0xe5, 0xf9, 0x45, 0xd9, 0x39, 0xf9, 0x89, 0x29, 0x12, 0x4c,
+	0x60, 0x29, 0x38, 0x5f, 0x29, 0x92, 0x8b, 0xdb, 0x37, 0x33, 0x2f, 0xb5, 0xc8, 0x3f, 0x29, 0x2b,
+	0x35, 0xb9, 0x44, 0x48, 0x84, 0x8b, 0x35, 0x17, 0xc4, 0x05, 0x1b, 0xc1, 0x19, 0x04, 0xe1, 0x20,
+	0x1b, 0xcd, 0x84, 0xdb, 0x68, 0x66, 0x54, 0xa3, 0x9d, 0x36, 0x32, 0x72, 0xf1, 0x25, 0xe7, 0xe7,
+	0xea, 0x21, 0x5c, 0xed, 0xc4, 0x1b, 0x04, 0xf5, 0x51, 0x00, 0xc8, 0x43, 0x01, 0x8c, 0x51, 0xee,
+	0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xf9, 0x29, 0x95, 0xc5, 0xc5,
+	0xa9, 0xa5, 0xc5, 0x70, 0x86, 0x2e, 0xd8, 0xdb, 0xc9, 0xf9, 0x39, 0xfa, 0xe9, 0xa9, 0x79, 0xfa,
+	0x60, 0x8e, 0x7e, 0x7a, 0xbe, 0x3e, 0x22, 0x80, 0xac, 0xa1, 0xcc, 0x32, 0xc3, 0x45, 0x4c, 0xcc,
+	0xe1, 0x11, 0x11, 0xab, 0x98, 0xb8, 0xc2, 0xa1, 0x96, 0x85, 0x19, 0x9e, 0x82, 0x73, 0x62, 0xc2,
+	0x0c, 0x1f, 0x31, 0x89, 0x21, 0x38, 0x31, 0xee, 0x01, 0x4e, 0xbe, 0xa9, 0x25, 0x89, 0x29, 0x89,
+	0x25, 0x89, 0xaf, 0x98, 0xb8, 0xa1, 0x12, 0x56, 0x56, 0x61, 0x86, 0x49, 0x6c, 0x60, 0x5b, 0x8c,
+	0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x62, 0xbb, 0x6d, 0x1d, 0x86, 0x01, 0x00, 0x00,
 }

witness/witness/v1/resource.proto

@@ -3,6 +3,11 @@ syntax = "proto3";
 package witness.v1;
 
 message ValidatedProof {
+  uint64 balance = 1;
+  uint64 workload = 2;
+}
+
+message MinerObject {
   string miner = 1;
   uint64 balance = 2;
   uint64 workload = 3;