diff --git a/gossip/privdata/pull.go b/gossip/privdata/pull.go index c7a1f11746e..e375ea71cc3 100644 --- a/gossip/privdata/pull.go +++ b/gossip/privdata/pull.go @@ -35,7 +35,7 @@ const ( type PrivateDataRetriever interface { // CollectionRWSet returns the bytes of CollectionPvtReadWriteSet for a given txID and collection from the transient store - CollectionRWSet(txID, collection string) []util.PrivateRWSet + CollectionRWSet(txID, collection, namespace string) []util.PrivateRWSet } // gossip defines capabilities that the gossip module gives the Coordinator @@ -130,6 +130,7 @@ func (p *puller) createResponse(message proto.ReceivedMessage) []*proto.PvtDataE Channel: p.channel, Collection: dig.Collection, TxId: dig.TxId, + Namespace: dig.Namespace, }) if pol == nil { logger.Debug("No policy found for channel", p.channel, ", collection", dig.Collection, "txID", dig.TxId, "skipping...") @@ -148,7 +149,7 @@ func (p *puller) createResponse(message proto.ReceivedMessage) []*proto.PvtDataE } // TODO: dig in the ledger if it's not in the transient store // Else, it's eligible to receive the private data, so we append it to the returned slice - rwSets := p.CollectionRWSet(dig.TxId, dig.Collection) + rwSets := p.CollectionRWSet(dig.TxId, dig.Collection, dig.Namespace) logger.Debug("Found", len(rwSets), "for TxID", dig.TxId, ", collection", dig.Collection, "for", message.GetConnectionInfo().Endpoint) if len(rwSets) == 0 { continue @@ -353,6 +354,7 @@ func (p *puller) computeFilters(req *proto.RemotePvtDataRequest) (digestToFilter Channel: p.channel, TxId: digest.TxId, Collection: digest.Collection, + Namespace: digest.Namespace, }) if pol == nil { return nil, errors.Errorf("Failed obtaining policy for channel %s, txID %s, collection %s", p.channel, digest.TxId, digest.Collection) diff --git a/gossip/privdata/pull_test.go b/gossip/privdata/pull_test.go index c0d4addecf4..2ad97dfac5a 100644 --- a/gossip/privdata/pull_test.go +++ b/gossip/privdata/pull_test.go @@ -96,8 +96,8 @@ type dataRetrieverMock struct { mock.Mock } -func (dr *dataRetrieverMock) CollectionRWSet(txID, collection string) []util.PrivateRWSet { - return dr.Called(txID, collection).Get(0).([]util.PrivateRWSet) +func (dr *dataRetrieverMock) CollectionRWSet(txID, collection, namespace string) []util.PrivateRWSet { + return dr.Called(txID, collection, namespace).Get(0).([]util.PrivateRWSet) } type receivedMsg struct { @@ -225,15 +225,15 @@ func TestPullerFromOnly1Peer(t *testing.T) { p2TransientStore := newPRWSet() policyStore = newPolicyStore().withPolicy("col1").thatMapsTo("p1") p2 := gn.newPuller("p2", policyStore) - p2.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1").Return(p2TransientStore) + p2.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1", "ns1").Return(p2TransientStore) p3 := gn.newPuller("p3", newPolicyStore()) - p3.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1").Run(func(_ mock.Arguments) { + p3.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1", "ns1").Run(func(_ mock.Arguments) { t.Fatal("p3 shouldn't have been selected for pull") }) fetchedMessages, err := p1.fetch(&proto.RemotePvtDataRequest{ - Digests: []*proto.PvtDataDigest{{Collection: "col1", TxId: "txID1"}}, + Digests: []*proto.PvtDataDigest{{Collection: "col1", TxId: "txID1", Namespace: "ns1"}}, }) rws1 := util.PrivateRWSet(fetchedMessages[0].Payload[0]) rws2 := util.PrivateRWSet(fetchedMessages[0].Payload[1]) @@ -252,15 +252,15 @@ func TestPullerDataNotAvailable(t *testing.T) { policyStore = newPolicyStore().withPolicy("col1").thatMapsTo("p1") p2 := gn.newPuller("p2", policyStore) - p2.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1").Return([]util.PrivateRWSet{}) + p2.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1", "ns1").Return([]util.PrivateRWSet{}) p3 := gn.newPuller("p3", newPolicyStore()) - p3.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1").Run(func(_ mock.Arguments) { + p3.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1", "ns1").Run(func(_ mock.Arguments) { t.Fatal("p3 shouldn't have been selected for pull") }) fetchedMessages, err := p1.fetch(&proto.RemotePvtDataRequest{ - Digests: []*proto.PvtDataDigest{{Collection: "col1", TxId: "txID1"}}, + Digests: []*proto.PvtDataDigest{{Collection: "col1", TxId: "txID1", Namespace: "ns1"}}, }) assert.Empty(t, fetchedMessages) assert.NoError(t, err) @@ -273,7 +273,7 @@ func TestPullerNoPeersKnown(t *testing.T) { policyStore := newPolicyStore().withPolicy("col1").thatMapsTo("p2").withPolicy("col1").thatMapsTo("p3") p1 := gn.newPuller("p1", policyStore) fetchedMessages, err := p1.fetch(&proto.RemotePvtDataRequest{ - Digests: []*proto.PvtDataDigest{{Collection: "col1", TxId: "txID1"}}, + Digests: []*proto.PvtDataDigest{{Collection: "col1", TxId: "txID1", Namespace: "ns1"}}, }) assert.Empty(t, fetchedMessages) assert.Error(t, err) @@ -288,7 +288,7 @@ func TestPullPeerFilterError(t *testing.T) { p1 := gn.newPuller("p1", policyStore) gn.peers[0].On("PeerFilter", mock.Anything, mock.Anything).Return(nil, errors.New("Failed obtaining filter")) fetchedMessages, err := p1.fetch(&proto.RemotePvtDataRequest{ - Digests: []*proto.PvtDataDigest{{Collection: "col1", TxId: "txID1"}}, + Digests: []*proto.PvtDataDigest{{Collection: "col1", TxId: "txID1", Namespace: "ns1"}}, }) assert.Error(t, err) assert.Contains(t, err.Error(), "Failed obtaining filter") @@ -305,13 +305,13 @@ func TestPullerPeerNotEligible(t *testing.T) { policyStore = newPolicyStore().withPolicy("col1").thatMapsTo("p2") p2 := gn.newPuller("p2", policyStore) - p2.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1").Run(func(_ mock.Arguments) { + p2.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1", "ns1").Run(func(_ mock.Arguments) { t.Fatal("p2 shouldn't have approved the pull") }) policyStore = newPolicyStore().withPolicy("col1").thatMapsTo("p3") p3 := gn.newPuller("p3", policyStore) - p3.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1").Run(func(_ mock.Arguments) { + p3.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1", "ns1").Run(func(_ mock.Arguments) { t.Fatal("p3 shouldn't have approved the pull") }) @@ -334,15 +334,17 @@ func TestPullerDifferentPeersDifferentCollections(t *testing.T) { p2TransientStore := newPRWSet() policyStore = newPolicyStore().withPolicy("col2").thatMapsTo("p1") p2 := gn.newPuller("p2", policyStore) - p2.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col2").Return(p2TransientStore) + p2.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col2", "ns1").Return(p2TransientStore) p3TransientStore := newPRWSet() policyStore = newPolicyStore().withPolicy("col3").thatMapsTo("p1") p3 := gn.newPuller("p3", policyStore) - p3.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col3").Return(p3TransientStore) + p3.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col3", "ns1").Return(p3TransientStore) fetchedMessages, err := p1.fetch(&proto.RemotePvtDataRequest{ - Digests: []*proto.PvtDataDigest{{Collection: "col2", TxId: "txID1"}, {Collection: "col3", TxId: "txID1"}}, + Digests: []*proto.PvtDataDigest{ + {Collection: "col2", TxId: "txID1", Namespace: "ns1"}, + {Collection: "col3", TxId: "txID1", Namespace: "ns1"}}, }) assert.NoError(t, err) rws1 := util.PrivateRWSet(fetchedMessages[0].Payload[0]) @@ -373,26 +375,26 @@ func TestPullerRetries(t *testing.T) { // p2 policyStore = newPolicyStore().withPolicy("col1").thatMapsTo("p2") p2 := gn.newPuller("p2", policyStore) - p2.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1").Return(transientStore) + p2.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1", "ns1").Return(transientStore) // p3 policyStore = newPolicyStore().withPolicy("col1").thatMapsTo("p1") p3 := gn.newPuller("p3", policyStore) - p3.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1").Return(transientStore) + p3.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1", "ns1").Return(transientStore) // p4 policyStore = newPolicyStore().withPolicy("col1").thatMapsTo("p4") p4 := gn.newPuller("p4", policyStore) - p4.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1").Return(transientStore) + p4.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1", "ns1").Return(transientStore) // p5 policyStore = newPolicyStore().withPolicy("col1").thatMapsTo("p5") p5 := gn.newPuller("p5", policyStore) - p5.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1").Return(transientStore) + p5.PrivateDataRetriever.(*dataRetrieverMock).On("CollectionRWSet", "txID1", "col1", "ns1").Return(transientStore) // Fetch from someone fetchedMessages, err := p1.fetch(&proto.RemotePvtDataRequest{ - Digests: []*proto.PvtDataDigest{{Collection: "col1", TxId: "txID1"}}, + Digests: []*proto.PvtDataDigest{{Collection: "col1", TxId: "txID1", Namespace: "ns1"}}, }) assert.NoError(t, err) rws1 := util.PrivateRWSet(fetchedMessages[0].Payload[0]) diff --git a/protos/gossip/message.pb.go b/protos/gossip/message.pb.go index de40af94dce..254ddc89227 100644 --- a/protos/gossip/message.pb.go +++ b/protos/gossip/message.pb.go @@ -1602,9 +1602,10 @@ func (m *RemotePvtDataRequest) GetDigests() []*PvtDataDigest { // PvtDataDigest defines a digest of private data type PvtDataDigest struct { TxId string `protobuf:"bytes,1,opt,name=tx_id,json=txId" json:"tx_id,omitempty"` - Collection string `protobuf:"bytes,2,opt,name=collection" json:"collection,omitempty"` - BlockSeq uint64 `protobuf:"varint,3,opt,name=block_seq,json=blockSeq" json:"block_seq,omitempty"` - SeqInBlock uint64 `protobuf:"varint,4,opt,name=seq_in_block,json=seqInBlock" json:"seq_in_block,omitempty"` + Namespace string `protobuf:"bytes,2,opt,name=namespace" json:"namespace,omitempty"` + Collection string `protobuf:"bytes,3,opt,name=collection" json:"collection,omitempty"` + BlockSeq uint64 `protobuf:"varint,4,opt,name=block_seq,json=blockSeq" json:"block_seq,omitempty"` + SeqInBlock uint64 `protobuf:"varint,5,opt,name=seq_in_block,json=seqInBlock" json:"seq_in_block,omitempty"` } func (m *PvtDataDigest) Reset() { *m = PvtDataDigest{} } @@ -1619,6 +1620,13 @@ func (m *PvtDataDigest) GetTxId() string { return "" } +func (m *PvtDataDigest) GetNamespace() string { + if m != nil { + return m.Namespace + } + return "" +} + func (m *PvtDataDigest) GetCollection() string { if m != nil { return m.Collection @@ -1908,108 +1916,110 @@ var _Gossip_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gossip/message.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1644 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x18, 0xdb, 0x6e, 0xe3, 0xc6, - 0x55, 0xb2, 0x75, 0xe3, 0xd1, 0xc5, 0xf2, 0xd8, 0xbb, 0xcb, 0x3a, 0x69, 0xea, 0x12, 0xdd, 0x64, - 0x5b, 0x27, 0x76, 0xe0, 0xb4, 0x68, 0x80, 0xb4, 0x0d, 0x6c, 0x4b, 0xb5, 0x84, 0xac, 0xb4, 0x2e, - 0xed, 0x45, 0xeb, 0xa2, 0x00, 0x31, 0x26, 0xc7, 0x14, 0x6b, 0x72, 0x48, 0x73, 0x46, 0xae, 0xfd, - 0x58, 0xf4, 0xad, 0x2f, 0xfd, 0xab, 0x7e, 0x57, 0x31, 0x33, 0xbc, 0x9a, 0x52, 0x80, 0x5d, 0xa0, - 0x6f, 0x3a, 0xf7, 0x39, 0xf7, 0x43, 0xc1, 0xae, 0x1b, 0x32, 0xe6, 0x45, 0x47, 0x01, 0x61, 0x0c, - 0xbb, 0xe4, 0x30, 0x8a, 0x43, 0x1e, 0xa2, 0x96, 0xc2, 0x1a, 0xff, 0xaa, 0x43, 0x67, 0x4c, 0x1f, - 0x88, 0x1f, 0x46, 0x04, 0xe9, 0xd0, 0x8e, 0xf0, 0x93, 0x1f, 0x62, 0x47, 0xaf, 0xef, 0xd7, 0xdf, - 0xf4, 0xcc, 0x14, 0x44, 0x9f, 0x82, 0xc6, 0x3c, 0x97, 0x62, 0xbe, 0x8c, 0x89, 0xbe, 0x21, 0x69, - 0x39, 0x02, 0x7d, 0x0f, 0x5b, 0x8c, 0xd8, 0x31, 0xe1, 0x16, 0x49, 0x54, 0xe9, 0x9b, 0xfb, 0xf5, - 0x37, 0xdd, 0xe3, 0x97, 0x87, 0xca, 0xcc, 0xe1, 0xa5, 0x24, 0xa7, 0x86, 0xcc, 0x01, 0x2b, 0xc1, - 0xc6, 0x04, 0x06, 0x65, 0x8e, 0x8f, 0x7d, 0x8a, 0x71, 0x02, 0x2d, 0xa5, 0x09, 0x7d, 0x09, 0x43, - 0x8f, 0x72, 0x12, 0x53, 0xec, 0x8f, 0xa9, 0x13, 0x85, 0x1e, 0xe5, 0x52, 0x95, 0x36, 0xa9, 0x99, - 0x15, 0xca, 0xa9, 0x06, 0x6d, 0x3b, 0xa4, 0x9c, 0x50, 0x6e, 0xfc, 0x17, 0xa0, 0x7f, 0x2e, 0x9f, - 0x3d, 0x53, 0x21, 0x43, 0xbb, 0xd0, 0xa4, 0x21, 0xb5, 0x89, 0x94, 0x6f, 0x98, 0x0a, 0x10, 0x4f, - 0xb4, 0x17, 0x98, 0x52, 0xe2, 0x27, 0xcf, 0x48, 0x41, 0x74, 0x00, 0x9b, 0x1c, 0xbb, 0x32, 0x06, - 0x83, 0xe3, 0x9f, 0xa4, 0x31, 0x28, 0xe9, 0x3c, 0xbc, 0xc2, 0xae, 0x29, 0xb8, 0xd0, 0x37, 0xa0, - 0x61, 0xdf, 0x7b, 0x20, 0x56, 0xc0, 0x5c, 0xbd, 0x29, 0xc3, 0xb6, 0x9b, 0x8a, 0x9c, 0x08, 0x42, - 0x22, 0x31, 0xa9, 0x99, 0x1d, 0xc9, 0x38, 0x63, 0x2e, 0xfa, 0x35, 0xb4, 0x03, 0x12, 0x58, 0x31, - 0xb9, 0xd7, 0x5b, 0x52, 0x24, 0xb3, 0x32, 0x23, 0xc1, 0x0d, 0x89, 0xd9, 0xc2, 0x8b, 0x4c, 0x72, - 0xbf, 0x24, 0x8c, 0x4f, 0x6a, 0x66, 0x2b, 0x20, 0x81, 0x49, 0xee, 0xd1, 0x6f, 0x52, 0x29, 0xa6, - 0xb7, 0xa5, 0xd4, 0xde, 0x2a, 0x29, 0x16, 0x85, 0x94, 0x91, 0x4c, 0x8c, 0xa1, 0xaf, 0xa1, 0xe3, - 0x60, 0x8e, 0xe5, 0x03, 0x3b, 0x52, 0x6e, 0x27, 0x95, 0x1b, 0x61, 0x8e, 0xf3, 0xf7, 0xb5, 0x05, - 0x9b, 0x78, 0xde, 0x01, 0x34, 0x17, 0xc4, 0xf7, 0x43, 0x5d, 0x2b, 0xb3, 0xab, 0x10, 0x4c, 0x04, - 0x69, 0x52, 0x33, 0x15, 0x0f, 0x3a, 0x4a, 0xd4, 0x3b, 0x9e, 0xab, 0x83, 0xe4, 0x47, 0x45, 0xf5, - 0x23, 0xcf, 0x55, 0x5e, 0x48, 0xed, 0x23, 0xcf, 0xcd, 0xde, 0x23, 0xbc, 0xef, 0x56, 0xdf, 0x93, - 0xfb, 0x2d, 0x25, 0x94, 0xe3, 0x5d, 0x29, 0xb1, 0x8c, 0x1c, 0xcc, 0x89, 0xde, 0xab, 0x5a, 0x79, - 0x2f, 0x29, 0x93, 0x9a, 0x09, 0x4e, 0x06, 0xa1, 0xd7, 0xd0, 0x24, 0x41, 0xc4, 0x9f, 0xf4, 0xbe, - 0x14, 0xe8, 0xa7, 0x02, 0x63, 0x81, 0x14, 0x0e, 0x48, 0x2a, 0x3a, 0x80, 0x86, 0x1d, 0x52, 0xaa, - 0x0f, 0x24, 0xd7, 0x8b, 0x94, 0xeb, 0x2c, 0xa4, 0x74, 0xcc, 0x38, 0xbe, 0xf1, 0x3d, 0xb6, 0x98, - 0xd4, 0x4c, 0xc9, 0x84, 0x8e, 0x01, 0x18, 0xc7, 0x9c, 0x58, 0x1e, 0xbd, 0x0d, 0xf5, 0x2d, 0x29, - 0xb2, 0x9d, 0xb5, 0x89, 0xa0, 0x4c, 0xe9, 0xad, 0x88, 0x8e, 0xc6, 0x52, 0x00, 0x9d, 0xc2, 0x40, - 0xc9, 0x30, 0x8a, 0x23, 0xb6, 0x08, 0xb9, 0x3e, 0x2c, 0x27, 0x3d, 0x93, 0xbb, 0x4c, 0x18, 0x26, - 0x35, 0xb3, 0x2f, 0x45, 0x52, 0x04, 0x9a, 0xc1, 0x4e, 0x6e, 0xd7, 0x8a, 0x96, 0xbe, 0x2f, 0xe3, - 0xb7, 0x2d, 0x15, 0x7d, 0x5a, 0x51, 0x74, 0xb1, 0xf4, 0xfd, 0x3c, 0x90, 0x43, 0xf6, 0x0c, 0x8f, - 0x4e, 0x40, 0xe9, 0x17, 0x4a, 0x04, 0x93, 0x8e, 0xca, 0x05, 0x65, 0x92, 0x20, 0xe4, 0x44, 0xaa, - 0xcb, 0xd5, 0xf4, 0x58, 0x01, 0x46, 0xa3, 0xd4, 0xab, 0x38, 0x29, 0x39, 0x7d, 0x47, 0xea, 0xf8, - 0x64, 0xa5, 0x8e, 0xac, 0x2a, 0xfb, 0xac, 0x88, 0x10, 0xb1, 0xf1, 0x09, 0x76, 0x54, 0xf1, 0xca, - 0x12, 0xdd, 0x2d, 0xc7, 0xe6, 0x6d, 0x46, 0xcd, 0x0b, 0xb5, 0x9f, 0x8b, 0x88, 0x72, 0xfd, 0x0e, - 0xfa, 0x11, 0x21, 0xb1, 0xe5, 0x39, 0x84, 0x72, 0x8f, 0x3f, 0xe9, 0x2f, 0xca, 0x6d, 0x78, 0x41, - 0x48, 0x3c, 0x4d, 0x68, 0xc2, 0x8d, 0xa8, 0x00, 0x8b, 0x66, 0xc7, 0xf6, 0x9d, 0xfe, 0x52, 0x8a, - 0xbc, 0xca, 0x3a, 0xd7, 0xbe, 0xa3, 0xe1, 0x3f, 0x7c, 0xe2, 0xb8, 0x24, 0x20, 0x54, 0x38, 0x2f, - 0xb8, 0xd0, 0x1f, 0x00, 0xa2, 0xd8, 0x7b, 0x50, 0x51, 0xd0, 0x5f, 0x95, 0x83, 0xaf, 0xfc, 0xbd, - 0x78, 0xe0, 0xe5, 0x2a, 0x2e, 0x48, 0xa0, 0xef, 0x0b, 0xf2, 0x4c, 0xd7, 0xa5, 0xfc, 0x4f, 0xd7, - 0xc8, 0x67, 0x11, 0x2b, 0x88, 0x18, 0x16, 0x6c, 0x5e, 0x61, 0x17, 0xf5, 0x41, 0x7b, 0x3f, 0x1f, - 0x8d, 0xff, 0x38, 0x9d, 0x8f, 0x47, 0xc3, 0x1a, 0xd2, 0xa0, 0x39, 0x9e, 0x5d, 0x5c, 0x5d, 0x0f, - 0xeb, 0xa8, 0x07, 0x9d, 0x77, 0xe6, 0xb9, 0xf5, 0x6e, 0xfe, 0xf6, 0x7a, 0xb8, 0x21, 0xf8, 0xce, - 0x26, 0x27, 0x73, 0x05, 0x6e, 0xa2, 0x21, 0xf4, 0x24, 0x78, 0x32, 0x1f, 0x59, 0xef, 0xcc, 0xf3, - 0x61, 0x03, 0x6d, 0x41, 0x57, 0x31, 0x98, 0x12, 0xd1, 0x2c, 0x0e, 0xd2, 0xff, 0xd4, 0x41, 0xcb, - 0x0a, 0x0a, 0xed, 0x41, 0x27, 0x20, 0x1c, 0x8b, 0xf6, 0x4a, 0x46, 0x7a, 0x06, 0xa3, 0x43, 0xd0, - 0xb8, 0x17, 0x10, 0xc6, 0x71, 0x10, 0xc9, 0x61, 0xda, 0x3d, 0x1e, 0x16, 0x83, 0x7f, 0xe5, 0x05, - 0xc4, 0xcc, 0x59, 0xd0, 0x0b, 0x68, 0x45, 0x77, 0x9e, 0xe5, 0x39, 0x72, 0xc6, 0xf6, 0xcc, 0x66, - 0x74, 0xe7, 0x4d, 0x1d, 0xf4, 0x33, 0xe8, 0x26, 0x23, 0xd8, 0x9a, 0x9d, 0x9c, 0xe9, 0x0d, 0x49, - 0x83, 0x04, 0x35, 0x3b, 0x39, 0x33, 0x4e, 0x60, 0xbb, 0xd2, 0x2a, 0xe8, 0x4b, 0xe8, 0x10, 0x5f, - 0x66, 0x89, 0xe9, 0xf5, 0xfd, 0xcd, 0xa2, 0xed, 0x6c, 0x61, 0x65, 0x1c, 0xc6, 0x6f, 0x61, 0x77, - 0x55, 0x93, 0x3c, 0xb7, 0x5d, 0xaf, 0xd8, 0xbe, 0x85, 0x7e, 0x69, 0x22, 0x14, 0x9c, 0xa8, 0x17, - 0x9d, 0xd8, 0x83, 0x4e, 0x56, 0x87, 0x6a, 0xaf, 0x64, 0x30, 0x32, 0xa0, 0xcf, 0x7d, 0x66, 0xd9, - 0x24, 0xe6, 0xd6, 0x02, 0xb3, 0x45, 0xe2, 0x7e, 0x97, 0xfb, 0xec, 0x8c, 0xc4, 0x7c, 0x82, 0xd9, - 0xc2, 0x78, 0x0f, 0xbd, 0x62, 0xbd, 0xae, 0x33, 0x83, 0xa0, 0x21, 0xd4, 0x24, 0x26, 0xe4, 0xef, - 0x52, 0x8a, 0x36, 0xcb, 0x29, 0x32, 0x02, 0xe8, 0x16, 0xca, 0x72, 0xfd, 0x4a, 0x74, 0xe4, 0xb8, - 0x66, 0xfa, 0xc6, 0xfe, 0xe6, 0x1b, 0xcd, 0x4c, 0x41, 0x74, 0x08, 0x9d, 0x80, 0xb9, 0x16, 0x7f, - 0x4a, 0x6e, 0x83, 0x41, 0x3e, 0xb3, 0x45, 0x14, 0x67, 0xcc, 0xbd, 0x7a, 0x8a, 0x88, 0xd9, 0x0e, - 0xd4, 0x0f, 0x23, 0x84, 0x6e, 0x61, 0x59, 0xac, 0x31, 0x57, 0x7c, 0xef, 0x46, 0xa5, 0xa4, 0x3e, - 0xcc, 0xe0, 0x23, 0x40, 0xbe, 0x07, 0xd6, 0xd8, 0xfb, 0x05, 0x34, 0x12, 0x5b, 0xab, 0xab, 0xa4, - 0xf1, 0x51, 0x96, 0x7d, 0x65, 0x59, 0xed, 0xb9, 0xff, 0x7b, 0x60, 0xbf, 0x55, 0x79, 0x4c, 0x4f, - 0x9b, 0x5f, 0x96, 0xef, 0xac, 0xee, 0xf1, 0x56, 0x26, 0xad, 0xd0, 0xd9, 0xe1, 0x65, 0x5c, 0x43, - 0x3b, 0xc1, 0xa1, 0x57, 0xd0, 0x66, 0xe4, 0xde, 0xa2, 0xcb, 0x20, 0x79, 0x66, 0x8b, 0x91, 0xfb, - 0xf9, 0x32, 0x10, 0x55, 0x55, 0xc8, 0x86, 0x8a, 0xc7, 0xcf, 0xa1, 0x97, 0x0c, 0x20, 0x2b, 0xa9, - 0xac, 0x4d, 0x51, 0xb3, 0x09, 0x4e, 0x3c, 0xc6, 0xf8, 0x1b, 0x0c, 0x2e, 0x14, 0x98, 0x5a, 0xf8, - 0x02, 0xb6, 0xec, 0xd0, 0xf7, 0x89, 0xcd, 0xbd, 0x90, 0x5a, 0x14, 0x07, 0x2a, 0x20, 0x9a, 0x39, - 0xc8, 0xd1, 0x73, 0x1c, 0x90, 0x8a, 0xf6, 0x8d, 0xaa, 0xf6, 0x7f, 0xd7, 0xa1, 0x57, 0xbc, 0xa4, - 0xd0, 0x21, 0x40, 0x90, 0x1d, 0x3c, 0x89, 0xdf, 0x83, 0xf2, 0x29, 0x64, 0x16, 0x38, 0x3e, 0x78, - 0x3c, 0x15, 0x5b, 0xb8, 0x51, 0x6e, 0x61, 0xe3, 0x9f, 0x75, 0xd8, 0xae, 0xac, 0xa4, 0x75, 0x4d, - 0xfa, 0xa1, 0x86, 0x5f, 0xc3, 0xc0, 0x63, 0x96, 0x43, 0x6c, 0x1f, 0xc7, 0x58, 0x84, 0x48, 0x96, - 0x44, 0xc7, 0xec, 0x7b, 0x6c, 0x94, 0x23, 0x8d, 0xdf, 0x41, 0x27, 0x95, 0x16, 0xa9, 0xf4, 0xa8, - 0x5d, 0x4c, 0xa5, 0x47, 0x6d, 0x91, 0xca, 0x42, 0x8e, 0x37, 0x8a, 0x39, 0x36, 0x6e, 0x61, 0xbb, - 0x72, 0x64, 0xa2, 0xef, 0x60, 0xc8, 0x88, 0x7f, 0x2b, 0xaf, 0x8b, 0x38, 0x50, 0xb6, 0xeb, 0xe5, - 0x07, 0x67, 0x6d, 0xb2, 0x25, 0x38, 0xa7, 0x39, 0xa3, 0xa8, 0x79, 0xb1, 0x2d, 0x69, 0x92, 0x3c, - 0x05, 0x18, 0x37, 0x80, 0xaa, 0x67, 0x29, 0xfa, 0x1c, 0x9a, 0xf2, 0x0a, 0x5e, 0x3b, 0xaa, 0x15, - 0x59, 0xf6, 0x2a, 0xc1, 0xce, 0x8f, 0xf4, 0x2a, 0xc1, 0x8e, 0xf1, 0x67, 0x68, 0x29, 0x1b, 0x22, - 0x67, 0xa4, 0xf4, 0x99, 0x60, 0x66, 0xf0, 0x8f, 0xce, 0x99, 0xd5, 0xab, 0xc8, 0x68, 0x43, 0x53, - 0x5e, 0x89, 0xc6, 0x5f, 0x00, 0x55, 0x6f, 0x21, 0x31, 0xc8, 0x19, 0xc7, 0x31, 0xb7, 0xca, 0x6d, - 0xd4, 0x95, 0xc8, 0x4b, 0xd5, 0x4b, 0x9f, 0x41, 0x97, 0x50, 0xc7, 0x2a, 0x27, 0x41, 0x23, 0xd4, - 0x51, 0x74, 0xe3, 0x14, 0x76, 0x56, 0x5c, 0x48, 0xe8, 0x00, 0x3a, 0x49, 0xc7, 0xa6, 0xeb, 0xac, - 0xd2, 0xd2, 0x19, 0x83, 0x71, 0x0e, 0xbb, 0xab, 0xae, 0x0e, 0x74, 0x94, 0xcf, 0x1b, 0xa5, 0x23, - 0xbb, 0x6a, 0x13, 0x46, 0x35, 0xad, 0xb2, 0x31, 0x24, 0xbe, 0x23, 0xfb, 0x25, 0x12, 0xda, 0x81, - 0x26, 0x7f, 0x4c, 0x2b, 0x5a, 0x33, 0x1b, 0xfc, 0x71, 0xea, 0xa0, 0xcf, 0x00, 0xf2, 0xfe, 0x95, - 0x2e, 0x69, 0x66, 0x01, 0x83, 0x3e, 0x01, 0xed, 0xc6, 0x0f, 0xed, 0x3b, 0xe1, 0xb5, 0x0c, 0x68, - 0xc3, 0xec, 0x48, 0xc4, 0x25, 0xb9, 0x47, 0xfb, 0xd0, 0x13, 0xc1, 0xf0, 0xa8, 0x25, 0x51, 0xb2, - 0xb5, 0x1a, 0x26, 0x30, 0x72, 0x3f, 0xa5, 0xa7, 0x02, 0x63, 0xfc, 0x00, 0x2f, 0x56, 0x1e, 0x41, - 0xe8, 0xb8, 0xb2, 0xe3, 0x5f, 0x3e, 0x73, 0x68, 0xac, 0xc8, 0x85, 0x4d, 0x7f, 0x0d, 0x83, 0x32, - 0x0d, 0x7d, 0x05, 0x2d, 0xe5, 0x6f, 0x52, 0xda, 0x6b, 0x82, 0x92, 0x30, 0x15, 0xbf, 0x61, 0x55, - 0x61, 0x67, 0xa3, 0xf4, 0x4f, 0x99, 0xea, 0x74, 0xde, 0xbd, 0x86, 0x2d, 0xfe, 0x68, 0x95, 0xdc, - 0x53, 0x25, 0xd1, 0xe3, 0x8f, 0x97, 0x99, 0x83, 0x65, 0x95, 0xc5, 0xcf, 0x62, 0xe3, 0x0b, 0xd8, - 0x7a, 0x76, 0x73, 0x8a, 0xb6, 0x22, 0x71, 0x1c, 0xc6, 0x49, 0x06, 0x14, 0xf0, 0xab, 0xdf, 0x43, - 0xb7, 0xb0, 0x18, 0x9e, 0x5f, 0x82, 0x7d, 0xd0, 0x4e, 0xdf, 0xbe, 0x3b, 0xfb, 0xc1, 0x9a, 0x5d, - 0x9e, 0x0f, 0xeb, 0xe2, 0xe0, 0x9b, 0x8e, 0xc6, 0xf3, 0xab, 0xe9, 0xd5, 0xb5, 0xc4, 0x6c, 0x1c, - 0xff, 0x1d, 0x5a, 0x6a, 0x31, 0xa3, 0x6f, 0xa1, 0xa7, 0x7e, 0x5d, 0xf2, 0x98, 0xe0, 0x00, 0x55, - 0x7a, 0x6c, 0xaf, 0x82, 0x31, 0x6a, 0x6f, 0xea, 0x5f, 0xd7, 0xd1, 0xe7, 0xd0, 0xb8, 0xf0, 0xa8, - 0x8b, 0xca, 0x1f, 0x54, 0x7b, 0x65, 0xd0, 0xa8, 0x9d, 0x7e, 0xf5, 0xd7, 0x03, 0xd7, 0xe3, 0x8b, - 0xe5, 0xcd, 0xa1, 0x1d, 0x06, 0x47, 0x8b, 0xa7, 0x88, 0xc4, 0xd2, 0xbb, 0xf8, 0xe8, 0x16, 0xdf, - 0xc4, 0x9e, 0x7d, 0x24, 0xff, 0xcb, 0x60, 0x47, 0x4a, 0xec, 0xa6, 0x25, 0xc1, 0x6f, 0xfe, 0x17, - 0x00, 0x00, 0xff, 0xff, 0x90, 0x9e, 0xb9, 0xc7, 0xf2, 0x10, 0x00, 0x00, + // 1666 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0xdd, 0x4f, 0xe4, 0xc8, + 0x11, 0x1f, 0xc3, 0x7c, 0xb9, 0xe6, 0x83, 0xa1, 0x61, 0x77, 0x1d, 0xee, 0x72, 0x21, 0x56, 0xf6, + 0x6e, 0x13, 0xee, 0xe0, 0xc4, 0x25, 0xca, 0x49, 0x97, 0xe4, 0x04, 0xcc, 0x84, 0x19, 0xdd, 0x0e, + 0x4b, 0x0c, 0xab, 0x84, 0x28, 0x92, 0xd5, 0xd8, 0x8d, 0xc7, 0xc1, 0x6e, 0x1b, 0x77, 0x43, 0xe0, + 0x31, 0xca, 0x5b, 0x5e, 0xf2, 0x37, 0xe4, 0x9f, 0xc9, 0xdf, 0x15, 0x75, 0xb7, 0x3f, 0xf1, 0xcc, + 0x49, 0x7b, 0xd2, 0xbd, 0x4d, 0x7d, 0xfc, 0xaa, 0xba, 0xaa, 0xab, 0xaa, 0xcb, 0x03, 0xdb, 0x5e, + 0xc4, 0x98, 0x1f, 0x1f, 0x84, 0x84, 0x31, 0xec, 0x91, 0xfd, 0x38, 0x89, 0x78, 0x84, 0xda, 0x8a, + 0x6b, 0xfe, 0x4b, 0x83, 0xee, 0x84, 0x3e, 0x90, 0x20, 0x8a, 0x09, 0x32, 0xa0, 0x13, 0xe3, 0xa7, + 0x20, 0xc2, 0xae, 0xa1, 0xed, 0x6a, 0x6f, 0xfa, 0x56, 0x46, 0xa2, 0x8f, 0x41, 0x67, 0xbe, 0x47, + 0x31, 0xbf, 0x4f, 0x88, 0xb1, 0x26, 0x65, 0x05, 0x03, 0x7d, 0x0b, 0x1b, 0x8c, 0x38, 0x09, 0xe1, + 0x36, 0x49, 0x4d, 0x19, 0xeb, 0xbb, 0xda, 0x9b, 0xde, 0xe1, 0xcb, 0x7d, 0xe5, 0x66, 0xff, 0x42, + 0x8a, 0x33, 0x47, 0xd6, 0x90, 0x55, 0x68, 0x73, 0x0a, 0xc3, 0xaa, 0xc6, 0x0f, 0x3d, 0x8a, 0x79, + 0x04, 0x6d, 0x65, 0x09, 0x7d, 0x0e, 0x23, 0x9f, 0x72, 0x92, 0x50, 0x1c, 0x4c, 0xa8, 0x1b, 0x47, + 0x3e, 0xe5, 0xd2, 0x94, 0x3e, 0x6d, 0x58, 0x35, 0xc9, 0xb1, 0x0e, 0x1d, 0x27, 0xa2, 0x9c, 0x50, + 0x6e, 0xfe, 0x0f, 0x60, 0x70, 0x2a, 0x8f, 0x3d, 0x57, 0x29, 0x43, 0xdb, 0xd0, 0xa2, 0x11, 0x75, + 0x88, 0xc4, 0x37, 0x2d, 0x45, 0x88, 0x23, 0x3a, 0x0b, 0x4c, 0x29, 0x09, 0xd2, 0x63, 0x64, 0x24, + 0xda, 0x83, 0x75, 0x8e, 0x3d, 0x99, 0x83, 0xe1, 0xe1, 0x4f, 0xb2, 0x1c, 0x54, 0x6c, 0xee, 0x5f, + 0x62, 0xcf, 0x12, 0x5a, 0xe8, 0x2b, 0xd0, 0x71, 0xe0, 0x3f, 0x10, 0x3b, 0x64, 0x9e, 0xd1, 0x92, + 0x69, 0xdb, 0xce, 0x20, 0x47, 0x42, 0x90, 0x22, 0xa6, 0x0d, 0xab, 0x2b, 0x15, 0xe7, 0xcc, 0x43, + 0xbf, 0x86, 0x4e, 0x48, 0x42, 0x3b, 0x21, 0x77, 0x46, 0x5b, 0x42, 0x72, 0x2f, 0x73, 0x12, 0x5e, + 0x93, 0x84, 0x2d, 0xfc, 0xd8, 0x22, 0x77, 0xf7, 0x84, 0xf1, 0x69, 0xc3, 0x6a, 0x87, 0x24, 0xb4, + 0xc8, 0x1d, 0xfa, 0x4d, 0x86, 0x62, 0x46, 0x47, 0xa2, 0x76, 0x96, 0xa1, 0x58, 0x1c, 0x51, 0x46, + 0x72, 0x18, 0x43, 0x5f, 0x42, 0xd7, 0xc5, 0x1c, 0xcb, 0x03, 0x76, 0x25, 0x6e, 0x2b, 0xc3, 0x8d, + 0x31, 0xc7, 0xc5, 0xf9, 0x3a, 0x42, 0x4d, 0x1c, 0x6f, 0x0f, 0x5a, 0x0b, 0x12, 0x04, 0x91, 0xa1, + 0x57, 0xd5, 0x55, 0x0a, 0xa6, 0x42, 0x34, 0x6d, 0x58, 0x4a, 0x07, 0x1d, 0xa4, 0xe6, 0x5d, 0xdf, + 0x33, 0x40, 0xea, 0xa3, 0xb2, 0xf9, 0xb1, 0xef, 0xa9, 0x28, 0xa4, 0xf5, 0xb1, 0xef, 0xe5, 0xe7, + 0x11, 0xd1, 0xf7, 0xea, 0xe7, 0x29, 0xe2, 0x96, 0x08, 0x15, 0x78, 0x4f, 0x22, 0xee, 0x63, 0x17, + 0x73, 0x62, 0xf4, 0xeb, 0x5e, 0xde, 0x4b, 0xc9, 0xb4, 0x61, 0x81, 0x9b, 0x53, 0xe8, 0x35, 0xb4, + 0x48, 0x18, 0xf3, 0x27, 0x63, 0x20, 0x01, 0x83, 0x0c, 0x30, 0x11, 0x4c, 0x11, 0x80, 0x94, 0xa2, + 0x3d, 0x68, 0x3a, 0x11, 0xa5, 0xc6, 0x50, 0x6a, 0xbd, 0xc8, 0xb4, 0x4e, 0x22, 0x4a, 0x27, 0x8c, + 0xe3, 0xeb, 0xc0, 0x67, 0x8b, 0x69, 0xc3, 0x92, 0x4a, 0xe8, 0x10, 0x80, 0x71, 0xcc, 0x89, 0xed, + 0xd3, 0x9b, 0xc8, 0xd8, 0x90, 0x90, 0xcd, 0xbc, 0x4d, 0x84, 0x64, 0x46, 0x6f, 0x44, 0x76, 0x74, + 0x96, 0x11, 0xe8, 0x18, 0x86, 0x0a, 0xc3, 0x28, 0x8e, 0xd9, 0x22, 0xe2, 0xc6, 0xa8, 0x7a, 0xe9, + 0x39, 0xee, 0x22, 0x55, 0x98, 0x36, 0xac, 0x81, 0x84, 0x64, 0x0c, 0x34, 0x87, 0xad, 0xc2, 0xaf, + 0x1d, 0xdf, 0x07, 0x81, 0xcc, 0xdf, 0xa6, 0x34, 0xf4, 0x71, 0xcd, 0xd0, 0xf9, 0x7d, 0x10, 0x14, + 0x89, 0x1c, 0xb1, 0x67, 0x7c, 0x74, 0x04, 0xca, 0xbe, 0x30, 0x22, 0x94, 0x0c, 0x54, 0x2d, 0x28, + 0x8b, 0x84, 0x11, 0x27, 0xd2, 0x5c, 0x61, 0xa6, 0xcf, 0x4a, 0x34, 0x1a, 0x67, 0x51, 0x25, 0x69, + 0xc9, 0x19, 0x5b, 0xd2, 0xc6, 0x47, 0x4b, 0x6d, 0xe4, 0x55, 0x39, 0x60, 0x65, 0x86, 0xc8, 0x4d, + 0x40, 0xb0, 0xab, 0x8a, 0x57, 0x96, 0xe8, 0x76, 0x35, 0x37, 0x6f, 0x73, 0x69, 0x51, 0xa8, 0x83, + 0x02, 0x22, 0xca, 0xf5, 0x1b, 0x18, 0xc4, 0x84, 0x24, 0xb6, 0xef, 0x12, 0xca, 0x7d, 0xfe, 0x64, + 0xbc, 0xa8, 0xb6, 0xe1, 0x39, 0x21, 0xc9, 0x2c, 0x95, 0x89, 0x30, 0xe2, 0x12, 0x2d, 0x9a, 0x1d, + 0x3b, 0xb7, 0xc6, 0x4b, 0x09, 0x79, 0x95, 0x77, 0xae, 0x73, 0x4b, 0xa3, 0x7f, 0x04, 0xc4, 0xf5, + 0x48, 0x48, 0xa8, 0x08, 0x5e, 0x68, 0xa1, 0x3f, 0x00, 0xc4, 0x89, 0xff, 0xa0, 0xb2, 0x60, 0xbc, + 0xaa, 0x26, 0x5f, 0xc5, 0x7b, 0xfe, 0xc0, 0xab, 0x55, 0x5c, 0x42, 0xa0, 0x6f, 0x4b, 0x78, 0x66, + 0x18, 0x12, 0xff, 0xd3, 0x15, 0xf8, 0x3c, 0x63, 0x25, 0x88, 0x69, 0xc3, 0xfa, 0x25, 0xf6, 0xd0, + 0x00, 0xf4, 0xf7, 0x67, 0xe3, 0xc9, 0x1f, 0x67, 0x67, 0x93, 0xf1, 0xa8, 0x81, 0x74, 0x68, 0x4d, + 0xe6, 0xe7, 0x97, 0x57, 0x23, 0x0d, 0xf5, 0xa1, 0xfb, 0xce, 0x3a, 0xb5, 0xdf, 0x9d, 0xbd, 0xbd, + 0x1a, 0xad, 0x09, 0xbd, 0x93, 0xe9, 0xd1, 0x99, 0x22, 0xd7, 0xd1, 0x08, 0xfa, 0x92, 0x3c, 0x3a, + 0x1b, 0xdb, 0xef, 0xac, 0xd3, 0x51, 0x13, 0x6d, 0x40, 0x4f, 0x29, 0x58, 0x92, 0xd1, 0x2a, 0x0f, + 0xd2, 0xff, 0x68, 0xa0, 0xe7, 0x05, 0x85, 0x76, 0xa0, 0x1b, 0x12, 0x8e, 0x45, 0x7b, 0xa5, 0x23, + 0x3d, 0xa7, 0xd1, 0x3e, 0xe8, 0xdc, 0x0f, 0x09, 0xe3, 0x38, 0x8c, 0xe5, 0x30, 0xed, 0x1d, 0x8e, + 0xca, 0xc9, 0xbf, 0xf4, 0x43, 0x62, 0x15, 0x2a, 0xe8, 0x05, 0xb4, 0xe3, 0x5b, 0xdf, 0xf6, 0x5d, + 0x39, 0x63, 0xfb, 0x56, 0x2b, 0xbe, 0xf5, 0x67, 0x2e, 0xfa, 0x19, 0xf4, 0xd2, 0x11, 0x6c, 0xcf, + 0x8f, 0x4e, 0x8c, 0xa6, 0x94, 0x41, 0xca, 0x9a, 0x1f, 0x9d, 0x98, 0x47, 0xb0, 0x59, 0x6b, 0x15, + 0xf4, 0x39, 0x74, 0x49, 0x20, 0x6f, 0x89, 0x19, 0xda, 0xee, 0x7a, 0xd9, 0x77, 0xfe, 0x60, 0xe5, + 0x1a, 0xe6, 0x6f, 0x61, 0x7b, 0x59, 0x93, 0x3c, 0xf7, 0xad, 0xd5, 0x7c, 0xdf, 0xc0, 0xa0, 0x32, + 0x11, 0x4a, 0x41, 0x68, 0xe5, 0x20, 0x76, 0xa0, 0x9b, 0xd7, 0xa1, 0x7a, 0x57, 0x72, 0x1a, 0x99, + 0x30, 0xe0, 0x01, 0xb3, 0x1d, 0x92, 0x70, 0x7b, 0x81, 0xd9, 0x22, 0x0d, 0xbf, 0xc7, 0x03, 0x76, + 0x42, 0x12, 0x3e, 0xc5, 0x6c, 0x61, 0xbe, 0x87, 0x7e, 0xb9, 0x5e, 0x57, 0xb9, 0x41, 0xd0, 0x14, + 0x66, 0x52, 0x17, 0xf2, 0x77, 0xe5, 0x8a, 0xd6, 0xab, 0x57, 0x64, 0x86, 0xd0, 0x2b, 0x95, 0xe5, + 0xea, 0x27, 0xd1, 0x95, 0xe3, 0x9a, 0x19, 0x6b, 0xbb, 0xeb, 0x6f, 0x74, 0x2b, 0x23, 0xd1, 0x3e, + 0x74, 0x43, 0xe6, 0xd9, 0xfc, 0x29, 0xdd, 0x0d, 0x86, 0xc5, 0xcc, 0x16, 0x59, 0x9c, 0x33, 0xef, + 0xf2, 0x29, 0x26, 0x56, 0x27, 0x54, 0x3f, 0xcc, 0x08, 0x7a, 0xa5, 0xc7, 0x62, 0x85, 0xbb, 0xf2, + 0x79, 0xd7, 0x6a, 0x25, 0xf5, 0x61, 0x0e, 0x1f, 0x01, 0x8a, 0x77, 0x60, 0x85, 0xbf, 0x5f, 0x40, + 0x33, 0xf5, 0xb5, 0xbc, 0x4a, 0x9a, 0x3f, 0xc8, 0x73, 0xa0, 0x3c, 0xab, 0x77, 0xee, 0x47, 0x4f, + 0xec, 0xd7, 0xea, 0x1e, 0xb3, 0xd5, 0xe6, 0x97, 0xd5, 0x3d, 0xab, 0x77, 0xb8, 0x91, 0xa3, 0x15, + 0x3b, 0x5f, 0xbc, 0xcc, 0x2b, 0xe8, 0xa4, 0x3c, 0xf4, 0x0a, 0x3a, 0x8c, 0xdc, 0xd9, 0xf4, 0x3e, + 0x4c, 0x8f, 0xd9, 0x66, 0xe4, 0xee, 0xec, 0x3e, 0x14, 0x55, 0x55, 0xba, 0x0d, 0x95, 0x8f, 0x9f, + 0x43, 0x3f, 0x1d, 0x40, 0x76, 0x5a, 0x59, 0xeb, 0xa2, 0x66, 0x53, 0x9e, 0x38, 0x8c, 0xf9, 0x37, + 0x18, 0x9e, 0x2b, 0x32, 0xf3, 0xf0, 0x19, 0x6c, 0x38, 0x51, 0x10, 0x10, 0x87, 0xfb, 0x11, 0xb5, + 0x29, 0x0e, 0x55, 0x42, 0x74, 0x6b, 0x58, 0xb0, 0xcf, 0x70, 0x48, 0x6a, 0xd6, 0xd7, 0xea, 0xd6, + 0xff, 0xad, 0x41, 0xbf, 0xbc, 0x49, 0xa1, 0x7d, 0x80, 0x30, 0x5f, 0x78, 0xd2, 0xb8, 0x87, 0xd5, + 0x55, 0xc8, 0x2a, 0x69, 0x7c, 0xf0, 0x78, 0x2a, 0xb7, 0x70, 0xb3, 0xda, 0xc2, 0xe6, 0x3f, 0x35, + 0xd8, 0xac, 0x3d, 0x49, 0xab, 0x9a, 0xf4, 0x43, 0x1d, 0xbf, 0x86, 0xa1, 0xcf, 0x6c, 0x97, 0x38, + 0x01, 0x4e, 0xb0, 0x48, 0x91, 0x2c, 0x89, 0xae, 0x35, 0xf0, 0xd9, 0xb8, 0x60, 0x9a, 0xbf, 0x83, + 0x6e, 0x86, 0x16, 0x57, 0xe9, 0x53, 0xa7, 0x7c, 0x95, 0x3e, 0x75, 0xc4, 0x55, 0x96, 0xee, 0x78, + 0xad, 0x7c, 0xc7, 0xe6, 0x0d, 0x6c, 0xd6, 0x96, 0x4c, 0xf4, 0x0d, 0x8c, 0x18, 0x09, 0x6e, 0xe4, + 0x76, 0x91, 0x84, 0xca, 0xb7, 0x56, 0x3d, 0x70, 0xde, 0x26, 0x1b, 0x42, 0x73, 0x56, 0x28, 0x8a, + 0x9a, 0x17, 0xaf, 0x25, 0x4d, 0x2f, 0x4f, 0x11, 0xe6, 0x35, 0xa0, 0xfa, 0x5a, 0x8a, 0x3e, 0x85, + 0x96, 0xdc, 0x82, 0x57, 0x8e, 0x6a, 0x25, 0x96, 0xbd, 0x4a, 0xb0, 0xfb, 0x3d, 0xbd, 0x4a, 0xb0, + 0x6b, 0xfe, 0x19, 0xda, 0xca, 0x87, 0xb8, 0x33, 0x52, 0xf9, 0x4c, 0xb0, 0x72, 0xfa, 0x7b, 0xe7, + 0xcc, 0xf2, 0xa7, 0xc8, 0xec, 0x40, 0x4b, 0x6e, 0x89, 0xe6, 0x5f, 0x00, 0xd5, 0x77, 0x21, 0x31, + 0xc8, 0x19, 0xc7, 0x09, 0xb7, 0xab, 0x6d, 0xd4, 0x93, 0xcc, 0x0b, 0xd5, 0x4b, 0x9f, 0x40, 0x8f, + 0x50, 0xd7, 0xae, 0x5e, 0x82, 0x4e, 0xa8, 0xab, 0xe4, 0xe6, 0x31, 0x6c, 0x2d, 0xd9, 0x90, 0xd0, + 0x1e, 0x74, 0xd3, 0x8e, 0xcd, 0x9e, 0xb3, 0x5a, 0x4b, 0xe7, 0x0a, 0xe6, 0x29, 0x6c, 0x2f, 0xdb, + 0x3a, 0xd0, 0x41, 0x31, 0x6f, 0x94, 0x8d, 0x7c, 0xab, 0x4d, 0x15, 0xd5, 0xb4, 0xca, 0xc7, 0x90, + 0xf9, 0x5f, 0x0d, 0x06, 0x15, 0x11, 0xda, 0x82, 0x16, 0x7f, 0xcc, 0x2a, 0x5a, 0xb7, 0x9a, 0xfc, + 0x71, 0x26, 0x3f, 0xde, 0x44, 0x2f, 0xb3, 0x18, 0x3b, 0xea, 0xe3, 0x4d, 0xb7, 0x0a, 0x06, 0xfa, + 0x04, 0xa0, 0xe8, 0x6e, 0x99, 0x4f, 0xdd, 0x2a, 0x71, 0xd0, 0x47, 0xa0, 0x5f, 0x07, 0x91, 0x73, + 0x2b, 0x72, 0x22, 0x1b, 0xab, 0x69, 0x75, 0x25, 0xe3, 0x82, 0xdc, 0xa1, 0x5d, 0xe8, 0x8b, 0x54, + 0xf9, 0xd4, 0x96, 0x2c, 0xf9, 0x29, 0xd5, 0xb4, 0x80, 0x91, 0xbb, 0x19, 0x3d, 0x16, 0x1c, 0xf3, + 0x3b, 0x78, 0xb1, 0x74, 0x45, 0x42, 0x87, 0xb5, 0x0d, 0xe0, 0xe5, 0xb3, 0x70, 0x27, 0x4a, 0x5c, + 0xda, 0x03, 0xae, 0x60, 0x58, 0x95, 0xa1, 0x2f, 0xa0, 0xad, 0xb2, 0x91, 0x16, 0xfe, 0x8a, 0x94, + 0xa5, 0x4a, 0xe5, 0x2f, 0x5c, 0x55, 0xf6, 0xf9, 0xa0, 0xfd, 0x53, 0x6e, 0x3a, 0x9b, 0x86, 0xaf, + 0x61, 0x83, 0x3f, 0xda, 0x95, 0xf0, 0x54, 0xc1, 0xf4, 0xf9, 0xe3, 0x45, 0x1e, 0x60, 0xd5, 0x64, + 0xf9, 0xa3, 0xd9, 0xfc, 0x0c, 0x36, 0x9e, 0x6d, 0xa4, 0xa2, 0xe9, 0x48, 0x92, 0x44, 0x49, 0x7a, + 0x3f, 0x8a, 0xf8, 0xd5, 0xef, 0xa1, 0x57, 0x7a, 0x36, 0x9e, 0xef, 0x89, 0x03, 0xd0, 0x8f, 0xdf, + 0xbe, 0x3b, 0xf9, 0xce, 0x9e, 0x5f, 0x9c, 0x8e, 0x34, 0xb1, 0x0e, 0xce, 0xc6, 0x93, 0xb3, 0xcb, + 0xd9, 0xe5, 0x95, 0xe4, 0xac, 0x1d, 0xfe, 0x1d, 0xda, 0xea, 0xd9, 0x46, 0x5f, 0x43, 0x5f, 0xfd, + 0xba, 0xe0, 0x09, 0xc1, 0x21, 0xaa, 0x75, 0xe0, 0x4e, 0x8d, 0x63, 0x36, 0xde, 0x68, 0x5f, 0x6a, + 0xe8, 0x53, 0x68, 0x9e, 0xfb, 0xd4, 0x43, 0xd5, 0xcf, 0xad, 0x9d, 0x2a, 0x69, 0x36, 0x8e, 0xbf, + 0xf8, 0xeb, 0x9e, 0xe7, 0xf3, 0xc5, 0xfd, 0xf5, 0xbe, 0x13, 0x85, 0x07, 0x8b, 0xa7, 0x98, 0x24, + 0x32, 0xba, 0xe4, 0xe0, 0x06, 0x5f, 0x27, 0xbe, 0x73, 0x20, 0xff, 0xe9, 0x60, 0x07, 0x0a, 0x76, + 0xdd, 0x96, 0xe4, 0x57, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xe4, 0xe6, 0xef, 0x9c, 0x10, 0x11, + 0x00, 0x00, } diff --git a/protos/gossip/message.proto b/protos/gossip/message.proto index 95de32868e7..6cf49b9aa74 100644 --- a/protos/gossip/message.proto +++ b/protos/gossip/message.proto @@ -310,9 +310,10 @@ message RemotePvtDataRequest { // PvtDataDigest defines a digest of private data message PvtDataDigest { string tx_id = 1; - string collection = 2; - uint64 block_seq = 3; - uint64 seq_in_block = 4; + string namespace = 2; + string collection = 3; + uint64 block_seq = 4; + uint64 seq_in_block = 5; } // RemotePrivateData message to response on private diff --git a/protos/ledger/rwset/rwset.pb.go b/protos/ledger/rwset/rwset.pb.go index 5e5bf50f078..3d55d5b06d1 100644 --- a/protos/ledger/rwset/rwset.pb.go +++ b/protos/ledger/rwset/rwset.pb.go @@ -225,6 +225,7 @@ type CollectionCriteria struct { Channel string `protobuf:"bytes,1,opt,name=channel" json:"channel,omitempty"` TxId string `protobuf:"bytes,2,opt,name=tx_id,json=txId" json:"tx_id,omitempty"` Collection string `protobuf:"bytes,3,opt,name=collection" json:"collection,omitempty"` + Namespace string `protobuf:"bytes,4,opt,name=namespace" json:"namespace,omitempty"` } func (m *CollectionCriteria) Reset() { *m = CollectionCriteria{} } @@ -253,6 +254,13 @@ func (m *CollectionCriteria) GetCollection() string { return "" } +func (m *CollectionCriteria) GetNamespace() string { + if m != nil { + return m.Namespace + } + return "" +} + func init() { proto.RegisterType((*TxReadWriteSet)(nil), "rwset.TxReadWriteSet") proto.RegisterType((*NsReadWriteSet)(nil), "rwset.NsReadWriteSet") @@ -267,35 +275,35 @@ func init() { func init() { proto.RegisterFile("ledger/rwset/rwset.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 466 bytes of a gzipped FileDescriptorProto + // 473 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x6f, 0xd3, 0x30, - 0x14, 0xc6, 0x2b, 0xdd, 0xc8, 0x5b, 0x15, 0x98, 0xb7, 0x89, 0x20, 0x4d, 0x50, 0x0a, 0x12, 0x15, - 0x87, 0x04, 0xc6, 0x8d, 0x03, 0x07, 0xc6, 0x01, 0x84, 0x98, 0x90, 0x99, 0x40, 0x1a, 0x87, 0xc8, - 0xb5, 0x4d, 0x13, 0xa9, 0x75, 0x22, 0xdb, 0x94, 0xf2, 0x07, 0x70, 0x86, 0x1b, 0x67, 0xfe, 0x53, - 0xd4, 0xe7, 0xb4, 0xf9, 0x31, 0x7e, 0x1d, 0xb8, 0x44, 0xf1, 0xf3, 0xf7, 0xbd, 0xef, 0xf3, 0xfb, - 0xe2, 0x40, 0x34, 0x53, 0x72, 0xaa, 0x4c, 0x62, 0x3e, 0x59, 0xe5, 0xfc, 0x33, 0x2e, 0x4d, 0xe1, - 0x0a, 0xda, 0xc7, 0xc5, 0xe8, 0x3b, 0x81, 0xf0, 0x6c, 0xc9, 0x14, 0x97, 0xef, 0x4c, 0xee, 0xd4, - 0x1b, 0xe5, 0xe8, 0x13, 0x00, 0xc9, 0x1d, 0x4f, 0xe7, 0x85, 0x54, 0xb3, 0x88, 0x0c, 0xc9, 0x38, - 0x3c, 0xbe, 0x15, 0x7b, 0x6e, 0x1b, 0x1a, 0x3f, 0xe3, 0x8e, 0xbf, 0x5a, 0xc1, 0x58, 0x20, 0xd7, - 0xaf, 0xf4, 0x01, 0x5c, 0xd1, 0x36, 0x45, 0x7c, 0xb4, 0x35, 0xec, 0x8d, 0x77, 0x8f, 0x0f, 0x2b, - 0xf6, 0xa9, 0x6d, 0xb2, 0xd9, 0x8e, 0xb6, 0x0c, 0x4d, 0xec, 0x43, 0xb0, 0xe9, 0x44, 0xb7, 0x61, - 0xeb, 0xe5, 0xdb, 0x6b, 0x97, 0x46, 0x3f, 0x08, 0x84, 0x6d, 0x02, 0x3d, 0x82, 0x40, 0xf3, 0xb9, - 0xb2, 0x25, 0x17, 0x0a, 0x8d, 0x05, 0xac, 0x2e, 0xd0, 0x03, 0xe8, 0xaf, 0x45, 0xc9, 0x78, 0xc0, - 0xfc, 0x82, 0xbe, 0x87, 0xeb, 0xa2, 0x98, 0xcd, 0x94, 0x70, 0x79, 0xa1, 0xd3, 0x8c, 0xdb, 0x4c, - 0xc9, 0xca, 0x5c, 0x0f, 0xcd, 0xdd, 0xa9, 0xcc, 0x9d, 0x6c, 0x50, 0xcf, 0x11, 0xd4, 0xb2, 0x7a, - 0x28, 0xba, 0xbb, 0x68, 0xfc, 0x1b, 0x81, 0xa3, 0x3f, 0xf1, 0xe8, 0x3d, 0xb8, 0xda, 0x50, 0x5f, - 0x79, 0xad, 0x7c, 0x87, 0x75, 0xf9, 0x94, 0xcf, 0x15, 0xbd, 0x0d, 0x83, 0x96, 0x37, 0x7f, 0x86, - 0xdd, 0xac, 0x16, 0xa3, 0x77, 0x21, 0x2c, 0x17, 0xce, 0xef, 0xe3, 0x41, 0xa2, 0x1e, 0x82, 0x06, - 0xe5, 0xc2, 0x21, 0x62, 0xa5, 0x3f, 0xfa, 0x4a, 0x60, 0xef, 0x6c, 0xf9, 0x7a, 0xe1, 0xfe, 0x6b, - 0xa6, 0x8f, 0x61, 0xa0, 0x6d, 0xba, 0x91, 0xaf, 0x72, 0x8d, 0x36, 0xb9, 0x76, 0xf4, 0x18, 0x68, - 0x2c, 0xe1, 0x90, 0xbe, 0x10, 0xd8, 0xbb, 0x80, 0xf8, 0x4b, 0x96, 0x0c, 0x0e, 0x1a, 0x73, 0xeb, - 0xea, 0x0e, 0x2f, 0x44, 0xd6, 0xd5, 0xa7, 0xa2, 0xb5, 0x85, 0x3e, 0xce, 0xe1, 0xc6, 0x6f, 0x09, - 0xff, 0x1e, 0xd4, 0x2f, 0xbf, 0xb2, 0x91, 0x00, 0x5a, 0xf7, 0x3e, 0x59, 0x35, 0x35, 0x39, 0xa7, - 0x11, 0xec, 0x88, 0x8c, 0x6b, 0x5d, 0x8d, 0x3c, 0x60, 0xeb, 0x25, 0xdd, 0x87, 0xbe, 0x5b, 0xa6, - 0xb9, 0xc4, 0x2e, 0x01, 0xbb, 0xec, 0x96, 0x2f, 0x24, 0xbd, 0x09, 0x50, 0x8b, 0x61, 0xb8, 0x01, - 0x6b, 0x54, 0x9e, 0xa6, 0x70, 0xbf, 0x30, 0xd3, 0x38, 0xfb, 0x5c, 0x2a, 0xe3, 0xef, 0x75, 0xfc, - 0x81, 0x4f, 0x4c, 0x2e, 0xfc, 0x95, 0xb6, 0x71, 0x55, 0x44, 0x4b, 0xe7, 0x0f, 0xa7, 0xb9, 0xcb, - 0x3e, 0x4e, 0x62, 0x51, 0xcc, 0x93, 0x06, 0x25, 0xf1, 0x94, 0xc4, 0x53, 0x92, 0xe6, 0xff, 0x61, - 0xb2, 0x8d, 0xc5, 0x47, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xae, 0xa7, 0x5f, 0x87, 0x36, 0x04, - 0x00, 0x00, + 0x14, 0xc6, 0xeb, 0xba, 0x91, 0xb7, 0x2a, 0x30, 0x6f, 0x13, 0x41, 0x9a, 0xa0, 0x14, 0x24, 0x2a, + 0x0e, 0x09, 0x8c, 0x1b, 0x07, 0x0e, 0x8c, 0x03, 0x08, 0x31, 0x21, 0x33, 0x81, 0x34, 0x0e, 0x91, + 0x1b, 0x9b, 0x26, 0x52, 0xeb, 0x44, 0xb6, 0x29, 0xe5, 0xc8, 0x81, 0x33, 0xdc, 0x38, 0xf3, 0x9f, + 0xa2, 0x3e, 0xa7, 0xf9, 0x55, 0x7e, 0x1d, 0xb8, 0x44, 0xf1, 0xf3, 0xf7, 0xbd, 0xef, 0xf3, 0xfb, + 0xe2, 0x40, 0x30, 0x93, 0x62, 0x2a, 0x75, 0xa4, 0x3f, 0x1a, 0x69, 0xdd, 0x33, 0x2c, 0x74, 0x6e, + 0x73, 0xda, 0xc7, 0xc5, 0xe8, 0x3b, 0x01, 0xff, 0x7c, 0xc9, 0x24, 0x17, 0x6f, 0x75, 0x66, 0xe5, + 0x6b, 0x69, 0xe9, 0x63, 0x00, 0xc1, 0x2d, 0x8f, 0xe7, 0xb9, 0x90, 0xb3, 0x80, 0x0c, 0xc9, 0xd8, + 0x3f, 0xb9, 0x19, 0x3a, 0x6e, 0x1b, 0x1a, 0x3e, 0xe5, 0x96, 0xbf, 0x5c, 0xc1, 0x98, 0x27, 0xd6, + 0xaf, 0xf4, 0x3e, 0x5c, 0x56, 0x26, 0x46, 0x7c, 0xb0, 0x35, 0xec, 0x8d, 0xf7, 0x4e, 0x8e, 0x4a, + 0xf6, 0x99, 0x69, 0xb2, 0xd9, 0xae, 0x32, 0x0c, 0x4d, 0x1c, 0x80, 0x57, 0x75, 0xa2, 0x3b, 0xb0, + 0xf5, 0xe2, 0xcd, 0xd5, 0x4b, 0xa3, 0x1f, 0x04, 0xfc, 0x36, 0x81, 0x1e, 0x83, 0xa7, 0xf8, 0x5c, + 0x9a, 0x82, 0x27, 0x12, 0x8d, 0x79, 0xac, 0x2e, 0xd0, 0x43, 0xe8, 0xaf, 0x45, 0xc9, 0x78, 0xc0, + 0xdc, 0x82, 0xbe, 0x83, 0x6b, 0x49, 0x3e, 0x9b, 0xc9, 0xc4, 0x66, 0xb9, 0x8a, 0x53, 0x6e, 0x52, + 0x29, 0x4a, 0x73, 0x3d, 0x34, 0x77, 0xbb, 0x34, 0x77, 0x5a, 0xa1, 0x9e, 0x21, 0xa8, 0x65, 0xf5, + 0x28, 0xe9, 0xee, 0xa2, 0xf1, 0x6f, 0x04, 0x8e, 0xff, 0xc4, 0xa3, 0x77, 0xe1, 0x4a, 0x43, 0x7d, + 0xe5, 0xb5, 0xf4, 0xed, 0xd7, 0xe5, 0x33, 0x3e, 0x97, 0xf4, 0x16, 0x0c, 0x5a, 0xde, 0xdc, 0x19, + 0xf6, 0xd2, 0x5a, 0x8c, 0xde, 0x01, 0xbf, 0x58, 0x58, 0xb7, 0x8f, 0x07, 0x09, 0x7a, 0x08, 0x1a, + 0x14, 0x0b, 0x8b, 0x88, 0x95, 0xfe, 0xe8, 0x2b, 0x81, 0xfd, 0xf3, 0xe5, 0xab, 0x85, 0xfd, 0xaf, + 0x99, 0x3e, 0x82, 0x81, 0x32, 0x71, 0x25, 0x5f, 0xe6, 0x1a, 0x54, 0xb9, 0x76, 0xf4, 0x18, 0x28, + 0x2c, 0xe1, 0x90, 0xbe, 0x10, 0xd8, 0xdf, 0x40, 0xfc, 0x25, 0x4b, 0x06, 0x87, 0x8d, 0xb9, 0x75, + 0x75, 0x87, 0x1b, 0x91, 0x75, 0xf5, 0x69, 0xd2, 0xda, 0x42, 0x1f, 0x17, 0x70, 0xfd, 0xb7, 0x84, + 0x7f, 0x0f, 0xea, 0x97, 0x5f, 0xd9, 0xe8, 0x33, 0x01, 0x5a, 0x37, 0x3f, 0x5d, 0x75, 0xd5, 0x19, + 0xa7, 0x01, 0xec, 0x26, 0x29, 0x57, 0xaa, 0x9c, 0xb9, 0xc7, 0xd6, 0x4b, 0x7a, 0x00, 0x7d, 0xbb, + 0x8c, 0x33, 0x81, 0x6d, 0x3c, 0xb6, 0x6d, 0x97, 0xcf, 0x05, 0xbd, 0x01, 0x50, 0xab, 0x61, 0xba, + 0x1e, 0x6b, 0x54, 0xda, 0x33, 0xdb, 0xee, 0xcc, 0xec, 0x49, 0x0c, 0xf7, 0x72, 0x3d, 0x0d, 0xd3, + 0x4f, 0x85, 0xd4, 0xee, 0xda, 0x87, 0xef, 0xf9, 0x44, 0x67, 0x89, 0xbb, 0xf1, 0x26, 0x2c, 0x8b, + 0xe8, 0xf8, 0xe2, 0xc1, 0x34, 0xb3, 0xe9, 0x87, 0x49, 0x98, 0xe4, 0xf3, 0xa8, 0x41, 0x89, 0x1c, + 0x25, 0x72, 0x94, 0xa8, 0xf9, 0xfb, 0x98, 0xec, 0x60, 0xf1, 0xe1, 0xcf, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xb4, 0x20, 0xc0, 0xca, 0x55, 0x04, 0x00, 0x00, } diff --git a/protos/ledger/rwset/rwset.proto b/protos/ledger/rwset/rwset.proto index cc2fc4b271e..e09024650ff 100644 --- a/protos/ledger/rwset/rwset.proto +++ b/protos/ledger/rwset/rwset.proto @@ -70,4 +70,5 @@ message CollectionCriteria { string channel = 1; string tx_id = 2; string collection = 3; + string namespace = 4; } \ No newline at end of file