update protocol

baseapi/base/v1/odysseus.proto

@@ -37,7 +37,7 @@ message TaskContent {
 }
 
 message TaskResponse {
-    string task_id = 1;
+    string task_uuid = 1;
     bytes task_result = 2;
     string task_uid = 3;
     string task_fee = 4;

gen/proto/go/base/v1/odysseus.pb.go

@@ -202,7 +202,7 @@ func (*TaskContent) XXX_MessageName() string {
 }
 
 type TaskResponse struct {
-	TaskId               string   `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"`
+	TaskUuid             string   `protobuf:"bytes,1,opt,name=task_uuid,json=taskUuid,proto3" json:"task_uuid,omitempty"`
 	TaskResult           []byte   `protobuf:"bytes,2,opt,name=task_result,json=taskResult,proto3" json:"task_result,omitempty"`
 	TaskUid              string   `protobuf:"bytes,3,opt,name=task_uid,json=taskUid,proto3" json:"task_uid,omitempty"`
 	TaskFee              string   `protobuf:"bytes,4,opt,name=task_fee,json=taskFee,proto3" json:"task_fee,omitempty"`
@@ -237,9 +237,9 @@ func (m *TaskResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_TaskResponse proto.InternalMessageInfo
 
-func (m *TaskResponse) GetTaskId() string {
+func (m *TaskResponse) GetTaskUuid() string {
 	if m != nil {
-		return m.TaskId
+		return m.TaskUuid
 	}
 	return ""
 }
@@ -292,43 +292,43 @@ func init() {
 func init() { proto.RegisterFile("base/v1/odysseus.proto", fileDescriptor_91b466c680c1fa25) }
 
 var fileDescriptor_91b466c680c1fa25 = []byte{
-	// 601 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0xcb, 0x6e, 0xd3, 0x4c,
-	0x14, 0xc7, 0x3b, 0x4e, 0xbf, 0x26, 0x99, 0x24, 0x4d, 0x3a, 0x9f, 0x00, 0x53, 0x04, 0x8d, 0x8a,
-	0x40, 0xa1, 0x12, 0xb1, 0x02, 0xbb, 0x76, 0x85, 0x03, 0x45, 0x45, 0xaa, 0x88, 0xd2, 0x0b, 0x15,
-	0xaa, 0x14, 0x4d, 0xec, 0x53, 0xd7, 0x8a, 0xed, 0xb1, 0xe6, 0x52, 0xe4, 0xb7, 0x41, 0x2c, 0x79,
-	0x0f, 0x24, 0xc4, 0x63, 0xc0, 0x8e, 0x97, 0x00, 0xcd, 0x8c, 0xe3, 0x2a, 0x0b, 0x56, 0x99, 0xfc,
-	0xe6, 0xef, 0xf3, 0x3f, 0x97, 0x39, 0xf8, 0xee, 0x9c, 0x0a, 0xf0, 0x6e, 0x46, 0x1e, 0x0b, 0x0b,
-	0x21, 0x40, 0x89, 0x61, 0xce, 0x99, 0x64, 0xa4, 0xae, 0xf9, 0xf0, 0x66, 0xb4, 0xbd, 0x13, 0x31,
-	0x16, 0x25, 0xe0, 0x19, 0x3c, 0x57, 0x57, 0x9e, 0x8c, 0x53, 0x10, 0x92, 0xa6, 0xb9, 0x55, 0x6e,
-	0x57, 0x11, 0x38, 0x08, 0xa6, 0x78, 0x00, 0x25, 0xef, 0x1a, 0x1e, 0xb1, 0x88, 0x59, 0xb0, 0xfb,
-	0xc7, 0xc1, 0xad, 0x53, 0x2a, 0x16, 0x63, 0x96, 0x49, 0xc8, 0x24, 0x79, 0x80, 0x9b, 0x92, 0x8a,
-	0xc5, 0x4c, 0xa9, 0x38, 0x74, 0x51, 0x1f, 0x0d, 0x9a, 0xd3, 0x86, 0x06, 0x67, 0x2a, 0x0e, 0xc9,
-	0xb0, 0xbc, 0x94, 0x45, 0x0e, 0xae, 0xd3, 0x47, 0x83, 0xcd, 0x17, 0x5b, 0xc3, 0x32, 0xa7, 0xa1,
-	0x8e, 0x72, 0x5a, 0xe4, 0x60, 0xf5, 0xfa, 0x44, 0xee, 0xe1, 0xba, 0xd1, 0xc7, 0xa1, 0x5b, 0xeb,
-	0xa3, 0xc1, 0xfa, 0x74, 0x43, 0xff, 0x3d, 0x0a, 0xc9, 0x7d, 0x6c, 0x44, 0xb3, 0x20, 0x0d, 0xdd,
-	0x75, 0x63, 0x62, 0x84, 0xe3, 0x34, 0x24, 0x0f, 0x31, 0x36, 0x57, 0x39, 0xe5, 0x34, 0x75, 0xff,
-	0xeb, 0xa3, 0x41, 0x7b, 0x6a, 0x5c, 0x27, 0x1a, 0x90, 0x27, 0x78, 0xd3, 0xa6, 0xb0, 0x2c, 0xd8,
-	0xdd, 0x30, 0x91, 0x3b, 0xc6, 0x74, 0x09, 0xc9, 0x63, 0xdc, 0xb1, 0x06, 0x34, 0x49, 0xe6, 0x34,
-	0x58, 0xb8, 0x75, 0xe3, 0xd2, 0x36, 0x2e, 0x25, 0xab, 0xb2, 0xd0, 0xa5, 0x36, 0x6e, 0xb3, 0x38,
-	0x8b, 0x6f, 0x13, 0xbc, 0x02, 0x70, 0x9b, 0xb7, 0x57, 0x87, 0x00, 0x55, 0xe8, 0x4f, 0x8c, 0x2f,
-	0x12, 0x46, 0x43, 0x17, 0xf7, 0xd1, 0xa0, 0x66, 0x43, 0x7f, 0x28, 0x19, 0x79, 0x86, 0x7b, 0x01,
-	0xcb, 0x24, 0x8d, 0x33, 0xe0, 0xb3, 0x5c, 0xcd, 0x17, 0x50, 0xb8, 0x2d, 0x53, 0x4b, 0xb7, 0xe2,
-	0x13, 0x83, 0x77, 0xbf, 0x21, 0xdc, 0xd6, 0xbd, 0x9b, 0x82, 0xc8, 0x59, 0x26, 0x56, 0xba, 0x66,
-	0x07, 0xb0, 0xec, 0xda, 0x0e, 0x6e, 0x99, 0x0b, 0x0e, 0x42, 0x25, 0xd2, 0x0c, 0xa0, 0x3d, 0x35,
-	0xdd, 0x9a, 0x1a, 0xb2, 0x52, 0x50, 0xed, 0xdf, 0x05, 0xad, 0xaf, 0x16, 0xf4, 0x14, 0x77, 0xad,
-	0x9f, 0x98, 0x09, 0x15, 0x04, 0x00, 0xa1, 0x69, 0x7b, 0xc3, 0xf6, 0xf4, 0x48, 0x9c, 0x58, 0x58,
-	0x4d, 0x06, 0x38, 0x67, 0xdc, 0xb4, 0xbd, 0x69, 0x27, 0xf3, 0x46, 0x83, 0xbd, 0x03, 0xdc, 0x58,
-	0x3e, 0x01, 0xb2, 0x89, 0xf1, 0x49, 0x21, 0x24, 0xa4, 0x9a, 0xf4, 0xd6, 0x48, 0x17, 0xb7, 0xc6,
-	0x2c, 0xcd, 0x95, 0x04, 0x03, 0x90, 0x16, 0x8c, 0x95, 0x90, 0xcc, 0x0a, 0x9c, 0xbd, 0x77, 0xb8,
-	0xe3, 0xc7, 0x49, 0x12, 0x67, 0xd1, 0x31, 0xc8, 0x6b, 0x16, 0xea, 0x2f, 0x4a, 0x70, 0xc8, 0x01,
-	0x7a, 0x6b, 0x64, 0xab, 0x52, 0xf8, 0x85, 0x9e, 0x73, 0x0f, 0x91, 0x3b, 0x78, 0xab, 0x42, 0xaf,
-	0x15, 0xa7, 0x32, 0x66, 0x59, 0xcf, 0xf1, 0x3f, 0xa3, 0xef, 0xbf, 0x1e, 0x21, 0xdc, 0x0a, 0x58,
-	0xba, 0x7c, 0x9c, 0x7e, 0xe7, 0x7d, 0xb9, 0x49, 0x13, 0xfd, 0xea, 0x27, 0xe8, 0xe3, 0xab, 0x28,
-	0x96, 0xd7, 0x6a, 0x3e, 0x0c, 0x58, 0x5a, 0x6d, 0x59, 0x75, 0x78, 0x6e, 0x76, 0x23, 0x60, 0x89,
-	0x17, 0x41, 0x66, 0x97, 0xcc, 0x8b, 0x98, 0x57, 0xee, 0xd4, 0x81, 0xfe, 0xbd, 0x19, 0x7d, 0x71,
-	0x6a, 0xfe, 0xc5, 0xc5, 0x57, 0xa7, 0xee, 0x6b, 0x8f, 0xf3, 0xd1, 0x0f, 0x7b, 0xba, 0x3c, 0x1f,
-	0xfd, 0x74, 0xfe, 0x2f, 0x4f, 0x97, 0x6f, 0x27, 0xfe, 0x31, 0x48, 0x1a, 0x52, 0x49, 0x7f, 0x3b,
-	0x0d, 0x4d, 0xf7, 0xf7, 0xcf, 0x47, 0xf3, 0x0d, 0x13, 0xf3, 0xe5, 0xdf, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0xbc, 0x9b, 0x79, 0xf1, 0xe9, 0x03, 0x00, 0x00,
+	// 594 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xcd, 0x6e, 0xd3, 0x40,
+	0x10, 0xc7, 0xbb, 0x4e, 0x69, 0x92, 0x4d, 0xd2, 0xa4, 0x8b, 0x00, 0x53, 0x04, 0x8d, 0x8a, 0x40,
+	0xa1, 0x12, 0xb1, 0x02, 0xb7, 0xf6, 0x84, 0x03, 0x45, 0x45, 0xaa, 0x88, 0xd2, 0x0f, 0x2a, 0x54,
+	0x29, 0xda, 0xd8, 0x53, 0xd7, 0x8a, 0xed, 0xb5, 0xf6, 0xa3, 0xc8, 0x6f, 0x83, 0x38, 0xf2, 0x24,
+	0xc0, 0x63, 0xc0, 0x8d, 0x97, 0x00, 0xed, 0xae, 0xe3, 0xaa, 0x07, 0x38, 0x65, 0xf2, 0x9b, 0xbf,
+	0xe7, 0x73, 0x07, 0xdf, 0x9d, 0x53, 0x01, 0xde, 0xd5, 0xc8, 0x63, 0x61, 0x21, 0x04, 0x28, 0x31,
+	0xcc, 0x39, 0x93, 0x8c, 0xd4, 0x35, 0x1f, 0x5e, 0x8d, 0x36, 0xb7, 0x22, 0xc6, 0xa2, 0x04, 0x3c,
+	0x83, 0xe7, 0xea, 0xc2, 0x93, 0x71, 0x0a, 0x42, 0xd2, 0x34, 0xb7, 0xca, 0xcd, 0x2a, 0x02, 0x07,
+	0xc1, 0x14, 0x0f, 0xa0, 0xe4, 0x5d, 0xc3, 0x23, 0x16, 0x31, 0x0b, 0xb6, 0xff, 0x38, 0xb8, 0x75,
+	0x4c, 0xc5, 0x62, 0xcc, 0x32, 0x09, 0x99, 0x24, 0x0f, 0x70, 0x53, 0x52, 0xb1, 0x98, 0x29, 0x15,
+	0x87, 0x2e, 0xea, 0xa3, 0x41, 0x73, 0xda, 0xd0, 0xe0, 0x44, 0xc5, 0x21, 0x19, 0x96, 0x4e, 0x59,
+	0xe4, 0xe0, 0x3a, 0x7d, 0x34, 0x58, 0x7f, 0xb1, 0x31, 0x2c, 0x6b, 0x1a, 0xea, 0x28, 0xc7, 0x45,
+	0x0e, 0x56, 0xaf, 0x2d, 0x72, 0x0f, 0xd7, 0x8d, 0x3e, 0x0e, 0xdd, 0x5a, 0x1f, 0x0d, 0x56, 0xa7,
+	0x6b, 0xfa, 0xef, 0x41, 0x48, 0xee, 0x63, 0x23, 0x9a, 0x05, 0x69, 0xe8, 0xae, 0x9a, 0x24, 0x46,
+	0x38, 0x4e, 0x43, 0xf2, 0x10, 0x63, 0xe3, 0xca, 0x29, 0xa7, 0xa9, 0x7b, 0xab, 0x8f, 0x06, 0xed,
+	0xa9, 0xc9, 0x3a, 0xd1, 0x80, 0x3c, 0xc1, 0xeb, 0xb6, 0x84, 0x65, 0xc3, 0xee, 0x9a, 0x89, 0xdc,
+	0x31, 0x49, 0x97, 0x90, 0x3c, 0xc6, 0x1d, 0x9b, 0x80, 0x26, 0xc9, 0x9c, 0x06, 0x0b, 0xb7, 0x6e,
+	0xb2, 0xb4, 0x4d, 0x96, 0x92, 0x55, 0x55, 0xe8, 0x56, 0x1b, 0xd7, 0x55, 0x9c, 0xc4, 0xd7, 0x05,
+	0x5e, 0x00, 0xb8, 0xcd, 0x6b, 0xd7, 0x3e, 0x40, 0x15, 0xfa, 0x13, 0xe3, 0x8b, 0x84, 0xd1, 0xd0,
+	0xc5, 0x7d, 0x34, 0xa8, 0xd9, 0xd0, 0x1f, 0x4a, 0x46, 0x9e, 0xe1, 0x5e, 0xc0, 0x32, 0x49, 0xe3,
+	0x0c, 0xf8, 0x2c, 0x57, 0xf3, 0x05, 0x14, 0x6e, 0xcb, 0xf4, 0xd2, 0xad, 0xf8, 0xc4, 0xe0, 0xed,
+	0xef, 0x08, 0xb7, 0xf5, 0xec, 0xa6, 0x20, 0x72, 0x96, 0x09, 0xf8, 0xff, 0x0a, 0xb6, 0x70, 0xcb,
+	0x38, 0x39, 0x08, 0x95, 0x48, 0xb3, 0x84, 0xf6, 0xd4, 0x4c, 0x6c, 0x6a, 0xc8, 0x8d, 0xa6, 0x6a,
+	0xff, 0x6e, 0x6a, 0xf5, 0x66, 0x53, 0x4f, 0x71, 0xd7, 0x6e, 0x4a, 0xcc, 0x84, 0x0a, 0x02, 0x80,
+	0xd0, 0x8c, 0xbe, 0x61, 0xe7, 0x7a, 0x20, 0x8e, 0x2c, 0xac, 0xb6, 0x03, 0x9c, 0x33, 0x6e, 0x46,
+	0xdf, 0xb4, 0xdb, 0x79, 0xa3, 0xc1, 0xce, 0x1e, 0x6e, 0x2c, 0x9f, 0x01, 0x59, 0xc7, 0xf8, 0xa8,
+	0x10, 0x12, 0x52, 0x4d, 0x7a, 0x2b, 0xa4, 0x8b, 0x5b, 0x63, 0x96, 0xe6, 0x4a, 0x82, 0x01, 0x48,
+	0x0b, 0xc6, 0x4a, 0x48, 0x66, 0x05, 0xce, 0xce, 0x3b, 0xdc, 0xf1, 0xe3, 0x24, 0x89, 0xb3, 0xe8,
+	0x10, 0xe4, 0x25, 0x0b, 0xf5, 0x17, 0x25, 0xd8, 0xe7, 0x00, 0xbd, 0x15, 0xb2, 0x51, 0x29, 0xfc,
+	0x42, 0xef, 0xba, 0x87, 0xc8, 0x1d, 0xbc, 0x51, 0xa1, 0xd7, 0x8a, 0x53, 0x19, 0xb3, 0xac, 0xe7,
+	0xf8, 0x9f, 0xd1, 0xb7, 0x5f, 0x8f, 0x10, 0x6e, 0x05, 0x2c, 0x5d, 0x3e, 0x50, 0xbf, 0xf3, 0xbe,
+	0xbc, 0xa6, 0x89, 0x7e, 0xf9, 0x13, 0xf4, 0xf1, 0x55, 0x14, 0xcb, 0x4b, 0x35, 0x1f, 0x06, 0x2c,
+	0xad, 0x2e, 0xad, 0x32, 0x9e, 0x9b, 0xfb, 0x08, 0x58, 0xe2, 0x45, 0x90, 0xd9, 0x43, 0xf3, 0x22,
+	0xe6, 0x95, 0x77, 0xb5, 0xa7, 0x7f, 0xaf, 0x46, 0x5f, 0x9c, 0x9a, 0x7f, 0x76, 0xf6, 0xd5, 0xa9,
+	0xfb, 0x3a, 0xc7, 0xe9, 0xe8, 0x87, 0xb5, 0xce, 0x4f, 0x47, 0x3f, 0x9d, 0xdb, 0xa5, 0x75, 0xfe,
+	0x76, 0xe2, 0x1f, 0x82, 0xa4, 0x21, 0x95, 0xf4, 0xb7, 0xd3, 0xd0, 0x74, 0x77, 0xf7, 0x74, 0x34,
+	0x5f, 0x33, 0x31, 0x5f, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x8d, 0xdb, 0x48, 0x1a, 0xed, 0x03,
+	0x00, 0x00,
 }

nodemanager/nodemanager/v1/request_response.proto

@@ -55,8 +55,9 @@ message DeviceInfoRequest {
 
 message DeviceInfoResponse {
   string miner_pubkey = 1;
-  repeated DeviceInfo devices = 2;
-  bytes device_signature = 3; // 由测试程序对设备信息进行签名
+  string benefit_address = 2;
+  repeated DeviceInfo devices = 3;
+  bytes device_signature = 4; // 由测试程序对设备信息进行签名
 }
 
 message DeviceUsage {
@@ -69,7 +70,7 @@ message StatusResponse {
 }
 
 message PushTaskMessage {
-  string task_id = 1;
+  string task_uuid = 1;
   base.v1.TaskType task_type = 2;
   uint64 workload = 3;
   string task_cmd = 4; // 
@@ -81,7 +82,7 @@ message PushTaskMessage {
 // manager_signature = sign(hash((task_id+hash(task_param)+hash(task_result)+container_signature+miner_signature+workload))
 
 message SubmitTaskResult {
-  string task_id = 1;
+  string task_uuid = 1;
   bytes container_signature = 2; // 容器签名
   bytes miner_signature = 3; // worker 签名
   bytes task_result = 4; // 任务结果
@@ -89,7 +90,7 @@ message SubmitTaskResult {
 }
 
 message ProofTaskResult {
-  string task_id = 1; 
+  string task_uuid = 1; 
   bytes manager_signature = 2; // nodemanager 签名
   bytes container_pubkey = 3;
 }
@@ -100,7 +101,7 @@ message DispatchTaskRequest {
 }
 
 message DispatchTaskResponse {
-  string task_id = 1;
+  string task_uuid = 1;
   string miner = 2;
 }