From 88b1725369aeff551cd387c149a0bbfaa1a88eb6 Mon Sep 17 00:00:00 2001 From: AstaFrode Date: Wed, 23 Aug 2023 10:14:43 +0800 Subject: [PATCH 1/2] update examples --- examples/node/main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/node/main.go b/examples/node/main.go index 4a7015d..031fabb 100644 --- a/examples/node/main.go +++ b/examples/node/main.go @@ -16,6 +16,7 @@ import ( "time" p2pgo "github.com/CESSProject/p2p-go" + "github.com/CESSProject/p2p-go/config" "github.com/CESSProject/p2p-go/core" "github.com/CESSProject/p2p-go/out" "golang.org/x/time/rate" @@ -43,7 +44,7 @@ func main() { p2pgo.BootPeers([]string{ "_dnsaddr.boot-kldr-testnet.cess.cloud", }), - p2pgo.ProtocolPrefix("/kldr-testnet"), + p2pgo.ProtocolPrefix(config.TestnetProtocolPrefix), ) if err != nil { panic(err) From 4e2644153b6f8740fa2f848b523dc8d35a945224 Mon Sep 17 00:00:00 2001 From: AstaFrode Date: Wed, 23 Aug 2023 10:18:13 +0800 Subject: [PATCH 2/2] update pois-service-api.proto --- pb/pois-service-api.pb.go | 68 +++++++++++++++++++-------------------- pb/pois-service-api.proto | 2 +- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/pb/pois-service-api.pb.go b/pb/pois-service-api.pb.go index 6fad5c1..b8caf70 100644 --- a/pb/pois-service-api.pb.go +++ b/pb/pois-service-api.pb.go @@ -353,7 +353,7 @@ type ResponseBatchVerify struct { unknownFields protoimpl.UnknownFields BatchVerifyResult bool `protobuf:"varint,1,opt,name=batch_verify_result,json=batchVerifyResult,proto3" json:"batch_verify_result,omitempty"` - TeePeerId []byte `protobuf:"bytes,2,opt,name=tee_peer_id,json=teePeerId,proto3" json:"tee_peer_id,omitempty"` + TeeAccountId []byte `protobuf:"bytes,2,opt,name=tee_account_id,json=teeAccountId,proto3" json:"tee_account_id,omitempty"` ServiceBloomFilter []uint64 `protobuf:"varint,3,rep,packed,name=service_bloom_filter,json=serviceBloomFilter,proto3" json:"service_bloom_filter,omitempty"` Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` } @@ -397,9 +397,9 @@ func (x *ResponseBatchVerify) GetBatchVerifyResult() bool { return false } -func (x *ResponseBatchVerify) GetTeePeerId() []byte { +func (x *ResponseBatchVerify) GetTeeAccountId() []byte { if x != nil { - return x.TeePeerId + return x.TeeAccountId } return nil } @@ -660,41 +660,41 @@ var file_pois_service_api_proto_rawDesc = []byte{ 0x6d, 0x65, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x75, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x75, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x75, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x75, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x67, 0x6d, 0x61, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x69, 0x67, 0x6d, 0x61, 0x22, 0xb5, 0x01, 0x0a, 0x13, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x69, 0x67, 0x6d, 0x61, 0x22, 0xbb, 0x01, 0x0a, 0x13, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x61, 0x74, 0x63, 0x68, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x12, 0x2e, 0x0a, 0x13, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x62, 0x61, 0x74, 0x63, 0x68, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x52, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x12, 0x1e, 0x0a, 0x0b, 0x74, 0x65, 0x65, 0x5f, 0x70, 0x65, 0x65, 0x72, 0x5f, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x74, 0x65, 0x65, 0x50, 0x65, 0x65, - 0x72, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x14, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x62, - 0x6c, 0x6f, 0x6f, 0x6d, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x03, 0x28, - 0x04, 0x52, 0x12, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x6c, 0x6f, 0x6f, 0x6d, 0x46, - 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, - 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, - 0x75, 0x72, 0x65, 0x2a, 0xa1, 0x01, 0x0a, 0x0a, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, - 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, - 0x0e, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, - 0x16, 0x0a, 0x11, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, - 0x74, 0x65, 0x72, 0x73, 0x10, 0x91, 0x4e, 0x12, 0x10, 0x0a, 0x0b, 0x49, 0x6e, 0x76, 0x61, 0x6c, - 0x69, 0x64, 0x50, 0x61, 0x74, 0x68, 0x10, 0x92, 0x4e, 0x12, 0x12, 0x0a, 0x0d, 0x49, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x93, 0x4e, 0x12, 0x10, 0x0a, - 0x0b, 0x4f, 0x75, 0x74, 0x4f, 0x66, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x10, 0x94, 0x4e, 0x12, - 0x13, 0x0a, 0x0e, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x45, 0x72, 0x72, 0x6f, - 0x72, 0x10, 0x95, 0x4e, 0x12, 0x11, 0x0a, 0x0c, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x45, - 0x72, 0x72, 0x6f, 0x72, 0x10, 0x96, 0x4e, 0x32, 0xad, 0x01, 0x0a, 0x08, 0x50, 0x6f, 0x64, 0x72, - 0x32, 0x41, 0x70, 0x69, 0x12, 0x48, 0x0a, 0x0f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, - 0x67, 0x65, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x18, 0x2e, 0x70, 0x6f, 0x64, 0x72, 0x32, 0x2e, - 0x61, 0x70, 0x69, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x47, 0x65, 0x6e, 0x54, 0x61, - 0x67, 0x1a, 0x19, 0x2e, 0x70, 0x6f, 0x64, 0x72, 0x32, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x47, 0x65, 0x6e, 0x54, 0x61, 0x67, 0x22, 0x00, 0x12, 0x57, - 0x0a, 0x14, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, - 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x12, 0x1d, 0x2e, 0x70, 0x6f, 0x64, 0x72, 0x32, 0x2e, 0x61, - 0x70, 0x69, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x56, - 0x65, 0x72, 0x69, 0x66, 0x79, 0x1a, 0x1e, 0x2e, 0x70, 0x6f, 0x64, 0x72, 0x32, 0x2e, 0x61, 0x70, - 0x69, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x61, 0x74, 0x63, 0x68, 0x56, - 0x65, 0x72, 0x69, 0x66, 0x79, 0x22, 0x00, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x2f, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x6c, 0x74, 0x12, 0x24, 0x0a, 0x0e, 0x74, 0x65, 0x65, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x74, 0x65, 0x65, + 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x14, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x6f, 0x6d, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, + 0x72, 0x18, 0x03, 0x20, 0x03, 0x28, 0x04, 0x52, 0x12, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x42, 0x6c, 0x6f, 0x6f, 0x6d, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x73, + 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, + 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x2a, 0xa1, 0x01, 0x0a, 0x0a, 0x53, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, + 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, + 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x10, 0x91, 0x4e, 0x12, 0x10, 0x0a, + 0x0b, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x50, 0x61, 0x74, 0x68, 0x10, 0x92, 0x4e, 0x12, + 0x12, 0x0a, 0x0d, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x45, 0x72, 0x72, 0x6f, 0x72, + 0x10, 0x93, 0x4e, 0x12, 0x10, 0x0a, 0x0b, 0x4f, 0x75, 0x74, 0x4f, 0x66, 0x4d, 0x65, 0x6d, 0x6f, + 0x72, 0x79, 0x10, 0x94, 0x4e, 0x12, 0x13, 0x0a, 0x0e, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, + 0x68, 0x6d, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x95, 0x4e, 0x12, 0x11, 0x0a, 0x0c, 0x55, 0x6e, + 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x96, 0x4e, 0x32, 0xad, 0x01, + 0x0a, 0x08, 0x50, 0x6f, 0x64, 0x72, 0x32, 0x41, 0x70, 0x69, 0x12, 0x48, 0x0a, 0x0f, 0x72, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x67, 0x65, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x18, 0x2e, + 0x70, 0x6f, 0x64, 0x72, 0x32, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x47, 0x65, 0x6e, 0x54, 0x61, 0x67, 0x1a, 0x19, 0x2e, 0x70, 0x6f, 0x64, 0x72, 0x32, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x47, 0x65, 0x6e, 0x54, + 0x61, 0x67, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x14, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, + 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x12, 0x1d, 0x2e, 0x70, + 0x6f, 0x64, 0x72, 0x32, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x42, 0x61, 0x74, 0x63, 0x68, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x1a, 0x1e, 0x2e, 0x70, 0x6f, + 0x64, 0x72, 0x32, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x42, 0x61, 0x74, 0x63, 0x68, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x22, 0x00, 0x42, 0x07, 0x5a, + 0x05, 0x2e, 0x2f, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/pois-service-api.proto b/pb/pois-service-api.proto index 2fc5605..00d8c50 100644 --- a/pb/pois-service-api.proto +++ b/pb/pois-service-api.proto @@ -54,7 +54,7 @@ message RequestBatchVerify { message ResponseBatchVerify { bool batch_verify_result = 1; - bytes tee_peer_id = 2; + bytes tee_account_id = 2; repeated uint64 service_bloom_filter = 3; bytes signature = 4; }