Skip to content

O
OdysseusProtocol
Commit 3833d2e6 authored by vicotor's avatar vicotor
Browse files
Options

update protocol

parent 04484d6f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 259 deletions
baseapi/base/v1/odysseus.proto
View file @ 3833d2e6
......@@ -9,10 +9,11 @@ import "base/gogo.proto";
option (gogoproto.messagename_all) = true;
enum TaskType {
enum TaskKind {
SystemTask = 0;
ComputeTask = 1;
CustomTask = 2;
StandardTask = 3;
}
enum BillingMethod {
......@@ -22,38 +23,24 @@ enum BillingMethod {
}
message TaskContent {
string task_uuid = 1;
TaskType task_type = 2;
uint64 task_id = 3;
string task_id = 1;
TaskKind task_kind = 2;
uint64 task_type = 3;
string task_cmd =4;
bytes task_param = 5;
uint64 task_timestamp = 6;
string task_callback = 7;
string task_uid = 8;
string task_fee = 9;
// todo: add workload and container publickey
int64 task_workload = 10;
bytes container_pubkey = 11;
int32 task_in_len =12;
}
// CREATE TABLE 'bills' (
// id UUID,
// time TIMESTAMP,
// type symbol CAPACITY 128 CACHE INDEX CAPACITY 8192,
// uid symbol CAPACITY 128 CACHE INDEX CAPACITY 8192,
// fee INT,
// out_len INT,
// workload INT,
// duration INT,
// profit_acc symbol CAPACITY 128 CACHE INDEX CAPACITY 8192,
// worker_acc symbol CAPACITY 128 CACHE INDEX CAPACITY 8192,
// result symbol CAPACITY 128 CACHE INDEX CAPACITY 8192
// ) timestamp (time) PARTITION BY DAY WAL;
message TaskReceipt {
string task_uuid = 1;
string task_id = 1;
uint64 task_timestamp = 2;
uint64 task_id = 3;
uint64 task_type = 3;
string task_uid = 4;
int64 task_fee = 5;
int64 task_out_len = 6;
......@@ -66,7 +53,7 @@ message TaskReceipt {
}
message TaskResponse {
string task_uuid = 1;
string task_id = 1;
bytes task_result_header = 2;
bytes task_result_body = 3;
string task_uid = 4;
......
gen/proto/go/base/v1/odysseus.pb.go
View file @ 3833d2e6
This diff is collapsed.
gen/proto/go/witness/v1/request_response.pb.go
View file @ 3833d2e6
......@@ -158,6 +158,7 @@ type Proof struct {
ManagerSignature []byte `protobuf:"bytes,3,opt,name=manager_signature,json=managerSignature,proto3" json:"manager_signature,omitempty"`
ContainerSignature []byte `protobuf:"bytes,4,opt,name=container_signature,json=containerSignature,proto3" json:"container_signature,omitempty"`
MinerSignature []byte `protobuf:"bytes,5,opt,name=miner_signature,json=minerSignature,proto3" json:"miner_signature,omitempty"`
TaskType uint64 `protobuf:"varint,8,opt,name=task_type,json=taskType,proto3" json:"task_type,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
......@@ -236,6 +237,13 @@ func (m *Proof) GetMinerSignature() []byte {
return nil
}
func (m *Proof) GetTaskType() uint64 {
if m != nil {
return m.TaskType
}
return 0
}
type PushProofResponse struct {
Workload uint64 `protobuf:"varint,1,opt,name=workload,proto3" json:"workload,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
......@@ -551,42 +559,43 @@ func init() {
func init() { proto.RegisterFile("witness/v1/request_response.proto", fileDescriptor_fcd71b26d9e7af56) }
var fileDescriptor_fcd71b26d9e7af56 = []byte{
// 584 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x6e, 0xd3, 0x30,
0x14, 0x56, 0x9a, 0xad, 0x5d, 0xcf, 0xfe, 0x3a, 0xd3, 0x6d, 0x01, 0x84, 0x54, 0x32, 0x21, 0x8a,
0x10, 0x89, 0xc2, 0xee, 0x86, 0x84, 0x44, 0x6f, 0xca, 0x04, 0x93, 0xaa, 0x4c, 0x6a, 0x27, 0x34,
0xa9, 0xf2, 0x1a, 0xd3, 0x44, 0x6d, 0xe2, 0xd6, 0x76, 0x5a, 0xed, 0x11, 0x78, 0x0d, 0x2e, 0x79,
0x02, 0x9e, 0x81, 0xc7, 0xe0, 0x92, 0x57, 0xe0, 0x06, 0xc5, 0x76, 0x9a, 0xb6, 0x68, 0x83, 0x3b,
0x7f, 0xdf, 0xf9, 0xce, 0xf9, 0x7c, 0x7c, 0x6c, 0xc3, 0xd3, 0x79, 0x24, 0x12, 0xc2, 0xb9, 0x3b,
0xf3, 0x5c, 0x46, 0xa6, 0x29, 0xe1, 0xa2, 0xcf, 0x08, 0x9f, 0xd0, 0x84, 0x13, 0x67, 0xc2, 0xa8,
0xa0, 0x08, 0xb4, 0xc4, 0x99, 0x79, 0xf6, 0x11, 0xd4, 0x7b, 0x0a, 0x5d, 0x0a, 0x2c, 0x52, 0xee,
0xab, 0x14, 0xfb, 0x23, 0x1c, 0xae, 0xf1, 0xaa, 0x04, 0x7a, 0x02, 0x79, 0x7a, 0x3f, 0x0a, 0x2c,
0xa3, 0x61, 0x34, 0xab, 0x7e, 0x55, 0x33, 0xe7, 0x01, 0xaa, 0xc3, 0xe6, 0x84, 0x10, 0xc6, 0xad,
0x52, 0xc3, 0x6c, 0x56, 0x7d, 0x05, 0xec, 0x2f, 0x06, 0xd4, 0x3a, 0x29, 0x0f, 0x3b, 0x8c, 0xd2,
0xcf, 0xda, 0x02, 0xbd, 0x80, 0xf2, 0x24, 0xc3, 0xdc, 0x32, 0x1a, 0x66, 0x73, 0xfb, 0xf5, 0x81,
0x53, 0xec, 0xcb, 0x51, 0x4a, 0x2d, 0x40, 0xcf, 0x60, 0x8f, 0x91, 0x39, 0x66, 0x41, 0x1f, 0x07,
0x01, 0x23, 0x3c, 0x2b, 0x9f, 0x19, 0xef, 0x2a, 0xf6, 0x9d, 0x22, 0xd1, 0x09, 0xec, 0xc6, 0x51,
0x42, 0xd8, 0x42, 0x65, 0x4a, 0xd5, 0x8e, 0x24, 0xb5, 0xc8, 0xfe, 0x6d, 0xc0, 0xa6, 0xac, 0x8e,
0x1e, 0xc1, 0xd6, 0x9c, 0xb2, 0xd1, 0x98, 0x62, 0xd5, 0xc8, 0x86, 0xbf, 0xc0, 0xe8, 0x18, 0x2a,
0x02, 0xf3, 0x51, 0xd6, 0xa3, 0xb2, 0x2a, 0x67, 0xf0, 0x3c, 0x40, 0x0f, 0x61, 0x8b, 0x91, 0x69,
0x3f, 0xc4, 0x3c, 0xb4, 0xca, 0x0d, 0xa3, 0xb9, 0xe3, 0x57, 0x18, 0x99, 0xbe, 0xc7, 0x3c, 0x44,
0x8f, 0xa1, 0x9a, 0x9d, 0xb4, 0x8a, 0x55, 0x64, 0x6c, 0x2b, 0x23, 0x64, 0xf0, 0x25, 0x1c, 0xc4,
0x38, 0xc1, 0x43, 0xc2, 0xfa, 0x3c, 0x1a, 0x26, 0x58, 0xa4, 0x8c, 0xc8, 0xfd, 0xed, 0xf8, 0x35,
0x1d, 0xb8, 0xcc, 0x79, 0xe4, 0xc2, 0x83, 0x01, 0x4d, 0x04, 0x96, 0xcd, 0x14, 0xf2, 0x0d, 0x29,
0x47, 0x8b, 0x50, 0x91, 0xf0, 0x1c, 0xf6, 0xe3, 0x35, 0xf1, 0xa6, 0x14, 0xef, 0xc5, 0x2b, 0x42,
0xdb, 0x85, 0x83, 0xa5, 0x41, 0xe8, 0x99, 0xde, 0x73, 0x10, 0xf6, 0x5b, 0xa8, 0xb7, 0x89, 0xb8,
0xc8, 0xaa, 0xac, 0x4c, 0xaf, 0x06, 0xe6, 0x6d, 0x9c, 0x5f, 0x80, 0x6c, 0x99, 0x8d, 0x5e, 0x9a,
0xe9, 0x03, 0x53, 0xc0, 0xfe, 0x00, 0x87, 0x6b, 0xf9, 0xff, 0x36, 0x45, 0x47, 0x50, 0xc6, 0x31,
0x4d, 0x13, 0x91, 0x1f, 0xbe, 0x42, 0xf6, 0x09, 0xec, 0xb7, 0x89, 0xb8, 0x7f, 0x1f, 0xb6, 0x03,
0xb5, 0x42, 0xf4, 0x1f, 0x1d, 0x9e, 0xc2, 0x71, 0x9b, 0x88, 0x5e, 0x24, 0xc2, 0x80, 0xe1, 0xf9,
0x4a, 0x71, 0x0b, 0x2a, 0xf9, 0x55, 0x52, 0x06, 0x39, 0xb4, 0x13, 0xb0, 0xfe, 0x4e, 0xd2, 0x66,
0x77, 0x66, 0xdd, 0xd5, 0x17, 0x6a, 0xc0, 0x76, 0x4c, 0xd8, 0x68, 0x4c, 0x64, 0x21, 0xcb, 0x94,
0x6f, 0x67, 0x99, 0x6a, 0x7d, 0x37, 0x60, 0x6f, 0x40, 0xe3, 0xa5, 0x27, 0xd2, 0xaa, 0xeb, 0x5d,
0xe6, 0xbe, 0x9d, 0xec, 0x71, 0x77, 0x8c, 0x4f, 0xed, 0x61, 0x24, 0xc2, 0xf4, 0xc6, 0x19, 0xd0,
0xd8, 0xa5, 0xc1, 0x2d, 0xe7, 0x24, 0xe5, 0x8b, 0xc5, 0x2b, 0xf9, 0x05, 0x0c, 0xe8, 0xd8, 0x1d,
0x92, 0xc4, 0x95, 0xc0, 0x1d, 0x52, 0xb7, 0xf8, 0x34, 0xde, 0xe8, 0xe5, 0xcc, 0xfb, 0x5a, 0x32,
0x7b, 0x57, 0x57, 0xdf, 0x4a, 0xa0, 0x3f, 0x02, 0xa7, 0xeb, 0xfd, 0x58, 0x80, 0xeb, 0xae, 0xf7,
0xb3, 0x74, 0x54, 0x80, 0xeb, 0x76, 0xa7, 0x75, 0x41, 0x04, 0x0e, 0xb0, 0xc0, 0xbf, 0x4a, 0xdb,
0x3a, 0x70, 0x76, 0xd6, 0xf5, 0x6e, 0xca, 0xd2, 0xe5, 0xf4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff,
0xb7, 0xc2, 0xbe, 0x65, 0x9a, 0x04, 0x00, 0x00,
// 599 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x4e, 0x13, 0x41,
0x14, 0xce, 0xb6, 0xd0, 0x9f, 0xc3, 0x5f, 0x19, 0x0b, 0xac, 0x12, 0x93, 0xba, 0xc4, 0x58, 0x63,
0xdc, 0x4d, 0xe5, 0x0e, 0x13, 0x13, 0xb9, 0xa9, 0x44, 0x49, 0x9a, 0x62, 0x80, 0x18, 0x92, 0x66,
0xe8, 0x1e, 0xdb, 0x0d, 0xec, 0xce, 0x32, 0x33, 0x4b, 0xd3, 0x47, 0xf0, 0x0d, 0xbc, 0xf6, 0xd2,
0x27, 0xf0, 0x19, 0x7c, 0x0c, 0x2f, 0x7d, 0x0a, 0x33, 0x3f, 0xdb, 0x85, 0x1a, 0xd0, 0xbb, 0xf9,
0xbe, 0xf3, 0x9d, 0xf3, 0x9d, 0x33, 0x7f, 0xf0, 0x64, 0x12, 0xc9, 0x04, 0x85, 0x08, 0xae, 0x3b,
0x01, 0xc7, 0xab, 0x0c, 0x85, 0x1c, 0x70, 0x14, 0x29, 0x4b, 0x04, 0xfa, 0x29, 0x67, 0x92, 0x11,
0xb0, 0x12, 0xff, 0xba, 0xe3, 0x6d, 0x42, 0xf3, 0xc4, 0xa0, 0x23, 0x49, 0x65, 0x26, 0xfa, 0x26,
0xc5, 0xfb, 0x00, 0x1b, 0x73, 0xbc, 0x29, 0x41, 0x1e, 0x43, 0x9e, 0x3e, 0x88, 0x42, 0xd7, 0x69,
0x39, 0xed, 0x7a, 0xbf, 0x6e, 0x99, 0x83, 0x90, 0x34, 0x61, 0x31, 0x45, 0xe4, 0xc2, 0x2d, 0xb5,
0xca, 0xed, 0x7a, 0xdf, 0x00, 0xef, 0x8b, 0x03, 0x8d, 0x5e, 0x26, 0xc6, 0x3d, 0xce, 0xd8, 0x67,
0x6b, 0x41, 0x9e, 0x43, 0x25, 0x55, 0x58, 0xb8, 0x4e, 0xab, 0xdc, 0x5e, 0x7a, 0xb5, 0xee, 0x17,
0x7d, 0xf9, 0x46, 0x69, 0x05, 0xe4, 0x29, 0xac, 0x72, 0x9c, 0x50, 0x1e, 0x0e, 0x68, 0x18, 0x72,
0x14, 0xaa, 0xbc, 0x32, 0x5e, 0x31, 0xec, 0x5b, 0x43, 0x92, 0x1d, 0x58, 0x89, 0xa3, 0x04, 0xf9,
0x4c, 0x55, 0xd6, 0xaa, 0x65, 0x4d, 0x5a, 0x91, 0xf7, 0xb5, 0x04, 0x8b, 0xba, 0x3a, 0x79, 0x04,
0xb5, 0x09, 0xe3, 0x17, 0x97, 0x8c, 0x9a, 0x41, 0x16, 0xfa, 0x33, 0x4c, 0xb6, 0xa0, 0x2a, 0xa9,
0xb8, 0x50, 0x33, 0x1a, 0xab, 0x8a, 0x82, 0x07, 0x21, 0x79, 0x08, 0x35, 0x8e, 0x57, 0x83, 0x31,
0x15, 0x63, 0xb7, 0xd2, 0x72, 0xda, 0xcb, 0xfd, 0x2a, 0xc7, 0xab, 0x77, 0x54, 0x8c, 0xc9, 0x36,
0xd4, 0xd5, 0x4e, 0x9b, 0x58, 0x55, 0xc7, 0x6a, 0x8a, 0xd0, 0xc1, 0x17, 0xb0, 0x1e, 0xd3, 0x84,
0x8e, 0x90, 0x0f, 0x44, 0x34, 0x4a, 0xa8, 0xcc, 0x38, 0xea, 0xfe, 0x96, 0xfb, 0x0d, 0x1b, 0x38,
0xca, 0x79, 0x12, 0xc0, 0x83, 0x21, 0x4b, 0x24, 0xd5, 0xc3, 0x14, 0xf2, 0x05, 0x2d, 0x27, 0xb3,
0x50, 0x91, 0xf0, 0x0c, 0xd6, 0xe2, 0x39, 0xf1, 0xa2, 0x16, 0xaf, 0xc6, 0xb7, 0x85, 0xdb, 0x50,
0xd7, 0x73, 0xc9, 0x69, 0x8a, 0x6e, 0xcd, 0x0c, 0xad, 0x88, 0x8f, 0xd3, 0x14, 0xbd, 0x00, 0xd6,
0x6f, 0x9c, 0x92, 0x3d, 0xf0, 0x7b, 0x76, 0xc9, 0x7b, 0x03, 0xcd, 0x2e, 0xca, 0x43, 0x65, 0x71,
0xeb, 0x68, 0x1b, 0x50, 0x9e, 0xc6, 0xf9, 0xed, 0x50, 0x4b, 0x75, 0x2f, 0x74, 0x27, 0x76, 0x37,
0x0d, 0xf0, 0xde, 0xc3, 0xc6, 0x5c, 0xfe, 0xbf, 0x4d, 0xc9, 0x26, 0x54, 0x68, 0xcc, 0xb2, 0x44,
0xe6, 0x27, 0x63, 0x90, 0xb7, 0x03, 0x6b, 0x5d, 0x94, 0xf7, 0xf7, 0xe1, 0xf9, 0xd0, 0x28, 0x44,
0xff, 0x31, 0xe1, 0x2e, 0x6c, 0x75, 0x51, 0x9e, 0x44, 0x72, 0x1c, 0x72, 0x3a, 0xb9, 0x55, 0xdc,
0x85, 0x6a, 0x7e, 0xcf, 0x8c, 0x41, 0x0e, 0xbd, 0x04, 0xdc, 0xbf, 0x93, 0xac, 0xd9, 0x9d, 0x59,
0x77, 0xcd, 0x45, 0x5a, 0xb0, 0x14, 0x23, 0xbf, 0xb8, 0x44, 0x5d, 0xc8, 0x2d, 0xeb, 0x87, 0x75,
0x93, 0xda, 0xff, 0xe1, 0xc0, 0xea, 0x90, 0xc5, 0x37, 0xde, 0xcf, 0x7e, 0xd3, 0x76, 0x99, 0xfb,
0xf6, 0xd4, 0xcb, 0xef, 0x39, 0x9f, 0xba, 0xa3, 0x48, 0x8e, 0xb3, 0x73, 0x7f, 0xc8, 0xe2, 0x80,
0x85, 0x53, 0x21, 0x30, 0x13, 0xb3, 0xc5, 0x4b, 0xfd, 0x3f, 0x0c, 0xd9, 0x65, 0x30, 0xc2, 0x24,
0xd0, 0x20, 0x18, 0xb1, 0xa0, 0xf8, 0x51, 0x5e, 0xdb, 0xe5, 0x75, 0xe7, 0x5b, 0xa9, 0x7c, 0x72,
0x7a, 0xfa, 0xbd, 0x04, 0xf6, 0x97, 0xf0, 0x8f, 0x3b, 0x3f, 0x67, 0xe0, 0xec, 0xb8, 0xf3, 0xab,
0xb4, 0x59, 0x80, 0xb3, 0x6e, 0x6f, 0xff, 0x10, 0x25, 0x0d, 0xa9, 0xa4, 0xbf, 0x4b, 0x4b, 0x36,
0xb0, 0xb7, 0x77, 0xdc, 0x39, 0xaf, 0x68, 0x97, 0xdd, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe9,
0x2f, 0x52, 0xa9, 0xb7, 0x04, 0x00, 0x00,
}
nodemanager/nodemanager/v1/request_response.proto
View file @ 3833d2e6
......@@ -72,11 +72,12 @@ message StatusResponse {
}
message PushTaskMessage {
string task_uuid = 1;
base.v1.TaskType task_type = 2;
string task_id = 1;
base.v1.TaskKind task_kind = 2;
uint64 workload = 3;
string task_cmd = 4; //
bytes task_param = 5;
uint64 task_type = 6;
}
// container_signature = sign(hash(task_id+hash(task_param)+hash(task_result)))
......@@ -84,7 +85,7 @@ message PushTaskMessage {
// manager_signature = sign(hash(task_id+hash(task_param)+hash(task_result)+(reward_address).Bytes()+(miner_address).Bytes()+container_signature+miner_signature+workload))
message SubmitTaskResult {
string task_uuid = 1;
string task_id = 1;
bytes container_signature = 2; // 容器签名
bytes miner_signature = 3; // worker 签名
bytes task_result_header = 4; // result headyer
......@@ -98,7 +99,7 @@ message SubmitResourceMap {
}
message ProofTaskResult {
string task_uuid = 1;
string task_id = 1;
uint64 workload = 2;
bytes manager_signature = 3; // nodemanager 签名
bytes container_pubkey = 4;
......@@ -110,7 +111,7 @@ message DispatchTaskRequest {
}
message DispatchTaskResponse {
string task_uuid = 1;
string task_id = 1;
string miner = 2;
}
......
witness/witness/v1/request_response.proto
View file @ 3833d2e6
......@@ -18,12 +18,13 @@ message PushProofRequest {
message Proof {
uint64 workload = 1;
string task_id = 2;
string task_id = 2; // uuid ? task_id ?
bytes req_hash = 6;
bytes resp_hash = 7;
bytes manager_signature = 3;
bytes container_signature = 4;
bytes miner_signature = 5;
uint64 task_type = 8;
}
message PushProofResponse {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment