Commit d726a67d authored by 贾浩@五瓣科技's avatar 贾浩@五瓣科技

update: PushProofRequest add chain id

parent 87387c19
...@@ -24,6 +24,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package ...@@ -24,6 +24,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
type WorkerMessage struct { type WorkerMessage struct {
// Types that are valid to be assigned to Message: // Types that are valid to be assigned to Message:
//
// *WorkerMessage_HeartbeatResponse // *WorkerMessage_HeartbeatResponse
// *WorkerMessage_SubmitTaskResult // *WorkerMessage_SubmitTaskResult
// *WorkerMessage_Status // *WorkerMessage_Status
...@@ -166,6 +167,7 @@ func (*WorkerMessage) XXX_OneofWrappers() []interface{} { ...@@ -166,6 +167,7 @@ func (*WorkerMessage) XXX_OneofWrappers() []interface{} {
type ManagerMessage struct { type ManagerMessage struct {
// Types that are valid to be assigned to Message: // Types that are valid to be assigned to Message:
//
// *ManagerMessage_HeartbeatRequest // *ManagerMessage_HeartbeatRequest
// *ManagerMessage_PushTaskMessage // *ManagerMessage_PushTaskMessage
// *ManagerMessage_ProofTaskResult // *ManagerMessage_ProofTaskResult
......
...@@ -100,6 +100,7 @@ type PushProofRequest struct { ...@@ -100,6 +100,7 @@ type PushProofRequest struct {
Proofs []*Proof `protobuf:"bytes,1,rep,name=proofs,proto3" json:"proofs,omitempty"` Proofs []*Proof `protobuf:"bytes,1,rep,name=proofs,proto3" json:"proofs,omitempty"`
RewardAddress string `protobuf:"bytes,2,opt,name=reward_address,json=rewardAddress,proto3" json:"reward_address,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"` MinerAddress string `protobuf:"bytes,3,opt,name=miner_address,json=minerAddress,proto3" json:"miner_address,omitempty"`
ChainId uint64 `protobuf:"varint,4,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -150,6 +151,13 @@ func (m *PushProofRequest) GetMinerAddress() string { ...@@ -150,6 +151,13 @@ func (m *PushProofRequest) GetMinerAddress() string {
return "" return ""
} }
func (m *PushProofRequest) GetChainId() uint64 {
if m != nil {
return m.ChainId
}
return 0
}
type Proof struct { type Proof struct {
Workload uint64 `protobuf:"varint,1,opt,name=workload,proto3" json:"workload,omitempty"` Workload uint64 `protobuf:"varint,1,opt,name=workload,proto3" json:"workload,omitempty"`
TaskId string `protobuf:"bytes,2,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` TaskId string `protobuf:"bytes,2,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"`
...@@ -551,42 +559,43 @@ func init() { ...@@ -551,42 +559,43 @@ func init() {
func init() { proto.RegisterFile("witness/v1/request_response.proto", fileDescriptor_fcd71b26d9e7af56) } func init() { proto.RegisterFile("witness/v1/request_response.proto", fileDescriptor_fcd71b26d9e7af56) }
var fileDescriptor_fcd71b26d9e7af56 = []byte{ var fileDescriptor_fcd71b26d9e7af56 = []byte{
// 584 bytes of a gzipped FileDescriptorProto // 598 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x6e, 0xd3, 0x30, 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, 0x14, 0x56, 0x9a, 0xae, 0x5d, 0xcf, 0xfe, 0x3a, 0xd3, 0x6d, 0x01, 0x84, 0x14, 0x32, 0x21, 0x8a,
0x10, 0x89, 0xc2, 0xee, 0x86, 0x84, 0x44, 0x6f, 0xca, 0x04, 0x93, 0xaa, 0x4c, 0x6a, 0x27, 0x34, 0x10, 0x89, 0xc2, 0xee, 0x86, 0x84, 0xc4, 0x6e, 0xca, 0x04, 0x93, 0xaa, 0x4c, 0xda, 0x26, 0x34,
0xa9, 0xf2, 0x1a, 0xd3, 0x44, 0x6d, 0xe2, 0xd6, 0x76, 0x5a, 0xed, 0x11, 0x78, 0x0d, 0x2e, 0x79, 0xa9, 0xf2, 0x1a, 0xd3, 0x44, 0x5b, 0xe2, 0xce, 0x76, 0x56, 0xed, 0x75, 0x10, 0x57, 0x3c, 0x01,
0x02, 0x9e, 0x81, 0xc7, 0xe0, 0x92, 0x57, 0xe0, 0x06, 0xc5, 0x76, 0x9a, 0xb6, 0x68, 0x83, 0x3b, 0xcf, 0xc0, 0x63, 0x70, 0xc9, 0x2b, 0x70, 0x83, 0xfc, 0x93, 0xa6, 0x2d, 0xda, 0xe0, 0xce, 0xdf,
0x7f, 0xdf, 0xf9, 0xce, 0xf9, 0x7c, 0x7c, 0x6c, 0xc3, 0xd3, 0x79, 0x24, 0x12, 0xc2, 0xb9, 0x3b, 0x77, 0xbe, 0x73, 0xbe, 0x63, 0x1f, 0xdb, 0xf0, 0x74, 0x92, 0x8a, 0x9c, 0x70, 0x1e, 0xdc, 0x84,
0xf3, 0x5c, 0x46, 0xa6, 0x29, 0xe1, 0xa2, 0xcf, 0x08, 0x9f, 0xd0, 0x84, 0x13, 0x67, 0xc2, 0xa8, 0x01, 0x23, 0xd7, 0x05, 0xe1, 0x62, 0xc0, 0x08, 0x1f, 0xd3, 0x9c, 0x13, 0x7f, 0xcc, 0xa8, 0xa0,
0xa0, 0x08, 0xb4, 0xc4, 0x99, 0x79, 0xf6, 0x11, 0xd4, 0x7b, 0x0a, 0x5d, 0x0a, 0x2c, 0x52, 0xee, 0x08, 0x8c, 0xc4, 0xbf, 0x09, 0xbd, 0x6d, 0xe8, 0x9c, 0x6a, 0x74, 0x2c, 0xb0, 0x28, 0x78, 0xa4,
0xab, 0x14, 0xfb, 0x23, 0x1c, 0xae, 0xf1, 0xaa, 0x04, 0x7a, 0x02, 0x79, 0x7a, 0x3f, 0x0a, 0x2c, 0x53, 0xbc, 0x8f, 0xb0, 0xb5, 0xc0, 0xeb, 0x12, 0xe8, 0x09, 0x94, 0xe9, 0x83, 0x34, 0x76, 0x2c,
0xa3, 0x61, 0x34, 0xab, 0x7e, 0x55, 0x33, 0xe7, 0x01, 0xaa, 0xc3, 0xe6, 0x84, 0x10, 0xc6, 0xad, 0xd7, 0xea, 0xb6, 0xa2, 0x96, 0x61, 0x0e, 0x63, 0xd4, 0x81, 0xa5, 0x31, 0x21, 0x8c, 0x3b, 0x35,
0x52, 0xc3, 0x6c, 0x56, 0x7d, 0x05, 0xec, 0x2f, 0x06, 0xd4, 0x3a, 0x29, 0x0f, 0x3b, 0x8c, 0xd2, 0xd7, 0xee, 0xb6, 0x22, 0x0d, 0xbc, 0xaf, 0x16, 0xb4, 0xfb, 0x05, 0x4f, 0xfa, 0x8c, 0xd2, 0xcf,
0xcf, 0xda, 0x02, 0xbd, 0x80, 0xf2, 0x24, 0xc3, 0xdc, 0x32, 0x1a, 0x66, 0x73, 0xfb, 0xf5, 0x81, 0xc6, 0x02, 0xbd, 0x80, 0xc6, 0x58, 0x62, 0xee, 0x58, 0xae, 0xdd, 0x5d, 0x79, 0xbd, 0xe9, 0x57,
0x53, 0xec, 0xcb, 0x51, 0x4a, 0x2d, 0x40, 0xcf, 0x60, 0x8f, 0x91, 0x39, 0x66, 0x41, 0x1f, 0x07, 0x7d, 0xf9, 0x5a, 0x69, 0x04, 0xe8, 0x19, 0xac, 0x33, 0x32, 0xc1, 0x2c, 0x1e, 0xe0, 0x38, 0x66,
0x01, 0x23, 0x3c, 0x2b, 0x9f, 0x19, 0xef, 0x2a, 0xf6, 0x9d, 0x22, 0xd1, 0x09, 0xec, 0xc6, 0x51, 0x84, 0xcb, 0xf2, 0xd2, 0x78, 0x4d, 0xb3, 0xef, 0x34, 0x89, 0x76, 0x61, 0x2d, 0x4b, 0x73, 0xc2,
0x42, 0xd8, 0x42, 0x65, 0x4a, 0xd5, 0x8e, 0x24, 0xb5, 0xc8, 0xfe, 0x6d, 0xc0, 0xa6, 0xac, 0x8e, 0xa6, 0x2a, 0x5b, 0xa9, 0x56, 0x15, 0x59, 0x8a, 0x1e, 0xc2, 0xf2, 0x30, 0xc1, 0x69, 0x2e, 0xdb,
0x1e, 0xc1, 0xd6, 0x9c, 0xb2, 0xd1, 0x98, 0x62, 0xd5, 0xc8, 0x86, 0xbf, 0xc0, 0xe8, 0x18, 0x2a, 0xaf, 0xbb, 0x56, 0xb7, 0x1e, 0x35, 0x15, 0x3e, 0x8c, 0xbd, 0xdf, 0x16, 0x2c, 0x29, 0x63, 0xf4,
0x02, 0xf3, 0x51, 0xd6, 0xa3, 0xb2, 0x2a, 0x67, 0xf0, 0x3c, 0x40, 0x0f, 0x61, 0x8b, 0x91, 0x69, 0x08, 0x96, 0x27, 0x94, 0x5d, 0x5e, 0x51, 0xac, 0xf7, 0x58, 0x8f, 0xa6, 0x18, 0xed, 0x40, 0x53,
0x3f, 0xc4, 0x3c, 0xb4, 0xca, 0x0d, 0xa3, 0xb9, 0xe3, 0x57, 0x18, 0x99, 0xbe, 0xc7, 0x3c, 0x44, 0x60, 0x7e, 0x29, 0xf3, 0x75, 0x17, 0x0d, 0x09, 0x0f, 0x63, 0x59, 0x99, 0x91, 0xeb, 0x41, 0x82,
0x8f, 0xa1, 0x9a, 0x9d, 0xb4, 0x8a, 0x55, 0x64, 0x6c, 0x2b, 0x23, 0x64, 0xf0, 0x25, 0x1c, 0xc4, 0x79, 0xe2, 0x34, 0x5c, 0xab, 0xbb, 0x1a, 0x35, 0x19, 0xb9, 0x7e, 0x8f, 0x79, 0x82, 0x1e, 0x43,
0x38, 0xc1, 0x43, 0xc2, 0xfa, 0x3c, 0x1a, 0x26, 0x58, 0xa4, 0x8c, 0xc8, 0xfd, 0xed, 0xf8, 0x35, 0x4b, 0x0e, 0x41, 0xc7, 0x9a, 0x2a, 0xb6, 0x2c, 0x09, 0x15, 0x7c, 0x09, 0x9b, 0x19, 0xce, 0xf1,
0x1d, 0xb8, 0xcc, 0x79, 0xe4, 0xc2, 0x83, 0x01, 0x4d, 0x04, 0x96, 0xcd, 0x14, 0xf2, 0x0d, 0x29, 0x88, 0xb0, 0x01, 0x4f, 0x47, 0x39, 0x16, 0x05, 0x23, 0xaa, 0xf5, 0xd5, 0xa8, 0x6d, 0x02, 0xc7,
0x47, 0x8b, 0x50, 0x91, 0xf0, 0x1c, 0xf6, 0xe3, 0x35, 0xf1, 0xa6, 0x14, 0xef, 0xc5, 0x2b, 0x42, 0x25, 0x8f, 0x02, 0x78, 0x30, 0xa4, 0xb9, 0xc0, 0x6a, 0x9f, 0x95, 0xbc, 0xae, 0xe4, 0x68, 0x1a,
0xdb, 0x85, 0x83, 0xa5, 0x41, 0xe8, 0x99, 0xde, 0x73, 0x10, 0xf6, 0x5b, 0xa8, 0xb7, 0x89, 0xb8, 0xaa, 0x12, 0x9e, 0xc3, 0x46, 0xb6, 0x20, 0x5e, 0x52, 0xe2, 0xf5, 0x6c, 0x4e, 0xe8, 0x05, 0xb0,
0xc8, 0xaa, 0xac, 0x4c, 0xaf, 0x06, 0xe6, 0x6d, 0x9c, 0x5f, 0x80, 0x6c, 0x99, 0x8d, 0x5e, 0x9a, 0x39, 0x33, 0x23, 0x33, 0xee, 0x7b, 0x0e, 0xc2, 0x7b, 0x0b, 0x9d, 0x1e, 0x11, 0x47, 0xb2, 0xca,
0xe9, 0x03, 0x53, 0xc0, 0xfe, 0x00, 0x87, 0x6b, 0xf9, 0xff, 0x36, 0x45, 0x47, 0x50, 0xc6, 0x31, 0xdc, 0x60, 0xdb, 0x60, 0xdf, 0x66, 0xe5, 0xdd, 0x90, 0x4b, 0x79, 0x2b, 0x94, 0x99, 0x39, 0x30,
0x4d, 0x13, 0x91, 0x1f, 0xbe, 0x42, 0xf6, 0x09, 0xec, 0xb7, 0x89, 0xb8, 0x7f, 0x1f, 0xb6, 0x03, 0x0d, 0xbc, 0x0f, 0xb0, 0xb5, 0x90, 0xff, 0x6f, 0x53, 0xb4, 0x0d, 0x0d, 0x9c, 0xd1, 0x22, 0x17,
0xb5, 0x42, 0xf4, 0x1f, 0x1d, 0x9e, 0xc2, 0x71, 0x9b, 0x88, 0x5e, 0x24, 0xc2, 0x80, 0xe1, 0xf9, 0xe5, 0xe1, 0x6b, 0xe4, 0xed, 0xc2, 0x46, 0x8f, 0x88, 0xfb, 0xfb, 0xf0, 0x7c, 0x68, 0x57, 0xa2,
0x4a, 0x71, 0x0b, 0x2a, 0xf9, 0x55, 0x52, 0x06, 0x39, 0xb4, 0x13, 0xb0, 0xfe, 0x4e, 0xd2, 0x66, 0xff, 0xd8, 0xe1, 0x1e, 0xec, 0xf4, 0x88, 0x38, 0x4d, 0x45, 0x12, 0x33, 0x3c, 0x99, 0x2b, 0xee,
0x77, 0x66, 0xdd, 0xd5, 0x17, 0x6a, 0xc0, 0x76, 0x4c, 0xd8, 0x68, 0x4c, 0x64, 0x21, 0xcb, 0x94, 0x40, 0xb3, 0xbc, 0x65, 0xda, 0xa0, 0x84, 0x5e, 0x0e, 0xce, 0xdf, 0x49, 0xc6, 0xec, 0xce, 0xac,
0x6f, 0x67, 0x99, 0x6a, 0x7d, 0x37, 0x60, 0x6f, 0x40, 0xe3, 0xa5, 0x27, 0xd2, 0xaa, 0xeb, 0x5d, 0xbb, 0xf6, 0x85, 0x5c, 0x58, 0xc9, 0x08, 0xbb, 0xbc, 0x22, 0xaa, 0x90, 0x63, 0xab, 0x67, 0x35,
0xe6, 0xbe, 0x9d, 0xec, 0x71, 0x77, 0x8c, 0x4f, 0xed, 0x61, 0x24, 0xc2, 0xf4, 0xc6, 0x19, 0xd0, 0x4b, 0x1d, 0x7c, 0xb7, 0x60, 0x7d, 0x48, 0xb3, 0x99, 0xd7, 0x73, 0xd0, 0x31, 0x5d, 0x96, 0xbe,
0xd8, 0xa5, 0xc1, 0x2d, 0xe7, 0x24, 0xe5, 0x8b, 0xc5, 0x2b, 0xf9, 0x05, 0x0c, 0xe8, 0xd8, 0x1d, 0x7d, 0xf9, 0xee, 0xfb, 0xd6, 0xa7, 0xde, 0x28, 0x15, 0x49, 0x71, 0xe1, 0x0f, 0x69, 0x16, 0xd0,
0x92, 0xc4, 0x95, 0xc0, 0x1d, 0x52, 0xb7, 0xf8, 0x34, 0xde, 0xe8, 0xe5, 0xcc, 0xfb, 0x5a, 0x32, 0xf8, 0x96, 0x73, 0x52, 0xf0, 0xe9, 0xe2, 0x95, 0xfa, 0x1d, 0x86, 0xf4, 0x2a, 0x18, 0x91, 0x3c,
0x7b, 0x57, 0x57, 0xdf, 0x4a, 0xa0, 0x3f, 0x02, 0xa7, 0xeb, 0xfd, 0x58, 0x80, 0xeb, 0xae, 0xf7, 0x50, 0x20, 0x18, 0xd1, 0xa0, 0xfa, 0x4f, 0xde, 0x98, 0xe5, 0x4d, 0xf8, 0xa5, 0x66, 0x9f, 0x9e,
0xb3, 0x74, 0x54, 0x80, 0xeb, 0x76, 0xa7, 0x75, 0x41, 0x04, 0x0e, 0xb0, 0xc0, 0xbf, 0x4a, 0xdb, 0x9d, 0x7d, 0xab, 0x81, 0xf9, 0x23, 0xfc, 0x93, 0xf0, 0xc7, 0x14, 0x9c, 0x9f, 0x84, 0x3f, 0x6b,
0x3a, 0x70, 0x76, 0xd6, 0xf5, 0x6e, 0xca, 0xd2, 0xe5, 0xf4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdb, 0x15, 0x38, 0xef, 0xf5, 0x0f, 0x8e, 0x88, 0xc0, 0x31, 0x16, 0xf8, 0x57, 0x6d, 0xc5, 0x04,
0xb7, 0xc2, 0xbe, 0x65, 0x9a, 0x04, 0x00, 0x00, 0xf6, 0xf7, 0x4f, 0xc2, 0x8b, 0x86, 0x72, 0xd9, 0xfb, 0x13, 0x00, 0x00, 0xff, 0xff, 0x4b, 0x05,
0x29, 0x29, 0xb5, 0x04, 0x00, 0x00,
} }
...@@ -14,6 +14,7 @@ message PushProofRequest { ...@@ -14,6 +14,7 @@ message PushProofRequest {
repeated Proof proofs = 1; repeated Proof proofs = 1;
string reward_address = 2; string reward_address = 2;
string miner_address = 3; string miner_address = 3;
uint64 chain_id = 4;
} }
message Proof { 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