diff --git a/go.mod b/go.mod index 8b5ee4fa1f0..b89da23ac1b 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/hyperledger/fabric-chaincode-go v0.0.0-20200128192331-2d899240a7ed github.com/hyperledger/fabric-config v0.0.7 github.com/hyperledger/fabric-lib-go v1.0.0 - github.com/hyperledger/fabric-protos-go v0.0.0-20200917184523-71c4060efc42 + github.com/hyperledger/fabric-protos-go v0.0.0-20200923020143-c1b0c2469253 github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect github.com/kr/pretty v0.2.0 github.com/magiconair/properties v1.8.1 // indirect diff --git a/go.sum b/go.sum index 4c9dea0e437..a40765f58e6 100644 --- a/go.sum +++ b/go.sum @@ -142,8 +142,8 @@ github.com/hyperledger/fabric-lib-go v1.0.0 h1:UL1w7c9LvHZUSkIvHTDGklxFv2kTeva1Q github.com/hyperledger/fabric-lib-go v1.0.0/go.mod h1:H362nMlunurmHwkYqR5uHL2UDWbQdbfz74n8kbCFsqc= github.com/hyperledger/fabric-protos-go v0.0.0-20190919234611-2a87503ac7c9/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= github.com/hyperledger/fabric-protos-go v0.0.0-20200424173316-dd554ba3746e/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= -github.com/hyperledger/fabric-protos-go v0.0.0-20200917184523-71c4060efc42 h1:g+r5PwknXSMj0cCleBdfiTYLHiPBQKvzFy/EVk/FMz4= -github.com/hyperledger/fabric-protos-go v0.0.0-20200917184523-71c4060efc42/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= +github.com/hyperledger/fabric-protos-go v0.0.0-20200923020143-c1b0c2469253 h1:o77hro6NUJ+zHYhgGrCipzW0IxeQvAgy37+lH67Pnbc= +github.com/hyperledger/fabric-protos-go v0.0.0-20200923020143-c1b0c2469253/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd h1:anPrsicrIi2ColgWTVPk+TrN42hJIWlfPHSBP9S0ZkM= github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd/go.mod h1:3LVOLeyx9XVvwPgrt2be44XgSqndprz1G18rSk8KD84= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= diff --git a/vendor/github.com/hyperledger/fabric-protos-go/common/ledger.pb.go b/vendor/github.com/hyperledger/fabric-protos-go/common/ledger.pb.go index 86f3287e4cc..7a1c6444842 100644 --- a/vendor/github.com/hyperledger/fabric-protos-go/common/ledger.pb.go +++ b/vendor/github.com/hyperledger/fabric-protos-go/common/ledger.pb.go @@ -23,12 +23,15 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Contains information about the blockchain ledger such as height, current // block hash, and previous block hash. type BlockchainInfo struct { - Height uint64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` - CurrentBlockHash []byte `protobuf:"bytes,2,opt,name=currentBlockHash,proto3" json:"currentBlockHash,omitempty"` - PreviousBlockHash []byte `protobuf:"bytes,3,opt,name=previousBlockHash,proto3" json:"previousBlockHash,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Height uint64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` + CurrentBlockHash []byte `protobuf:"bytes,2,opt,name=currentBlockHash,proto3" json:"currentBlockHash,omitempty"` + PreviousBlockHash []byte `protobuf:"bytes,3,opt,name=previousBlockHash,proto3" json:"previousBlockHash,omitempty"` + // Specifies bootstrapping snapshot info if the channel is bootstrapped from a snapshot. + // It is nil if the channel is not bootstrapped from a snapshot. + BootstrappingSnapshotInfo *BootstrappingSnapshotInfo `protobuf:"bytes,4,opt,name=bootstrapping_snapshot_info,json=bootstrappingSnapshotInfo,proto3" json:"bootstrapping_snapshot_info,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *BlockchainInfo) Reset() { *m = BlockchainInfo{} } @@ -77,24 +80,77 @@ func (m *BlockchainInfo) GetPreviousBlockHash() []byte { return nil } +func (m *BlockchainInfo) GetBootstrappingSnapshotInfo() *BootstrappingSnapshotInfo { + if m != nil { + return m.BootstrappingSnapshotInfo + } + return nil +} + +// Contains information for the bootstrapping snapshot. +type BootstrappingSnapshotInfo struct { + LastBlockInSnapshot uint64 `protobuf:"varint,1,opt,name=last_block_in_snapshot,json=lastBlockInSnapshot,proto3" json:"last_block_in_snapshot,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *BootstrappingSnapshotInfo) Reset() { *m = BootstrappingSnapshotInfo{} } +func (m *BootstrappingSnapshotInfo) String() string { return proto.CompactTextString(m) } +func (*BootstrappingSnapshotInfo) ProtoMessage() {} +func (*BootstrappingSnapshotInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_da3410306adbea27, []int{1} +} + +func (m *BootstrappingSnapshotInfo) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_BootstrappingSnapshotInfo.Unmarshal(m, b) +} +func (m *BootstrappingSnapshotInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_BootstrappingSnapshotInfo.Marshal(b, m, deterministic) +} +func (m *BootstrappingSnapshotInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_BootstrappingSnapshotInfo.Merge(m, src) +} +func (m *BootstrappingSnapshotInfo) XXX_Size() int { + return xxx_messageInfo_BootstrappingSnapshotInfo.Size(m) +} +func (m *BootstrappingSnapshotInfo) XXX_DiscardUnknown() { + xxx_messageInfo_BootstrappingSnapshotInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_BootstrappingSnapshotInfo proto.InternalMessageInfo + +func (m *BootstrappingSnapshotInfo) GetLastBlockInSnapshot() uint64 { + if m != nil { + return m.LastBlockInSnapshot + } + return 0 +} + func init() { proto.RegisterType((*BlockchainInfo)(nil), "common.BlockchainInfo") + proto.RegisterType((*BootstrappingSnapshotInfo)(nil), "common.BootstrappingSnapshotInfo") } func init() { proto.RegisterFile("common/ledger.proto", fileDescriptor_da3410306adbea27) } var fileDescriptor_da3410306adbea27 = []byte{ - // 189 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4e, 0xce, 0xcf, 0xcd, - 0xcd, 0xcf, 0xd3, 0xcf, 0x49, 0x4d, 0x49, 0x4f, 0x2d, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, - 0x62, 0x83, 0x08, 0x2a, 0x35, 0x31, 0x72, 0xf1, 0x39, 0xe5, 0xe4, 0x27, 0x67, 0x27, 0x67, 0x24, - 0x66, 0xe6, 0x79, 0xe6, 0xa5, 0xe5, 0x0b, 0x89, 0x71, 0xb1, 0x65, 0xa4, 0x66, 0xa6, 0x67, 0x94, - 0x48, 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x04, 0x41, 0x79, 0x42, 0x5a, 0x5c, 0x02, 0xc9, 0xa5, 0x45, - 0x45, 0xa9, 0x79, 0x25, 0x60, 0x0d, 0x1e, 0x89, 0xc5, 0x19, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0x3c, - 0x41, 0x18, 0xe2, 0x42, 0x3a, 0x5c, 0x82, 0x05, 0x45, 0xa9, 0x65, 0x99, 0xf9, 0xa5, 0xc5, 0x08, - 0xc5, 0xcc, 0x60, 0xc5, 0x98, 0x12, 0x4e, 0x61, 0x5c, 0x2a, 0xf9, 0x45, 0xe9, 0x7a, 0x19, 0x95, - 0x05, 0xa9, 0x45, 0x50, 0x57, 0xa6, 0x25, 0x26, 0x15, 0x65, 0x26, 0x43, 0x1c, 0x5b, 0xac, 0x07, - 0x71, 0x6c, 0x94, 0x5e, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x12, 0x88, 0xab, 0x8f, 0xa4, 0x58, 0x1f, - 0xa2, 0x58, 0x17, 0xa2, 0x58, 0x37, 0x3d, 0x5f, 0x1f, 0xa2, 0x3e, 0x89, 0x0d, 0x2c, 0x62, 0x0c, - 0x08, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x1e, 0x95, 0x9c, 0x02, 0x01, 0x00, 0x00, + // 268 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x41, 0x4b, 0xc3, 0x30, + 0x1c, 0xc5, 0xa9, 0x8e, 0x1e, 0xa2, 0x88, 0x66, 0x30, 0x3a, 0xbc, 0xd4, 0xe1, 0xa1, 0x88, 0x6b, + 0xc1, 0x7d, 0x83, 0x9e, 0xdc, 0x4d, 0x2a, 0x78, 0xf0, 0x52, 0x92, 0x98, 0x26, 0xc1, 0x2e, 0xff, + 0x90, 0xa4, 0x82, 0x1f, 0xd8, 0xef, 0x21, 0x6d, 0xa2, 0x1b, 0x8c, 0x1d, 0xff, 0xef, 0xfd, 0x1e, + 0xff, 0xc7, 0x43, 0x73, 0x06, 0xbb, 0x1d, 0xe8, 0xaa, 0xe7, 0x1f, 0x82, 0xdb, 0xd2, 0x58, 0xf0, + 0x80, 0xd3, 0x20, 0xae, 0x7e, 0x12, 0x74, 0x55, 0xf7, 0xc0, 0x3e, 0x99, 0x24, 0x4a, 0x6f, 0x75, + 0x07, 0x78, 0x81, 0x52, 0xc9, 0x95, 0x90, 0x3e, 0x4b, 0xf2, 0xa4, 0x98, 0x35, 0xf1, 0xc2, 0x0f, + 0xe8, 0x9a, 0x0d, 0xd6, 0x72, 0xed, 0xa7, 0xc0, 0x33, 0x71, 0x32, 0x3b, 0xcb, 0x93, 0xe2, 0xb2, + 0x39, 0xd2, 0xf1, 0x23, 0xba, 0x31, 0x96, 0x7f, 0x29, 0x18, 0xdc, 0x1e, 0x3e, 0x9f, 0xe0, 0x63, + 0x03, 0x13, 0x74, 0x4b, 0x01, 0xbc, 0xf3, 0x96, 0x18, 0xa3, 0xb4, 0x68, 0x9d, 0x26, 0xc6, 0x49, + 0xf0, 0xad, 0xd2, 0x1d, 0x64, 0xb3, 0x3c, 0x29, 0x2e, 0x9e, 0xee, 0xca, 0x50, 0xb9, 0xac, 0x0f, + 0xd1, 0xd7, 0x48, 0x8e, 0xcd, 0x9b, 0x25, 0x3d, 0x65, 0xad, 0x5e, 0xd0, 0xf2, 0x64, 0x0e, 0x6f, + 0xd0, 0xa2, 0x27, 0xce, 0xb7, 0x74, 0x6c, 0xd4, 0x2a, 0xfd, 0xff, 0x3f, 0x2e, 0x30, 0x1f, 0xdd, + 0xa9, 0xee, 0x56, 0xff, 0x05, 0xeb, 0x37, 0x74, 0x0f, 0x56, 0x94, 0xf2, 0xdb, 0x70, 0x1b, 0xa7, + 0xed, 0x08, 0xb5, 0x8a, 0x85, 0x85, 0x5d, 0xac, 0xfb, 0x5e, 0x0a, 0xe5, 0xe5, 0x40, 0xc7, 0xb3, + 0x3a, 0x80, 0xab, 0x00, 0xaf, 0x03, 0xbc, 0x16, 0x50, 0x05, 0x9e, 0xa6, 0x93, 0xb2, 0xf9, 0x0d, + 0x00, 0x00, 0xff, 0xff, 0x8e, 0xa3, 0xd7, 0x80, 0xb7, 0x01, 0x00, 0x00, } diff --git a/vendor/modules.txt b/vendor/modules.txt index 5440f59de26..d4ade7e05d7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -184,7 +184,7 @@ github.com/hyperledger/fabric-config/protolator/protoext/peerext # github.com/hyperledger/fabric-lib-go v1.0.0 ## explicit github.com/hyperledger/fabric-lib-go/healthz -# github.com/hyperledger/fabric-protos-go v0.0.0-20200917184523-71c4060efc42 +# github.com/hyperledger/fabric-protos-go v0.0.0-20200923020143-c1b0c2469253 ## explicit github.com/hyperledger/fabric-protos-go/common github.com/hyperledger/fabric-protos-go/discovery