Skip to content

O
OdysseusProtocol
Commit 4dfca04c authored by Your Name's avatar Your Name
Browse files
Options

add input len

parents 8f1499cf 260d2ca4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 348 additions and 155 deletions
baseapi/base/v1/odysseus.proto
View file @ 4dfca04c
......@@ -37,6 +37,33 @@ message TaskContent {
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;
uint64 task_finish_time = 2;
uint64 task_id = 3;
string task_uid = 4;
int64 task_fee = 5;
int64 task_out_len = 6;
int64 task_workload = 7;
int64 task_duration = 8;
string task_profit_account = 9;
string task_worker_account = 10;
string task_result = 11; // some message for task result, ex: failed, success, timeout, etc.
}
message TaskResponse {
string task_uuid = 1;
bytes task_result = 2;
......
gen/proto/go/base/v1/odysseus.pb.go
View file @ 4dfca04c
This diff is collapsed.
gen/proto/go/witness/v1/request_response.pb.go
View file @ 4dfca04c
......@@ -98,7 +98,8 @@ func (m *WitnessStatusResponse) GetPeers() []string {
type PushProofRequest struct {
Proofs []*Proof `protobuf:"bytes,1,rep,name=proofs,proto3" json:"proofs,omitempty"`
Miner string `protobuf:"bytes,2,opt,name=miner,proto3" json:"miner,omitempty"`
RewardAddress string `protobuf:"bytes,2,opt,name=reward_address,json=rewardAddress,proto3" json:"reward_address,omitempty"`
MinerAddress string `protobuf:"bytes,3,opt,name=miner_address,json=minerAddress,proto3" json:"miner_address,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
......@@ -135,9 +136,16 @@ func (m *PushProofRequest) GetProofs() []*Proof {
return nil
}
func (m *PushProofRequest) GetMiner() string {
func (m *PushProofRequest) GetRewardAddress() string {
if m != nil {
return m.Miner
return m.RewardAddress
}
return ""
}
func (m *PushProofRequest) GetMinerAddress() string {
if m != nil {
return m.MinerAddress
}
return ""
}
......@@ -543,40 +551,42 @@ func init() {
func init() { proto.RegisterFile("witness/v1/request_response.proto", fileDescriptor_fcd71b26d9e7af56) }
var fileDescriptor_fcd71b26d9e7af56 = []byte{
// 548 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcd, 0x6e, 0xd3, 0x40,
0x10, 0x96, 0xed, 0xe6, 0x6f, 0x82, 0xda, 0x64, 0x49, 0x53, 0x03, 0x42, 0x0a, 0xe6, 0x40, 0x10,
0xc2, 0x96, 0xe9, 0xad, 0x48, 0x1c, 0x72, 0x09, 0x15, 0x54, 0x8a, 0x12, 0x29, 0xa9, 0x50, 0xa5,
0x68, 0x1b, 0x2f, 0xb1, 0x95, 0xd8, 0x9b, 0xec, 0xae, 0x13, 0xf5, 0x75, 0x38, 0xf2, 0x04, 0x3c,
0x03, 0x8f, 0xc1, 0x91, 0x57, 0xe0, 0x82, 0xbc, 0x5e, 0xc7, 0x49, 0x50, 0x4a, 0x6f, 0xfb, 0xcd,
0x7c, 0xdf, 0x7c, 0xe3, 0x19, 0x0f, 0xbc, 0x58, 0x07, 0x22, 0x22, 0x9c, 0x3b, 0x2b, 0xd7, 0x61,
0x64, 0x19, 0x13, 0x2e, 0xc6, 0x8c, 0xf0, 0x05, 0x8d, 0x38, 0xb1, 0x17, 0x8c, 0x0a, 0x8a, 0x40,
0x51, 0xec, 0x95, 0x6b, 0x35, 0xa1, 0x31, 0x4a, 0xd1, 0x40, 0x60, 0x11, 0xf3, 0x7e, 0x2a, 0xb1,
0x3e, 0xc3, 0xe9, 0x5e, 0x3c, 0x2d, 0x81, 0x9e, 0x43, 0x26, 0x1f, 0x07, 0x9e, 0xa9, 0xb5, 0xb4,
0x76, 0xa5, 0x5f, 0x51, 0x91, 0x4b, 0x0f, 0x35, 0xa0, 0xb0, 0x20, 0x84, 0x71, 0x53, 0x6f, 0x19,
0xed, 0x4a, 0x3f, 0x05, 0xd6, 0x00, 0x6a, 0xbd, 0x98, 0xfb, 0x3d, 0x46, 0xe9, 0x57, 0xe5, 0x80,
0x5e, 0x43, 0x71, 0x91, 0x60, 0x6e, 0x6a, 0x2d, 0xa3, 0x5d, 0x7d, 0x57, 0xb7, 0xf3, 0xb6, 0xec,
0x94, 0xa9, 0x08, 0x49, 0xd1, 0x30, 0x88, 0x08, 0x33, 0x75, 0x69, 0x97, 0x02, 0xeb, 0x8f, 0x06,
0x05, 0xc9, 0x43, 0x4f, 0xa1, 0xbc, 0xa6, 0x6c, 0x36, 0xa7, 0x38, 0xed, 0xe8, 0xa8, 0xbf, 0xc1,
0xe8, 0x0c, 0x4a, 0x02, 0xf3, 0x59, 0xd2, 0x6c, 0xaa, 0x2e, 0x26, 0xf0, 0xd2, 0x43, 0x4f, 0xa0,
0xcc, 0xc8, 0x72, 0xec, 0x63, 0xee, 0x9b, 0xc5, 0x96, 0xd6, 0x7e, 0xd4, 0x2f, 0x31, 0xb2, 0xfc,
0x88, 0xb9, 0x8f, 0x9e, 0x41, 0x25, 0x19, 0x59, 0x9a, 0x2b, 0xc9, 0x5c, 0x39, 0x09, 0xc8, 0xe4,
0x1b, 0xa8, 0x87, 0x38, 0xc2, 0x53, 0xc2, 0xc6, 0x3c, 0x98, 0x46, 0x58, 0xc4, 0x8c, 0x98, 0x86,
0x24, 0xd5, 0x54, 0x62, 0x90, 0xc5, 0x91, 0x03, 0x8f, 0x27, 0x34, 0x12, 0x38, 0x69, 0x78, 0x8b,
0x7e, 0x24, 0xe9, 0x68, 0x93, 0xca, 0x05, 0xaf, 0xe0, 0x24, 0xdc, 0x23, 0x17, 0x24, 0xf9, 0x38,
0xdc, 0x21, 0x5a, 0x0e, 0xd4, 0xb7, 0x46, 0xaa, 0x96, 0x73, 0xcf, 0x20, 0xac, 0x0f, 0xd0, 0xe8,
0x12, 0x71, 0x95, 0x54, 0xd9, 0xd9, 0x43, 0x0d, 0x8c, 0xbb, 0x30, 0xdb, 0x64, 0xf2, 0x3c, 0x30,
0xee, 0x4f, 0x70, 0xba, 0xa7, 0xff, 0xbf, 0x29, 0x6a, 0x42, 0x11, 0x87, 0x34, 0x8e, 0x44, 0x36,
0xfc, 0x14, 0x59, 0x2f, 0xe1, 0xa4, 0x4b, 0xc4, 0xfd, 0x7d, 0x58, 0x36, 0xd4, 0x72, 0xd2, 0x03,
0xbe, 0xf0, 0x1c, 0xce, 0xba, 0x44, 0x8c, 0x02, 0xe1, 0x7b, 0x0c, 0xaf, 0x77, 0x8a, 0x9b, 0x50,
0xc2, 0x9e, 0xc7, 0x08, 0xe7, 0xca, 0x20, 0x83, 0x56, 0x04, 0xe6, 0xbf, 0x22, 0x65, 0x76, 0x50,
0x75, 0xe8, 0xbb, 0x50, 0x0b, 0xaa, 0x21, 0x61, 0xb3, 0x39, 0x91, 0x85, 0x4c, 0x43, 0x1e, 0xc1,
0x76, 0xa8, 0xf3, 0x43, 0x83, 0xe3, 0x09, 0x0d, 0xb7, 0x7e, 0xf6, 0x4e, 0x43, 0x75, 0x99, 0xf9,
0xf6, 0x92, 0x2b, 0xed, 0x69, 0x5f, 0xba, 0xd3, 0x40, 0xf8, 0xf1, 0xad, 0x3d, 0xa1, 0xa1, 0x43,
0xbd, 0x3b, 0xce, 0x49, 0xcc, 0x37, 0x8f, 0xb7, 0xf2, 0x96, 0x27, 0x74, 0xee, 0x4c, 0x49, 0xe4,
0x48, 0xe0, 0x4c, 0xa9, 0x93, 0x5f, 0xff, 0x7b, 0xf5, 0x5c, 0xb9, 0xdf, 0x74, 0x63, 0x74, 0x7d,
0xfd, 0x5d, 0x07, 0x75, 0xd1, 0xf6, 0xd0, 0xfd, 0xb9, 0x01, 0x37, 0x43, 0xf7, 0x97, 0xde, 0xcc,
0xc1, 0x4d, 0xb7, 0xd7, 0xb9, 0x22, 0x02, 0x7b, 0x58, 0xe0, 0xdf, 0x7a, 0x55, 0x25, 0x2e, 0x2e,
0x86, 0xee, 0x6d, 0x51, 0xba, 0x9c, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x71, 0x5a, 0x34,
0x63, 0x04, 0x00, 0x00,
// 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,
}
nodemanager/nodemanager/v1/request_response.proto
View file @ 4dfca04c
......@@ -79,7 +79,7 @@ message PushTaskMessage {
// container_signature = sign(hash(task_id+hash(task_param)+hash(task_result)))
// miner_signature = sign(hash(task_id+hash(task_param)+hash(task_result)))
// manager_signature = sign(hash((task_id+hash(task_param)+hash(task_result)+container_signature+miner_signature+workload))
// 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;
......@@ -91,8 +91,9 @@ message SubmitTaskResult {
message ProofTaskResult {
string task_uuid = 1;
bytes manager_signature = 2; // nodemanager 签名
bytes container_pubkey = 3;
uint64 workload = 2;
bytes manager_signature = 3; // nodemanager 签名
bytes container_pubkey = 4;
}
message DispatchTaskRequest {
......
witness/witness/v1/request_response.proto
View file @ 4dfca04c
......@@ -12,7 +12,8 @@ message WitnessStatusResponse {
message PushProofRequest {
repeated Proof proofs = 1;
string miner = 2;
string reward_address = 2;
string miner_address = 3;
}
message Proof {
......
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