From ab9963acb32ef4f2efe30c21cfc1102dd7e7770b Mon Sep 17 00:00:00 2001 From: William Banfield Date: Fri, 4 Mar 2022 16:21:27 -0500 Subject: [PATCH] apply the renames to LastCommitInfo --- abci/types/types.pb.go | 516 ++++++++++++++++--------------- internal/state/execution.go | 12 +- internal/state/execution_test.go | 8 +- internal/state/helpers_test.go | 2 +- 4 files changed, 270 insertions(+), 268 deletions(-) diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 969179672..20e0eab78 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -801,10 +801,10 @@ func (m *RequestQuery) GetProve() bool { } type RequestBeginBlock struct { - Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` - Header types1.Header `protobuf:"bytes,2,opt,name=header,proto3" json:"header"` - LastCommitInfo LastCommitInfo `protobuf:"bytes,3,opt,name=last_commit_info,json=lastCommitInfo,proto3" json:"last_commit_info"` - ByzantineValidators []Evidence `protobuf:"bytes,4,rep,name=byzantine_validators,json=byzantineValidators,proto3" json:"byzantine_validators"` + Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` + Header types1.Header `protobuf:"bytes,2,opt,name=header,proto3" json:"header"` + LastCommitInfo CommitInfo `protobuf:"bytes,3,opt,name=last_commit_info,json=lastCommitInfo,proto3" json:"last_commit_info"` + ByzantineValidators []Evidence `protobuf:"bytes,4,rep,name=byzantine_validators,json=byzantineValidators,proto3" json:"byzantine_validators"` } func (m *RequestBeginBlock) Reset() { *m = RequestBeginBlock{} } @@ -854,11 +854,11 @@ func (m *RequestBeginBlock) GetHeader() types1.Header { return types1.Header{} } -func (m *RequestBeginBlock) GetLastCommitInfo() LastCommitInfo { +func (m *RequestBeginBlock) GetLastCommitInfo() CommitInfo { if m != nil { return m.LastCommitInfo } - return LastCommitInfo{} + return CommitInfo{} } func (m *RequestBeginBlock) GetByzantineValidators() []Evidence { @@ -1413,11 +1413,11 @@ func (m *RequestPrepareProposal) GetVotes() []*types1.Vote { } type RequestProcessProposal struct { - Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` - Header types1.Header `protobuf:"bytes,2,opt,name=header,proto3" json:"header"` - Txs [][]byte `protobuf:"bytes,3,rep,name=txs,proto3" json:"txs,omitempty"` - LastCommitInfo LastCommitInfo `protobuf:"bytes,4,opt,name=last_commit_info,json=lastCommitInfo,proto3" json:"last_commit_info"` - ByzantineValidators []Evidence `protobuf:"bytes,5,rep,name=byzantine_validators,json=byzantineValidators,proto3" json:"byzantine_validators"` + Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` + Header types1.Header `protobuf:"bytes,2,opt,name=header,proto3" json:"header"` + Txs [][]byte `protobuf:"bytes,3,rep,name=txs,proto3" json:"txs,omitempty"` + ProposedLastCommit CommitInfo `protobuf:"bytes,4,opt,name=proposed_last_commit,json=proposedLastCommit,proto3" json:"proposed_last_commit"` + ByzantineValidators []Evidence `protobuf:"bytes,5,rep,name=byzantine_validators,json=byzantineValidators,proto3" json:"byzantine_validators"` } func (m *RequestProcessProposal) Reset() { *m = RequestProcessProposal{} } @@ -1474,11 +1474,11 @@ func (m *RequestProcessProposal) GetTxs() [][]byte { return nil } -func (m *RequestProcessProposal) GetLastCommitInfo() LastCommitInfo { +func (m *RequestProcessProposal) GetProposedLastCommit() CommitInfo { if m != nil { - return m.LastCommitInfo + return m.ProposedLastCommit } - return LastCommitInfo{} + return CommitInfo{} } func (m *RequestProcessProposal) GetByzantineValidators() []Evidence { @@ -1489,11 +1489,11 @@ func (m *RequestProcessProposal) GetByzantineValidators() []Evidence { } type RequestFinalizeBlock struct { - Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` - Header types1.Header `protobuf:"bytes,2,opt,name=header,proto3" json:"header"` - Txs [][]byte `protobuf:"bytes,3,rep,name=txs,proto3" json:"txs,omitempty"` - LastCommitInfo LastCommitInfo `protobuf:"bytes,4,opt,name=last_commit_info,json=lastCommitInfo,proto3" json:"last_commit_info"` - ByzantineValidators []Evidence `protobuf:"bytes,5,rep,name=byzantine_validators,json=byzantineValidators,proto3" json:"byzantine_validators"` + Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` + Header types1.Header `protobuf:"bytes,2,opt,name=header,proto3" json:"header"` + Txs [][]byte `protobuf:"bytes,3,rep,name=txs,proto3" json:"txs,omitempty"` + DecidedLastCommit CommitInfo `protobuf:"bytes,4,opt,name=decided_last_commit,json=decidedLastCommit,proto3" json:"decided_last_commit"` + ByzantineValidators []Evidence `protobuf:"bytes,5,rep,name=byzantine_validators,json=byzantineValidators,proto3" json:"byzantine_validators"` } func (m *RequestFinalizeBlock) Reset() { *m = RequestFinalizeBlock{} } @@ -1550,11 +1550,11 @@ func (m *RequestFinalizeBlock) GetTxs() [][]byte { return nil } -func (m *RequestFinalizeBlock) GetLastCommitInfo() LastCommitInfo { +func (m *RequestFinalizeBlock) GetDecidedLastCommit() CommitInfo { if m != nil { - return m.LastCommitInfo + return m.DecidedLastCommit } - return LastCommitInfo{} + return CommitInfo{} } func (m *RequestFinalizeBlock) GetByzantineValidators() []Evidence { @@ -3123,23 +3123,23 @@ func (m *ResponseFinalizeBlock) GetRetainHeight() int64 { return 0 } -type LastCommitInfo struct { +type CommitInfo struct { Round int32 `protobuf:"varint,1,opt,name=round,proto3" json:"round,omitempty"` Votes []VoteInfo `protobuf:"bytes,2,rep,name=votes,proto3" json:"votes"` } -func (m *LastCommitInfo) Reset() { *m = LastCommitInfo{} } -func (m *LastCommitInfo) String() string { return proto.CompactTextString(m) } -func (*LastCommitInfo) ProtoMessage() {} -func (*LastCommitInfo) Descriptor() ([]byte, []int) { +func (m *CommitInfo) Reset() { *m = CommitInfo{} } +func (m *CommitInfo) String() string { return proto.CompactTextString(m) } +func (*CommitInfo) ProtoMessage() {} +func (*CommitInfo) Descriptor() ([]byte, []int) { return fileDescriptor_252557cfdd89a31a, []int{41} } -func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { +func (m *CommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *LastCommitInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *CommitInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_LastCommitInfo.Marshal(b, m, deterministic) + return xxx_messageInfo_CommitInfo.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -3149,26 +3149,26 @@ func (m *LastCommitInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, erro return b[:n], nil } } -func (m *LastCommitInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_LastCommitInfo.Merge(m, src) +func (m *CommitInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommitInfo.Merge(m, src) } -func (m *LastCommitInfo) XXX_Size() int { +func (m *CommitInfo) XXX_Size() int { return m.Size() } -func (m *LastCommitInfo) XXX_DiscardUnknown() { - xxx_messageInfo_LastCommitInfo.DiscardUnknown(m) +func (m *CommitInfo) XXX_DiscardUnknown() { + xxx_messageInfo_CommitInfo.DiscardUnknown(m) } -var xxx_messageInfo_LastCommitInfo proto.InternalMessageInfo +var xxx_messageInfo_CommitInfo proto.InternalMessageInfo -func (m *LastCommitInfo) GetRound() int32 { +func (m *CommitInfo) GetRound() int32 { if m != nil { return m.Round } return 0 } -func (m *LastCommitInfo) GetVotes() []VoteInfo { +func (m *CommitInfo) GetVotes() []VoteInfo { if m != nil { return m.Votes } @@ -3830,7 +3830,7 @@ func init() { proto.RegisterType((*ResponsePrepareProposal)(nil), "tendermint.abci.ResponsePrepareProposal") proto.RegisterType((*ResponseProcessProposal)(nil), "tendermint.abci.ResponseProcessProposal") proto.RegisterType((*ResponseFinalizeBlock)(nil), "tendermint.abci.ResponseFinalizeBlock") - proto.RegisterType((*LastCommitInfo)(nil), "tendermint.abci.LastCommitInfo") + proto.RegisterType((*CommitInfo)(nil), "tendermint.abci.CommitInfo") proto.RegisterType((*Event)(nil), "tendermint.abci.Event") proto.RegisterType((*EventAttribute)(nil), "tendermint.abci.EventAttribute") proto.RegisterType((*ExecTxResult)(nil), "tendermint.abci.ExecTxResult") @@ -3845,209 +3845,211 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 3218 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcd, 0x73, 0x23, 0xd5, - 0x11, 0xd7, 0xb7, 0xa5, 0xd6, 0xa7, 0x9f, 0x17, 0xa3, 0x15, 0xbb, 0xf6, 0x32, 0x5b, 0xc0, 0xb2, - 0x2c, 0x76, 0xf0, 0x16, 0x64, 0x29, 0x48, 0x52, 0x96, 0x56, 0x46, 0xde, 0x35, 0xb6, 0xf3, 0x2c, - 0x2f, 0x45, 0x02, 0x3b, 0x8c, 0xa4, 0x67, 0x69, 0x58, 0x69, 0x66, 0x98, 0x19, 0x19, 0x7b, 0x8f, - 0x49, 0xb8, 0x50, 0x49, 0x15, 0xc7, 0x7c, 0x14, 0xb7, 0x1c, 0xf2, 0x07, 0xe4, 0x90, 0x53, 0x4e, - 0x39, 0x70, 0xc8, 0x81, 0x5b, 0x52, 0x39, 0x90, 0x14, 0xdc, 0xf2, 0x0f, 0xe4, 0x94, 0x4a, 0xea, - 0x7d, 0xcc, 0x97, 0xa4, 0xd1, 0x47, 0x0c, 0xa9, 0x1c, 0x72, 0x9b, 0xd7, 0xd3, 0xdd, 0xf3, 0x5e, - 0xcf, 0x7b, 0xdd, 0xfd, 0xeb, 0x7e, 0xf0, 0x94, 0x4d, 0xb4, 0x0e, 0x31, 0x07, 0xaa, 0x66, 0x6f, - 0x2a, 0xad, 0xb6, 0xba, 0x69, 0x9f, 0x1b, 0xc4, 0xda, 0x30, 0x4c, 0xdd, 0xd6, 0x51, 0xd1, 0x7b, - 0xb9, 0x41, 0x5f, 0x56, 0xae, 0xfa, 0xb8, 0xdb, 0xe6, 0xb9, 0x61, 0xeb, 0x9b, 0x86, 0xa9, 0xeb, - 0x27, 0x9c, 0xbf, 0x72, 0xc5, 0xf7, 0x9a, 0xe9, 0xf1, 0x6b, 0x0b, 0xbc, 0x15, 0xc2, 0x8f, 0xc8, - 0xb9, 0xf3, 0xf6, 0xea, 0x98, 0xac, 0xa1, 0x98, 0xca, 0xc0, 0x79, 0xbd, 0xde, 0xd5, 0xf5, 0x6e, - 0x9f, 0x6c, 0xb2, 0x51, 0x6b, 0x78, 0xb2, 0x69, 0xab, 0x03, 0x62, 0xd9, 0xca, 0xc0, 0x10, 0x0c, - 0x97, 0xba, 0x7a, 0x57, 0x67, 0x8f, 0x9b, 0xf4, 0x89, 0x53, 0xa5, 0x7f, 0x01, 0x2c, 0x61, 0xf2, - 0xc1, 0x90, 0x58, 0x36, 0xda, 0x82, 0x04, 0x69, 0xf7, 0xf4, 0x72, 0xf4, 0x5a, 0xf4, 0x46, 0x76, - 0xeb, 0xca, 0xc6, 0xc8, 0xe2, 0x36, 0x04, 0x5f, 0xbd, 0xdd, 0xd3, 0x1b, 0x11, 0xcc, 0x78, 0xd1, - 0xcb, 0x90, 0x3c, 0xe9, 0x0f, 0xad, 0x5e, 0x39, 0xc6, 0x84, 0xae, 0x86, 0x09, 0xed, 0x50, 0xa6, - 0x46, 0x04, 0x73, 0x6e, 0xfa, 0x29, 0x55, 0x3b, 0xd1, 0xcb, 0xf1, 0xe9, 0x9f, 0xda, 0xd5, 0x4e, - 0xd8, 0xa7, 0x28, 0x2f, 0xaa, 0x02, 0xa8, 0x9a, 0x6a, 0xcb, 0xed, 0x9e, 0xa2, 0x6a, 0xe5, 0x04, - 0x93, 0x7c, 0x3a, 0x5c, 0x52, 0xb5, 0x6b, 0x94, 0xb1, 0x11, 0xc1, 0x19, 0xd5, 0x19, 0xd0, 0xe9, - 0x7e, 0x30, 0x24, 0xe6, 0x79, 0x39, 0x39, 0x7d, 0xba, 0xdf, 0xa7, 0x4c, 0x74, 0xba, 0x8c, 0x1b, - 0xed, 0x42, 0xb6, 0x45, 0xba, 0xaa, 0x26, 0xb7, 0xfa, 0x7a, 0xfb, 0x51, 0x39, 0xc5, 0x84, 0xa5, - 0x30, 0xe1, 0x2a, 0x65, 0xad, 0x52, 0xce, 0x6a, 0xac, 0x1c, 0x6d, 0x44, 0x30, 0xb4, 0x5c, 0x0a, - 0x7a, 0x1d, 0xd2, 0xed, 0x1e, 0x69, 0x3f, 0x92, 0xed, 0xb3, 0xf2, 0x12, 0xd3, 0xb3, 0x1e, 0xa6, - 0xa7, 0x46, 0xf9, 0x9a, 0x67, 0x8d, 0x08, 0x5e, 0x6a, 0xf3, 0x47, 0xb4, 0x03, 0xd0, 0x21, 0x7d, - 0xf5, 0x94, 0x98, 0x54, 0x3e, 0x3d, 0xdd, 0x06, 0x77, 0x39, 0x67, 0xf3, 0x4c, 0x4c, 0x23, 0xd3, - 0x71, 0x08, 0xa8, 0x06, 0x19, 0xa2, 0x75, 0xc4, 0x72, 0x32, 0x4c, 0xcd, 0xb5, 0xd0, 0xff, 0xad, - 0x75, 0xfc, 0x8b, 0x49, 0x13, 0x31, 0x46, 0x77, 0x20, 0xd5, 0xd6, 0x07, 0x03, 0xd5, 0x2e, 0x03, - 0xd3, 0xb0, 0x16, 0xba, 0x10, 0xc6, 0xd5, 0x88, 0x60, 0xc1, 0x8f, 0xf6, 0xa1, 0xd0, 0x57, 0x2d, - 0x5b, 0xb6, 0x34, 0xc5, 0xb0, 0x7a, 0xba, 0x6d, 0x95, 0xb3, 0x4c, 0xc3, 0x33, 0x61, 0x1a, 0xf6, - 0x54, 0xcb, 0x3e, 0x72, 0x98, 0x1b, 0x11, 0x9c, 0xef, 0xfb, 0x09, 0x54, 0x9f, 0x7e, 0x72, 0x42, - 0x4c, 0x57, 0x61, 0x39, 0x37, 0x5d, 0xdf, 0x01, 0xe5, 0x76, 0xe4, 0xa9, 0x3e, 0xdd, 0x4f, 0x40, - 0x3f, 0x84, 0x95, 0xbe, 0xae, 0x74, 0x5c, 0x75, 0x72, 0xbb, 0x37, 0xd4, 0x1e, 0x95, 0xf3, 0x4c, - 0xe9, 0xf3, 0xa1, 0x93, 0xd4, 0x95, 0x8e, 0xa3, 0xa2, 0x46, 0x05, 0x1a, 0x11, 0xbc, 0xdc, 0x1f, - 0x25, 0xa2, 0x87, 0x70, 0x49, 0x31, 0x8c, 0xfe, 0xf9, 0xa8, 0xf6, 0x02, 0xd3, 0x7e, 0x33, 0x4c, - 0xfb, 0x36, 0x95, 0x19, 0x55, 0x8f, 0x94, 0x31, 0x2a, 0x6a, 0x42, 0xc9, 0x30, 0x89, 0xa1, 0x98, - 0x44, 0x36, 0x4c, 0xdd, 0xd0, 0x2d, 0xa5, 0x5f, 0x2e, 0x32, 0xdd, 0xcf, 0x85, 0xe9, 0x3e, 0xe4, - 0xfc, 0x87, 0x82, 0xbd, 0x11, 0xc1, 0x45, 0x23, 0x48, 0xe2, 0x5a, 0xf5, 0x36, 0xb1, 0x2c, 0x4f, - 0x6b, 0x69, 0x96, 0x56, 0xc6, 0x1f, 0xd4, 0x1a, 0x20, 0xa1, 0x3a, 0x64, 0xc9, 0x19, 0x15, 0x97, - 0x4f, 0x75, 0x9b, 0x94, 0x97, 0xa7, 0x1f, 0xac, 0x3a, 0x63, 0x7d, 0xa0, 0xdb, 0x84, 0x1e, 0x2a, - 0xe2, 0x8e, 0x90, 0x02, 0x4f, 0x9c, 0x12, 0x53, 0x3d, 0x39, 0x67, 0x6a, 0x64, 0xf6, 0xc6, 0x52, - 0x75, 0xad, 0x8c, 0x98, 0xc2, 0x17, 0xc2, 0x14, 0x3e, 0x60, 0x42, 0x54, 0x45, 0xdd, 0x11, 0x69, - 0x44, 0xf0, 0xca, 0xe9, 0x38, 0x99, 0x6e, 0xb1, 0x13, 0x55, 0x53, 0xfa, 0xea, 0x63, 0x22, 0x8e, - 0xcd, 0xca, 0xf4, 0x2d, 0xb6, 0x23, 0xb8, 0xd9, 0x59, 0xa1, 0x5b, 0xec, 0xc4, 0x4f, 0xa8, 0x2e, - 0x41, 0xf2, 0x54, 0xe9, 0x0f, 0x89, 0xf4, 0x1c, 0x64, 0x7d, 0x8e, 0x15, 0x95, 0x61, 0x69, 0x40, - 0x2c, 0x4b, 0xe9, 0x12, 0xe6, 0x87, 0x33, 0xd8, 0x19, 0x4a, 0x05, 0xc8, 0xf9, 0x9d, 0xa9, 0xf4, - 0x49, 0xd4, 0x95, 0xa4, 0x7e, 0x92, 0x4a, 0x9e, 0x12, 0x93, 0x2d, 0x5b, 0x48, 0x8a, 0x21, 0xba, - 0x0e, 0x79, 0x36, 0x65, 0xd9, 0x79, 0x4f, 0x9d, 0x75, 0x02, 0xe7, 0x18, 0xf1, 0x81, 0x60, 0x5a, - 0x87, 0xac, 0xb1, 0x65, 0xb8, 0x2c, 0x71, 0xc6, 0x02, 0xc6, 0x96, 0xe1, 0x30, 0x3c, 0x0d, 0x39, - 0xba, 0x3e, 0x97, 0x23, 0xc1, 0x3e, 0x92, 0xa5, 0x34, 0xc1, 0x22, 0xfd, 0x31, 0x06, 0xa5, 0x51, - 0x07, 0x8c, 0xee, 0x40, 0x82, 0xc6, 0x22, 0x11, 0x56, 0x2a, 0x1b, 0x3c, 0x50, 0x6d, 0x38, 0x81, - 0x6a, 0xa3, 0xe9, 0x04, 0xaa, 0x6a, 0xfa, 0xb3, 0x2f, 0xd6, 0x23, 0x9f, 0xfc, 0x75, 0x3d, 0x8a, - 0x99, 0x04, 0xba, 0x4c, 0x7d, 0xa5, 0xa2, 0x6a, 0xb2, 0xda, 0x61, 0x53, 0xce, 0x50, 0x47, 0xa8, - 0xa8, 0xda, 0x6e, 0x07, 0xed, 0x41, 0xa9, 0xad, 0x6b, 0x16, 0xd1, 0xac, 0xa1, 0x25, 0xf3, 0x40, - 0x28, 0x82, 0x49, 0xc0, 0x1d, 0xf2, 0xf0, 0x5a, 0x73, 0x38, 0x0f, 0x19, 0x23, 0x2e, 0xb6, 0x83, - 0x04, 0xea, 0x56, 0x4f, 0x95, 0xbe, 0xda, 0x51, 0x6c, 0xdd, 0xb4, 0xca, 0x89, 0x6b, 0xf1, 0x89, - 0xfe, 0xf0, 0x81, 0xc3, 0x72, 0x6c, 0x74, 0x14, 0x9b, 0x54, 0x13, 0x74, 0xba, 0xd8, 0x27, 0x89, - 0x9e, 0x85, 0xa2, 0x62, 0x18, 0xb2, 0x65, 0x2b, 0x36, 0x91, 0x5b, 0xe7, 0x36, 0xb1, 0x58, 0xa0, - 0xc9, 0xe1, 0xbc, 0x62, 0x18, 0x47, 0x94, 0x5a, 0xa5, 0x44, 0xf4, 0x0c, 0x14, 0x68, 0x4c, 0x52, - 0x95, 0xbe, 0xdc, 0x23, 0x6a, 0xb7, 0x67, 0xb3, 0x90, 0x12, 0xc7, 0x79, 0x41, 0x6d, 0x30, 0xa2, - 0xd4, 0x71, 0xff, 0x38, 0x8b, 0x47, 0x08, 0x41, 0xa2, 0xa3, 0xd8, 0x0a, 0xb3, 0x64, 0x0e, 0xb3, - 0x67, 0x4a, 0x33, 0x14, 0xbb, 0x27, 0xec, 0xc3, 0x9e, 0xd1, 0x2a, 0xa4, 0x84, 0xda, 0x38, 0x53, - 0x2b, 0x46, 0xe8, 0x12, 0x24, 0x0d, 0x53, 0x3f, 0x25, 0xec, 0xd7, 0xa5, 0x31, 0x1f, 0x48, 0x3f, - 0x89, 0xc1, 0xf2, 0x58, 0xe4, 0xa2, 0x7a, 0x7b, 0x8a, 0xd5, 0x73, 0xbe, 0x45, 0x9f, 0xd1, 0x2b, - 0x54, 0xaf, 0xd2, 0x21, 0xa6, 0x88, 0xf6, 0xe5, 0x71, 0x53, 0x37, 0xd8, 0x7b, 0x61, 0x1a, 0xc1, - 0x8d, 0x0e, 0xa0, 0xd4, 0x57, 0x2c, 0x5b, 0xe6, 0xde, 0x5f, 0xf6, 0x45, 0xfe, 0xf1, 0xd8, 0xb7, - 0xa7, 0x38, 0xf1, 0x82, 0x6e, 0x6a, 0xa1, 0xa8, 0xd0, 0x0f, 0x50, 0x11, 0x86, 0x4b, 0xad, 0xf3, - 0xc7, 0x8a, 0x66, 0xab, 0x1a, 0x91, 0xc7, 0xfe, 0xdc, 0xe5, 0x31, 0xa5, 0xf5, 0x53, 0xb5, 0x43, - 0xb4, 0xb6, 0xf3, 0xcb, 0x56, 0x5c, 0x61, 0xf7, 0x97, 0x5a, 0x12, 0x86, 0x42, 0x30, 0xee, 0xa2, - 0x02, 0xc4, 0xec, 0x33, 0x61, 0x80, 0x98, 0x7d, 0x86, 0xbe, 0x05, 0x09, 0xba, 0x48, 0xb6, 0xf8, - 0xc2, 0x84, 0xa4, 0x45, 0xc8, 0x35, 0xcf, 0x0d, 0x82, 0x19, 0xa7, 0x24, 0xb9, 0xc7, 0xc1, 0x8d, - 0xc5, 0xa3, 0x5a, 0xa5, 0xe7, 0xa1, 0x38, 0x12, 0x68, 0x7d, 0xff, 0x2f, 0xea, 0xff, 0x7f, 0x52, - 0x11, 0xf2, 0x81, 0x88, 0x2a, 0xad, 0xc2, 0xa5, 0x49, 0x01, 0x52, 0xea, 0xb9, 0xf4, 0x40, 0xa0, - 0x43, 0x2f, 0x43, 0xda, 0x8d, 0x90, 0xfc, 0x38, 0x8e, 0xdb, 0xca, 0x61, 0xc6, 0x2e, 0x2b, 0x3d, - 0x87, 0x74, 0x5b, 0xb3, 0xfd, 0x10, 0x63, 0x13, 0x5f, 0x52, 0x0c, 0xa3, 0xa1, 0x58, 0x3d, 0xe9, - 0x3d, 0x28, 0x87, 0x45, 0xbf, 0x91, 0x65, 0x24, 0xdc, 0x6d, 0xb8, 0x0a, 0xa9, 0x13, 0xdd, 0x1c, - 0x28, 0x36, 0x53, 0x96, 0xc7, 0x62, 0x44, 0xb7, 0x27, 0x8f, 0x84, 0x71, 0x46, 0xe6, 0x03, 0x49, - 0x86, 0xcb, 0xa1, 0x11, 0x90, 0x8a, 0xa8, 0x5a, 0x87, 0x70, 0x7b, 0xe6, 0x31, 0x1f, 0x78, 0x8a, - 0xf8, 0x64, 0xf9, 0x80, 0x7e, 0xd6, 0x62, 0x6b, 0x65, 0xfa, 0x33, 0x58, 0x8c, 0xa4, 0xef, 0xb9, - 0xdb, 0xdf, 0x8b, 0x2f, 0xe8, 0x26, 0x24, 0x58, 0x44, 0xe2, 0x56, 0x5a, 0x1d, 0xdf, 0xe8, 0x94, - 0x0b, 0x33, 0x1e, 0xa9, 0x01, 0x95, 0xf0, 0x78, 0xb2, 0x90, 0xa6, 0x9f, 0x45, 0x61, 0x75, 0x72, - 0x48, 0x46, 0x57, 0x01, 0xb8, 0x0f, 0x17, 0x1e, 0x20, 0x7e, 0x23, 0x87, 0x33, 0x8c, 0x72, 0x97, - 0xba, 0x81, 0x67, 0xa1, 0xe8, 0xbd, 0x96, 0x2d, 0xf5, 0x31, 0xdf, 0xa6, 0x71, 0x9c, 0x77, 0x79, - 0x8e, 0xd4, 0xc7, 0x04, 0xdd, 0x82, 0x24, 0xfd, 0x12, 0x75, 0x96, 0xf1, 0x29, 0xd3, 0xe1, 0x4c, - 0xd2, 0xaf, 0x62, 0xbe, 0xf9, 0x04, 0x23, 0xf7, 0xd7, 0xe9, 0x1f, 0x4a, 0x10, 0xb7, 0xcf, 0xf8, - 0x94, 0x72, 0x98, 0x3e, 0x4e, 0xf4, 0x18, 0x89, 0x6f, 0xc2, 0x63, 0x24, 0x2f, 0xe0, 0x31, 0x7e, - 0x11, 0x73, 0x8f, 0x59, 0x20, 0xd8, 0xff, 0xdf, 0x36, 0x96, 0xf4, 0xa7, 0x2c, 0xa4, 0x31, 0xb1, - 0x0c, 0x1a, 0x68, 0x51, 0x15, 0x32, 0xe4, 0xac, 0x4d, 0x0c, 0xdb, 0xc9, 0x4d, 0x26, 0xe7, 0x78, - 0x9c, 0xbb, 0xee, 0x70, 0x52, 0xc4, 0xe2, 0x8a, 0xa1, 0xdb, 0x02, 0x9c, 0x86, 0xe3, 0x4c, 0x21, - 0xee, 0x47, 0xa7, 0xaf, 0x38, 0xe8, 0x34, 0x1e, 0x0a, 0x50, 0xb8, 0xd4, 0x08, 0x3c, 0xbd, 0x2d, - 0xe0, 0x69, 0x62, 0xc6, 0xc7, 0x02, 0xf8, 0xb4, 0x16, 0xc0, 0xa7, 0xc9, 0x19, 0xcb, 0x0c, 0x01, - 0xa8, 0xaf, 0x38, 0x00, 0x35, 0x35, 0x63, 0xc6, 0x23, 0x08, 0xf5, 0x5e, 0x10, 0xa1, 0x72, 0x64, - 0x79, 0x3d, 0x54, 0x7a, 0x2a, 0x44, 0xfd, 0x8e, 0x0f, 0xa2, 0xa6, 0x43, 0xb1, 0x21, 0x57, 0x34, - 0x01, 0xa3, 0xbe, 0x11, 0xc0, 0xa8, 0x99, 0x19, 0x76, 0x98, 0x02, 0x52, 0xef, 0xfa, 0x41, 0x2a, - 0x84, 0x62, 0x5d, 0xf1, 0xdf, 0xc3, 0x50, 0xea, 0xab, 0x2e, 0x4a, 0xcd, 0x86, 0xc2, 0x6d, 0xb1, - 0x96, 0x51, 0x98, 0x7a, 0x30, 0x06, 0x53, 0x39, 0xac, 0x7c, 0x36, 0x54, 0xc5, 0x0c, 0x9c, 0x7a, - 0x30, 0x86, 0x53, 0xf3, 0x33, 0x14, 0xce, 0x00, 0xaa, 0xef, 0x4c, 0x06, 0xaa, 0xe1, 0x50, 0x52, - 0x4c, 0x73, 0x3e, 0xa4, 0x2a, 0x87, 0x20, 0xd5, 0x62, 0x28, 0xaa, 0xe2, 0xea, 0xe7, 0x86, 0xaa, - 0xc7, 0x13, 0xa0, 0x2a, 0x07, 0x95, 0x37, 0x42, 0x95, 0xcf, 0x81, 0x55, 0x8f, 0x27, 0x60, 0xd5, - 0xe5, 0x99, 0x6a, 0x67, 0x82, 0xd5, 0x9d, 0x20, 0x58, 0x45, 0x33, 0xce, 0x58, 0x28, 0x5a, 0x6d, - 0x85, 0xa1, 0x55, 0x8e, 0x28, 0x6f, 0x85, 0x6a, 0x5c, 0x00, 0xae, 0x1e, 0x8c, 0xc1, 0xd5, 0x4b, - 0x33, 0x76, 0xda, 0xbc, 0x78, 0xf5, 0x79, 0x9a, 0x2e, 0x8d, 0xb8, 0x6a, 0x9a, 0x71, 0x11, 0xd3, - 0xd4, 0x4d, 0x81, 0x3c, 0xf9, 0x40, 0xba, 0x41, 0xf1, 0x8b, 0xe7, 0x96, 0xa7, 0x60, 0x5b, 0x96, - 0xd9, 0xfa, 0x5c, 0xb1, 0xf4, 0xbb, 0xa8, 0x27, 0xcb, 0x82, 0x94, 0x1f, 0xfb, 0x64, 0x04, 0xf6, - 0xf1, 0x21, 0xde, 0x58, 0x10, 0xf1, 0xae, 0x43, 0x96, 0x66, 0xac, 0x23, 0x60, 0x56, 0x31, 0x5c, - 0x30, 0x7b, 0x13, 0x96, 0x59, 0x10, 0xe5, 0x49, 0x93, 0x48, 0x53, 0x13, 0x2c, 0x63, 0x2a, 0xd2, - 0x17, 0xdc, 0x0a, 0x3c, 0x5f, 0x7d, 0x11, 0x56, 0x7c, 0xbc, 0x6e, 0x26, 0xcc, 0x91, 0x5d, 0xc9, - 0xe5, 0xde, 0x16, 0x29, 0xf1, 0x1f, 0xa2, 0x9e, 0x85, 0x3c, 0x14, 0x3c, 0x09, 0xb0, 0x46, 0xbf, - 0x26, 0xc0, 0x1a, 0xfb, 0x8f, 0x01, 0xab, 0x3f, 0xb3, 0x8f, 0x07, 0x33, 0xfb, 0x7f, 0x44, 0xbd, - 0x7f, 0xe2, 0xc2, 0xcf, 0xb6, 0xde, 0x21, 0x22, 0xd7, 0x66, 0xcf, 0x34, 0x3d, 0xe9, 0xeb, 0x5d, - 0x91, 0x51, 0xd3, 0x47, 0xca, 0xe5, 0xc6, 0xce, 0x8c, 0x08, 0x8d, 0x6e, 0x9a, 0x9e, 0x64, 0x16, - 0x16, 0x69, 0x7a, 0x09, 0xe2, 0x8f, 0x08, 0x8f, 0x74, 0x39, 0x4c, 0x1f, 0x29, 0x1f, 0xdb, 0x64, - 0x2c, 0x7e, 0xe5, 0x30, 0x1f, 0xa0, 0x3b, 0x90, 0x61, 0x45, 0x74, 0x59, 0x37, 0x2c, 0x11, 0x90, - 0x9e, 0xf2, 0xaf, 0x95, 0xd7, 0xca, 0x37, 0x0e, 0x29, 0xcf, 0x81, 0x61, 0xe1, 0xb4, 0x21, 0x9e, - 0x7c, 0x08, 0x24, 0x13, 0x00, 0xc2, 0x57, 0x20, 0x43, 0x67, 0x6f, 0x19, 0x4a, 0x9b, 0xb0, 0xc8, - 0x92, 0xc1, 0x1e, 0x41, 0x7a, 0x08, 0x68, 0x3c, 0x4e, 0xa2, 0x06, 0xa4, 0xc8, 0x29, 0xd1, 0x6c, - 0x8b, 0x25, 0xdf, 0x23, 0xa9, 0xb3, 0xc8, 0x8b, 0x88, 0x66, 0x57, 0xcb, 0xd4, 0xc8, 0x7f, 0xff, - 0x62, 0xbd, 0xc4, 0xb9, 0x6f, 0xe9, 0x03, 0xd5, 0x26, 0x03, 0xc3, 0x3e, 0xc7, 0x42, 0x5e, 0xfa, - 0x4b, 0x8c, 0x42, 0xbe, 0x40, 0xfc, 0x9c, 0x68, 0x5b, 0x67, 0xcb, 0xc7, 0x7c, 0x70, 0x7f, 0x3e, - 0x7b, 0x5f, 0x05, 0xe8, 0x2a, 0x96, 0xfc, 0xa1, 0xa2, 0xd9, 0xa4, 0x23, 0x8c, 0x9e, 0xe9, 0x2a, - 0xd6, 0x5b, 0x8c, 0x40, 0xff, 0x3a, 0x7d, 0x3d, 0xb4, 0x48, 0x47, 0x14, 0x1e, 0x96, 0xba, 0x8a, - 0x75, 0x6c, 0x91, 0x8e, 0x6f, 0x95, 0x4b, 0x17, 0x5b, 0x65, 0xd0, 0xc6, 0xe9, 0x11, 0x1b, 0xfb, - 0xc0, 0x58, 0xc6, 0x0f, 0xc6, 0x50, 0x05, 0xd2, 0x86, 0xa9, 0xea, 0xa6, 0x6a, 0x9f, 0xb3, 0x1f, - 0x13, 0xc7, 0xee, 0x18, 0x5d, 0x87, 0xfc, 0x80, 0x0c, 0x0c, 0x5d, 0xef, 0xcb, 0xdc, 0xd9, 0x64, - 0x99, 0x68, 0x4e, 0x10, 0xeb, 0xcc, 0xe7, 0x7c, 0x14, 0xf3, 0x4e, 0x9f, 0x07, 0xba, 0xbf, 0x5e, - 0xf3, 0xae, 0x4d, 0x30, 0xaf, 0x8f, 0x42, 0x17, 0x31, 0x62, 0x5f, 0x77, 0xfc, 0xdf, 0x32, 0xb0, - 0xf4, 0x53, 0x56, 0x8a, 0x0b, 0xe6, 0x46, 0xe8, 0x08, 0x96, 0xdd, 0xc3, 0x2f, 0x0f, 0x99, 0x53, - 0x70, 0xb6, 0xf3, 0xbc, 0xde, 0xa3, 0x74, 0x1a, 0x24, 0x5b, 0xe8, 0x6d, 0x78, 0x72, 0xc4, 0xb3, - 0xb9, 0xaa, 0x63, 0xf3, 0x3a, 0xb8, 0x27, 0x82, 0x0e, 0xce, 0x51, 0xed, 0x19, 0x2b, 0x7e, 0xc1, - 0x33, 0xb7, 0x0b, 0x85, 0x60, 0x9a, 0x37, 0xf1, 0xf7, 0x5f, 0x87, 0xbc, 0x49, 0x6c, 0x45, 0xd5, - 0xe4, 0x40, 0xfd, 0x2c, 0xc7, 0x89, 0xa2, 0x2a, 0x77, 0x08, 0x4f, 0x4c, 0x4c, 0xf7, 0xd0, 0xb7, - 0x21, 0xe3, 0x65, 0x8a, 0xd1, 0x10, 0xf0, 0xe4, 0x96, 0x57, 0x3c, 0x5e, 0xe9, 0xf7, 0x51, 0x4f, - 0x65, 0xb0, 0x60, 0x53, 0x87, 0x94, 0x49, 0xac, 0x61, 0x9f, 0x97, 0x50, 0x0a, 0x5b, 0x2f, 0xce, - 0x97, 0x28, 0x52, 0xea, 0xb0, 0x6f, 0x63, 0x21, 0x2c, 0x3d, 0x84, 0x14, 0xa7, 0xa0, 0x2c, 0x2c, - 0x1d, 0xef, 0xdf, 0xdf, 0x3f, 0x78, 0x6b, 0xbf, 0x14, 0x41, 0x00, 0xa9, 0xed, 0x5a, 0xad, 0x7e, - 0xd8, 0x2c, 0x45, 0x51, 0x06, 0x92, 0xdb, 0xd5, 0x03, 0xdc, 0x2c, 0xc5, 0x28, 0x19, 0xd7, 0xef, - 0xd5, 0x6b, 0xcd, 0x52, 0x1c, 0x2d, 0x43, 0x9e, 0x3f, 0xcb, 0x3b, 0x07, 0xf8, 0xcd, 0xed, 0x66, - 0x29, 0xe1, 0x23, 0x1d, 0xd5, 0xf7, 0xef, 0xd6, 0x71, 0x29, 0x29, 0xbd, 0x04, 0x97, 0x43, 0x53, - 0x4b, 0xaf, 0x1a, 0x13, 0xf5, 0x55, 0x63, 0xa4, 0x9f, 0xc7, 0xa0, 0x12, 0x9e, 0x2f, 0xa2, 0x7b, - 0x23, 0x0b, 0xdf, 0x5a, 0x20, 0xd9, 0x1c, 0x59, 0x3d, 0x7a, 0x06, 0x0a, 0x26, 0x39, 0x21, 0x76, - 0xbb, 0xc7, 0xf3, 0x57, 0x1e, 0x30, 0xf3, 0x38, 0x2f, 0xa8, 0x4c, 0xc8, 0xe2, 0x6c, 0xef, 0x93, - 0xb6, 0x2d, 0x73, 0x5f, 0xc4, 0x37, 0x5d, 0x86, 0xb2, 0x51, 0xea, 0x11, 0x27, 0x4a, 0xef, 0x2d, - 0x64, 0xcb, 0x0c, 0x24, 0x71, 0xbd, 0x89, 0xdf, 0x2e, 0xc5, 0x11, 0x82, 0x02, 0x7b, 0x94, 0x8f, - 0xf6, 0xb7, 0x0f, 0x8f, 0x1a, 0x07, 0xd4, 0x96, 0x2b, 0x50, 0x74, 0x6c, 0xe9, 0x10, 0x93, 0xd2, - 0x3b, 0x5e, 0xfc, 0xf1, 0x55, 0xa4, 0x76, 0xa0, 0x30, 0x92, 0x2e, 0x46, 0xc7, 0xf1, 0x8c, 0x57, - 0xc2, 0x71, 0x53, 0x41, 0x9c, 0x3f, 0xf5, 0x0f, 0xa5, 0x5f, 0x47, 0xe1, 0xa9, 0x29, 0x09, 0x25, - 0xba, 0x3f, 0x62, 0xf9, 0xdb, 0x8b, 0xa4, 0xa3, 0xa3, 0x1b, 0xef, 0xce, 0x5c, 0xc6, 0x3a, 0xda, - 0xdb, 0x3e, 0x6a, 0x04, 0x37, 0x9e, 0x74, 0x07, 0x9e, 0x0c, 0xc9, 0xf8, 0x67, 0x94, 0xc2, 0xa4, - 0xdf, 0xc6, 0xfc, 0xa2, 0xc1, 0x14, 0x7e, 0x15, 0x52, 0x4a, 0x9b, 0x26, 0xad, 0x6c, 0x71, 0x69, - 0x2c, 0x46, 0x53, 0x2a, 0x9c, 0xe8, 0x75, 0x00, 0xfb, 0x4c, 0xe6, 0xeb, 0x71, 0xfc, 0xd0, 0x78, - 0x45, 0xa0, 0x7e, 0x46, 0xda, 0xcd, 0x33, 0xb1, 0xfa, 0x8c, 0x2d, 0x9e, 0x2c, 0xf4, 0xe6, 0x24, - 0x8f, 0x3b, 0x67, 0x83, 0x61, 0x31, 0x5f, 0x9b, 0xbc, 0x98, 0xaf, 0x95, 0x7e, 0x19, 0xf7, 0x9c, - 0x50, 0xb0, 0x9c, 0x75, 0x04, 0xbc, 0x53, 0x24, 0x5f, 0x30, 0xff, 0xc9, 0x32, 0x2d, 0x75, 0x1e, - 0xbd, 0x82, 0x66, 0x8d, 0x2d, 0x68, 0xd6, 0x89, 0x81, 0x2c, 0xfe, 0xcd, 0x05, 0xb2, 0xc4, 0x05, - 0x03, 0x99, 0x7f, 0x7f, 0x25, 0x83, 0xfb, 0x6b, 0x2c, 0xe6, 0xa4, 0x26, 0xc4, 0x9c, 0x77, 0xa1, - 0x10, 0x2c, 0xe5, 0x51, 0xaf, 0x6a, 0xea, 0x43, 0xad, 0xc3, 0x36, 0x72, 0x12, 0xf3, 0x01, 0x7a, - 0xd9, 0x29, 0xef, 0xc6, 0x42, 0xc2, 0x0f, 0x3d, 0xad, 0xbe, 0x52, 0xa0, 0xa8, 0xf3, 0x3e, 0x86, - 0x24, 0xfb, 0x2d, 0x34, 0x28, 0xb2, 0x16, 0x87, 0x40, 0x59, 0xf4, 0x19, 0xbd, 0x0b, 0xa0, 0xd8, - 0xb6, 0xa9, 0xb6, 0x86, 0x9e, 0xe2, 0xf5, 0xc9, 0x3f, 0x7f, 0xdb, 0xe1, 0xab, 0x5e, 0x11, 0xbb, - 0xe0, 0x92, 0x27, 0xea, 0xdb, 0x09, 0x3e, 0x85, 0xd2, 0x3e, 0x14, 0x82, 0xb2, 0x0e, 0x2e, 0xe0, - 0x73, 0x08, 0xe2, 0x02, 0x0e, 0xf3, 0x04, 0x2e, 0x70, 0x51, 0x45, 0x9c, 0xb7, 0xb3, 0xd8, 0x40, - 0xfa, 0x71, 0x0c, 0x72, 0xfe, 0x6d, 0xf3, 0x3f, 0x93, 0x5a, 0xbf, 0x09, 0x19, 0xfb, 0x4c, 0xbe, - 0x60, 0xf2, 0x97, 0xb6, 0xcf, 0xea, 0xf3, 0xa4, 0x7f, 0x1f, 0x45, 0x21, 0xed, 0x5a, 0x20, 0xa4, - 0x9f, 0xe4, 0x19, 0x30, 0xe6, 0xef, 0x9e, 0xf0, 0x06, 0x55, 0xdc, 0x6d, 0x7b, 0xbd, 0xe6, 0x06, - 0x84, 0xb0, 0x72, 0xa8, 0xdf, 0xdc, 0x4e, 0xf9, 0x5a, 0x04, 0x80, 0xd7, 0x20, 0xe3, 0x1e, 0x3f, - 0x8a, 0xd7, 0x95, 0x4e, 0xc7, 0x24, 0x96, 0x25, 0x72, 0x01, 0x67, 0xc8, 0x3a, 0x93, 0xfa, 0x87, - 0xa2, 0x35, 0x13, 0xc7, 0x7c, 0x20, 0x75, 0xa0, 0x38, 0x72, 0x76, 0xd1, 0x6b, 0xb0, 0x64, 0x0c, - 0x5b, 0xb2, 0xb3, 0x3f, 0x46, 0xee, 0x0e, 0x39, 0x48, 0x70, 0xd8, 0xea, 0xab, 0xed, 0xfb, 0xe4, - 0xdc, 0x99, 0x8c, 0x31, 0x6c, 0xdd, 0xe7, 0xdb, 0x88, 0x7f, 0x25, 0xe6, 0xff, 0xca, 0x8f, 0xa2, - 0x90, 0x76, 0x8e, 0x05, 0xfa, 0x2e, 0x64, 0x5c, 0xbf, 0xe0, 0x76, 0xac, 0x43, 0x1d, 0x8a, 0xd0, - 0xef, 0x89, 0xa0, 0x9b, 0xb0, 0x6c, 0xa9, 0x5d, 0x8d, 0x74, 0x64, 0xaf, 0x64, 0xc0, 0x3e, 0x97, - 0xc6, 0x45, 0xfe, 0x62, 0xcf, 0xa9, 0x17, 0xdc, 0x4b, 0xa4, 0xe3, 0xa5, 0xc4, 0xbd, 0x44, 0x3a, - 0x51, 0x4a, 0x4a, 0xff, 0x8c, 0x42, 0xda, 0xa9, 0xab, 0xa3, 0x97, 0x7c, 0xa7, 0xb0, 0x30, 0xc9, - 0xde, 0x82, 0xd1, 0xeb, 0x34, 0x06, 0xe7, 0x1d, 0x5b, 0x7c, 0xde, 0x61, 0x2d, 0x63, 0xa7, 0x79, - 0x9f, 0x58, 0xb8, 0x79, 0x7f, 0x0b, 0x90, 0xad, 0xdb, 0x4a, 0x5f, 0x3e, 0xd5, 0x6d, 0x55, 0xeb, - 0xca, 0xdc, 0xf2, 0xfc, 0xc0, 0x94, 0xd8, 0x9b, 0x07, 0xec, 0xc5, 0xa1, 0xfb, 0x13, 0xdc, 0xac, - 0x77, 0xd1, 0xc6, 0xe1, 0x2a, 0xa4, 0x44, 0x62, 0xc7, 0x3b, 0x87, 0x62, 0xe4, 0xf6, 0x61, 0x12, - 0xbe, 0x3e, 0x4c, 0x05, 0xd2, 0x03, 0x62, 0x2b, 0xec, 0xf4, 0x73, 0x4f, 0xec, 0x8e, 0x6f, 0xbe, - 0x0a, 0x59, 0x5f, 0x0f, 0x97, 0x3a, 0x84, 0xfd, 0xfa, 0x5b, 0xa5, 0x48, 0x65, 0xe9, 0xe3, 0x4f, - 0xaf, 0xc5, 0xf7, 0xc9, 0x87, 0x74, 0x03, 0xe3, 0x7a, 0xad, 0x51, 0xaf, 0xdd, 0x2f, 0x45, 0x2b, - 0xd9, 0x8f, 0x3f, 0xbd, 0xb6, 0x84, 0x09, 0x2b, 0x7b, 0xdf, 0x6c, 0x40, 0xce, 0xff, 0x57, 0x82, - 0xe9, 0x0e, 0x82, 0xc2, 0xdd, 0xe3, 0xc3, 0xbd, 0xdd, 0xda, 0x76, 0xb3, 0x2e, 0x3f, 0x38, 0x68, - 0xd6, 0x4b, 0x51, 0xf4, 0x24, 0xac, 0xec, 0xed, 0xbe, 0xd1, 0x68, 0xca, 0xb5, 0xbd, 0xdd, 0xfa, - 0x7e, 0x53, 0xde, 0x6e, 0x36, 0xb7, 0x6b, 0xf7, 0x4b, 0xb1, 0xad, 0xdf, 0x64, 0xa1, 0xb8, 0x5d, - 0xad, 0xed, 0xd2, 0xbc, 0x56, 0x6d, 0x2b, 0xac, 0xbc, 0x56, 0x83, 0x04, 0x2b, 0xa0, 0x4d, 0xbd, - 0x93, 0x57, 0x99, 0xde, 0x14, 0x41, 0x3b, 0x90, 0x64, 0xb5, 0x35, 0x34, 0xfd, 0x92, 0x5e, 0x65, - 0x46, 0x97, 0x84, 0x4e, 0x86, 0x1d, 0x95, 0xa9, 0xb7, 0xf6, 0x2a, 0xd3, 0x9b, 0x26, 0x68, 0x0f, - 0x96, 0x9c, 0xd2, 0xc7, 0xac, 0xfb, 0x6f, 0x95, 0x99, 0xdd, 0x07, 0xba, 0x34, 0x5e, 0xa2, 0x9a, - 0x7e, 0xa1, 0xaf, 0x32, 0xa3, 0x9d, 0x82, 0x76, 0x21, 0x25, 0xd0, 0xe1, 0x8c, 0xbb, 0x6c, 0x95, - 0x59, 0x5d, 0x04, 0x84, 0x21, 0xe3, 0x15, 0xff, 0x66, 0x5f, 0x53, 0xac, 0xcc, 0xd1, 0x29, 0x42, - 0x0f, 0x21, 0x1f, 0x44, 0x9c, 0xf3, 0xdd, 0x97, 0xab, 0xcc, 0xd9, 0xaf, 0xa0, 0xfa, 0x83, 0xf0, - 0x73, 0xbe, 0xfb, 0x73, 0x95, 0x39, 0xdb, 0x17, 0xe8, 0x7d, 0x58, 0x1e, 0x87, 0x87, 0xf3, 0x5f, - 0xa7, 0xab, 0x2c, 0xd0, 0xd0, 0x40, 0x03, 0x40, 0x13, 0x60, 0xe5, 0x02, 0xb7, 0xeb, 0x2a, 0x8b, - 0xf4, 0x37, 0x50, 0x07, 0x8a, 0xa3, 0x30, 0x65, 0xde, 0xdb, 0x76, 0x95, 0xb9, 0x7b, 0x1d, 0xfc, - 0x2b, 0x41, 0x44, 0x33, 0xef, 0xed, 0xbb, 0xca, 0xdc, 0xad, 0x0f, 0x74, 0x0c, 0xe0, 0xc3, 0x9d, - 0x73, 0xdc, 0xc6, 0xab, 0xcc, 0xd3, 0x04, 0x41, 0x06, 0xac, 0x4c, 0xc2, 0x9b, 0x8b, 0x5c, 0xce, - 0xab, 0x2c, 0xd4, 0x1b, 0xa1, 0xfb, 0x39, 0x88, 0x64, 0xe6, 0xbb, 0xac, 0x57, 0x99, 0xb3, 0x49, - 0x52, 0xad, 0x7f, 0xf6, 0xe5, 0x5a, 0xf4, 0xf3, 0x2f, 0xd7, 0xa2, 0x7f, 0xfb, 0x72, 0x2d, 0xfa, - 0xc9, 0x57, 0x6b, 0x91, 0xcf, 0xbf, 0x5a, 0x8b, 0xfc, 0xf9, 0xab, 0xb5, 0xc8, 0x0f, 0x5e, 0xe8, - 0xaa, 0x76, 0x6f, 0xd8, 0xda, 0x68, 0xeb, 0x83, 0x4d, 0xff, 0xbd, 0xed, 0x49, 0x77, 0xc9, 0x5b, - 0x29, 0x16, 0x4d, 0x6f, 0xff, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x93, 0xc5, 0x4e, 0x6b, 0x2e, - 0x00, 0x00, + // 3249 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcd, 0x73, 0x23, 0xd5, + 0x11, 0xd7, 0xb7, 0x35, 0xad, 0x4f, 0x3f, 0x9b, 0x45, 0x2b, 0x76, 0xed, 0x65, 0xb6, 0x80, 0x65, + 0x59, 0xbc, 0xc1, 0x5b, 0x90, 0xa5, 0x20, 0x49, 0x59, 0x5a, 0x19, 0x79, 0x6d, 0x6c, 0x33, 0x96, + 0x97, 0x22, 0x21, 0x3b, 0x8c, 0x34, 0xcf, 0xd2, 0xb0, 0xd2, 0xcc, 0x30, 0x33, 0x32, 0xf6, 0x9e, + 0x52, 0x49, 0x71, 0xa1, 0x92, 0x2a, 0x8e, 0xa9, 0xa4, 0xa8, 0x5c, 0x72, 0xc8, 0x1f, 0x90, 0x43, + 0x4e, 0x39, 0xe5, 0xc0, 0x21, 0x07, 0x6e, 0x49, 0xe5, 0x40, 0x52, 0x70, 0xcb, 0x3f, 0x90, 0x53, + 0x2a, 0xa9, 0xf7, 0x31, 0x5f, 0x92, 0x46, 0x1f, 0x18, 0x52, 0xb9, 0xcd, 0xeb, 0xe9, 0xee, 0x79, + 0xaf, 0xe7, 0xbd, 0xee, 0xfe, 0x75, 0x3f, 0x78, 0xca, 0xc1, 0xba, 0x8a, 0xad, 0x81, 0xa6, 0x3b, + 0xb7, 0x95, 0x76, 0x47, 0xbb, 0xed, 0x9c, 0x9b, 0xd8, 0xde, 0x30, 0x2d, 0xc3, 0x31, 0x50, 0xc9, + 0x7f, 0xb9, 0x41, 0x5e, 0x56, 0xaf, 0x06, 0xb8, 0x3b, 0xd6, 0xb9, 0xe9, 0x18, 0xb7, 0x4d, 0xcb, + 0x30, 0x4e, 0x18, 0x7f, 0xf5, 0x4a, 0xe0, 0x35, 0xd5, 0x13, 0xd4, 0x16, 0x7a, 0xcb, 0x85, 0x1f, + 0xe1, 0x73, 0xf7, 0xed, 0xd5, 0x31, 0x59, 0x53, 0xb1, 0x94, 0x81, 0xfb, 0x7a, 0xbd, 0x6b, 0x18, + 0xdd, 0x3e, 0xbe, 0x4d, 0x47, 0xed, 0xe1, 0xc9, 0x6d, 0x47, 0x1b, 0x60, 0xdb, 0x51, 0x06, 0x26, + 0x67, 0x58, 0xed, 0x1a, 0x5d, 0x83, 0x3e, 0xde, 0x26, 0x4f, 0x8c, 0x2a, 0xfe, 0x07, 0x60, 0x49, + 0xc2, 0x1f, 0x0c, 0xb1, 0xed, 0xa0, 0x4d, 0x48, 0xe1, 0x4e, 0xcf, 0xa8, 0xc4, 0xaf, 0xc5, 0x6f, + 0xe4, 0x36, 0xaf, 0x6c, 0x8c, 0x2c, 0x6e, 0x83, 0xf3, 0x35, 0x3a, 0x3d, 0xa3, 0x19, 0x93, 0x28, + 0x2f, 0x7a, 0x19, 0xd2, 0x27, 0xfd, 0xa1, 0xdd, 0xab, 0x24, 0xa8, 0xd0, 0xd5, 0x28, 0xa1, 0x6d, + 0xc2, 0xd4, 0x8c, 0x49, 0x8c, 0x9b, 0x7c, 0x4a, 0xd3, 0x4f, 0x8c, 0x4a, 0x72, 0xfa, 0xa7, 0x76, + 0xf4, 0x13, 0xfa, 0x29, 0xc2, 0x8b, 0x6a, 0x00, 0x9a, 0xae, 0x39, 0x72, 0xa7, 0xa7, 0x68, 0x7a, + 0x25, 0x45, 0x25, 0x9f, 0x8e, 0x96, 0xd4, 0x9c, 0x3a, 0x61, 0x6c, 0xc6, 0x24, 0x41, 0x73, 0x07, + 0x64, 0xba, 0x1f, 0x0c, 0xb1, 0x75, 0x5e, 0x49, 0x4f, 0x9f, 0xee, 0x5b, 0x84, 0x89, 0x4c, 0x97, + 0x72, 0xa3, 0x1d, 0xc8, 0xb5, 0x71, 0x57, 0xd3, 0xe5, 0x76, 0xdf, 0xe8, 0x3c, 0xaa, 0x64, 0xa8, + 0xb0, 0x18, 0x25, 0x5c, 0x23, 0xac, 0x35, 0xc2, 0x59, 0x4b, 0x54, 0xe2, 0xcd, 0x98, 0x04, 0x6d, + 0x8f, 0x82, 0x5e, 0x87, 0x6c, 0xa7, 0x87, 0x3b, 0x8f, 0x64, 0xe7, 0xac, 0xb2, 0x44, 0xf5, 0xac, + 0x47, 0xe9, 0xa9, 0x13, 0xbe, 0xd6, 0x59, 0x33, 0x26, 0x2d, 0x75, 0xd8, 0x23, 0xda, 0x06, 0x50, + 0x71, 0x5f, 0x3b, 0xc5, 0x16, 0x91, 0xcf, 0x4e, 0xb7, 0xc1, 0x3d, 0xc6, 0xd9, 0x3a, 0xe3, 0xd3, + 0x10, 0x54, 0x97, 0x80, 0xea, 0x20, 0x60, 0x5d, 0xe5, 0xcb, 0x11, 0xa8, 0x9a, 0x6b, 0x91, 0xff, + 0x5b, 0x57, 0x83, 0x8b, 0xc9, 0x62, 0x3e, 0x46, 0x77, 0x21, 0xd3, 0x31, 0x06, 0x03, 0xcd, 0xa9, + 0x00, 0xd5, 0xb0, 0x16, 0xb9, 0x10, 0xca, 0xd5, 0x8c, 0x49, 0x9c, 0x1f, 0xed, 0x43, 0xb1, 0xaf, + 0xd9, 0x8e, 0x6c, 0xeb, 0x8a, 0x69, 0xf7, 0x0c, 0xc7, 0xae, 0xe4, 0xa8, 0x86, 0x67, 0xa2, 0x34, + 0xec, 0x69, 0xb6, 0x73, 0xe4, 0x32, 0x37, 0x63, 0x52, 0xa1, 0x1f, 0x24, 0x10, 0x7d, 0xc6, 0xc9, + 0x09, 0xb6, 0x3c, 0x85, 0x95, 0xfc, 0x74, 0x7d, 0x07, 0x84, 0xdb, 0x95, 0x27, 0xfa, 0x8c, 0x20, + 0x01, 0xfd, 0x08, 0x56, 0xfa, 0x86, 0xa2, 0x7a, 0xea, 0xe4, 0x4e, 0x6f, 0xa8, 0x3f, 0xaa, 0x14, + 0xa8, 0xd2, 0xe7, 0x23, 0x27, 0x69, 0x28, 0xaa, 0xab, 0xa2, 0x4e, 0x04, 0x9a, 0x31, 0x69, 0xb9, + 0x3f, 0x4a, 0x44, 0x0f, 0x61, 0x55, 0x31, 0xcd, 0xfe, 0xf9, 0xa8, 0xf6, 0x22, 0xd5, 0x7e, 0x33, + 0x4a, 0xfb, 0x16, 0x91, 0x19, 0x55, 0x8f, 0x94, 0x31, 0x2a, 0x6a, 0x41, 0xd9, 0xb4, 0xb0, 0xa9, + 0x58, 0x58, 0x36, 0x2d, 0xc3, 0x34, 0x6c, 0xa5, 0x5f, 0x29, 0x51, 0xdd, 0xcf, 0x45, 0xe9, 0x3e, + 0x64, 0xfc, 0x87, 0x9c, 0xbd, 0x19, 0x93, 0x4a, 0x66, 0x98, 0xc4, 0xb4, 0x1a, 0x1d, 0x6c, 0xdb, + 0xbe, 0xd6, 0xf2, 0x2c, 0xad, 0x94, 0x3f, 0xac, 0x35, 0x44, 0x42, 0x0d, 0xc8, 0xe1, 0x33, 0x22, + 0x2e, 0x9f, 0x1a, 0x0e, 0xae, 0x2c, 0x4f, 0x3f, 0x58, 0x0d, 0xca, 0xfa, 0xc0, 0x70, 0x30, 0x39, + 0x54, 0xd8, 0x1b, 0x21, 0x05, 0x9e, 0x38, 0xc5, 0x96, 0x76, 0x72, 0x4e, 0xd5, 0xc8, 0xf4, 0x8d, + 0xad, 0x19, 0x7a, 0x05, 0x51, 0x85, 0x2f, 0x44, 0x29, 0x7c, 0x40, 0x85, 0x88, 0x8a, 0x86, 0x2b, + 0xd2, 0x8c, 0x49, 0x2b, 0xa7, 0xe3, 0x64, 0xb2, 0xc5, 0x4e, 0x34, 0x5d, 0xe9, 0x6b, 0x8f, 0x31, + 0x3f, 0x36, 0x2b, 0xd3, 0xb7, 0xd8, 0x36, 0xe7, 0xa6, 0x67, 0x85, 0x6c, 0xb1, 0x93, 0x20, 0xa1, + 0xb6, 0x04, 0xe9, 0x53, 0xa5, 0x3f, 0xc4, 0xe2, 0x73, 0x90, 0x0b, 0x38, 0x56, 0x54, 0x81, 0xa5, + 0x01, 0xb6, 0x6d, 0xa5, 0x8b, 0xa9, 0x1f, 0x16, 0x24, 0x77, 0x28, 0x16, 0x21, 0x1f, 0x74, 0xa6, + 0xe2, 0x27, 0x71, 0x4f, 0x92, 0xf8, 0x49, 0x22, 0x79, 0x8a, 0x2d, 0xba, 0x6c, 0x2e, 0xc9, 0x87, + 0xe8, 0x3a, 0x14, 0xe8, 0x94, 0x65, 0xf7, 0x3d, 0x71, 0xd6, 0x29, 0x29, 0x4f, 0x89, 0x0f, 0x38, + 0xd3, 0x3a, 0xe4, 0xcc, 0x4d, 0xd3, 0x63, 0x49, 0x52, 0x16, 0x30, 0x37, 0x4d, 0x97, 0xe1, 0x69, + 0xc8, 0x93, 0xf5, 0x79, 0x1c, 0x29, 0xfa, 0x91, 0x1c, 0xa1, 0x71, 0x16, 0xf1, 0xcf, 0x09, 0x28, + 0x8f, 0x3a, 0x60, 0x74, 0x17, 0x52, 0x24, 0x16, 0xf1, 0xb0, 0x52, 0xdd, 0x60, 0x81, 0x6a, 0xc3, + 0x0d, 0x54, 0x1b, 0x2d, 0x37, 0x50, 0xd5, 0xb2, 0x9f, 0x7d, 0xb1, 0x1e, 0xfb, 0xe4, 0xef, 0xeb, + 0x71, 0x89, 0x4a, 0xa0, 0xcb, 0xc4, 0x57, 0x2a, 0x9a, 0x2e, 0x6b, 0x2a, 0x9d, 0xb2, 0x40, 0x1c, + 0xa1, 0xa2, 0xe9, 0x3b, 0x2a, 0xda, 0x83, 0x72, 0xc7, 0xd0, 0x6d, 0xac, 0xdb, 0x43, 0x5b, 0x66, + 0x81, 0x90, 0x07, 0x93, 0x90, 0x3b, 0x64, 0xe1, 0xb5, 0xee, 0x72, 0x1e, 0x52, 0x46, 0xa9, 0xd4, + 0x09, 0x13, 0x88, 0x5b, 0x3d, 0x55, 0xfa, 0x9a, 0xaa, 0x38, 0x86, 0x65, 0x57, 0x52, 0xd7, 0x92, + 0x13, 0xfd, 0xe1, 0x03, 0x97, 0xe5, 0xd8, 0x54, 0x15, 0x07, 0xd7, 0x52, 0x64, 0xba, 0x52, 0x40, + 0x12, 0x3d, 0x0b, 0x25, 0xc5, 0x34, 0x65, 0xdb, 0x51, 0x1c, 0x2c, 0xb7, 0xcf, 0x1d, 0x6c, 0xd3, + 0x40, 0x93, 0x97, 0x0a, 0x8a, 0x69, 0x1e, 0x11, 0x6a, 0x8d, 0x10, 0xd1, 0x33, 0x50, 0x24, 0x31, + 0x49, 0x53, 0xfa, 0x72, 0x0f, 0x6b, 0xdd, 0x9e, 0x43, 0x43, 0x4a, 0x52, 0x2a, 0x70, 0x6a, 0x93, + 0x12, 0x45, 0xd5, 0xfb, 0xe3, 0x34, 0x1e, 0x21, 0x04, 0x29, 0x55, 0x71, 0x14, 0x6a, 0xc9, 0xbc, + 0x44, 0x9f, 0x09, 0xcd, 0x54, 0x9c, 0x1e, 0xb7, 0x0f, 0x7d, 0x46, 0x97, 0x20, 0xc3, 0xd5, 0x26, + 0xa9, 0x5a, 0x3e, 0x42, 0xab, 0x90, 0x36, 0x2d, 0xe3, 0x14, 0xd3, 0x5f, 0x97, 0x95, 0xd8, 0x40, + 0xfc, 0x49, 0x02, 0x96, 0xc7, 0x22, 0x17, 0xd1, 0xdb, 0x53, 0xec, 0x9e, 0xfb, 0x2d, 0xf2, 0x8c, + 0x5e, 0x21, 0x7a, 0x15, 0x15, 0x5b, 0x3c, 0xda, 0x57, 0xc6, 0x4d, 0xdd, 0xa4, 0xef, 0xb9, 0x69, + 0x38, 0x37, 0xda, 0x85, 0x72, 0x5f, 0xb1, 0x1d, 0x99, 0x79, 0x7f, 0x39, 0x10, 0xf9, 0x9f, 0x1a, + 0x33, 0x32, 0x8b, 0x15, 0x64, 0x43, 0x73, 0x25, 0x45, 0x22, 0xea, 0x53, 0x91, 0x04, 0xab, 0xed, + 0xf3, 0xc7, 0x8a, 0xee, 0x68, 0x3a, 0x96, 0xc7, 0xfe, 0xda, 0xe5, 0x31, 0x85, 0x8d, 0x53, 0x4d, + 0xc5, 0x7a, 0xc7, 0xfd, 0x5d, 0x2b, 0x9e, 0xb0, 0xf7, 0x3b, 0x6d, 0x51, 0x82, 0x62, 0x38, 0xe6, + 0xa2, 0x22, 0x24, 0x9c, 0x33, 0xbe, 0xf8, 0x84, 0x73, 0x86, 0xbe, 0x03, 0x29, 0xb2, 0x40, 0xba, + 0xf0, 0xe2, 0x84, 0x84, 0x85, 0xcb, 0xb5, 0xce, 0x4d, 0x2c, 0x51, 0x4e, 0x51, 0xf4, 0x8e, 0x82, + 0x17, 0x87, 0x47, 0xb5, 0x8a, 0xcf, 0x43, 0x69, 0x24, 0xc8, 0x06, 0xfe, 0x5d, 0x3c, 0xf8, 0xef, + 0xc4, 0x12, 0x14, 0x42, 0xd1, 0x54, 0xbc, 0x04, 0xab, 0x93, 0x82, 0xa3, 0xd8, 0xf3, 0xe8, 0xa1, + 0x20, 0x87, 0x5e, 0x86, 0xac, 0x17, 0x1d, 0xd9, 0x51, 0x1c, 0xb7, 0x95, 0xcb, 0x2c, 0x79, 0xac, + 0xe4, 0x0c, 0x92, 0x2d, 0x4d, 0xf7, 0x42, 0x82, 0x4e, 0x7c, 0x49, 0x31, 0xcd, 0xa6, 0x62, 0xf7, + 0xc4, 0xf7, 0xa0, 0x12, 0x15, 0xf9, 0x46, 0x96, 0x91, 0xf2, 0xb6, 0xe0, 0x25, 0xc8, 0x9c, 0x18, + 0xd6, 0x40, 0x71, 0xa8, 0xb2, 0x82, 0xc4, 0x47, 0x64, 0x6b, 0xb2, 0x28, 0x98, 0xa4, 0x64, 0x36, + 0x10, 0x65, 0xb8, 0x1c, 0x19, 0xfd, 0x88, 0x88, 0xa6, 0xab, 0x98, 0xd9, 0xb3, 0x20, 0xb1, 0x81, + 0xaf, 0x88, 0x4d, 0x96, 0x0d, 0xc8, 0x67, 0x6d, 0xba, 0x56, 0xaa, 0x5f, 0x90, 0xf8, 0x48, 0xfc, + 0x81, 0xb7, 0xf5, 0xfd, 0xd8, 0x82, 0x6e, 0x42, 0x8a, 0x46, 0x23, 0x66, 0xa5, 0x4b, 0xe3, 0x9b, + 0x9c, 0x70, 0x49, 0x94, 0x47, 0x6c, 0x42, 0x35, 0x3a, 0x96, 0x2c, 0xa4, 0xe9, 0x17, 0x71, 0xb8, + 0x34, 0x39, 0x1c, 0xa3, 0xab, 0x00, 0xcc, 0x7f, 0xf3, 0xd3, 0x9f, 0xbc, 0x91, 0x97, 0x04, 0x4a, + 0xb9, 0x47, 0x5c, 0xc0, 0xb3, 0x50, 0xf2, 0x5f, 0xcb, 0xb6, 0xf6, 0x98, 0x6d, 0xd3, 0xa4, 0x54, + 0xf0, 0x78, 0x8e, 0xb4, 0xc7, 0x18, 0xdd, 0x82, 0x34, 0xf9, 0x12, 0x71, 0x94, 0xc9, 0x29, 0xd3, + 0x61, 0x4c, 0xe2, 0x6f, 0x12, 0x81, 0xf9, 0x84, 0xa3, 0xf6, 0x37, 0xe9, 0x1b, 0xca, 0x90, 0x74, + 0xce, 0xd8, 0x94, 0xf2, 0x12, 0x79, 0x44, 0x47, 0xb0, 0xca, 0x32, 0x0c, 0xac, 0xca, 0x01, 0xb7, + 0xc1, 0x33, 0xfe, 0x39, 0x3c, 0x06, 0x72, 0xc5, 0xf7, 0x3c, 0xcf, 0x11, 0xe9, 0x35, 0xd2, 0x17, + 0xf0, 0x1a, 0xbf, 0x4e, 0x78, 0x47, 0x2d, 0x14, 0xec, 0xbf, 0x65, 0xfb, 0xbc, 0x05, 0x2b, 0x2a, + 0xee, 0x68, 0xea, 0xd7, 0x35, 0xcf, 0x32, 0x97, 0xfe, 0x96, 0xad, 0xf3, 0x97, 0x1c, 0x64, 0x25, + 0x6c, 0x9b, 0x24, 0xd4, 0xa2, 0x1a, 0x08, 0xf8, 0xac, 0x83, 0x4d, 0xc7, 0xcd, 0x4e, 0x26, 0x67, + 0x79, 0x8c, 0xbb, 0xe1, 0x72, 0x12, 0xcc, 0xe2, 0x89, 0xa1, 0x3b, 0x1c, 0x9e, 0x46, 0x23, 0x4d, + 0x2e, 0x1e, 0xc4, 0xa7, 0xaf, 0xb8, 0xf8, 0x34, 0x19, 0x09, 0x51, 0x98, 0xd4, 0x08, 0x40, 0xbd, + 0xc3, 0x01, 0x6a, 0x6a, 0xc6, 0xc7, 0x42, 0x08, 0xb5, 0x1e, 0x42, 0xa8, 0xe9, 0x19, 0xcb, 0x8c, + 0x80, 0xa8, 0xaf, 0xb8, 0x10, 0x35, 0x33, 0x63, 0xc6, 0x23, 0x18, 0xf5, 0x7e, 0x18, 0xa3, 0x32, + 0x6c, 0x79, 0x3d, 0x52, 0x7a, 0x2a, 0x48, 0xfd, 0x5e, 0x00, 0xa4, 0x66, 0x23, 0xd1, 0x21, 0x53, + 0x34, 0x01, 0xa5, 0xbe, 0x11, 0x42, 0xa9, 0xc2, 0x0c, 0x3b, 0x4c, 0x81, 0xa9, 0xf7, 0x82, 0x30, + 0x15, 0x22, 0xd1, 0x2e, 0xff, 0xef, 0x51, 0x38, 0xf5, 0x55, 0x0f, 0xa7, 0xe6, 0x22, 0x01, 0x37, + 0x5f, 0xcb, 0x28, 0x50, 0x3d, 0x18, 0x03, 0xaa, 0x0c, 0x58, 0x3e, 0x1b, 0xa9, 0x62, 0x06, 0x52, + 0x3d, 0x18, 0x43, 0xaa, 0x85, 0x19, 0x0a, 0x67, 0x40, 0xd5, 0x77, 0x27, 0x43, 0xd5, 0x68, 0x30, + 0xc9, 0xa7, 0x39, 0x1f, 0x56, 0x95, 0x23, 0xb0, 0x6a, 0x29, 0x12, 0x57, 0x31, 0xf5, 0x73, 0x83, + 0xd5, 0xe3, 0x09, 0x60, 0x95, 0xc1, 0xca, 0x1b, 0x91, 0xca, 0xe7, 0x40, 0xab, 0xc7, 0x13, 0xd0, + 0xea, 0xf2, 0x4c, 0xb5, 0x33, 0xe1, 0xea, 0x76, 0x18, 0xae, 0xa2, 0x19, 0x67, 0x2c, 0x12, 0xaf, + 0xb6, 0xa3, 0xf0, 0x2a, 0xc3, 0x94, 0xb7, 0x22, 0x35, 0x2e, 0x00, 0x58, 0x0f, 0xc6, 0x00, 0xeb, + 0xea, 0x8c, 0x9d, 0x36, 0x2f, 0x62, 0x7d, 0x9e, 0x24, 0x4d, 0x23, 0xae, 0x9a, 0xe4, 0x5d, 0xd8, + 0xb2, 0x0c, 0x8b, 0x63, 0x4f, 0x36, 0x10, 0x6f, 0x10, 0x04, 0xe3, 0xbb, 0xe5, 0x29, 0xe8, 0x96, + 0xe6, 0xb7, 0x01, 0x57, 0x2c, 0xfe, 0x21, 0xee, 0xcb, 0xd2, 0xc4, 0x3f, 0x88, 0x7e, 0x04, 0x8e, + 0x7e, 0x02, 0x98, 0x37, 0x11, 0xc6, 0xbc, 0xeb, 0x90, 0x23, 0x79, 0xeb, 0x08, 0x9c, 0x55, 0x4c, + 0x0f, 0xce, 0xde, 0x84, 0x65, 0x1a, 0x3e, 0x59, 0xea, 0xc4, 0x93, 0xd5, 0x14, 0xcd, 0x9b, 0x4a, + 0xe4, 0x05, 0xb3, 0x02, 0xcb, 0x5a, 0x5f, 0x84, 0x95, 0x00, 0xaf, 0x97, 0x0f, 0x33, 0x6c, 0x57, + 0xf6, 0xb8, 0xb7, 0x78, 0x62, 0xfc, 0xa7, 0xb8, 0x6f, 0x21, 0x1f, 0x07, 0x4f, 0x82, 0xac, 0xf1, + 0x6f, 0x08, 0xb2, 0x26, 0xbe, 0x36, 0x64, 0x0d, 0xe6, 0xf7, 0xc9, 0x70, 0x7e, 0xff, 0xaf, 0xb8, + 0xff, 0x4f, 0x3c, 0x00, 0xda, 0x31, 0x54, 0xcc, 0x33, 0x6e, 0xfa, 0x4c, 0x12, 0x94, 0xbe, 0xd1, + 0xe5, 0x79, 0x35, 0x79, 0x24, 0x5c, 0x5e, 0xec, 0x14, 0x78, 0x68, 0xf4, 0x92, 0xf5, 0x34, 0xb5, + 0x30, 0x4f, 0xd6, 0xcb, 0x90, 0x7c, 0x84, 0x59, 0xa4, 0xcb, 0x4b, 0xe4, 0x91, 0xf0, 0xd1, 0x4d, + 0x46, 0xe3, 0x57, 0x5e, 0x62, 0x03, 0x74, 0x17, 0x04, 0x5a, 0x46, 0x97, 0x0d, 0xd3, 0xe6, 0x01, + 0x29, 0x94, 0xe8, 0xb0, 0x6a, 0xf9, 0xc6, 0x21, 0xe1, 0x39, 0x30, 0x6d, 0x29, 0x6b, 0xf2, 0xa7, + 0x00, 0x0e, 0x11, 0x42, 0x50, 0xf8, 0x0a, 0x08, 0x64, 0xf6, 0xb6, 0xa9, 0x74, 0x30, 0x8d, 0x2c, + 0x82, 0xe4, 0x13, 0xc4, 0x87, 0x80, 0xc6, 0xe3, 0x24, 0x6a, 0x42, 0x06, 0x9f, 0x62, 0xdd, 0xb1, + 0x69, 0x0a, 0x3e, 0x92, 0x40, 0xf3, 0xbc, 0x08, 0xeb, 0x4e, 0xad, 0x42, 0x8c, 0xfc, 0xcf, 0x2f, + 0xd6, 0xcb, 0x8c, 0xfb, 0x96, 0x31, 0xd0, 0x1c, 0x3c, 0x30, 0x9d, 0x73, 0x89, 0xcb, 0x8b, 0x7f, + 0x4b, 0x10, 0xe0, 0x17, 0x8a, 0x9f, 0x13, 0x6d, 0xeb, 0x6e, 0xf9, 0x44, 0x00, 0xf0, 0xcf, 0x67, + 0xef, 0xab, 0x00, 0x5d, 0xc5, 0x96, 0x3f, 0x54, 0x74, 0x07, 0xab, 0xdc, 0xe8, 0x42, 0x57, 0xb1, + 0xdf, 0xa6, 0x04, 0xf2, 0xd7, 0xc9, 0xeb, 0xa1, 0x8d, 0x55, 0x5e, 0x7a, 0x58, 0xea, 0x2a, 0xf6, + 0xb1, 0x8d, 0xd5, 0xc0, 0x2a, 0x97, 0x2e, 0xb6, 0xca, 0xb0, 0x8d, 0xb3, 0x23, 0x36, 0x0e, 0x40, + 0x32, 0x21, 0x08, 0xc9, 0x50, 0x15, 0xb2, 0xa6, 0xa5, 0x19, 0x96, 0xe6, 0x9c, 0xd3, 0x1f, 0x93, + 0x94, 0xbc, 0x31, 0xba, 0x0e, 0x85, 0x01, 0x1e, 0x98, 0x86, 0xd1, 0x97, 0x99, 0xb3, 0xc9, 0x51, + 0xd1, 0x3c, 0x27, 0x36, 0xa8, 0xcf, 0xf9, 0x28, 0xe1, 0x9f, 0x3e, 0x1f, 0x7a, 0x7f, 0xb3, 0xe6, + 0x5d, 0x9b, 0x60, 0xde, 0x00, 0x85, 0x2c, 0x62, 0xc4, 0xbe, 0xde, 0xf8, 0x7f, 0x65, 0x60, 0xf1, + 0xe7, 0xb4, 0x18, 0x17, 0xce, 0x8d, 0xd0, 0x11, 0x2c, 0x7b, 0x87, 0x5f, 0x1e, 0x52, 0xa7, 0xe0, + 0x6e, 0xe7, 0x79, 0xbd, 0x47, 0xf9, 0x34, 0x4c, 0xb6, 0xd1, 0x3b, 0xf0, 0xe4, 0x88, 0x67, 0xf3, + 0x54, 0x27, 0xe6, 0x75, 0x70, 0x4f, 0x84, 0x1d, 0x9c, 0xab, 0xda, 0x37, 0x56, 0xf2, 0x82, 0x67, + 0x6e, 0x07, 0x8a, 0xe1, 0x34, 0x6f, 0xe2, 0xef, 0xbf, 0x0e, 0x05, 0x0b, 0x3b, 0x8a, 0xa6, 0xcb, + 0xa1, 0x0a, 0x5a, 0x9e, 0x11, 0x79, 0x5d, 0xee, 0x10, 0x9e, 0x98, 0x98, 0xee, 0xa1, 0xef, 0x82, + 0xe0, 0x67, 0x8a, 0xf1, 0x08, 0xf0, 0xe4, 0x15, 0x59, 0x7c, 0x5e, 0xf1, 0x8f, 0x71, 0x5f, 0x65, + 0xb8, 0x6c, 0xd3, 0x80, 0x8c, 0x85, 0xed, 0x61, 0x9f, 0x15, 0x52, 0x8a, 0x9b, 0x2f, 0xce, 0x97, + 0x28, 0x12, 0xea, 0xb0, 0xef, 0x48, 0x5c, 0x58, 0x7c, 0x08, 0x19, 0x46, 0x41, 0x39, 0x58, 0x3a, + 0xde, 0xdf, 0xdd, 0x3f, 0x78, 0x7b, 0xbf, 0x1c, 0x43, 0x00, 0x99, 0xad, 0x7a, 0xbd, 0x71, 0xd8, + 0x2a, 0xc7, 0x91, 0x00, 0xe9, 0xad, 0xda, 0x81, 0xd4, 0x2a, 0x27, 0x08, 0x59, 0x6a, 0xdc, 0x6f, + 0xd4, 0x5b, 0xe5, 0x24, 0x5a, 0x86, 0x02, 0x7b, 0x96, 0xb7, 0x0f, 0xa4, 0x37, 0xb7, 0x5a, 0xe5, + 0x54, 0x80, 0x74, 0xd4, 0xd8, 0xbf, 0xd7, 0x90, 0xca, 0x69, 0xf1, 0x25, 0xb8, 0x1c, 0x99, 0x5a, + 0xfa, 0x35, 0x99, 0x78, 0xa0, 0x26, 0x23, 0xfe, 0x32, 0x01, 0xd5, 0xe8, 0x7c, 0x11, 0xdd, 0x1f, + 0x59, 0xf8, 0xe6, 0x02, 0xc9, 0xe6, 0xc8, 0xea, 0xd1, 0x33, 0x50, 0xb4, 0xf0, 0x09, 0x76, 0x3a, + 0x3d, 0x96, 0xbf, 0xb2, 0x80, 0x59, 0x90, 0x0a, 0x9c, 0x4a, 0x85, 0x6c, 0xc6, 0xf6, 0x3e, 0xee, + 0x38, 0x32, 0xf3, 0x45, 0x6c, 0xd3, 0x09, 0x84, 0x8d, 0x50, 0x8f, 0x18, 0x51, 0x7c, 0x6f, 0x21, + 0x5b, 0x0a, 0x90, 0x96, 0x1a, 0x2d, 0xe9, 0x9d, 0x72, 0x12, 0x21, 0x28, 0xd2, 0x47, 0xf9, 0x68, + 0x7f, 0xeb, 0xf0, 0xa8, 0x79, 0x40, 0x6c, 0xb9, 0x02, 0x25, 0xd7, 0x96, 0x2e, 0x31, 0x2d, 0xbe, + 0xeb, 0xc7, 0x9f, 0x40, 0x5d, 0x6a, 0x1b, 0x8a, 0x23, 0xe9, 0x62, 0x7c, 0x1c, 0xcf, 0xf8, 0x85, + 0x1c, 0x2f, 0x15, 0x94, 0x0a, 0xa7, 0xc1, 0xa1, 0xf8, 0xdb, 0x38, 0x3c, 0x35, 0x25, 0xa1, 0x44, + 0xbb, 0x23, 0x96, 0xbf, 0xb3, 0x48, 0x3a, 0x3a, 0xba, 0xf1, 0xee, 0xce, 0x65, 0xac, 0xa3, 0xbd, + 0xad, 0xa3, 0x66, 0x78, 0xe3, 0x89, 0x77, 0xe1, 0xc9, 0x88, 0x8c, 0x7f, 0x46, 0x41, 0x4c, 0xfc, + 0x7d, 0x22, 0x28, 0x1a, 0x4e, 0xe1, 0x2f, 0x41, 0x46, 0xe9, 0x90, 0xa4, 0x95, 0x2e, 0x2e, 0x2b, + 0xf1, 0xd1, 0x94, 0x3a, 0x27, 0x7a, 0x1d, 0xc0, 0x39, 0x93, 0xd9, 0x7a, 0x5c, 0x3f, 0x34, 0x5e, + 0x11, 0x68, 0x9c, 0xe1, 0x4e, 0xeb, 0x8c, 0xaf, 0x5e, 0x70, 0xf8, 0x93, 0x8d, 0xde, 0x9c, 0xe4, + 0x71, 0xe7, 0x6c, 0x31, 0x2c, 0xe6, 0x6b, 0xd3, 0x17, 0xf3, 0xb5, 0xe2, 0xaf, 0x92, 0xbe, 0x13, + 0x0a, 0x17, 0xb4, 0x8e, 0x80, 0xf5, 0x8a, 0xe4, 0x0b, 0xe6, 0x3f, 0x39, 0xaa, 0xa5, 0xc1, 0xa2, + 0x57, 0xd8, 0xac, 0x89, 0x05, 0xcd, 0x3a, 0x31, 0x90, 0x25, 0xbf, 0xbd, 0x40, 0x96, 0xba, 0x60, + 0x20, 0x0b, 0xee, 0xaf, 0x74, 0x78, 0x7f, 0x8d, 0xc5, 0x9c, 0xcc, 0x84, 0x98, 0xf3, 0x0e, 0x40, + 0xa0, 0x09, 0xb2, 0x0a, 0x69, 0xcb, 0x18, 0xea, 0x2a, 0xdd, 0xc4, 0x69, 0x89, 0x0d, 0xd0, 0xcb, + 0x6e, 0x81, 0x37, 0x11, 0x11, 0x7a, 0xc8, 0x49, 0x0d, 0x54, 0x02, 0x79, 0xa5, 0xf7, 0x31, 0xa4, + 0xe9, 0x2f, 0x21, 0x01, 0x91, 0x36, 0x39, 0x38, 0xc2, 0x22, 0xcf, 0xe8, 0xc7, 0x00, 0x8a, 0xe3, + 0x58, 0x5a, 0x7b, 0xe8, 0x2b, 0x5e, 0x9f, 0xfc, 0xe3, 0xb7, 0x5c, 0xbe, 0xda, 0x15, 0xbe, 0x03, + 0x56, 0x7d, 0xd1, 0xc0, 0x2e, 0x08, 0x28, 0x14, 0xf7, 0xa1, 0x18, 0x96, 0x75, 0x31, 0x01, 0x9b, + 0x43, 0x18, 0x13, 0x30, 0x88, 0xc7, 0x31, 0x81, 0x87, 0x28, 0x92, 0xac, 0x99, 0x45, 0x07, 0xe2, + 0xcf, 0x12, 0x90, 0x0f, 0x6e, 0x99, 0xff, 0x9b, 0xb4, 0xfa, 0x4d, 0x10, 0x9c, 0x33, 0xf9, 0x82, + 0x89, 0x5f, 0xd6, 0x39, 0x6b, 0xcc, 0x93, 0xfa, 0x7d, 0x14, 0x87, 0xac, 0x67, 0x81, 0x88, 0x8e, + 0x92, 0x6f, 0xc0, 0x44, 0xb0, 0x7f, 0xc2, 0x5a, 0x54, 0x49, 0xaf, 0xf1, 0xf5, 0x9a, 0x17, 0x0c, + 0xa2, 0x4a, 0xa1, 0x41, 0x73, 0xbb, 0xc5, 0x6b, 0xee, 0xfc, 0x5f, 0x03, 0xc1, 0x3b, 0x7a, 0x04, + 0xab, 0x2b, 0xaa, 0x6a, 0x61, 0xdb, 0xe6, 0x79, 0x80, 0x3b, 0xa4, 0x7d, 0x49, 0xe3, 0x43, 0xde, + 0x9c, 0x49, 0x4a, 0x6c, 0x20, 0xaa, 0x50, 0x1a, 0x39, 0xb7, 0xe8, 0x35, 0x58, 0x32, 0x87, 0x6d, + 0xd9, 0xdd, 0x1f, 0x23, 0x37, 0x87, 0x5c, 0x14, 0x38, 0x6c, 0xf7, 0xb5, 0xce, 0x2e, 0x3e, 0x77, + 0x27, 0x63, 0x0e, 0xdb, 0xbb, 0x6c, 0x1b, 0xb1, 0xaf, 0x24, 0x82, 0x5f, 0xf9, 0x69, 0x1c, 0xb2, + 0xee, 0xb1, 0x40, 0xdf, 0x07, 0xc1, 0xf3, 0x09, 0x5e, 0xbf, 0x3a, 0xd2, 0x99, 0x70, 0xfd, 0xbe, + 0x08, 0xba, 0x09, 0xcb, 0xb6, 0xd6, 0xd5, 0xdd, 0xca, 0x3c, 0x2b, 0xbb, 0x24, 0xe8, 0xfe, 0x2c, + 0xb1, 0x17, 0x7b, 0x6e, 0xad, 0xe0, 0x7e, 0x2a, 0x9b, 0x2c, 0xa7, 0xee, 0xa7, 0xb2, 0xa9, 0x72, + 0x5a, 0xfc, 0x77, 0x1c, 0xb2, 0x6e, 0x4d, 0x1d, 0xbd, 0x14, 0x38, 0x85, 0xc5, 0x49, 0xf6, 0xe6, + 0x8c, 0x7e, 0xaf, 0x31, 0x3c, 0xef, 0xc4, 0xe2, 0xf3, 0x8e, 0x6a, 0x18, 0xbb, 0xad, 0xfb, 0xd4, + 0xc2, 0xad, 0xfb, 0x5b, 0x80, 0x1c, 0xc3, 0x51, 0xfa, 0xf2, 0xa9, 0xe1, 0x68, 0x7a, 0x57, 0x66, + 0x96, 0x67, 0x07, 0xa6, 0x4c, 0xdf, 0x3c, 0xa0, 0x2f, 0x0e, 0xbd, 0x9f, 0xe0, 0x65, 0xbc, 0x8b, + 0xb6, 0x0e, 0x2f, 0x41, 0x86, 0x27, 0x75, 0xac, 0x77, 0xc8, 0x47, 0x5e, 0x17, 0x26, 0x15, 0xe8, + 0xc2, 0x54, 0x21, 0x3b, 0xc0, 0x8e, 0x42, 0x4f, 0x3f, 0xf3, 0xc2, 0xde, 0xf8, 0xe6, 0xab, 0x90, + 0x0b, 0x74, 0x71, 0x89, 0x43, 0xd8, 0x6f, 0xbc, 0x5d, 0x8e, 0x55, 0x97, 0x3e, 0xfe, 0xf4, 0x5a, + 0x72, 0x1f, 0x7f, 0x48, 0x36, 0xb0, 0xd4, 0xa8, 0x37, 0x1b, 0xf5, 0xdd, 0x72, 0xbc, 0x9a, 0xfb, + 0xf8, 0xd3, 0x6b, 0x4b, 0x12, 0xa6, 0x25, 0xef, 0x9b, 0x4d, 0xc8, 0x07, 0xff, 0x4a, 0x38, 0xd5, + 0x41, 0x50, 0xbc, 0x77, 0x7c, 0xb8, 0xb7, 0x53, 0xdf, 0x6a, 0x35, 0xe4, 0x07, 0x07, 0xad, 0x46, + 0x39, 0x8e, 0x9e, 0x84, 0x95, 0xbd, 0x9d, 0x37, 0x9a, 0x2d, 0xb9, 0xbe, 0xb7, 0xd3, 0xd8, 0x6f, + 0xc9, 0x5b, 0xad, 0xd6, 0x56, 0x7d, 0xb7, 0x9c, 0xd8, 0xfc, 0x5d, 0x0e, 0x4a, 0x5b, 0xb5, 0xfa, + 0x0e, 0xc9, 0x69, 0xb5, 0x8e, 0x42, 0x4b, 0x6b, 0x75, 0x48, 0xd1, 0xe2, 0xd9, 0xd4, 0x1b, 0x79, + 0xd5, 0xe9, 0x0d, 0x11, 0xb4, 0x0d, 0x69, 0x5a, 0x57, 0x43, 0xd3, 0xaf, 0xe8, 0x55, 0x67, 0x74, + 0x48, 0xc8, 0x64, 0xe8, 0x51, 0x99, 0x7a, 0x67, 0xaf, 0x3a, 0xbd, 0x61, 0x82, 0xf6, 0x60, 0xc9, + 0x2d, 0x7b, 0xcc, 0xba, 0xfd, 0x56, 0x9d, 0xd9, 0x79, 0x20, 0x4b, 0x63, 0xe5, 0xa9, 0xe9, 0xd7, + 0xf9, 0xaa, 0x33, 0x5a, 0x29, 0x68, 0x07, 0x32, 0x1c, 0x19, 0xce, 0xb8, 0xc9, 0x56, 0x9d, 0xd5, + 0x41, 0x40, 0x12, 0x08, 0x7e, 0xe1, 0x6f, 0xf6, 0x25, 0xc5, 0xea, 0x1c, 0x5d, 0x22, 0xf4, 0x10, + 0x0a, 0x61, 0xb4, 0x39, 0xdf, 0x6d, 0xb9, 0xea, 0x9c, 0xbd, 0x0a, 0xa2, 0x3f, 0x0c, 0x3d, 0xe7, + 0xbb, 0x3d, 0x57, 0x9d, 0xb3, 0x75, 0x81, 0xde, 0x87, 0xe5, 0x71, 0x68, 0x38, 0xff, 0x65, 0xba, + 0xea, 0x02, 0xcd, 0x0c, 0x34, 0x00, 0x34, 0x01, 0x52, 0x2e, 0x70, 0xb7, 0xae, 0xba, 0x48, 0x6f, + 0x03, 0xa9, 0x50, 0x1a, 0x85, 0x28, 0xf3, 0xde, 0xb5, 0xab, 0xce, 0xdd, 0xe7, 0x60, 0x5f, 0x09, + 0xa3, 0x99, 0x79, 0xef, 0xde, 0x55, 0xe7, 0x6e, 0x7b, 0xa0, 0x63, 0x80, 0x00, 0xe6, 0x9c, 0xe3, + 0x2e, 0x5e, 0x75, 0x9e, 0x06, 0x08, 0x32, 0x61, 0x65, 0x12, 0xd6, 0x5c, 0xe4, 0x6a, 0x5e, 0x75, + 0xa1, 0xbe, 0x08, 0xd9, 0xcf, 0x61, 0x14, 0x33, 0xdf, 0x55, 0xbd, 0xea, 0x9c, 0x0d, 0x92, 0x5a, + 0xe3, 0xb3, 0x2f, 0xd7, 0xe2, 0x9f, 0x7f, 0xb9, 0x16, 0xff, 0xc7, 0x97, 0x6b, 0xf1, 0x4f, 0xbe, + 0x5a, 0x8b, 0x7d, 0xfe, 0xd5, 0x5a, 0xec, 0xaf, 0x5f, 0xad, 0xc5, 0x7e, 0xf8, 0x42, 0x57, 0x73, + 0x7a, 0xc3, 0xf6, 0x46, 0xc7, 0x18, 0xdc, 0x0e, 0xde, 0xda, 0x9e, 0x74, 0x93, 0xbc, 0x9d, 0xa1, + 0xd1, 0xf4, 0xce, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x36, 0x11, 0xa3, 0x69, 0x2e, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5818,7 +5820,7 @@ func (m *RequestProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) } } { - size, err := m.LastCommitInfo.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.ProposedLastCommit.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5891,7 +5893,7 @@ func (m *RequestFinalizeBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { } } { - size, err := m.LastCommitInfo.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.DecidedLastCommit.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -7397,7 +7399,7 @@ func (m *ResponseFinalizeBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *LastCommitInfo) Marshal() (dAtA []byte, err error) { +func (m *CommitInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -7407,12 +7409,12 @@ func (m *LastCommitInfo) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *LastCommitInfo) MarshalTo(dAtA []byte) (int, error) { +func (m *CommitInfo) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *LastCommitInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *CommitInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -8440,7 +8442,7 @@ func (m *RequestProcessProposal) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } } - l = m.LastCommitInfo.Size() + l = m.ProposedLastCommit.Size() n += 1 + l + sovTypes(uint64(l)) if len(m.ByzantineValidators) > 0 { for _, e := range m.ByzantineValidators { @@ -8469,7 +8471,7 @@ func (m *RequestFinalizeBlock) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } } - l = m.LastCommitInfo.Size() + l = m.DecidedLastCommit.Size() n += 1 + l + sovTypes(uint64(l)) if len(m.ByzantineValidators) > 0 { for _, e := range m.ByzantineValidators { @@ -9181,7 +9183,7 @@ func (m *ResponseFinalizeBlock) Size() (n int) { return n } -func (m *LastCommitInfo) Size() (n int) { +func (m *CommitInfo) Size() (n int) { if m == nil { return 0 } @@ -12128,7 +12130,7 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LastCommitInfo", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ProposedLastCommit", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -12155,7 +12157,7 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.LastCommitInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.ProposedLastCommit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -12344,7 +12346,7 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LastCommitInfo", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DecidedLastCommit", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -12371,7 +12373,7 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.LastCommitInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.DecidedLastCommit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -16107,7 +16109,7 @@ func (m *ResponseFinalizeBlock) Unmarshal(dAtA []byte) error { } return nil } -func (m *LastCommitInfo) Unmarshal(dAtA []byte) error { +func (m *CommitInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -16130,10 +16132,10 @@ func (m *LastCommitInfo) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: LastCommitInfo: wiretype end group for non-group") + return fmt.Errorf("proto: CommitInfo: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: LastCommitInfo: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: CommitInfo: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/internal/state/execution.go b/internal/state/execution.go index 75541dabf..5da2a1f49 100644 --- a/internal/state/execution.go +++ b/internal/state/execution.go @@ -162,7 +162,7 @@ func (blockExec *BlockExecutor) ProcessProposal( Hash: block.Header.Hash(), Header: *block.Header.ToProto(), Txs: block.Data.Txs.ToSliceOfBytes(), - LastCommitInfo: buildLastCommitInfo(block, blockExec.store, state.InitialHeight), + ProposedLastCommit: buildLastCommitInfo(block, blockExec.store, state.InitialHeight), ByzantineValidators: block.Evidence.ToABCI(), } @@ -220,7 +220,7 @@ func (blockExec *BlockExecutor) ApplyBlock( Hash: block.Hash(), Header: *pbh, Txs: block.Txs.ToSliceOfBytes(), - LastCommitInfo: buildLastCommitInfo(block, blockExec.store, state.InitialHeight), + DecidedLastCommit: buildLastCommitInfo(block, blockExec.store, state.InitialHeight), ByzantineValidators: block.Evidence.ToABCI(), }, ) @@ -374,11 +374,11 @@ func (blockExec *BlockExecutor) Commit( return res.Data, res.RetainHeight, err } -func buildLastCommitInfo(block *types.Block, store Store, initialHeight int64) abci.LastCommitInfo { +func buildLastCommitInfo(block *types.Block, store Store, initialHeight int64) abci.CommitInfo { if block.Height == initialHeight { // there is no last commmit for the initial height. // return an empty value. - return abci.LastCommitInfo{} + return abci.CommitInfo{} } lastValSet, err := store.LoadValidators(block.Height - 1) @@ -409,7 +409,7 @@ func buildLastCommitInfo(block *types.Block, store Store, initialHeight int64) a } } - return abci.LastCommitInfo{ + return abci.CommitInfo{ Round: block.LastCommit.Round, Votes: votes, } @@ -594,7 +594,7 @@ func ExecCommitBlock( Hash: block.Hash(), Header: *pbh, Txs: block.Txs.ToSliceOfBytes(), - LastCommitInfo: buildLastCommitInfo(block, store, initialHeight), + DecidedLastCommit: buildLastCommitInfo(block, store, initialHeight), ByzantineValidators: block.Evidence.ToABCI(), }, ) diff --git a/internal/state/execution_test.go b/internal/state/execution_test.go index abc9ef83d..5a37b304f 100644 --- a/internal/state/execution_test.go +++ b/internal/state/execution_test.go @@ -67,10 +67,10 @@ func TestApplyBlock(t *testing.T) { assert.EqualValues(t, 1, state.Version.Consensus.App, "App version wasn't updated") } -// TestFinalizeBlockLastCommitInfo ensures we correctly send the LastCommitInfo to the -// application. The test ensures that the LastCommitInfo properly reflects +// TestFinalizeBlockDecidedLastCommit ensures we correctly send the DecidedLastCommit to the +// application. The test ensures that the DecidedLastCommit properly reflects // which validators signed the preceding block. -func TestFinalizeBlockLastCommitInfo(t *testing.T) { +func TestFinalizeBlockDecidedLastCommit(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -291,7 +291,7 @@ func TestProcessProposal(t *testing.T) { Header: *block1.Header.ToProto(), Txs: block1.Txs.ToSliceOfBytes(), ByzantineValidators: block1.Evidence.ToABCI(), - LastCommitInfo: abci.LastCommitInfo{ + ProposedLastCommit: abci.CommitInfo{ Round: 0, Votes: voteInfos, }, diff --git a/internal/state/helpers_test.go b/internal/state/helpers_test.go index a24d60e61..7cfdc85ed 100644 --- a/internal/state/helpers_test.go +++ b/internal/state/helpers_test.go @@ -293,7 +293,7 @@ func (app *testApp) Info(req abci.RequestInfo) (resInfo abci.ResponseInfo) { } func (app *testApp) FinalizeBlock(req abci.RequestFinalizeBlock) abci.ResponseFinalizeBlock { - app.CommitVotes = req.LastCommitInfo.Votes + app.CommitVotes = req.DecidedLastCommit.Votes app.ByzantineValidators = req.ByzantineValidators resTxs := make([]*abci.ExecTxResult, len(req.Txs))