Skip to content

GitLab

新注册的用户请输入邮箱并保存，随后登录邮箱激活账号。后续可直接使用邮箱登录！

Commit be724079 authored by taifu's avatar taifu
Browse files
Options

Merge branch 'v2.2.1_qc_consensus' into 'v2.2.1_qc' (merge request !20) 

update proposal types in wal
update proposal types in wal
parents 7b6ff172 6aa7b085
master bxy2.3.2 develop v2.2.1_archive_alpha v2.3.0_archive_alpha v2.3.0_ibc v3.0.0 v2.3.2 v2.3.1 v2.3.0 v2.2.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 90 deletions
consensus/tbft/tbft.pb.go
View file @ be724079
......@@ -1119,8 +1119,8 @@ func (m *TimeoutInfo) GetStep() Step {
}
type ProposalVoteRemix struct {
Proposal []byte `protobuf:"bytes,1,opt,name=proposal,proto3" json:"proposal,omitempty"`
PrecommitVote *Vote `protobuf:"bytes,2,opt,name=precommitVote,proto3" json:"precommitVote,omitempty"`
Proposal *Proposal `protobuf:"bytes,1,opt,name=proposal,proto3" json:"proposal,omitempty"`
PrecommitVote *Vote `protobuf:"bytes,2,opt,name=precommitVote,proto3" json:"precommitVote,omitempty"`
}
func (m *ProposalVoteRemix) Reset() { *m = ProposalVoteRemix{} }
......@@ -1156,7 +1156,7 @@ func (m *ProposalVoteRemix) XXX_DiscardUnknown() {
var xxx_messageInfo_ProposalVoteRemix proto.InternalMessageInfo
func (m *ProposalVoteRemix) GetProposal() []byte {
func (m *ProposalVoteRemix) GetProposal() *Proposal {
if m != nil {
return m.Proposal
}
......@@ -1262,81 +1262,82 @@ func init() {
func init() { proto.RegisterFile("consensus/tbft/tbft.proto", fileDescriptor_3dacd5877ec4420d) }
var fileDescriptor_3dacd5877ec4420d = []byte{
// 1183 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcd, 0x6f, 0x1b, 0x45,
0x14, 0xf7, 0xd8, 0xeb, 0x8f, 0x3c, 0xaf, 0xdd, 0xf5, 0xd0, 0x82, 0x71, 0x25, 0x63, 0x2d, 0xa2,
0x32, 0xa9, 0x6a, 0xb7, 0xae, 0x10, 0x55, 0x39, 0x35, 0xee, 0xe6, 0x43, 0x34, 0x71, 0xb2, 0xde,
0x26, 0x82, 0x43, 0x57, 0xeb, 0x78, 0x62, 0x2f, 0xb1, 0x77, 0x97, 0xdd, 0xb5, 0xa9, 0x4f, 0xf0,
0x27, 0x20, 0x81, 0xe0, 0x5f, 0xe2, 0xc0, 0xa1, 0x47, 0x4e, 0x08, 0x25, 0x67, 0xf8, 0x1b, 0xd0,
0xcc, 0xec, 0x97, 0x13, 0x47, 0x22, 0x4a, 0xc4, 0xc5, 0x9a, 0xf7, 0x35, 0xef, 0xbd, 0xdf, 0xef,
0xcd, 0x8c, 0x17, 0x3e, 0x3c, 0xb6, 0x2d, 0x8f, 0x58, 0xde, 0xcc, 0x6b, 0xfb, 0x83, 0x13, 0x9f,
0xfd, 0xb4, 0x1c, 0xd7, 0xf6, 0x6d, 0x2c, 0xd0, 0x75, 0x0d, 0x1f, 0xdb, 0xd3, 0xa9, 0x6d, 0xb5,
0x07, 0x13, 0xfb, 0xf8, 0x94, 0x5b, 0x6a, 0x77, 0x03, 0x9d, 0x4b, 0xbe, 0x9d, 0x11, 0x2f, 0xf0,
0x97, 0x5b, 0x20, 0x1e, 0x1a, 0x13, 0x73, 0x68, 0xf8, 0xb6, 0xdb, 0x27, 0x3e, 0xae, 0x03, 0xcc,
0x43, 0xd9, 0xab, 0xa2, 0x46, 0xa6, 0xb9, 0xa6, 0x26, 0x34, 0xf2, 0x06, 0xe4, 0xb5, 0x8d, 0x4d,
0x6d, 0xd7, 0x1b, 0xe1, 0x4f, 0x40, 0xf0, 0x17, 0x0e, 0xa9, 0xa2, 0x06, 0x6a, 0x96, 0x3b, 0x95,
0x16, 0xab, 0x22, 0x30, 0x6a, 0x0b, 0x87, 0xa8, 0xcc, 0x8c, 0x25, 0xc8, 0x4c, 0xbd, 0x51, 0x35,
0xdd, 0x40, 0x4d, 0x51, 0xa5, 0x4b, 0xf9, 0x77, 0x04, 0x85, 0x7d, 0xd7, 0x76, 0x6c, 0xcf, 0x98,
0xe0, 0xbb, 0x90, 0x9d, 0xdb, 0x3e, 0x71, 0xd9, 0x36, 0x6b, 0x2a, 0x17, 0xf0, 0xfb, 0x90, 0x1b,
0x13, 0x73, 0x34, 0xf6, 0x59, 0x9c, 0xa0, 0x06, 0x12, 0xf5, 0x76, 0xed, 0x99, 0x35, 0xac, 0x66,
0x1a, 0xa8, 0x99, 0x55, 0xb9, 0x80, 0xef, 0xc3, 0x9a, 0x63, 0x4f, 0x74, 0x6e, 0x11, 0x98, 0xa5,
0xe0, 0xd8, 0x13, 0x95, 0x19, 0x3f, 0x86, 0x2c, 0x83, 0xa1, 0x9a, 0x6d, 0xa0, 0x66, 0xb1, 0x53,
0x6a, 0x71, 0x1c, 0x5a, 0x1b, 0x54, 0xa9, 0x72, 0x1b, 0x7e, 0x0e, 0x45, 0x62, 0x0d, 0x6d, 0xd7,
0x23, 0x53, 0x62, 0xf9, 0xd5, 0x1c, 0x73, 0xad, 0x86, 0xae, 0x4a, 0x6c, 0x52, 0x2c, 0xdf, 0x5d,
0xa8, 0x49, 0x67, 0xf9, 0x4f, 0x04, 0xc2, 0xa1, 0xed, 0x13, 0x2c, 0x2f, 0x01, 0x52, 0xe6, 0x80,
0x50, 0x4b, 0x02, 0x8d, 0xa8, 0xdd, 0xf4, 0xea, 0x76, 0x33, 0xab, 0xdb, 0x15, 0x92, 0xed, 0x62,
0x10, 0xc6, 0x86, 0x37, 0x66, 0x0d, 0x89, 0x2a, 0x5b, 0xdf, 0xa4, 0x01, 0xca, 0xb9, 0x69, 0x31,
0x8e, 0xb5, 0xb7, 0x5e, 0x35, 0xcf, 0x39, 0x8f, 0x35, 0xf2, 0xaf, 0x08, 0x80, 0xa1, 0x45, 0x7b,
0xf1, 0xf0, 0x13, 0xde, 0x02, 0x9f, 0x8e, 0x62, 0xe7, 0x3e, 0xef, 0x33, 0x76, 0x60, 0x2d, 0x7b,
0x3c, 0x0f, 0xf7, 0xa4, 0x33, 0xe0, 0xcd, 0xa6, 0x01, 0x97, 0x74, 0x59, 0x7b, 0x09, 0x10, 0xbb,
0x51, 0xfb, 0x29, 0x59, 0x04, 0x23, 0x40, 0x97, 0xb8, 0x01, 0xd9, 0xb9, 0x31, 0x99, 0x11, 0x16,
0x53, 0xec, 0x40, 0x0c, 0xa6, 0xca, 0x0d, 0xcf, 0xd3, 0xcf, 0x90, 0xfc, 0x53, 0x06, 0xf2, 0x54,
0x47, 0x27, 0xf7, 0xbf, 0xa0, 0x7f, 0xbd, 0xb1, 0x0a, 0xaa, 0x16, 0xa2, 0xaa, 0xa9, 0xdf, 0xd4,
0xf8, 0xa6, 0xf3, 0x34, 0x80, 0x9e, 0x0b, 0xb8, 0x15, 0x02, 0x92, 0x63, 0x80, 0x54, 0xe3, 0xd4,
0x7d, 0xe2, 0xaf, 0x40, 0x43, 0x81, 0x32, 0x5b, 0xe8, 0x83, 0x85, 0xce, 0x47, 0x33, 0xcf, 0x02,
0x3f, 0x5a, 0x11, 0xb8, 0xb1, 0x60, 0xc0, 0xf2, 0x78, 0x71, 0x9e, 0x50, 0xdd, 0x0e, 0x84, 0xb5,
0x03, 0xa8, 0x5c, 0x4a, 0xb4, 0x62, 0xb3, 0x07, 0xcb, 0x9b, 0x49, 0x17, 0x49, 0x4f, 0xb2, 0xf2,
0x0b, 0x02, 0x91, 0x9d, 0xbd, 0x90, 0x9a, 0x18, 0x76, 0xb4, 0x1a, 0xf6, 0x74, 0x12, 0xf6, 0x4f,
0xa1, 0xe0, 0xb8, 0x84, 0x23, 0x9a, 0x09, 0xce, 0x6c, 0x12, 0x18, 0x35, 0x32, 0xe3, 0x47, 0x00,
0x8e, 0x4b, 0xe8, 0x90, 0x9b, 0xbe, 0xc7, 0x88, 0xba, 0xe4, 0x9c, 0x70, 0x90, 0xff, 0x46, 0x80,
0xb7, 0x59, 0xea, 0x1b, 0x94, 0xd7, 0x87, 0x3b, 0x6c, 0xa1, 0xd3, 0x12, 0x74, 0x8f, 0xf8, 0xb4,
0x4a, 0x4a, 0xdf, 0x43, 0x9e, 0xf8, 0x72, 0x82, 0x56, 0x52, 0x08, 0x46, 0xa1, 0xe4, 0x26, 0x75,
0x35, 0x0d, 0xf0, 0x65, 0xa7, 0x24, 0x0d, 0x59, 0x4e, 0x43, 0x73, 0x99, 0x06, 0xcc, 0x53, 0x26,
0x43, 0x93, 0x44, 0xfc, 0x9c, 0x81, 0x72, 0x37, 0x7c, 0x2a, 0xfa, 0xbe, 0xe1, 0x13, 0x5c, 0x86,
0xb4, 0x39, 0x0c, 0x88, 0x4d, 0x9b, 0xc3, 0x6b, 0x9e, 0x88, 0x3a, 0x08, 0x9e, 0x4f, 0x1c, 0x86,
0x74, 0x39, 0x9c, 0xa8, 0xbe, 0x4f, 0x1c, 0x95, 0xe9, 0xf1, 0x3a, 0xa5, 0x8e, 0x5f, 0xec, 0xc1,
0x75, 0x1b, 0x9c, 0xc3, 0xf0, 0xba, 0x57, 0x23, 0x3b, 0xfe, 0x02, 0x2a, 0x73, 0xe2, 0x9a, 0x27,
0xa6, 0x35, 0xd2, 0xa3, 0xa0, 0xdc, 0xca, 0x20, 0x29, 0x74, 0x8c, 0x5e, 0x8d, 0xcf, 0xe1, 0x0e,
0x1d, 0x3d, 0x32, 0x8c, 0x43, 0xf3, 0x2b, 0x43, 0xcb, 0xdc, 0x2d, 0x0a, 0xfc, 0x0c, 0xca, 0xec,
0x5e, 0x8b, 0xe3, 0x0a, 0x2b, 0xe3, 0x4a, 0xcc, 0x2b, 0x0a, 0xfb, 0x12, 0xee, 0x71, 0x60, 0xf4,
0x65, 0xee, 0xab, 0x6b, 0xc1, 0x45, 0x7b, 0x05, 0xf5, 0x2a, 0x1e, 0x5f, 0xd2, 0xc9, 0xaf, 0x40,
0xdc, 0x24, 0xfe, 0xf1, 0x98, 0x29, 0x0f, 0xba, 0x37, 0xe3, 0x44, 0x9e, 0x43, 0xfe, 0x56, 0x36,
0xba, 0xee, 0x61, 0xfa, 0x07, 0x41, 0x71, 0xcb, 0xf6, 0x3c, 0xd3, 0xf9, 0x3f, 0x26, 0xab, 0x76,
0x61, 0xb2, 0xc4, 0xc4, 0x24, 0x3d, 0xbc, 0x6a, 0x92, 0xc4, 0x15, 0x93, 0xf3, 0x0c, 0xca, 0x17,
0x28, 0xcc, 0x5f, 0x79, 0x94, 0xc4, 0xe4, 0x21, 0x95, 0xbf, 0x83, 0xa2, 0x66, 0x4e, 0x89, 0x3d,
0xf3, 0x77, 0xac, 0x13, 0x9b, 0x56, 0x34, 0x9c, 0xb9, 0x86, 0x6f, 0xda, 0x16, 0xeb, 0x3a, 0xa3,
0x46, 0xf2, 0xed, 0xf6, 0x2e, 0x1b, 0x50, 0x09, 0xcb, 0x67, 0xb7, 0x37, 0x99, 0x9a, 0x6f, 0x97,
0x00, 0x41, 0x17, 0x00, 0x79, 0x0c, 0xa5, 0x88, 0x28, 0x1a, 0xb1, 0xe2, 0x05, 0x58, 0x76, 0x90,
0xdf, 0x40, 0xe1, 0xc8, 0x98, 0xf0, 0x5b, 0xe7, 0xaa, 0xeb, 0xf0, 0x41, 0xf0, 0xc0, 0xa6, 0x59,
0x99, 0x01, 0x5e, 0x61, 0x54, 0xe2, 0x91, 0xc5, 0x20, 0x0c, 0x0d, 0xdf, 0x60, 0x3d, 0x8a, 0x2a,
0x5b, 0xaf, 0x7f, 0x0f, 0xc5, 0xc4, 0x3f, 0x43, 0x7c, 0x07, 0x8a, 0xbb, 0xfd, 0x2d, 0x7d, 0x5f,
0xed, 0xed, 0xf7, 0xfa, 0x8a, 0x94, 0x8a, 0x15, 0xca, 0x61, 0x4f, 0x53, 0x24, 0x84, 0x2b, 0x50,
0x0a, 0x14, 0xdd, 0xde, 0xee, 0xee, 0x8e, 0x26, 0xa5, 0x71, 0x09, 0xd6, 0xa8, 0xaa, 0xaf, 0xbd,
0xd0, 0x14, 0x29, 0x83, 0xef, 0x41, 0x85, 0x8a, 0x9b, 0x8a, 0xd6, 0xdd, 0xd6, 0xd5, 0xde, 0xeb,
0xbd, 0x97, 0x07, 0x5d, 0x49, 0x08, 0xd5, 0x7d, 0x65, 0xef, 0x25, 0xd7, 0xea, 0x07, 0x5d, 0x29,
0xbb, 0xfe, 0x18, 0x0a, 0xe1, 0x7f, 0x01, 0x2c, 0x81, 0x48, 0xb3, 0x44, 0xd9, 0x52, 0x18, 0x43,
0x39, 0xd4, 0x04, 0xe9, 0xd0, 0xfa, 0x0f, 0x08, 0x04, 0x4a, 0x02, 0x2e, 0x03, 0xec, 0x29, 0x47,
0xfa, 0xb6, 0xb2, 0xb3, 0xb5, 0xad, 0x49, 0x29, 0x5a, 0x07, 0x95, 0xd9, 0xe6, 0x12, 0xc2, 0x45,
0xc8, 0x87, 0x7d, 0xa4, 0xb9, 0xc0, 0x77, 0xcd, 0xd0, 0x3c, 0x81, 0xa0, 0x1f, 0xbd, 0xd8, 0xd1,
0x24, 0x81, 0x86, 0xc6, 0x29, 0xb2, 0x34, 0x6d, 0x24, 0x72, 0x97, 0x1c, 0x06, 0xc8, 0x05, 0xf6,
0xfc, 0xfa, 0x1b, 0x10, 0x93, 0xf8, 0x52, 0x50, 0xb4, 0x9d, 0x5d, 0xa5, 0xf7, 0x5a, 0xd3, 0x95,
0x3d, 0x4d, 0xfd, 0x8a, 0x57, 0xce, 0xb3, 0xbf, 0x78, 0x15, 0xe8, 0x10, 0x2d, 0x98, 0x25, 0xe5,
0x72, 0x1a, 0x7f, 0x00, 0xef, 0x45, 0x3e, 0x09, 0x43, 0x66, 0x63, 0xfa, 0xdb, 0x59, 0x1d, 0xbd,
0x3b, 0xab, 0xa3, 0xbf, 0xce, 0xea, 0xe8, 0xc7, 0xf3, 0x7a, 0xea, 0xdd, 0x79, 0x3d, 0xf5, 0xc7,
0x79, 0x3d, 0x05, 0x0d, 0xdb, 0x1d, 0xb5, 0x8e, 0xc7, 0x86, 0x69, 0x4d, 0x8d, 0x53, 0xe2, 0xb6,
0x9c, 0x41, 0x2b, 0xfa, 0xe6, 0x60, 0xc4, 0x7f, 0xfd, 0x24, 0x61, 0xb5, 0xdd, 0x51, 0x3b, 0x16,
0xdb, 0xce, 0xe0, 0xd1, 0xc8, 0x6e, 0xcf, 0x3b, 0xed, 0xe5, 0xcf, 0x94, 0x41, 0x8e, 0x7d, 0x72,
0x3c, 0xfd, 0x37, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x24, 0x38, 0x05, 0xbf, 0x0c, 0x00, 0x00,
// 1186 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0x1b, 0x45,
0x14, 0xf7, 0xd8, 0xeb, 0x3f, 0x79, 0x5e, 0xbb, 0xeb, 0xa1, 0x05, 0xe3, 0x4a, 0xc6, 0x5a, 0x44,
0x65, 0x52, 0xd5, 0x6e, 0x5d, 0x21, 0xaa, 0x72, 0x6a, 0xdc, 0x6d, 0x12, 0xd1, 0xc4, 0xc9, 0x7a,
0x9b, 0x08, 0x0e, 0x5d, 0xad, 0xe3, 0x89, 0xbd, 0xc4, 0xde, 0xdd, 0xee, 0xae, 0x4d, 0x7d, 0x82,
0x8f, 0x80, 0x04, 0x82, 0xaf, 0xc4, 0x81, 0x43, 0x8f, 0x9c, 0x10, 0x4a, 0xce, 0xf0, 0x19, 0xd0,
0xcc, 0xec, 0x3f, 0x27, 0x8e, 0x20, 0x4a, 0xc4, 0xc5, 0x9a, 0xf7, 0x6f, 0xde, 0x7b, 0xbf, 0xdf,
0x9b, 0x19, 0x2f, 0x7c, 0x78, 0x64, 0x5b, 0x1e, 0xb1, 0xbc, 0x99, 0xd7, 0xf6, 0x07, 0xc7, 0x3e,
0xfb, 0x69, 0x39, 0xae, 0xed, 0xdb, 0x58, 0xa0, 0xeb, 0x1a, 0x3e, 0xb2, 0xa7, 0x53, 0xdb, 0x6a,
0x0f, 0x26, 0xf6, 0xd1, 0x09, 0xb7, 0xd4, 0x6e, 0x07, 0x3a, 0x97, 0xbc, 0x99, 0x11, 0x2f, 0xf0,
0x97, 0x5b, 0x20, 0x1e, 0x18, 0x13, 0x73, 0x68, 0xf8, 0xb6, 0xdb, 0x27, 0x3e, 0xae, 0x03, 0xcc,
0x43, 0xd9, 0xab, 0xa2, 0x46, 0xa6, 0xb9, 0xa6, 0x26, 0x34, 0xf2, 0x06, 0xe4, 0xb5, 0x8d, 0x17,
0xda, 0x8e, 0x37, 0xc2, 0x9f, 0x80, 0xe0, 0x2f, 0x1c, 0x52, 0x45, 0x0d, 0xd4, 0x2c, 0x77, 0x2a,
0x2d, 0x56, 0x45, 0x60, 0xd4, 0x16, 0x0e, 0x51, 0x99, 0x19, 0x4b, 0x90, 0x99, 0x7a, 0xa3, 0x6a,
0xba, 0x81, 0x9a, 0xa2, 0x4a, 0x97, 0xf2, 0x6f, 0x08, 0x0a, 0x7b, 0xae, 0xed, 0xd8, 0x9e, 0x31,
0xc1, 0xb7, 0x21, 0x3b, 0xb7, 0x7d, 0xe2, 0xb2, 0x6d, 0xd6, 0x54, 0x2e, 0xe0, 0xf7, 0x21, 0x37,
0x26, 0xe6, 0x68, 0xec, 0xb3, 0x38, 0x41, 0x0d, 0x24, 0xea, 0xed, 0xda, 0x33, 0x6b, 0x58, 0xcd,
0x34, 0x50, 0x33, 0xab, 0x72, 0x01, 0xdf, 0x85, 0x35, 0xc7, 0x9e, 0xe8, 0xdc, 0x22, 0x30, 0x4b,
0xc1, 0xb1, 0x27, 0x2a, 0x33, 0x7e, 0x0c, 0x59, 0x06, 0x43, 0x35, 0xdb, 0x40, 0xcd, 0x62, 0xa7,
0xd4, 0xe2, 0x38, 0xb4, 0x36, 0xa8, 0x52, 0xe5, 0x36, 0xfc, 0x14, 0x8a, 0xc4, 0x1a, 0xda, 0xae,
0x47, 0xa6, 0xc4, 0xf2, 0xab, 0x39, 0xe6, 0x5a, 0x0d, 0x5d, 0x95, 0xd8, 0xa4, 0x58, 0xbe, 0xbb,
0x50, 0x93, 0xce, 0xf2, 0x1f, 0x08, 0x84, 0x03, 0xdb, 0x27, 0x58, 0x5e, 0x02, 0xa4, 0xcc, 0x01,
0xa1, 0x96, 0x04, 0x1a, 0x51, 0xbb, 0xe9, 0xd5, 0xed, 0x66, 0x56, 0xb7, 0x2b, 0x24, 0xdb, 0xc5,
0x20, 0x8c, 0x0d, 0x6f, 0xcc, 0x1a, 0x12, 0x55, 0xb6, 0xbe, 0x4e, 0x03, 0x94, 0x73, 0xd3, 0x62,
0x1c, 0x6b, 0x6f, 0xbd, 0x6a, 0x9e, 0x73, 0x1e, 0x6b, 0xe4, 0x5f, 0x10, 0x00, 0x43, 0x8b, 0xf6,
0xe2, 0xe1, 0x47, 0xbc, 0x05, 0x3e, 0x1d, 0xc5, 0xce, 0x5d, 0xde, 0x67, 0xec, 0xc0, 0x5a, 0xf6,
0x78, 0x1e, 0xee, 0x49, 0x67, 0xc0, 0x9b, 0x4d, 0x03, 0x2e, 0xe9, 0xb2, 0xf6, 0x1c, 0x20, 0x76,
0xa3, 0xf6, 0x13, 0xb2, 0x08, 0x46, 0x80, 0x2e, 0x71, 0x03, 0xb2, 0x73, 0x63, 0x32, 0x23, 0x2c,
0xa6, 0xd8, 0x81, 0x18, 0x4c, 0x95, 0x1b, 0x9e, 0xa6, 0x9f, 0x20, 0xf9, 0xc7, 0x0c, 0xe4, 0xa9,
0x8e, 0x4e, 0xee, 0x7f, 0x41, 0xff, 0x6a, 0x63, 0x15, 0x54, 0x2d, 0x44, 0x55, 0x53, 0xbf, 0xa9,
0xf1, 0x4d, 0xe7, 0x71, 0x00, 0x3d, 0x17, 0x70, 0x2b, 0x04, 0x24, 0xc7, 0x00, 0xa9, 0xc6, 0xa9,
0xfb, 0xc4, 0x5f, 0x81, 0x86, 0x02, 0x65, 0xb6, 0xd0, 0x07, 0x0b, 0x9d, 0x8f, 0x66, 0x9e, 0x05,
0x7e, 0xb4, 0x22, 0x70, 0x63, 0xc1, 0x80, 0xe5, 0xf1, 0xe2, 0x3c, 0xa1, 0xba, 0x19, 0x08, 0x6b,
0xfb, 0x50, 0xb9, 0x90, 0x68, 0xc5, 0x66, 0xf7, 0x96, 0x37, 0x93, 0xce, 0x93, 0x9e, 0x64, 0xe5,
0x67, 0x04, 0x22, 0x3b, 0x7b, 0x21, 0x35, 0x31, 0xec, 0x68, 0x35, 0xec, 0xe9, 0x24, 0xec, 0x9f,
0x42, 0xc1, 0x71, 0x09, 0x47, 0x34, 0x13, 0x9c, 0xd9, 0x24, 0x30, 0x6a, 0x64, 0xc6, 0x0f, 0x00,
0x1c, 0x97, 0xd0, 0x21, 0x37, 0x7d, 0x8f, 0x11, 0x75, 0xc1, 0x39, 0xe1, 0x20, 0xff, 0x85, 0x00,
0x6f, 0xb1, 0xd4, 0xd7, 0x28, 0xaf, 0x0f, 0xb7, 0xd8, 0x42, 0xa7, 0x25, 0xe8, 0x1e, 0xf1, 0x69,
0x95, 0x94, 0xbe, 0xfb, 0x3c, 0xf1, 0xc5, 0x04, 0xad, 0xa4, 0x10, 0x8c, 0x42, 0xc9, 0x4d, 0xea,
0x6a, 0x1a, 0xe0, 0x8b, 0x4e, 0x49, 0x1a, 0xb2, 0x9c, 0x86, 0xe6, 0x32, 0x0d, 0x98, 0xa7, 0x4c,
0x86, 0x26, 0x89, 0xf8, 0x29, 0x03, 0xe5, 0x6e, 0xf8, 0x54, 0xf4, 0x7d, 0xc3, 0x27, 0xb8, 0x0c,
0x69, 0x73, 0x18, 0x10, 0x9b, 0x36, 0x87, 0x57, 0x3c, 0x11, 0x75, 0x10, 0x3c, 0x9f, 0x38, 0x0c,
0xe9, 0x72, 0x38, 0x51, 0x7d, 0x9f, 0x38, 0x2a, 0xd3, 0xe3, 0x75, 0x4a, 0x1d, 0xbf, 0xd8, 0x83,
0xeb, 0x36, 0x38, 0x87, 0xe1, 0x75, 0xaf, 0x46, 0x76, 0xfc, 0x05, 0x54, 0xe6, 0xc4, 0x35, 0x8f,
0x4d, 0x6b, 0xa4, 0x47, 0x41, 0xb9, 0x95, 0x41, 0x52, 0xe8, 0x18, 0xbd, 0x1a, 0x9f, 0xc3, 0x2d,
0x3a, 0x7a, 0x64, 0x18, 0x87, 0xe6, 0x57, 0x86, 0x96, 0xb9, 0x5b, 0x14, 0xf8, 0x19, 0x94, 0xd9,
0xbd, 0x16, 0xc7, 0x15, 0x56, 0xc6, 0x95, 0x98, 0x57, 0x14, 0xf6, 0x25, 0xdc, 0xe1, 0xc0, 0xe8,
0xcb, 0xdc, 0x57, 0xd7, 0x82, 0x8b, 0xf6, 0x12, 0xea, 0x55, 0x3c, 0xbe, 0xa0, 0x93, 0x5f, 0x82,
0xf8, 0x82, 0xf8, 0x47, 0x63, 0xa6, 0xdc, 0xef, 0x5e, 0x8f, 0x13, 0x79, 0x0e, 0xf9, 0x1b, 0xd9,
0xe8, 0xaa, 0x87, 0xe9, 0x6f, 0x04, 0xc5, 0x4d, 0xdb, 0xf3, 0x4c, 0xe7, 0xff, 0x98, 0xac, 0xda,
0xb9, 0xc9, 0x12, 0x13, 0x93, 0x74, 0xff, 0xb2, 0x49, 0x12, 0x57, 0x4c, 0xce, 0x13, 0x28, 0x9f,
0xa3, 0x30, 0x7f, 0xe9, 0x51, 0x12, 0x93, 0x87, 0x54, 0xfe, 0x16, 0x8a, 0x9a, 0x39, 0x25, 0xf6,
0xcc, 0xdf, 0xb6, 0x8e, 0x6d, 0x5a, 0xd1, 0x70, 0xe6, 0x1a, 0xbe, 0x69, 0x5b, 0xac, 0xeb, 0x8c,
0x1a, 0xc9, 0x37, 0xdb, 0xbb, 0xfc, 0x06, 0x2a, 0x61, 0xf9, 0xec, 0xf6, 0x26, 0x53, 0xf3, 0xed,
0xd2, 0x51, 0x43, 0xff, 0x72, 0xd4, 0x1e, 0x42, 0x29, 0x22, 0x8e, 0xee, 0xb0, 0xe2, 0x45, 0x58,
0x76, 0x90, 0x5f, 0x43, 0xe1, 0xd0, 0x98, 0xf0, 0x5b, 0xe8, 0xb2, 0xeb, 0xf1, 0x5e, 0xf0, 0xe0,
0xa6, 0x59, 0xd9, 0x01, 0x7e, 0x61, 0x54, 0xe2, 0xd1, 0xc5, 0x20, 0x0c, 0x0d, 0xdf, 0x60, 0x3d,
0x8b, 0x2a, 0x5b, 0xaf, 0x7f, 0x07, 0xc5, 0xc4, 0x3f, 0x45, 0x7c, 0x0b, 0x8a, 0x3b, 0xfd, 0x4d,
0x7d, 0x4f, 0xed, 0xed, 0xf5, 0xfa, 0x8a, 0x94, 0x8a, 0x15, 0xca, 0x41, 0x4f, 0x53, 0x24, 0x84,
0x2b, 0x50, 0x0a, 0x14, 0xdd, 0xde, 0xce, 0xce, 0xb6, 0x26, 0xa5, 0x71, 0x09, 0xd6, 0xa8, 0xaa,
0xaf, 0x3d, 0xd3, 0x14, 0x29, 0x83, 0xef, 0x40, 0x85, 0x8a, 0x2f, 0x14, 0xad, 0xbb, 0xa5, 0xab,
0xbd, 0x57, 0xbb, 0xcf, 0xf7, 0xbb, 0x92, 0x10, 0xaa, 0xfb, 0xca, 0xee, 0x73, 0xae, 0xd5, 0xf7,
0xbb, 0x52, 0x76, 0xfd, 0x21, 0x14, 0xc2, 0xff, 0x06, 0x58, 0x02, 0x91, 0x66, 0x89, 0xb2, 0xa5,
0x30, 0x86, 0x72, 0xa8, 0x09, 0xd2, 0xa1, 0xf5, 0xef, 0x11, 0x08, 0x94, 0x14, 0x5c, 0x06, 0xd8,
0x55, 0x0e, 0xf5, 0x2d, 0x65, 0x7b, 0x73, 0x4b, 0x93, 0x52, 0xb4, 0x0e, 0x2a, 0xb3, 0xcd, 0x25,
0x84, 0x8b, 0x90, 0x0f, 0xfb, 0x48, 0x73, 0x81, 0xef, 0x9a, 0xa1, 0x79, 0x02, 0x41, 0x3f, 0x7c,
0xb6, 0xad, 0x49, 0x02, 0x0d, 0x8d, 0x53, 0x64, 0x69, 0xda, 0x48, 0xe4, 0x2e, 0x39, 0x0c, 0x90,
0x0b, 0xec, 0xf9, 0xf5, 0xd7, 0x20, 0x26, 0xf1, 0xa5, 0xa0, 0x68, 0xdb, 0x3b, 0x4a, 0xef, 0x95,
0xa6, 0x2b, 0xbb, 0x9a, 0xfa, 0x15, 0xaf, 0x9c, 0x67, 0x7f, 0xf6, 0x32, 0xd0, 0x21, 0x5a, 0x30,
0x4b, 0xca, 0xe5, 0x34, 0xfe, 0x00, 0xde, 0x8b, 0x7c, 0x12, 0x86, 0xcc, 0xc6, 0xf4, 0xd7, 0xd3,
0x3a, 0x7a, 0x77, 0x5a, 0x47, 0x7f, 0x9e, 0xd6, 0xd1, 0x0f, 0x67, 0xf5, 0xd4, 0xbb, 0xb3, 0x7a,
0xea, 0xf7, 0xb3, 0x7a, 0x0a, 0x1a, 0xb6, 0x3b, 0x6a, 0x1d, 0x8d, 0x0d, 0xd3, 0x9a, 0x1a, 0x27,
0xc4, 0x6d, 0x39, 0x83, 0x56, 0xf4, 0x0d, 0xc2, 0x88, 0xff, 0xfa, 0x51, 0xc2, 0x6a, 0xbb, 0xa3,
0x76, 0x2c, 0xb6, 0x9d, 0xc1, 0x83, 0x91, 0xdd, 0x9e, 0x77, 0xda, 0xcb, 0x9f, 0x2d, 0x83, 0x1c,
0xfb, 0x04, 0x79, 0xfc, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5f, 0x6f, 0x48, 0xfb, 0xcf, 0x0c,
0x00, 0x00,
}
func (m *ValidatorSet) Marshal() (dAtA []byte, err error) {
......@@ -2161,10 +2162,15 @@ func (m *ProposalVoteRemix) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
if len(m.Proposal) > 0 {
i -= len(m.Proposal)
copy(dAtA[i:], m.Proposal)
i = encodeVarintTbft(dAtA, i, uint64(len(m.Proposal)))
if m.Proposal != nil {
{
size, err := m.Proposal.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintTbft(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
}
......@@ -2591,8 +2597,8 @@ func (m *ProposalVoteRemix) Size() (n int) {
}
var l int
_ = l
l = len(m.Proposal)
if l > 0 {
if m.Proposal != nil {
l = m.Proposal.Size()
n += 1 + l + sovTbft(uint64(l))
}
if m.PrecommitVote != nil {
......@@ -5240,7 +5246,7 @@ func (m *ProposalVoteRemix) Unmarshal(dAtA []byte) error {
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Proposal", wireType)
}
var byteLen int
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTbft
......@@ -5250,24 +5256,26 @@ func (m *ProposalVoteRemix) Unmarshal(dAtA []byte) error {
}
b := dAtA[iNdEx]
iNdEx++
byteLen |= int(b&0x7F) << shift
msglen |= int(b&0x7F) << shift
if b < 0x80 {
break
}
}
if byteLen < 0 {
if msglen < 0 {
return ErrInvalidLengthTbft
}
postIndex := iNdEx + byteLen
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthTbft
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Proposal = append(m.Proposal[:0], dAtA[iNdEx:postIndex]...)
if m.Proposal == nil {
m.Proposal = []byte{}
m.Proposal = &Proposal{}
}
if err := m.Proposal.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
case 2:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © 2021 ChainMaker Org. All Rights Reserved. 长安链 版权所有。