From cdecb52c64225290a4fe08e4963107f9774dc485 Mon Sep 17 00:00:00 2001 From: Jason Yellick Date: Fri, 3 Feb 2017 11:08:47 -0500 Subject: [PATCH] [FAB-2027] Proto style fixes https://jira.hyperledger.org/browse/FAB-2027 Per https://jira.hyperledger.org/browse/FAB-2026 the proto style in fabric is inconsistent and violates accepted proto style guidelines. This CR makes the non-golang code invasive proto changes to conform with the style guide. In particular, protoc converts lower_underscore_separated to LowerUnderscoreSeparated which means that most of our existing fields can be normalized to the official proto style with no code changes. This does not fix fields which contained upper case abbreviations particularly fields ending in 'ID' like txID which must become tx_id and will be translated to TxId. This does not fix the enum fields which by proto style should be UPPER_CASE as this will also require code changes. Change-Id: Id32d6caba43be9e1c6b1f638be284071bf52f0fd Signed-off-by: Jason Yellick --- protos/common/common.pb.go | 132 +++++++++++----------- protos/common/common.proto | 26 ++--- protos/common/configtx.pb.go | 95 ++++++++-------- protos/common/configtx.proto | 13 ++- protos/common/msp_principal.pb.go | 50 +++++---- protos/common/msp_principal.proto | 15 +-- protos/common/policies.pb.go | 64 +++++------ protos/common/policies.proto | 12 +- protos/msp/mspconfig.pb.go | 72 ++++++------ protos/msp/mspconfig.proto | 24 ++-- protos/peer/admin.pb.go | 59 +++++----- protos/peer/admin.proto | 8 +- protos/peer/chaincode.pb.go | 167 ++++++++++++++-------------- protos/peer/chaincode.proto | 32 +++--- protos/peer/chaincodeevent.pb.go | 20 ++-- protos/peer/chaincodeevent.proto | 6 +- protos/peer/configuration.pb.go | 34 +++--- protos/peer/configuration.proto | 8 +- protos/peer/events.pb.go | 88 ++++++++------- protos/peer/events.proto | 12 +- protos/peer/peer.proto | 4 +- protos/peer/proposal.pb.go | 55 ++++----- protos/peer/proposal.proto | 10 +- protos/peer/proposal_response.pb.go | 48 ++++---- protos/peer/proposal_response.proto | 2 +- protos/peer/transaction.pb.go | 71 ++++++------ protos/peer/transaction.proto | 7 +- 27 files changed, 574 insertions(+), 560 deletions(-) diff --git a/protos/common/common.pb.go b/protos/common/common.pb.go index cbc64de4c1b..fb28f764ea4 100644 --- a/protos/common/common.pb.go +++ b/protos/common/common.pb.go @@ -194,7 +194,7 @@ func (m *Metadata) GetSignatures() []*MetadataSignature { } type MetadataSignature struct { - SignatureHeader []byte `protobuf:"bytes,1,opt,name=signatureHeader,proto3" json:"signatureHeader,omitempty"` + SignatureHeader []byte `protobuf:"bytes,1,opt,name=signature_header,json=signatureHeader,proto3" json:"signature_header,omitempty"` Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` } @@ -204,8 +204,8 @@ func (*MetadataSignature) ProtoMessage() {} func (*MetadataSignature) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } type Header struct { - ChainHeader *ChainHeader `protobuf:"bytes,1,opt,name=chainHeader" json:"chainHeader,omitempty"` - SignatureHeader *SignatureHeader `protobuf:"bytes,2,opt,name=signatureHeader" json:"signatureHeader,omitempty"` + ChainHeader *ChainHeader `protobuf:"bytes,1,opt,name=chain_header,json=chainHeader" json:"chain_header,omitempty"` + SignatureHeader *SignatureHeader `protobuf:"bytes,2,opt,name=signature_header,json=signatureHeader" json:"signature_header,omitempty"` } func (m *Header) Reset() { *m = Header{} } @@ -318,9 +318,9 @@ func (*Envelope) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} // in the BlockHeader. This makes it natural and obvious that the Data is included in the hash, but // the Metadata is not. type Block struct { - Header *BlockHeader `protobuf:"bytes,1,opt,name=Header" json:"Header,omitempty"` - Data *BlockData `protobuf:"bytes,2,opt,name=Data" json:"Data,omitempty"` - Metadata *BlockMetadata `protobuf:"bytes,3,opt,name=Metadata" json:"Metadata,omitempty"` + Header *BlockHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` + Data *BlockData `protobuf:"bytes,2,opt,name=data" json:"data,omitempty"` + Metadata *BlockMetadata `protobuf:"bytes,3,opt,name=metadata" json:"metadata,omitempty"` } func (m *Block) Reset() { *m = Block{} } @@ -353,9 +353,9 @@ func (m *Block) GetMetadata() *BlockMetadata { // The block header is hashed using the configured chain hashing algorithm // over the ASN.1 encoding of the BlockHeader type BlockHeader struct { - Number uint64 `protobuf:"varint,1,opt,name=Number" json:"Number,omitempty"` - PreviousHash []byte `protobuf:"bytes,2,opt,name=PreviousHash,proto3" json:"PreviousHash,omitempty"` - DataHash []byte `protobuf:"bytes,3,opt,name=DataHash,proto3" json:"DataHash,omitempty"` + Number uint64 `protobuf:"varint,1,opt,name=number" json:"number,omitempty"` + PreviousHash []byte `protobuf:"bytes,2,opt,name=previous_hash,json=previousHash,proto3" json:"previous_hash,omitempty"` + DataHash []byte `protobuf:"bytes,3,opt,name=data_hash,json=dataHash,proto3" json:"data_hash,omitempty"` } func (m *BlockHeader) Reset() { *m = BlockHeader{} } @@ -364,7 +364,7 @@ func (*BlockHeader) ProtoMessage() {} func (*BlockHeader) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } type BlockData struct { - Data [][]byte `protobuf:"bytes,1,rep,name=Data,proto3" json:"Data,omitempty"` + Data [][]byte `protobuf:"bytes,1,rep,name=data,proto3" json:"data,omitempty"` } func (m *BlockData) Reset() { *m = BlockData{} } @@ -373,7 +373,7 @@ func (*BlockData) ProtoMessage() {} func (*BlockData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } type BlockMetadata struct { - Metadata [][]byte `protobuf:"bytes,1,rep,name=Metadata,proto3" json:"Metadata,omitempty"` + Metadata [][]byte `protobuf:"bytes,1,rep,name=metadata,proto3" json:"metadata,omitempty"` } func (m *BlockMetadata) Reset() { *m = BlockMetadata{} } @@ -402,60 +402,60 @@ func init() { func init() { proto.RegisterFile("common/common.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 865 bytes of a gzipped FileDescriptorProto + // 876 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x55, 0xdd, 0x6e, 0xe3, 0x44, - 0x14, 0xae, 0xe3, 0xfc, 0x34, 0x27, 0xa5, 0xeb, 0x4e, 0xb7, 0xbb, 0xde, 0x8a, 0xd5, 0x56, 0x96, - 0x40, 0x55, 0x2b, 0x12, 0x51, 0x84, 0x04, 0x97, 0x4e, 0x3c, 0xe9, 0x5a, 0x9b, 0xda, 0xcb, 0x8c, - 0xb3, 0x08, 0x7a, 0x61, 0x39, 0xc9, 0x34, 0xb1, 0x48, 0xec, 0xc8, 0x76, 0xaa, 0xf6, 0x96, 0x07, - 0x40, 0x48, 0x70, 0x85, 0xc4, 0x0b, 0xf0, 0x24, 0xbc, 0x01, 0x2f, 0x82, 0xc4, 0x2d, 0x9a, 0xb1, - 0xc7, 0x8d, 0xdb, 0x8b, 0xbd, 0xea, 0x7c, 0xe7, 0xfb, 0xe6, 0x9c, 0xef, 0x9c, 0x33, 0xa9, 0xe1, - 0x70, 0x1a, 0xaf, 0x56, 0x71, 0xd4, 0xcb, 0xff, 0x74, 0xd7, 0x49, 0x9c, 0xc5, 0xa8, 0x99, 0xa3, - 0xe3, 0x37, 0xf3, 0x38, 0x9e, 0x2f, 0x59, 0x4f, 0x44, 0x27, 0x9b, 0x9b, 0x5e, 0x16, 0xae, 0x58, - 0x9a, 0x05, 0xab, 0x75, 0x2e, 0x34, 0x0c, 0x80, 0x51, 0x90, 0x66, 0x83, 0x38, 0xba, 0x09, 0xe7, - 0xe8, 0x39, 0x34, 0xc2, 0x68, 0xc6, 0xee, 0x74, 0xe5, 0x44, 0x39, 0xad, 0x93, 0x1c, 0x18, 0xd7, - 0xb0, 0x7b, 0xc5, 0xb2, 0x60, 0x16, 0x64, 0x01, 0x57, 0xdc, 0x06, 0xcb, 0x0d, 0x13, 0x8a, 0x3d, - 0x92, 0x03, 0xf4, 0x2d, 0x40, 0x1a, 0xce, 0xa3, 0x20, 0xdb, 0x24, 0x2c, 0xd5, 0x6b, 0x27, 0xea, - 0x69, 0xe7, 0xe2, 0x55, 0xb7, 0x70, 0x24, 0xef, 0x52, 0xa9, 0x20, 0x5b, 0x62, 0xe3, 0x1a, 0x0e, - 0x9e, 0x08, 0xd0, 0x29, 0x3c, 0x2b, 0x25, 0x6f, 0x59, 0x30, 0x63, 0x49, 0x51, 0xef, 0x71, 0x18, - 0x7d, 0x0a, 0xed, 0x32, 0xa4, 0xd7, 0x84, 0xe6, 0x21, 0x60, 0xfc, 0xac, 0x40, 0xb3, 0x10, 0x7e, - 0x0d, 0x9d, 0xe9, 0x22, 0x08, 0xa3, 0xad, 0x74, 0x9d, 0x8b, 0x43, 0xe9, 0x71, 0xf0, 0x40, 0x91, - 0x6d, 0x1d, 0x32, 0x9f, 0x3a, 0xa9, 0x89, 0xab, 0x2f, 0xe5, 0x55, 0x5a, 0xa5, 0x9f, 0x58, 0x34, - 0xfe, 0x51, 0xa0, 0xb3, 0x95, 0x1f, 0x21, 0xa8, 0x67, 0xf7, 0xeb, 0x7c, 0x82, 0x0d, 0x22, 0xce, - 0x48, 0x87, 0xd6, 0x2d, 0x4b, 0xd2, 0x30, 0x8e, 0x44, 0xfa, 0x06, 0x91, 0x10, 0x7d, 0x03, 0xed, - 0x72, 0x67, 0xba, 0x2a, 0x4a, 0x1f, 0x77, 0xf3, 0xad, 0x76, 0xe5, 0x56, 0xbb, 0x9e, 0x54, 0x90, - 0x07, 0x31, 0xcf, 0x29, 0x3a, 0xb1, 0x2d, 0xbd, 0x7e, 0xa2, 0x9c, 0xb6, 0x89, 0x84, 0xc2, 0xc1, - 0x9d, 0x6d, 0xe9, 0x0d, 0x11, 0x16, 0x67, 0xbe, 0x58, 0xb6, 0x8e, 0xa7, 0x0b, 0xbd, 0x99, 0xaf, - 0x5e, 0x00, 0x3e, 0x5e, 0x76, 0x97, 0xb1, 0x48, 0x38, 0x6b, 0xe5, 0xe3, 0x2d, 0x03, 0x86, 0x09, - 0xcf, 0x1e, 0x75, 0x2f, 0x8a, 0x26, 0x2c, 0xc8, 0x62, 0xb9, 0x31, 0x09, 0x79, 0x81, 0x28, 0x8e, - 0xa6, 0x72, 0x4b, 0x39, 0x30, 0x30, 0xb4, 0xde, 0x07, 0xf7, 0xcb, 0x38, 0x98, 0xa1, 0xcf, 0xa1, - 0xb9, 0xd8, 0x5e, 0xce, 0xbe, 0x9c, 0x70, 0x31, 0xd8, 0x82, 0xe5, 0xee, 0xf9, 0x6b, 0x29, 0xf2, - 0x88, 0xb3, 0xd1, 0x87, 0x5d, 0x1c, 0xdd, 0xb2, 0x65, 0x9c, 0xcf, 0x72, 0x9d, 0xa7, 0x94, 0x16, - 0x0a, 0xf8, 0x91, 0xc7, 0xf2, 0x8b, 0x02, 0x8d, 0xfe, 0x32, 0x9e, 0xfe, 0x84, 0xce, 0xe5, 0xab, - 0x79, 0xfc, 0x4c, 0x04, 0x2d, 0xed, 0x14, 0x1d, 0x7f, 0x06, 0x75, 0x4b, 0xda, 0xe9, 0x5c, 0x1c, - 0x54, 0xa4, 0x9c, 0x20, 0x82, 0x46, 0x5f, 0x3e, 0xfc, 0x88, 0x8a, 0x35, 0x1e, 0x55, 0xa4, 0x92, - 0x24, 0xa5, 0xcc, 0x60, 0xd0, 0xd9, 0x2a, 0x88, 0x5e, 0x40, 0xd3, 0xd9, 0xac, 0x26, 0x85, 0xab, - 0x3a, 0x29, 0x10, 0x32, 0x60, 0xef, 0x7d, 0xc2, 0x6e, 0xc3, 0x78, 0x93, 0xbe, 0x0d, 0xd2, 0x45, - 0xd1, 0x58, 0x25, 0x86, 0x8e, 0x61, 0x97, 0xbb, 0x10, 0xbc, 0x2a, 0xf8, 0x12, 0x1b, 0x6f, 0xa0, - 0x5d, 0x9a, 0xe5, 0xc3, 0x15, 0xdd, 0x28, 0x27, 0x2a, 0x1f, 0x2e, 0x3f, 0x1b, 0xe7, 0xf0, 0x49, - 0xc5, 0x22, 0xcf, 0x56, 0xf6, 0x92, 0x0b, 0x4b, 0x7c, 0xf6, 0x97, 0x02, 0x4d, 0x9a, 0x05, 0xd9, - 0x26, 0x45, 0x1d, 0x68, 0x8d, 0x9d, 0x77, 0x8e, 0xfb, 0xbd, 0xa3, 0xed, 0xa0, 0x3d, 0x68, 0xd1, - 0xf1, 0x60, 0x80, 0x29, 0xd5, 0xfe, 0x56, 0x90, 0x06, 0x9d, 0xbe, 0x69, 0xf9, 0x04, 0x7f, 0x37, - 0xc6, 0xd4, 0xd3, 0x7e, 0x55, 0xd1, 0x3e, 0xb4, 0x87, 0x2e, 0xe9, 0xdb, 0x96, 0x85, 0x1d, 0xed, - 0x37, 0x81, 0x1d, 0xd7, 0xf3, 0x87, 0xee, 0xd8, 0xb1, 0xb4, 0xdf, 0x55, 0xf4, 0x1a, 0xf4, 0x42, - 0xed, 0x63, 0xc7, 0xb3, 0xbd, 0x1f, 0x7c, 0xcf, 0x75, 0xfd, 0x91, 0x49, 0x2e, 0xb1, 0xf6, 0xa7, - 0x8a, 0x8e, 0xe1, 0xc8, 0x76, 0x3c, 0x4c, 0x1c, 0x73, 0xe4, 0x53, 0x4c, 0x3e, 0x60, 0xe2, 0x63, - 0x42, 0x5c, 0xa2, 0xfd, 0xab, 0x22, 0x1d, 0x0e, 0x79, 0xc8, 0x1e, 0x60, 0x7f, 0xec, 0x98, 0x1f, - 0x4c, 0x7b, 0x64, 0xf6, 0x47, 0x58, 0xfb, 0x4f, 0x3d, 0xfb, 0x43, 0x01, 0xc8, 0xa7, 0xeb, 0xf1, - 0x5f, 0x61, 0x07, 0x5a, 0x57, 0x98, 0x52, 0xf3, 0x12, 0x6b, 0x3b, 0xe8, 0x35, 0xbc, 0x1a, 0xb8, - 0xce, 0xd0, 0xbe, 0x1c, 0x13, 0xd3, 0xb3, 0x5d, 0xc7, 0xf7, 0x88, 0xe9, 0x50, 0x73, 0xc0, 0xcf, - 0x9a, 0x82, 0x5e, 0x00, 0xaa, 0xd2, 0xb6, 0x87, 0xaf, 0xb4, 0x1a, 0xd2, 0xe1, 0x39, 0x76, 0x2c, - 0x97, 0x50, 0x4c, 0x2a, 0x37, 0x54, 0xf4, 0x12, 0x0e, 0x5d, 0x62, 0x61, 0xf2, 0x88, 0xa8, 0xa3, - 0x23, 0x38, 0xb0, 0xf0, 0xc8, 0xe6, 0x9e, 0x29, 0xc6, 0xef, 0x7c, 0xdb, 0x19, 0xba, 0x5a, 0xe3, - 0x6c, 0x02, 0xa8, 0x32, 0x76, 0x9b, 0xff, 0x33, 0x46, 0xfb, 0x00, 0xd4, 0xbe, 0x74, 0x4c, 0x6f, - 0x4c, 0x30, 0xd5, 0x76, 0xb8, 0x8f, 0x91, 0x49, 0x3d, 0xbf, 0x62, 0x46, 0x53, 0x78, 0xb5, 0xad, - 0x2a, 0xd4, 0x1f, 0xda, 0x23, 0x0f, 0x13, 0xad, 0xc6, 0x9b, 0x2c, 0x6c, 0x68, 0x6a, 0xff, 0x8b, - 0x1f, 0xcf, 0xe7, 0x61, 0xb6, 0xd8, 0x4c, 0xf8, 0x5b, 0xec, 0x2d, 0xee, 0xd7, 0x2c, 0x59, 0xb2, - 0xd9, 0x9c, 0x25, 0xbd, 0x9b, 0x60, 0x92, 0x84, 0xd3, 0xfc, 0xc3, 0x91, 0x16, 0x1f, 0x97, 0x49, - 0x53, 0xc0, 0xaf, 0xfe, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xa5, 0xe2, 0x9d, 0x74, 0x06, 0x00, - 0x00, + 0x14, 0xae, 0xe3, 0xfc, 0x34, 0x27, 0xdd, 0xee, 0x74, 0xba, 0xdd, 0xf5, 0x16, 0x56, 0x5b, 0x19, + 0x81, 0x4a, 0x2b, 0x12, 0x51, 0x24, 0x04, 0x97, 0x4e, 0x3c, 0xe9, 0x5a, 0x9b, 0xda, 0x30, 0x76, + 0x16, 0xf1, 0x23, 0x59, 0x93, 0x64, 0x9a, 0x44, 0x24, 0x76, 0x14, 0x3b, 0x55, 0x7b, 0xcf, 0x35, + 0x42, 0x82, 0x2b, 0x24, 0x5e, 0x80, 0x27, 0xe1, 0x0d, 0x78, 0x11, 0x24, 0x6e, 0xd1, 0xcc, 0xd8, + 0x6e, 0xdc, 0x45, 0xda, 0xab, 0xcc, 0x77, 0xce, 0x37, 0xe7, 0x7c, 0xf3, 0x9d, 0x71, 0x06, 0x0e, + 0xc7, 0xf1, 0x72, 0x19, 0x47, 0x1d, 0xf5, 0xd3, 0x5e, 0xad, 0xe3, 0x34, 0xc6, 0x75, 0x85, 0x8e, + 0x5f, 0x4e, 0xe3, 0x78, 0xba, 0xe0, 0x1d, 0x19, 0x1d, 0x6d, 0xae, 0x3b, 0xe9, 0x7c, 0xc9, 0x93, + 0x94, 0x2d, 0x57, 0x8a, 0x68, 0x9a, 0x00, 0x03, 0x96, 0xa4, 0xbd, 0x38, 0xba, 0x9e, 0x4f, 0xf1, + 0x13, 0xa8, 0xcd, 0xa3, 0x09, 0xbf, 0x35, 0xb4, 0x13, 0xed, 0xb4, 0x4a, 0x15, 0x30, 0xbf, 0x87, + 0xdd, 0x2b, 0x9e, 0xb2, 0x09, 0x4b, 0x99, 0x60, 0xdc, 0xb0, 0xc5, 0x86, 0x4b, 0xc6, 0x1e, 0x55, + 0x00, 0x7f, 0x09, 0x90, 0xcc, 0xa7, 0x11, 0x4b, 0x37, 0x6b, 0x9e, 0x18, 0x95, 0x13, 0xfd, 0xb4, + 0x75, 0xf1, 0xbc, 0x9d, 0x29, 0xca, 0xf7, 0xfa, 0x39, 0x83, 0x6e, 0x91, 0xcd, 0x1f, 0xe0, 0xe0, + 0x2d, 0x02, 0xfe, 0x18, 0x50, 0x41, 0x09, 0x67, 0x9c, 0x4d, 0xf8, 0x3a, 0x6b, 0xf8, 0xb8, 0x88, + 0xbf, 0x92, 0x61, 0xfc, 0x3e, 0x34, 0x8b, 0x90, 0x51, 0x91, 0x9c, 0xfb, 0x80, 0xf9, 0x93, 0x06, + 0xf5, 0x8c, 0xf8, 0x39, 0xec, 0x8d, 0x67, 0x6c, 0x1e, 0x6d, 0xd7, 0x6b, 0x5d, 0x1c, 0xe6, 0x2a, + 0x7b, 0x22, 0xa7, 0xa8, 0xb4, 0x35, 0xbe, 0x07, 0xb8, 0xfb, 0x3f, 0x5a, 0x2a, 0x72, 0xef, 0xb3, + 0x7c, 0xaf, 0x5f, 0xd6, 0xf4, 0x96, 0x48, 0xf3, 0x6f, 0x0d, 0x5a, 0x5b, 0x0d, 0x30, 0x86, 0x6a, + 0x7a, 0xb7, 0x52, 0x26, 0xd6, 0xa8, 0x5c, 0x63, 0x03, 0x1a, 0x37, 0x7c, 0x9d, 0xcc, 0xe3, 0x48, + 0x96, 0xaf, 0xd1, 0x1c, 0xe2, 0x2f, 0xa0, 0x59, 0x8c, 0xcd, 0xd0, 0x65, 0xeb, 0xe3, 0xb6, 0x1a, + 0x6c, 0x3b, 0x1f, 0x6c, 0x3b, 0xc8, 0x19, 0xf4, 0x9e, 0x2c, 0x6a, 0xca, 0xa3, 0x38, 0xb6, 0x51, + 0x3d, 0xd1, 0x4e, 0x9b, 0x34, 0x87, 0x52, 0xc1, 0xad, 0x63, 0x1b, 0x35, 0x19, 0x96, 0x6b, 0x31, + 0x5b, 0xbe, 0x8a, 0xc7, 0x33, 0xa3, 0xae, 0xa6, 0x2f, 0x81, 0x30, 0x98, 0xdf, 0xa6, 0x3c, 0x92, + 0xca, 0x1a, 0xca, 0xe0, 0x22, 0x60, 0x5a, 0xf0, 0xf8, 0xc1, 0xe9, 0x65, 0xd3, 0x35, 0x67, 0x69, + 0x9c, 0xcf, 0x2c, 0x87, 0xa2, 0x41, 0x14, 0x47, 0xe3, 0x7c, 0x4e, 0x0a, 0x98, 0x04, 0x1a, 0x5f, + 0xb1, 0xbb, 0x45, 0xcc, 0x26, 0xf8, 0x23, 0xa8, 0x97, 0xa6, 0xb3, 0x9f, 0x3b, 0x9c, 0x19, 0x9b, + 0x65, 0x85, 0x7a, 0x71, 0x61, 0xb2, 0x3a, 0x72, 0x6d, 0x76, 0x61, 0x97, 0x44, 0x37, 0x7c, 0x11, + 0x2b, 0x2f, 0x57, 0xaa, 0x64, 0x2e, 0x21, 0x83, 0xef, 0xb8, 0x2e, 0x3f, 0x6b, 0x50, 0xeb, 0x2e, + 0xe2, 0xf1, 0x8f, 0xf8, 0xfc, 0x81, 0x92, 0xe2, 0x9e, 0xc8, 0xf4, 0x03, 0x39, 0x1f, 0x6e, 0xc9, + 0x69, 0x5d, 0x1c, 0x94, 0xa8, 0x36, 0x4b, 0x99, 0x52, 0x88, 0x3f, 0x85, 0xdd, 0x65, 0x76, 0xd5, + 0xb3, 0x31, 0x1e, 0x95, 0xa8, 0xf9, 0x77, 0x40, 0x0b, 0x9a, 0x39, 0x85, 0xd6, 0x56, 0x43, 0xfc, + 0x14, 0xea, 0xd1, 0x66, 0x39, 0xca, 0x54, 0x55, 0x69, 0x86, 0xf0, 0x07, 0xf0, 0x68, 0xb5, 0xe6, + 0x37, 0xf3, 0x78, 0x93, 0x84, 0x33, 0x96, 0xcc, 0xb2, 0x93, 0xed, 0xe5, 0xc1, 0x57, 0x2c, 0x99, + 0xe1, 0xf7, 0xa0, 0x29, 0x6a, 0x2a, 0x82, 0x2e, 0x09, 0xbb, 0x22, 0x20, 0x92, 0xe6, 0x4b, 0x68, + 0x16, 0x72, 0x0b, 0x7b, 0xb5, 0x13, 0xbd, 0xb0, 0xf7, 0x1c, 0x1e, 0x95, 0x44, 0xe2, 0xe3, 0xad, + 0xd3, 0x28, 0x62, 0x81, 0xcf, 0xfe, 0xd4, 0xa0, 0xee, 0xa7, 0x2c, 0xdd, 0x24, 0xb8, 0x05, 0x8d, + 0xa1, 0xfb, 0xda, 0xf5, 0xbe, 0x71, 0xd1, 0x0e, 0xde, 0x83, 0x86, 0x3f, 0xec, 0xf5, 0x88, 0xef, + 0xa3, 0xbf, 0x34, 0x8c, 0xa0, 0xd5, 0xb5, 0xec, 0x90, 0x92, 0xaf, 0x87, 0xc4, 0x0f, 0xd0, 0x2f, + 0x3a, 0xde, 0x87, 0x66, 0xdf, 0xa3, 0x5d, 0xc7, 0xb6, 0x89, 0x8b, 0x7e, 0x95, 0xd8, 0xf5, 0x82, + 0xb0, 0xef, 0x0d, 0x5d, 0x1b, 0xfd, 0xa6, 0xe3, 0x17, 0x60, 0x64, 0xec, 0x90, 0xb8, 0x81, 0x13, + 0x7c, 0x1b, 0x06, 0x9e, 0x17, 0x0e, 0x2c, 0x7a, 0x49, 0xd0, 0x1f, 0x3a, 0x3e, 0x86, 0x23, 0xc7, + 0x0d, 0x08, 0x75, 0xad, 0x41, 0xe8, 0x13, 0xfa, 0x86, 0xd0, 0x90, 0x50, 0xea, 0x51, 0xf4, 0x8f, + 0x8e, 0x0d, 0x38, 0x14, 0x21, 0xa7, 0x47, 0xc2, 0xa1, 0x6b, 0xbd, 0xb1, 0x9c, 0x81, 0xd5, 0x1d, + 0x10, 0xf4, 0xaf, 0x7e, 0xf6, 0xbb, 0x06, 0xa0, 0xfc, 0x0d, 0xc4, 0x77, 0xd8, 0x82, 0xc6, 0x15, + 0xf1, 0x7d, 0xeb, 0x92, 0xa0, 0x1d, 0xfc, 0x02, 0x9e, 0xf7, 0x3c, 0xb7, 0xef, 0x5c, 0x0e, 0xa9, + 0x15, 0x38, 0x9e, 0x1b, 0x06, 0xd4, 0x72, 0x7d, 0xab, 0x27, 0xd6, 0x48, 0xc3, 0x4f, 0x01, 0x97, + 0xd3, 0x4e, 0x40, 0xae, 0x50, 0x05, 0x1b, 0xf0, 0x84, 0xb8, 0xb6, 0x47, 0x7d, 0x42, 0x4b, 0x3b, + 0x74, 0xfc, 0x0c, 0x0e, 0x3d, 0x6a, 0x13, 0xfa, 0x20, 0x51, 0xc5, 0x47, 0x70, 0x60, 0x93, 0x81, + 0x23, 0x34, 0xfb, 0x84, 0xbc, 0x0e, 0x1d, 0xb7, 0xef, 0xa1, 0xda, 0xd9, 0x08, 0x70, 0xc9, 0x76, + 0x47, 0xfc, 0x23, 0xe3, 0x7d, 0x00, 0xdf, 0xb9, 0x74, 0xad, 0x60, 0x48, 0x89, 0x8f, 0x76, 0x84, + 0x8e, 0x81, 0xe5, 0x07, 0x61, 0x49, 0x0c, 0xd2, 0x44, 0xb7, 0xad, 0x2e, 0x7e, 0xd8, 0x77, 0x06, + 0x01, 0xa1, 0xa8, 0x22, 0x0e, 0x99, 0xc9, 0x40, 0x7a, 0xf7, 0x93, 0xef, 0xce, 0xa7, 0xf3, 0x74, + 0xb6, 0x19, 0x89, 0xdb, 0xd8, 0x99, 0xdd, 0xad, 0xf8, 0x7a, 0xc1, 0x27, 0x53, 0xbe, 0xee, 0x5c, + 0xb3, 0xd1, 0x7a, 0x3e, 0x56, 0xaf, 0x47, 0x92, 0xbd, 0x30, 0xa3, 0xba, 0x84, 0x9f, 0xfd, 0x17, + 0x00, 0x00, 0xff, 0xff, 0x98, 0x98, 0x0b, 0xe3, 0x79, 0x06, 0x00, 0x00, } diff --git a/protos/common/common.proto b/protos/common/common.proto index c205493279c..106916ac05a 100644 --- a/protos/common/common.proto +++ b/protos/common/common.proto @@ -64,13 +64,13 @@ message Metadata { } message MetadataSignature { - bytes signatureHeader = 1; // An encoded SignatureHeader + bytes signature_header = 1; // An encoded SignatureHeader bytes signature = 2; // The signature over the concatenation of the Metadata value bytes, signatureHeader, and block header } message Header { - ChainHeader chainHeader = 1; - SignatureHeader signatureHeader = 2; + ChainHeader chain_header = 1; + SignatureHeader signature_header = 2; } // Header is a generic replay prevention and identity message to include in a signed payload @@ -85,7 +85,7 @@ message ChainHeader { google.protobuf.Timestamp timestamp = 3; // Identifier of the chain this message is bound for - string chainID = 4; + string chainID = 4; // XXX change to channel_id // An unique identifier that is used end-to-end. // - set by higher layers such as end user or SDK @@ -93,7 +93,7 @@ message ChainHeader { // - as the header is passed along unchanged, it will be // be retrieved by the committer (uniqueness check here as well) // - to be stored in the ledger - string txID = 5; + string txID = 5; // XXX change to tx_id // The epoch in which this header was generated, where epoch is defined based on block height // Epoch in which the response has been generated. This field identifies a @@ -140,24 +140,24 @@ message Envelope { // in the BlockHeader. This makes it natural and obvious that the Data is included in the hash, but // the Metadata is not. message Block { - BlockHeader Header = 1; - BlockData Data = 2; - BlockMetadata Metadata = 3; + BlockHeader header = 1; + BlockData data = 2; + BlockMetadata metadata = 3; } // BlockHeader is the element of the block which forms the block chain // The block header is hashed using the configured chain hashing algorithm // over the ASN.1 encoding of the BlockHeader message BlockHeader { - uint64 Number = 1; // The position in the blockchain - bytes PreviousHash = 2; // The hash of the previous block header - bytes DataHash = 3; // The hash of the BlockData, by MerkleTree + uint64 number = 1; // The position in the blockchain + bytes previous_hash = 2; // The hash of the previous block header + bytes data_hash = 3; // The hash of the BlockData, by MerkleTree } message BlockData { - repeated bytes Data = 1; + repeated bytes data = 1; } message BlockMetadata { - repeated bytes Metadata = 1; + repeated bytes metadata = 1; } diff --git a/protos/common/configtx.pb.go b/protos/common/configtx.pb.go index 93747e9fb17..d0a8e2a7848 100644 --- a/protos/common/configtx.pb.go +++ b/protos/common/configtx.pb.go @@ -16,6 +16,7 @@ var _ = math.Inf type ConfigItem_ConfigType int32 const ( + // XXX change all to UPPER_CASE ConfigItem_Policy ConfigItem_ConfigType = 0 ConfigItem_Chain ConfigItem_ConfigType = 1 ConfigItem_Orderer ConfigItem_ConfigType = 2 @@ -85,7 +86,7 @@ func (m *ConfigEnvelope) GetSignatures() []*ConfigSignature { // The orderer supplies a configuration template to the user to use when constructing a new // chain creation transaction, so this is used to facilitate that. type ConfigTemplate struct { - Items []*ConfigItem `protobuf:"bytes,1,rep,name=Items" json:"Items,omitempty"` + Items []*ConfigItem `protobuf:"bytes,1,rep,name=items" json:"items,omitempty"` } func (m *ConfigTemplate) Reset() { *m = ConfigTemplate{} } @@ -217,11 +218,11 @@ func (m *ConfigPolicy) GetPolicy() *Policy { } type ConfigItem struct { - Type ConfigItem_ConfigType `protobuf:"varint,1,opt,name=Type,enum=common.ConfigItem_ConfigType" json:"Type,omitempty"` - LastModified uint64 `protobuf:"varint,2,opt,name=LastModified" json:"LastModified,omitempty"` - ModificationPolicy string `protobuf:"bytes,3,opt,name=ModificationPolicy" json:"ModificationPolicy,omitempty"` - Key string `protobuf:"bytes,4,opt,name=Key" json:"Key,omitempty"` - Value []byte `protobuf:"bytes,5,opt,name=Value,proto3" json:"Value,omitempty"` + Type ConfigItem_ConfigType `protobuf:"varint,1,opt,name=type,enum=common.ConfigItem_ConfigType" json:"type,omitempty"` + LastModified uint64 `protobuf:"varint,2,opt,name=last_modified,json=lastModified" json:"last_modified,omitempty"` + ModificationPolicy string `protobuf:"bytes,3,opt,name=modification_policy,json=modificationPolicy" json:"modification_policy,omitempty"` + Key string `protobuf:"bytes,4,opt,name=key" json:"key,omitempty"` + Value []byte `protobuf:"bytes,5,opt,name=value,proto3" json:"value,omitempty"` } func (m *ConfigItem) Reset() { *m = ConfigItem{} } @@ -255,45 +256,45 @@ func init() { func init() { proto.RegisterFile("common/configtx.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 637 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x54, 0x51, 0x4f, 0x13, 0x41, - 0x10, 0xb6, 0xbd, 0xeb, 0x95, 0x4e, 0x2b, 0x5c, 0x16, 0xd4, 0x0b, 0x91, 0x88, 0xf7, 0x60, 0x8a, - 0x84, 0x36, 0xe2, 0x03, 0x86, 0xc4, 0x17, 0x09, 0x51, 0x83, 0x60, 0x5d, 0x88, 0x0f, 0xc4, 0x84, - 0x1c, 0xbd, 0xa1, 0xbd, 0xd8, 0xde, 0x5e, 0xf6, 0xae, 0x84, 0x7b, 0xf3, 0xf7, 0xfa, 0x2b, 0xcc, - 0xce, 0xee, 0xd5, 0x6b, 0x2d, 0x35, 0xbc, 0xb4, 0xbb, 0x33, 0xdf, 0x7c, 0xdf, 0xb7, 0xb3, 0xb7, - 0x03, 0x4f, 0xfa, 0x62, 0x3c, 0x16, 0x71, 0xb7, 0x2f, 0xe2, 0x9b, 0x68, 0x90, 0xdd, 0x75, 0x12, - 0x29, 0x32, 0xc1, 0x1c, 0x1d, 0xde, 0x5c, 0x9f, 0xa6, 0xd5, 0x9f, 0x4e, 0x6e, 0x16, 0x35, 0x89, - 0x18, 0x45, 0xfd, 0x08, 0x53, 0x1d, 0xf6, 0x03, 0x58, 0x3d, 0x22, 0x96, 0xe3, 0xf8, 0x16, 0x47, - 0x22, 0x41, 0xf6, 0x14, 0x1c, 0xcd, 0xeb, 0x55, 0xb6, 0x2b, 0xed, 0x16, 0x37, 0x3b, 0x76, 0x00, - 0x90, 0x46, 0x83, 0x38, 0xc8, 0x26, 0x12, 0x53, 0xaf, 0xba, 0x6d, 0xb5, 0x9b, 0xfb, 0xcf, 0x3a, - 0x46, 0x43, 0x73, 0x9c, 0x17, 0x79, 0x5e, 0x82, 0xfa, 0x87, 0x85, 0xc4, 0x05, 0x8e, 0x93, 0x51, - 0x90, 0x21, 0x6b, 0x43, 0xed, 0x73, 0x86, 0xe3, 0xd4, 0xab, 0x10, 0x0b, 0x9b, 0x65, 0x51, 0x29, - 0xae, 0x01, 0xfe, 0x15, 0x38, 0x3a, 0xc8, 0x76, 0xc1, 0x19, 0x62, 0x10, 0xa2, 0x24, 0x5b, 0xcd, - 0xfd, 0xf5, 0x69, 0xd1, 0x30, 0x88, 0xe2, 0x4f, 0x94, 0xe2, 0x06, 0xa2, 0x04, 0x22, 0x12, 0xa8, - 0xde, 0x2f, 0x40, 0x00, 0x7f, 0x08, 0xa0, 0x83, 0x67, 0x78, 0x97, 0x3d, 0x4c, 0x64, 0x0f, 0xea, - 0xfd, 0x61, 0x10, 0xc7, 0x38, 0xf2, 0xaa, 0x73, 0x68, 0x62, 0xfc, 0x28, 0xc5, 0x24, 0xe1, 0x05, - 0xc6, 0xff, 0x6d, 0x41, 0xb3, 0x94, 0x60, 0x1e, 0xd4, 0x6f, 0x51, 0xa6, 0x91, 0x88, 0x49, 0xcc, - 0xe6, 0xc5, 0x96, 0x1d, 0x80, 0x33, 0x50, 0x90, 0xc2, 0xfe, 0x8b, 0x05, 0xbc, 0x1d, 0xfa, 0x4d, - 0x8f, 0xe3, 0x4c, 0xe6, 0xdc, 0xc0, 0x55, 0xe1, 0x6d, 0x30, 0x9a, 0x60, 0xea, 0x59, 0xf7, 0x17, - 0x7e, 0x27, 0x84, 0x29, 0xd4, 0x70, 0xf6, 0x1e, 0x56, 0x8a, 0xef, 0xc2, 0xb3, 0xa9, 0xf4, 0xe5, - 0xa2, 0xd2, 0x9e, 0xc1, 0xe8, 0xe2, 0x69, 0x09, 0xdb, 0x02, 0x18, 0x8b, 0xf0, 0x8a, 0xf6, 0xb9, - 0x57, 0xdb, 0xae, 0xb4, 0x1b, 0xbc, 0x31, 0x16, 0x21, 0xe1, 0xf3, 0xcd, 0x33, 0x68, 0x96, 0xdc, - 0x32, 0x17, 0xac, 0x9f, 0x98, 0xd3, 0xa1, 0x1b, 0x5c, 0x2d, 0xd9, 0x0e, 0xd4, 0xc8, 0xc8, 0xb2, - 0x3e, 0x6a, 0xc4, 0x61, 0xf5, 0x5d, 0x45, 0xf1, 0x95, 0x0e, 0xf1, 0x60, 0x3e, 0xaa, 0x2d, 0xf3, - 0x7d, 0x83, 0xc7, 0x33, 0x27, 0x5b, 0xc0, 0xf8, 0x7a, 0x96, 0x71, 0x63, 0x96, 0x51, 0x9f, 0xb3, - 0x44, 0xe9, 0xff, 0x28, 0xee, 0x9a, 0xc4, 0x96, 0xdc, 0xf5, 0x46, 0x99, 0xb8, 0x65, 0x28, 0xe6, - 0x1a, 0x6a, 0xcd, 0x35, 0xd4, 0x17, 0xd0, 0x2a, 0x0b, 0x2f, 0xa1, 0x7f, 0x05, 0x8e, 0x21, 0xd1, - 0xc6, 0x57, 0x0b, 0xe3, 0xc6, 0xb2, 0xc9, 0xfe, 0x4f, 0xf0, 0x57, 0xb5, 0x78, 0x26, 0xea, 0xed, - 0xb0, 0x37, 0x60, 0x5f, 0xe4, 0x09, 0x92, 0xd8, 0xea, 0xfe, 0xd6, 0xbf, 0xaf, 0xcb, 0x2c, 0x15, - 0x88, 0x13, 0x94, 0xf9, 0xd0, 0xfa, 0x12, 0xa4, 0xd9, 0xa9, 0x08, 0xa3, 0x9b, 0x08, 0x43, 0xb2, - 0x63, 0xf3, 0x99, 0x18, 0xeb, 0x00, 0xd3, 0xeb, 0x7e, 0x90, 0x45, 0x22, 0xee, 0x95, 0xcd, 0x2c, - 0xc8, 0xa8, 0x6b, 0x3a, 0xc1, 0xdc, 0xb3, 0xf5, 0x35, 0x9d, 0x60, 0xae, 0xba, 0x49, 0x0d, 0xa7, - 0x6f, 0xb0, 0xc5, 0xf5, 0xc6, 0x3f, 0x2a, 0xcc, 0x93, 0x13, 0x00, 0x47, 0xd7, 0xbb, 0x8f, 0x58, - 0x03, 0x6a, 0xf4, 0xb2, 0xdd, 0x0a, 0x6b, 0x42, 0xfd, 0xab, 0x0c, 0x51, 0xa2, 0x74, 0xab, 0x6c, - 0x05, 0xec, 0x1e, 0xa2, 0x74, 0x2d, 0x56, 0x07, 0xeb, 0xf4, 0xbc, 0xe7, 0xda, 0xfe, 0x25, 0xac, - 0xcd, 0x0d, 0x39, 0xb6, 0x03, 0xee, 0x74, 0xcc, 0x5d, 0x95, 0xe6, 0x46, 0x8b, 0xaf, 0x4d, 0xe3, - 0x7a, 0x66, 0xb0, 0xe7, 0xd0, 0x98, 0x86, 0xcc, 0x55, 0xff, 0x0d, 0x7c, 0xd8, 0xbb, 0xdc, 0x1d, - 0x44, 0xd9, 0x70, 0x72, 0xad, 0x3a, 0xd9, 0x1d, 0xe6, 0x09, 0xca, 0x11, 0x86, 0x03, 0x94, 0xdd, - 0x9b, 0xe0, 0x5a, 0x46, 0xfd, 0x2e, 0xcd, 0xea, 0xd4, 0x0c, 0xf4, 0x6b, 0x87, 0xb6, 0x6f, 0xff, - 0x04, 0x00, 0x00, 0xff, 0xff, 0x79, 0xf6, 0x9c, 0x49, 0x07, 0x06, 0x00, 0x00, + // 632 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x54, 0x51, 0x4f, 0xdb, 0x30, + 0x10, 0x5e, 0x9b, 0x34, 0xa5, 0xd7, 0x02, 0x91, 0x61, 0x5b, 0x84, 0x86, 0xc6, 0x32, 0x69, 0x2a, + 0x43, 0x50, 0x8d, 0x3d, 0x30, 0x21, 0xed, 0x65, 0x08, 0x6d, 0x7b, 0x80, 0x31, 0x83, 0xf6, 0x80, + 0x26, 0x55, 0xa1, 0x39, 0x5a, 0x6b, 0x49, 0x1c, 0x39, 0x2e, 0x22, 0xaf, 0xfb, 0xb9, 0xfb, 0x15, + 0x53, 0x6c, 0x27, 0xa4, 0x1d, 0x2b, 0xe2, 0x05, 0xe2, 0xbb, 0xef, 0xfb, 0xee, 0xf3, 0x5d, 0x7d, + 0xf0, 0x74, 0xc4, 0xe3, 0x98, 0x27, 0x83, 0x11, 0x4f, 0xae, 0xd9, 0x58, 0xde, 0xee, 0xa5, 0x82, + 0x4b, 0x4e, 0x1c, 0x1d, 0xde, 0x58, 0xab, 0xd2, 0xc5, 0x3f, 0x9d, 0xdc, 0x28, 0x39, 0x29, 0x8f, + 0xd8, 0x88, 0x61, 0xa6, 0xc3, 0x7e, 0x00, 0x2b, 0x47, 0x4a, 0xe5, 0x38, 0xb9, 0xc1, 0x88, 0xa7, + 0x48, 0x9e, 0x81, 0xa3, 0x75, 0xbd, 0xc6, 0x56, 0xa3, 0xdf, 0xa3, 0xe6, 0x44, 0x0e, 0x00, 0x32, + 0x36, 0x4e, 0x02, 0x39, 0x15, 0x98, 0x79, 0xcd, 0x2d, 0xab, 0xdf, 0xdd, 0x7f, 0xbe, 0x67, 0x6a, + 0x68, 0x8d, 0xf3, 0x32, 0x4f, 0x6b, 0x50, 0xff, 0xb0, 0x2c, 0x71, 0x81, 0x71, 0x1a, 0x05, 0x12, + 0x49, 0x1f, 0x5a, 0x4c, 0x62, 0x9c, 0x79, 0x0d, 0xa5, 0x42, 0x66, 0x55, 0xbe, 0x4a, 0x8c, 0xa9, + 0x06, 0xf8, 0x43, 0x70, 0x74, 0x90, 0xec, 0x80, 0x33, 0xc1, 0x20, 0x44, 0xa1, 0x6c, 0x75, 0xf7, + 0xd7, 0x2a, 0xd2, 0x24, 0x60, 0xc9, 0x17, 0x95, 0xa2, 0x06, 0x72, 0x57, 0xa0, 0xf9, 0x50, 0x81, + 0x09, 0x80, 0x0e, 0x9e, 0xe2, 0xad, 0x7c, 0x5c, 0x91, 0x5d, 0x68, 0x8f, 0x26, 0x41, 0x92, 0x60, + 0xe4, 0x35, 0xe7, 0xd0, 0x4a, 0xf1, 0xb3, 0xe0, 0xd3, 0x94, 0x96, 0x18, 0xff, 0x8f, 0x05, 0xdd, + 0x5a, 0x82, 0x78, 0xd0, 0xbe, 0x41, 0x91, 0x31, 0x9e, 0xa8, 0x62, 0x36, 0x2d, 0x8f, 0xe4, 0x00, + 0x9c, 0x71, 0x01, 0x29, 0xed, 0xbf, 0xbc, 0x47, 0x77, 0x4f, 0xfd, 0xcd, 0x8e, 0x13, 0x29, 0x72, + 0x6a, 0xe0, 0x05, 0xf1, 0x26, 0x88, 0xa6, 0x98, 0x79, 0xd6, 0xff, 0x89, 0x3f, 0x14, 0xc2, 0x10, + 0x35, 0x9c, 0x7c, 0x84, 0xa5, 0xf2, 0x77, 0xe1, 0xd9, 0x8a, 0xfa, 0xea, 0x3e, 0xea, 0x99, 0xc1, + 0x68, 0x72, 0x45, 0x21, 0x9b, 0x00, 0x31, 0x0f, 0x87, 0xea, 0x9c, 0x7b, 0xad, 0xad, 0x46, 0xbf, + 0x43, 0x3b, 0x31, 0x0f, 0x15, 0x3e, 0xdf, 0x38, 0x85, 0x6e, 0xcd, 0x2d, 0x71, 0xc1, 0xfa, 0x85, + 0xb9, 0xba, 0x74, 0x87, 0x16, 0x9f, 0x64, 0x1b, 0x5a, 0xca, 0xc8, 0xa2, 0x3e, 0x6a, 0xc4, 0x61, + 0xf3, 0x43, 0xa3, 0xd0, 0xab, 0x5d, 0xe2, 0xd1, 0x7a, 0x8a, 0x5b, 0xd7, 0xfb, 0x0e, 0xcb, 0x33, + 0x37, 0xbb, 0x47, 0xf1, 0xed, 0xac, 0xe2, 0xfa, 0xac, 0xa2, 0xbe, 0x67, 0x4d, 0xd2, 0xff, 0x59, + 0xce, 0x5a, 0x15, 0x5b, 0x30, 0xeb, 0xf5, 0xba, 0x70, 0xcf, 0x48, 0xcc, 0x35, 0xd4, 0x9a, 0x6b, + 0xa8, 0xcf, 0xa1, 0x57, 0x2f, 0xbc, 0x40, 0xfe, 0x0d, 0x38, 0x46, 0x44, 0x1b, 0x5f, 0x29, 0x8d, + 0x1b, 0xcb, 0x26, 0xfb, 0x50, 0xc1, 0xdf, 0xcd, 0xf2, 0x99, 0x14, 0x6f, 0x87, 0xbc, 0x03, 0x5b, + 0xe6, 0x29, 0xaa, 0x62, 0x2b, 0xfb, 0x9b, 0xff, 0xbe, 0x2e, 0xf3, 0x79, 0x91, 0xa7, 0x48, 0x15, + 0x94, 0xbc, 0x86, 0xe5, 0x28, 0xc8, 0xe4, 0x30, 0xe6, 0x21, 0xbb, 0x66, 0x18, 0x2a, 0x3f, 0x36, + 0xed, 0x15, 0xc1, 0x13, 0x13, 0x23, 0x03, 0x58, 0xd3, 0xf9, 0x51, 0x20, 0x19, 0x4f, 0x66, 0xed, + 0x90, 0x7a, 0xca, 0x5c, 0xdc, 0x0c, 0xca, 0xbe, 0x1b, 0x54, 0xd5, 0xcf, 0x56, 0xad, 0x9f, 0xfe, + 0x51, 0x69, 0xbf, 0x70, 0x44, 0x00, 0x1c, 0xcd, 0x77, 0x9f, 0x90, 0x0e, 0xb4, 0xd4, 0xdb, 0x76, + 0x1b, 0xa4, 0x0b, 0xed, 0x6f, 0x22, 0x44, 0x81, 0xc2, 0x6d, 0x92, 0x25, 0xb0, 0xcf, 0x10, 0x85, + 0x6b, 0x91, 0x36, 0x58, 0x27, 0xe7, 0x67, 0xae, 0xed, 0x5f, 0xc2, 0xea, 0xdc, 0x9a, 0x23, 0xdb, + 0xe0, 0x56, 0x8b, 0x6e, 0x58, 0xdb, 0x1c, 0x3d, 0xba, 0x5a, 0xc5, 0xf5, 0xd6, 0x20, 0x2f, 0xa0, + 0x53, 0x85, 0xcc, 0xb0, 0xef, 0x02, 0x9f, 0x76, 0x2f, 0x77, 0xc6, 0x4c, 0x4e, 0xa6, 0x57, 0x45, + 0x2f, 0x07, 0x93, 0x3c, 0x45, 0x11, 0x61, 0x38, 0x46, 0x31, 0xb8, 0x0e, 0xae, 0x04, 0x1b, 0x0d, + 0xd4, 0xb6, 0xce, 0xcc, 0x4a, 0xbf, 0x72, 0xd4, 0xf1, 0xfd, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xe7, 0xe5, 0x43, 0x20, 0x09, 0x06, 0x00, 0x00, } diff --git a/protos/common/configtx.proto b/protos/common/configtx.proto index 168aa2704d2..09c8fd039fe 100644 --- a/protos/common/configtx.proto +++ b/protos/common/configtx.proto @@ -56,7 +56,7 @@ message ConfigEnvelope { // The orderer supplies a configuration template to the user to use when constructing a new // chain creation transaction, so this is used to facilitate that. message ConfigTemplate { - repeated ConfigItem Items = 1; + repeated ConfigItem items = 1; } // This message may change slightly depending on the finalization of signature schemes for transactions @@ -96,17 +96,18 @@ message ConfigPolicy { message ConfigItem { enum ConfigType { + // XXX change all to UPPER_CASE Policy = 0; // Implies that the Value is a marshaled Policy message, and may be referred to by Key as a ModificationPolicy Chain = 1; // Marshaled format for this type is yet to be determined Orderer = 2; // Marshaled format for this type is yet to be determined Peer = 3; // Marshaled format for this type is yet to be determined MSP = 4; // Marshaled MSPConfig proto } - ConfigType Type = 1; // The type of configuration this is. - uint64 LastModified = 2; // The Sequence number in the ConfigEnvelope this item was last modified - string ModificationPolicy = 3; // What policy to check before allowing modification - string Key = 4; // A unique ID, unique scoped by Type, to reference the value by - bytes Value = 5; // The byte representation of this configuration, usually a marshaled message + ConfigType type = 1; // The type of configuration this is. + uint64 last_modified = 2; // The Sequence number in the ConfigEnvelope this item was last modified + string modification_policy = 3; // What policy to check before allowing modification + string key = 4; // A unique ID, unique scoped by Type, to reference the value by + bytes value = 5; // The byte representation of this configuration, usually a marshaled message } message ConfigSignature { diff --git a/protos/common/msp_principal.pb.go b/protos/common/msp_principal.pb.go index 8b608e01356..d32d348b91d 100644 --- a/protos/common/msp_principal.pb.go +++ b/protos/common/msp_principal.pb.go @@ -16,6 +16,7 @@ var _ = math.Inf type MSPPrincipal_Classification int32 const ( + // XXX Change all to UPPER_CASE MSPPrincipal_ByMSPRole MSPPrincipal_Classification = 0 // one of a member of MSP network, and the one of an // administrator of an MSP network @@ -91,13 +92,13 @@ type MSPPrincipal struct { // "Principal" contains a specific identity. Default value // denotes that Principal contains one of the groups by // default supported by all MSPs ("admin" or "member"). - PrincipalClassification MSPPrincipal_Classification `protobuf:"varint,1,opt,name=PrincipalClassification,enum=common.MSPPrincipal_Classification" json:"PrincipalClassification,omitempty"` + PrincipalClassification MSPPrincipal_Classification `protobuf:"varint,1,opt,name=principal_classification,json=principalClassification,enum=common.MSPPrincipal_Classification" json:"principal_classification,omitempty"` // Principal completes the policy principal definition. For the default // principal types, Principal can be either "Admin" or "Member". // For the ByOrganizationUnit/ByIdentity values of Classification, // PolicyPrincipal acquires its value from an organization unit or // identity, respectively. - Principal []byte `protobuf:"bytes,2,opt,name=Principal,proto3" json:"Principal,omitempty"` + Principal []byte `protobuf:"bytes,2,opt,name=principal,proto3" json:"principal,omitempty"` } func (m *MSPPrincipal) Reset() { *m = MSPPrincipal{} } @@ -114,7 +115,7 @@ type OrganizationUnit struct { MSPIdentifier string `protobuf:"bytes,1,opt,name=MSPIdentifier" json:"MSPIdentifier,omitempty"` // OrganizationUnitIdentifier defines the organization unit under the // MSP identified with MSPIdentifier - OrganizationUnitIdentifier string `protobuf:"bytes,2,opt,name=OrganizationUnitIdentifier" json:"OrganizationUnitIdentifier,omitempty"` + OrganizationalUnitIdentifier string `protobuf:"bytes,2,opt,name=organizational_unit_identifier,json=organizationalUnitIdentifier" json:"organizational_unit_identifier,omitempty"` } func (m *OrganizationUnit) Reset() { *m = OrganizationUnit{} } @@ -150,25 +151,26 @@ func init() { func init() { proto.RegisterFile("common/msp_principal.proto", fileDescriptor4) } var fileDescriptor4 = []byte{ - // 316 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x4b, 0xc3, 0x30, - 0x14, 0xc6, 0x97, 0xa1, 0x93, 0x3e, 0xb7, 0x52, 0x72, 0xd0, 0x31, 0x3d, 0x8c, 0xba, 0xc3, 0x40, - 0x6c, 0x61, 0xde, 0x05, 0xeb, 0x41, 0x3c, 0x14, 0x4b, 0xa7, 0x17, 0x41, 0xa4, 0xed, 0xb2, 0xed, - 0x41, 0x9b, 0x86, 0x34, 0x82, 0xf1, 0x0f, 0xf0, 0x2f, 0xf4, 0x0f, 0x92, 0xa5, 0x6e, 0x76, 0x03, - 0xc5, 0x53, 0x79, 0xdf, 0xf7, 0xfb, 0xbe, 0xd7, 0x84, 0xc0, 0x20, 0x2b, 0x8b, 0xa2, 0xe4, 0x7e, - 0x51, 0x89, 0x17, 0x21, 0x91, 0x67, 0x28, 0x92, 0xdc, 0x13, 0xb2, 0x54, 0x25, 0xed, 0xd4, 0x9e, - 0xfb, 0x49, 0xa0, 0x1b, 0x4e, 0xa3, 0x68, 0x6d, 0xd3, 0x67, 0x38, 0xde, 0x0c, 0x37, 0x79, 0x52, - 0x55, 0x38, 0xc7, 0x2c, 0x51, 0x58, 0xf2, 0x3e, 0x19, 0x92, 0xb1, 0x3d, 0x39, 0xf3, 0xea, 0xa8, - 0xd7, 0x8c, 0x79, 0xdb, 0x68, 0xfc, 0x5b, 0x07, 0x3d, 0x05, 0x6b, 0x63, 0xf5, 0xdb, 0x43, 0x32, - 0xee, 0xc6, 0x3f, 0x82, 0x7b, 0x0b, 0xf6, 0x0e, 0xdf, 0x03, 0x2b, 0xd0, 0xe1, 0x34, 0x8a, 0xcb, - 0x9c, 0x39, 0x2d, 0x7a, 0x04, 0x34, 0xd0, 0xf7, 0x72, 0x91, 0x70, 0x7c, 0x37, 0xc0, 0x23, 0x47, - 0xe5, 0x10, 0x6a, 0x03, 0x04, 0xfa, 0x6e, 0xc6, 0xb8, 0x42, 0xa5, 0x9d, 0xb6, 0xfb, 0x06, 0xce, - 0x2e, 0x45, 0x47, 0xd0, 0x0b, 0xa7, 0x51, 0x0d, 0xcd, 0x91, 0x49, 0x73, 0x1e, 0x2b, 0xde, 0x16, - 0xe9, 0x15, 0x0c, 0x76, 0x93, 0x8d, 0x48, 0xdb, 0x44, 0xfe, 0x20, 0xdc, 0x0f, 0x02, 0x07, 0xdf, - 0xff, 0xfb, 0xcf, 0x8d, 0x3e, 0xec, 0xad, 0x68, 0xd3, 0x6d, 0x4f, 0x4e, 0x1a, 0xd7, 0xbb, 0x92, - 0xd7, 0xdf, 0x07, 0x2d, 0x58, 0x6c, 0x40, 0x77, 0x04, 0x87, 0x0d, 0x91, 0x02, 0x74, 0x42, 0x56, - 0xa4, 0x4c, 0x3a, 0x2d, 0x6a, 0xc1, 0xfe, 0xf5, 0xac, 0x40, 0xee, 0x90, 0xe0, 0xe2, 0xe9, 0x7c, - 0x81, 0x6a, 0xf9, 0x9a, 0xae, 0x0a, 0xfd, 0xa5, 0x16, 0x4c, 0xe6, 0x6c, 0xb6, 0x60, 0xd2, 0x9f, - 0x27, 0xa9, 0xc4, 0xcc, 0x37, 0x0f, 0xa1, 0xf2, 0xeb, 0x75, 0x69, 0xc7, 0x8c, 0x97, 0x5f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x81, 0x8f, 0xfe, 0x6f, 0x35, 0x02, 0x00, 0x00, + // 331 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x92, 0x41, 0x4b, 0xc3, 0x30, + 0x1c, 0xc5, 0xd7, 0xa1, 0x93, 0xfe, 0xdd, 0x4a, 0xc9, 0x41, 0x87, 0x0e, 0x19, 0x75, 0x87, 0x81, + 0xd8, 0xc2, 0xfc, 0x04, 0x56, 0x41, 0x3c, 0x14, 0x4b, 0xa7, 0x17, 0x0f, 0x96, 0xb6, 0xcb, 0xb6, + 0x3f, 0xb4, 0x49, 0x49, 0xb3, 0x43, 0x3d, 0x78, 0xf4, 0x1b, 0xfa, 0x7d, 0xa4, 0xa9, 0xdb, 0xda, + 0x9d, 0x3c, 0x85, 0xbc, 0xf7, 0x7b, 0xef, 0x9f, 0x84, 0xc0, 0x45, 0xc2, 0xb3, 0x8c, 0x33, 0x27, + 0x2b, 0xf2, 0x30, 0x17, 0xc8, 0x12, 0xcc, 0xa3, 0xd4, 0xce, 0x05, 0x97, 0x9c, 0xf4, 0x6a, 0xcf, + 0xfa, 0xd1, 0xa0, 0xef, 0xcd, 0x7d, 0x7f, 0x6b, 0x93, 0x0f, 0x18, 0xee, 0xd8, 0x30, 0x49, 0xa3, + 0xa2, 0xc0, 0x25, 0x26, 0x91, 0x44, 0xce, 0x86, 0xda, 0x58, 0x9b, 0x1a, 0xb3, 0x6b, 0xbb, 0xce, + 0xda, 0xcd, 0x9c, 0xfd, 0xd0, 0x42, 0x83, 0xf3, 0x5d, 0x49, 0xdb, 0x20, 0x23, 0xd0, 0x77, 0xd6, + 0xb0, 0x3b, 0xd6, 0xa6, 0xfd, 0x60, 0x2f, 0x58, 0x4f, 0x60, 0x1c, 0xf0, 0x03, 0xd0, 0xdd, 0xd2, + 0x9b, 0xfb, 0x01, 0x4f, 0xa9, 0xd9, 0x21, 0x67, 0x40, 0xdc, 0xf2, 0x45, 0xac, 0x22, 0x86, 0x9f, + 0x0a, 0x78, 0x63, 0x28, 0x4d, 0x8d, 0x18, 0x00, 0x6e, 0xf9, 0xbc, 0xa0, 0x4c, 0xa2, 0x2c, 0xcd, + 0xae, 0xf5, 0x05, 0xe6, 0x21, 0x45, 0x26, 0x30, 0xf0, 0xe6, 0x7e, 0x0d, 0x2d, 0x91, 0x0a, 0x75, + 0x1f, 0x3d, 0x68, 0x8b, 0xe4, 0x11, 0xae, 0x78, 0x23, 0x19, 0xa5, 0xe1, 0x86, 0xa1, 0x0c, 0x71, + 0x1f, 0xeb, 0xaa, 0xd8, 0xa8, 0x4d, 0x55, 0x13, 0xf6, 0x2d, 0xd6, 0xb7, 0x06, 0x27, 0x7f, 0xa7, + 0xfe, 0xe7, 0x5c, 0x07, 0x8e, 0x2a, 0x5a, 0xb5, 0x1b, 0xb3, 0xcb, 0xc6, 0x23, 0x57, 0xf2, 0x76, + 0x7d, 0x2d, 0x73, 0x1a, 0x28, 0xd0, 0x9a, 0xc0, 0x69, 0x43, 0x24, 0x00, 0x3d, 0x8f, 0x66, 0x31, + 0x15, 0x66, 0x87, 0xe8, 0x70, 0x7c, 0xbf, 0xc8, 0x90, 0x99, 0x9a, 0x7b, 0xfb, 0x7e, 0xb3, 0x42, + 0xb9, 0xde, 0xc4, 0x55, 0xa1, 0xb3, 0x2e, 0x73, 0x2a, 0x52, 0xba, 0x58, 0x51, 0xe1, 0x2c, 0xa3, + 0x58, 0x60, 0xe2, 0xa8, 0xff, 0x50, 0x38, 0xf5, 0xb8, 0xb8, 0xa7, 0xb6, 0x77, 0xbf, 0x01, 0x00, + 0x00, 0xff, 0xff, 0xd6, 0xf3, 0xc4, 0xb4, 0x3c, 0x02, 0x00, 0x00, } diff --git a/protos/common/msp_principal.proto b/protos/common/msp_principal.proto index 2372aec6221..998d3ae7fb5 100644 --- a/protos/common/msp_principal.proto +++ b/protos/common/msp_principal.proto @@ -49,6 +49,7 @@ package common; message MSPPrincipal { enum Classification { + // XXX Change all to UPPER_CASE ByMSPRole = 0; // Represents the one of the dedicated MSP roles, the // one of a member of MSP network, and the one of an // administrator of an MSP network @@ -67,14 +68,14 @@ message MSPPrincipal { // "Principal" contains a specific identity. Default value // denotes that Principal contains one of the groups by // default supported by all MSPs ("admin" or "member"). - Classification PrincipalClassification = 1; + Classification principal_classification = 1; // Principal completes the policy principal definition. For the default // principal types, Principal can be either "Admin" or "Member". // For the ByOrganizationUnit/ByIdentity values of Classification, // PolicyPrincipal acquires its value from an organization unit or // identity, respectively. - bytes Principal = 2; + bytes principal = 2; } @@ -85,11 +86,11 @@ message OrganizationUnit { // MSPIdentifier represents the identifier of the MSP this organization unit // refers to - string MSPIdentifier = 1; + string MSPIdentifier = 1; // XXX change to msp_identifier // OrganizationUnitIdentifier defines the organization unit under the // MSP identified with MSPIdentifier - string OrganizationUnitIdentifier = 2; + string organizational_unit_identifier = 2; } @@ -100,11 +101,11 @@ message MSPRole { // MSPIdentifier represents the identifier of the MSP this principal // refers to - string MSPIdentifier = 1; + string MSPIdentifier = 1; // XXX change to msp_identifier enum MSPRoleType { - Member = 0; // Represents an MSP Member - Admin = 1; // Represents an MSP Admin + Member = 0; // Represents an MSP Member // XXX change to MEMBER + Admin = 1; // Represents an MSP Admin // XXX change to ADMIN } // MSPRoleType defines which of the available, pre-defined MSP-roles diff --git a/protos/common/policies.pb.go b/protos/common/policies.pb.go index 4d1dc9479d9..a6e55a715c7 100644 --- a/protos/common/policies.pb.go +++ b/protos/common/policies.pb.go @@ -51,9 +51,9 @@ func (*Policy) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} } // SignaturePolicyEnvelope wraps a SignaturePolicy and includes a version for future enhancements type SignaturePolicyEnvelope struct { - Version int32 `protobuf:"varint,1,opt,name=Version" json:"Version,omitempty"` - Policy *SignaturePolicy `protobuf:"bytes,2,opt,name=Policy" json:"Policy,omitempty"` - Identities []*MSPPrincipal `protobuf:"bytes,3,rep,name=Identities" json:"Identities,omitempty"` + Version int32 `protobuf:"varint,1,opt,name=version" json:"version,omitempty"` + Policy *SignaturePolicy `protobuf:"bytes,2,opt,name=policy" json:"policy,omitempty"` + Identities []*MSPPrincipal `protobuf:"bytes,3,rep,name=identities" json:"identities,omitempty"` } func (m *SignaturePolicyEnvelope) Reset() { *m = SignaturePolicyEnvelope{} } @@ -98,10 +98,10 @@ type isSignaturePolicy_Type interface { } type SignaturePolicy_SignedBy struct { - SignedBy int32 `protobuf:"varint,1,opt,name=SignedBy,oneof"` + SignedBy int32 `protobuf:"varint,1,opt,name=signed_by,json=signedBy,oneof"` } type SignaturePolicy_From struct { - From *SignaturePolicy_NOutOf `protobuf:"bytes,2,opt,name=From,oneof"` + From *SignaturePolicy_NOutOf `protobuf:"bytes,2,opt,name=from,oneof"` } func (*SignaturePolicy_SignedBy) isSignaturePolicy_Type() {} @@ -158,14 +158,14 @@ func _SignaturePolicy_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { func _SignaturePolicy_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { m := msg.(*SignaturePolicy) switch tag { - case 1: // Type.SignedBy + case 1: // Type.signed_by if wire != proto.WireVarint { return true, proto.ErrInternalBadWireType } x, err := b.DecodeVarint() m.Type = &SignaturePolicy_SignedBy{int32(x)} return true, err - case 2: // Type.From + case 2: // Type.from if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } @@ -199,7 +199,7 @@ func _SignaturePolicy_OneofSizer(msg proto.Message) (n int) { type SignaturePolicy_NOutOf struct { N int32 `protobuf:"varint,1,opt,name=N" json:"N,omitempty"` - Policies []*SignaturePolicy `protobuf:"bytes,2,rep,name=Policies" json:"Policies,omitempty"` + Policies []*SignaturePolicy `protobuf:"bytes,2,rep,name=policies" json:"policies,omitempty"` } func (m *SignaturePolicy_NOutOf) Reset() { *m = SignaturePolicy_NOutOf{} } @@ -225,28 +225,28 @@ func init() { func init() { proto.RegisterFile("common/policies.proto", fileDescriptor5) } var fileDescriptor5 = []byte{ - // 357 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x51, 0xe1, 0x6a, 0xc2, 0x30, - 0x18, 0x34, 0xea, 0xaa, 0xfb, 0x74, 0x4c, 0xc2, 0x36, 0x8b, 0x8c, 0x21, 0xfd, 0x25, 0x8c, 0xb5, - 0x4c, 0x7d, 0x81, 0x09, 0x6e, 0x8a, 0x58, 0x4b, 0xab, 0x1b, 0xec, 0xcf, 0xd0, 0x1a, 0x6b, 0xa0, - 0x6d, 0x42, 0x5a, 0x07, 0x7d, 0x95, 0x3d, 0xca, 0x9e, 0x6e, 0xb4, 0x69, 0x65, 0x08, 0xfe, 0xcb, - 0x77, 0xb9, 0xbb, 0xdc, 0xe5, 0x83, 0x5b, 0x97, 0x05, 0x01, 0x0b, 0x0d, 0xce, 0x7c, 0xea, 0x52, - 0x12, 0xe9, 0x5c, 0xb0, 0x98, 0x61, 0x45, 0xc2, 0x9d, 0x4e, 0x7e, 0x1d, 0x44, 0xfc, 0x8b, 0x0b, - 0x1a, 0xba, 0x94, 0xaf, 0x7d, 0xc9, 0xd1, 0x3c, 0x50, 0xac, 0x54, 0x95, 0x60, 0x0c, 0xd5, 0x38, - 0xe1, 0x44, 0x45, 0x5d, 0xd4, 0xbb, 0xb0, 0xb3, 0x33, 0xbe, 0x03, 0x25, 0xf3, 0x4c, 0xd4, 0x72, - 0x17, 0xf5, 0x9a, 0x76, 0x3e, 0x69, 0xcf, 0x00, 0x52, 0xb5, 0x4c, 0x59, 0x0d, 0xa8, 0xad, 0xcc, - 0x99, 0xb9, 0xf8, 0x30, 0x5b, 0x25, 0x7c, 0x05, 0x97, 0xce, 0xf4, 0xcd, 0x7c, 0x59, 0xae, 0xec, - 0x71, 0x0b, 0xe1, 0x1a, 0x54, 0xe6, 0x8e, 0xd5, 0x2a, 0x6b, 0x3f, 0x08, 0xda, 0x0e, 0xf5, 0xc2, - 0x75, 0x7c, 0x10, 0x44, 0x8a, 0xc7, 0xe1, 0x37, 0xf1, 0x19, 0x27, 0x58, 0x85, 0xda, 0x3b, 0x11, - 0x11, 0x65, 0x61, 0xfe, 0x7a, 0x31, 0x62, 0xa3, 0x88, 0x97, 0x05, 0x68, 0xf4, 0xdb, 0xba, 0xec, - 0xa2, 0x9f, 0x58, 0xd9, 0x45, 0x8b, 0x21, 0xc0, 0x74, 0x4b, 0xc2, 0x98, 0xc6, 0x94, 0x44, 0x6a, - 0xa5, 0x5b, 0xe9, 0x35, 0xfa, 0x37, 0x85, 0x68, 0xee, 0x58, 0x56, 0xd1, 0xdf, 0xfe, 0xc7, 0xd3, - 0x7e, 0x11, 0x5c, 0x9f, 0x38, 0xe2, 0x7b, 0xa8, 0xa7, 0x10, 0xd9, 0x8e, 0x12, 0x99, 0x6a, 0x52, - 0xb2, 0x8f, 0x08, 0x1e, 0x42, 0xf5, 0x55, 0xb0, 0x20, 0x8f, 0xf5, 0x70, 0x26, 0x96, 0x6e, 0x2e, - 0x0e, 0xf1, 0x62, 0x37, 0x29, 0xd9, 0x19, 0xbb, 0x33, 0x03, 0x45, 0x22, 0xb8, 0x09, 0xc8, 0xcc, - 0xcb, 0x22, 0x13, 0x0f, 0xa0, 0x6e, 0xe5, 0xbb, 0x53, 0xcb, 0x59, 0xe6, 0xb3, 0x45, 0x8f, 0xc4, - 0x91, 0x02, 0xd5, 0xf4, 0xfb, 0x47, 0x4f, 0x9f, 0x8f, 0x1e, 0x8d, 0xf7, 0x87, 0x4d, 0x2a, 0x31, - 0xf6, 0x09, 0x27, 0xc2, 0x27, 0x5b, 0x8f, 0x08, 0x63, 0xb7, 0xde, 0x08, 0xea, 0x1a, 0xd9, 0xa6, - 0x23, 0x43, 0x1a, 0x6e, 0x94, 0x6c, 0x1c, 0xfc, 0x05, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xa7, 0xbf, - 0x6f, 0x35, 0x02, 0x00, 0x00, + // 359 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x51, 0xd1, 0x6a, 0xea, 0x40, + 0x14, 0x74, 0xd5, 0x1b, 0xf5, 0xe8, 0xa5, 0xb2, 0xb4, 0x35, 0x08, 0x2d, 0x92, 0x27, 0xa1, 0x34, + 0xa1, 0xda, 0x1f, 0xa8, 0x20, 0xb5, 0x88, 0x31, 0x24, 0x4a, 0xa1, 0x2f, 0x62, 0xe2, 0x1a, 0x17, + 0x92, 0xec, 0xb2, 0x89, 0x42, 0x7e, 0xa5, 0xbf, 0xd2, 0x9f, 0x2b, 0xc9, 0x26, 0xa5, 0x15, 0x7c, + 0xcb, 0x99, 0xcc, 0xcc, 0x99, 0xd9, 0x03, 0x37, 0x1e, 0x0b, 0x43, 0x16, 0x19, 0x9c, 0x05, 0xd4, + 0xa3, 0x24, 0xd6, 0xb9, 0x60, 0x09, 0xc3, 0x8a, 0x84, 0xfb, 0xfd, 0xe2, 0x77, 0x18, 0xf3, 0x0d, + 0x17, 0x34, 0xf2, 0x28, 0xdf, 0x06, 0x92, 0xa3, 0xf9, 0xa0, 0x58, 0x99, 0x2a, 0xc5, 0x18, 0xea, + 0x49, 0xca, 0x89, 0x8a, 0x06, 0x68, 0xf8, 0xcf, 0xce, 0xbf, 0xf1, 0x2d, 0x28, 0xb9, 0x67, 0xaa, + 0x56, 0x07, 0x68, 0xd8, 0xb1, 0x8b, 0x49, 0x7b, 0x02, 0x90, 0xaa, 0x55, 0xc6, 0x6a, 0x43, 0x63, + 0x6d, 0xce, 0xcd, 0xe5, 0xbb, 0xd9, 0xad, 0xe0, 0xff, 0xd0, 0x72, 0xde, 0x5e, 0xcd, 0x97, 0xd5, + 0xda, 0x9e, 0x76, 0x11, 0x6e, 0x40, 0x6d, 0xe1, 0x58, 0xdd, 0xaa, 0xf6, 0x89, 0xa0, 0xe7, 0x50, + 0x3f, 0xda, 0x26, 0x47, 0x41, 0xa4, 0x78, 0x1a, 0x9d, 0x48, 0xc0, 0x38, 0xc1, 0x2a, 0x34, 0x4e, + 0x44, 0xc4, 0x94, 0x45, 0xc5, 0xf6, 0x72, 0xc4, 0xc6, 0x9f, 0x00, 0xed, 0x51, 0x4f, 0x97, 0x5d, + 0xf4, 0x33, 0xab, 0x32, 0x19, 0x7e, 0x06, 0xa0, 0x3b, 0x12, 0x25, 0x34, 0xa1, 0x24, 0x56, 0x6b, + 0x83, 0xda, 0xb0, 0x3d, 0xba, 0x2e, 0x45, 0x0b, 0xc7, 0xb2, 0xca, 0xfe, 0xf6, 0x2f, 0x9e, 0xf6, + 0x85, 0xe0, 0xea, 0xcc, 0x11, 0xdf, 0x41, 0x2b, 0xa6, 0x7e, 0x44, 0x76, 0x1b, 0x37, 0x95, 0xb1, + 0x66, 0x15, 0xbb, 0x29, 0xa1, 0x49, 0xb6, 0xa8, 0xbe, 0x17, 0x2c, 0x2c, 0x72, 0xdd, 0x5f, 0xc8, + 0xa5, 0x9b, 0xcb, 0x63, 0xb2, 0xdc, 0xcf, 0x2a, 0x76, 0xce, 0xee, 0xcf, 0x41, 0x91, 0x08, 0xee, + 0x00, 0x32, 0x8b, 0xb6, 0xc8, 0xc4, 0x63, 0x68, 0x96, 0xc7, 0x53, 0xab, 0x79, 0xe8, 0x8b, 0x4d, + 0x7f, 0x88, 0x13, 0x05, 0xea, 0xd9, 0xfb, 0x4f, 0x1e, 0x3f, 0x1e, 0x7c, 0x9a, 0x1c, 0x8e, 0x6e, + 0x26, 0x31, 0x0e, 0x29, 0x27, 0x22, 0x20, 0x3b, 0x9f, 0x08, 0x63, 0xbf, 0x75, 0x05, 0xf5, 0x8c, + 0xfc, 0xd4, 0xb1, 0x21, 0x0d, 0x5d, 0x25, 0x1f, 0xc7, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3b, + 0xed, 0x93, 0x2e, 0x36, 0x02, 0x00, 0x00, } diff --git a/protos/common/policies.proto b/protos/common/policies.proto index 68971f1772e..5b3baa5e82e 100644 --- a/protos/common/policies.proto +++ b/protos/common/policies.proto @@ -36,9 +36,9 @@ message Policy { // SignaturePolicyEnvelope wraps a SignaturePolicy and includes a version for future enhancements message SignaturePolicyEnvelope { - int32 Version = 1; - SignaturePolicy Policy = 2; - repeated MSPPrincipal Identities = 3; + int32 version = 1; + SignaturePolicy policy = 2; + repeated MSPPrincipal identities = 3; } // SignaturePolicy is a recursive message structure which defines a featherweight DSL for describing @@ -50,10 +50,10 @@ message SignaturePolicyEnvelope { message SignaturePolicy { message NOutOf { int32 N = 1; - repeated SignaturePolicy Policies = 2; + repeated SignaturePolicy policies = 2; } oneof Type { - int32 SignedBy = 1; - NOutOf From = 2; + int32 signed_by = 1; + NOutOf from = 2; } } diff --git a/protos/msp/mspconfig.pb.go b/protos/msp/mspconfig.pb.go index 9519be9f418..b0523542267 100644 --- a/protos/msp/mspconfig.pb.go +++ b/protos/msp/mspconfig.pb.go @@ -37,9 +37,9 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type MSPConfig struct { // Type holds the type of the MSP; the default one would // be of type FABRIC implementing an X.509 based provider - Type int32 `protobuf:"varint,1,opt,name=Type" json:"Type,omitempty"` + Type int32 `protobuf:"varint,1,opt,name=type" json:"type,omitempty"` // Config is MSP dependent configuration info - Config []byte `protobuf:"bytes,2,opt,name=Config,proto3" json:"Config,omitempty"` + Config []byte `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` } func (m *MSPConfig) Reset() { *m = MSPConfig{} } @@ -61,11 +61,11 @@ type FabricMSPConfig struct { // For example, and assuming the default implementation of MSP, // that is X.509-based and considers a single Issuer, // this can refer to the Subject OU field or the Issuer OU field. - Name string `protobuf:"bytes,1,opt,name=Name" json:"Name,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` // List of root certificates trusted by this MSP // they are used upon certificate validation (see // comment for IntermediateCerts below) - RootCerts [][]byte `protobuf:"bytes,2,rep,name=RootCerts,proto3" json:"RootCerts,omitempty"` + RootCerts [][]byte `protobuf:"bytes,2,rep,name=root_certs,json=rootCerts,proto3" json:"root_certs,omitempty"` // List of intermediate certificates trusted by this MSP; // they are used upon certificate validation as follows: // validation attempts to build a path from the certificate @@ -74,15 +74,15 @@ type FabricMSPConfig struct { // the other end of the path). If the path is longer than // 2, certificates in the middle are searched within the // IntermediateCerts pool - IntermediateCerts [][]byte `protobuf:"bytes,3,rep,name=IntermediateCerts,proto3" json:"IntermediateCerts,omitempty"` + IntermediateCerts [][]byte `protobuf:"bytes,3,rep,name=intermediate_certs,json=intermediateCerts,proto3" json:"intermediate_certs,omitempty"` // Identity denoting the administrator of this MSP - Admins [][]byte `protobuf:"bytes,4,rep,name=Admins,proto3" json:"Admins,omitempty"` + Admins [][]byte `protobuf:"bytes,4,rep,name=admins,proto3" json:"admins,omitempty"` // Identity revocation list - RevocationList [][]byte `protobuf:"bytes,5,rep,name=RevocationList,proto3" json:"RevocationList,omitempty"` + RevocationList [][]byte `protobuf:"bytes,5,rep,name=revocation_list,json=revocationList,proto3" json:"revocation_list,omitempty"` // SigningIdentity holds information on the signing identity // this peer is to use, and which is to be imported by the // MSP defined before - SigningIdentity *SigningIdentityInfo `protobuf:"bytes,6,opt,name=SigningIdentity" json:"SigningIdentity,omitempty"` + SigningIdentity *SigningIdentityInfo `protobuf:"bytes,6,opt,name=signing_identity,json=signingIdentity" json:"signing_identity,omitempty"` } func (m *FabricMSPConfig) Reset() { *m = FabricMSPConfig{} } @@ -104,10 +104,10 @@ type SigningIdentityInfo struct { // PublicSigner carries the public information of the signing // identity. For an X.509 provider this would be represented by // an X.509 certificate - PublicSigner []byte `protobuf:"bytes,1,opt,name=PublicSigner,proto3" json:"PublicSigner,omitempty"` + PublicSigner []byte `protobuf:"bytes,1,opt,name=public_signer,json=publicSigner,proto3" json:"public_signer,omitempty"` // PrivateSigner denotes a reference to the private key of the // peer's signing identity - PrivateSigner *KeyInfo `protobuf:"bytes,2,opt,name=PrivateSigner" json:"PrivateSigner,omitempty"` + PrivateSigner *KeyInfo `protobuf:"bytes,2,opt,name=private_signer,json=privateSigner" json:"private_signer,omitempty"` } func (m *SigningIdentityInfo) Reset() { *m = SigningIdentityInfo{} } @@ -130,10 +130,10 @@ type KeyInfo struct { // Identifier of the key inside the default keystore; this for // the case of Software BCCSP as well as the HSM BCCSP would be // the SKI of the key - KeyIdentifier string `protobuf:"bytes,1,opt,name=KeyIdentifier" json:"KeyIdentifier,omitempty"` + KeyIdentifier string `protobuf:"bytes,1,opt,name=key_identifier,json=keyIdentifier" json:"key_identifier,omitempty"` // KeyMaterial (optional) for the key to be imported; this is // properly encoded key bytes, prefixed by the type of the key - KeyMaterial []byte `protobuf:"bytes,2,opt,name=KeyMaterial,proto3" json:"KeyMaterial,omitempty"` + KeyMaterial []byte `protobuf:"bytes,2,opt,name=key_material,json=keyMaterial,proto3" json:"key_material,omitempty"` } func (m *KeyInfo) Reset() { *m = KeyInfo{} } @@ -151,27 +151,29 @@ func init() { func init() { proto.RegisterFile("msp/mspconfig.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 341 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x52, 0xcd, 0x4b, 0xc3, 0x30, - 0x14, 0xa7, 0xfb, 0x92, 0x66, 0x9d, 0xc3, 0x0c, 0xa4, 0x07, 0x0f, 0xa5, 0x88, 0x14, 0x91, 0x16, - 0xe6, 0xc1, 0xb3, 0x1b, 0x08, 0x63, 0x4e, 0x66, 0xe6, 0xc9, 0x5b, 0x3f, 0x5e, 0xbb, 0xc0, 0x92, - 0x94, 0x24, 0x1b, 0xf4, 0x0f, 0xf7, 0x2e, 0x4d, 0x0b, 0xda, 0xe9, 0xed, 0xf7, 0x7e, 0x1f, 0xfc, - 0x42, 0xde, 0x43, 0x33, 0xa6, 0xca, 0x88, 0xa9, 0x32, 0x15, 0x3c, 0xa7, 0x45, 0x58, 0x4a, 0xa1, - 0x05, 0xee, 0x33, 0x55, 0xfa, 0x4f, 0xc8, 0xde, 0xec, 0xb6, 0x4b, 0xc3, 0x63, 0x8c, 0x06, 0x1f, - 0x55, 0x09, 0xae, 0xe5, 0x59, 0xc1, 0x90, 0x18, 0x8c, 0xaf, 0xd1, 0xa8, 0x51, 0xdd, 0x9e, 0x67, - 0x05, 0x0e, 0x69, 0x27, 0xff, 0xcb, 0x42, 0xd3, 0x97, 0x38, 0x91, 0x34, 0xed, 0xe4, 0xdf, 0x62, - 0xd6, 0xe4, 0x6d, 0x62, 0x30, 0xbe, 0x41, 0x36, 0x11, 0x42, 0x2f, 0x41, 0x6a, 0xe5, 0xf6, 0xbc, - 0x7e, 0xe0, 0x90, 0x1f, 0x02, 0x3f, 0xa0, 0xab, 0x15, 0xd7, 0x20, 0x19, 0x64, 0x34, 0xd6, 0xd0, - 0xb8, 0xfa, 0xc6, 0xf5, 0x57, 0xa8, 0xdf, 0xf2, 0x9c, 0x31, 0xca, 0x95, 0x3b, 0x30, 0x96, 0x76, - 0xc2, 0x77, 0xe8, 0x92, 0xc0, 0x49, 0xa4, 0xb1, 0xa6, 0x82, 0xbf, 0x52, 0xa5, 0xdd, 0xa1, 0xd1, - 0xcf, 0x58, 0xbc, 0x40, 0xd3, 0x1d, 0x2d, 0x38, 0xe5, 0xc5, 0x2a, 0x03, 0xae, 0xa9, 0xae, 0xdc, - 0x91, 0x67, 0x05, 0xe3, 0xb9, 0x1b, 0x32, 0x55, 0x86, 0x67, 0xda, 0x8a, 0xe7, 0x82, 0x9c, 0x07, - 0x7c, 0x86, 0x66, 0xff, 0xf8, 0xb0, 0x8f, 0x9c, 0xed, 0x31, 0x39, 0xd0, 0xb4, 0x16, 0x41, 0x9a, - 0x2f, 0x70, 0x48, 0x87, 0xc3, 0x73, 0x34, 0xd9, 0x4a, 0x7a, 0x8a, 0x35, 0xb4, 0xa6, 0x9e, 0x29, - 0x77, 0x4c, 0xf9, 0x1a, 0x9a, 0xc2, 0xae, 0xc5, 0x7f, 0x47, 0x17, 0xad, 0x82, 0x6f, 0xd1, 0xa4, - 0x86, 0xa6, 0x35, 0xa7, 0x6d, 0x87, 0x4d, 0xba, 0x24, 0xf6, 0xd0, 0x78, 0x0d, 0xd5, 0x26, 0xd6, - 0x20, 0x69, 0x7c, 0x68, 0x97, 0xf6, 0x9b, 0x5a, 0xdc, 0x7f, 0x06, 0x05, 0xd5, 0xfb, 0x63, 0x12, - 0xa6, 0x82, 0x45, 0xfb, 0xaa, 0x04, 0x79, 0x80, 0xac, 0x00, 0x19, 0xe5, 0x66, 0x9f, 0x91, 0x39, - 0x0f, 0x55, 0xdf, 0x4b, 0x32, 0x32, 0xf8, 0xf1, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x18, 0xfd, 0xb5, - 0x2f, 0x41, 0x02, 0x00, 0x00, + // 373 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x92, 0xcb, 0x8b, 0xd4, 0x40, + 0x10, 0x87, 0xc9, 0xcc, 0xee, 0xc8, 0xd4, 0x66, 0x66, 0xb4, 0x17, 0x96, 0x5c, 0x84, 0x18, 0x11, + 0x83, 0x60, 0x02, 0xee, 0xc1, 0xbb, 0x03, 0xc2, 0xa0, 0x0b, 0x92, 0xdc, 0xbc, 0x84, 0x3c, 0x2a, + 0xd9, 0x62, 0xd2, 0x0f, 0xba, 0x7b, 0x17, 0xf2, 0xa7, 0x7b, 0x93, 0x74, 0x1a, 0x75, 0xc0, 0x5b, + 0xf5, 0x57, 0xdf, 0x8f, 0x4a, 0xba, 0x0b, 0x6e, 0xb9, 0x51, 0x39, 0x37, 0xaa, 0x95, 0xa2, 0xa7, + 0x21, 0x53, 0x5a, 0x5a, 0xc9, 0xd6, 0xdc, 0xa8, 0xe4, 0x33, 0x6c, 0x1f, 0xca, 0x1f, 0x47, 0xc7, + 0x19, 0x83, 0x2b, 0x3b, 0x29, 0x8c, 0x82, 0x38, 0x48, 0xaf, 0x0b, 0x57, 0xb3, 0x3b, 0xd8, 0x2c, + 0xa9, 0x68, 0x15, 0x07, 0x69, 0x58, 0xf8, 0x53, 0xf2, 0x2b, 0x80, 0xc3, 0xd7, 0xba, 0xd1, 0xd4, + 0x5e, 0xe4, 0x45, 0xcd, 0x97, 0xfc, 0xb6, 0x70, 0x35, 0x7b, 0x0d, 0xa0, 0xa5, 0xb4, 0x55, 0x8b, + 0xda, 0x9a, 0x68, 0x15, 0xaf, 0xd3, 0xb0, 0xd8, 0xce, 0xe4, 0x38, 0x03, 0xf6, 0x11, 0x18, 0x09, + 0x8b, 0x9a, 0x63, 0x47, 0xb5, 0x45, 0xaf, 0xad, 0x9d, 0xf6, 0xea, 0xdf, 0xce, 0xa2, 0xdf, 0xc1, + 0xa6, 0xee, 0x38, 0x09, 0x13, 0x5d, 0x39, 0xc5, 0x9f, 0xd8, 0x7b, 0x38, 0x68, 0x7c, 0x96, 0x6d, + 0x6d, 0x49, 0x8a, 0x6a, 0x24, 0x63, 0xa3, 0x6b, 0x27, 0xec, 0xff, 0xe2, 0xef, 0x64, 0x2c, 0x3b, + 0xc2, 0x4b, 0x43, 0x83, 0x20, 0x31, 0x54, 0xd4, 0xa1, 0xb0, 0x64, 0xa7, 0x68, 0x13, 0x07, 0xe9, + 0xcd, 0xa7, 0x28, 0xe3, 0x46, 0x65, 0xe5, 0xd2, 0x3c, 0xf9, 0xde, 0x49, 0xf4, 0xb2, 0x38, 0x98, + 0x4b, 0x98, 0x48, 0xb8, 0xfd, 0x8f, 0xc7, 0xde, 0xc2, 0x4e, 0x3d, 0x35, 0x23, 0xb5, 0xd5, 0x1c, + 0x40, 0xed, 0xee, 0x21, 0x2c, 0xc2, 0x05, 0x96, 0x8e, 0xb1, 0x7b, 0xd8, 0x2b, 0x4d, 0xcf, 0xf3, + 0xbf, 0x7a, 0x6b, 0xe5, 0xc6, 0x87, 0x6e, 0xfc, 0x37, 0x5c, 0x46, 0xee, 0xbc, 0xb3, 0x84, 0x92, + 0x12, 0x5e, 0xf8, 0x0e, 0x7b, 0x07, 0xfb, 0x33, 0x4e, 0xfe, 0xe3, 0x7b, 0xf2, 0x53, 0xb6, 0xc5, + 0xee, 0x8c, 0xd3, 0xe9, 0x0f, 0x64, 0x6f, 0x20, 0x9c, 0x35, 0x5e, 0x5b, 0xd4, 0x54, 0x8f, 0xfe, + 0xf1, 0x6e, 0xce, 0x38, 0x3d, 0x78, 0xf4, 0xe5, 0xc3, 0xcf, 0x74, 0x20, 0xfb, 0xf8, 0xd4, 0x64, + 0xad, 0xe4, 0xf9, 0xe3, 0xa4, 0x50, 0x8f, 0xd8, 0x0d, 0xa8, 0xf3, 0xde, 0xbd, 0x6b, 0xee, 0xd6, + 0xc4, 0xcc, 0x7b, 0xd3, 0x6c, 0x5c, 0x7d, 0xff, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x1f, 0xd3, 0x3a, + 0x98, 0x49, 0x02, 0x00, 0x00, } diff --git a/protos/msp/mspconfig.proto b/protos/msp/mspconfig.proto index cefa15b6972..ff6a4081b73 100644 --- a/protos/msp/mspconfig.proto +++ b/protos/msp/mspconfig.proto @@ -26,10 +26,10 @@ package msp; message MSPConfig { // Type holds the type of the MSP; the default one would // be of type FABRIC implementing an X.509 based provider - int32 Type = 1; + int32 type = 1; // Config is MSP dependent configuration info - bytes Config = 2; + bytes config = 2; } // FabricMSPConfig collects all the configuration information for @@ -46,12 +46,12 @@ message FabricMSPConfig { // For example, and assuming the default implementation of MSP, // that is X.509-based and considers a single Issuer, // this can refer to the Subject OU field or the Issuer OU field. - string Name = 1; + string name = 1; // List of root certificates trusted by this MSP // they are used upon certificate validation (see // comment for IntermediateCerts below) - repeated bytes RootCerts = 2; + repeated bytes root_certs = 2; // List of intermediate certificates trusted by this MSP; // they are used upon certificate validation as follows: @@ -61,18 +61,18 @@ message FabricMSPConfig { // the other end of the path). If the path is longer than // 2, certificates in the middle are searched within the // IntermediateCerts pool - repeated bytes IntermediateCerts = 3; + repeated bytes intermediate_certs = 3; // Identity denoting the administrator of this MSP - repeated bytes Admins = 4; + repeated bytes admins = 4; // Identity revocation list - repeated bytes RevocationList = 5; + repeated bytes revocation_list = 5; // SigningIdentity holds information on the signing identity // this peer is to use, and which is to be imported by the // MSP defined before - SigningIdentityInfo SigningIdentity = 6; + SigningIdentityInfo signing_identity = 6; } // SigningIdentityInfo represents the configuration information @@ -82,11 +82,11 @@ message SigningIdentityInfo { // PublicSigner carries the public information of the signing // identity. For an X.509 provider this would be represented by // an X.509 certificate - bytes PublicSigner = 1; + bytes public_signer = 1; // PrivateSigner denotes a reference to the private key of the // peer's signing identity - KeyInfo PrivateSigner = 2; + KeyInfo private_signer = 2; } // KeyInfo represents a (secret) key that is either already stored @@ -97,9 +97,9 @@ message KeyInfo { // Identifier of the key inside the default keystore; this for // the case of Software BCCSP as well as the HSM BCCSP would be // the SKI of the key - string KeyIdentifier = 1; + string key_identifier = 1; // KeyMaterial (optional) for the key to be imported; this is // properly encoded key bytes, prefixed by the type of the key - bytes KeyMaterial = 2; + bytes key_material = 2; } diff --git a/protos/peer/admin.pb.go b/protos/peer/admin.pb.go index c5cbb706105..517c847a893 100644 --- a/protos/peer/admin.pb.go +++ b/protos/peer/admin.pb.go @@ -128,8 +128,8 @@ func (*ServerStatus) ProtoMessage() {} func (*ServerStatus) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } type LogLevelRequest struct { - LogModule string `protobuf:"bytes,1,opt,name=logModule" json:"logModule,omitempty"` - LogLevel string `protobuf:"bytes,2,opt,name=logLevel" json:"logLevel,omitempty"` + LogModule string `protobuf:"bytes,1,opt,name=log_module,json=logModule" json:"log_module,omitempty"` + LogLevel string `protobuf:"bytes,2,opt,name=log_level,json=logLevel" json:"log_level,omitempty"` } func (m *LogLevelRequest) Reset() { *m = LogLevelRequest{} } @@ -138,8 +138,8 @@ func (*LogLevelRequest) ProtoMessage() {} func (*LogLevelRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } type LogLevelResponse struct { - LogModule string `protobuf:"bytes,1,opt,name=logModule" json:"logModule,omitempty"` - LogLevel string `protobuf:"bytes,2,opt,name=logLevel" json:"logLevel,omitempty"` + LogModule string `protobuf:"bytes,1,opt,name=log_module,json=logModule" json:"log_module,omitempty"` + LogLevel string `protobuf:"bytes,2,opt,name=log_level,json=logLevel" json:"log_level,omitempty"` } func (m *LogLevelResponse) Reset() { *m = LogLevelResponse{} } @@ -363,29 +363,30 @@ var _Admin_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("peer/admin.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 380 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x92, 0xcf, 0x6e, 0xda, 0x40, - 0x10, 0xc6, 0x31, 0x2d, 0xb4, 0x1e, 0xfa, 0x67, 0xbb, 0xaa, 0x5a, 0xe4, 0x56, 0x6a, 0xe5, 0x53, - 0xab, 0x4a, 0xb6, 0x44, 0x0f, 0x39, 0x24, 0x39, 0x90, 0xd8, 0x21, 0x11, 0xc4, 0x20, 0x1b, 0x14, - 0x25, 0x37, 0x1b, 0x0f, 0x06, 0xc9, 0xb0, 0xce, 0xee, 0x1a, 0x89, 0xd7, 0xc9, 0x3b, 0xe5, 0x7d, - 0x22, 0x7b, 0x21, 0x44, 0x49, 0x2e, 0x41, 0x39, 0x8d, 0x67, 0xe6, 0x9b, 0x4f, 0xde, 0x9f, 0x3e, - 0x20, 0x19, 0x22, 0xb7, 0xc3, 0x78, 0x3e, 0x5b, 0x58, 0x19, 0x67, 0x92, 0xd1, 0x7a, 0x59, 0x84, - 0xf1, 0x23, 0x61, 0x2c, 0x49, 0xd1, 0x2e, 0xdb, 0x28, 0x9f, 0xd8, 0x38, 0xcf, 0xe4, 0x4a, 0x89, - 0xcc, 0x1b, 0x0d, 0x3e, 0x04, 0xc8, 0x97, 0xc8, 0x03, 0x19, 0xca, 0x5c, 0xd0, 0x3d, 0xa8, 0x8b, - 0xf2, 0xab, 0xa9, 0xfd, 0xd6, 0xfe, 0x7c, 0x6a, 0xfd, 0x52, 0x42, 0x61, 0x3d, 0x54, 0x59, 0xaa, - 0x1c, 0xb3, 0x18, 0xfd, 0xb5, 0xdc, 0xbc, 0x04, 0xd8, 0x4e, 0xe9, 0x47, 0xd0, 0x47, 0x9e, 0xe3, - 0x9e, 0x9c, 0x79, 0xae, 0x43, 0x2a, 0xb4, 0x01, 0xef, 0x82, 0x61, 0xdb, 0x1f, 0xba, 0x0e, 0xd1, - 0x54, 0xd3, 0x1f, 0x0c, 0x5c, 0x87, 0x54, 0x29, 0x40, 0x7d, 0xd0, 0x1e, 0x05, 0xae, 0x43, 0xde, - 0x50, 0x1d, 0x6a, 0xae, 0xef, 0xf7, 0x7d, 0xf2, 0xb6, 0xd0, 0x8c, 0xbc, 0xae, 0xd7, 0xbf, 0xf0, - 0x48, 0xcd, 0xec, 0xc2, 0xe7, 0x1e, 0x4b, 0x7a, 0xb8, 0xc4, 0xd4, 0xc7, 0xeb, 0x1c, 0x85, 0xa4, - 0x3f, 0x41, 0x4f, 0x59, 0x72, 0xce, 0xe2, 0x3c, 0xc5, 0xf2, 0x4f, 0x75, 0x7f, 0x3b, 0xa0, 0x06, - 0xbc, 0x4f, 0xd7, 0x07, 0xcd, 0x6a, 0xb9, 0xbc, 0xef, 0xcd, 0x1e, 0x90, 0xad, 0x99, 0xc8, 0xd8, - 0x42, 0xe0, 0xee, 0x6e, 0xad, 0xdb, 0x2a, 0xd4, 0xda, 0x05, 0x74, 0xba, 0x0f, 0x7a, 0x07, 0xe5, - 0x9a, 0xe2, 0x37, 0x4b, 0x41, 0xb7, 0x36, 0xd0, 0x2d, 0xb7, 0x80, 0x6e, 0x7c, 0x7d, 0x8e, 0xa6, - 0x59, 0xa1, 0x87, 0xd0, 0x08, 0x64, 0xc8, 0xa5, 0x1a, 0xbf, 0xf8, 0xfc, 0xa0, 0x60, 0xcf, 0xb2, - 0x1d, 0xaf, 0x4f, 0xe1, 0x4b, 0x07, 0xa5, 0x7a, 0xec, 0x06, 0x0d, 0xfd, 0xbe, 0x11, 0x3f, 0x22, - 0x6f, 0x34, 0x9f, 0x2e, 0x14, 0x45, 0xe5, 0x14, 0xbc, 0x8a, 0xd3, 0xd1, 0xbf, 0xab, 0xbf, 0xc9, - 0x4c, 0x4e, 0xf3, 0xc8, 0x1a, 0xb3, 0xb9, 0x3d, 0x5d, 0x65, 0xc8, 0x53, 0x8c, 0x13, 0xe4, 0xf6, - 0x24, 0x8c, 0xf8, 0x6c, 0xac, 0xd2, 0x2c, 0xec, 0x22, 0xf5, 0x91, 0x4a, 0xfa, 0xff, 0xbb, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x9c, 0x1f, 0x0c, 0x90, 0x04, 0x03, 0x00, 0x00, + // 388 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x92, 0xdf, 0x8e, 0xd2, 0x40, + 0x14, 0xc6, 0x29, 0x0a, 0xda, 0x83, 0x7f, 0xc6, 0x89, 0x51, 0x02, 0x31, 0x9a, 0x5e, 0x69, 0x4c, + 0xda, 0x04, 0x2f, 0xbc, 0x50, 0x2f, 0xd0, 0x56, 0x34, 0x42, 0x21, 0x2d, 0xc4, 0xe8, 0x0d, 0x69, + 0xe9, 0xa1, 0x90, 0x4c, 0x99, 0xee, 0xcc, 0x94, 0x84, 0xd7, 0xd9, 0x77, 0xda, 0xf7, 0xd9, 0xb4, + 0x03, 0x61, 0xb3, 0xbb, 0x37, 0xfb, 0xe7, 0xea, 0xf4, 0x9c, 0xf3, 0x9d, 0x2f, 0x9d, 0x5f, 0x3e, + 0x20, 0x39, 0xa2, 0x70, 0xa2, 0x24, 0x5b, 0x6f, 0xec, 0x5c, 0x70, 0xc5, 0x69, 0xb3, 0x2a, 0xb2, + 0xd3, 0x4d, 0x39, 0x4f, 0x19, 0x3a, 0x55, 0x1b, 0x17, 0x4b, 0x07, 0xb3, 0x5c, 0xed, 0xb4, 0xc8, + 0x3a, 0x35, 0xe0, 0x49, 0x88, 0x62, 0x8b, 0x22, 0x54, 0x91, 0x2a, 0x24, 0xfd, 0x0c, 0x4d, 0x59, + 0x7d, 0xb5, 0x8d, 0x77, 0xc6, 0xfb, 0x67, 0xbd, 0xb7, 0x5a, 0x28, 0xed, 0x8b, 0x2a, 0x5b, 0x97, + 0x1f, 0x3c, 0xc1, 0x60, 0x2f, 0xb7, 0xfe, 0x01, 0x1c, 0xa7, 0xf4, 0x29, 0x98, 0x33, 0xdf, 0xf5, + 0x7e, 0xfe, 0xf6, 0x3d, 0x97, 0xd4, 0x68, 0x0b, 0x1e, 0x85, 0xd3, 0x7e, 0x30, 0xf5, 0x5c, 0x62, + 0xe8, 0x66, 0x3c, 0x99, 0x78, 0x2e, 0xa9, 0x53, 0x80, 0xe6, 0xa4, 0x3f, 0x0b, 0x3d, 0x97, 0x3c, + 0xa0, 0x26, 0x34, 0xbc, 0x20, 0x18, 0x07, 0xe4, 0x61, 0xa9, 0x99, 0xf9, 0x7f, 0xfc, 0xf1, 0x5f, + 0x9f, 0x34, 0xac, 0x11, 0x3c, 0x1f, 0xf2, 0x74, 0x88, 0x5b, 0x64, 0x01, 0x9e, 0x14, 0x28, 0x15, + 0x7d, 0x03, 0xc0, 0x78, 0x3a, 0xcf, 0x78, 0x52, 0x30, 0xac, 0x7e, 0xd5, 0x0c, 0x4c, 0xc6, 0xd3, + 0x51, 0x35, 0xa0, 0x5d, 0x28, 0x9b, 0x39, 0x2b, 0x4f, 0xda, 0xf5, 0x6a, 0xfb, 0x98, 0xed, 0x2d, + 0x2c, 0x1f, 0xc8, 0xd1, 0x4e, 0xe6, 0x7c, 0x23, 0xf1, 0x2e, 0x7e, 0xbd, 0xb3, 0x3a, 0x34, 0xfa, + 0x25, 0x78, 0xfa, 0x05, 0xcc, 0x01, 0xaa, 0x3d, 0xc9, 0x57, 0xb6, 0x06, 0x6f, 0x1f, 0xc0, 0xdb, + 0x5e, 0x09, 0xbe, 0xf3, 0xf2, 0x3a, 0xa2, 0x56, 0x8d, 0x7e, 0x83, 0x56, 0xa8, 0x22, 0xa1, 0xf4, + 0xf8, 0xc6, 0xe7, 0x5f, 0x4b, 0xfe, 0x3c, 0xbf, 0xe5, 0xf5, 0x2f, 0x78, 0x31, 0x40, 0xa5, 0x5f, + 0x7b, 0x80, 0x43, 0x5f, 0x1f, 0xc4, 0x97, 0xe8, 0x77, 0xda, 0x57, 0x17, 0x9a, 0xa3, 0x76, 0x0a, + 0xef, 0xc5, 0xe9, 0xfb, 0xc7, 0xff, 0x1f, 0xd2, 0xb5, 0x5a, 0x15, 0xb1, 0xbd, 0xe0, 0x99, 0xb3, + 0xda, 0xe5, 0x28, 0x18, 0x26, 0x29, 0x0a, 0x67, 0x19, 0xc5, 0x62, 0xbd, 0xd0, 0x89, 0x96, 0x4e, + 0x99, 0xfc, 0x58, 0xa7, 0xfd, 0xd3, 0x79, 0x00, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x24, 0x41, 0xca, + 0x08, 0x03, 0x00, 0x00, } diff --git a/protos/peer/admin.proto b/protos/peer/admin.proto index 4cb21eae6c9..9fd9df72a46 100644 --- a/protos/peer/admin.proto +++ b/protos/peer/admin.proto @@ -47,11 +47,11 @@ message ServerStatus { } message LogLevelRequest { - string logModule = 1; - string logLevel = 2; + string log_module = 1; + string log_level = 2; } message LogLevelResponse { - string logModule = 1; - string logLevel = 2; + string log_module = 1; + string log_level = 2; } diff --git a/protos/peer/chaincode.pb.go b/protos/peer/chaincode.pb.go index 7248f370f37..648e7bbfbe6 100644 --- a/protos/peer/chaincode.pb.go +++ b/protos/peer/chaincode.pb.go @@ -228,11 +228,11 @@ func (m *ChaincodeSpec) GetInput() *ChaincodeInput { // Specify the deployment of a chaincode. // TODO: Define `codePackage`. type ChaincodeDeploymentSpec struct { - ChaincodeSpec *ChaincodeSpec `protobuf:"bytes,1,opt,name=chaincodeSpec" json:"chaincodeSpec,omitempty"` + ChaincodeSpec *ChaincodeSpec `protobuf:"bytes,1,opt,name=chaincode_spec,json=chaincodeSpec" json:"chaincode_spec,omitempty"` // Controls when the chaincode becomes executable. - EffectiveDate *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=effectiveDate" json:"effectiveDate,omitempty"` - CodePackage []byte `protobuf:"bytes,3,opt,name=codePackage,proto3" json:"codePackage,omitempty"` - ExecEnv ChaincodeDeploymentSpec_ExecutionEnvironment `protobuf:"varint,4,opt,name=execEnv,enum=protos.ChaincodeDeploymentSpec_ExecutionEnvironment" json:"execEnv,omitempty"` + EffectiveDate *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=effective_date,json=effectiveDate" json:"effective_date,omitempty"` + CodePackage []byte `protobuf:"bytes,3,opt,name=code_package,json=codePackage,proto3" json:"code_package,omitempty"` + ExecEnv ChaincodeDeploymentSpec_ExecutionEnvironment `protobuf:"varint,4,opt,name=exec_env,json=execEnv,enum=protos.ChaincodeDeploymentSpec_ExecutionEnvironment" json:"exec_env,omitempty"` } func (m *ChaincodeDeploymentSpec) Reset() { *m = ChaincodeDeploymentSpec{} } @@ -256,7 +256,7 @@ func (m *ChaincodeDeploymentSpec) GetEffectiveDate() *google_protobuf1.Timestamp // Carries the chaincode function and its arguments. type ChaincodeInvocationSpec struct { - ChaincodeSpec *ChaincodeSpec `protobuf:"bytes,1,opt,name=chaincodeSpec" json:"chaincodeSpec,omitempty"` + ChaincodeSpec *ChaincodeSpec `protobuf:"bytes,1,opt,name=chaincode_spec,json=chaincodeSpec" json:"chaincode_spec,omitempty"` // This field can contain a user-specified ID generation algorithm // If supplied, this will be used to generate a ID // If not supplied (left empty), sha256base64 will be used @@ -264,7 +264,7 @@ type ChaincodeInvocationSpec struct { // 1, a hash function // 2, a decoding used to decode user (string) input to bytes // Currently, SHA256 with BASE64 is supported (e.g. idGenerationAlg='sha256base64') - IdGenerationAlg string `protobuf:"bytes,2,opt,name=idGenerationAlg" json:"idGenerationAlg,omitempty"` + IdGenerationAlg string `protobuf:"bytes,2,opt,name=id_generation_alg,json=idGenerationAlg" json:"id_generation_alg,omitempty"` } func (m *ChaincodeInvocationSpec) Reset() { *m = ChaincodeInvocationSpec{} } @@ -302,11 +302,11 @@ type ChaincodeMessage struct { Timestamp *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=timestamp" json:"timestamp,omitempty"` Payload []byte `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"` Txid string `protobuf:"bytes,4,opt,name=txid" json:"txid,omitempty"` - ProposalContext *ChaincodeProposalContext `protobuf:"bytes,5,opt,name=proposalContext" json:"proposalContext,omitempty"` + ProposalContext *ChaincodeProposalContext `protobuf:"bytes,5,opt,name=proposal_context,json=proposalContext" json:"proposal_context,omitempty"` // event emmited by chaincode. Used only with Init or Invoke. // This event is then stored (currently) // with Block.NonHashData.TransactionResult - ChaincodeEvent *ChaincodeEvent `protobuf:"bytes,6,opt,name=chaincodeEvent" json:"chaincodeEvent,omitempty"` + ChaincodeEvent *ChaincodeEvent `protobuf:"bytes,6,opt,name=chaincode_event,json=chaincodeEvent" json:"chaincode_event,omitempty"` } func (m *ChaincodeMessage) Reset() { *m = ChaincodeMessage{} } @@ -346,8 +346,8 @@ func (*PutStateInfo) ProtoMessage() {} func (*PutStateInfo) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} } type RangeQueryState struct { - StartKey string `protobuf:"bytes,1,opt,name=startKey" json:"startKey,omitempty"` - EndKey string `protobuf:"bytes,2,opt,name=endKey" json:"endKey,omitempty"` + StartKey string `protobuf:"bytes,1,opt,name=start_key,json=startKey" json:"start_key,omitempty"` + EndKey string `protobuf:"bytes,2,opt,name=end_key,json=endKey" json:"end_key,omitempty"` } func (m *RangeQueryState) Reset() { *m = RangeQueryState{} } @@ -393,8 +393,8 @@ func (*QueryStateKeyValue) ProtoMessage() {} func (*QueryStateKeyValue) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} } type QueryStateResponse struct { - KeysAndValues []*QueryStateKeyValue `protobuf:"bytes,1,rep,name=keysAndValues" json:"keysAndValues,omitempty"` - HasMore bool `protobuf:"varint,2,opt,name=hasMore" json:"hasMore,omitempty"` + KeysAndValues []*QueryStateKeyValue `protobuf:"bytes,1,rep,name=keys_and_values,json=keysAndValues" json:"keys_and_values,omitempty"` + HasMore bool `protobuf:"varint,2,opt,name=has_more,json=hasMore" json:"has_more,omitempty"` ID string `protobuf:"bytes,3,opt,name=ID" json:"ID,omitempty"` } @@ -538,74 +538,77 @@ var _ChaincodeSupport_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("peer/chaincode.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 1090 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x56, 0x5f, 0x6f, 0x1a, 0x47, - 0x10, 0xcf, 0xf1, 0xc7, 0x86, 0x01, 0xc3, 0x66, 0x43, 0x12, 0x8a, 0x5a, 0x95, 0x9e, 0xfa, 0xe0, - 0x54, 0x15, 0xb4, 0x34, 0xad, 0x2a, 0xb5, 0x8a, 0x7a, 0xb9, 0xdb, 0xd0, 0x8b, 0xf1, 0x41, 0x96, - 0xb3, 0x95, 0xf4, 0xc5, 0x3a, 0x1f, 0x0b, 0x3e, 0x19, 0xdf, 0x5e, 0xef, 0x16, 0x64, 0xde, 0xf2, - 0x91, 0xfa, 0xdc, 0xcf, 0xd4, 0xcf, 0x50, 0x55, 0x7b, 0x7f, 0xf8, 0x63, 0x6c, 0x29, 0x52, 0x9f, - 0xd8, 0xdf, 0xcc, 0x6f, 0x66, 0x67, 0x66, 0x67, 0x86, 0x83, 0x46, 0xc0, 0x58, 0xd8, 0x75, 0xaf, - 0x1c, 0xcf, 0x77, 0xf9, 0x84, 0x75, 0x82, 0x90, 0x0b, 0x8e, 0x0f, 0xe2, 0x9f, 0xa8, 0xf5, 0xd9, - 0xae, 0x96, 0x2d, 0x99, 0x2f, 0x12, 0x4a, 0xeb, 0xcb, 0x19, 0xe7, 0xb3, 0x39, 0xeb, 0xc6, 0xe8, - 0x72, 0x31, 0xed, 0x0a, 0xef, 0x86, 0x45, 0xc2, 0xb9, 0x09, 0x12, 0x82, 0x3a, 0x84, 0x8a, 0x9e, - 0x19, 0x9a, 0x06, 0xc6, 0x50, 0x08, 0x1c, 0x71, 0xd5, 0x54, 0xda, 0xca, 0x71, 0x99, 0xc6, 0x67, - 0x29, 0xf3, 0x9d, 0x1b, 0xd6, 0xcc, 0x25, 0x32, 0x79, 0xc6, 0x4d, 0x38, 0x5c, 0xb2, 0x30, 0xf2, - 0xb8, 0xdf, 0xcc, 0xc7, 0xe2, 0x0c, 0xaa, 0x5f, 0x43, 0x6d, 0xe3, 0xd0, 0x0f, 0x16, 0x42, 0xda, - 0x3b, 0xe1, 0x2c, 0x6a, 0x2a, 0xed, 0xfc, 0x71, 0x95, 0xc6, 0x67, 0xf5, 0x5f, 0x05, 0x8e, 0xd6, - 0xb4, 0x71, 0xc0, 0x5c, 0xdc, 0x81, 0x82, 0x58, 0x05, 0x2c, 0xbe, 0xb9, 0xd6, 0x6b, 0x25, 0xe1, - 0x45, 0x9d, 0x1d, 0x52, 0xc7, 0x5e, 0x05, 0x8c, 0xc6, 0x3c, 0xfc, 0x23, 0x54, 0xdc, 0x4d, 0xe0, - 0x71, 0x70, 0x95, 0xde, 0x93, 0x3d, 0x33, 0xd3, 0xa0, 0xdb, 0x3c, 0xfc, 0x2d, 0x14, 0x3d, 0x19, - 0x55, 0x1c, 0x76, 0xa5, 0xf7, 0x6c, 0xdf, 0x40, 0x6a, 0x69, 0x42, 0x92, 0x69, 0xca, 0x82, 0xf1, - 0x85, 0x68, 0x16, 0xda, 0xca, 0x71, 0x91, 0x66, 0x50, 0x7d, 0x05, 0x05, 0x19, 0x0c, 0x3e, 0x82, - 0xf2, 0x99, 0x65, 0x90, 0x37, 0xa6, 0x45, 0x0c, 0xf4, 0x08, 0x03, 0x1c, 0xf4, 0x87, 0x03, 0xcd, - 0xea, 0x23, 0x05, 0x97, 0xa0, 0x60, 0x0d, 0x0d, 0x82, 0x72, 0xf8, 0x10, 0xf2, 0xba, 0x46, 0x51, - 0x5e, 0x8a, 0xde, 0x6a, 0xe7, 0x1a, 0x2a, 0xa8, 0x7f, 0xe7, 0xe0, 0xf9, 0xfa, 0x4e, 0x83, 0x05, - 0x73, 0xbe, 0xba, 0x61, 0xbe, 0x88, 0x4b, 0xf1, 0x0b, 0x1c, 0xb9, 0xdb, 0x69, 0xc7, 0x35, 0xa9, - 0xf4, 0x9e, 0xde, 0x5b, 0x13, 0xba, 0xcb, 0xc5, 0xbf, 0xc1, 0x11, 0x9b, 0x4e, 0x99, 0x2b, 0xbc, - 0x25, 0x33, 0x1c, 0xc1, 0xd2, 0xca, 0xb4, 0x3a, 0x49, 0x27, 0x74, 0xb2, 0x4e, 0xe8, 0xd8, 0x59, - 0x27, 0xd0, 0x5d, 0x03, 0xdc, 0x86, 0x8a, 0xf4, 0x36, 0x72, 0xdc, 0x6b, 0x67, 0xc6, 0xe2, 0x42, - 0x55, 0xe9, 0xb6, 0x08, 0x5b, 0x70, 0xc8, 0x6e, 0x99, 0x4b, 0xfc, 0x65, 0x5c, 0x96, 0x5a, 0xef, - 0xe5, 0x5e, 0x68, 0xbb, 0x29, 0x75, 0xc8, 0x2d, 0x73, 0x17, 0xc2, 0xe3, 0x3e, 0xf1, 0x97, 0x5e, - 0xc8, 0x7d, 0xa9, 0xa0, 0x99, 0x13, 0xb5, 0x03, 0x8d, 0xfb, 0x08, 0xb2, 0x9a, 0xc6, 0x50, 0x3f, - 0x21, 0x34, 0xa9, 0xec, 0xf8, 0xc3, 0xd8, 0x26, 0xa7, 0x48, 0x51, 0x3f, 0x2a, 0x5b, 0xc5, 0x33, - 0xfd, 0x25, 0x77, 0x1d, 0x69, 0xfa, 0xff, 0x8b, 0x77, 0x0c, 0x75, 0x6f, 0xd2, 0x67, 0x3e, 0x0b, - 0x63, 0x87, 0xda, 0x7c, 0x96, 0x76, 0xfd, 0x5d, 0xb1, 0x4a, 0xa1, 0xb9, 0xf6, 0x34, 0x0a, 0x79, - 0xc0, 0x23, 0x67, 0xae, 0x73, 0x5f, 0xb0, 0xdb, 0xb8, 0x6b, 0xdc, 0x90, 0x39, 0x82, 0x87, 0xf1, - 0xe5, 0x55, 0x9a, 0x41, 0xfc, 0x39, 0x94, 0x45, 0xe8, 0xf8, 0x91, 0xc7, 0x7c, 0x11, 0x7b, 0xae, - 0xd2, 0x8d, 0x40, 0xfd, 0xa7, 0x00, 0x68, 0xed, 0xf4, 0x94, 0x45, 0x91, 0xac, 0xf5, 0xf7, 0x3b, - 0x73, 0xf1, 0xc5, 0x5e, 0x1a, 0x29, 0x6f, 0x7b, 0x34, 0x7e, 0x86, 0xf2, 0x7a, 0xcc, 0x3f, 0xe1, - 0xf9, 0x37, 0x64, 0x19, 0x79, 0xe0, 0xac, 0xe6, 0xdc, 0x99, 0xa4, 0xcf, 0x9e, 0x41, 0x39, 0xc4, - 0xe2, 0xd6, 0x9b, 0xc4, 0xef, 0x5d, 0xa6, 0xf1, 0x19, 0xbf, 0x85, 0x7a, 0xb0, 0x9b, 0x7a, 0xb3, - 0x18, 0xdf, 0xd6, 0xde, 0x8b, 0xf2, 0x4e, 0x89, 0xe8, 0x5d, 0x43, 0xfc, 0x0a, 0x6a, 0xeb, 0xa7, - 0x20, 0x72, 0x81, 0x35, 0x0f, 0x1e, 0x18, 0xd0, 0x58, 0x4b, 0xef, 0xb0, 0xd5, 0xbf, 0x72, 0xf7, - 0x0f, 0x64, 0x15, 0x4a, 0x94, 0xf4, 0xcd, 0xb1, 0x4d, 0x28, 0x52, 0x70, 0x0d, 0x20, 0x43, 0xc4, - 0x40, 0x39, 0x39, 0x8f, 0xa6, 0x65, 0xda, 0x28, 0x8f, 0xcb, 0x50, 0xa4, 0x44, 0x33, 0x3e, 0xa0, - 0x02, 0xae, 0x43, 0xc5, 0xa6, 0x9a, 0x35, 0xd6, 0x74, 0xdb, 0x1c, 0x5a, 0xa8, 0x28, 0x5d, 0xea, - 0xc3, 0xd3, 0xd1, 0x80, 0xd8, 0xc4, 0x40, 0x07, 0x92, 0x4a, 0x28, 0x1d, 0x52, 0x74, 0x28, 0x35, - 0x7d, 0x62, 0x5f, 0x8c, 0x6d, 0xcd, 0x26, 0xa8, 0x24, 0xe1, 0xe8, 0x2c, 0x83, 0x65, 0x09, 0x0d, - 0x32, 0x48, 0x21, 0xe0, 0x06, 0x20, 0xd3, 0x3a, 0x1f, 0x9e, 0x90, 0x0b, 0xfd, 0x77, 0xcd, 0xb4, - 0x74, 0xb9, 0x1b, 0x2a, 0x49, 0x80, 0xe3, 0xd1, 0xd0, 0x1a, 0x13, 0x74, 0x84, 0x9f, 0xc2, 0x63, - 0xaa, 0x59, 0x7d, 0x72, 0xf1, 0xee, 0x8c, 0xd0, 0x0f, 0xa9, 0x69, 0x0d, 0x3f, 0x87, 0x27, 0xe4, - 0x3d, 0xd1, 0xcf, 0xec, 0x5d, 0x45, 0x5d, 0xfa, 0xdc, 0x12, 0x5c, 0x58, 0xe4, 0xbd, 0x8d, 0x90, - 0xf4, 0xb2, 0x2d, 0xd5, 0x07, 0xc3, 0x31, 0x41, 0x8f, 0x65, 0x3c, 0x27, 0x84, 0x8c, 0xb4, 0x81, - 0x79, 0x4e, 0x10, 0x56, 0x7f, 0x82, 0xea, 0x68, 0x21, 0xc6, 0xc2, 0x11, 0xcc, 0xf4, 0xa7, 0x1c, - 0x23, 0xc8, 0x5f, 0xb3, 0x55, 0xba, 0xfa, 0xe5, 0x11, 0x37, 0xa0, 0xb8, 0x74, 0xe6, 0x0b, 0x96, - 0xb6, 0x6a, 0x02, 0x54, 0x02, 0x75, 0xea, 0xf8, 0x33, 0xf6, 0x6e, 0xc1, 0xc2, 0x55, 0x6c, 0x8e, - 0x5b, 0x50, 0x8a, 0x84, 0x13, 0x8a, 0x93, 0xb5, 0xfd, 0x1a, 0xe3, 0x67, 0x70, 0xc0, 0xfc, 0x89, - 0xd4, 0x24, 0xa3, 0x94, 0x22, 0xf5, 0x05, 0x3c, 0x4e, 0x86, 0x7e, 0xdb, 0x51, 0x03, 0x8a, 0x7f, - 0x4a, 0x94, 0x7a, 0x49, 0x80, 0xda, 0x86, 0xda, 0x86, 0x63, 0xc9, 0x76, 0xa9, 0x41, 0xce, 0x34, - 0x52, 0x52, 0xce, 0x34, 0xd4, 0xaf, 0xa0, 0xbe, 0x61, 0xe8, 0x73, 0x1e, 0xb1, 0x3d, 0xca, 0xaf, - 0x80, 0x37, 0x94, 0x13, 0xb6, 0x3a, 0x97, 0xc9, 0x7c, 0x72, 0xd2, 0x1f, 0x95, 0x6d, 0x73, 0xca, - 0xa2, 0x80, 0xfb, 0x11, 0x93, 0xdb, 0xf6, 0x9a, 0xad, 0x22, 0xcd, 0x9f, 0xc4, 0xee, 0x92, 0x3f, - 0xb9, 0xca, 0xe6, 0xef, 0x6b, 0xff, 0x46, 0xba, 0x6b, 0x20, 0x47, 0xee, 0xca, 0x89, 0x4e, 0x79, - 0x98, 0x5c, 0x58, 0xa2, 0x19, 0x4c, 0x13, 0xc8, 0x67, 0x09, 0x7c, 0xf3, 0x12, 0x1a, 0x3a, 0xf7, - 0xa7, 0xde, 0x84, 0xf9, 0xc2, 0x73, 0xe6, 0x9e, 0x58, 0x0d, 0xd8, 0x92, 0xcd, 0xe5, 0x66, 0x1c, - 0x9d, 0xbd, 0x1e, 0x98, 0x3a, 0x7a, 0x84, 0x11, 0x54, 0xf5, 0xa1, 0xf5, 0xc6, 0x34, 0x88, 0x65, - 0x9b, 0xda, 0x00, 0x29, 0xbd, 0xf7, 0x5b, 0x3b, 0x65, 0xbc, 0x08, 0x02, 0x1e, 0x0a, 0x6c, 0x40, - 0x89, 0xb2, 0x99, 0x17, 0x09, 0x16, 0xe2, 0xe6, 0x43, 0x1b, 0xa5, 0xf5, 0xa0, 0x46, 0x7d, 0x74, - 0xac, 0x7c, 0xa7, 0xbc, 0xd6, 0xe1, 0x19, 0x0f, 0x67, 0x9d, 0xab, 0x55, 0xc0, 0xc2, 0x39, 0x9b, - 0xcc, 0x58, 0x98, 0x1a, 0xfc, 0xf1, 0x62, 0xe6, 0x89, 0xab, 0xc5, 0x65, 0xc7, 0xe5, 0x37, 0xdd, - 0x2d, 0x75, 0x77, 0xea, 0x5c, 0x86, 0x9e, 0x9b, 0x7c, 0x8c, 0x44, 0x5d, 0xf9, 0xd5, 0x72, 0x99, - 0x7c, 0xc3, 0xfc, 0xf0, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe5, 0x9c, 0x73, 0xa3, 0xe2, 0x08, - 0x00, 0x00, + // 1141 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6e, 0xdb, 0x46, + 0x10, 0x0e, 0xf5, 0x63, 0x4b, 0x23, 0x59, 0x5a, 0x6f, 0x9c, 0x44, 0x71, 0x5b, 0xd4, 0x21, 0x7a, + 0x70, 0x82, 0x42, 0x6e, 0xdd, 0xb4, 0xe8, 0x21, 0x68, 0xc1, 0x90, 0x1b, 0x95, 0x95, 0x4c, 0x29, + 0x2b, 0xda, 0x48, 0x7a, 0x21, 0x68, 0x6a, 0x2c, 0x13, 0x91, 0x49, 0x96, 0x5c, 0x09, 0xd6, 0x39, + 0x2f, 0xd4, 0x27, 0xe8, 0x23, 0xf5, 0x11, 0x8a, 0x62, 0x97, 0xfa, 0x73, 0x94, 0x00, 0x39, 0xf4, + 0xa4, 0xfd, 0x66, 0xbe, 0x99, 0x9d, 0xf9, 0x76, 0x67, 0x45, 0x38, 0x48, 0x10, 0xd3, 0x93, 0xe0, + 0xda, 0x0f, 0xa3, 0x20, 0x1e, 0x61, 0x3b, 0x49, 0x63, 0x11, 0xd3, 0x1d, 0xf5, 0x93, 0x1d, 0x3e, + 0xbe, 0xeb, 0xc5, 0x19, 0x46, 0x22, 0xa7, 0x1c, 0x7e, 0x3d, 0x8e, 0xe3, 0xf1, 0x04, 0x4f, 0x14, + 0xba, 0x9c, 0x5e, 0x9d, 0x88, 0xf0, 0x06, 0x33, 0xe1, 0xdf, 0x24, 0x39, 0x41, 0xef, 0x43, 0xcd, + 0x5c, 0x06, 0xda, 0x16, 0xa5, 0x50, 0x4a, 0x7c, 0x71, 0xdd, 0xd2, 0x8e, 0xb4, 0xe3, 0x2a, 0x57, + 0x6b, 0x69, 0x8b, 0xfc, 0x1b, 0x6c, 0x15, 0x72, 0x9b, 0x5c, 0xd3, 0x16, 0xec, 0xce, 0x30, 0xcd, + 0xc2, 0x38, 0x6a, 0x15, 0x95, 0x79, 0x09, 0xf5, 0x6f, 0xa0, 0xb1, 0x4e, 0x18, 0x25, 0x53, 0x21, + 0xe3, 0xfd, 0x74, 0x9c, 0xb5, 0xb4, 0xa3, 0xe2, 0x71, 0x9d, 0xab, 0xb5, 0xfe, 0xaf, 0x06, 0x7b, + 0x2b, 0xda, 0x30, 0xc1, 0x80, 0xb6, 0xa1, 0x24, 0xe6, 0x09, 0xaa, 0x9d, 0x1b, 0xa7, 0x87, 0x79, + 0x79, 0x59, 0xfb, 0x0e, 0xa9, 0xed, 0xce, 0x13, 0xe4, 0x8a, 0x47, 0x7f, 0x84, 0x5a, 0xb0, 0x2e, + 0x5c, 0x15, 0x57, 0x3b, 0xbd, 0xbf, 0x15, 0x66, 0x5b, 0x7c, 0x93, 0x47, 0xbf, 0x85, 0x72, 0x28, + 0xab, 0x52, 0x65, 0xd7, 0x4e, 0x1f, 0x6e, 0x07, 0x48, 0x2f, 0xcf, 0x49, 0xb2, 0x4d, 0x29, 0x58, + 0x3c, 0x15, 0xad, 0xd2, 0x91, 0x76, 0x5c, 0xe6, 0x4b, 0xa8, 0xff, 0x02, 0x25, 0x59, 0x0c, 0xdd, + 0x83, 0xea, 0xb9, 0x63, 0xb1, 0x57, 0xb6, 0xc3, 0x2c, 0x72, 0x8f, 0x02, 0xec, 0x74, 0xfa, 0x3d, + 0xc3, 0xe9, 0x10, 0x8d, 0x56, 0xa0, 0xe4, 0xf4, 0x2d, 0x46, 0x0a, 0x74, 0x17, 0x8a, 0xa6, 0xc1, + 0x49, 0x51, 0x9a, 0x7e, 0x37, 0x2e, 0x0c, 0x52, 0xd2, 0xff, 0x2e, 0xc0, 0xa3, 0xd5, 0x9e, 0x16, + 0x26, 0x93, 0x78, 0x7e, 0x83, 0x91, 0x50, 0x52, 0xbc, 0x80, 0xc6, 0xaa, 0x64, 0x2f, 0x4b, 0x30, + 0x50, 0xa2, 0xd4, 0x4e, 0x1f, 0x7c, 0x54, 0x14, 0xbe, 0x17, 0xdc, 0x11, 0xd2, 0x80, 0x06, 0x5e, + 0x5d, 0x61, 0x20, 0xc2, 0x19, 0x7a, 0x23, 0x5f, 0xe0, 0x42, 0x9b, 0xc3, 0x76, 0x7e, 0x17, 0xda, + 0xcb, 0xbb, 0xd0, 0x76, 0x97, 0x77, 0x81, 0xef, 0xad, 0x22, 0x2c, 0x5f, 0x20, 0x7d, 0x02, 0x75, + 0xb5, 0x77, 0xe2, 0x07, 0xef, 0xfc, 0x31, 0x2a, 0xad, 0xea, 0xbc, 0x26, 0x6d, 0x83, 0xdc, 0x44, + 0xfb, 0x50, 0xc1, 0x5b, 0x0c, 0x3c, 0x8c, 0x66, 0x4a, 0x9a, 0xc6, 0xe9, 0xf3, 0xad, 0xea, 0xee, + 0xb6, 0xd5, 0x66, 0xb7, 0x18, 0x4c, 0x45, 0x18, 0x47, 0x2c, 0x9a, 0x85, 0x69, 0x1c, 0x49, 0x07, + 0xdf, 0x95, 0x59, 0x58, 0x34, 0xd3, 0xdb, 0x70, 0xf0, 0x31, 0x82, 0x54, 0xd4, 0xea, 0x9b, 0x5d, + 0xc6, 0x73, 0x75, 0x87, 0x6f, 0x87, 0x2e, 0x3b, 0x23, 0x9a, 0xfe, 0x5e, 0xdb, 0x10, 0xd0, 0x8e, + 0x66, 0x71, 0xe0, 0xcb, 0xd0, 0xff, 0x41, 0xc0, 0x67, 0xb0, 0x1f, 0x8e, 0xbc, 0x31, 0x46, 0x98, + 0xaa, 0x94, 0x9e, 0x3f, 0x19, 0x2f, 0x2e, 0x7f, 0x33, 0x1c, 0x75, 0x56, 0x76, 0x63, 0x32, 0xd6, + 0x39, 0xb4, 0x56, 0xb9, 0x06, 0x69, 0x9c, 0xc4, 0x99, 0x3f, 0x31, 0xe3, 0x48, 0xe0, 0xad, 0xba, + 0x3c, 0x41, 0x8a, 0xbe, 0x88, 0x53, 0xb5, 0x7d, 0x9d, 0x2f, 0x21, 0xfd, 0x12, 0xaa, 0x22, 0xf5, + 0xa3, 0x2c, 0xc4, 0x48, 0xa8, 0xcc, 0x75, 0xbe, 0x36, 0xe8, 0xff, 0x94, 0x80, 0xac, 0x92, 0x9e, + 0x61, 0x96, 0x49, 0xbd, 0xbf, 0xbf, 0x33, 0x1e, 0x5f, 0x6d, 0x35, 0xb2, 0xe0, 0x6d, 0x4e, 0xc8, + 0xcf, 0x50, 0x5d, 0x4d, 0xfb, 0x67, 0xdc, 0x81, 0x35, 0x59, 0x56, 0x9e, 0xf8, 0xf3, 0x49, 0xec, + 0x8f, 0x16, 0x47, 0xbf, 0x84, 0x72, 0x96, 0xc5, 0x6d, 0x38, 0x52, 0x47, 0x5e, 0xe5, 0x6a, 0x4d, + 0xbb, 0x40, 0x92, 0x45, 0xeb, 0x5e, 0x90, 0xf7, 0xde, 0x2a, 0xab, 0xed, 0x8e, 0xb6, 0xca, 0xfc, + 0x40, 0x23, 0xde, 0x4c, 0x3e, 0x10, 0xed, 0x57, 0x68, 0xae, 0x8f, 0x4e, 0xbd, 0x64, 0xad, 0x9d, + 0x4f, 0x4c, 0x2a, 0x93, 0x5e, 0xbe, 0x3e, 0x69, 0x85, 0xf5, 0xbf, 0x0a, 0x1f, 0x9f, 0xcc, 0x3a, + 0x54, 0x38, 0xeb, 0xd8, 0x43, 0x97, 0x71, 0xa2, 0xd1, 0x06, 0xc0, 0x12, 0x31, 0x8b, 0x14, 0xe4, + 0x60, 0xda, 0x8e, 0xed, 0x92, 0x22, 0xad, 0x42, 0x99, 0x33, 0xc3, 0x7a, 0x4b, 0x4a, 0xb4, 0x09, + 0x35, 0x97, 0x1b, 0xce, 0xd0, 0x30, 0x5d, 0xbb, 0xef, 0x90, 0xb2, 0x4c, 0x69, 0xf6, 0xcf, 0x06, + 0x3d, 0xe6, 0x32, 0x8b, 0xec, 0x48, 0x2a, 0xe3, 0xbc, 0xcf, 0xc9, 0xae, 0xf4, 0x74, 0x98, 0xeb, + 0x0d, 0x5d, 0xc3, 0x65, 0xa4, 0x22, 0xe1, 0xe0, 0x7c, 0x09, 0xab, 0x12, 0x5a, 0xac, 0xb7, 0x80, + 0x40, 0x0f, 0x80, 0xd8, 0xce, 0x45, 0xbf, 0xcb, 0x3c, 0xf3, 0x37, 0xc3, 0x76, 0x4c, 0xf9, 0x48, + 0xd4, 0xf2, 0x02, 0x87, 0x83, 0xbe, 0x33, 0x64, 0x64, 0x8f, 0x3e, 0x80, 0x7d, 0x6e, 0x38, 0x1d, + 0xe6, 0xbd, 0x3e, 0x67, 0xfc, 0xed, 0x22, 0xb4, 0x41, 0x1f, 0xc1, 0x7d, 0xf6, 0x86, 0x99, 0xe7, + 0xee, 0x5d, 0x47, 0x53, 0xe6, 0xdc, 0x30, 0x78, 0x0e, 0x7b, 0xe3, 0x12, 0x22, 0xb3, 0x6c, 0x5a, + 0xcd, 0x5e, 0x7f, 0xc8, 0xc8, 0xbe, 0xac, 0xa7, 0xcb, 0xd8, 0xc0, 0xe8, 0xd9, 0x17, 0x8c, 0x50, + 0xfd, 0x27, 0xa8, 0x0f, 0xa6, 0x62, 0x28, 0x7c, 0x81, 0x76, 0x74, 0x15, 0x53, 0x02, 0xc5, 0x77, + 0x38, 0x5f, 0xfc, 0x07, 0xc8, 0x25, 0x3d, 0x80, 0xf2, 0xcc, 0x9f, 0x4c, 0x71, 0x71, 0x59, 0x73, + 0xa0, 0x77, 0xa0, 0xc9, 0xfd, 0x68, 0x8c, 0xaf, 0xa7, 0x98, 0xce, 0x55, 0x38, 0xfd, 0x02, 0xaa, + 0x99, 0xf0, 0x53, 0xe1, 0xad, 0x13, 0x54, 0x94, 0xa1, 0x8b, 0x73, 0xfa, 0x08, 0x76, 0x31, 0x1a, + 0x29, 0x57, 0x3e, 0x4e, 0x3b, 0x18, 0x8d, 0xba, 0x38, 0xd7, 0x9f, 0xc2, 0x7e, 0x3e, 0xfb, 0x9b, + 0xa9, 0x0e, 0xa0, 0xfc, 0xa7, 0x44, 0x8b, 0x34, 0x39, 0xd0, 0x8f, 0xa0, 0xb1, 0xe6, 0x38, 0xf2, + 0xc6, 0x34, 0xa0, 0x60, 0x5b, 0x0b, 0x52, 0xc1, 0xb6, 0xf4, 0x27, 0xd0, 0x5c, 0x33, 0xcc, 0x49, + 0x9c, 0xe1, 0x16, 0xe5, 0x05, 0xd0, 0x35, 0xa5, 0x8b, 0xf3, 0x0b, 0xd9, 0xce, 0x67, 0xb7, 0xfd, + 0x5e, 0xdb, 0x0c, 0xe7, 0x98, 0x25, 0x71, 0x94, 0x21, 0x7d, 0x09, 0xcd, 0x77, 0x38, 0xcf, 0x3c, + 0x3f, 0x1a, 0x79, 0x8a, 0x98, 0xff, 0xe3, 0xd5, 0xd6, 0xff, 0x65, 0xdb, 0x7b, 0xf2, 0x3d, 0x19, + 0x62, 0x44, 0x23, 0x85, 0x32, 0xfa, 0x18, 0x2a, 0xd7, 0x7e, 0xe6, 0xdd, 0xc4, 0x69, 0xbe, 0x67, + 0x85, 0xef, 0x5e, 0xfb, 0xd9, 0x59, 0x9c, 0x2e, 0x7b, 0x28, 0x2e, 0x7b, 0x78, 0xf6, 0x1c, 0x0e, + 0xcc, 0x38, 0xba, 0x0a, 0x47, 0x18, 0x89, 0xd0, 0x9f, 0x84, 0x62, 0xde, 0xc3, 0x19, 0x4e, 0xe4, + 0x1b, 0x39, 0x38, 0x7f, 0xd9, 0xb3, 0x4d, 0x72, 0x8f, 0x12, 0xa8, 0x9b, 0x7d, 0xe7, 0x95, 0x6d, + 0x31, 0xc7, 0xb5, 0x8d, 0x1e, 0xd1, 0x4e, 0xdf, 0x6c, 0x3c, 0x2d, 0xc3, 0x69, 0x92, 0xc4, 0xa9, + 0xa0, 0x16, 0x54, 0x38, 0x8e, 0xc3, 0x4c, 0x60, 0x4a, 0x5b, 0x9f, 0x7a, 0x58, 0x0e, 0x3f, 0xe9, + 0xd1, 0xef, 0x1d, 0x6b, 0xdf, 0x69, 0x2f, 0x4d, 0x78, 0x18, 0xa7, 0xe3, 0xf6, 0xf5, 0x3c, 0xc1, + 0x74, 0x82, 0xa3, 0x31, 0xa6, 0x8b, 0x80, 0x3f, 0x9e, 0x8e, 0x43, 0x71, 0x3d, 0xbd, 0x6c, 0x07, + 0xf1, 0xcd, 0xc9, 0x86, 0xfb, 0xe4, 0xca, 0xbf, 0x4c, 0xc3, 0x20, 0xff, 0x34, 0xc9, 0x4e, 0xe4, + 0x37, 0xcc, 0x65, 0xfe, 0x45, 0xf3, 0xc3, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x41, 0x1b, 0x34, + 0xd4, 0xf0, 0x08, 0x00, 0x00, } diff --git a/protos/peer/chaincode.proto b/protos/peer/chaincode.proto index 849d0223791..f0a0d3778e7 100644 --- a/protos/peer/chaincode.proto +++ b/protos/peer/chaincode.proto @@ -69,7 +69,7 @@ message ChaincodeSpec { } Type type = 1; - ChaincodeID chaincodeID = 2; + ChaincodeID chaincodeID = 2; // XXX change to chaincode_id ChaincodeInput input = 3; int32 timeout = 4; } @@ -83,18 +83,18 @@ message ChaincodeDeploymentSpec { SYSTEM = 1; } - ChaincodeSpec chaincodeSpec = 1; + ChaincodeSpec chaincode_spec = 1; // Controls when the chaincode becomes executable. - google.protobuf.Timestamp effectiveDate = 2; - bytes codePackage = 3; - ExecutionEnvironment execEnv= 4; + google.protobuf.Timestamp effective_date = 2; + bytes code_package = 3; + ExecutionEnvironment exec_env= 4; } // Carries the chaincode function and its arguments. message ChaincodeInvocationSpec { - ChaincodeSpec chaincodeSpec = 1; + ChaincodeSpec chaincode_spec = 1; // This field can contain a user-specified ID generation algorithm // If supplied, this will be used to generate a ID // If not supplied (left empty), sha256base64 will be used @@ -102,7 +102,7 @@ message ChaincodeInvocationSpec { // 1, a hash function // 2, a decoding used to decode user (string) input to bytes // Currently, SHA256 with BASE64 is supported (e.g. idGenerationAlg='sha256base64') - string idGenerationAlg = 2; + string id_generation_alg = 2; } // ChaincodeProposalContext contains proposal data that we send to the chaincode @@ -148,12 +148,12 @@ message ChaincodeMessage { bytes payload = 3; string txid = 4; - ChaincodeProposalContext proposalContext = 5; + ChaincodeProposalContext proposal_context = 5; //event emmited by chaincode. Used only with Init or Invoke. // This event is then stored (currently) //with Block.NonHashData.TransactionResult - ChaincodeEvent chaincodeEvent = 6; + ChaincodeEvent chaincode_event = 6; } message PutStateInfo { @@ -162,8 +162,8 @@ message PutStateInfo { } message RangeQueryState { - string startKey = 1; - string endKey = 2; + string start_key = 1; + string end_key = 2; } message ExecuteQueryState { @@ -171,11 +171,11 @@ message ExecuteQueryState { } message QueryStateNext { - string ID = 1; + string ID = 1; // XXX change to id } message QueryStateClose { - string ID = 1; + string ID = 1; // XXX change to id } message QueryStateKeyValue { @@ -184,9 +184,9 @@ message QueryStateKeyValue { } message QueryStateResponse { - repeated QueryStateKeyValue keysAndValues = 1; - bool hasMore = 2; - string ID = 3; + repeated QueryStateKeyValue keys_and_values = 1; + bool has_more = 2; + string ID = 3; // XXX change to id } // Interface that provides support to chaincode execution. ChaincodeContext diff --git a/protos/peer/chaincodeevent.pb.go b/protos/peer/chaincodeevent.pb.go index 168f9c36cd3..84dababd1b8 100644 --- a/protos/peer/chaincodeevent.pb.go +++ b/protos/peer/chaincodeevent.pb.go @@ -18,7 +18,7 @@ var _ = math.Inf type ChaincodeEvent struct { ChaincodeID string `protobuf:"bytes,1,opt,name=chaincodeID" json:"chaincodeID,omitempty"` TxID string `protobuf:"bytes,2,opt,name=txID" json:"txID,omitempty"` - EventName string `protobuf:"bytes,3,opt,name=eventName" json:"eventName,omitempty"` + EventName string `protobuf:"bytes,3,opt,name=event_name,json=eventName" json:"event_name,omitempty"` Payload []byte `protobuf:"bytes,4,opt,name=payload,proto3" json:"payload,omitempty"` } @@ -34,17 +34,17 @@ func init() { func init() { proto.RegisterFile("peer/chaincodeevent.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 186 bytes of a gzipped FileDescriptorProto + // 192 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x2c, 0x48, 0x4d, 0x2d, 0xd2, 0x4f, 0xce, 0x48, 0xcc, 0xcc, 0x4b, 0xce, 0x4f, 0x49, 0x4d, 0x2d, 0x4b, 0xcd, 0x2b, 0xd1, - 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x03, 0x53, 0xc5, 0x4a, 0x75, 0x5c, 0x7c, 0xce, 0x30, + 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x03, 0x53, 0xc5, 0x4a, 0xf5, 0x5c, 0x7c, 0xce, 0x30, 0x79, 0x57, 0x90, 0xbc, 0x90, 0x02, 0x17, 0x37, 0x5c, 0x87, 0xa7, 0x8b, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x67, 0x10, 0xb2, 0x90, 0x90, 0x10, 0x17, 0x4b, 0x49, 0x85, 0xa7, 0x8b, 0x04, 0x13, 0x58, - 0x0a, 0xcc, 0x16, 0x92, 0xe1, 0xe2, 0x04, 0x1b, 0xef, 0x97, 0x98, 0x9b, 0x2a, 0xc1, 0x0c, 0x96, - 0x40, 0x08, 0x08, 0x49, 0x70, 0xb1, 0x17, 0x24, 0x56, 0xe6, 0xe4, 0x27, 0xa6, 0x48, 0xb0, 0x28, - 0x30, 0x6a, 0xf0, 0x04, 0xc1, 0xb8, 0x4e, 0xce, 0x5c, 0x62, 0xf9, 0x45, 0xe9, 0x7a, 0x19, 0x95, - 0x05, 0xa9, 0x45, 0x39, 0xa9, 0x29, 0xe9, 0xa9, 0x45, 0x10, 0x07, 0x16, 0x47, 0x69, 0xa6, 0x67, - 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, 0x49, 0xeb, 0xa7, 0x25, 0x26, 0x15, - 0x65, 0x26, 0xeb, 0x43, 0x54, 0xe9, 0x83, 0x7c, 0x98, 0x04, 0xf1, 0x8c, 0x31, 0x20, 0x00, 0x00, - 0xff, 0xff, 0x78, 0x83, 0xed, 0x60, 0xf0, 0x00, 0x00, 0x00, + 0x0a, 0xcc, 0x16, 0x92, 0xe5, 0xe2, 0x02, 0x1b, 0x1f, 0x9f, 0x97, 0x98, 0x9b, 0x2a, 0xc1, 0x0c, + 0x96, 0xe1, 0x04, 0x8b, 0xf8, 0x25, 0xe6, 0xa6, 0x0a, 0x49, 0x70, 0xb1, 0x17, 0x24, 0x56, 0xe6, + 0xe4, 0x27, 0xa6, 0x48, 0xb0, 0x28, 0x30, 0x6a, 0xf0, 0x04, 0xc1, 0xb8, 0x4e, 0xce, 0x5c, 0x62, + 0xf9, 0x45, 0xe9, 0x7a, 0x19, 0x95, 0x05, 0xa9, 0x45, 0x39, 0xa9, 0x29, 0xe9, 0xa9, 0x45, 0x10, + 0x17, 0x16, 0x47, 0x69, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, + 0x49, 0xeb, 0xa7, 0x25, 0x26, 0x15, 0x65, 0x26, 0xeb, 0x43, 0x54, 0xe9, 0x83, 0xbc, 0x98, 0x04, + 0xf1, 0x8d, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xde, 0xa7, 0x69, 0xc1, 0xf1, 0x00, 0x00, 0x00, } diff --git a/protos/peer/chaincodeevent.proto b/protos/peer/chaincodeevent.proto index be6d1f86ecf..01ea1516390 100755 --- a/protos/peer/chaincodeevent.proto +++ b/protos/peer/chaincodeevent.proto @@ -22,8 +22,8 @@ option go_package = "github.com/hyperledger/fabric/protos/peer"; //ChaincodeEvent is used for events and registrations that are specific to chaincode //string type - "chaincode" message ChaincodeEvent { - string chaincodeID = 1; - string txID = 2; - string eventName = 3; + string chaincodeID = 1; // XXX change to chaincodeID + string txID = 2; // XXX change to tx_id + string event_name = 3; bytes payload = 4; } diff --git a/protos/peer/configuration.pb.go b/protos/peer/configuration.pb.go index b0d0f140541..0df2f5b59fc 100644 --- a/protos/peer/configuration.pb.go +++ b/protos/peer/configuration.pb.go @@ -15,7 +15,7 @@ var _ = math.Inf // AnchorPeers simply represents list of anchor peers which is used in ConfigurationItem type AnchorPeers struct { - AnchorPeers []*AnchorPeer `protobuf:"bytes,1,rep,name=anchorPeers" json:"anchorPeers,omitempty"` + AnchorPeers []*AnchorPeer `protobuf:"bytes,1,rep,name=anchor_peers,json=anchorPeers" json:"anchor_peers,omitempty"` } func (m *AnchorPeers) Reset() { *m = AnchorPeers{} } @@ -34,12 +34,12 @@ func (m *AnchorPeers) GetAnchorPeers() []*AnchorPeer { // port number and peer certificate. type AnchorPeer struct { // DNS host name of the anchor peer - Host string `protobuf:"bytes,1,opt,name=Host" json:"Host,omitempty"` + Host string `protobuf:"bytes,1,opt,name=host" json:"host,omitempty"` // The port number - Port int32 `protobuf:"varint,2,opt,name=Port" json:"Port,omitempty"` + Port int32 `protobuf:"varint,2,opt,name=port" json:"port,omitempty"` // SSL certificate to be used to maintain mutual TLS // connection with anchor peer - Cert []byte `protobuf:"bytes,3,opt,name=Cert,proto3" json:"Cert,omitempty"` + Cert []byte `protobuf:"bytes,3,opt,name=cert,proto3" json:"cert,omitempty"` } func (m *AnchorPeer) Reset() { *m = AnchorPeer{} } @@ -55,17 +55,17 @@ func init() { func init() { proto.RegisterFile("peer/configuration.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ - // 188 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0x8f, 0x31, 0x6f, 0x83, 0x30, - 0x10, 0x85, 0xe5, 0xd2, 0x56, 0xaa, 0xe9, 0xe4, 0xc9, 0xa3, 0xc5, 0xe4, 0xaa, 0x12, 0x96, 0x92, - 0xfc, 0x81, 0x84, 0x85, 0x11, 0x79, 0xcc, 0x06, 0xce, 0x01, 0x96, 0x12, 0x0e, 0x9d, 0xcd, 0x90, - 0x7f, 0x1f, 0x61, 0x06, 0x32, 0xdd, 0x77, 0xef, 0xde, 0x49, 0xef, 0x71, 0x39, 0x03, 0x90, 0x71, - 0x38, 0xf5, 0x7e, 0x58, 0xa8, 0x8d, 0x1e, 0xa7, 0x72, 0x26, 0x8c, 0x28, 0xbe, 0xd3, 0x08, 0x45, - 0xc5, 0xf3, 0xf3, 0xe4, 0x46, 0xa4, 0x06, 0x80, 0x82, 0x38, 0xf1, 0xbc, 0xdd, 0x57, 0xc9, 0x54, - 0xa6, 0xf3, 0x83, 0xd8, 0x7e, 0x42, 0xb9, 0x3b, 0xed, 0xbb, 0xad, 0xa8, 0x39, 0xdf, 0x4f, 0x42, - 0xf0, 0xcf, 0x1a, 0x43, 0x94, 0x4c, 0x31, 0xfd, 0x63, 0x13, 0xaf, 0x5a, 0x83, 0x14, 0xe5, 0x87, - 0x62, 0xfa, 0xcb, 0x26, 0x5e, 0xb5, 0x0a, 0x28, 0xca, 0x4c, 0x31, 0xfd, 0x6b, 0x13, 0x5f, 0xfe, - 0xaf, 0x7f, 0x83, 0x8f, 0xe3, 0xd2, 0x95, 0x0e, 0x1f, 0x66, 0x7c, 0xce, 0x40, 0x77, 0xb8, 0x0d, - 0x40, 0xa6, 0x6f, 0x3b, 0xf2, 0xce, 0x6c, 0x49, 0xcc, 0xda, 0xab, 0xdb, 0x3a, 0x1c, 0x5f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x67, 0x14, 0x11, 0x01, 0xe6, 0x00, 0x00, 0x00, + // 191 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x44, 0x8f, 0x31, 0x4f, 0xc6, 0x20, + 0x10, 0x86, 0x83, 0x55, 0x13, 0x69, 0x27, 0x26, 0x46, 0xd2, 0x09, 0x63, 0x52, 0x12, 0x8d, 0x3f, + 0x40, 0xe3, 0xe0, 0x68, 0x18, 0x5d, 0x0c, 0xc5, 0x6b, 0x21, 0xd1, 0x1e, 0x39, 0xe8, 0xf0, 0xfd, + 0xfb, 0x2f, 0xd0, 0xa1, 0x13, 0x0f, 0xef, 0xdd, 0x93, 0xbc, 0xc7, 0x65, 0x02, 0x20, 0xe3, 0x71, + 0x5b, 0xe2, 0xba, 0x93, 0x2b, 0x11, 0xb7, 0x29, 0x11, 0x16, 0x14, 0xf7, 0xed, 0xc9, 0xe3, 0x07, + 0xef, 0xdf, 0x36, 0x1f, 0x90, 0xbe, 0x00, 0x28, 0x8b, 0x57, 0x3e, 0xb8, 0xf6, 0xfd, 0xa9, 0x66, + 0x96, 0x4c, 0x75, 0xba, 0x7f, 0x16, 0x87, 0x94, 0xa7, 0x73, 0xd5, 0xf6, 0xee, 0xd4, 0xc6, 0x4f, + 0xce, 0xcf, 0x91, 0x10, 0xfc, 0x36, 0x60, 0x2e, 0x92, 0x29, 0xa6, 0x1f, 0x6c, 0xe3, 0x9a, 0x25, + 0xa4, 0x22, 0x6f, 0x14, 0xd3, 0x77, 0xb6, 0x71, 0xcd, 0x3c, 0x50, 0x91, 0x9d, 0x62, 0x7a, 0xb0, + 0x8d, 0xdf, 0x9f, 0xbe, 0x1f, 0xd7, 0x58, 0xc2, 0x3e, 0x4f, 0x1e, 0xff, 0x4d, 0xb8, 0x24, 0xa0, + 0x3f, 0xf8, 0x5d, 0x81, 0xcc, 0xe2, 0x66, 0x8a, 0xde, 0x1c, 0x4d, 0x4c, 0xad, 0x37, 0x1f, 0x47, + 0xbc, 0x5c, 0x03, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x2c, 0x85, 0xf6, 0xe7, 0x00, 0x00, 0x00, } diff --git a/protos/peer/configuration.proto b/protos/peer/configuration.proto index 788659e30e3..82bd15bfc50 100644 --- a/protos/peer/configuration.proto +++ b/protos/peer/configuration.proto @@ -22,7 +22,7 @@ package protos; // AnchorPeers simply represents list of anchor peers which is used in ConfigurationItem message AnchorPeers { - repeated AnchorPeer anchorPeers = 1; + repeated AnchorPeer anchor_peers = 1; } // AnchorPeer message structure which provides information about anchor peer, it includes host name, @@ -30,12 +30,12 @@ message AnchorPeers { message AnchorPeer { // DNS host name of the anchor peer - string Host = 1; + string host = 1; // The port number - int32 Port = 2; + int32 port = 2; // SSL certificate to be used to maintain mutual TLS // connection with anchor peer - bytes Cert = 3; + bytes cert = 3; } diff --git a/protos/peer/events.pb.go b/protos/peer/events.pb.go index 0fa52bc7819..e965f5e1ad2 100644 --- a/protos/peer/events.pb.go +++ b/protos/peer/events.pb.go @@ -50,7 +50,7 @@ func (EventType) EnumDescriptor() ([]byte, []int) { return fileDescriptor4, []in // when EventType is CHAINCODE type ChaincodeReg struct { ChaincodeID string `protobuf:"bytes,1,opt,name=chaincodeID" json:"chaincodeID,omitempty"` - EventName string `protobuf:"bytes,2,opt,name=eventName" json:"eventName,omitempty"` + EventName string `protobuf:"bytes,2,opt,name=event_name,json=eventName" json:"event_name,omitempty"` } func (m *ChaincodeReg) Reset() { *m = ChaincodeReg{} } @@ -59,7 +59,7 @@ func (*ChaincodeReg) ProtoMessage() {} func (*ChaincodeReg) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} } type Interest struct { - EventType EventType `protobuf:"varint,1,opt,name=eventType,enum=protos.EventType" json:"eventType,omitempty"` + EventType EventType `protobuf:"varint,1,opt,name=event_type,json=eventType,enum=protos.EventType" json:"event_type,omitempty"` // Ideally we should just have the following oneof for different // Reg types and get rid of EventType. But this is an API change // Additional Reg types may add messages specific to their type @@ -81,7 +81,7 @@ type isInterest_RegInfo interface { } type Interest_ChaincodeRegInfo struct { - ChaincodeRegInfo *ChaincodeReg `protobuf:"bytes,2,opt,name=chaincodeRegInfo,oneof"` + ChaincodeRegInfo *ChaincodeReg `protobuf:"bytes,2,opt,name=chaincode_reg_info,json=chaincodeRegInfo,oneof"` } func (*Interest_ChaincodeRegInfo) isInterest_RegInfo() {} @@ -126,7 +126,7 @@ func _Interest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { func _Interest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { m := msg.(*Interest) switch tag { - case 2: // RegInfo.chaincodeRegInfo + case 2: // RegInfo.chaincode_reg_info if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } @@ -178,7 +178,7 @@ func (m *Register) GetEvents() []*Interest { // string type - "rejection" type Rejection struct { Tx *Transaction `protobuf:"bytes,1,opt,name=tx" json:"tx,omitempty"` - ErrorMsg string `protobuf:"bytes,2,opt,name=errorMsg" json:"errorMsg,omitempty"` + ErrorMsg string `protobuf:"bytes,2,opt,name=error_msg,json=errorMsg" json:"error_msg,omitempty"` } func (m *Rejection) Reset() { *m = Rejection{} } @@ -254,7 +254,7 @@ type Event_Block struct { Block *common.Block `protobuf:"bytes,2,opt,name=block,oneof"` } type Event_ChaincodeEvent struct { - ChaincodeEvent *ChaincodeEvent `protobuf:"bytes,3,opt,name=chaincodeEvent,oneof"` + ChaincodeEvent *ChaincodeEvent `protobuf:"bytes,3,opt,name=chaincode_event,json=chaincodeEvent,oneof"` } type Event_Rejection struct { Rejection *Rejection `protobuf:"bytes,4,opt,name=rejection,oneof"` @@ -377,7 +377,7 @@ func _Event_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) err := b.DecodeMessage(msg) m.Event = &Event_Block{msg} return true, err - case 3: // Event.chaincodeEvent + case 3: // Event.chaincode_event if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } @@ -562,40 +562,42 @@ var _Events_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("peer/events.proto", fileDescriptor4) } var fileDescriptor4 = []byte{ - // 559 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x54, 0x51, 0x6f, 0x9b, 0x3c, - 0x14, 0x85, 0xb4, 0x49, 0xc3, 0x25, 0xad, 0xa8, 0xfb, 0xa9, 0xe2, 0x8b, 0xa6, 0x29, 0x62, 0x9a, - 0x94, 0x75, 0x52, 0xd8, 0x58, 0xb4, 0xe7, 0x0d, 0x82, 0x06, 0x6b, 0x97, 0x48, 0x6e, 0xf6, 0xb2, - 0x37, 0x42, 0x5c, 0xc2, 0xd6, 0x40, 0x64, 0x9c, 0xa9, 0xf9, 0x3f, 0x7b, 0xdc, 0x8f, 0x9c, 0x72, - 0xc1, 0x90, 0xae, 0x4f, 0x7b, 0x42, 0xf7, 0x9e, 0x73, 0xec, 0xe3, 0x73, 0x6d, 0xe0, 0x7c, 0xc3, - 0x18, 0xb7, 0xd9, 0x4f, 0x96, 0x89, 0x62, 0xb4, 0xe1, 0xb9, 0xc8, 0x49, 0x07, 0x3f, 0x45, 0xff, - 0x22, 0xce, 0xd7, 0xeb, 0x3c, 0xb3, 0xcb, 0x4f, 0x09, 0xf6, 0xff, 0x47, 0x7e, 0xbc, 0x8a, 0xd2, - 0x2c, 0xce, 0x97, 0x0c, 0x85, 0x15, 0x74, 0x89, 0x90, 0xe0, 0x51, 0x56, 0x44, 0xb1, 0x48, 0xa5, - 0xc4, 0x9a, 0x42, 0xcf, 0x93, 0x7c, 0xca, 0x12, 0x32, 0x00, 0xbd, 0xd6, 0x87, 0x13, 0x53, 0x1d, - 0xa8, 0x43, 0x8d, 0x1e, 0xb6, 0xc8, 0x33, 0xd0, 0x70, 0xe1, 0x69, 0xb4, 0x66, 0x66, 0x0b, 0xf1, - 0xa6, 0x61, 0xfd, 0x52, 0xa1, 0x1b, 0x66, 0x82, 0x71, 0x56, 0x08, 0x62, 0x57, 0xd4, 0xf9, 0x6e, - 0xc3, 0x70, 0xa9, 0x33, 0xe7, 0xbc, 0xdc, 0xb7, 0x18, 0xf9, 0x12, 0xa0, 0x0d, 0x87, 0xb8, 0x60, - 0xc4, 0x07, 0x6e, 0xc2, 0xec, 0x2e, 0xc7, 0x2d, 0x74, 0xe7, 0x3f, 0xa9, 0x3b, 0x74, 0x1b, 0x28, - 0xf4, 0x09, 0x9f, 0x98, 0x70, 0x82, 0xbd, 0x70, 0x62, 0x1e, 0xa1, 0x3b, 0x59, 0xba, 0x1a, 0x9c, - 0x54, 0x24, 0x6b, 0x0c, 0x5d, 0xca, 0x92, 0xb4, 0x10, 0x8c, 0x93, 0x21, 0x74, 0xca, 0x88, 0x4d, - 0x75, 0x70, 0x34, 0xd4, 0x1d, 0x43, 0x6e, 0x25, 0xcf, 0x41, 0x2b, 0xdc, 0xba, 0x01, 0x8d, 0xb2, - 0xef, 0x0c, 0xf3, 0x23, 0x2f, 0xa0, 0x25, 0x1e, 0xf0, 0x54, 0xba, 0x73, 0x21, 0x25, 0xf3, 0x26, - 0x60, 0xda, 0x12, 0x0f, 0xa4, 0x0f, 0x5d, 0xc6, 0x79, 0xce, 0xbf, 0x14, 0x49, 0x95, 0x55, 0x5d, - 0x5b, 0xef, 0x01, 0xbe, 0x66, 0xfc, 0xdf, 0x5d, 0x5c, 0x83, 0x7e, 0x9b, 0x26, 0x19, 0x5b, 0x62, - 0x84, 0xfb, 0x79, 0x14, 0x69, 0x92, 0x45, 0x62, 0xcb, 0xcb, 0x90, 0x7b, 0xb4, 0x69, 0x90, 0xe7, - 0x00, 0x28, 0x73, 0x77, 0x82, 0x15, 0x68, 0xa1, 0x47, 0x0f, 0x3a, 0xd6, 0xef, 0x16, 0xb4, 0xcb, - 0x75, 0x46, 0xd0, 0x95, 0x66, 0xaa, 0x53, 0xd5, 0x16, 0x64, 0x54, 0x81, 0x42, 0x6b, 0x0e, 0x79, - 0x09, 0xed, 0xc5, 0x7d, 0x1e, 0xff, 0xa8, 0x06, 0x74, 0x3a, 0xaa, 0xae, 0xa2, 0xbb, 0x6f, 0x06, - 0x0a, 0x2d, 0x51, 0xf2, 0x01, 0xce, 0xea, 0x11, 0xe1, 0x46, 0x38, 0x15, 0xdd, 0xb9, 0x7c, 0x32, - 0x50, 0x44, 0x03, 0x85, 0xfe, 0xc5, 0x27, 0x6f, 0x41, 0xe3, 0x32, 0x75, 0xf3, 0x18, 0xc5, 0xe7, - 0x8d, 0xb3, 0x0a, 0x08, 0x14, 0xda, 0xb0, 0xc8, 0x18, 0x60, 0x5b, 0x47, 0x6b, 0xb6, 0x51, 0x43, - 0xa4, 0xa6, 0x09, 0x3d, 0x50, 0xe8, 0x01, 0x0f, 0x6f, 0x0e, 0x67, 0x91, 0xc8, 0xb9, 0xd9, 0xc1, - 0xa0, 0x64, 0xe9, 0x9e, 0x54, 0x21, 0x5d, 0xb9, 0xa0, 0xd5, 0x17, 0x97, 0xf4, 0xa0, 0x4b, 0xfd, - 0x4f, 0xe1, 0xed, 0xdc, 0xa7, 0x86, 0x42, 0x34, 0x68, 0xbb, 0x37, 0x33, 0xef, 0xda, 0x50, 0xc9, - 0x29, 0x68, 0x5e, 0xf0, 0x31, 0x9c, 0x7a, 0xb3, 0x89, 0x6f, 0xb4, 0xf6, 0x25, 0xf5, 0x3f, 0xfb, - 0xde, 0x3c, 0x9c, 0x4d, 0x8d, 0x23, 0x67, 0x0c, 0x1d, 0x5c, 0xa3, 0x20, 0x57, 0x70, 0xec, 0xad, - 0x22, 0x41, 0x4e, 0x1f, 0x3d, 0x8a, 0xfe, 0xe3, 0xd2, 0x52, 0x86, 0xea, 0x1b, 0xd5, 0x7d, 0xfd, - 0xed, 0x55, 0x92, 0x8a, 0xd5, 0x76, 0xb1, 0xcf, 0xd9, 0x5e, 0xed, 0x36, 0x8c, 0xdf, 0xb3, 0x65, - 0xc2, 0xb8, 0x7d, 0x17, 0x2d, 0x78, 0x1a, 0xdb, 0xa5, 0xc6, 0xde, 0xbf, 0xf3, 0x45, 0xf9, 0x97, - 0x78, 0xf7, 0x27, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x06, 0x21, 0x4f, 0x41, 0x04, 0x00, 0x00, + // 584 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x6f, 0xda, 0x4e, + 0x10, 0xb5, 0x49, 0x20, 0x78, 0x20, 0xf9, 0x91, 0xcd, 0x4f, 0x91, 0x9b, 0xfe, 0x51, 0xe4, 0xaa, + 0x12, 0x4d, 0x25, 0x48, 0x69, 0xd4, 0x7b, 0x6c, 0xac, 0xda, 0x4d, 0x13, 0xa4, 0x0d, 0xbd, 0xf4, + 0x82, 0x8c, 0x33, 0x31, 0x6e, 0x83, 0x8d, 0xd6, 0x9b, 0x2a, 0x7c, 0xa2, 0x9e, 0xfa, 0x1d, 0x2b, + 0x8f, 0xbd, 0x36, 0xa8, 0xa7, 0x9e, 0xcc, 0xcc, 0xbc, 0x37, 0xf3, 0xf6, 0xcd, 0x2e, 0x70, 0xb8, + 0x42, 0x14, 0x43, 0xfc, 0x89, 0x89, 0xcc, 0x06, 0x2b, 0x91, 0xca, 0x94, 0xb5, 0xe8, 0x93, 0x9d, + 0x1c, 0x85, 0xe9, 0x72, 0x99, 0x26, 0xc3, 0xe2, 0x53, 0x14, 0x4f, 0x9e, 0x11, 0x3e, 0x5c, 0x04, + 0x71, 0x12, 0xa6, 0x77, 0x48, 0xc4, 0xb2, 0x74, 0x4c, 0x25, 0x29, 0x82, 0x24, 0x0b, 0x42, 0x19, + 0x2b, 0x8a, 0x35, 0x81, 0xae, 0xa3, 0xf0, 0x1c, 0x23, 0x76, 0x0a, 0x9d, 0x8a, 0xef, 0x8f, 0x4d, + 0xfd, 0x54, 0xef, 0x1b, 0x7c, 0x33, 0xc5, 0x5e, 0x02, 0x50, 0xe3, 0x59, 0x12, 0x2c, 0xd1, 0x6c, + 0x10, 0xc0, 0xa0, 0xcc, 0x4d, 0xb0, 0x44, 0xeb, 0x97, 0x0e, 0x6d, 0x3f, 0x91, 0x28, 0x30, 0x93, + 0xec, 0x5c, 0x61, 0xe5, 0x7a, 0x85, 0xd4, 0xec, 0x60, 0x74, 0x58, 0x4c, 0xce, 0x06, 0x6e, 0x5e, + 0x99, 0xae, 0x57, 0x58, 0xd2, 0xf3, 0x9f, 0x6c, 0x0c, 0xac, 0x1a, 0x36, 0x13, 0x18, 0xcd, 0xe2, + 0xe4, 0x3e, 0xa5, 0x29, 0x9d, 0xd1, 0xff, 0x8a, 0xb9, 0xa9, 0xd8, 0xd3, 0x78, 0x2f, 0xdc, 0x88, + 0xfd, 0xe4, 0x3e, 0x65, 0x26, 0xec, 0x51, 0xce, 0x1f, 0x9b, 0x3b, 0x24, 0x50, 0x85, 0xb6, 0x01, + 0x7b, 0x25, 0xc8, 0xba, 0x80, 0x36, 0xc7, 0x28, 0xce, 0x24, 0x0a, 0xd6, 0x87, 0x56, 0x61, 0xb3, + 0xa9, 0x9f, 0xee, 0xf4, 0x3b, 0xa3, 0x9e, 0x1a, 0xa5, 0x8e, 0xc2, 0xcb, 0xba, 0x75, 0x0d, 0x06, + 0xc7, 0xef, 0x48, 0x1e, 0xb2, 0xd7, 0xd0, 0x90, 0x4f, 0x74, 0xae, 0xce, 0xe8, 0x48, 0x51, 0xa6, + 0xb5, 0xc9, 0xbc, 0x21, 0x9f, 0xd8, 0x73, 0x30, 0x50, 0x88, 0x54, 0xcc, 0x96, 0x59, 0x54, 0xfa, + 0xd5, 0xa6, 0xc4, 0x75, 0x16, 0x59, 0x1f, 0x01, 0xbe, 0x26, 0xe2, 0xdf, 0x65, 0x5c, 0x41, 0xe7, + 0x36, 0x8e, 0x12, 0xbc, 0x23, 0x17, 0xd9, 0x0b, 0x30, 0xb2, 0x38, 0x4a, 0x02, 0xf9, 0x28, 0x0a, + 0x9f, 0xbb, 0xbc, 0x4e, 0xb0, 0x57, 0xe5, 0x1a, 0xec, 0xb5, 0xc4, 0x8c, 0x24, 0x74, 0xf9, 0x46, + 0xc6, 0xfa, 0xdd, 0x80, 0x66, 0xd1, 0x67, 0x00, 0x6d, 0x25, 0xa6, 0x3c, 0x56, 0x25, 0x41, 0x79, + 0xe5, 0x69, 0xbc, 0xc2, 0xb0, 0x37, 0xd0, 0x9c, 0x3f, 0xa4, 0xe1, 0x8f, 0x72, 0x43, 0xfb, 0x83, + 0xf2, 0x3e, 0xda, 0x79, 0xd2, 0xd3, 0x78, 0x51, 0x65, 0x97, 0xf0, 0x5f, 0xbd, 0x55, 0x1a, 0x4c, + 0x7b, 0xe9, 0x8c, 0x8e, 0xff, 0x5a, 0x29, 0xe9, 0xf0, 0x34, 0x7e, 0x10, 0x6e, 0x65, 0xd8, 0x7b, + 0x30, 0x84, 0xf2, 0xdd, 0xdc, 0x25, 0xf2, 0x61, 0x2d, 0xad, 0x2c, 0x78, 0x1a, 0xaf, 0x51, 0xec, + 0x02, 0xe0, 0xb1, 0xf2, 0xd6, 0x6c, 0x12, 0x87, 0x29, 0x4e, 0xed, 0xba, 0xa7, 0xf1, 0x0d, 0x1c, + 0xdd, 0x1d, 0x81, 0x81, 0x4c, 0x85, 0xd9, 0x22, 0xa7, 0x54, 0x68, 0xef, 0x95, 0x2e, 0x9d, 0xd9, + 0x60, 0x54, 0x97, 0x97, 0x75, 0xa1, 0xcd, 0xdd, 0x4f, 0xfe, 0xed, 0xd4, 0xe5, 0x3d, 0x8d, 0x19, + 0xd0, 0xb4, 0xbf, 0x4c, 0x9c, 0xab, 0x9e, 0xce, 0xf6, 0xc1, 0x70, 0xbc, 0x4b, 0xff, 0xc6, 0x99, + 0x8c, 0xdd, 0x5e, 0x23, 0x0f, 0xb9, 0xfb, 0xd9, 0x75, 0xa6, 0xfe, 0xe4, 0xa6, 0xb7, 0x33, 0xba, + 0x80, 0x16, 0xf5, 0xc8, 0xd8, 0x19, 0xec, 0x3a, 0x8b, 0x40, 0xb2, 0xfd, 0xad, 0x87, 0x71, 0xb2, + 0x1d, 0x5a, 0x5a, 0x5f, 0x3f, 0xd7, 0xed, 0x77, 0xdf, 0xde, 0x46, 0xb1, 0x5c, 0x3c, 0xce, 0x73, + 0xa3, 0x87, 0x8b, 0xf5, 0x0a, 0xc5, 0x03, 0xde, 0x45, 0x28, 0x86, 0xf7, 0xc1, 0x5c, 0xc4, 0xe1, + 0xb0, 0xe0, 0x0c, 0xf3, 0xd7, 0x3e, 0x2f, 0xfe, 0x2b, 0x3e, 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, + 0x98, 0x6e, 0x61, 0x2e, 0x47, 0x04, 0x00, 0x00, } diff --git a/protos/peer/events.proto b/protos/peer/events.proto index db410593430..4b6912c7aec 100644 --- a/protos/peer/events.proto +++ b/protos/peer/events.proto @@ -37,18 +37,18 @@ enum EventType { //ChaincodeReg is used for registering chaincode Interests //when EventType is CHAINCODE message ChaincodeReg { - string chaincodeID = 1; - string eventName = 2; + string chaincodeID = 1; // XXX change to chaincode_id + string event_name = 2; } message Interest { - EventType eventType = 1; + EventType event_type = 1; //Ideally we should just have the following oneof for different //Reg types and get rid of EventType. But this is an API change //Additional Reg types may add messages specific to their type //to the oneof. oneof RegInfo { - ChaincodeReg chaincodeRegInfo = 2; + ChaincodeReg chaincode_reg_info = 2; } string chainID = 3; } @@ -64,7 +64,7 @@ message Register { //string type - "rejection" message Rejection { Transaction tx = 1; - string errorMsg = 2; + string error_msg = 2; } //---------- producer events --------- @@ -92,7 +92,7 @@ message Event { //producer events common.Block block = 2; - ChaincodeEvent chaincodeEvent = 3; + ChaincodeEvent chaincode_event = 3; Rejection rejection = 4; //Unregister consumer sent events diff --git a/protos/peer/peer.proto b/protos/peer/peer.proto index 5b0e2041c8b..95bdb5acf62 100644 --- a/protos/peer/peer.proto +++ b/protos/peer/peer.proto @@ -27,12 +27,10 @@ message PeerID { } message PeerEndpoint { - PeerID ID = 1; + PeerID ID = 1; // XXX change to id string address = 2; } -//-------- the Endorser service ------------ - service Endorser { rpc ProcessProposal(SignedProposal) returns (ProposalResponse) {} } diff --git a/protos/peer/proposal.pb.go b/protos/peer/proposal.pb.go index 2c19c3232dc..c7971228b7e 100644 --- a/protos/peer/proposal.pb.go +++ b/protos/peer/proposal.pb.go @@ -39,7 +39,7 @@ var _ = math.Inf // 4. Detect replay attacks; type SignedProposal struct { // The bytes of Proposal - ProposalBytes []byte `protobuf:"bytes,1,opt,name=proposalBytes,proto3" json:"proposalBytes,omitempty"` + ProposalBytes []byte `protobuf:"bytes,1,opt,name=proposal_bytes,json=proposalBytes,proto3" json:"proposal_bytes,omitempty"` // Signaure over proposalBytes; this signature is to be verified against // the creator identity contained in the header of the Proposal message // marshaled as proposalBytes @@ -102,7 +102,7 @@ type ChaincodeHeaderExtension struct { // Notice that the visibility function may be potentially part of the ESCC. // In that case it overrides PayloadVisibility field. Finally notice that // this field impacts the content of ProposalResponsePayload.proposalHash. - PayloadVisibility []byte `protobuf:"bytes,1,opt,name=payloadVisibility,proto3" json:"payloadVisibility,omitempty"` + PayloadVisibility []byte `protobuf:"bytes,1,opt,name=payload_visibility,json=payloadVisibility,proto3" json:"payload_visibility,omitempty"` // The ID of the chaincode to target. ChaincodeID *ChaincodeID `protobuf:"bytes,2,opt,name=chaincodeID" json:"chaincodeID,omitempty"` } @@ -125,12 +125,12 @@ func (m *ChaincodeHeaderExtension) GetChaincodeID() *ChaincodeID { type ChaincodeProposalPayload struct { // Input contains the arguments for this invocation. If this invocation // deploys a new chaincode, ESCC/VSCC are part of this field. - Input []byte `protobuf:"bytes,1,opt,name=Input,proto3" json:"Input,omitempty"` + Input []byte `protobuf:"bytes,1,opt,name=input,proto3" json:"input,omitempty"` // Transient contains data (e.g. cryptographic material) that might be used // to implement some form of application-level confidentiality. The contents // of this field are supposed to always be omitted from the transaction and // excluded from the ledger. - Transient []byte `protobuf:"bytes,2,opt,name=Transient,proto3" json:"Transient,omitempty"` + Transient []byte `protobuf:"bytes,2,opt,name=transient,proto3" json:"transient,omitempty"` } func (m *ChaincodeProposalPayload) Reset() { *m = ChaincodeProposalPayload{} } @@ -174,27 +174,28 @@ func init() { func init() { proto.RegisterFile("peer/proposal.proto", fileDescriptor6) } var fileDescriptor6 = []byte{ - // 351 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x64, 0x52, 0xcf, 0x4b, 0xc3, 0x30, - 0x18, 0x65, 0x8a, 0xdb, 0xfc, 0xe6, 0xcf, 0x6e, 0x48, 0x19, 0x3b, 0x48, 0xf1, 0xa0, 0x38, 0x56, - 0x98, 0xf8, 0x07, 0xb8, 0x29, 0xb8, 0x8b, 0x8c, 0x3a, 0x3c, 0xec, 0x22, 0x69, 0xfb, 0xd9, 0x06, - 0x6a, 0x12, 0x93, 0x54, 0xec, 0xc9, 0x7f, 0x5d, 0xda, 0x26, 0xdd, 0x86, 0xa7, 0xf2, 0xbd, 0xf7, - 0xf2, 0xf2, 0xbd, 0xd7, 0x40, 0x5f, 0x20, 0x4a, 0x5f, 0x48, 0x2e, 0xb8, 0x22, 0xd9, 0x44, 0x48, - 0xae, 0xb9, 0xd3, 0xae, 0x3e, 0x6a, 0x38, 0xa8, 0xc8, 0x28, 0x25, 0x94, 0x45, 0x3c, 0xc6, 0x9a, - 0x1d, 0x8e, 0x76, 0x8e, 0xbc, 0x4b, 0x54, 0x82, 0x33, 0x65, 0x58, 0x6f, 0x05, 0x27, 0xaf, 0x34, - 0x61, 0x18, 0x2f, 0x8d, 0xc0, 0xb9, 0x82, 0x63, 0x2b, 0x9e, 0x15, 0x1a, 0x95, 0xdb, 0xba, 0x6c, - 0x5d, 0x1f, 0x05, 0xbb, 0xa0, 0x33, 0x82, 0x43, 0x45, 0x13, 0x46, 0x74, 0x2e, 0xd1, 0xdd, 0xab, - 0x14, 0x1b, 0xc0, 0x5b, 0x43, 0xb7, 0xf1, 0xbb, 0x80, 0x76, 0x8a, 0x24, 0x46, 0x69, 0x8c, 0xcc, - 0xe4, 0xb8, 0xd0, 0x11, 0xa4, 0xc8, 0x38, 0x89, 0xcd, 0x79, 0x3b, 0x96, 0xde, 0xf8, 0xa3, 0x91, - 0x29, 0xca, 0x99, 0xbb, 0x5f, 0x7b, 0x37, 0x80, 0xf7, 0x0b, 0xee, 0xdc, 0x46, 0x7c, 0xae, 0xac, - 0x9e, 0x2c, 0xe7, 0x8c, 0xe1, 0xdc, 0x98, 0xbc, 0x51, 0x45, 0x43, 0x9a, 0x51, 0x5d, 0x98, 0x6b, - 0xff, 0x13, 0xce, 0x3d, 0xf4, 0x9a, 0xb2, 0x16, 0x8f, 0xd5, 0x16, 0xbd, 0x69, 0xbf, 0x2e, 0x46, - 0x4d, 0xe6, 0x1b, 0x2a, 0xd8, 0xd6, 0x79, 0x2f, 0x5b, 0x0b, 0xd8, 0x94, 0x4b, 0xb3, 0xfa, 0x00, - 0x0e, 0x16, 0x4c, 0xe4, 0xda, 0x5c, 0x5a, 0x0f, 0x65, 0xa0, 0x95, 0x24, 0x4c, 0x51, 0x64, 0xda, - 0x96, 0xd5, 0x00, 0xde, 0x17, 0x9c, 0x36, 0x7e, 0x0f, 0x91, 0x2e, 0x73, 0xb8, 0xd0, 0x91, 0xa8, - 0xf2, 0x4c, 0xdb, 0xf6, 0xed, 0x58, 0xb6, 0x89, 0xdf, 0xc8, 0xb4, 0x32, 0x3e, 0x66, 0x72, 0xc6, - 0xd0, 0xb5, 0x7f, 0xb6, 0xaa, 0xac, 0x37, 0x3d, 0xb3, 0x41, 0x02, 0x83, 0x07, 0x8d, 0x62, 0x76, - 0xbb, 0xbe, 0x49, 0xa8, 0x4e, 0xf3, 0x70, 0x12, 0xf1, 0x4f, 0x3f, 0x2d, 0x04, 0xca, 0x0c, 0xe3, - 0x04, 0xa5, 0xff, 0x41, 0x42, 0x49, 0x23, 0xbf, 0x3e, 0xea, 0x97, 0x4f, 0x27, 0xac, 0x9f, 0xd7, - 0xdd, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x95, 0xc2, 0x4b, 0x7c, 0x02, 0x00, 0x00, + // 357 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0x52, 0x51, 0x4b, 0xf3, 0x30, + 0x14, 0x65, 0xdf, 0x87, 0xdb, 0xcc, 0x74, 0x6a, 0x36, 0xa4, 0x8c, 0x3d, 0x48, 0x41, 0x50, 0xd4, + 0x16, 0x26, 0xfe, 0x00, 0x37, 0x05, 0x7d, 0x91, 0x51, 0xd1, 0x87, 0xbd, 0x8c, 0xb4, 0xbd, 0xb6, + 0x81, 0x9a, 0xc4, 0x24, 0x1d, 0xf6, 0xcd, 0x9f, 0x2e, 0x6d, 0x93, 0x6c, 0x3e, 0x95, 0x7b, 0xce, + 0xc9, 0xc9, 0x3d, 0xa7, 0x41, 0x23, 0x01, 0x20, 0x43, 0x21, 0xb9, 0xe0, 0x8a, 0x14, 0x81, 0x90, + 0x5c, 0x73, 0xdc, 0x6d, 0x3e, 0x6a, 0x32, 0x6e, 0xc8, 0x24, 0x27, 0x94, 0x25, 0x3c, 0x85, 0x96, + 0x9d, 0x4c, 0xff, 0x1c, 0x59, 0x4b, 0x50, 0x82, 0x33, 0x65, 0x58, 0xff, 0x0d, 0x0d, 0x5f, 0x69, + 0xc6, 0x20, 0x5d, 0x1a, 0x01, 0x3e, 0x47, 0x43, 0x27, 0x8e, 0x2b, 0x0d, 0xca, 0xeb, 0x9c, 0x75, + 0x2e, 0x0e, 0xa2, 0x43, 0x8b, 0xce, 0x6b, 0x10, 0x4f, 0xd1, 0xbe, 0xa2, 0x19, 0x23, 0xba, 0x94, + 0xe0, 0xfd, 0x6b, 0x14, 0x5b, 0xc0, 0x5f, 0xa1, 0xbe, 0x33, 0x3c, 0x45, 0xdd, 0x1c, 0x48, 0x0a, + 0xd2, 0x18, 0x99, 0x09, 0x7b, 0xa8, 0x27, 0x48, 0x55, 0x70, 0x92, 0x9a, 0xf3, 0x76, 0xac, 0xbd, + 0xe1, 0x5b, 0x03, 0x53, 0x94, 0x33, 0xef, 0x7f, 0xeb, 0xed, 0x00, 0xff, 0xa7, 0x83, 0xbc, 0x85, + 0x0d, 0xf9, 0xd4, 0x78, 0x3d, 0x5a, 0x12, 0xdf, 0x20, 0x6c, 0x5c, 0xd6, 0x1b, 0xaa, 0x68, 0x4c, + 0x0b, 0xaa, 0x2b, 0x73, 0xf1, 0x89, 0x61, 0xde, 0x1d, 0x81, 0xef, 0xd0, 0xc0, 0xf5, 0xf5, 0xfc, + 0xd0, 0xec, 0x31, 0x98, 0x8d, 0xda, 0x6e, 0x54, 0xb0, 0xd8, 0x52, 0xd1, 0xae, 0xce, 0x7f, 0xd9, + 0xd9, 0xc0, 0xe6, 0x5c, 0x9a, 0xe5, 0xc7, 0x68, 0x8f, 0x32, 0x51, 0x6a, 0x73, 0x69, 0x3b, 0xd4, + 0x91, 0xb4, 0x24, 0x4c, 0x51, 0x60, 0xda, 0xd6, 0xe5, 0x00, 0xff, 0x0b, 0x1d, 0x39, 0xbf, 0xfb, + 0x44, 0xd7, 0x41, 0x3c, 0xd4, 0x93, 0xa0, 0xca, 0x42, 0xdb, 0xfe, 0xed, 0x58, 0xf7, 0x09, 0x1b, + 0x60, 0x5a, 0x19, 0x1f, 0x33, 0xe1, 0x6b, 0xd4, 0xb7, 0x3f, 0xb7, 0x29, 0x6d, 0x30, 0x3b, 0xb6, + 0x41, 0x22, 0x83, 0x47, 0x4e, 0x31, 0xbf, 0x5a, 0x5d, 0x66, 0x54, 0xe7, 0x65, 0x1c, 0x24, 0xfc, + 0x33, 0xcc, 0x2b, 0x01, 0xb2, 0x80, 0x34, 0x03, 0x19, 0x7e, 0x90, 0x58, 0xd2, 0x24, 0x6c, 0x8f, + 0x86, 0xf5, 0xeb, 0x89, 0xdb, 0x17, 0x76, 0xfb, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x0b, 0x8f, + 0x64, 0x7f, 0x02, 0x00, 0x00, } diff --git a/protos/peer/proposal.proto b/protos/peer/proposal.proto index b2b0dab9748..21b47eeff06 100644 --- a/protos/peer/proposal.proto +++ b/protos/peer/proposal.proto @@ -102,7 +102,7 @@ SignedTransaction message SignedProposal { // The bytes of Proposal - bytes proposalBytes = 1; + bytes proposal_bytes = 1; // Signaure over proposalBytes; this signature is to be verified against // the creator identity contained in the header of the Proposal message @@ -225,10 +225,10 @@ message ChaincodeHeaderExtension { // Notice that the visibility function may be potentially part of the ESCC. // In that case it overrides PayloadVisibility field. Finally notice that // this field impacts the content of ProposalResponsePayload.proposalHash. - bytes payloadVisibility = 1; + bytes payload_visibility = 1; // The ID of the chaincode to target. - ChaincodeID chaincodeID = 2; + ChaincodeID chaincodeID = 2; // XXX change this to chaincode_id } // ChaincodeProposalPayload is the Proposal's payload message to be used when @@ -238,13 +238,13 @@ message ChaincodeProposalPayload { // Input contains the arguments for this invocation. If this invocation // deploys a new chaincode, ESCC/VSCC are part of this field. - bytes Input = 1; + bytes input = 1; // Transient contains data (e.g. cryptographic material) that might be used // to implement some form of application-level confidentiality. The contents // of this field are supposed to always be omitted from the transaction and // excluded from the ledger. - bytes Transient = 2; + bytes transient = 2; } // ChaincodeAction contains the actions the events generated by the execution diff --git a/protos/peer/proposal_response.pb.go b/protos/peer/proposal_response.pb.go index 8024ef1b3a4..ab6f1f54657 100644 --- a/protos/peer/proposal_response.pb.go +++ b/protos/peer/proposal_response.pb.go @@ -101,7 +101,7 @@ type ProposalResponsePayload struct { // nothing from the payload can be hashed. The PayloadVisibility field in the // Header's extension controls to which extent the proposal payload is // "visible" in the sense that was just explained. - ProposalHash []byte `protobuf:"bytes,1,opt,name=proposalHash,proto3" json:"proposalHash,omitempty"` + ProposalHash []byte `protobuf:"bytes,1,opt,name=proposal_hash,json=proposalHash,proto3" json:"proposal_hash,omitempty"` // Extension should be unmarshaled to a type-specific message. The type of // the extension in any proposal response depends on the type of the proposal // that the client selected when the proposal was initially sent out. In @@ -147,27 +147,27 @@ func init() { func init() { proto.RegisterFile("peer/proposal_response.proto", fileDescriptor7) } var fileDescriptor7 = []byte{ - // 343 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0x52, 0xdf, 0x4b, 0xeb, 0x30, - 0x14, 0xa6, 0xbb, 0x77, 0xbb, 0xdb, 0xd9, 0x1e, 0x46, 0x2e, 0x68, 0x19, 0x03, 0x47, 0x9f, 0x26, - 0x4a, 0x0b, 0x8a, 0xe0, 0xb3, 0x20, 0xfa, 0x38, 0x82, 0xf8, 0xa0, 0x0f, 0x92, 0x6e, 0x67, 0x5d, - 0xa1, 0x6d, 0x42, 0x4e, 0x2a, 0xee, 0x0f, 0xf6, 0xff, 0x90, 0xa6, 0x49, 0xb7, 0xf9, 0x54, 0xbe, - 0xd3, 0x2f, 0xdf, 0x8f, 0xe4, 0xc0, 0x5c, 0x21, 0xea, 0x44, 0x69, 0xa9, 0x24, 0x89, 0xe2, 0x43, - 0x23, 0x29, 0x59, 0x11, 0xc6, 0x4a, 0x4b, 0x23, 0xd9, 0xc0, 0x7e, 0x68, 0x76, 0x91, 0x49, 0x99, - 0x15, 0x98, 0x58, 0x98, 0xd6, 0xdb, 0xc4, 0xe4, 0x25, 0x92, 0x11, 0xa5, 0x6a, 0x89, 0xd1, 0x77, - 0x00, 0xd3, 0x95, 0x13, 0xe1, 0x4e, 0x83, 0x85, 0xf0, 0xef, 0x13, 0x35, 0xe5, 0xb2, 0x0a, 0x83, - 0x45, 0xb0, 0xec, 0x73, 0x0f, 0xd9, 0x3d, 0x8c, 0x3a, 0x85, 0xb0, 0xb7, 0x08, 0x96, 0xe3, 0x9b, - 0x59, 0xdc, 0x7a, 0xc4, 0xde, 0x23, 0x7e, 0xf1, 0x0c, 0x7e, 0x20, 0xb3, 0x6b, 0x18, 0xfa, 0x8c, - 0xe1, 0x5f, 0x7b, 0x70, 0xda, 0x9e, 0xa0, 0xd8, 0xfb, 0xf2, 0x8e, 0xd1, 0x24, 0x50, 0x62, 0x5f, - 0x48, 0xb1, 0x09, 0xfb, 0x8b, 0x60, 0x39, 0xe1, 0x1e, 0xb2, 0x3b, 0x18, 0x63, 0xb5, 0x91, 0x9a, - 0xb0, 0xc4, 0xca, 0x84, 0x03, 0x2b, 0xf5, 0xdf, 0x4b, 0x3d, 0x1e, 0x7e, 0xf1, 0x63, 0x5e, 0xf4, - 0x0a, 0xc3, 0xae, 0xde, 0x19, 0x0c, 0xc8, 0x08, 0x53, 0x93, 0x6b, 0xe7, 0x50, 0x63, 0x5a, 0x22, - 0x91, 0xc8, 0xd0, 0x56, 0x1b, 0x71, 0x0f, 0x8f, 0xe3, 0xfc, 0x39, 0x89, 0x13, 0xbd, 0xc3, 0xf9, - 0xef, 0xeb, 0x5b, 0xb9, 0xa4, 0x11, 0x4c, 0xfc, 0xf3, 0x3c, 0x0b, 0xda, 0x59, 0xb3, 0x09, 0x3f, - 0x99, 0xb1, 0x39, 0x8c, 0xf0, 0xcb, 0x60, 0x65, 0xef, 0xba, 0x67, 0x09, 0x87, 0x41, 0xf4, 0x04, - 0xe3, 0xa3, 0x42, 0x6c, 0x06, 0x43, 0x57, 0x49, 0x3b, 0xb1, 0x0e, 0x37, 0x42, 0x94, 0x67, 0x95, - 0x30, 0xb5, 0x46, 0x2f, 0xd4, 0x0d, 0x1e, 0xae, 0xde, 0x2e, 0xb3, 0xdc, 0xec, 0xea, 0x34, 0x5e, - 0xcb, 0x32, 0xd9, 0xed, 0x15, 0xea, 0x02, 0x37, 0x19, 0xea, 0x64, 0x2b, 0x52, 0x9d, 0xaf, 0xdb, - 0xfd, 0xa0, 0xa4, 0xd9, 0xa9, 0xb4, 0xdd, 0x9d, 0xdb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x38, - 0x84, 0xd8, 0x0f, 0x62, 0x02, 0x00, 0x00, + // 345 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0x52, 0x5f, 0x4b, 0xfb, 0x30, + 0x14, 0xa5, 0xfb, 0xfd, 0x36, 0xb7, 0xbb, 0x09, 0xa3, 0x82, 0x96, 0x31, 0x70, 0xd4, 0x97, 0x89, + 0xd2, 0x82, 0x22, 0xf8, 0x2c, 0x88, 0x3e, 0x8e, 0x20, 0x3e, 0x88, 0x20, 0xe9, 0x76, 0xd7, 0x16, + 0xda, 0x26, 0xe4, 0xa6, 0xe2, 0x3e, 0xb0, 0xdf, 0x43, 0x9a, 0x26, 0xdd, 0xf4, 0xa9, 0x9c, 0xdb, + 0x93, 0xf3, 0x27, 0xb9, 0x30, 0x97, 0x88, 0x2a, 0x96, 0x4a, 0x48, 0x41, 0xbc, 0xf8, 0x50, 0x48, + 0x52, 0x54, 0x84, 0x91, 0x54, 0x42, 0x0b, 0x7f, 0x60, 0x3e, 0x34, 0x3b, 0x4f, 0x85, 0x48, 0x0b, + 0x8c, 0x0d, 0x4c, 0xea, 0x6d, 0xac, 0xf3, 0x12, 0x49, 0xf3, 0x52, 0xb6, 0xc4, 0xf0, 0xdb, 0x83, + 0xe9, 0xca, 0x8a, 0x30, 0xab, 0xe1, 0x07, 0x70, 0xf4, 0x89, 0x8a, 0x72, 0x51, 0x05, 0xde, 0xc2, + 0x5b, 0xf6, 0x99, 0x83, 0xfe, 0x3d, 0x8c, 0x3a, 0x85, 0xa0, 0xb7, 0xf0, 0x96, 0xe3, 0x9b, 0x59, + 0xd4, 0x7a, 0x44, 0xce, 0x23, 0x7a, 0x71, 0x0c, 0xb6, 0x27, 0xfb, 0xd7, 0x30, 0x74, 0x19, 0x83, + 0xff, 0xe6, 0xe0, 0xb4, 0x3d, 0x41, 0x91, 0xf3, 0x65, 0x1d, 0xa3, 0x49, 0x20, 0xf9, 0xae, 0x10, + 0x7c, 0x13, 0xf4, 0x17, 0xde, 0x72, 0xc2, 0x1c, 0xf4, 0xef, 0x60, 0x8c, 0xd5, 0x46, 0x28, 0xc2, + 0x12, 0x2b, 0x1d, 0x0c, 0x8c, 0xd4, 0x89, 0x93, 0x7a, 0xdc, 0xff, 0x62, 0x87, 0xbc, 0xf0, 0x15, + 0x86, 0x5d, 0xbd, 0x53, 0x18, 0x90, 0xe6, 0xba, 0x26, 0xdb, 0xce, 0xa2, 0xc6, 0xb4, 0x44, 0x22, + 0x9e, 0xa2, 0xa9, 0x36, 0x62, 0x0e, 0x1e, 0xc6, 0xf9, 0xf7, 0x2b, 0x4e, 0xf8, 0x0e, 0x67, 0x7f, + 0xaf, 0x6f, 0x65, 0x93, 0x5e, 0xc0, 0x71, 0xf7, 0x3c, 0x19, 0xa7, 0xcc, 0xb8, 0x4d, 0xd8, 0xc4, + 0x0d, 0x9f, 0x39, 0x65, 0xfe, 0x1c, 0x46, 0xf8, 0xa5, 0xb1, 0x32, 0x97, 0xdd, 0x33, 0x84, 0xfd, + 0x20, 0x7c, 0x82, 0xf1, 0x41, 0x23, 0x7f, 0x06, 0x43, 0xdb, 0x49, 0x59, 0xb1, 0x0e, 0x37, 0x42, + 0x94, 0xa7, 0x15, 0xd7, 0xb5, 0x42, 0x27, 0xd4, 0x0d, 0x1e, 0xae, 0xde, 0x2e, 0xd3, 0x5c, 0x67, + 0x75, 0x12, 0xad, 0x45, 0x19, 0x67, 0x3b, 0x89, 0xaa, 0xc0, 0x4d, 0x8a, 0x2a, 0xde, 0xf2, 0x44, + 0xe5, 0xeb, 0x76, 0x41, 0x28, 0x6e, 0x96, 0x2a, 0x69, 0x97, 0xe7, 0xf6, 0x27, 0x00, 0x00, 0xff, + 0xff, 0xe8, 0x57, 0x2f, 0xb2, 0x63, 0x02, 0x00, 0x00, } diff --git a/protos/peer/proposal_response.proto b/protos/peer/proposal_response.proto index d1a58eecbb7..2b228d473f2 100644 --- a/protos/peer/proposal_response.proto +++ b/protos/peer/proposal_response.proto @@ -87,7 +87,7 @@ message ProposalResponsePayload { // nothing from the payload can be hashed. The PayloadVisibility field in the // Header's extension controls to which extent the proposal payload is // "visible" in the sense that was just explained. - bytes proposalHash = 1; + bytes proposal_hash = 1; // Extension should be unmarshaled to a type-specific message. The type of // the extension in any proposal response depends on the type of the proposal diff --git a/protos/peer/transaction.pb.go b/protos/peer/transaction.pb.go index 1316a0c2b63..cc7ea9313e0 100644 --- a/protos/peer/transaction.pb.go +++ b/protos/peer/transaction.pb.go @@ -14,6 +14,7 @@ var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// XXX Change to UPPER_CASE type InvalidTransaction_Cause int32 const ( @@ -40,7 +41,7 @@ func (InvalidTransaction_Cause) EnumDescriptor() ([]byte, []int) { return fileDe // transactionBytes field). type SignedTransaction struct { // The bytes of the Transaction. NDD - TransactionBytes []byte `protobuf:"bytes,1,opt,name=transactionBytes,proto3" json:"transactionBytes,omitempty"` + TransactionBytes []byte `protobuf:"bytes,1,opt,name=transaction_bytes,json=transactionBytes,proto3" json:"transaction_bytes,omitempty"` // Signature of the transactionBytes The public key of the signature is in // the header field of TransactionAction There might be multiple // TransactionAction, so multiple headers, but there should be same @@ -141,7 +142,7 @@ type ChaincodeActionPayload struct { // ProposalResponsePayload.proposalHash. For the CHAINCODE type, // ProposalResponsePayload.proposalHash is supposed to be H(ProposalHeader || // f(ChaincodeProposalPayload)) where f is the visibility function. - ChaincodeProposalPayload []byte `protobuf:"bytes,1,opt,name=chaincodeProposalPayload,proto3" json:"chaincodeProposalPayload,omitempty"` + ChaincodeProposalPayload []byte `protobuf:"bytes,1,opt,name=chaincode_proposal_payload,json=chaincodeProposalPayload,proto3" json:"chaincode_proposal_payload,omitempty"` // The list of actions to apply to the ledger Action *ChaincodeEndorsedAction `protobuf:"bytes,2,opt,name=action" json:"action,omitempty"` } @@ -164,7 +165,7 @@ type ChaincodeEndorsedAction struct { // This is the bytes of the ProposalResponsePayload message signed by the // endorsers. Recall that for the CHAINCODE type, the // ProposalResponsePayload's extenstion field carries a ChaincodeAction - ProposalResponsePayload []byte `protobuf:"bytes,1,opt,name=proposalResponsePayload,proto3" json:"proposalResponsePayload,omitempty"` + ProposalResponsePayload []byte `protobuf:"bytes,1,opt,name=proposal_response_payload,json=proposalResponsePayload,proto3" json:"proposal_response_payload,omitempty"` // The endorsement of the proposal, basically the endorser's signature over // proposalResponsePayload Endorsements []*Endorsement `protobuf:"bytes,2,rep,name=endorsements" json:"endorsements,omitempty"` @@ -195,36 +196,36 @@ func init() { func init() { proto.RegisterFile("peer/transaction.proto", fileDescriptor8) } var fileDescriptor8 = []byte{ - // 481 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x93, 0x51, 0x6b, 0xdb, 0x30, - 0x10, 0xc7, 0xe7, 0x96, 0xa4, 0xf4, 0x5c, 0x46, 0xa2, 0xb1, 0xd4, 0x0b, 0x85, 0x06, 0x3f, 0x75, - 0x1b, 0xd8, 0x90, 0xb2, 0xb5, 0xf4, 0xad, 0xcd, 0xf2, 0xd0, 0xb7, 0xe2, 0x05, 0x06, 0x83, 0x31, - 0x14, 0xfb, 0xe2, 0x08, 0x6c, 0xc9, 0x48, 0x72, 0x69, 0xbe, 0xc3, 0xf6, 0xba, 0xaf, 0xb3, 0xaf, - 0x36, 0x62, 0x49, 0x89, 0x43, 0x96, 0x27, 0x73, 0xfa, 0xff, 0xfc, 0xbf, 0xd3, 0xdd, 0x09, 0x06, - 0x15, 0xa2, 0x8c, 0xb5, 0xa4, 0x5c, 0xd1, 0x54, 0x33, 0xc1, 0xa3, 0x4a, 0x0a, 0x2d, 0x48, 0xb7, - 0xf9, 0xa8, 0xe1, 0x65, 0x2e, 0x44, 0x5e, 0x60, 0xdc, 0x84, 0xf3, 0x7a, 0x11, 0x6b, 0x56, 0xa2, - 0xd2, 0xb4, 0xac, 0x0c, 0x38, 0xbc, 0x68, 0x0c, 0x2a, 0x29, 0x2a, 0xa1, 0x68, 0xf1, 0x53, 0xa2, - 0xaa, 0x04, 0x57, 0x68, 0xd4, 0xf0, 0x07, 0xf4, 0xbf, 0xb2, 0x9c, 0x63, 0x36, 0xdb, 0x66, 0x20, - 0x1f, 0xa0, 0xd7, 0x4a, 0xf8, 0xb0, 0xd2, 0xa8, 0x02, 0x6f, 0xe4, 0x5d, 0x9d, 0x25, 0x7b, 0xe7, - 0xe4, 0x02, 0x4e, 0x15, 0xcb, 0x39, 0xd5, 0xb5, 0xc4, 0xe0, 0xa8, 0x81, 0xb6, 0x07, 0xe1, 0x5f, - 0x0f, 0xc8, 0x23, 0x7f, 0xa6, 0x05, 0xdb, 0x49, 0xf0, 0x09, 0xfc, 0x96, 0x51, 0xe3, 0xed, 0x8f, - 0xdf, 0x98, 0x92, 0x54, 0xd4, 0x22, 0x93, 0x36, 0x47, 0x3e, 0x43, 0x27, 0xa5, 0xb5, 0x32, 0x79, - 0x5e, 0x8f, 0x47, 0xee, 0x87, 0xfd, 0x0c, 0xd1, 0x64, 0xcd, 0x25, 0x06, 0x0f, 0xef, 0xa0, 0xd3, - 0xc4, 0xe4, 0x2d, 0xf4, 0x67, 0x2f, 0x8f, 0xd9, 0x7d, 0x21, 0x91, 0x66, 0xab, 0xe9, 0x0b, 0x53, - 0x5a, 0xf5, 0x5e, 0x91, 0x21, 0x0c, 0x92, 0x6f, 0x13, 0xc1, 0x17, 0x05, 0x4b, 0xf5, 0x97, 0x5a, - 0x32, 0x9e, 0x4f, 0x44, 0x59, 0x32, 0xdd, 0xf3, 0xc2, 0x3f, 0x1e, 0xf8, 0xed, 0xd2, 0x03, 0x38, - 0x79, 0x46, 0xa9, 0x5c, 0xd9, 0x9d, 0xc4, 0x85, 0xe4, 0x16, 0x4e, 0x37, 0xbd, 0x6f, 0x2a, 0xf4, - 0xc7, 0xc3, 0xc8, 0x4c, 0x27, 0x72, 0xd3, 0x89, 0x66, 0x8e, 0x48, 0xb6, 0x30, 0xb9, 0x86, 0x13, - 0xe3, 0xae, 0x82, 0xe3, 0xd1, 0xf1, 0x95, 0x3f, 0x7e, 0xf7, 0x9f, 0x56, 0xdc, 0x9b, 0x86, 0x38, - 0x32, 0x9c, 0x42, 0x7f, 0x4f, 0x25, 0x03, 0xe8, 0x2e, 0x91, 0x66, 0x28, 0xed, 0xbc, 0x6c, 0xb4, - 0xae, 0xba, 0xa2, 0xab, 0x42, 0xd0, 0xcc, 0xce, 0xc8, 0x85, 0xe1, 0x6f, 0x0f, 0x06, 0x93, 0x25, - 0x65, 0x3c, 0x15, 0x19, 0x1a, 0x97, 0x27, 0x23, 0x91, 0x3b, 0x08, 0x52, 0xa7, 0x3c, 0xd9, 0xfd, - 0xb1, 0x9a, 0xb5, 0x3f, 0xa8, 0x93, 0x1b, 0xe8, 0xda, 0xe1, 0x9a, 0x4e, 0x5c, 0xba, 0x1b, 0x6d, - 0x72, 0x4d, 0x79, 0x26, 0xa4, 0xc2, 0xcc, 0xde, 0xcb, 0xe2, 0xe1, 0x2f, 0x0f, 0xce, 0x0f, 0x30, - 0xe4, 0x16, 0xce, 0xdd, 0x1e, 0x27, 0x76, 0x8d, 0x77, 0xeb, 0x39, 0x24, 0x93, 0x1b, 0x38, 0x43, - 0xe3, 0x55, 0x22, 0xd7, 0x2a, 0x38, 0x6a, 0xda, 0xbc, 0xd9, 0xb8, 0xe9, 0x56, 0x4b, 0x76, 0xc0, - 0x87, 0x8f, 0xdf, 0xdf, 0xe7, 0x4c, 0x2f, 0xeb, 0x79, 0x94, 0x8a, 0x32, 0x5e, 0xae, 0x2a, 0x94, - 0x05, 0x66, 0x39, 0xca, 0x78, 0x41, 0xe7, 0x92, 0xa5, 0xe6, 0xdd, 0xa9, 0x78, 0xfd, 0xc8, 0xe6, - 0xe6, 0x4d, 0x5e, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x52, 0xfc, 0xf5, 0x8d, 0xb4, 0x03, 0x00, - 0x00, + // 491 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x93, 0xcf, 0x6a, 0xdb, 0x40, + 0x10, 0xc6, 0xab, 0x04, 0x3b, 0x64, 0x1c, 0x8a, 0xbd, 0xa5, 0x8e, 0x62, 0x02, 0x31, 0x3a, 0xa5, + 0x04, 0x24, 0x70, 0xe8, 0x1f, 0x42, 0x2f, 0x89, 0xeb, 0x43, 0x6e, 0x41, 0x35, 0x14, 0x7a, 0xa8, + 0x59, 0x49, 0x63, 0x79, 0x41, 0xda, 0x15, 0xbb, 0xab, 0x10, 0xbf, 0x44, 0x7b, 0xeb, 0xeb, 0xf4, + 0xd5, 0x8a, 0xb5, 0x5a, 0x49, 0xa9, 0x9b, 0x93, 0x18, 0xcd, 0x4f, 0xdf, 0xf7, 0x69, 0x66, 0x17, + 0xc6, 0x05, 0xa2, 0x0c, 0xb4, 0xa4, 0x5c, 0xd1, 0x58, 0x33, 0xc1, 0xfd, 0x42, 0x0a, 0x2d, 0x48, + 0xbf, 0x7a, 0xa8, 0xc9, 0x45, 0x2a, 0x44, 0x9a, 0x61, 0x50, 0x95, 0x51, 0xb9, 0x0e, 0x34, 0xcb, + 0x51, 0x69, 0x9a, 0x17, 0x06, 0x9c, 0x9c, 0x57, 0x02, 0x85, 0x14, 0x85, 0x50, 0x34, 0x5b, 0x49, + 0x54, 0x85, 0xe0, 0x0a, 0x4d, 0xd7, 0xfb, 0x01, 0xa3, 0xaf, 0x2c, 0xe5, 0x98, 0x2c, 0x5b, 0x07, + 0x72, 0x05, 0xa3, 0x8e, 0xe1, 0x2a, 0xda, 0x6a, 0x54, 0xae, 0x33, 0x75, 0x2e, 0x4f, 0xc2, 0x61, + 0xa7, 0x71, 0xb7, 0x7b, 0x4f, 0xce, 0xe1, 0x58, 0xb1, 0x94, 0x53, 0x5d, 0x4a, 0x74, 0x0f, 0x2a, + 0xa8, 0x7d, 0xe1, 0xfd, 0x71, 0x80, 0xdc, 0xf3, 0x47, 0x9a, 0xb1, 0x67, 0x0e, 0xef, 0x61, 0xd0, + 0x11, 0xaa, 0xb4, 0x07, 0xb3, 0x37, 0x26, 0x93, 0xf2, 0x3b, 0x64, 0xd8, 0xe5, 0xc8, 0x07, 0xe8, + 0xc5, 0xb4, 0x54, 0xc6, 0xe7, 0xf5, 0x6c, 0x6a, 0x3f, 0xd8, 0x77, 0xf0, 0xe7, 0x3b, 0x2e, 0x34, + 0xb8, 0x77, 0x03, 0xbd, 0xaa, 0x26, 0x6f, 0x61, 0xb4, 0x7c, 0xba, 0x4f, 0x6e, 0x33, 0x89, 0x34, + 0xd9, 0x2e, 0x9e, 0x98, 0xd2, 0x6a, 0xf8, 0x8a, 0x4c, 0x60, 0x1c, 0x7e, 0x9b, 0x0b, 0xbe, 0xce, + 0x58, 0xac, 0xbf, 0x94, 0x92, 0xf1, 0x74, 0x2e, 0xf2, 0x9c, 0xe9, 0xa1, 0xe3, 0xfd, 0x76, 0x60, + 0xd0, 0x8d, 0xee, 0xc2, 0xd1, 0x23, 0x4a, 0x65, 0x63, 0xf7, 0x42, 0x5b, 0x92, 0x4f, 0x70, 0xdc, + 0x0c, 0xbf, 0x4a, 0x38, 0x98, 0x4d, 0x7c, 0xb3, 0x1e, 0xdf, 0xae, 0xc7, 0x5f, 0x5a, 0x22, 0x6c, + 0x61, 0x72, 0x0d, 0x47, 0x46, 0x5d, 0xb9, 0x87, 0xd3, 0xc3, 0xcb, 0xc1, 0xec, 0xec, 0x3f, 0xa3, + 0xb8, 0x35, 0x03, 0xb1, 0xa4, 0xb7, 0x80, 0xd1, 0x5e, 0x97, 0x8c, 0xa1, 0xbf, 0x41, 0x9a, 0xa0, + 0xac, 0xf7, 0x55, 0x57, 0xbb, 0xd4, 0x05, 0xdd, 0x66, 0x82, 0x26, 0xf5, 0x8e, 0x6c, 0xe9, 0xfd, + 0x72, 0x60, 0x3c, 0xdf, 0x50, 0xc6, 0x63, 0x91, 0xa0, 0x51, 0x79, 0x30, 0x2d, 0xf2, 0x19, 0x26, + 0xb1, 0xed, 0xac, 0x9a, 0x13, 0x64, 0x75, 0x8c, 0x81, 0xdb, 0x10, 0x0f, 0x35, 0x60, 0xbf, 0xfe, + 0x08, 0xfd, 0x7a, 0xbd, 0x66, 0x16, 0x17, 0xf6, 0x9f, 0x1a, 0xb7, 0x05, 0x4f, 0x84, 0x54, 0x98, + 0xd4, 0x7f, 0x56, 0xe3, 0xde, 0x4f, 0x07, 0x4e, 0x5f, 0x60, 0xc8, 0x0d, 0x9c, 0xed, 0x1d, 0xe5, + 0x7f, 0x12, 0x9d, 0x5a, 0x20, 0xac, 0xfb, 0x6d, 0xa0, 0x13, 0x34, 0x6a, 0x39, 0x72, 0xad, 0xdc, + 0x83, 0x6a, 0xd4, 0xcd, 0xa9, 0x5b, 0xb4, 0xbd, 0xf0, 0x19, 0x78, 0x77, 0xf5, 0xfd, 0x5d, 0xca, + 0xf4, 0xa6, 0x8c, 0xfc, 0x58, 0xe4, 0xc1, 0x66, 0x5b, 0xa0, 0xcc, 0x30, 0x49, 0x51, 0x06, 0x6b, + 0x1a, 0x49, 0x16, 0x9b, 0xcb, 0xa7, 0x82, 0xdd, 0x4d, 0x8b, 0xcc, 0xc5, 0xbc, 0xfe, 0x1b, 0x00, + 0x00, 0xff, 0xff, 0x33, 0x58, 0x63, 0xf9, 0xb9, 0x03, 0x00, 0x00, } diff --git a/protos/peer/transaction.proto b/protos/peer/transaction.proto index 53a5c716306..6b4d24a902a 100644 --- a/protos/peer/transaction.proto +++ b/protos/peer/transaction.proto @@ -29,7 +29,7 @@ import "peer/proposal_response.proto"; message SignedTransaction { // The bytes of the Transaction. NDD - bytes transactionBytes = 1; + bytes transaction_bytes = 1; // Signature of the transactionBytes The public key of the signature is in // the header field of TransactionAction There might be multiple @@ -40,6 +40,7 @@ message SignedTransaction { // This is used to wrap an invalid Transaction with the cause message InvalidTransaction { + // XXX Change to UPPER_CASE enum Cause { TxIdAlreadyExists = 0; RWConflictDuringCommit = 1; @@ -102,7 +103,7 @@ message ChaincodeActionPayload { // ProposalResponsePayload.proposalHash. For the CHAINCODE type, // ProposalResponsePayload.proposalHash is supposed to be H(ProposalHeader || // f(ChaincodeProposalPayload)) where f is the visibility function. - bytes chaincodeProposalPayload = 1; + bytes chaincode_proposal_payload = 1; // The list of actions to apply to the ledger ChaincodeEndorsedAction action = 2; @@ -115,7 +116,7 @@ message ChaincodeEndorsedAction { // This is the bytes of the ProposalResponsePayload message signed by the // endorsers. Recall that for the CHAINCODE type, the // ProposalResponsePayload's extenstion field carries a ChaincodeAction - bytes proposalResponsePayload = 1; + bytes proposal_response_payload = 1; // The endorsement of the proposal, basically the endorser's signature over // proposalResponsePayload