diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 8f1ae41d4..3c22e5215 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -267,10 +267,10 @@ type Request_ApplySnapshotChunk struct { ApplySnapshotChunk *RequestApplySnapshotChunk `protobuf:"bytes,15,opt,name=apply_snapshot_chunk,json=applySnapshotChunk,proto3,oneof" json:"apply_snapshot_chunk,omitempty"` } type Request_BeginRecheckTx struct { - BeginRecheckTx *RequestBeginRecheckTx `protobuf:"bytes,100,opt,name=begin_recheck_tx,json=beginRecheckTx,proto3,oneof" json:"begin_recheck_tx,omitempty"` + BeginRecheckTx *RequestBeginRecheckTx `protobuf:"bytes,1000,opt,name=begin_recheck_tx,json=beginRecheckTx,proto3,oneof" json:"begin_recheck_tx,omitempty"` } type Request_EndRecheckTx struct { - EndRecheckTx *RequestEndRecheckTx `protobuf:"bytes,101,opt,name=end_recheck_tx,json=endRecheckTx,proto3,oneof" json:"end_recheck_tx,omitempty"` + EndRecheckTx *RequestEndRecheckTx `protobuf:"bytes,1001,opt,name=end_recheck_tx,json=endRecheckTx,proto3,oneof" json:"end_recheck_tx,omitempty"` } func (*Request_Echo) isRequest_Value() {} @@ -1440,10 +1440,10 @@ type Response_ApplySnapshotChunk struct { ApplySnapshotChunk *ResponseApplySnapshotChunk `protobuf:"bytes,16,opt,name=apply_snapshot_chunk,json=applySnapshotChunk,proto3,oneof" json:"apply_snapshot_chunk,omitempty"` } type Response_BeginRecheckTx struct { - BeginRecheckTx *ResponseBeginRecheckTx `protobuf:"bytes,100,opt,name=begin_recheck_tx,json=beginRecheckTx,proto3,oneof" json:"begin_recheck_tx,omitempty"` + BeginRecheckTx *ResponseBeginRecheckTx `protobuf:"bytes,1000,opt,name=begin_recheck_tx,json=beginRecheckTx,proto3,oneof" json:"begin_recheck_tx,omitempty"` } type Response_EndRecheckTx struct { - EndRecheckTx *ResponseEndRecheckTx `protobuf:"bytes,101,opt,name=end_recheck_tx,json=endRecheckTx,proto3,oneof" json:"end_recheck_tx,omitempty"` + EndRecheckTx *ResponseEndRecheckTx `protobuf:"bytes,1001,opt,name=end_recheck_tx,json=endRecheckTx,proto3,oneof" json:"end_recheck_tx,omitempty"` } func (*Response_Exception) isResponse_Value() {} @@ -3236,6 +3236,8 @@ type Evidence struct { // not store historical validators. // https://github.com/tendermint/tendermint/issues/4581 TotalVotingPower int64 `protobuf:"varint,5,opt,name=total_voting_power,json=totalVotingPower,proto3" json:"total_voting_power,omitempty"` + // *** Ostracon Extended Fields *** + VotingPower int64 `protobuf:"varint,1000,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"` } func (m *Evidence) Reset() { *m = Evidence{} } @@ -3306,6 +3308,13 @@ func (m *Evidence) GetTotalVotingPower() int64 { return 0 } +func (m *Evidence) GetVotingPower() int64 { + if m != nil { + return m.VotingPower + } + return 0 +} + type Snapshot struct { Height uint64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` Format uint32 `protobuf:"varint,2,opt,name=format,proto3" json:"format,omitempty"` @@ -3441,187 +3450,187 @@ func init() { proto.RegisterFile("ostracon/abci/types.proto", fileDescriptor_add var fileDescriptor_addf585b2317eb36 = []byte{ // 2889 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcb, 0x73, 0xe3, 0xc6, - 0xd1, 0x27, 0xf8, 0x46, 0x4b, 0xa4, 0xa8, 0x59, 0x79, 0x97, 0x8b, 0xb5, 0xa5, 0xfd, 0xb0, 0x9f, - 0x63, 0x7b, 0x63, 0x4b, 0xf6, 0xae, 0x63, 0xc7, 0x76, 0xec, 0x98, 0xe2, 0xd2, 0xa6, 0x2c, 0xad, - 0xa4, 0x85, 0x68, 0xb9, 0xfc, 0x0a, 0x0c, 0x82, 0x23, 0x12, 0x59, 0x12, 0x80, 0x09, 0x50, 0x96, - 0x72, 0x4b, 0x52, 0xa9, 0x4a, 0xf9, 0xe4, 0x5c, 0x52, 0xb9, 0xf8, 0xff, 0xc8, 0x21, 0x55, 0x39, - 0xc6, 0x47, 0x1f, 0x73, 0x72, 0x52, 0xde, 0x4a, 0x55, 0x2a, 0xf7, 0x54, 0x2a, 0x97, 0x24, 0x35, - 0x0f, 0x3c, 0x05, 0x80, 0x5c, 0x3b, 0xb7, 0xdc, 0x66, 0x1a, 0xdd, 0x8d, 0xe9, 0x41, 0x4f, 0xf7, - 0xaf, 0x7b, 0x00, 0x57, 0x2d, 0xc7, 0x9d, 0x6a, 0xba, 0x65, 0x6e, 0x69, 0x7d, 0xdd, 0xd8, 0x72, - 0xcf, 0x6d, 0xec, 0x6c, 0xda, 0x53, 0xcb, 0xb5, 0x50, 0xcd, 0x7b, 0xb4, 0x49, 0x1e, 0x49, 0xd7, - 0x7c, 0x4e, 0x7d, 0x7a, 0x6e, 0xbb, 0xd6, 0x96, 0x3d, 0xb5, 0xac, 0x13, 0xc6, 0x2b, 0x49, 0xfe, - 0x43, 0xaa, 0x21, 0xac, 0x27, 0xf4, 0x8c, 0x0b, 0xde, 0xc7, 0xe7, 0xde, 0xb3, 0x6b, 0x31, 0x39, - 0x5b, 0x9b, 0x6a, 0x13, 0xef, 0xe1, 0xc6, 0xd0, 0xb2, 0x86, 0x63, 0xbc, 0x45, 0x67, 0xfd, 0xd9, - 0xc9, 0x96, 0x6b, 0x4c, 0xb0, 0xe3, 0x6a, 0x13, 0x9b, 0x33, 0xac, 0x0d, 0xad, 0xa1, 0x45, 0x87, - 0x5b, 0x64, 0xc4, 0xa8, 0xf2, 0xaf, 0x44, 0xa8, 0x28, 0xf8, 0xe3, 0x19, 0x76, 0x5c, 0xf4, 0x2c, - 0x14, 0xb1, 0x3e, 0xb2, 0x9a, 0xc2, 0x75, 0xe1, 0xc9, 0xa5, 0x5b, 0xd2, 0x66, 0xc4, 0xa4, 0x4d, - 0xce, 0xd5, 0xd1, 0x47, 0x56, 0x37, 0xa7, 0x50, 0x4e, 0x74, 0x1b, 0x4a, 0x27, 0xe3, 0x99, 0x33, - 0x6a, 0xe6, 0xa9, 0xc8, 0xb5, 0x64, 0x91, 0x37, 0x08, 0x4b, 0x37, 0xa7, 0x30, 0x5e, 0xf2, 0x1a, - 0xc3, 0x3c, 0xb1, 0x9a, 0x85, 0xac, 0xd7, 0xec, 0x98, 0x27, 0xf4, 0x35, 0x84, 0x13, 0xbd, 0x0e, - 0xe0, 0x60, 0x57, 0xb5, 0x6c, 0xd7, 0xb0, 0xcc, 0x66, 0x91, 0xca, 0x6d, 0x24, 0xcb, 0x1d, 0x61, - 0xf7, 0x80, 0xb2, 0x75, 0x73, 0x8a, 0xe8, 0x78, 0x13, 0xa2, 0xc1, 0x30, 0x0d, 0x57, 0xd5, 0x47, - 0x9a, 0x61, 0x36, 0x4b, 0x59, 0x1a, 0x76, 0x4c, 0xc3, 0x6d, 0x13, 0x36, 0xa2, 0xc1, 0xf0, 0x26, - 0xc4, 0xd4, 0x8f, 0x67, 0x78, 0x7a, 0xde, 0x2c, 0x67, 0x99, 0x7a, 0x8f, 0xb0, 0x10, 0x53, 0x29, - 0x2f, 0x6a, 0xc3, 0x52, 0x1f, 0x0f, 0x0d, 0x53, 0xed, 0x8f, 0x2d, 0xfd, 0x7e, 0xb3, 0x42, 0x45, - 0xaf, 0x27, 0x8b, 0x6e, 0x13, 0xc6, 0x6d, 0xc2, 0xd7, 0xcd, 0x29, 0xd0, 0xf7, 0x67, 0xe8, 0x65, - 0xa8, 0xea, 0x23, 0xac, 0xdf, 0x57, 0xdd, 0xb3, 0x66, 0x95, 0x6a, 0x78, 0x2c, 0x59, 0x43, 0x9b, - 0x70, 0xf5, 0xce, 0xba, 0x39, 0xa5, 0xa2, 0xb3, 0x21, 0xb1, 0x7b, 0x80, 0xc7, 0xc6, 0x29, 0x9e, - 0x12, 0x69, 0x31, 0xcb, 0xee, 0x3b, 0x8c, 0x8f, 0xca, 0x8b, 0x03, 0x6f, 0x82, 0x5e, 0x05, 0x11, - 0x9b, 0x03, 0x6e, 0x00, 0x50, 0x05, 0xeb, 0x29, 0x9e, 0x61, 0x0e, 0xbc, 0xe5, 0x57, 0x31, 0x1f, - 0xa3, 0x17, 0xa0, 0xac, 0x5b, 0x93, 0x89, 0xe1, 0x36, 0x97, 0xa8, 0xec, 0xa3, 0x29, 0x4b, 0xa7, - 0x3c, 0xdd, 0x9c, 0xc2, 0xb9, 0xd1, 0x1e, 0xd4, 0xc7, 0x86, 0xe3, 0xaa, 0x8e, 0xa9, 0xd9, 0xce, - 0xc8, 0x72, 0x9d, 0xe6, 0x32, 0x95, 0xbf, 0x91, 0x2c, 0xbf, 0x67, 0x38, 0xee, 0x91, 0xc7, 0xda, - 0xcd, 0x29, 0xb5, 0x71, 0x98, 0x40, 0xb4, 0x59, 0x27, 0x27, 0x78, 0xea, 0xab, 0x6b, 0xd6, 0xb2, - 0xb4, 0x1d, 0x10, 0x5e, 0x4f, 0x9a, 0x68, 0xb3, 0xc2, 0x04, 0xf4, 0x2e, 0x5c, 0x1a, 0x5b, 0xda, - 0xc0, 0x57, 0xa6, 0xea, 0xa3, 0x99, 0x79, 0xbf, 0x59, 0xa7, 0x2a, 0x9f, 0x48, 0x59, 0xa0, 0xa5, - 0x0d, 0x3c, 0x05, 0x6d, 0xc2, 0xde, 0xcd, 0x29, 0xab, 0xe3, 0x38, 0x11, 0x7d, 0x00, 0x6b, 0x9a, - 0x6d, 0x8f, 0xcf, 0xe3, 0xba, 0x57, 0xa8, 0xee, 0x27, 0x93, 0x75, 0xb7, 0x88, 0x44, 0x5c, 0x39, - 0xd2, 0x2e, 0x50, 0xd1, 0x21, 0x34, 0x98, 0x3b, 0x4e, 0xb1, 0xef, 0x51, 0x03, 0xaa, 0xf9, 0xff, - 0x33, 0x7c, 0x52, 0xc1, 0xba, 0xef, 0x58, 0xf5, 0x7e, 0x84, 0x82, 0xde, 0x82, 0x3a, 0xf1, 0x8e, - 0x90, 0x3e, 0x4c, 0xf5, 0xc9, 0xa9, 0x2e, 0x12, 0xd6, 0xb6, 0x8c, 0x43, 0xf3, 0xed, 0x0a, 0x94, - 0x4e, 0xb5, 0xf1, 0x0c, 0xcb, 0x4f, 0xc0, 0x52, 0x28, 0xd8, 0xa0, 0x26, 0x54, 0x26, 0xd8, 0x71, - 0xb4, 0x21, 0xa6, 0x91, 0x49, 0x54, 0xbc, 0xa9, 0x5c, 0x87, 0xe5, 0x70, 0x88, 0x91, 0x27, 0xbe, - 0x20, 0x09, 0x1f, 0x44, 0xf0, 0x14, 0x4f, 0x1d, 0x12, 0x33, 0xb8, 0x20, 0x9f, 0xa2, 0x1b, 0x50, - 0xa3, 0x0e, 0xad, 0x7a, 0xcf, 0x49, 0xfc, 0x2a, 0x2a, 0xcb, 0x94, 0x78, 0xcc, 0x99, 0x36, 0x60, - 0xc9, 0xbe, 0x65, 0xfb, 0x2c, 0x05, 0xca, 0x02, 0xf6, 0x2d, 0x9b, 0x33, 0xc8, 0x2f, 0x43, 0x23, - 0x1e, 0x75, 0x50, 0x03, 0x0a, 0xf7, 0xf1, 0x39, 0x7f, 0x1f, 0x19, 0xa2, 0x35, 0x6e, 0x16, 0x7d, - 0x87, 0xa8, 0x70, 0x1b, 0xff, 0x90, 0xf7, 0x85, 0xfd, 0x80, 0x83, 0xbe, 0x0f, 0x45, 0x12, 0xb5, - 0xfd, 0x00, 0xcc, 0x42, 0xfa, 0xa6, 0x17, 0xd2, 0x37, 0x7b, 0x5e, 0x48, 0xdf, 0xae, 0x7e, 0xf1, - 0xd5, 0x46, 0xee, 0xb3, 0x3f, 0x6d, 0x08, 0x0a, 0x95, 0x40, 0x57, 0x49, 0x8c, 0xd0, 0x0c, 0x53, - 0x35, 0x06, 0xfc, 0x3d, 0x15, 0x3a, 0xdf, 0x19, 0xa0, 0x1d, 0x68, 0xe8, 0x96, 0xe9, 0x60, 0xd3, - 0x99, 0x39, 0x2a, 0x4b, 0x19, 0x3c, 0xf4, 0xc6, 0xcf, 0x71, 0xdb, 0x63, 0x3b, 0xa4, 0x5c, 0xca, - 0x8a, 0x1e, 0x25, 0xa0, 0x3b, 0x00, 0xa7, 0xda, 0xd8, 0x18, 0x68, 0xae, 0x35, 0x75, 0x9a, 0xc5, - 0xeb, 0x85, 0x04, 0x25, 0xc7, 0x1e, 0xc3, 0xdb, 0xf6, 0x40, 0x73, 0xf1, 0x76, 0x91, 0xac, 0x54, - 0x09, 0xc9, 0xa1, 0xef, 0xc0, 0x8a, 0x66, 0xdb, 0xaa, 0xe3, 0x6a, 0x2e, 0x56, 0xfb, 0xe7, 0x2e, - 0x76, 0x68, 0x40, 0x5e, 0x56, 0x6a, 0x9a, 0x6d, 0x1f, 0x11, 0xea, 0x36, 0x21, 0xa2, 0xc7, 0xa1, - 0x4e, 0xc2, 0xaf, 0xa1, 0x8d, 0xd5, 0x11, 0x36, 0x86, 0x23, 0x97, 0x86, 0xde, 0x82, 0x52, 0xe3, - 0xd4, 0x2e, 0x25, 0xca, 0x03, 0xdf, 0x09, 0x68, 0xf0, 0x45, 0x08, 0x8a, 0x03, 0xcd, 0xd5, 0xe8, - 0x26, 0x2e, 0x2b, 0x74, 0x4c, 0x68, 0xb6, 0xe6, 0x8e, 0xf8, 0xd6, 0xd0, 0x31, 0xba, 0x0c, 0x65, - 0xae, 0xb6, 0x40, 0xd5, 0xf2, 0x19, 0xf9, 0x5e, 0xf6, 0xd4, 0x3a, 0xc5, 0x34, 0xcf, 0x54, 0x15, - 0x36, 0x91, 0xff, 0x25, 0xc0, 0xea, 0x85, 0x40, 0x4d, 0xf4, 0x8e, 0x34, 0x67, 0xe4, 0xbd, 0x8b, - 0x8c, 0xd1, 0xf3, 0x44, 0xaf, 0x36, 0xc0, 0x53, 0x9e, 0x14, 0x2f, 0x07, 0x1b, 0xc4, 0x12, 0x7d, - 0x97, 0x3e, 0xe5, 0x1b, 0xc3, 0x79, 0xd1, 0x5d, 0x68, 0x8c, 0x35, 0xc7, 0x55, 0x59, 0xf8, 0x53, - 0x43, 0x09, 0x32, 0x1e, 0xec, 0xf7, 0x34, 0x2f, 0x5c, 0x12, 0x27, 0xe7, 0x6a, 0xea, 0xe3, 0x08, - 0x15, 0x1d, 0xc2, 0x5a, 0xff, 0xfc, 0x27, 0x9a, 0xe9, 0x1a, 0x26, 0x56, 0x2f, 0x7c, 0xb3, 0x2b, - 0x31, 0x95, 0x9d, 0x53, 0x63, 0x80, 0x4d, 0xdd, 0xfb, 0x58, 0x97, 0x7c, 0x51, 0xff, 0x63, 0x3a, - 0xf2, 0x21, 0xd4, 0xa3, 0x69, 0x06, 0xd5, 0x21, 0xef, 0x9e, 0x71, 0xd3, 0xf3, 0xee, 0x19, 0xda, - 0x84, 0x22, 0x31, 0x90, 0x9a, 0x5d, 0xbf, 0x90, 0xd7, 0xb9, 0x54, 0xef, 0xdc, 0xc6, 0x0a, 0xe5, - 0x93, 0x65, 0xff, 0x04, 0xf8, 0xa9, 0x27, 0xae, 0x53, 0x7e, 0x0a, 0x56, 0x62, 0xd9, 0x25, 0xf4, - 0xdd, 0x84, 0xf0, 0x77, 0x93, 0x57, 0xa0, 0x16, 0x49, 0x26, 0xf2, 0x65, 0x58, 0x4b, 0xca, 0x0e, - 0xf2, 0x89, 0x4f, 0x8f, 0xc4, 0x79, 0x74, 0x1b, 0xaa, 0x7e, 0x7a, 0x60, 0x27, 0x30, 0xbe, 0x4f, - 0x1e, 0xab, 0xe2, 0x33, 0x92, 0x83, 0x47, 0x9c, 0x99, 0x7a, 0x41, 0x9e, 0x2e, 0xbb, 0xa2, 0xd9, - 0x76, 0x57, 0x73, 0x46, 0xf2, 0x47, 0xd0, 0x4c, 0x0b, 0xfe, 0x31, 0x23, 0x8a, 0xbe, 0xf3, 0x5d, - 0x86, 0xf2, 0x89, 0x35, 0x9d, 0x68, 0x2e, 0x55, 0x56, 0x53, 0xf8, 0x8c, 0x38, 0x25, 0x4b, 0x04, - 0x05, 0x4a, 0x66, 0x13, 0x59, 0x85, 0xab, 0xa9, 0x29, 0x80, 0x88, 0x18, 0xe6, 0x00, 0xb3, 0xdd, - 0xac, 0x29, 0x6c, 0x12, 0x28, 0x62, 0x8b, 0x65, 0x13, 0xf2, 0x5a, 0x07, 0x9b, 0xc4, 0x67, 0x0b, - 0xf4, 0x84, 0xf0, 0x99, 0x7c, 0x17, 0x1e, 0x49, 0xcc, 0x04, 0x21, 0x27, 0x17, 0x16, 0x77, 0x72, - 0xf9, 0x19, 0xb8, 0x94, 0x90, 0x08, 0x52, 0xbf, 0xe8, 0x5f, 0x44, 0xa8, 0x2a, 0xd8, 0xb1, 0x49, - 0x14, 0x42, 0xaf, 0x83, 0x88, 0xcf, 0x74, 0xcc, 0x20, 0xa0, 0x90, 0x02, 0xa4, 0x18, 0x6f, 0xc7, - 0xe3, 0x23, 0x48, 0xc6, 0x17, 0x42, 0xcf, 0x71, 0x78, 0x9b, 0x86, 0x55, 0xb9, 0x70, 0x18, 0xdf, - 0x3e, 0xef, 0xe1, 0xdb, 0x42, 0x0a, 0x78, 0x61, 0x32, 0x31, 0x80, 0xfb, 0x1c, 0x07, 0xb8, 0xc5, - 0xcc, 0x17, 0x45, 0x10, 0x6e, 0x2b, 0x82, 0x70, 0x4b, 0x99, 0xe6, 0xa5, 0x40, 0xdc, 0x56, 0x04, - 0xe2, 0x96, 0x33, 0x55, 0xa4, 0x60, 0xdc, 0xe7, 0x3d, 0x8c, 0x5b, 0xc9, 0x34, 0x37, 0x06, 0x72, - 0xef, 0x44, 0x41, 0x2e, 0x83, 0xa8, 0xff, 0x97, 0x22, 0x9b, 0x8a, 0x72, 0x5f, 0x09, 0xa1, 0x5c, - 0x31, 0x05, 0x66, 0x32, 0x15, 0x09, 0x30, 0xb7, 0x15, 0x81, 0xb9, 0x90, 0x69, 0x7b, 0x0a, 0xce, - 0x7d, 0x2d, 0x8c, 0x73, 0x97, 0x52, 0x80, 0x32, 0x77, 0x91, 0x24, 0xa0, 0xfb, 0xa2, 0x0f, 0x74, - 0x97, 0x53, 0x30, 0x3a, 0x5f, 0x7d, 0x1c, 0xe9, 0xde, 0xbd, 0x80, 0x74, 0x6b, 0x29, 0x90, 0x8c, - 0x29, 0x98, 0x03, 0x75, 0xef, 0x5e, 0x80, 0xba, 0xf5, 0x4c, 0x75, 0x73, 0xb0, 0xee, 0x7b, 0xc9, - 0x58, 0x37, 0x0d, 0x8f, 0xf2, 0x25, 0x2e, 0x06, 0x76, 0x3f, 0x4c, 0x01, 0xbb, 0x0d, 0xaa, 0xfc, - 0xa9, 0x14, 0xe5, 0x0b, 0xa3, 0xdd, 0x7b, 0xa9, 0x68, 0xf7, 0xf1, 0x2c, 0xe7, 0xcc, 0x82, 0xbb, - 0xbb, 0x29, 0x70, 0xf7, 0x46, 0xba, 0xa7, 0x2c, 0x80, 0x77, 0x9f, 0x22, 0xd0, 0x22, 0x16, 0xba, - 0x48, 0xa0, 0xc6, 0xd3, 0xa9, 0x35, 0xe5, 0x50, 0x92, 0x4d, 0xe4, 0x27, 0x09, 0xd8, 0x09, 0x02, - 0x55, 0x06, 0x36, 0xa6, 0xe9, 0x30, 0x14, 0x9e, 0xe4, 0xdf, 0x0a, 0x81, 0x2c, 0xc5, 0x08, 0x61, - 0xa0, 0x24, 0x72, 0xa0, 0x14, 0x82, 0xcc, 0xf9, 0x28, 0x64, 0xde, 0x80, 0x25, 0x92, 0xe8, 0x62, - 0x68, 0x58, 0xb3, 0x3d, 0x34, 0x8c, 0x6e, 0xc2, 0x2a, 0x45, 0x30, 0x0c, 0x58, 0xf3, 0x80, 0x5e, - 0xa4, 0x01, 0x7d, 0x85, 0x3c, 0x60, 0x47, 0x86, 0xa5, 0xb9, 0x67, 0xe0, 0x52, 0x88, 0xd7, 0x4f, - 0xa0, 0x0c, 0x06, 0x36, 0x7c, 0xee, 0x16, 0xcf, 0xa4, 0x77, 0x83, 0x0d, 0x0a, 0x90, 0x36, 0x82, - 0xa2, 0x6e, 0x0d, 0x30, 0x4f, 0x6f, 0x74, 0x4c, 0xd0, 0xf7, 0xd8, 0x1a, 0xf2, 0x24, 0x46, 0x86, - 0x84, 0xcb, 0x8f, 0xc5, 0x22, 0x0b, 0xb6, 0xf2, 0xef, 0x85, 0x40, 0x5f, 0x00, 0xbe, 0x93, 0x70, - 0xb2, 0xf0, 0xdf, 0xc0, 0xc9, 0xf9, 0x6f, 0x88, 0x93, 0xc3, 0xd0, 0xa2, 0x10, 0x85, 0x16, 0x7f, - 0x17, 0x82, 0xaf, 0xeb, 0xa3, 0xde, 0x6f, 0xb6, 0x1b, 0x01, 0x4e, 0x28, 0xd1, 0x6f, 0xc5, 0x71, - 0x02, 0xaf, 0x63, 0xca, 0xf4, 0xbd, 0xd1, 0x3a, 0xa6, 0xc2, 0x90, 0x03, 0x9d, 0xa0, 0x17, 0x40, - 0xa4, 0xad, 0x2d, 0xd5, 0xb2, 0x1d, 0x1e, 0xfa, 0xaf, 0x06, 0x96, 0xb2, 0x1e, 0xd6, 0xe6, 0x21, - 0xe1, 0x38, 0xb0, 0x1d, 0xa5, 0x6a, 0xf3, 0x51, 0x28, 0xe7, 0x8b, 0x11, 0xf4, 0xfd, 0x28, 0x88, - 0x64, 0xed, 0x8e, 0xad, 0xe9, 0x98, 0x06, 0x72, 0x51, 0x09, 0x08, 0xf2, 0x07, 0x80, 0x2e, 0x26, - 0x12, 0xf4, 0x06, 0x94, 0xf1, 0x29, 0x36, 0x5d, 0xf2, 0xbd, 0xc8, 0x56, 0xaf, 0x5d, 0x80, 0xb7, - 0xd8, 0x74, 0xb7, 0x9b, 0x64, 0x83, 0xff, 0xf6, 0xd5, 0x46, 0x83, 0xf1, 0x3e, 0x6d, 0x4d, 0x0c, - 0x17, 0x4f, 0x6c, 0xf7, 0x5c, 0xe1, 0xd2, 0xf2, 0x4f, 0xf3, 0x04, 0x6d, 0x46, 0x92, 0x4c, 0xe2, - 0xbe, 0x7a, 0x07, 0x27, 0x1f, 0xaa, 0x30, 0x16, 0xdb, 0xeb, 0x75, 0x80, 0xa1, 0xe6, 0xa8, 0x9f, - 0x68, 0xa6, 0x8b, 0x07, 0x7c, 0xc3, 0x43, 0x14, 0x24, 0x41, 0x95, 0xcc, 0x66, 0x0e, 0x1e, 0xf0, - 0x62, 0xc7, 0x9f, 0x87, 0xac, 0xac, 0x7c, 0x1b, 0x2b, 0xa3, 0x3b, 0x5c, 0x8d, 0xef, 0xf0, 0xcf, - 0xf3, 0xc1, 0xd9, 0x08, 0x60, 0xf9, 0xff, 0xda, 0x2e, 0xfc, 0x82, 0x56, 0xe7, 0xd1, 0x6c, 0x8f, - 0xee, 0xc1, 0xaa, 0x7f, 0x3a, 0xd5, 0x19, 0x3d, 0xb5, 0x9e, 0xc7, 0x2d, 0x76, 0xb8, 0x1b, 0xa7, - 0x51, 0xb2, 0x83, 0x8e, 0xe1, 0x4a, 0x2c, 0xe6, 0xf8, 0x8a, 0xf3, 0x0b, 0x85, 0x9e, 0x47, 0xa2, - 0xa1, 0xc7, 0xd3, 0x1b, 0xec, 0x52, 0xe1, 0x5b, 0x9d, 0x88, 0x1d, 0x52, 0xf4, 0x85, 0x71, 0x4b, - 0xe2, 0x57, 0xbf, 0x01, 0xb5, 0x29, 0x76, 0x35, 0xc3, 0x54, 0x23, 0x05, 0xf5, 0x32, 0x23, 0xf2, - 0x32, 0x7d, 0x9f, 0x94, 0x12, 0x09, 0x08, 0x06, 0x7d, 0x0f, 0xc4, 0x00, 0xfa, 0x08, 0x89, 0xf5, - 0xa9, 0x5f, 0x77, 0x05, 0x9c, 0xf2, 0xef, 0x84, 0x40, 0x61, 0xb4, 0x8e, 0x6b, 0x43, 0x79, 0x8a, - 0x9d, 0xd9, 0x98, 0x95, 0x13, 0xf5, 0x5b, 0xdf, 0x5d, 0x04, 0xf9, 0x10, 0xea, 0x6c, 0xec, 0x2a, - 0x5c, 0x54, 0xfe, 0x11, 0x94, 0x19, 0x05, 0x2d, 0x41, 0xe5, 0xed, 0xfd, 0xdd, 0xfd, 0x83, 0x77, - 0xf6, 0x1b, 0x39, 0x04, 0x50, 0x6e, 0xb5, 0xdb, 0x9d, 0xc3, 0x5e, 0x43, 0x40, 0x22, 0x94, 0x5a, - 0xdb, 0x07, 0x4a, 0xaf, 0x91, 0x27, 0x64, 0xa5, 0xf3, 0x56, 0xa7, 0xdd, 0x6b, 0x14, 0xd0, 0x2a, - 0xd4, 0xd8, 0x58, 0x7d, 0xe3, 0x40, 0xb9, 0xdb, 0xea, 0x35, 0x8a, 0x21, 0xd2, 0x51, 0x67, 0xff, - 0x4e, 0x47, 0x69, 0x94, 0xe4, 0xe7, 0x48, 0xe9, 0x96, 0x82, 0x96, 0x82, 0x22, 0x4d, 0x08, 0x15, - 0x69, 0xf2, 0xaf, 0xf3, 0x20, 0xa5, 0x83, 0x20, 0xd4, 0x8d, 0x99, 0xfd, 0xec, 0xc2, 0xf8, 0x29, - 0x66, 0x3b, 0x7a, 0x1c, 0xea, 0x53, 0x7c, 0x82, 0x5d, 0x7d, 0xc4, 0x00, 0x19, 0x4b, 0x61, 0x35, - 0xa5, 0xc6, 0xa9, 0x54, 0xc8, 0x61, 0x6c, 0x3f, 0xc6, 0xba, 0xab, 0xb2, 0x6a, 0x91, 0x39, 0x9b, - 0x48, 0xd8, 0x08, 0xf5, 0x88, 0x11, 0xe5, 0x8f, 0x1e, 0x6a, 0x27, 0x45, 0x28, 0x29, 0x9d, 0x9e, - 0xf2, 0x6e, 0xa3, 0x80, 0x10, 0xd4, 0xe9, 0x50, 0x3d, 0xda, 0x6f, 0x1d, 0x1e, 0x75, 0x0f, 0xc8, - 0x4e, 0x5e, 0x82, 0x15, 0x6f, 0x27, 0x3d, 0x62, 0x49, 0x7e, 0x1a, 0x2e, 0x27, 0x23, 0xb8, 0xa4, - 0xb8, 0x25, 0xdf, 0x24, 0xe5, 0xff, 0x45, 0x78, 0x96, 0xc8, 0xfb, 0x0f, 0x01, 0x56, 0x62, 0x47, - 0x0e, 0x3d, 0x0b, 0x25, 0x56, 0x24, 0x24, 0x5f, 0x93, 0xd0, 0x58, 0xc1, 0x4f, 0x27, 0x63, 0x44, - 0x2f, 0x43, 0x15, 0xf3, 0x0e, 0xcb, 0xc5, 0x63, 0xcd, 0xca, 0x65, 0xaf, 0x03, 0xc3, 0x05, 0x7d, - 0x7e, 0xf4, 0x2a, 0x88, 0x7e, 0xd4, 0xe0, 0x55, 0xe8, 0x46, 0x5c, 0xd8, 0x8f, 0x36, 0x5c, 0x3a, - 0x90, 0x40, 0x2f, 0x06, 0x78, 0xae, 0x18, 0x2f, 0x4b, 0xb8, 0x30, 0x7b, 0xcc, 0x45, 0x3d, 0x6e, - 0xb9, 0x0d, 0x4b, 0x21, 0x4b, 0xd0, 0x35, 0x10, 0x27, 0xda, 0x19, 0xef, 0xd6, 0xb1, 0x2a, 0xbd, - 0x3a, 0xd1, 0xce, 0x58, 0xa3, 0xee, 0x0a, 0x54, 0xc8, 0xc3, 0xa1, 0xc6, 0xa2, 0x56, 0x41, 0x29, - 0x4f, 0xb4, 0xb3, 0x37, 0x35, 0x47, 0x7e, 0x1f, 0xea, 0xd1, 0x6e, 0x15, 0xf1, 0xec, 0xa9, 0x35, - 0x33, 0x07, 0x54, 0x47, 0x49, 0x61, 0x13, 0x74, 0x1b, 0x4a, 0xa7, 0x16, 0x0b, 0x7a, 0x49, 0xc7, - 0xff, 0xd8, 0x72, 0x71, 0xa8, 0xd7, 0xc5, 0x78, 0xe5, 0x33, 0x28, 0xd1, 0x30, 0x46, 0x3e, 0x1c, - 0xed, 0x3b, 0x71, 0x1c, 0x4b, 0xc6, 0xe8, 0x7d, 0x00, 0xcd, 0x75, 0xa7, 0x46, 0x7f, 0x16, 0xa8, - 0x7d, 0x2c, 0x29, 0x08, 0xb6, 0x3c, 0xae, 0xed, 0x47, 0x79, 0x34, 0x5c, 0x0b, 0x04, 0x43, 0x11, - 0x31, 0xa4, 0x4e, 0xde, 0x87, 0x7a, 0x54, 0x36, 0xdc, 0xf5, 0x5d, 0x4e, 0xe8, 0xfa, 0xfa, 0x68, - 0xc9, 0xc7, 0x5a, 0x05, 0xd6, 0x5b, 0xa4, 0x13, 0xf9, 0x97, 0x02, 0x54, 0x7b, 0x67, 0xfc, 0x90, - 0xa4, 0x34, 0x43, 0x02, 0xd1, 0x7c, 0xb8, 0x9d, 0xc3, 0xfa, 0x65, 0x05, 0xbf, 0x07, 0xf7, 0x9a, - 0x1f, 0x04, 0x8a, 0x8b, 0x15, 0xc1, 0x5e, 0x87, 0x86, 0x87, 0xbd, 0x57, 0x40, 0xf4, 0xbd, 0x89, - 0x14, 0x03, 0xda, 0x60, 0x30, 0xc5, 0x8e, 0xc3, 0x2d, 0xf3, 0xa6, 0xb4, 0x47, 0x6a, 0x7d, 0xc2, - 0xdb, 0x45, 0x05, 0x85, 0x4d, 0xe4, 0x3e, 0xac, 0xc4, 0x12, 0x1f, 0x7a, 0x09, 0x2a, 0xf6, 0xac, - 0xaf, 0x7a, 0x9b, 0x13, 0x39, 0x2e, 0x1e, 0x38, 0x9c, 0xf5, 0xc7, 0x86, 0xbe, 0x8b, 0xcf, 0xbd, - 0xa5, 0xd8, 0xb3, 0xfe, 0x2e, 0xdb, 0x41, 0xf6, 0x8e, 0x7c, 0xf8, 0x1d, 0xbf, 0x11, 0xa0, 0xea, - 0xf9, 0x03, 0xfa, 0x41, 0xf8, 0x70, 0x30, 0xfd, 0xcd, 0xb4, 0x4c, 0xcc, 0xb5, 0x87, 0xce, 0xc6, - 0x4d, 0x58, 0x75, 0x8c, 0xa1, 0x89, 0x07, 0x6a, 0x50, 0x8b, 0xd0, 0x97, 0x55, 0x95, 0x15, 0xf6, - 0x60, 0xcf, 0x2b, 0x44, 0x90, 0x0c, 0xcb, 0xa7, 0x96, 0x6b, 0x98, 0x43, 0x95, 0xad, 0xe9, 0xaf, - 0x15, 0xba, 0xa8, 0x25, 0x46, 0x3c, 0xa4, 0x4b, 0xfb, 0xa7, 0x00, 0x55, 0xef, 0x1c, 0xa3, 0xad, - 0x90, 0x53, 0xd6, 0x2f, 0xf4, 0x80, 0x3c, 0xb6, 0xa0, 0x1b, 0x1a, 0xb5, 0x25, 0xff, 0xb0, 0xb6, - 0xa4, 0x35, 0xb3, 0xbd, 0x1b, 0x85, 0xe2, 0x43, 0xdf, 0x28, 0x3c, 0x0d, 0xc8, 0xb5, 0x5c, 0x6d, - 0xac, 0x46, 0xec, 0x66, 0x60, 0xad, 0x41, 0x9f, 0x1c, 0x87, 0x6c, 0xff, 0x99, 0x00, 0x55, 0x3f, - 0x01, 0x3f, 0x6c, 0x73, 0xf3, 0x32, 0x94, 0x79, 0x9e, 0x61, 0xdd, 0x4d, 0x3e, 0xf3, 0xbb, 0xeb, - 0xc5, 0x50, 0x77, 0x5d, 0x82, 0xea, 0x04, 0xbb, 0x1a, 0xc5, 0x20, 0xac, 0x5c, 0xf4, 0xe7, 0x37, - 0x5f, 0x82, 0xa5, 0x50, 0x97, 0x99, 0x1c, 0xca, 0xfd, 0xce, 0x3b, 0x8d, 0x9c, 0x54, 0xf9, 0xf4, - 0xf3, 0xeb, 0x85, 0x7d, 0xfc, 0x09, 0x71, 0x68, 0xa5, 0xd3, 0xee, 0x76, 0xda, 0xbb, 0x0d, 0x41, - 0x5a, 0xfa, 0xf4, 0xf3, 0xeb, 0x15, 0x1e, 0xfe, 0x6f, 0x76, 0x61, 0x39, 0xfc, 0x4d, 0xa2, 0xa9, - 0x0a, 0x41, 0xfd, 0xce, 0xdb, 0x87, 0x7b, 0x3b, 0xed, 0x56, 0xaf, 0xa3, 0x1e, 0x1f, 0xf4, 0x3a, - 0x0d, 0x01, 0x5d, 0x81, 0x4b, 0x7b, 0x3b, 0x6f, 0x76, 0x7b, 0x6a, 0x7b, 0x6f, 0xa7, 0xb3, 0xdf, - 0x53, 0x5b, 0xbd, 0x5e, 0xab, 0xbd, 0xdb, 0xc8, 0xdf, 0xfa, 0x37, 0xc0, 0x4a, 0x6b, 0xbb, 0xbd, - 0x43, 0xd2, 0xac, 0xa1, 0x6b, 0xb4, 0x54, 0xfd, 0x21, 0x14, 0x69, 0xb5, 0x9e, 0x71, 0xa5, 0x2e, - 0x65, 0xf5, 0x23, 0xd1, 0x36, 0x94, 0x68, 0x11, 0x8f, 0xb2, 0x6e, 0xd8, 0xa5, 0xcc, 0xf6, 0x24, - 0x59, 0x04, 0x3d, 0x34, 0x19, 0x17, 0xee, 0x52, 0x56, 0xaf, 0x12, 0xed, 0x83, 0x18, 0x54, 0xdf, - 0xf3, 0xae, 0xdf, 0xa5, 0xb9, 0xdd, 0x4b, 0xa2, 0x2f, 0xa8, 0x30, 0xe6, 0x5d, 0x4a, 0x4b, 0x73, - 0x23, 0x19, 0xea, 0x42, 0xc5, 0xab, 0xda, 0xb2, 0x2f, 0xc8, 0xa5, 0x39, 0x9d, 0x45, 0xb2, 0xdd, - 0xac, 0xaa, 0xce, 0xba, 0xe5, 0x97, 0x32, 0xdb, 0xa3, 0xa8, 0x03, 0x65, 0x0e, 0x99, 0x33, 0xaf, - 0xbc, 0xa5, 0xec, 0x3e, 0x21, 0xd9, 0xa4, 0xa0, 0x45, 0x31, 0xef, 0x8f, 0x05, 0x69, 0x6e, 0xbf, - 0x17, 0xdd, 0x03, 0x08, 0x55, 0xce, 0x73, 0x7f, 0x45, 0x90, 0xe6, 0xf7, 0x71, 0xd1, 0x2e, 0x54, - 0xfd, 0x1a, 0x69, 0xce, 0xaf, 0x01, 0xd2, 0xbc, 0x96, 0x2a, 0x7a, 0x0f, 0x6a, 0xd1, 0xf2, 0x60, - 0x91, 0x0b, 0x7f, 0x69, 0xa1, 0x5e, 0x29, 0xd1, 0x1d, 0xad, 0x14, 0x16, 0xb9, 0xfe, 0x97, 0x16, - 0x6a, 0x9c, 0xa2, 0x13, 0x58, 0xbd, 0x88, 0xe3, 0x17, 0xfd, 0x17, 0x40, 0x5a, 0xb8, 0x91, 0x8a, - 0x0c, 0x40, 0x09, 0xd8, 0x7f, 0xe1, 0x1f, 0x03, 0xa4, 0xc5, 0xbb, 0xaa, 0xe8, 0x43, 0xa8, 0xc7, - 0xe0, 0xf4, 0x42, 0x7f, 0x09, 0x48, 0x8b, 0x75, 0x57, 0xd1, 0x3b, 0xb0, 0x1c, 0xc1, 0xdf, 0x0b, - 0xfc, 0x32, 0x20, 0x2d, 0xd2, 0x67, 0xdd, 0x7e, 0xf5, 0x8b, 0xaf, 0xd7, 0x85, 0x2f, 0xbf, 0x5e, - 0x17, 0xfe, 0xfc, 0xf5, 0xba, 0xf0, 0xd9, 0x83, 0xf5, 0xdc, 0x97, 0x0f, 0xd6, 0x73, 0x7f, 0x7c, - 0xb0, 0x9e, 0x7b, 0xef, 0xc6, 0xd0, 0x70, 0x47, 0xb3, 0xfe, 0xa6, 0x6e, 0x4d, 0xb6, 0xc6, 0x86, - 0x89, 0xb7, 0x12, 0xfe, 0xe7, 0xea, 0x97, 0x69, 0x72, 0xbc, 0xfd, 0x9f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xce, 0x35, 0xbc, 0x15, 0xed, 0x25, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0xe4, 0xd4, + 0x11, 0x1f, 0xcd, 0xb7, 0xda, 0x9e, 0xf1, 0xf8, 0xad, 0xd9, 0x9d, 0xd5, 0x82, 0xbd, 0xd1, 0x86, + 0x00, 0x1b, 0xb0, 0x61, 0x97, 0x40, 0x80, 0x40, 0x18, 0xcf, 0x0e, 0x8c, 0x63, 0xaf, 0xed, 0x95, + 0x07, 0x53, 0x7c, 0x45, 0x68, 0x34, 0xcf, 0x33, 0xca, 0xce, 0x48, 0x62, 0xa4, 0x31, 0x76, 0x6e, + 0x49, 0x2a, 0x55, 0x29, 0x4e, 0x54, 0xa5, 0x2a, 0x95, 0x0b, 0xff, 0x47, 0x0e, 0xa9, 0xca, 0x31, + 0x1c, 0x39, 0xe6, 0x44, 0x52, 0xec, 0x21, 0x1f, 0xf7, 0x54, 0x6e, 0x49, 0xea, 0x7d, 0xe8, 0xd3, + 0x92, 0x66, 0x16, 0x72, 0xcb, 0xed, 0x75, 0xab, 0xbb, 0xa5, 0x7e, 0xea, 0xd7, 0xfd, 0xeb, 0x96, + 0xe0, 0xaa, 0xe5, 0xb8, 0x53, 0x4d, 0xb7, 0xcc, 0x2d, 0xad, 0xaf, 0x1b, 0x5b, 0xee, 0xb9, 0x8d, + 0x9d, 0x4d, 0x7b, 0x6a, 0xb9, 0x16, 0xaa, 0x79, 0x97, 0x36, 0xc9, 0x25, 0xe9, 0x9a, 0x2f, 0xa9, + 0x4f, 0xcf, 0x6d, 0xd7, 0xda, 0xb2, 0xa7, 0x96, 0x75, 0xc2, 0x64, 0x25, 0xc9, 0xbf, 0x48, 0x2d, + 0x84, 0xed, 0x84, 0xae, 0x71, 0xc5, 0xfb, 0xf8, 0xdc, 0xbb, 0x76, 0x2d, 0xa6, 0x67, 0x6b, 0x53, + 0x6d, 0xe2, 0x5d, 0xdc, 0x18, 0x5a, 0xd6, 0x70, 0x8c, 0xb7, 0x28, 0xd5, 0x9f, 0x9d, 0x6c, 0xb9, + 0xc6, 0x04, 0x3b, 0xae, 0x36, 0xb1, 0xb9, 0xc0, 0xda, 0xd0, 0x1a, 0x5a, 0x74, 0xb9, 0x45, 0x56, + 0x8c, 0x2b, 0xff, 0x5a, 0x84, 0x8a, 0x82, 0x3f, 0x9a, 0x61, 0xc7, 0x45, 0xcf, 0x42, 0x11, 0xeb, + 0x23, 0xab, 0x29, 0x5c, 0x17, 0x9e, 0x5c, 0xba, 0x25, 0x6d, 0x46, 0x5c, 0xda, 0xe4, 0x52, 0x1d, + 0x7d, 0x64, 0x75, 0x73, 0x0a, 0x95, 0x44, 0xb7, 0xa1, 0x74, 0x32, 0x9e, 0x39, 0xa3, 0x66, 0x9e, + 0xaa, 0x5c, 0x4b, 0x56, 0x79, 0x83, 0x88, 0x74, 0x73, 0x0a, 0x93, 0x25, 0xb7, 0x31, 0xcc, 0x13, + 0xab, 0x59, 0xc8, 0xba, 0xcd, 0x8e, 0x79, 0x42, 0x6f, 0x43, 0x24, 0xd1, 0xeb, 0x00, 0x0e, 0x76, + 0x55, 0xcb, 0x76, 0x0d, 0xcb, 0x6c, 0x16, 0xa9, 0xde, 0x46, 0xb2, 0xde, 0x11, 0x76, 0x0f, 0xa8, + 0x58, 0x37, 0xa7, 0x88, 0x8e, 0x47, 0x10, 0x0b, 0x86, 0x69, 0xb8, 0xaa, 0x3e, 0xd2, 0x0c, 0xb3, + 0x59, 0xca, 0xb2, 0xb0, 0x63, 0x1a, 0x6e, 0x9b, 0x88, 0x11, 0x0b, 0x86, 0x47, 0x10, 0x57, 0x3f, + 0x9a, 0xe1, 0xe9, 0x79, 0xb3, 0x9c, 0xe5, 0xea, 0x3d, 0x22, 0x42, 0x5c, 0xa5, 0xb2, 0xa8, 0x0d, + 0x4b, 0x7d, 0x3c, 0x34, 0x4c, 0xb5, 0x3f, 0xb6, 0xf4, 0xfb, 0xcd, 0x0a, 0x55, 0xbd, 0x9e, 0xac, + 0xba, 0x4d, 0x04, 0xb7, 0x89, 0x5c, 0x37, 0xa7, 0x40, 0xdf, 0xa7, 0xd0, 0xcb, 0x50, 0xd5, 0x47, + 0x58, 0xbf, 0xaf, 0xba, 0x67, 0xcd, 0x2a, 0xb5, 0xf0, 0x58, 0xb2, 0x85, 0x36, 0x91, 0xea, 0x9d, + 0x75, 0x73, 0x4a, 0x45, 0x67, 0x4b, 0xe2, 0xf7, 0x00, 0x8f, 0x8d, 0x53, 0x3c, 0x25, 0xda, 0x62, + 0x96, 0xdf, 0x77, 0x98, 0x1c, 0xd5, 0x17, 0x07, 0x1e, 0x81, 0x5e, 0x05, 0x11, 0x9b, 0x03, 0xee, + 0x00, 0x50, 0x03, 0xeb, 0x29, 0x91, 0x61, 0x0e, 0xbc, 0xc7, 0xaf, 0x62, 0xbe, 0x46, 0x2f, 0x40, + 0x59, 0xb7, 0x26, 0x13, 0xc3, 0x6d, 0x2e, 0x51, 0xdd, 0x47, 0x53, 0x1e, 0x9d, 0xca, 0x74, 0x73, + 0x0a, 0x97, 0x46, 0x7b, 0x50, 0x1f, 0x1b, 0x8e, 0xab, 0x3a, 0xa6, 0x66, 0x3b, 0x23, 0xcb, 0x75, + 0x9a, 0xcb, 0x54, 0xff, 0x46, 0xb2, 0xfe, 0x9e, 0xe1, 0xb8, 0x47, 0x9e, 0x68, 0x37, 0xa7, 0xd4, + 0xc6, 0x61, 0x06, 0xb1, 0x66, 0x9d, 0x9c, 0xe0, 0xa9, 0x6f, 0xae, 0x59, 0xcb, 0xb2, 0x76, 0x40, + 0x64, 0x3d, 0x6d, 0x62, 0xcd, 0x0a, 0x33, 0xd0, 0x3b, 0x70, 0x69, 0x6c, 0x69, 0x03, 0xdf, 0x98, + 0xaa, 0x8f, 0x66, 0xe6, 0xfd, 0x66, 0x9d, 0x9a, 0x7c, 0x22, 0xe5, 0x01, 0x2d, 0x6d, 0xe0, 0x19, + 0x68, 0x13, 0xf1, 0x6e, 0x4e, 0x59, 0x1d, 0xc7, 0x99, 0xe8, 0x7d, 0x58, 0xd3, 0x6c, 0x7b, 0x7c, + 0x1e, 0xb7, 0xbd, 0x42, 0x6d, 0x3f, 0x99, 0x6c, 0xbb, 0x45, 0x34, 0xe2, 0xc6, 0x91, 0x76, 0x81, + 0x8b, 0xee, 0x41, 0x83, 0x85, 0xe3, 0x14, 0xfb, 0x11, 0xf5, 0x37, 0x16, 0x94, 0xdf, 0xce, 0x08, + 0x4a, 0x05, 0xeb, 0x7e, 0x64, 0xd5, 0xfb, 0x11, 0x0e, 0xda, 0x85, 0x3a, 0x09, 0x8f, 0x90, 0xc1, + 0xbf, 0x33, 0x83, 0x72, 0x6a, 0x90, 0x84, 0xcd, 0x2d, 0xe3, 0x10, 0xbd, 0x5d, 0x81, 0xd2, 0xa9, + 0x36, 0x9e, 0x61, 0xf9, 0x09, 0x58, 0x0a, 0xa5, 0x1b, 0xd4, 0x84, 0xca, 0x04, 0x3b, 0x8e, 0x36, + 0xc4, 0x34, 0x37, 0x89, 0x8a, 0x47, 0xca, 0x75, 0x58, 0x0e, 0x27, 0x19, 0x79, 0xe2, 0x2b, 0x92, + 0x04, 0x42, 0x14, 0x4f, 0xf1, 0xd4, 0x21, 0x59, 0x83, 0x2b, 0x72, 0x12, 0xdd, 0x80, 0x1a, 0x0d, + 0x69, 0xd5, 0xbb, 0x4e, 0x32, 0x58, 0x51, 0x59, 0xa6, 0xcc, 0x63, 0x2e, 0xb4, 0x01, 0x4b, 0xf6, + 0x2d, 0xdb, 0x17, 0x29, 0x50, 0x11, 0xb0, 0x6f, 0xd9, 0x5c, 0x40, 0x7e, 0x19, 0x1a, 0xf1, 0xbc, + 0x83, 0x1a, 0x50, 0xb8, 0x8f, 0xcf, 0xf9, 0xfd, 0xc8, 0x12, 0xad, 0x71, 0xb7, 0xe8, 0x3d, 0x44, + 0x85, 0xfb, 0xf8, 0xc7, 0xbc, 0xaf, 0xec, 0xa7, 0x1c, 0xf4, 0x7d, 0x28, 0x92, 0xbc, 0xed, 0xa7, + 0x60, 0x96, 0xd4, 0x37, 0xbd, 0xa4, 0xbe, 0xd9, 0xf3, 0x92, 0xfa, 0x76, 0xf5, 0xf3, 0x2f, 0x37, + 0x72, 0x9f, 0xfe, 0x79, 0x43, 0x50, 0xa8, 0x06, 0xba, 0x4a, 0xb2, 0x84, 0x66, 0x98, 0xaa, 0x31, + 0xe0, 0xf7, 0xa9, 0x50, 0x7a, 0x67, 0x80, 0x76, 0xa0, 0xa1, 0x5b, 0xa6, 0x83, 0x4d, 0x67, 0xe6, + 0xa8, 0xac, 0x68, 0xf0, 0xe4, 0x1b, 0x3f, 0xc9, 0x6d, 0x4f, 0xec, 0x90, 0x4a, 0x29, 0x2b, 0x7a, + 0x94, 0x81, 0xee, 0x00, 0x9c, 0x6a, 0x63, 0x63, 0xa0, 0xb9, 0xd6, 0xd4, 0x69, 0x16, 0xaf, 0x17, + 0x12, 0x8c, 0x1c, 0x7b, 0x02, 0x6f, 0xd9, 0x03, 0xcd, 0xc5, 0xdb, 0x45, 0xf2, 0xa4, 0x4a, 0x48, + 0x0f, 0x7d, 0x07, 0x56, 0x34, 0xdb, 0x56, 0x1d, 0x57, 0x73, 0xb1, 0xda, 0x3f, 0x77, 0xb1, 0x43, + 0x53, 0xf2, 0xb2, 0x52, 0xd3, 0x6c, 0xfb, 0x88, 0x70, 0xb7, 0x09, 0x13, 0x3d, 0x0e, 0x75, 0x92, + 0x80, 0x0d, 0x6d, 0xac, 0x8e, 0xb0, 0x31, 0x1c, 0xb9, 0x34, 0xf9, 0x16, 0x94, 0x1a, 0xe7, 0x76, + 0x29, 0x53, 0x1e, 0xf8, 0x41, 0x40, 0xd3, 0x2f, 0x42, 0x50, 0x1c, 0x68, 0xae, 0x46, 0x37, 0x71, + 0x59, 0xa1, 0x6b, 0xc2, 0xb3, 0x35, 0x77, 0xc4, 0xb7, 0x86, 0xae, 0xd1, 0x65, 0x28, 0x73, 0xb3, + 0x05, 0x6a, 0x96, 0x53, 0xe4, 0x7d, 0xd9, 0x53, 0xeb, 0x14, 0xd3, 0x4a, 0x53, 0x55, 0x18, 0x21, + 0xff, 0x5b, 0x80, 0xd5, 0x0b, 0xa9, 0x9a, 0xd8, 0x1d, 0x69, 0xce, 0xc8, 0xbb, 0x17, 0x59, 0xa3, + 0xe7, 0x89, 0x5d, 0x6d, 0x80, 0xa7, 0xbc, 0x2c, 0x5e, 0x0e, 0x36, 0x88, 0x95, 0xfa, 0x2e, 0xbd, + 0xca, 0x37, 0x86, 0xcb, 0xa2, 0xbb, 0xd0, 0x18, 0x6b, 0x8e, 0xab, 0xb2, 0x04, 0xa8, 0x86, 0x4a, + 0x64, 0x3c, 0xdd, 0xef, 0x69, 0x5e, 0xc2, 0x24, 0x41, 0xce, 0xcd, 0xd4, 0xc7, 0x11, 0x2e, 0x3a, + 0x84, 0xb5, 0xfe, 0xf9, 0x4f, 0x35, 0xd3, 0x35, 0x4c, 0xac, 0x5e, 0x78, 0x67, 0x57, 0x62, 0x26, + 0x3b, 0xa7, 0xc6, 0x00, 0x9b, 0xba, 0xf7, 0xb2, 0x2e, 0xf9, 0xaa, 0xfe, 0xcb, 0x74, 0xe4, 0x43, + 0xa8, 0x47, 0x0b, 0x0d, 0xaa, 0x43, 0xde, 0x3d, 0xe3, 0xae, 0xe7, 0xdd, 0x33, 0xb4, 0x09, 0x45, + 0xe2, 0x20, 0x75, 0xbb, 0x7e, 0xa1, 0xb2, 0x73, 0xad, 0xde, 0xb9, 0x8d, 0x15, 0x2a, 0x27, 0xcb, + 0xfe, 0x09, 0xf0, 0x8b, 0x4f, 0xdc, 0xa6, 0xfc, 0x14, 0xac, 0xc4, 0xea, 0x4b, 0xe8, 0xbd, 0x09, + 0xe1, 0xf7, 0x26, 0xaf, 0x40, 0x2d, 0x52, 0x4e, 0xe4, 0xcb, 0xb0, 0x96, 0x54, 0x1f, 0xe4, 0x13, + 0x9f, 0x1f, 0xc9, 0xf4, 0xe8, 0x36, 0x54, 0xfd, 0x02, 0xc1, 0x4e, 0x60, 0x7c, 0x9f, 0x3c, 0x51, + 0xc5, 0x17, 0x24, 0x07, 0x8f, 0x04, 0x33, 0x8d, 0x82, 0x3c, 0x7d, 0xec, 0x8a, 0x66, 0xdb, 0x5d, + 0xcd, 0x19, 0xc9, 0x1f, 0x42, 0x33, 0x2d, 0xfd, 0xc7, 0x9c, 0x28, 0xfa, 0xc1, 0x77, 0x19, 0xca, + 0x27, 0xd6, 0x74, 0xa2, 0xb9, 0xd4, 0x58, 0x4d, 0xe1, 0x14, 0x09, 0x4a, 0x56, 0x0a, 0x0a, 0x94, + 0xcd, 0x08, 0x59, 0x85, 0xab, 0xa9, 0x45, 0x80, 0xa8, 0x18, 0xe6, 0x00, 0xb3, 0xdd, 0xac, 0x29, + 0x8c, 0x08, 0x0c, 0xb1, 0x87, 0x65, 0x04, 0xb9, 0xad, 0x83, 0x4d, 0x12, 0xb3, 0x05, 0x7a, 0x42, + 0x38, 0x25, 0xdf, 0x85, 0x47, 0x12, 0x4b, 0x41, 0x28, 0xc8, 0x85, 0xc5, 0x83, 0x5c, 0x7e, 0x06, + 0x2e, 0x25, 0x14, 0x82, 0xd4, 0x37, 0xfa, 0x57, 0x11, 0xaa, 0x0a, 0x76, 0x6c, 0x92, 0x85, 0xd0, + 0xeb, 0x20, 0xe2, 0x33, 0x1d, 0x33, 0x10, 0x28, 0xa4, 0x40, 0x29, 0x26, 0xdb, 0xf1, 0xe4, 0x08, + 0x96, 0xf1, 0x95, 0xd0, 0x73, 0x1c, 0xe0, 0xa6, 0xa1, 0x55, 0xae, 0x1c, 0x46, 0xb8, 0xcf, 0x7b, + 0x08, 0xb7, 0x90, 0x02, 0x5f, 0x98, 0x4e, 0x0c, 0xe2, 0x3e, 0xc7, 0x21, 0x6e, 0x31, 0xf3, 0x46, + 0x11, 0x8c, 0xdb, 0x8a, 0x60, 0xdc, 0x52, 0xa6, 0x7b, 0x29, 0x20, 0xb7, 0x15, 0x01, 0xb9, 0xe5, + 0x4c, 0x13, 0x29, 0x28, 0xf7, 0x79, 0x0f, 0xe5, 0x56, 0x32, 0xdd, 0x8d, 0xc1, 0xdc, 0x3b, 0x51, + 0x98, 0xcb, 0x40, 0xea, 0xb7, 0x52, 0x74, 0x53, 0x71, 0xee, 0x2b, 0x21, 0x9c, 0x2b, 0xa6, 0x00, + 0x4d, 0x66, 0x22, 0x01, 0xe8, 0xb6, 0x22, 0x40, 0x17, 0x32, 0x7d, 0x4f, 0x41, 0xba, 0xaf, 0x85, + 0x91, 0xee, 0x52, 0x0a, 0x54, 0xe6, 0x21, 0x92, 0x04, 0x75, 0x5f, 0xf4, 0xa1, 0xee, 0x72, 0x0a, + 0x4a, 0xe7, 0x4f, 0x1f, 0xc7, 0xba, 0x77, 0x2f, 0x60, 0xdd, 0x5a, 0x0a, 0x26, 0x63, 0x06, 0xe6, + 0x80, 0xdd, 0xbb, 0x17, 0xc0, 0x6e, 0x3d, 0xd3, 0xdc, 0x1c, 0xb4, 0xfb, 0x6e, 0x32, 0xda, 0x4d, + 0x43, 0xa4, 0xfc, 0x11, 0x17, 0x83, 0xbb, 0x1f, 0xa4, 0xc0, 0xdd, 0x06, 0x35, 0xfe, 0x54, 0x8a, + 0xf1, 0x85, 0xf1, 0xae, 0x92, 0x8e, 0x77, 0x1f, 0xcf, 0x8a, 0xce, 0x2c, 0xc0, 0xbb, 0x97, 0x06, + 0x78, 0x6f, 0xa4, 0xc7, 0xca, 0x02, 0x88, 0xf7, 0x29, 0x02, 0x2e, 0x62, 0xc9, 0x8b, 0xa4, 0x6a, + 0x3c, 0x9d, 0x5a, 0x53, 0x0e, 0x26, 0x19, 0x21, 0x3f, 0x49, 0xe0, 0x4e, 0x90, 0xaa, 0x32, 0xd0, + 0x31, 0x2d, 0x88, 0xa1, 0x04, 0x25, 0xff, 0x4e, 0x08, 0x74, 0x29, 0x4a, 0x08, 0x43, 0x25, 0x91, + 0x43, 0xa5, 0x10, 0x68, 0xce, 0x47, 0x41, 0xf3, 0x06, 0x2c, 0x91, 0x52, 0x17, 0xc3, 0xc3, 0x9a, + 0xed, 0xe1, 0x61, 0x74, 0x13, 0x56, 0x29, 0x86, 0x61, 0xd0, 0x9a, 0xa7, 0xf4, 0x22, 0x4d, 0xe9, + 0x2b, 0xe4, 0x02, 0x3b, 0x34, 0xac, 0xd0, 0x3d, 0x03, 0x97, 0x42, 0xb2, 0x7e, 0x09, 0x65, 0x40, + 0xb0, 0xe1, 0x4b, 0xb7, 0x78, 0x2d, 0xbd, 0x1b, 0x6c, 0x50, 0x80, 0xb5, 0x11, 0x14, 0x75, 0x6b, + 0x80, 0x79, 0x81, 0xa3, 0x6b, 0x82, 0xbf, 0xc7, 0xd6, 0x90, 0x97, 0x31, 0xb2, 0x24, 0x52, 0x7e, + 0x36, 0x16, 0x59, 0xba, 0x95, 0xff, 0x20, 0x04, 0xf6, 0x02, 0xf8, 0x9d, 0x84, 0x94, 0x85, 0xff, + 0x05, 0x52, 0xce, 0x7f, 0x4d, 0xa4, 0x1c, 0x06, 0x17, 0x85, 0x28, 0xb8, 0xf8, 0xa7, 0x10, 0xbc, + 0x5d, 0x1f, 0xf7, 0x7e, 0xbd, 0xdd, 0x08, 0x90, 0x42, 0x89, 0xbe, 0x2b, 0x8e, 0x14, 0x78, 0x27, + 0x53, 0xa6, 0xf7, 0x8d, 0x76, 0x32, 0x15, 0x86, 0x1d, 0x28, 0x81, 0x5e, 0x00, 0x91, 0x8e, 0xb7, + 0x54, 0xcb, 0x76, 0x78, 0xf2, 0xbf, 0x1a, 0x78, 0xca, 0xe6, 0x58, 0x9b, 0x87, 0x44, 0xe2, 0xc0, + 0x76, 0x94, 0xaa, 0xcd, 0x57, 0xa1, 0xaa, 0x2f, 0x46, 0xf0, 0xf7, 0xa3, 0x20, 0x92, 0x67, 0x77, + 0x6c, 0x4d, 0xc7, 0x34, 0x95, 0x8b, 0x4a, 0xc0, 0x90, 0xdf, 0x07, 0x74, 0xb1, 0x94, 0xa0, 0x37, + 0xa0, 0x8c, 0x4f, 0xb1, 0xe9, 0x92, 0xf7, 0x45, 0xb6, 0x7a, 0xed, 0x02, 0xc0, 0xc5, 0xa6, 0xbb, + 0xdd, 0x24, 0x1b, 0xfc, 0x8f, 0x2f, 0x37, 0x1a, 0x4c, 0xf6, 0x69, 0x6b, 0x62, 0xb8, 0x78, 0x62, + 0xbb, 0xe7, 0x0a, 0xd7, 0x96, 0x7f, 0x96, 0x27, 0x78, 0x33, 0x52, 0x66, 0x12, 0xf7, 0xd5, 0x3b, + 0x38, 0xf9, 0x50, 0x8f, 0xb1, 0xd8, 0x5e, 0xaf, 0x03, 0x0c, 0x35, 0x47, 0xfd, 0x58, 0x33, 0x5d, + 0x3c, 0xe0, 0x1b, 0x1e, 0xe2, 0x20, 0x09, 0xaa, 0x84, 0x9a, 0x39, 0x78, 0xc0, 0xdb, 0x1d, 0x9f, + 0x0e, 0x79, 0x59, 0xf9, 0x26, 0x5e, 0x46, 0x77, 0xb8, 0x1a, 0xdf, 0xe1, 0x5f, 0xe4, 0x83, 0xb3, + 0x11, 0x00, 0xf3, 0xff, 0xb7, 0x5d, 0xf8, 0x25, 0xed, 0xcf, 0xa3, 0xf5, 0x1e, 0xdd, 0x83, 0x55, + 0xff, 0x74, 0xaa, 0x33, 0x7a, 0x6a, 0xbd, 0x88, 0x5b, 0xec, 0x70, 0x37, 0x4e, 0xa3, 0x6c, 0x07, + 0x1d, 0xc3, 0x95, 0x58, 0xce, 0xf1, 0x0d, 0xe7, 0x17, 0x4a, 0x3d, 0x8f, 0x44, 0x53, 0x8f, 0x67, + 0x37, 0xd8, 0xa5, 0xc2, 0x37, 0x3a, 0x11, 0x3b, 0xa4, 0xed, 0x0b, 0x23, 0x97, 0xc4, 0xb7, 0x7e, + 0x03, 0x6a, 0x53, 0xec, 0x6a, 0x86, 0xa9, 0x46, 0x5a, 0xea, 0x65, 0xc6, 0xe4, 0x8d, 0xfa, 0x3e, + 0x69, 0x26, 0x12, 0x30, 0x0c, 0xfa, 0x1e, 0x88, 0x01, 0xf8, 0x11, 0x12, 0x3b, 0x54, 0xbf, 0xf3, + 0x0a, 0x24, 0xe5, 0xdf, 0x0b, 0x81, 0xc1, 0x68, 0x27, 0xd7, 0x86, 0xf2, 0x14, 0x3b, 0xb3, 0x31, + 0x6b, 0x28, 0xea, 0xb7, 0xbe, 0xbb, 0x08, 0xf6, 0x21, 0xdc, 0xd9, 0xd8, 0x55, 0xb8, 0xaa, 0xfc, + 0x63, 0x28, 0x33, 0x0e, 0x5a, 0x82, 0xca, 0x5b, 0xfb, 0xbb, 0xfb, 0x07, 0x6f, 0xef, 0x37, 0x72, + 0x08, 0xa0, 0xdc, 0x6a, 0xb7, 0x3b, 0x87, 0xbd, 0x86, 0x80, 0x44, 0x28, 0xb5, 0xb6, 0x0f, 0x94, + 0x5e, 0x23, 0x4f, 0xd8, 0x4a, 0xe7, 0x47, 0x9d, 0x76, 0xaf, 0x51, 0x40, 0xab, 0x50, 0x63, 0x6b, + 0xf5, 0x8d, 0x03, 0xe5, 0x6e, 0xab, 0xd7, 0x28, 0x86, 0x58, 0x47, 0x9d, 0xfd, 0x3b, 0x1d, 0xa5, + 0x51, 0x92, 0x9f, 0x23, 0xcd, 0x5b, 0x0a, 0x5e, 0x0a, 0xda, 0x34, 0x21, 0xd4, 0xa6, 0xc9, 0xbf, + 0xc9, 0x83, 0x94, 0x0e, 0x83, 0x50, 0x37, 0xe6, 0xf6, 0xb3, 0x0b, 0x23, 0xa8, 0x98, 0xef, 0xe8, + 0x71, 0xa8, 0x4f, 0xf1, 0x09, 0x76, 0xf5, 0x11, 0x83, 0x64, 0xac, 0x84, 0xd5, 0x94, 0x1a, 0xe7, + 0x52, 0x25, 0x87, 0x89, 0xfd, 0x04, 0xeb, 0xae, 0xca, 0xfa, 0x45, 0x16, 0x6c, 0x22, 0x11, 0x23, + 0xdc, 0x23, 0xc6, 0x94, 0x3f, 0x7c, 0xa8, 0x9d, 0x14, 0xa1, 0xa4, 0x74, 0x7a, 0xca, 0x3b, 0x8d, + 0x02, 0x42, 0x50, 0xa7, 0x4b, 0xf5, 0x68, 0xbf, 0x75, 0x78, 0xd4, 0x3d, 0x20, 0x3b, 0x79, 0x09, + 0x56, 0xbc, 0x9d, 0xf4, 0x98, 0x25, 0xf9, 0x69, 0xb8, 0x9c, 0x0c, 0xe1, 0x92, 0xf2, 0x96, 0x7c, + 0x13, 0xd6, 0x92, 0xe0, 0x59, 0xa2, 0xec, 0xbf, 0x04, 0x58, 0x89, 0x1d, 0x39, 0xf4, 0x2c, 0x94, + 0x58, 0x9b, 0x90, 0xfc, 0xa9, 0x84, 0xe6, 0x0a, 0x7e, 0x3a, 0x99, 0x20, 0x7a, 0x19, 0xaa, 0x98, + 0xcf, 0x58, 0x2e, 0x1e, 0x6b, 0xd6, 0x30, 0x7b, 0x33, 0x18, 0xae, 0xe8, 0xcb, 0xa3, 0x57, 0x41, + 0xf4, 0xb3, 0x06, 0xef, 0x43, 0x37, 0xe2, 0xca, 0x7e, 0xb6, 0xe1, 0xda, 0x81, 0x06, 0x7a, 0x31, + 0xc0, 0x73, 0xc5, 0x78, 0x63, 0xc2, 0x95, 0xd9, 0x65, 0xae, 0xea, 0x49, 0xcb, 0x6d, 0x58, 0x0a, + 0x79, 0x82, 0xae, 0x81, 0x38, 0xd1, 0xce, 0xf8, 0xbc, 0x8e, 0xf5, 0xe9, 0xd5, 0x89, 0x76, 0xc6, + 0x46, 0x75, 0x57, 0xa0, 0x42, 0x2e, 0x0e, 0x35, 0x96, 0xb5, 0x0a, 0x4a, 0x79, 0xa2, 0x9d, 0xbd, + 0xa9, 0x39, 0xf2, 0x7b, 0x50, 0x8f, 0xce, 0xab, 0x48, 0x64, 0x4f, 0xad, 0x99, 0x39, 0xa0, 0x36, + 0x4a, 0x0a, 0x23, 0xd0, 0x6d, 0x28, 0x9d, 0x5a, 0x2c, 0xe9, 0x25, 0x1d, 0xff, 0x63, 0xcb, 0xc5, + 0xa1, 0x69, 0x17, 0x93, 0x95, 0xcf, 0xa0, 0x44, 0xd3, 0x18, 0x79, 0x71, 0x74, 0xf2, 0xc4, 0x71, + 0x2c, 0x59, 0xa3, 0xf7, 0x00, 0x34, 0xd7, 0x9d, 0x1a, 0xfd, 0x59, 0x60, 0xf6, 0xb1, 0xa4, 0x24, + 0xd8, 0xf2, 0xa4, 0xb6, 0x1f, 0xe5, 0xd9, 0x70, 0x2d, 0x50, 0x0c, 0x65, 0xc4, 0x90, 0x39, 0x79, + 0x1f, 0xea, 0x51, 0xdd, 0xf0, 0xdc, 0x77, 0x39, 0x61, 0xee, 0xeb, 0xa3, 0x25, 0x1f, 0x6b, 0x15, + 0xd8, 0x74, 0x91, 0x12, 0xf2, 0xaf, 0x04, 0xa8, 0xf6, 0xce, 0xf8, 0x21, 0x49, 0x19, 0x87, 0x04, + 0xaa, 0xf9, 0xf0, 0x40, 0x87, 0x4d, 0xcc, 0x0a, 0xfe, 0x14, 0xee, 0x35, 0x3f, 0x09, 0x14, 0x17, + 0x6b, 0x83, 0xbd, 0x19, 0x0d, 0x4f, 0x7b, 0xaf, 0x80, 0xe8, 0x47, 0x13, 0x69, 0x06, 0xb4, 0xc1, + 0x60, 0x8a, 0x1d, 0x87, 0x7b, 0xe6, 0x91, 0x74, 0x4a, 0x6a, 0x7d, 0xcc, 0x07, 0x46, 0x05, 0x85, + 0x11, 0x72, 0x1f, 0x56, 0x62, 0x85, 0x0f, 0xbd, 0x04, 0x15, 0x7b, 0xd6, 0x57, 0xbd, 0xcd, 0x89, + 0x1c, 0x17, 0x0f, 0x1c, 0xce, 0xfa, 0x63, 0x43, 0xdf, 0xc5, 0xe7, 0xde, 0xa3, 0xd8, 0xb3, 0xfe, + 0x2e, 0xdb, 0x41, 0x76, 0x8f, 0x7c, 0xf8, 0x1e, 0xbf, 0x15, 0xa0, 0xea, 0xc5, 0x03, 0xfa, 0x41, + 0xf8, 0x70, 0x30, 0xfb, 0xcd, 0xb4, 0x4a, 0xcc, 0xad, 0x87, 0xce, 0xc6, 0x4d, 0x58, 0x75, 0x8c, + 0xa1, 0x89, 0x07, 0x6a, 0xd0, 0x8b, 0xd0, 0x9b, 0x55, 0x95, 0x15, 0x76, 0x61, 0xcf, 0x6b, 0x44, + 0x90, 0x0c, 0xcb, 0xa7, 0x96, 0x6b, 0x98, 0x43, 0x95, 0x3d, 0x13, 0xed, 0x24, 0x0b, 0xca, 0x12, + 0x63, 0x1e, 0xd2, 0x47, 0xfb, 0x2c, 0x0f, 0x55, 0xef, 0x1c, 0xa3, 0xad, 0x50, 0x50, 0xd6, 0x2f, + 0x4c, 0x81, 0x3c, 0xb1, 0x60, 0x1e, 0x1a, 0xf5, 0x25, 0xff, 0xb0, 0xbe, 0xa4, 0x8d, 0xb3, 0xbd, + 0x6f, 0x0a, 0xc5, 0x87, 0xfe, 0xa6, 0xf0, 0x34, 0x20, 0xd7, 0x72, 0xb5, 0xb1, 0x1a, 0xf1, 0x9b, + 0x81, 0xb5, 0x06, 0xbd, 0x72, 0x1c, 0xf8, 0xbe, 0xd0, 0xfe, 0xfc, 0x5c, 0x80, 0xaa, 0x5f, 0xa4, + 0x1f, 0x76, 0x04, 0x7a, 0x19, 0xca, 0xbc, 0x16, 0xb1, 0x19, 0x28, 0xa7, 0xfc, 0x19, 0x7c, 0x31, + 0x34, 0x83, 0x97, 0xa0, 0x3a, 0xc1, 0xae, 0x46, 0x71, 0x0a, 0x6b, 0x29, 0x7d, 0xfa, 0xe6, 0x4b, + 0xb0, 0x14, 0x9a, 0x45, 0x93, 0x83, 0xbb, 0xdf, 0x79, 0xbb, 0x91, 0x93, 0x2a, 0x9f, 0x7c, 0x76, + 0xbd, 0xb0, 0x8f, 0x3f, 0x26, 0x41, 0xaf, 0x74, 0xda, 0xdd, 0x4e, 0x7b, 0xb7, 0x21, 0x48, 0x4b, + 0x9f, 0x7c, 0x76, 0xbd, 0xc2, 0x4b, 0xc4, 0xcd, 0x2e, 0x2c, 0x87, 0xdf, 0x5b, 0xb4, 0x9c, 0x21, + 0xa8, 0xdf, 0x79, 0xeb, 0x70, 0x6f, 0xa7, 0xdd, 0xea, 0x75, 0xd4, 0xe3, 0x83, 0x5e, 0xa7, 0x21, + 0xa0, 0x2b, 0x70, 0x69, 0x6f, 0xe7, 0xcd, 0x6e, 0x4f, 0x6d, 0xef, 0xed, 0x74, 0xf6, 0x7b, 0x6a, + 0xab, 0xd7, 0x6b, 0xb5, 0x77, 0x1b, 0xf9, 0x5b, 0xff, 0x01, 0x58, 0x69, 0x6d, 0xb7, 0x77, 0x48, + 0x29, 0x36, 0x74, 0x8d, 0xb6, 0xb3, 0x3f, 0x84, 0x22, 0xed, 0xe8, 0x33, 0x3e, 0xbd, 0x4b, 0x59, + 0x53, 0x4b, 0xb4, 0x0d, 0x25, 0xda, 0xe8, 0xa3, 0xac, 0x2f, 0xf1, 0x52, 0xe6, 0x10, 0x93, 0x3c, + 0x04, 0x3d, 0x58, 0x19, 0x1f, 0xe6, 0xa5, 0xac, 0x89, 0x26, 0xda, 0x07, 0x31, 0xe8, 0xd0, 0xe7, + 0x7d, 0xa6, 0x97, 0xe6, 0xce, 0x38, 0x89, 0xbd, 0xa0, 0x0b, 0x99, 0xf7, 0xf1, 0x5a, 0x9a, 0x9b, + 0xed, 0x50, 0x17, 0x2a, 0x5e, 0x67, 0x97, 0xfd, 0x21, 0x5d, 0x9a, 0x33, 0x7f, 0x24, 0xdb, 0xcd, + 0x3a, 0xef, 0xac, 0xbf, 0x01, 0xa4, 0xcc, 0x21, 0x2a, 0xea, 0x40, 0x99, 0xc3, 0xea, 0xcc, 0x4f, + 0xe3, 0x52, 0xf6, 0x34, 0x91, 0x6c, 0x52, 0x30, 0xc6, 0x98, 0xf7, 0x67, 0x83, 0x34, 0x77, 0x2a, + 0x8c, 0xee, 0x01, 0x84, 0xba, 0xeb, 0xb9, 0xbf, 0x2c, 0x48, 0xf3, 0xa7, 0xbd, 0x68, 0x17, 0xaa, + 0x7e, 0x1f, 0x35, 0xe7, 0x17, 0x02, 0x69, 0xde, 0xe0, 0x15, 0xbd, 0x0b, 0xb5, 0x68, 0x0b, 0xb1, + 0xc8, 0x8f, 0x01, 0xd2, 0x42, 0x13, 0x55, 0x62, 0x3b, 0xda, 0x4d, 0x2c, 0xf2, 0x9b, 0x80, 0xb4, + 0xd0, 0x78, 0x15, 0x9d, 0xc0, 0xea, 0x45, 0xac, 0xbf, 0xe8, 0x3f, 0x03, 0xd2, 0xc2, 0xe3, 0x56, + 0x64, 0x00, 0x4a, 0xe8, 0x0f, 0x16, 0xfe, 0x81, 0x40, 0x5a, 0x7c, 0xf6, 0x8a, 0x3e, 0x80, 0x7a, + 0x0c, 0x72, 0x2f, 0xf4, 0x33, 0x81, 0xb4, 0xd8, 0x08, 0x16, 0xbd, 0x0d, 0xcb, 0x11, 0x8c, 0xbe, + 0xc0, 0x8f, 0x05, 0xd2, 0x22, 0xb3, 0xd8, 0xed, 0x57, 0x3f, 0xff, 0x6a, 0x5d, 0xf8, 0xe2, 0xab, + 0x75, 0xe1, 0x2f, 0x5f, 0xad, 0x0b, 0x9f, 0x3e, 0x58, 0xcf, 0x7d, 0xf1, 0x60, 0x3d, 0xf7, 0xa7, + 0x07, 0xeb, 0xb9, 0x77, 0x6f, 0x0c, 0x0d, 0x77, 0x34, 0xeb, 0x6f, 0xea, 0xd6, 0x64, 0x6b, 0x6c, + 0x98, 0x78, 0x2b, 0xe1, 0xbf, 0xaf, 0x7e, 0x99, 0x16, 0xd0, 0xdb, 0xff, 0x0d, 0x00, 0x00, 0xff, + 0xff, 0x47, 0xb4, 0x6d, 0xa0, 0x15, 0x26, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4644,9 +4653,9 @@ func (m *Request_BeginRecheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x6 + dAtA[i] = 0x3e i-- - dAtA[i] = 0xa2 + dAtA[i] = 0xc2 } return len(dAtA) - i, nil } @@ -4667,9 +4676,9 @@ func (m *Request_EndRecheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x6 + dAtA[i] = 0x3e i-- - dAtA[i] = 0xaa + dAtA[i] = 0xca } return len(dAtA) - i, nil } @@ -5704,9 +5713,9 @@ func (m *Response_BeginRecheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x6 + dAtA[i] = 0x3e i-- - dAtA[i] = 0xa2 + dAtA[i] = 0xc2 } return len(dAtA) - i, nil } @@ -5727,9 +5736,9 @@ func (m *Response_EndRecheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x6 + dAtA[i] = 0x3e i-- - dAtA[i] = 0xaa + dAtA[i] = 0xca } return len(dAtA) - i, nil } @@ -6984,6 +6993,13 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.VotingPower != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.VotingPower)) + i-- + dAtA[i] = 0x3e + i-- + dAtA[i] = 0xc0 + } if m.TotalVotingPower != 0 { i = encodeVarintTypes(dAtA, i, uint64(m.TotalVotingPower)) i-- @@ -8356,6 +8372,9 @@ func (m *Evidence) Size() (n int) { if m.TotalVotingPower != 0 { n += 1 + sovTypes(uint64(m.TotalVotingPower)) } + if m.VotingPower != 0 { + n += 2 + sovTypes(uint64(m.VotingPower)) + } return n } @@ -8945,7 +8964,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_ApplySnapshotChunk{v} iNdEx = postIndex - case 100: + case 1000: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field BeginRecheckTx", wireType) } @@ -8980,7 +8999,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_BeginRecheckTx{v} iNdEx = postIndex - case 101: + case 1001: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field EndRecheckTx", wireType) } @@ -11438,7 +11457,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_ApplySnapshotChunk{v} iNdEx = postIndex - case 100: + case 1000: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field BeginRecheckTx", wireType) } @@ -11473,7 +11492,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_BeginRecheckTx{v} iNdEx = postIndex - case 101: + case 1001: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field EndRecheckTx", wireType) } @@ -15231,6 +15250,25 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { break } } + case 1000: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field VotingPower", wireType) + } + m.VotingPower = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.VotingPower |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/evidence/pool_test.go b/evidence/pool_test.go index 92cd496ab..96a22558d 100644 --- a/evidence/pool_test.go +++ b/evidence/pool_test.go @@ -99,11 +99,11 @@ func TestEvidencePoolBasic(t *testing.T) { var evidenceBytes int64 switch keyType := voterSet.Voters[0].PubKey.(type) { case ed25519.PubKey: - evidenceBytes = 372 + evidenceBytes = 375 case bls.PubKey: - evidenceBytes = 436 + evidenceBytes = 439 case composite.PubKey: - evidenceBytes = 436 + evidenceBytes = 439 default: assert.Fail(t, fmt.Sprintf("unknown public key: %s", keyType)) } diff --git a/proto/ostracon/abci/types.proto b/proto/ostracon/abci/types.proto index 1f6ed0a41..0f9ec9b1e 100644 --- a/proto/ostracon/abci/types.proto +++ b/proto/ostracon/abci/types.proto @@ -395,6 +395,9 @@ message Evidence { // not store historical validators. // https://github.com/tendermint/tendermint/issues/4581 int64 total_voting_power = 5; + + // *** Ostracon Extended Fields *** + int64 voting_power = 1000; } //---------------------------------------- diff --git a/proto/ostracon/types/evidence.pb.go b/proto/ostracon/types/evidence.pb.go index 57231f9e0..d01544a41 100644 --- a/proto/ostracon/types/evidence.pb.go +++ b/proto/ostracon/types/evidence.pb.go @@ -119,6 +119,8 @@ type DuplicateVoteEvidence struct { TotalVotingPower int64 `protobuf:"varint,3,opt,name=total_voting_power,json=totalVotingPower,proto3" json:"total_voting_power,omitempty"` ValidatorPower int64 `protobuf:"varint,4,opt,name=validator_power,json=validatorPower,proto3" json:"validator_power,omitempty"` Timestamp time.Time `protobuf:"bytes,5,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + // *** Ostracon Extended Fields *** + VotingPower int64 `protobuf:"varint,1000,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"` } func (m *DuplicateVoteEvidence) Reset() { *m = DuplicateVoteEvidence{} } @@ -189,6 +191,13 @@ func (m *DuplicateVoteEvidence) GetTimestamp() time.Time { return time.Time{} } +func (m *DuplicateVoteEvidence) GetVotingPower() int64 { + if m != nil { + return m.VotingPower + } + return 0 +} + // LightClientAttackEvidence contains evidence of a set of validators attempting to mislead a light client. type LightClientAttackEvidence struct { ConflictingBlock *LightBlock `protobuf:"bytes,1,opt,name=conflicting_block,json=conflictingBlock,proto3" json:"conflicting_block,omitempty"` @@ -320,41 +329,42 @@ func init() { func init() { proto.RegisterFile("ostracon/types/evidence.proto", fileDescriptor_97062afbc223b6b9) } var fileDescriptor_97062afbc223b6b9 = []byte{ - // 530 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x41, 0x6f, 0xd3, 0x30, - 0x14, 0xc7, 0x9b, 0xa6, 0x9d, 0x8a, 0x37, 0xc6, 0x30, 0x9d, 0x68, 0x23, 0x48, 0xab, 0x22, 0x44, - 0x11, 0x90, 0x48, 0xe3, 0xc6, 0x6d, 0x01, 0xb4, 0x09, 0xf5, 0x80, 0x22, 0xb4, 0x03, 0x97, 0xc8, - 0x71, 0xbd, 0xd4, 0x9a, 0x13, 0x47, 0x8d, 0x5b, 0x34, 0x3e, 0x03, 0x87, 0x7d, 0xac, 0x71, 0xdb, - 0x91, 0x13, 0x4c, 0xed, 0x17, 0x41, 0x76, 0x12, 0xaf, 0x0b, 0x2d, 0xa7, 0x5d, 0xa2, 0xe4, 0xfd, - 0x7f, 0xcf, 0xef, 0xbd, 0xbf, 0xed, 0x80, 0xa7, 0x3c, 0x13, 0x53, 0x84, 0x79, 0xe2, 0x8a, 0xf3, - 0x94, 0x64, 0x2e, 0x99, 0xd3, 0x31, 0x49, 0x30, 0x71, 0xd2, 0x29, 0x17, 0x1c, 0xee, 0x96, 0xb2, - 0xa3, 0x64, 0xab, 0x1d, 0xf1, 0x88, 0x2b, 0xc9, 0x95, 0x6f, 0x39, 0x65, 0xf5, 0x22, 0xce, 0x23, - 0x46, 0x5c, 0xf5, 0x15, 0xce, 0x4e, 0x5d, 0x41, 0x63, 0x92, 0x09, 0x14, 0xa7, 0x05, 0x60, 0x55, - 0xaa, 0xa8, 0x67, 0xa1, 0xd9, 0x15, 0x6d, 0x8e, 0x18, 0x1d, 0x23, 0xc1, 0xa7, 0xb9, 0x3e, 0xb8, - 0x36, 0x40, 0xeb, 0x63, 0xd1, 0x15, 0x0c, 0xc0, 0xe3, 0xf1, 0x2c, 0x65, 0x14, 0x23, 0x41, 0x82, - 0x39, 0x17, 0x24, 0x28, 0x1b, 0xee, 0x18, 0x7d, 0x63, 0xb8, 0x7d, 0xf0, 0xdc, 0xb9, 0xdd, 0xb1, - 0xf3, 0xa1, 0xc4, 0x4f, 0xb8, 0x20, 0xe5, 0x3a, 0xc7, 0x35, 0x7f, 0x7f, 0xbc, 0x4e, 0x80, 0x0c, - 0x3c, 0x61, 0x34, 0x9a, 0x88, 0x00, 0x33, 0x4a, 0x12, 0x11, 0x20, 0x21, 0x10, 0x3e, 0xbb, 0xa9, - 0x52, 0x57, 0x55, 0x5e, 0x56, 0xab, 0x8c, 0x64, 0xce, 0x7b, 0x95, 0x72, 0xa8, 0x32, 0x56, 0x2a, - 0x75, 0xd9, 0x26, 0xd1, 0x6b, 0x02, 0x33, 0x9b, 0xc5, 0x83, 0x1f, 0x75, 0xb0, 0xbf, 0xb6, 0x4f, - 0xf8, 0x0a, 0x6c, 0xa9, 0x29, 0x51, 0x31, 0x5e, 0xbb, 0x5a, 0x58, 0xd2, 0x7e, 0x53, 0x32, 0x87, - 0x1a, 0x0e, 0x8b, 0x2e, 0xff, 0x03, 0x7b, 0xf0, 0x35, 0x80, 0x82, 0x0b, 0xc4, 0xa4, 0x8b, 0x34, - 0x89, 0x82, 0x94, 0x7f, 0x23, 0xd3, 0x8e, 0xd9, 0x37, 0x86, 0xa6, 0xbf, 0xa7, 0x94, 0x13, 0x25, - 0x7c, 0x96, 0x71, 0xf8, 0x02, 0x3c, 0xd0, 0xfb, 0x52, 0xa0, 0x0d, 0x85, 0xee, 0xea, 0x70, 0x0e, - 0x7a, 0xe0, 0x9e, 0xde, 0xfc, 0x4e, 0x53, 0xb5, 0x61, 0x39, 0xf9, 0xf1, 0x70, 0xca, 0xe3, 0xe1, - 0x7c, 0x29, 0x09, 0xaf, 0x75, 0xf9, 0xbb, 0x57, 0xbb, 0xf8, 0xd3, 0x33, 0xfc, 0x9b, 0xb4, 0xc1, - 0xcf, 0x3a, 0xe8, 0x6e, 0x34, 0x14, 0x1e, 0x81, 0x87, 0x98, 0x27, 0xa7, 0x8c, 0x62, 0xd5, 0x77, - 0xc8, 0x38, 0x3e, 0x2b, 0xdc, 0xb1, 0xd6, 0x6e, 0x8b, 0x27, 0x09, 0x7f, 0x6f, 0x25, 0x49, 0x45, - 0xe0, 0x33, 0x70, 0x1f, 0xf3, 0x38, 0xe6, 0x49, 0x30, 0x21, 0x92, 0x53, 0xae, 0x99, 0xfe, 0x4e, - 0x1e, 0x3c, 0x56, 0x31, 0x38, 0x02, 0xed, 0xf0, 0xfc, 0x3b, 0x4a, 0x04, 0x4d, 0x48, 0xa0, 0x67, - 0xcd, 0x3a, 0x66, 0xdf, 0x1c, 0x6e, 0x1f, 0x74, 0xff, 0x71, 0xb8, 0x24, 0xfc, 0x47, 0x3a, 0x4d, - 0xc7, 0xb2, 0x0d, 0xa6, 0x37, 0x36, 0x98, 0x7e, 0x17, 0x5e, 0x7e, 0x02, 0x3b, 0xa5, 0x73, 0x23, - 0x9a, 0x09, 0xf8, 0x0e, 0xb4, 0x56, 0x6e, 0x8c, 0x9c, 0xa1, 0x53, 0x9d, 0x41, 0x9f, 0xce, 0x86, - 0x5c, 0xd0, 0xd7, 0xbc, 0x77, 0x74, 0xb9, 0xb0, 0x8d, 0xab, 0x85, 0x6d, 0x5c, 0x2f, 0x6c, 0xe3, - 0x62, 0x69, 0xd7, 0xae, 0x96, 0x76, 0xed, 0xd7, 0xd2, 0xae, 0x7d, 0x7d, 0x13, 0x51, 0x31, 0x99, - 0x85, 0x0e, 0xe6, 0xb1, 0xcb, 0x68, 0x42, 0x5c, 0x7d, 0xa7, 0xf3, 0x7f, 0xc5, 0xed, 0x2b, 0x1e, - 0x6e, 0xa9, 0xe8, 0xdb, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x98, 0xd4, 0x86, 0x84, 0x7d, 0x04, - 0x00, 0x00, + // 548 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xc1, 0x6e, 0xd3, 0x4c, + 0x10, 0xc7, 0xe3, 0x38, 0xe9, 0x97, 0x6f, 0x13, 0x4a, 0x59, 0x52, 0x91, 0x44, 0xe0, 0x44, 0x41, + 0x88, 0x20, 0xc0, 0x96, 0xca, 0x8d, 0x5b, 0x0d, 0xa8, 0x15, 0xca, 0x01, 0x59, 0xa8, 0x07, 0x2e, + 0xd6, 0x7a, 0xb3, 0x75, 0x56, 0x5d, 0x7b, 0xa3, 0x78, 0x13, 0x54, 0x9e, 0xa2, 0x8f, 0xc2, 0x63, + 0x94, 0x5b, 0x8f, 0x9c, 0xa0, 0x4a, 0x2e, 0x3c, 0x06, 0xda, 0xb5, 0xbd, 0x49, 0x4c, 0xc2, 0x89, + 0x4b, 0x14, 0xcf, 0xff, 0x37, 0x3b, 0xff, 0x99, 0x59, 0x1b, 0x3c, 0xe2, 0x89, 0x98, 0x22, 0xcc, + 0x63, 0x47, 0x5c, 0x4e, 0x48, 0xe2, 0x90, 0x39, 0x1d, 0x91, 0x18, 0x13, 0x7b, 0x32, 0xe5, 0x82, + 0xc3, 0xfd, 0x5c, 0xb6, 0x95, 0xdc, 0x69, 0x86, 0x3c, 0xe4, 0x4a, 0x72, 0xe4, 0xbf, 0x94, 0xea, + 0x74, 0x43, 0xce, 0x43, 0x46, 0x1c, 0xf5, 0x14, 0xcc, 0xce, 0x1d, 0x41, 0x23, 0x92, 0x08, 0x14, + 0x4d, 0x32, 0xa0, 0x53, 0xa8, 0xa2, 0x7e, 0x33, 0xcd, 0x2a, 0x68, 0x73, 0xc4, 0xe8, 0x08, 0x09, + 0x3e, 0x4d, 0xf5, 0xfe, 0xad, 0x01, 0x6a, 0xef, 0x32, 0x57, 0xd0, 0x07, 0x0f, 0x46, 0xb3, 0x09, + 0xa3, 0x18, 0x09, 0xe2, 0xcf, 0xb9, 0x20, 0x7e, 0x6e, 0xb8, 0x65, 0xf4, 0x8c, 0x41, 0xfd, 0xe8, + 0x89, 0xbd, 0xe9, 0xd8, 0x7e, 0x9b, 0xe3, 0x67, 0x5c, 0x90, 0xfc, 0x9c, 0xd3, 0x92, 0x77, 0x38, + 0xda, 0x26, 0x40, 0x06, 0x1e, 0x32, 0x1a, 0x8e, 0x85, 0x8f, 0x19, 0x25, 0xb1, 0xf0, 0x91, 0x10, + 0x08, 0x5f, 0xac, 0xaa, 0x94, 0x55, 0x95, 0x67, 0xc5, 0x2a, 0x43, 0x99, 0xf3, 0x46, 0xa5, 0x1c, + 0xab, 0x8c, 0xb5, 0x4a, 0x6d, 0xb6, 0x4b, 0x74, 0xab, 0xc0, 0x4c, 0x66, 0x51, 0xff, 0x6b, 0x19, + 0x1c, 0x6e, 0xf5, 0x09, 0x9f, 0x83, 0x3d, 0xd5, 0x25, 0xca, 0xda, 0x6b, 0x16, 0x0b, 0x4b, 0xda, + 0xab, 0x4a, 0xe6, 0x58, 0xc3, 0x41, 0xe6, 0xf2, 0x2f, 0xb0, 0x0b, 0x5f, 0x00, 0x28, 0xb8, 0x40, + 0x4c, 0x4e, 0x91, 0xc6, 0xa1, 0x3f, 0xe1, 0x9f, 0xc9, 0xb4, 0x65, 0xf6, 0x8c, 0x81, 0xe9, 0x1d, + 0x28, 0xe5, 0x4c, 0x09, 0x1f, 0x64, 0x1c, 0x3e, 0x05, 0x77, 0xf5, 0x5e, 0x32, 0xb4, 0xa2, 0xd0, + 0x7d, 0x1d, 0x4e, 0x41, 0x17, 0xfc, 0xaf, 0x97, 0xdf, 0xaa, 0x2a, 0x1b, 0x1d, 0x3b, 0xbd, 0x1e, + 0x76, 0x7e, 0x3d, 0xec, 0x8f, 0x39, 0xe1, 0xd6, 0xae, 0x7f, 0x74, 0x4b, 0x57, 0x3f, 0xbb, 0x86, + 0xb7, 0x4a, 0x83, 0x7d, 0xd0, 0xd8, 0x30, 0xf5, 0xeb, 0x3f, 0x55, 0xaa, 0x3e, 0x5f, 0x19, 0xea, + 0x7f, 0x2b, 0x83, 0xf6, 0xce, 0xa1, 0xc3, 0x13, 0x70, 0x0f, 0xf3, 0xf8, 0x9c, 0x51, 0xac, 0x8e, + 0x09, 0x18, 0xc7, 0x17, 0xd9, 0x04, 0x3b, 0x5b, 0x57, 0xe7, 0x4a, 0xc2, 0x3b, 0x58, 0x4b, 0x52, + 0x11, 0xf8, 0x18, 0xdc, 0xc1, 0x3c, 0x8a, 0x78, 0xec, 0x8f, 0x89, 0xe4, 0xd4, 0x64, 0x4d, 0xaf, + 0x91, 0x06, 0x4f, 0x55, 0x0c, 0x0e, 0x41, 0x33, 0xb8, 0xfc, 0x82, 0x62, 0x41, 0x63, 0xe2, 0xeb, + 0x79, 0x24, 0x2d, 0xb3, 0x67, 0x0e, 0xea, 0x47, 0xed, 0x3f, 0xb6, 0x90, 0x13, 0xde, 0x7d, 0x9d, + 0xa6, 0x63, 0xc9, 0x8e, 0xc5, 0x54, 0x76, 0x2c, 0xe6, 0x1f, 0xcc, 0xbb, 0xff, 0x1e, 0x34, 0xf2, + 0xc9, 0x0d, 0x69, 0x22, 0xe0, 0x6b, 0x50, 0x5b, 0x7b, 0xab, 0x64, 0x0f, 0xad, 0x62, 0x0f, 0xfa, + 0x06, 0x57, 0xe4, 0x81, 0x9e, 0xe6, 0xdd, 0x93, 0xeb, 0x85, 0x65, 0xdc, 0x2c, 0x2c, 0xe3, 0x76, + 0x61, 0x19, 0x57, 0x4b, 0xab, 0x74, 0xb3, 0xb4, 0x4a, 0xdf, 0x97, 0x56, 0xe9, 0xd3, 0xcb, 0x90, + 0x8a, 0xf1, 0x2c, 0xb0, 0x31, 0x8f, 0x1c, 0x46, 0x63, 0xe2, 0xe8, 0xf7, 0x3e, 0xfd, 0x9e, 0x6c, + 0x7e, 0x06, 0x82, 0x3d, 0x15, 0x7d, 0xf5, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x26, 0xaa, 0x27, 0x0c, + 0xa1, 0x04, 0x00, 0x00, } func (m *Evidence) Marshal() (dAtA []byte, err error) { @@ -451,6 +461,13 @@ func (m *DuplicateVoteEvidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.VotingPower != 0 { + i = encodeVarintEvidence(dAtA, i, uint64(m.VotingPower)) + i-- + dAtA[i] = 0x3e + i-- + dAtA[i] = 0xc0 + } n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err3 != nil { return 0, err3 @@ -669,6 +686,9 @@ func (m *DuplicateVoteEvidence) Size() (n int) { } l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovEvidence(uint64(l)) + if m.VotingPower != 0 { + n += 2 + sovEvidence(uint64(m.VotingPower)) + } return n } @@ -1012,6 +1032,25 @@ func (m *DuplicateVoteEvidence) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 1000: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field VotingPower", wireType) + } + m.VotingPower = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvidence + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.VotingPower |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipEvidence(dAtA[iNdEx:]) diff --git a/proto/ostracon/types/evidence.proto b/proto/ostracon/types/evidence.proto index cf2bbd219..54167efec 100644 --- a/proto/ostracon/types/evidence.proto +++ b/proto/ostracon/types/evidence.proto @@ -22,6 +22,9 @@ message DuplicateVoteEvidence { int64 total_voting_power = 3; int64 validator_power = 4; google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; + + // *** Ostracon Extended Fields *** + int64 voting_power = 1000; } // LightClientAttackEvidence contains evidence of a set of validators attempting to mislead a light client. diff --git a/state/execution_test.go b/state/execution_test.go index 4b10dfd03..211c24f0b 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -189,6 +189,7 @@ func TestBeginBlockByzantineValidators(t *testing.T) { Time: defaultEvidenceTime, Validator: types.OC2PB.Validator(state.Validators.Validators[0]), TotalVotingPower: 10, + VotingPower: 10, }, { Type: abci.EvidenceType_LIGHT_CLIENT_ATTACK, @@ -196,6 +197,7 @@ func TestBeginBlockByzantineValidators(t *testing.T) { Time: defaultEvidenceTime, Validator: types.OC2PB.Validator(state.Validators.Validators[0]), TotalVotingPower: 12, + VotingPower: 0, }, } diff --git a/types/evidence.go b/types/evidence.go index 4d97b625b..3735703cd 100644 --- a/types/evidence.go +++ b/types/evidence.go @@ -54,6 +54,7 @@ type DuplicateVoteEvidence struct { // abci specific information TotalVotingPower int64 + VotingPower int64 ValidatorPower int64 Timestamp time.Time } @@ -83,6 +84,7 @@ func NewDuplicateVoteEvidence(vote1, vote2 *Vote, blockTime time.Time, voterSet VoteA: voteA, VoteB: voteB, TotalVotingPower: voterSet.TotalVotingPower(), + VotingPower: val.VotingPower, ValidatorPower: val.StakingPower, Timestamp: blockTime, } @@ -99,6 +101,7 @@ func (dve *DuplicateVoteEvidence) ABCI() []abci.Evidence { Height: dve.VoteA.Height, Time: dve.Timestamp, TotalVotingPower: dve.TotalVotingPower, + VotingPower: dve.VotingPower, }} } @@ -163,6 +166,7 @@ func (dve *DuplicateVoteEvidence) ToProto() *tmproto.DuplicateVoteEvidence { VoteA: voteA, VoteB: voteB, TotalVotingPower: dve.TotalVotingPower, + VotingPower: dve.VotingPower, ValidatorPower: dve.ValidatorPower, Timestamp: dve.Timestamp, } @@ -189,6 +193,7 @@ func DuplicateVoteEvidenceFromProto(pb *tmproto.DuplicateVoteEvidence) (*Duplica VoteA: vA, VoteB: vB, TotalVotingPower: pb.TotalVotingPower, + VotingPower: pb.VotingPower, ValidatorPower: pb.ValidatorPower, Timestamp: pb.Timestamp, } @@ -229,6 +234,7 @@ func (l *LightClientAttackEvidence) ABCI() []abci.Evidence { Height: l.Height(), Time: l.Timestamp, TotalVotingPower: l.TotalVotingPower, + VotingPower: 0, } } return abciEv