diff --git a/protos/common/chain-config.pb.go b/protos/common/chain-config.pb.go new file mode 100644 index 00000000000..3cddac12aa8 --- /dev/null +++ b/protos/common/chain-config.pb.go @@ -0,0 +1,252 @@ +// Code generated by protoc-gen-go. +// source: common/chain-config.proto +// DO NOT EDIT! + +/* +Package common is a generated protocol buffer package. + +It is generated from these files: + common/chain-config.proto + common/common.proto + common/configuration.proto + +It has these top-level messages: + MSPPrincipal + OrganizationUnit + MSPRole + Header + ChainHeader + SignatureHeader + Payload + Envelope + Block + BlockHeader + BlockData + BlockMetadata + ConfigurationEnvelope + SignedConfigurationItem + ConfigurationItem + ConfigurationSignature + Policy + SignaturePolicyEnvelope + SignaturePolicy +*/ +package common + +import proto "github.com/golang/protobuf/proto" +import fmt "fmt" +import math "math" + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package + +type MSPPrincipal_Classification int32 + +const ( + MSPPrincipal_ByMSPRole MSPPrincipal_Classification = 0 + // one of a member of MSP network, and the one of an + // administrator of an MSP network + MSPPrincipal_ByOrganizationUnit MSPPrincipal_Classification = 1 + // groupping of entities, per MSP affiliation + // E.g., this can well be represented by an MSP's + // Organization unit + MSPPrincipal_ByIdentity MSPPrincipal_Classification = 2 +) + +var MSPPrincipal_Classification_name = map[int32]string{ + 0: "ByMSPRole", + 1: "ByOrganizationUnit", + 2: "ByIdentity", +} +var MSPPrincipal_Classification_value = map[string]int32{ + "ByMSPRole": 0, + "ByOrganizationUnit": 1, + "ByIdentity": 2, +} + +func (x MSPPrincipal_Classification) String() string { + return proto.EnumName(MSPPrincipal_Classification_name, int32(x)) +} +func (MSPPrincipal_Classification) EnumDescriptor() ([]byte, []int) { + return fileDescriptor0, []int{0, 0} +} + +type MSPRole_MSPRoleType int32 + +const ( + MSPRole_Member MSPRole_MSPRoleType = 0 + MSPRole_Admin MSPRole_MSPRoleType = 1 +) + +var MSPRole_MSPRoleType_name = map[int32]string{ + 0: "Member", + 1: "Admin", +} +var MSPRole_MSPRoleType_value = map[string]int32{ + "Member": 0, + "Admin": 1, +} + +func (x MSPRole_MSPRoleType) String() string { + return proto.EnumName(MSPRole_MSPRoleType_name, int32(x)) +} +func (MSPRole_MSPRoleType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} } + +// MSPPrincipal aims to represent an MSP-centric set of identities. +// In particular, this structure allows for definition of +// - a group of identities that are member of the same MSP +// - a group of identities that are member of the same organization unit +// in the same MSP +// - a group of identities that are administering a specific MSP +// - a specific identity +// Expressing these groups is done given two fields of the fields below +// - Classification, that defines the type of classification of identities +// in an MSP this principal would be defined on; Classification can take +// three values: +// (i) ByMSPRole: that represents a classification of identities within +// MSP based on one of the two pre-defined MSP rules, "member" and "admin" +// (ii) ByOrganizationUnit: that represents a classification of identities +// within MSP based on the organization unit an identity belongs to +// (iii)ByIdentity that denotes that MSPPrincipal is mapped to a single +// identity/certificate; this would mean that the Principal bytes +// message +type MSPPrincipal struct { + // Classification describes the way that one should process + // Principal. An Classification value of "ByOrganizationUnit" reflects + // that "Principal" contains the name of an organization this MSP + // handles. A Classification value "ByIdentity" means that + // "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,json=principalClassification,enum=common.MSPPrincipal_Classification" json:"PrincipalClassification,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,3,opt,name=Principal,json=principal,proto3" json:"Principal,omitempty"` +} + +func (m *MSPPrincipal) Reset() { *m = MSPPrincipal{} } +func (m *MSPPrincipal) String() string { return proto.CompactTextString(m) } +func (*MSPPrincipal) ProtoMessage() {} +func (*MSPPrincipal) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } + +func (m *MSPPrincipal) GetPrincipalClassification() MSPPrincipal_Classification { + if m != nil { + return m.PrincipalClassification + } + return MSPPrincipal_ByMSPRole +} + +func (m *MSPPrincipal) GetPrincipal() []byte { + if m != nil { + return m.Principal + } + return nil +} + +// OrganizationUnit governs the organization of the Principal +// field of a policy principal when a specific organization unity members +// are to be defined within a policy principal. +type OrganizationUnit struct { + // MSPIdentifier represents the identifier of the MSP this organization unit + // refers to + MSPIdentifier string `protobuf:"bytes,1,opt,name=MSPIdentifier,json=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" json:"OrganizationUnitIdentifier,omitempty"` +} + +func (m *OrganizationUnit) Reset() { *m = OrganizationUnit{} } +func (m *OrganizationUnit) String() string { return proto.CompactTextString(m) } +func (*OrganizationUnit) ProtoMessage() {} +func (*OrganizationUnit) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } + +func (m *OrganizationUnit) GetMSPIdentifier() string { + if m != nil { + return m.MSPIdentifier + } + return "" +} + +func (m *OrganizationUnit) GetOrganizationUnitIdentifier() string { + if m != nil { + return m.OrganizationUnitIdentifier + } + return "" +} + +// MSPRole governs the organization of the Principal +// field of an MSPPrincipal when it aims to define one of the +// two dedicated roles within an MSP: Admin and Members. +type MSPRole struct { + // MSPIdentifier represents the identifier of the MSP this principal + // refers to + MSPIdentifier string `protobuf:"bytes,1,opt,name=MSPIdentifier,json=mSPIdentifier" json:"MSPIdentifier,omitempty"` + // MSPRoleType defines which of the available, pre-defined MSP-roles + // an identiy should posess inside the MSP with identifier MSPidentifier + Role MSPRole_MSPRoleType `protobuf:"varint,2,opt,name=Role,json=role,enum=common.MSPRole_MSPRoleType" json:"Role,omitempty"` +} + +func (m *MSPRole) Reset() { *m = MSPRole{} } +func (m *MSPRole) String() string { return proto.CompactTextString(m) } +func (*MSPRole) ProtoMessage() {} +func (*MSPRole) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } + +func (m *MSPRole) GetMSPIdentifier() string { + if m != nil { + return m.MSPIdentifier + } + return "" +} + +func (m *MSPRole) GetRole() MSPRole_MSPRoleType { + if m != nil { + return m.Role + } + return MSPRole_Member +} + +func init() { + proto.RegisterType((*MSPPrincipal)(nil), "common.MSPPrincipal") + proto.RegisterType((*OrganizationUnit)(nil), "common.OrganizationUnit") + proto.RegisterType((*MSPRole)(nil), "common.MSPRole") + proto.RegisterEnum("common.MSPPrincipal_Classification", MSPPrincipal_Classification_name, MSPPrincipal_Classification_value) + proto.RegisterEnum("common.MSPRole_MSPRoleType", MSPRole_MSPRoleType_name, MSPRole_MSPRoleType_value) +} + +func init() { proto.RegisterFile("common/chain-config.proto", fileDescriptor0) } + +var fileDescriptor0 = []byte{ + // 325 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x92, 0x41, 0x4b, 0xfb, 0x30, + 0x18, 0xc6, 0xff, 0xdd, 0x7f, 0x4e, 0xfa, 0xba, 0x95, 0x92, 0x83, 0x9b, 0xd3, 0x83, 0xd4, 0x1d, + 0x04, 0x59, 0x0b, 0xf3, 0x2e, 0x58, 0x0f, 0xe2, 0x61, 0x38, 0xaa, 0x5e, 0x04, 0x0f, 0x6d, 0x96, + 0x76, 0x2f, 0xb4, 0x49, 0xc9, 0x22, 0x58, 0x3f, 0x80, 0x9f, 0xd0, 0x0f, 0x64, 0x96, 0xea, 0xa8, + 0x45, 0xc1, 0x53, 0xf2, 0xbe, 0xf9, 0x3d, 0xcf, 0x93, 0xbc, 0x04, 0x0e, 0xa8, 0x28, 0x0a, 0xc1, + 0x03, 0xba, 0x8a, 0x91, 0x4f, 0xa9, 0xe0, 0x29, 0x66, 0x7e, 0x29, 0x85, 0x12, 0xa4, 0x57, 0x1f, + 0x79, 0xef, 0x16, 0xf4, 0xe7, 0x77, 0x8b, 0x85, 0x44, 0x4e, 0xb1, 0x8c, 0x73, 0xf2, 0x04, 0xc3, + 0x6d, 0x71, 0x95, 0xc7, 0xeb, 0x35, 0xa6, 0x48, 0x63, 0x85, 0x82, 0x8f, 0xac, 0x63, 0xeb, 0xd4, + 0x99, 0x9d, 0xf8, 0xb5, 0xd4, 0x6f, 0xca, 0xfc, 0xef, 0x68, 0x34, 0x2c, 0x7f, 0xf6, 0x20, 0x47, + 0x60, 0x6f, 0x45, 0xa3, 0xff, 0xda, 0xb0, 0x1f, 0xd9, 0x5b, 0xd6, 0xbb, 0x06, 0xa7, 0xc5, 0x0f, + 0xc0, 0x0e, 0x2b, 0x9d, 0x14, 0x89, 0x9c, 0xb9, 0xff, 0xc8, 0x3e, 0x90, 0xb0, 0xba, 0x95, 0x59, + 0xcc, 0xf1, 0xd5, 0x00, 0x0f, 0x1c, 0x95, 0x6b, 0x11, 0x07, 0x20, 0xac, 0x6e, 0x96, 0x8c, 0x2b, + 0x54, 0x95, 0xdb, 0xf1, 0x5e, 0xc0, 0x6d, 0x53, 0x64, 0x02, 0x03, 0x6d, 0x54, 0x43, 0x29, 0x32, + 0x69, 0xde, 0x63, 0x47, 0x83, 0xa2, 0xd9, 0x24, 0x17, 0x30, 0x6e, 0x2b, 0x1b, 0x92, 0x8e, 0x91, + 0x8c, 0xc5, 0xaf, 0x84, 0xf7, 0x66, 0xc1, 0xee, 0xe7, 0x7d, 0xff, 0x98, 0x18, 0x40, 0x77, 0x43, + 0x1b, 0x6f, 0x67, 0x76, 0xd8, 0x18, 0xef, 0xa6, 0xfd, 0xb5, 0xde, 0x57, 0x25, 0x8b, 0xba, 0x52, + 0xef, 0xbc, 0x09, 0xec, 0x35, 0x9a, 0x04, 0xa0, 0x37, 0x67, 0x45, 0xc2, 0xa4, 0x9e, 0x8f, 0x0d, + 0x3b, 0x97, 0xcb, 0x02, 0xb9, 0x6b, 0x85, 0xd3, 0xc7, 0xb3, 0x0c, 0xd5, 0xea, 0x39, 0xd9, 0x18, + 0x06, 0x2b, 0x4d, 0xca, 0x9c, 0x2d, 0x33, 0x26, 0x83, 0x34, 0x4e, 0x24, 0xd2, 0xc0, 0x7c, 0x84, + 0x75, 0x50, 0xc7, 0x25, 0x3d, 0x53, 0x9e, 0x7f, 0x04, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x84, 0xd1, + 0x7b, 0x34, 0x02, 0x00, 0x00, +} diff --git a/protos/common/chain-config.proto b/protos/common/chain-config.proto new file mode 100644 index 00000000000..cb988d7598f --- /dev/null +++ b/protos/common/chain-config.proto @@ -0,0 +1,137 @@ +/* +Copyright IBM Corp. 2016 All Rights Reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + + +syntax = "proto3"; + +option go_package = "github.com/hyperledger/fabric/protos/common"; + +package common; + + +// chain-config.proto contains proto messages defining the schema of +// a chain configuration structure. An example of how +// this could be +// -- VerifierMSPlist carries information associated to MSPs governing +// the chain +// -- MSPPrincipal carries the information needed to define policies +// for reading/writing or managing the chain +// +// An example of chain configuration could set the following parameters: +// -- an array of msp.MSPConfig items to denote the list of MSPs that govern +// the chain +// -- readers: a list of MSPPrincipal assuming that by default ANY entity +// being part of this list is able to read transactions of that chain +// -- writers: a list of MSPPrincipal assuming that by default ANY entity +// being part of this list is able to submit transactions to that chain +// -- admins: a list of MSPPrincipal assuming that by default ANY entity +// being part of this list is able to modify the configuraiton of that +// chain. + + + +// MSPPrincipal aims to represent an MSP-centric set of identities. +// In particular, this structure allows for definition of +// - a group of identities that are member of the same MSP +// - a group of identities that are member of the same organization unit +// in the same MSP +// - a group of identities that are administering a specific MSP +// - a specific identity +// Expressing these groups is done given two fields of the fields below +// - Classification, that defines the type of classification of identities +// in an MSP this principal would be defined on; Classification can take +// three values: +// (i) ByMSPRole: that represents a classification of identities within +// MSP based on one of the two pre-defined MSP rules, "member" and "admin" +// (ii) ByOrganizationUnit: that represents a classification of identities +// within MSP based on the organization unit an identity belongs to +// (iii)ByIdentity that denotes that MSPPrincipal is mapped to a single +// identity/certificate; this would mean that the Principal bytes +// message +message MSPPrincipal { + + enum Classification { + 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 + ByOrganizationUnit = 1; // Denotes a finer grained (affiliation-based) + // groupping of entities, per MSP affiliation + // E.g., this can well be represented by an MSP's + // Organization unit + ByIdentity = 2; // Denotes a principal that consists of a single + // identity + } + + // Classification describes the way that one should process + // Principal. An Classification value of "ByOrganizationUnit" reflects + // that "Principal" contains the name of an organization this MSP + // handles. A Classification value "ByIdentity" means that + // "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; + + // 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 = 3; +} + + +// OrganizationUnit governs the organization of the Principal +// field of a policy principal when a specific organization unity members +// are to be defined within a policy principal. +message OrganizationUnit { + + // MSPIdentifier represents the identifier of the MSP this organization unit + // refers to + string MSPIdentifier = 1; + + // OrganizationUnitIdentifier defines the organization unit under the + // MSP identified with MSPIdentifier + string OrganizationUnitIdentifier = 2; + +} + +// MSPRole governs the organization of the Principal +// field of an MSPPrincipal when it aims to define one of the +// two dedicated roles within an MSP: Admin and Members. +message MSPRole { + + // MSPIdentifier represents the identifier of the MSP this principal + // refers to + string MSPIdentifier = 1; + + enum MSPRoleType { + Member = 0; // Represents an MSP Member + Admin = 1; // Represents an MSP Admin + } + + // MSPRoleType defines which of the available, pre-defined MSP-roles + // an identiy should posess inside the MSP with identifier MSPidentifier + MSPRoleType Role = 2; + +} + + +// TODO: Bring msp.SerializedIdentity from fabric/msp/identities.proto here. Reason below. +// SerializedIdentity represents an serialized version of an identity; +// this consists of an MSP-identifier this identity would correspond to +// and the bytes of the actual identity. A serialized form of +// SerializedIdentity would govern "Principal" field of a PolicyPrincipal +// of classification "ByIdentity". diff --git a/protos/common/common.pb.go b/protos/common/common.pb.go index 2a4ae29873e..38348574ef8 100644 --- a/protos/common/common.pb.go +++ b/protos/common/common.pb.go @@ -2,31 +2,6 @@ // source: common/common.proto // DO NOT EDIT! -/* -Package common is a generated protocol buffer package. - -It is generated from these files: - common/common.proto - common/configuration.proto - -It has these top-level messages: - Header - ChainHeader - SignatureHeader - Payload - Envelope - Block - BlockHeader - BlockData - BlockMetadata - ConfigurationEnvelope - SignedConfigurationItem - ConfigurationItem - ConfigurationSignature - Policy - SignaturePolicyEnvelope - SignaturePolicy -*/ package common import proto "github.com/golang/protobuf/proto" @@ -39,12 +14,6 @@ var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package - // These status codes are intended to resemble selected HTTP status codes type Status int32 @@ -83,7 +52,7 @@ var Status_value = map[string]int32{ func (x Status) String() string { return proto.EnumName(Status_name, int32(x)) } -func (Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +func (Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } type HeaderType int32 @@ -113,7 +82,7 @@ var HeaderType_value = map[string]int32{ func (x HeaderType) String() string { return proto.EnumName(HeaderType_name, int32(x)) } -func (HeaderType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } +func (HeaderType) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } // This enum enlist indexes of the block metadata array type BlockMetadataIndex int32 @@ -138,7 +107,7 @@ var BlockMetadataIndex_value = map[string]int32{ func (x BlockMetadataIndex) String() string { return proto.EnumName(BlockMetadataIndex_name, int32(x)) } -func (BlockMetadataIndex) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } +func (BlockMetadataIndex) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } type Header struct { ChainHeader *ChainHeader `protobuf:"bytes,1,opt,name=chainHeader" json:"chainHeader,omitempty"` @@ -148,7 +117,7 @@ type Header struct { func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} -func (*Header) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +func (*Header) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } func (m *Header) GetChainHeader() *ChainHeader { if m != nil { @@ -196,7 +165,21 @@ type ChainHeader struct { func (m *ChainHeader) Reset() { *m = ChainHeader{} } func (m *ChainHeader) String() string { return proto.CompactTextString(m) } func (*ChainHeader) ProtoMessage() {} -func (*ChainHeader) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } +func (*ChainHeader) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } + +func (m *ChainHeader) GetType() int32 { + if m != nil { + return m.Type + } + return 0 +} + +func (m *ChainHeader) GetVersion() int32 { + if m != nil { + return m.Version + } + return 0 +} func (m *ChainHeader) GetTimestamp() *google_protobuf.Timestamp { if m != nil { @@ -205,6 +188,34 @@ func (m *ChainHeader) GetTimestamp() *google_protobuf.Timestamp { return nil } +func (m *ChainHeader) GetChainID() string { + if m != nil { + return m.ChainID + } + return "" +} + +func (m *ChainHeader) GetTxID() string { + if m != nil { + return m.TxID + } + return "" +} + +func (m *ChainHeader) GetEpoch() uint64 { + if m != nil { + return m.Epoch + } + return 0 +} + +func (m *ChainHeader) GetExtension() []byte { + if m != nil { + return m.Extension + } + return nil +} + type SignatureHeader struct { // Creator of the message, specified as a certificate chain Creator []byte `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` @@ -215,7 +226,21 @@ type SignatureHeader struct { func (m *SignatureHeader) Reset() { *m = SignatureHeader{} } func (m *SignatureHeader) String() string { return proto.CompactTextString(m) } func (*SignatureHeader) ProtoMessage() {} -func (*SignatureHeader) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } +func (*SignatureHeader) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } + +func (m *SignatureHeader) GetCreator() []byte { + if m != nil { + return m.Creator + } + return nil +} + +func (m *SignatureHeader) GetNonce() []byte { + if m != nil { + return m.Nonce + } + return nil +} // Payload is the message contents (and header to allow for signing) type Payload struct { @@ -228,7 +253,7 @@ type Payload struct { func (m *Payload) Reset() { *m = Payload{} } func (m *Payload) String() string { return proto.CompactTextString(m) } func (*Payload) ProtoMessage() {} -func (*Payload) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } +func (*Payload) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} } func (m *Payload) GetHeader() *Header { if m != nil { @@ -237,6 +262,13 @@ func (m *Payload) GetHeader() *Header { return nil } +func (m *Payload) GetData() []byte { + if m != nil { + return m.Data + } + return nil +} + // Envelope wraps a Payload with a signature so that the message may be authenticated type Envelope struct { // A marshaled Payload @@ -248,22 +280,36 @@ type Envelope struct { func (m *Envelope) Reset() { *m = Envelope{} } func (m *Envelope) String() string { return proto.CompactTextString(m) } func (*Envelope) ProtoMessage() {} -func (*Envelope) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } +func (*Envelope) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} } + +func (m *Envelope) GetPayload() []byte { + if m != nil { + return m.Payload + } + return nil +} + +func (m *Envelope) GetSignature() []byte { + if m != nil { + return m.Signature + } + return nil +} // This is finalized block structure to be shared among the orderer and peer // Note that the BlockHeader chains to the previous BlockHeader, and the BlockData hash is embedded // 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" json:"Header,omitempty"` + Data *BlockData `protobuf:"bytes,2,opt,name=Data,json=data" json:"Data,omitempty"` + Metadata *BlockMetadata `protobuf:"bytes,3,opt,name=Metadata,json=metadata" json:"Metadata,omitempty"` } func (m *Block) Reset() { *m = Block{} } func (m *Block) String() string { return proto.CompactTextString(m) } func (*Block) ProtoMessage() {} -func (*Block) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } +func (*Block) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} } func (m *Block) GetHeader() *BlockHeader { if m != nil { @@ -287,33 +333,68 @@ func (m *Block) GetMetadata() *BlockMetadata { } 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" json:"Number,omitempty"` + PreviousHash []byte `protobuf:"bytes,2,opt,name=PreviousHash,json=previousHash,proto3" json:"PreviousHash,omitempty"` + DataHash []byte `protobuf:"bytes,3,opt,name=DataHash,json=dataHash,proto3" json:"DataHash,omitempty"` } func (m *BlockHeader) Reset() { *m = BlockHeader{} } func (m *BlockHeader) String() string { return proto.CompactTextString(m) } func (*BlockHeader) ProtoMessage() {} -func (*BlockHeader) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } +func (*BlockHeader) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} } + +func (m *BlockHeader) GetNumber() uint64 { + if m != nil { + return m.Number + } + return 0 +} + +func (m *BlockHeader) GetPreviousHash() []byte { + if m != nil { + return m.PreviousHash + } + return nil +} + +func (m *BlockHeader) GetDataHash() []byte { + if m != nil { + return m.DataHash + } + return nil +} type BlockData struct { - Data [][]byte `protobuf:"bytes,1,rep,name=Data,proto3" json:"Data,omitempty"` + Data [][]byte `protobuf:"bytes,1,rep,name=Data,json=data,proto3" json:"Data,omitempty"` } func (m *BlockData) Reset() { *m = BlockData{} } func (m *BlockData) String() string { return proto.CompactTextString(m) } func (*BlockData) ProtoMessage() {} -func (*BlockData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } +func (*BlockData) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} } + +func (m *BlockData) GetData() [][]byte { + if m != nil { + return m.Data + } + return nil +} type BlockMetadata struct { - Metadata [][]byte `protobuf:"bytes,1,rep,name=Metadata,proto3" json:"Metadata,omitempty"` + Metadata [][]byte `protobuf:"bytes,1,rep,name=Metadata,json=metadata,proto3" json:"Metadata,omitempty"` } func (m *BlockMetadata) Reset() { *m = BlockMetadata{} } func (m *BlockMetadata) String() string { return proto.CompactTextString(m) } func (*BlockMetadata) ProtoMessage() {} -func (*BlockMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } +func (*BlockMetadata) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} } + +func (m *BlockMetadata) GetMetadata() [][]byte { + if m != nil { + return m.Metadata + } + return nil +} func init() { proto.RegisterType((*Header)(nil), "common.Header") @@ -330,57 +411,57 @@ func init() { proto.RegisterEnum("common.BlockMetadataIndex", BlockMetadataIndex_name, BlockMetadataIndex_value) } -func init() { proto.RegisterFile("common/common.proto", fileDescriptor0) } - -var fileDescriptor0 = []byte{ - // 771 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0x54, 0xcd, 0x6e, 0xf2, 0x46, - 0x14, 0x8d, 0x63, 0x7e, 0xc2, 0x35, 0xcd, 0xe7, 0x0e, 0xdf, 0x97, 0xb8, 0xa8, 0x51, 0x90, 0xa5, - 0x56, 0x28, 0x51, 0x41, 0x4d, 0x55, 0xa9, 0x5b, 0x83, 0x07, 0x62, 0x95, 0x8c, 0xd3, 0xb1, 0x9d, - 0xaa, 0xdd, 0x58, 0x06, 0x26, 0x80, 0x0a, 0x36, 0x32, 0x26, 0x4a, 0xb6, 0xed, 0xbe, 0xaa, 0xd4, - 0x6e, 0xfb, 0x02, 0x7d, 0x92, 0xbe, 0x41, 0x5f, 0xa4, 0x52, 0xb7, 0xd5, 0x8c, 0x6d, 0xc0, 0xac, - 0x98, 0x73, 0xcf, 0xfd, 0x39, 0xe7, 0xce, 0x60, 0x68, 0x4c, 0xa2, 0xd5, 0x2a, 0x0a, 0xbb, 0xe9, - 0x4f, 0x67, 0x1d, 0x47, 0x49, 0x84, 0x2a, 0x29, 0x6a, 0x5e, 0xcf, 0xa2, 0x68, 0xb6, 0x64, 0x5d, - 0x11, 0x1d, 0x6f, 0x9f, 0xbb, 0xc9, 0x62, 0xc5, 0x36, 0x49, 0xb0, 0x5a, 0xa7, 0x89, 0xfa, 0xcf, - 0x12, 0x54, 0xee, 0x59, 0x30, 0x65, 0x31, 0xfa, 0x1a, 0x94, 0xc9, 0x3c, 0x58, 0x84, 0x29, 0xd4, - 0xa4, 0x96, 0xd4, 0x56, 0xee, 0x1a, 0x9d, 0xac, 0x6f, 0x7f, 0x4f, 0xd1, 0xc3, 0x3c, 0x64, 0xc0, - 0xbb, 0xcd, 0x62, 0x16, 0x06, 0xc9, 0x36, 0x66, 0x59, 0xe9, 0xa9, 0x28, 0xbd, 0xcc, 0x4b, 0x9d, - 0x22, 0x4d, 0x8f, 0xf3, 0xf5, 0x7f, 0x24, 0x50, 0x0e, 0xfa, 0x23, 0x04, 0xa5, 0xe4, 0x6d, 0xcd, - 0x84, 0x84, 0x32, 0x15, 0x67, 0xa4, 0x41, 0xf5, 0x85, 0xc5, 0x9b, 0x45, 0x14, 0x8a, 0xf6, 0x65, - 0x9a, 0x43, 0xf4, 0x0d, 0xd4, 0x76, 0xae, 0x34, 0x59, 0x8c, 0x6e, 0x76, 0x52, 0xdf, 0x9d, 0xdc, - 0x77, 0xc7, 0xcd, 0x33, 0xe8, 0x3e, 0x99, 0xf7, 0x14, 0x4e, 0x2c, 0x53, 0x2b, 0xb5, 0xa4, 0x76, - 0x8d, 0xe6, 0x50, 0x28, 0x78, 0xb5, 0x4c, 0xad, 0x2c, 0xc2, 0xe2, 0x8c, 0xde, 0x43, 0x99, 0xad, - 0xa3, 0xc9, 0x5c, 0xab, 0xb4, 0xa4, 0x76, 0x89, 0xa6, 0x00, 0x7d, 0x0a, 0x35, 0xf6, 0x9a, 0xb0, - 0x50, 0x28, 0xab, 0xb6, 0xa4, 0x76, 0x9d, 0xee, 0x03, 0xba, 0x01, 0xef, 0x8e, 0xdc, 0x8b, 0xa1, - 0x31, 0x0b, 0x92, 0x28, 0x5d, 0x71, 0x9d, 0xe6, 0x90, 0x0f, 0x08, 0xa3, 0x70, 0xc2, 0x84, 0xc1, - 0x3a, 0x4d, 0x81, 0x8e, 0xa1, 0xfa, 0x18, 0xbc, 0x2d, 0xa3, 0x60, 0x8a, 0x3e, 0x87, 0xca, 0xfc, - 0xf0, 0x72, 0xce, 0xf3, 0x0d, 0x67, 0x8b, 0xcd, 0x58, 0xae, 0x7e, 0x1a, 0x24, 0x41, 0xd6, 0x47, - 0x9c, 0xf5, 0x1e, 0x9c, 0xe1, 0xf0, 0x85, 0x2d, 0xa3, 0x74, 0x97, 0xeb, 0xb4, 0x65, 0x2e, 0x21, - 0x83, 0xdc, 0xcd, 0xee, 0x72, 0xb2, 0xf2, 0x7d, 0x40, 0xff, 0x55, 0x82, 0x72, 0x6f, 0x19, 0x4d, - 0x7e, 0x42, 0xb7, 0xf9, 0xab, 0x39, 0x7e, 0x26, 0x82, 0xce, 0xe5, 0x64, 0x8e, 0x3f, 0x83, 0x92, - 0x99, 0xcb, 0x51, 0xee, 0x3e, 0x2e, 0xa4, 0x72, 0x82, 0x0a, 0x1a, 0x7d, 0x09, 0x67, 0x0f, 0x2c, - 0x09, 0x84, 0xf2, 0xf4, 0x1a, 0x3f, 0x14, 0x52, 0x73, 0x92, 0xee, 0xd2, 0x74, 0x06, 0xca, 0xc1, - 0x40, 0x74, 0x01, 0x15, 0xb2, 0x5d, 0x8d, 0x33, 0x55, 0x25, 0x9a, 0x21, 0xa4, 0x43, 0xfd, 0x31, - 0x66, 0x2f, 0x8b, 0x68, 0xbb, 0xb9, 0x0f, 0x36, 0xf3, 0xcc, 0x58, 0x21, 0x86, 0x9a, 0x70, 0xc6, - 0x55, 0x08, 0x5e, 0x16, 0xfc, 0x0e, 0xeb, 0xd7, 0x50, 0xdb, 0x89, 0xe5, 0xcb, 0x15, 0x6e, 0xa4, - 0x96, 0xcc, 0x97, 0xcb, 0xcf, 0xfa, 0x2d, 0x7c, 0x54, 0x90, 0xc8, 0xbb, 0xed, 0xbc, 0xa4, 0x89, - 0x3b, 0x7c, 0xf3, 0x97, 0x04, 0x15, 0x27, 0x09, 0x92, 0xed, 0x06, 0x29, 0x50, 0xf5, 0xc8, 0xb7, - 0xc4, 0xfe, 0x9e, 0xa8, 0x27, 0xa8, 0x0e, 0x55, 0xc7, 0xeb, 0xf7, 0xb1, 0xe3, 0xa8, 0x7f, 0x4b, - 0x48, 0x05, 0xa5, 0x67, 0x98, 0x3e, 0xc5, 0xdf, 0x79, 0xd8, 0x71, 0xd5, 0xdf, 0x64, 0x74, 0x0e, - 0xb5, 0x81, 0x4d, 0x7b, 0x96, 0x69, 0x62, 0xa2, 0xfe, 0x2e, 0x30, 0xb1, 0x5d, 0x7f, 0x60, 0x7b, - 0xc4, 0x54, 0xff, 0x90, 0xd1, 0x15, 0x68, 0x59, 0xb6, 0x8f, 0x89, 0x6b, 0xb9, 0x3f, 0xf8, 0xae, - 0x6d, 0xfb, 0x23, 0x83, 0x0e, 0xb1, 0xfa, 0xa7, 0x8c, 0x9a, 0xf0, 0xc1, 0x22, 0x2e, 0xa6, 0xc4, - 0x18, 0xf9, 0x0e, 0xa6, 0x4f, 0x98, 0xfa, 0x98, 0x52, 0x9b, 0xaa, 0xff, 0xca, 0x48, 0x83, 0x06, - 0x0f, 0x59, 0x7d, 0xec, 0x7b, 0xc4, 0x78, 0x32, 0xac, 0x91, 0xd1, 0x1b, 0x61, 0xf5, 0x3f, 0xf9, - 0xe6, 0x17, 0x09, 0x20, 0xdd, 0xae, 0xcb, 0xff, 0x85, 0x0a, 0x54, 0x1f, 0xb0, 0xe3, 0x18, 0x43, - 0xac, 0x9e, 0xa0, 0x2b, 0xf8, 0xa4, 0x6f, 0x93, 0x81, 0x35, 0xf4, 0xa8, 0xe1, 0x5a, 0x36, 0xf1, - 0x5d, 0x6a, 0x10, 0xc7, 0xe8, 0xf3, 0xb3, 0x2a, 0xa1, 0x0b, 0x40, 0x45, 0xda, 0x72, 0xf1, 0x83, - 0x7a, 0x8a, 0x34, 0x78, 0x8f, 0x89, 0x69, 0x53, 0x07, 0xd3, 0x42, 0x85, 0x8c, 0x2e, 0xa1, 0x61, - 0x53, 0x13, 0xd3, 0x23, 0xa2, 0x74, 0xe3, 0x01, 0x2a, 0xec, 0xd7, 0x0a, 0xa7, 0xec, 0x15, 0x9d, - 0x03, 0x38, 0xd6, 0x90, 0x18, 0xae, 0x47, 0xb1, 0xa3, 0x9e, 0xf0, 0x81, 0x23, 0xc3, 0x71, 0xfd, - 0xc2, 0x54, 0x55, 0xe2, 0x6d, 0x0f, 0xda, 0x39, 0xfe, 0xc0, 0x1a, 0xb9, 0x98, 0xaa, 0xa7, 0xbd, - 0x2f, 0x7e, 0xbc, 0x9d, 0x2d, 0x92, 0xf9, 0x76, 0xcc, 0xdf, 0x59, 0x77, 0xfe, 0xb6, 0x66, 0xf1, - 0x92, 0x4d, 0x67, 0x2c, 0xee, 0x3e, 0x07, 0xe3, 0x78, 0x31, 0x49, 0x3f, 0x9b, 0x9b, 0xec, 0xd3, - 0x3a, 0xae, 0x08, 0xf8, 0xd5, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x69, 0x37, 0x92, 0x72, - 0x05, 0x00, 0x00, +func init() { proto.RegisterFile("common/common.proto", fileDescriptor1) } + +var fileDescriptor1 = []byte{ + // 769 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0x54, 0xdd, 0x6e, 0xda, 0x48, + 0x18, 0x8d, 0x63, 0x7e, 0x3f, 0xd8, 0xac, 0x77, 0x48, 0x36, 0x6c, 0xb4, 0xab, 0x44, 0x96, 0x76, + 0xb5, 0x4a, 0xb4, 0xa0, 0xcd, 0x6a, 0xa5, 0xbd, 0x35, 0x78, 0x48, 0xac, 0x25, 0xe3, 0x74, 0x6c, + 0xa7, 0x6a, 0x6f, 0x2c, 0x03, 0x13, 0x40, 0x05, 0x1b, 0x19, 0x13, 0x25, 0xb7, 0xed, 0x7d, 0x55, + 0xa9, 0xbd, 0xed, 0x0b, 0xf4, 0x49, 0xfa, 0x06, 0x7d, 0x91, 0x4a, 0xbd, 0xed, 0x78, 0x6c, 0x03, + 0xe6, 0x8a, 0x39, 0xdf, 0xef, 0x39, 0x67, 0x06, 0x43, 0x63, 0x18, 0xcc, 0xe7, 0x81, 0xdf, 0x4e, + 0x7e, 0x5a, 0x8b, 0x30, 0x88, 0x02, 0x54, 0x4a, 0xd0, 0xc9, 0xe9, 0x38, 0x08, 0xc6, 0x33, 0xd6, + 0x16, 0xd1, 0xc1, 0xea, 0xbe, 0x1d, 0x4d, 0xe7, 0x6c, 0x19, 0x79, 0xf3, 0x45, 0x52, 0xa8, 0xbe, + 0x96, 0xa0, 0x74, 0xcd, 0xbc, 0x11, 0x0b, 0xd1, 0xbf, 0x50, 0x1b, 0x4e, 0xbc, 0xa9, 0x9f, 0xc0, + 0xa6, 0x74, 0x26, 0xfd, 0x59, 0xbb, 0x6c, 0xb4, 0xd2, 0xb9, 0xdd, 0x4d, 0x8a, 0x6e, 0xd7, 0x21, + 0x0d, 0x7e, 0x5c, 0x4e, 0xc7, 0xbe, 0x17, 0xad, 0x42, 0x96, 0xb6, 0xee, 0x8b, 0xd6, 0xe3, 0xac, + 0xd5, 0xca, 0xa7, 0xe9, 0x6e, 0xbd, 0xfa, 0x45, 0x82, 0xda, 0xd6, 0x7c, 0x84, 0xa0, 0x10, 0x3d, + 0x2d, 0x98, 0xa0, 0x50, 0xa4, 0xe2, 0x8c, 0x9a, 0x50, 0x7e, 0x60, 0xe1, 0x72, 0x1a, 0xf8, 0x62, + 0x7c, 0x91, 0x66, 0x10, 0xfd, 0x07, 0xd5, 0xb5, 0xaa, 0xa6, 0x2c, 0x56, 0x9f, 0xb4, 0x12, 0xdd, + 0xad, 0x4c, 0x77, 0xcb, 0xce, 0x2a, 0xe8, 0xa6, 0x38, 0x9e, 0x29, 0x94, 0x18, 0x7a, 0xb3, 0xc0, + 0xfb, 0xaa, 0x34, 0x83, 0x82, 0xc1, 0x23, 0x0f, 0x17, 0x45, 0x58, 0x9c, 0xd1, 0x21, 0x14, 0xd9, + 0x22, 0x18, 0x4e, 0x9a, 0x25, 0x1e, 0x2c, 0xd0, 0x04, 0xa0, 0x5f, 0xa1, 0xca, 0x1e, 0x23, 0xe6, + 0x0b, 0x66, 0x65, 0x9e, 0xa9, 0xd3, 0x4d, 0x40, 0xe5, 0xe6, 0xec, 0xa8, 0x17, 0x4b, 0x43, 0xe6, + 0x45, 0x41, 0x62, 0x71, 0x9d, 0x66, 0x30, 0x5e, 0xe0, 0x07, 0xfe, 0x90, 0x09, 0x81, 0x75, 0x9a, + 0x00, 0x15, 0x43, 0xf9, 0xd6, 0x7b, 0x9a, 0x05, 0xde, 0x08, 0xfd, 0x01, 0xa5, 0xc9, 0xf6, 0xe5, + 0x1c, 0x64, 0x0e, 0xa7, 0xc6, 0xa6, 0xd9, 0x98, 0xfd, 0xc8, 0x8b, 0xbc, 0x74, 0x8e, 0x38, 0xab, + 0x1d, 0xa8, 0x60, 0xff, 0x81, 0xcd, 0x82, 0xc4, 0xcb, 0x45, 0x32, 0x32, 0xa3, 0x90, 0xc2, 0x58, + 0xcd, 0xfa, 0x72, 0xd2, 0xf6, 0x4d, 0x40, 0x7d, 0x2b, 0x41, 0xb1, 0x33, 0x0b, 0x86, 0xaf, 0xd0, + 0x45, 0xf6, 0x6a, 0x76, 0x9f, 0x89, 0x48, 0xef, 0xd0, 0xf9, 0x1d, 0x0a, 0x7a, 0x46, 0xa7, 0x76, + 0xf9, 0x53, 0xae, 0x34, 0x4e, 0x24, 0x0c, 0xd1, 0xdf, 0x50, 0xb9, 0x61, 0x91, 0x27, 0x98, 0x27, + 0xd7, 0x78, 0x94, 0x2b, 0xcd, 0x92, 0xb4, 0x32, 0x4f, 0x4f, 0x2a, 0x83, 0xda, 0xd6, 0x42, 0xf4, + 0x33, 0x94, 0xc8, 0x6a, 0x3e, 0x48, 0x59, 0x15, 0x68, 0xc9, 0x17, 0x08, 0xa9, 0x50, 0xbf, 0x0d, + 0xd9, 0xc3, 0x34, 0x58, 0x2d, 0xaf, 0xbd, 0xe5, 0x24, 0x15, 0x56, 0x5f, 0x6c, 0xc5, 0xd0, 0x09, + 0x54, 0x62, 0x2e, 0x22, 0x2f, 0x8b, 0x7c, 0x65, 0x94, 0x62, 0xf5, 0x14, 0xaa, 0x6b, 0xb2, 0xb1, + 0xb9, 0x42, 0x8d, 0x74, 0x26, 0xaf, 0xcd, 0xbd, 0x80, 0x1f, 0x72, 0x14, 0xe3, 0x69, 0x6b, 0x2d, + 0x49, 0xe1, 0x9a, 0xf4, 0xf9, 0x27, 0xfe, 0x97, 0xb3, 0x22, 0xee, 0xe8, 0x12, 0xd5, 0xa0, 0xec, + 0x90, 0xff, 0x89, 0xf9, 0x9c, 0x28, 0x7b, 0xa8, 0x0e, 0x65, 0xcb, 0xe9, 0x76, 0xb1, 0x65, 0x29, + 0x9f, 0x25, 0xa4, 0x70, 0x69, 0x9a, 0xee, 0x52, 0xfc, 0xcc, 0xc1, 0x96, 0xad, 0xbc, 0x93, 0xd1, + 0x01, 0x54, 0x7b, 0x26, 0xed, 0x18, 0xba, 0x8e, 0x89, 0xf2, 0x5e, 0x60, 0x62, 0xda, 0x6e, 0xcf, + 0x74, 0x88, 0xae, 0x7c, 0x90, 0xd1, 0x6f, 0xd0, 0x4c, 0xab, 0x5d, 0x4c, 0x6c, 0xc3, 0x7e, 0xe1, + 0xda, 0xa6, 0xe9, 0xf6, 0x35, 0x7a, 0x85, 0x95, 0x8f, 0x32, 0xa7, 0x74, 0x64, 0x10, 0x1b, 0x53, + 0xa2, 0xf5, 0x5d, 0x0b, 0xd3, 0x3b, 0x4c, 0x5d, 0x4c, 0xa9, 0x49, 0x95, 0xaf, 0x32, 0x7f, 0x10, + 0x8d, 0x38, 0x64, 0x74, 0xb1, 0xeb, 0x10, 0xed, 0x4e, 0x33, 0xfa, 0x5a, 0xa7, 0x8f, 0x95, 0x6f, + 0xf2, 0xf9, 0x1b, 0x09, 0x20, 0x71, 0xd7, 0x8e, 0xff, 0x85, 0x9c, 0xf0, 0x0d, 0x27, 0xa8, 0xf1, + 0x91, 0x7b, 0x7c, 0xe1, 0x2f, 0x5d, 0x93, 0xf4, 0x8c, 0x2b, 0x87, 0x6a, 0xb6, 0x61, 0x12, 0xd7, + 0xa6, 0x1a, 0xb1, 0xb4, 0x6e, 0x7c, 0x56, 0x24, 0x7e, 0x1b, 0x28, 0x9f, 0x36, 0x6c, 0x7c, 0xa3, + 0xec, 0xf3, 0x65, 0x87, 0x98, 0xe8, 0x26, 0xe5, 0x1b, 0x73, 0x1d, 0x32, 0x3a, 0x86, 0x86, 0x49, + 0x75, 0x4c, 0x77, 0x12, 0x85, 0x73, 0x07, 0x50, 0xce, 0x5f, 0xc3, 0x1f, 0xb1, 0x47, 0x6e, 0x00, + 0x58, 0xc6, 0x15, 0xd1, 0x6c, 0x87, 0x62, 0x8b, 0xf3, 0xe1, 0x0b, 0xfb, 0x1a, 0x57, 0x9f, 0xdb, + 0xca, 0x89, 0xf0, 0xb1, 0x5b, 0xe3, 0x2c, 0xb7, 0x67, 0xf4, 0xb9, 0x0f, 0xca, 0x7e, 0xe7, 0xaf, + 0x97, 0x17, 0xe3, 0x69, 0x34, 0x59, 0x0d, 0xe2, 0x77, 0xd6, 0x9e, 0x70, 0x81, 0xe1, 0x8c, 0x8d, + 0xc6, 0x2c, 0x6c, 0xdf, 0x7b, 0x83, 0x70, 0x3a, 0x4c, 0x3e, 0x9b, 0xcb, 0xf4, 0xd3, 0x3a, 0x28, + 0x09, 0xf8, 0xcf, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x57, 0xf4, 0xb8, 0x72, 0x05, 0x00, + 0x00, } diff --git a/protos/common/configuration.pb.go b/protos/common/configuration.pb.go index 78462d30307..0348c9081ba 100644 --- a/protos/common/configuration.pb.go +++ b/protos/common/configuration.pb.go @@ -39,7 +39,7 @@ func (x ConfigurationItem_ConfigurationType) String() string { return proto.EnumName(ConfigurationItem_ConfigurationType_name, int32(x)) } func (ConfigurationItem_ConfigurationType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor1, []int{2, 0} + return fileDescriptor2, []int{2, 0} } type Policy_PolicyType int32 @@ -64,7 +64,7 @@ var Policy_PolicyType_value = map[string]int32{ func (x Policy_PolicyType) String() string { return proto.EnumName(Policy_PolicyType_name, int32(x)) } -func (Policy_PolicyType) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{4, 0} } +func (Policy_PolicyType) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{4, 0} } // ConfigurationEnvelope is designed to contain _all_ configuration for a chain with no dependency // on previous configuration transactions. @@ -88,13 +88,13 @@ func (Policy_PolicyType) EnumDescriptor() ([]byte, []int) { return fileDescripto // 4. All configuration changes have a LastModification of one more than the last configuration's highest LastModification number // 5. All configuration changes satisfy the corresponding modification policy type ConfigurationEnvelope struct { - Items []*SignedConfigurationItem `protobuf:"bytes,1,rep,name=Items" json:"Items,omitempty"` + Items []*SignedConfigurationItem `protobuf:"bytes,1,rep,name=Items,json=items" json:"Items,omitempty"` } func (m *ConfigurationEnvelope) Reset() { *m = ConfigurationEnvelope{} } func (m *ConfigurationEnvelope) String() string { return proto.CompactTextString(m) } func (*ConfigurationEnvelope) ProtoMessage() {} -func (*ConfigurationEnvelope) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } +func (*ConfigurationEnvelope) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } func (m *ConfigurationEnvelope) GetItems() []*SignedConfigurationItem { if m != nil { @@ -105,14 +105,21 @@ func (m *ConfigurationEnvelope) GetItems() []*SignedConfigurationItem { // This message may change slightly depending on the finalization of signature schemes for transactions type SignedConfigurationItem struct { - ConfigurationItem []byte `protobuf:"bytes,1,opt,name=ConfigurationItem,proto3" json:"ConfigurationItem,omitempty"` - Signatures []*ConfigurationSignature `protobuf:"bytes,2,rep,name=Signatures" json:"Signatures,omitempty"` + ConfigurationItem []byte `protobuf:"bytes,1,opt,name=ConfigurationItem,json=configurationItem,proto3" json:"ConfigurationItem,omitempty"` + Signatures []*ConfigurationSignature `protobuf:"bytes,2,rep,name=Signatures,json=signatures" json:"Signatures,omitempty"` } func (m *SignedConfigurationItem) Reset() { *m = SignedConfigurationItem{} } func (m *SignedConfigurationItem) String() string { return proto.CompactTextString(m) } func (*SignedConfigurationItem) ProtoMessage() {} -func (*SignedConfigurationItem) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } +func (*SignedConfigurationItem) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} } + +func (m *SignedConfigurationItem) GetConfigurationItem() []byte { + if m != nil { + return m.ConfigurationItem + } + return nil +} func (m *SignedConfigurationItem) GetSignatures() []*ConfigurationSignature { if m != nil { @@ -122,18 +129,18 @@ func (m *SignedConfigurationItem) GetSignatures() []*ConfigurationSignature { } type ConfigurationItem struct { - Header *ChainHeader `protobuf:"bytes,1,opt,name=Header" json:"Header,omitempty"` - Type ConfigurationItem_ConfigurationType `protobuf:"varint,2,opt,name=Type,enum=common.ConfigurationItem_ConfigurationType" json:"Type,omitempty"` - LastModified uint64 `protobuf:"varint,3,opt,name=LastModified" json:"LastModified,omitempty"` - ModificationPolicy string `protobuf:"bytes,4,opt,name=ModificationPolicy" json:"ModificationPolicy,omitempty"` - Key string `protobuf:"bytes,5,opt,name=Key" json:"Key,omitempty"` - Value []byte `protobuf:"bytes,6,opt,name=Value,proto3" json:"Value,omitempty"` + Header *ChainHeader `protobuf:"bytes,1,opt,name=Header,json=header" json:"Header,omitempty"` + Type ConfigurationItem_ConfigurationType `protobuf:"varint,2,opt,name=Type,json=type,enum=common.ConfigurationItem_ConfigurationType" json:"Type,omitempty"` + LastModified uint64 `protobuf:"varint,3,opt,name=LastModified,json=lastModified" json:"LastModified,omitempty"` + ModificationPolicy string `protobuf:"bytes,4,opt,name=ModificationPolicy,json=modificationPolicy" json:"ModificationPolicy,omitempty"` + Key string `protobuf:"bytes,5,opt,name=Key,json=key" json:"Key,omitempty"` + Value []byte `protobuf:"bytes,6,opt,name=Value,json=value,proto3" json:"Value,omitempty"` } func (m *ConfigurationItem) Reset() { *m = ConfigurationItem{} } func (m *ConfigurationItem) String() string { return proto.CompactTextString(m) } func (*ConfigurationItem) ProtoMessage() {} -func (*ConfigurationItem) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } +func (*ConfigurationItem) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} } func (m *ConfigurationItem) GetHeader() *ChainHeader { if m != nil { @@ -142,6 +149,41 @@ func (m *ConfigurationItem) GetHeader() *ChainHeader { return nil } +func (m *ConfigurationItem) GetType() ConfigurationItem_ConfigurationType { + if m != nil { + return m.Type + } + return ConfigurationItem_Policy +} + +func (m *ConfigurationItem) GetLastModified() uint64 { + if m != nil { + return m.LastModified + } + return 0 +} + +func (m *ConfigurationItem) GetModificationPolicy() string { + if m != nil { + return m.ModificationPolicy + } + return "" +} + +func (m *ConfigurationItem) GetKey() string { + if m != nil { + return m.Key + } + return "" +} + +func (m *ConfigurationItem) GetValue() []byte { + if m != nil { + return m.Value + } + return nil +} + type ConfigurationSignature struct { SignatureHeader []byte `protobuf:"bytes,1,opt,name=signatureHeader,proto3" json:"signatureHeader,omitempty"` Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` @@ -150,7 +192,21 @@ type ConfigurationSignature struct { func (m *ConfigurationSignature) Reset() { *m = ConfigurationSignature{} } func (m *ConfigurationSignature) String() string { return proto.CompactTextString(m) } func (*ConfigurationSignature) ProtoMessage() {} -func (*ConfigurationSignature) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} } +func (*ConfigurationSignature) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} } + +func (m *ConfigurationSignature) GetSignatureHeader() []byte { + if m != nil { + return m.SignatureHeader + } + return nil +} + +func (m *ConfigurationSignature) GetSignature() []byte { + if m != nil { + return m.Signature + } + return nil +} // Policy expresses a policy which the orderer can evaluate, because there has been some desire expressed to support // multiple policy engines, this is typed as a oneof for now @@ -162,19 +218,40 @@ type Policy struct { func (m *Policy) Reset() { *m = Policy{} } func (m *Policy) String() string { return proto.CompactTextString(m) } func (*Policy) ProtoMessage() {} -func (*Policy) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} } +func (*Policy) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} } + +func (m *Policy) GetType() int32 { + if m != nil { + return m.Type + } + return 0 +} + +func (m *Policy) GetPolicy() []byte { + if m != nil { + return m.Policy + } + return nil +} // 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 [][]byte `protobuf:"bytes,3,rep,name=Identities,proto3" json:"Identities,omitempty"` + Version int32 `protobuf:"varint,1,opt,name=Version,json=version" json:"Version,omitempty"` + Policy *SignaturePolicy `protobuf:"bytes,2,opt,name=Policy,json=policy" json:"Policy,omitempty"` + Identities [][]byte `protobuf:"bytes,3,rep,name=Identities,json=identities,proto3" json:"Identities,omitempty"` } func (m *SignaturePolicyEnvelope) Reset() { *m = SignaturePolicyEnvelope{} } func (m *SignaturePolicyEnvelope) String() string { return proto.CompactTextString(m) } func (*SignaturePolicyEnvelope) ProtoMessage() {} -func (*SignaturePolicyEnvelope) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} } +func (*SignaturePolicyEnvelope) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} } + +func (m *SignaturePolicyEnvelope) GetVersion() int32 { + if m != nil { + return m.Version + } + return 0 +} func (m *SignaturePolicyEnvelope) GetPolicy() *SignaturePolicy { if m != nil { @@ -183,6 +260,13 @@ func (m *SignaturePolicyEnvelope) GetPolicy() *SignaturePolicy { return nil } +func (m *SignaturePolicyEnvelope) GetIdentities() [][]byte { + if m != nil { + return m.Identities + } + return nil +} + // SignaturePolicy is a recursive message structure which defines a featherweight DSL for describing // policies which are more complicated than 'exactly this signature'. The NOutOf operator is sufficent // to express AND as well as OR, as well as of course N out of the following M policies @@ -199,17 +283,17 @@ type SignaturePolicy struct { func (m *SignaturePolicy) Reset() { *m = SignaturePolicy{} } func (m *SignaturePolicy) String() string { return proto.CompactTextString(m) } func (*SignaturePolicy) ProtoMessage() {} -func (*SignaturePolicy) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} } +func (*SignaturePolicy) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} } type isSignaturePolicy_Type interface { isSignaturePolicy_Type() } type SignaturePolicy_SignedBy struct { - SignedBy int32 `protobuf:"varint,1,opt,name=SignedBy,oneof"` + SignedBy int32 `protobuf:"varint,1,opt,name=SignedBy,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,json=from,oneof"` } func (*SignaturePolicy_SignedBy) isSignaturePolicy_Type() {} @@ -306,14 +390,21 @@ 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"` + N int32 `protobuf:"varint,1,opt,name=N,json=n" json:"N,omitempty"` + Policies []*SignaturePolicy `protobuf:"bytes,2,rep,name=Policies,json=policies" json:"Policies,omitempty"` } func (m *SignaturePolicy_NOutOf) Reset() { *m = SignaturePolicy_NOutOf{} } func (m *SignaturePolicy_NOutOf) String() string { return proto.CompactTextString(m) } func (*SignaturePolicy_NOutOf) ProtoMessage() {} -func (*SignaturePolicy_NOutOf) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6, 0} } +func (*SignaturePolicy_NOutOf) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6, 0} } + +func (m *SignaturePolicy_NOutOf) GetN() int32 { + if m != nil { + return m.N + } + return 0 +} func (m *SignaturePolicy_NOutOf) GetPolicies() []*SignaturePolicy { if m != nil { @@ -335,45 +426,46 @@ func init() { proto.RegisterEnum("common.Policy_PolicyType", Policy_PolicyType_name, Policy_PolicyType_value) } -func init() { proto.RegisterFile("common/configuration.proto", fileDescriptor1) } - -var fileDescriptor1 = []byte{ - // 579 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x54, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0xcd, 0xc6, 0x89, 0xd3, 0x4c, 0x0c, 0x35, 0x53, 0x68, 0xad, 0xaa, 0x2a, 0x96, 0x4f, 0x96, - 0x0a, 0x89, 0x48, 0xe1, 0x0a, 0xa2, 0x55, 0x4b, 0xab, 0x52, 0xa7, 0xda, 0xb4, 0x45, 0xe2, 0x84, - 0x13, 0x6f, 0x92, 0x95, 0x12, 0x3b, 0x5a, 0x3b, 0x48, 0xb9, 0x23, 0xf1, 0x4f, 0x1c, 0xf9, 0x32, - 0xe4, 0x5d, 0xdb, 0x38, 0x69, 0x72, 0xf2, 0xce, 0x9b, 0xf7, 0x66, 0xde, 0x8c, 0x76, 0x0d, 0x87, - 0xc3, 0x68, 0x36, 0x8b, 0xc2, 0xce, 0x30, 0x0a, 0x47, 0x7c, 0xbc, 0x10, 0x7e, 0xc2, 0xa3, 0xb0, - 0x3d, 0x17, 0x51, 0x12, 0xa1, 0xae, 0x72, 0x87, 0x7b, 0x05, 0x27, 0xfd, 0xa8, 0xa4, 0xe3, 0xc1, - 0xab, 0xf3, 0xb2, 0xe6, 0x22, 0xfc, 0xc9, 0xa6, 0xd1, 0x9c, 0xe1, 0x07, 0xa8, 0x5f, 0x27, 0x6c, - 0x16, 0x5b, 0xc4, 0xd6, 0xdc, 0x56, 0xf7, 0x75, 0x3b, 0x93, 0xf5, 0xf9, 0x38, 0x64, 0xc1, 0x8a, - 0x26, 0xe5, 0x51, 0xc5, 0x76, 0x7e, 0x13, 0x38, 0xd8, 0x42, 0xc1, 0x37, 0xf0, 0xe2, 0x09, 0x68, - 0x11, 0x9b, 0xb8, 0x06, 0x7d, 0x9a, 0xc0, 0x8f, 0x00, 0x69, 0x21, 0x3f, 0x59, 0x08, 0x16, 0x5b, - 0x55, 0xe9, 0xe2, 0x38, 0x77, 0xb1, 0x42, 0x2f, 0x68, 0xb4, 0xa4, 0x70, 0xfe, 0x56, 0x37, 0xb4, - 0xc3, 0x13, 0xd0, 0xaf, 0x98, 0x1f, 0x30, 0x21, 0x1b, 0xb7, 0xba, 0x7b, 0x45, 0xc5, 0x89, 0xcf, - 0x43, 0x95, 0xa2, 0x19, 0x05, 0x3f, 0x41, 0xed, 0x7e, 0x39, 0x67, 0x56, 0xd5, 0x26, 0xee, 0xf3, - 0xee, 0xc9, 0xc6, 0xe6, 0x69, 0xd5, 0x55, 0x24, 0x95, 0x50, 0x29, 0x44, 0x07, 0x8c, 0xaf, 0x7e, - 0x9c, 0xdc, 0x46, 0x01, 0x1f, 0x71, 0x16, 0x58, 0x9a, 0x4d, 0xdc, 0x1a, 0x5d, 0xc1, 0xb0, 0x0d, - 0xa8, 0xce, 0x43, 0xa9, 0xbe, 0x8b, 0xa6, 0x7c, 0xb8, 0xb4, 0x6a, 0x36, 0x71, 0x9b, 0x74, 0x43, - 0x06, 0x4d, 0xd0, 0x6e, 0xd8, 0xd2, 0xaa, 0x4b, 0x42, 0x7a, 0xc4, 0x97, 0x50, 0x7f, 0xf4, 0xa7, - 0x0b, 0x66, 0xe9, 0x72, 0x97, 0x2a, 0x70, 0xce, 0xd7, 0xc6, 0x97, 0x86, 0x00, 0x74, 0x55, 0xc6, - 0xac, 0x60, 0x13, 0xea, 0x72, 0x68, 0x93, 0x60, 0x0b, 0x1a, 0x3d, 0x11, 0x30, 0xc1, 0x84, 0x59, - 0x4d, 0x39, 0x97, 0xfe, 0x40, 0xf0, 0xa1, 0xa9, 0x39, 0x3f, 0x60, 0x7f, 0xf3, 0xaa, 0xd1, 0x85, - 0xdd, 0x38, 0x0f, 0x4a, 0x1b, 0x35, 0xe8, 0x3a, 0x8c, 0x47, 0xd0, 0x2c, 0x20, 0xb9, 0x4a, 0x83, - 0xfe, 0x07, 0x9c, 0x71, 0xee, 0x08, 0x11, 0x6a, 0x49, 0xba, 0xed, 0xb4, 0x4c, 0x9d, 0xca, 0x33, - 0xee, 0x83, 0x3e, 0x57, 0x0b, 0x51, 0xc2, 0x2c, 0x72, 0xde, 0x01, 0x28, 0x95, 0x9c, 0xaa, 0x05, - 0x8d, 0x07, 0xef, 0xc6, 0xeb, 0x7d, 0xf3, 0xcc, 0x0a, 0x3e, 0x83, 0x66, 0xff, 0xfa, 0x8b, 0xf7, - 0xf9, 0xfe, 0x81, 0x5e, 0x98, 0x04, 0x1b, 0xa0, 0xdd, 0xf6, 0xef, 0xcc, 0xaa, 0xf3, 0x2b, 0xbb, - 0x99, 0xb2, 0xad, 0x12, 0x17, 0x97, 0xdd, 0x82, 0xc6, 0x23, 0x13, 0x31, 0x8f, 0xc2, 0xac, 0x7b, - 0x1e, 0x62, 0x27, 0xb7, 0x27, 0x0d, 0xb4, 0xba, 0x07, 0xe5, 0x77, 0x50, 0x2a, 0x45, 0xf3, 0x29, - 0x8e, 0x01, 0xae, 0x03, 0x16, 0x26, 0x3c, 0xe1, 0x2c, 0xb6, 0x34, 0x5b, 0x73, 0x0d, 0x5a, 0x42, - 0x9c, 0x3f, 0x04, 0x76, 0xd7, 0xb4, 0x78, 0x04, 0x3b, 0xea, 0xcd, 0x9c, 0x2d, 0x55, 0xff, 0xab, - 0x0a, 0x2d, 0x10, 0x7c, 0x0f, 0xb5, 0x4b, 0x11, 0xcd, 0x32, 0x03, 0xc7, 0x5b, 0x0c, 0xb4, 0xbd, - 0xde, 0x22, 0xe9, 0x8d, 0xae, 0x2a, 0x54, 0xb2, 0x0f, 0x6f, 0x40, 0x57, 0x08, 0x1a, 0x40, 0xbc, - 0x6c, 0x2c, 0xe2, 0xe1, 0x29, 0xec, 0x48, 0x01, 0x2f, 0x1e, 0xd5, 0xd6, 0x91, 0x0a, 0xe2, 0x99, - 0xae, 0x1e, 0xc2, 0xd9, 0xdb, 0xef, 0x27, 0x63, 0x9e, 0x4c, 0x16, 0x83, 0x54, 0xd2, 0x99, 0x2c, - 0xe7, 0x4c, 0x4c, 0x59, 0x30, 0x66, 0xa2, 0x33, 0x92, 0x37, 0xa6, 0x23, 0x7f, 0x2a, 0x71, 0xf6, - 0x8b, 0x19, 0xe8, 0x32, 0x3c, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x15, 0xbd, 0x99, 0x9e, - 0x04, 0x00, 0x00, +func init() { proto.RegisterFile("common/configuration.proto", fileDescriptor2) } + +var fileDescriptor2 = []byte{ + // 596 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x54, 0xcd, 0x6e, 0xda, 0x4c, + 0x14, 0x8d, 0xf1, 0x0f, 0x70, 0xf1, 0xf7, 0xc5, 0xb9, 0x69, 0x13, 0x2b, 0xaa, 0xd2, 0xca, 0x2b, + 0xa4, 0xb4, 0xa0, 0x92, 0x76, 0xdb, 0xaa, 0x89, 0x92, 0x26, 0xa2, 0x31, 0xd1, 0x90, 0xa4, 0x52, + 0x57, 0x35, 0xf6, 0x00, 0xa3, 0x82, 0x8d, 0x6c, 0x83, 0xc4, 0xbe, 0x52, 0xdf, 0xa9, 0xcb, 0x3e, + 0x59, 0xc7, 0x33, 0xc6, 0xe5, 0x77, 0x83, 0x99, 0x33, 0xe7, 0xdc, 0x7b, 0xee, 0xd1, 0xcc, 0xc0, + 0x89, 0x1f, 0x8d, 0xc7, 0x51, 0xd8, 0xf4, 0xa3, 0xb0, 0xcf, 0x06, 0xd3, 0xd8, 0x4b, 0x59, 0x14, + 0x36, 0x26, 0x71, 0x94, 0x46, 0x68, 0xc8, 0xbd, 0x93, 0xc3, 0x82, 0x93, 0x7d, 0xe4, 0xa6, 0xe3, + 0xc2, 0xf3, 0xcb, 0x65, 0xcd, 0x55, 0x38, 0xa3, 0xa3, 0x68, 0x42, 0xf1, 0x3d, 0xe8, 0xb7, 0x29, + 0x1d, 0x27, 0xb6, 0xf2, 0x4a, 0xad, 0xd7, 0x5a, 0x2f, 0x1b, 0xb9, 0xac, 0xcb, 0x06, 0x21, 0x0d, + 0x56, 0x34, 0x19, 0x8f, 0xe8, 0x2c, 0x63, 0x3b, 0xbf, 0x14, 0x38, 0xde, 0x41, 0xc1, 0xd7, 0x70, + 0xb0, 0x01, 0xf2, 0xf2, 0x4a, 0xdd, 0x24, 0x07, 0xfe, 0x06, 0xfb, 0x03, 0x40, 0x56, 0xc8, 0x4b, + 0xa7, 0x31, 0x4d, 0xec, 0x92, 0x70, 0x71, 0xba, 0x70, 0xb1, 0x52, 0xa7, 0xa0, 0x11, 0x48, 0x0a, + 0x85, 0xf3, 0xa7, 0xb4, 0xa5, 0x1d, 0x9e, 0x81, 0x71, 0x43, 0xbd, 0x80, 0xc6, 0xa2, 0x71, 0xad, + 0x75, 0x58, 0x54, 0x1c, 0x7a, 0x2c, 0x94, 0x5b, 0xc4, 0x18, 0x8a, 0x2f, 0x7e, 0x04, 0xed, 0x61, + 0x3e, 0xa1, 0xbc, 0xb9, 0x52, 0xff, 0xbf, 0x75, 0xb6, 0xb5, 0x79, 0x56, 0x75, 0x15, 0xc9, 0x24, + 0x44, 0x4b, 0xf9, 0x2f, 0x3a, 0x60, 0x7e, 0xf1, 0x92, 0xf4, 0x2e, 0x0a, 0x58, 0x9f, 0xd1, 0xc0, + 0x56, 0x79, 0x21, 0x8d, 0x98, 0xa3, 0x25, 0x0c, 0x1b, 0x80, 0xf2, 0xbf, 0x2f, 0xd4, 0xf7, 0xd1, + 0x88, 0xf9, 0x73, 0x5b, 0xe3, 0xcc, 0x2a, 0xc1, 0xf1, 0xc6, 0x0e, 0x5a, 0xa0, 0xb6, 0xe9, 0xdc, + 0xd6, 0x05, 0x41, 0xfd, 0x41, 0xe7, 0xf8, 0x0c, 0xf4, 0x27, 0x6f, 0x34, 0xa5, 0xb6, 0x21, 0xb2, + 0xd4, 0x67, 0xd9, 0xc2, 0xb9, 0x5c, 0x1b, 0x3f, 0xb3, 0x85, 0x00, 0x86, 0x2c, 0x63, 0xed, 0x61, + 0x15, 0x74, 0x31, 0xb4, 0xa5, 0x60, 0x0d, 0xca, 0x9d, 0x98, 0x4f, 0x4c, 0x63, 0xab, 0x94, 0x71, + 0xae, 0xbd, 0x5e, 0xcc, 0x7c, 0x4b, 0x75, 0xbe, 0xc3, 0xd1, 0xf6, 0xa8, 0xb1, 0x0e, 0xfb, 0x45, + 0xd8, 0x4b, 0x89, 0x9a, 0x64, 0x1d, 0xc6, 0x17, 0x50, 0x2d, 0x20, 0x11, 0xa5, 0x49, 0xfe, 0x01, + 0xce, 0x60, 0xe1, 0x08, 0x11, 0x44, 0x68, 0xa2, 0x8c, 0x9e, 0x07, 0x78, 0x04, 0xc6, 0x44, 0x06, + 0x22, 0x85, 0xf9, 0xca, 0x79, 0x0b, 0x20, 0x55, 0x62, 0x2a, 0x6e, 0xff, 0xd1, 0x6d, 0xbb, 0x9d, + 0xaf, 0x2e, 0x1f, 0xeb, 0x3f, 0xa8, 0x76, 0x6f, 0x3f, 0xbb, 0x9f, 0x1e, 0x1e, 0xc9, 0x15, 0x1f, + 0xad, 0x0c, 0xea, 0x5d, 0xf7, 0xde, 0x2a, 0x39, 0x3f, 0xf3, 0x93, 0x29, 0xda, 0x4a, 0x71, 0x71, + 0xd8, 0x6d, 0x28, 0x3f, 0xd1, 0x38, 0xe1, 0x03, 0xe6, 0xdd, 0xcb, 0x33, 0xb9, 0xc4, 0xe6, 0xc2, + 0x9e, 0x30, 0x50, 0x6b, 0x1d, 0x2f, 0xdf, 0x83, 0xa5, 0x52, 0x0b, 0x67, 0x78, 0x0a, 0x70, 0x1b, + 0xd0, 0x30, 0x65, 0x29, 0xe3, 0xc7, 0x56, 0xe5, 0xc7, 0xd6, 0x24, 0xc0, 0x0a, 0xc4, 0xf9, 0xad, + 0xc0, 0xfe, 0x9a, 0x96, 0x27, 0x54, 0x91, 0x77, 0xe6, 0x62, 0x2e, 0xfb, 0xdf, 0xec, 0x91, 0x4a, + 0x92, 0x23, 0xf8, 0x0e, 0xb4, 0xeb, 0x38, 0x1a, 0xe7, 0x06, 0x4e, 0x77, 0x18, 0x68, 0xb8, 0x9d, + 0x69, 0xda, 0xe9, 0x73, 0xa5, 0xd6, 0xe7, 0xec, 0x93, 0x36, 0x18, 0x12, 0x41, 0x13, 0x14, 0x37, + 0x1f, 0x4b, 0x09, 0xf1, 0x1c, 0x2a, 0x42, 0xc0, 0x8a, 0x4b, 0xb5, 0x73, 0xa4, 0xca, 0x24, 0x27, + 0x5e, 0x18, 0xf2, 0x22, 0x5c, 0xbc, 0xf9, 0x76, 0x36, 0x60, 0xe9, 0x70, 0xda, 0xcb, 0x24, 0xcd, + 0x21, 0x87, 0xe2, 0x11, 0x0d, 0x06, 0x34, 0x6e, 0xf6, 0xc5, 0x89, 0x69, 0x8a, 0x47, 0x25, 0xc9, + 0x9f, 0x98, 0x9e, 0x21, 0x96, 0xe7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x4e, 0xe3, 0xee, + 0x9e, 0x04, 0x00, 0x00, }