diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go index 2daed5c63..d2b2d99fe 100644 --- a/abci/example/kvstore/kvstore.go +++ b/abci/example/kvstore/kvstore.go @@ -156,7 +156,7 @@ func (app *Application) handleTx(tx []byte) *types.ExecTxResult { }, } - return &types.ExecTxResult{Code: code.CodeTypeOK, TxEvents: events} + return &types.ExecTxResult{Code: code.CodeTypeOK, Events: events} } func (app *Application) Close() error { diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 20e0eab78..06a25a86d 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -3040,7 +3040,7 @@ func (m *ResponseProcessProposal) GetConsensusParamUpdates() *types1.ConsensusPa } type ResponseFinalizeBlock struct { - BlockEvents []Event `protobuf:"bytes,1,rep,name=block_events,json=blockEvents,proto3" json:"events,omitempty"` + Events []Event `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` TxResults []*ExecTxResult `protobuf:"bytes,2,rep,name=tx_results,json=txResults,proto3" json:"tx_results,omitempty"` ValidatorUpdates []ValidatorUpdate `protobuf:"bytes,3,rep,name=validator_updates,json=validatorUpdates,proto3" json:"validator_updates"` ConsensusParamUpdates *types1.ConsensusParams `protobuf:"bytes,4,opt,name=consensus_param_updates,json=consensusParamUpdates,proto3" json:"consensus_param_updates,omitempty"` @@ -3081,9 +3081,9 @@ func (m *ResponseFinalizeBlock) XXX_DiscardUnknown() { var xxx_messageInfo_ResponseFinalizeBlock proto.InternalMessageInfo -func (m *ResponseFinalizeBlock) GetBlockEvents() []Event { +func (m *ResponseFinalizeBlock) GetEvents() []Event { if m != nil { - return m.BlockEvents + return m.Events } return nil } @@ -3301,7 +3301,7 @@ type ExecTxResult struct { Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` GasWanted int64 `protobuf:"varint,5,opt,name=gas_wanted,json=gasWanted,proto3" json:"gas_wanted,omitempty"` GasUsed int64 `protobuf:"varint,6,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"` - TxEvents []Event `protobuf:"bytes,7,rep,name=tx_events,json=txEvents,proto3" json:"events,omitempty"` + Events []Event `protobuf:"bytes,7,rep,name=events,proto3" json:"events,omitempty"` Codespace string `protobuf:"bytes,8,opt,name=codespace,proto3" json:"codespace,omitempty"` } @@ -3380,9 +3380,9 @@ func (m *ExecTxResult) GetGasUsed() int64 { return 0 } -func (m *ExecTxResult) GetTxEvents() []Event { +func (m *ExecTxResult) GetEvents() []Event { if m != nil { - return m.TxEvents + return m.Events } return nil } @@ -3845,211 +3845,209 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 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, + // 3225 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0xdb, 0xd6, + 0x11, 0xe7, 0xb7, 0xc8, 0xe5, 0xa7, 0x9e, 0x14, 0x85, 0x66, 0x6c, 0xc9, 0x81, 0x27, 0x89, 0xe3, + 0x38, 0x52, 0x23, 0x4f, 0x52, 0x67, 0x92, 0xb6, 0x23, 0xd2, 0x54, 0x28, 0x4b, 0x91, 0x14, 0x88, + 0x72, 0x26, 0x6d, 0x6a, 0x04, 0x24, 0x9e, 0x48, 0xc4, 0x24, 0x80, 0x00, 0x20, 0x23, 0xf9, 0xd4, + 0xe9, 0x4c, 0x2e, 0x99, 0x76, 0x9a, 0x63, 0x67, 0x3a, 0x99, 0x5e, 0x7a, 0xe8, 0x1f, 0xd0, 0x43, + 0x4f, 0x3d, 0xf5, 0x90, 0x43, 0x0f, 0xb9, 0xb5, 0xd3, 0x43, 0xda, 0x49, 0x6e, 0xfd, 0x07, 0x7a, + 0xea, 0xc7, 0xbc, 0x0f, 0x7c, 0x91, 0x04, 0x3f, 0x62, 0xbb, 0x97, 0xde, 0xf0, 0x16, 0xbb, 0x8b, + 0xf7, 0x16, 0xef, 0xed, 0xee, 0x6f, 0xf7, 0xc1, 0x33, 0x36, 0xd6, 0x14, 0x6c, 0xf6, 0x55, 0xcd, + 0xde, 0x92, 0x5b, 0x6d, 0x75, 0xcb, 0xbe, 0x30, 0xb0, 0xb5, 0x69, 0x98, 0xba, 0xad, 0xa3, 0xa2, + 0xf7, 0x72, 0x93, 0xbc, 0xac, 0x5c, 0xf1, 0x71, 0xb7, 0xcd, 0x0b, 0xc3, 0xd6, 0xb7, 0x0c, 0x53, + 0xd7, 0xcf, 0x18, 0x7f, 0xe5, 0xb2, 0xef, 0x35, 0xd5, 0xe3, 0xd7, 0x16, 0x78, 0xcb, 0x85, 0x1f, + 0xe0, 0x0b, 0xe7, 0xed, 0x95, 0x31, 0x59, 0x43, 0x36, 0xe5, 0xbe, 0xf3, 0x7a, 0xa3, 0xa3, 0xeb, + 0x9d, 0x1e, 0xde, 0xa2, 0xa3, 0xd6, 0xe0, 0x6c, 0xcb, 0x56, 0xfb, 0xd8, 0xb2, 0xe5, 0xbe, 0xc1, + 0x19, 0x56, 0x3b, 0x7a, 0x47, 0xa7, 0x8f, 0x5b, 0xe4, 0x89, 0x51, 0x85, 0xff, 0x00, 0x2c, 0x89, + 0xf8, 0xa3, 0x01, 0xb6, 0x6c, 0xb4, 0x0d, 0x09, 0xdc, 0xee, 0xea, 0xe5, 0xe8, 0xd5, 0xe8, 0xf5, + 0xec, 0xf6, 0xe5, 0xcd, 0x91, 0xc5, 0x6d, 0x72, 0xbe, 0x7a, 0xbb, 0xab, 0x37, 0x22, 0x22, 0xe5, + 0x45, 0xaf, 0x42, 0xf2, 0xac, 0x37, 0xb0, 0xba, 0xe5, 0x18, 0x15, 0xba, 0x12, 0x26, 0xb4, 0x4b, + 0x98, 0x1a, 0x11, 0x91, 0x71, 0x93, 0x4f, 0xa9, 0xda, 0x99, 0x5e, 0x8e, 0x4f, 0xff, 0xd4, 0x9e, + 0x76, 0x46, 0x3f, 0x45, 0x78, 0x51, 0x15, 0x40, 0xd5, 0x54, 0x5b, 0x6a, 0x77, 0x65, 0x55, 0x2b, + 0x27, 0xa8, 0xe4, 0xb3, 0xe1, 0x92, 0xaa, 0x5d, 0x23, 0x8c, 0x8d, 0x88, 0x98, 0x51, 0x9d, 0x01, + 0x99, 0xee, 0x47, 0x03, 0x6c, 0x5e, 0x94, 0x93, 0xd3, 0xa7, 0xfb, 0x0e, 0x61, 0x22, 0xd3, 0xa5, + 0xdc, 0x68, 0x0f, 0xb2, 0x2d, 0xdc, 0x51, 0x35, 0xa9, 0xd5, 0xd3, 0xdb, 0x0f, 0xca, 0x29, 0x2a, + 0x2c, 0x84, 0x09, 0x57, 0x09, 0x6b, 0x95, 0x70, 0x56, 0x63, 0xe5, 0x68, 0x23, 0x22, 0x42, 0xcb, + 0xa5, 0xa0, 0x37, 0x21, 0xdd, 0xee, 0xe2, 0xf6, 0x03, 0xc9, 0x3e, 0x2f, 0x2f, 0x51, 0x3d, 0x1b, + 0x61, 0x7a, 0x6a, 0x84, 0xaf, 0x79, 0xde, 0x88, 0x88, 0x4b, 0x6d, 0xf6, 0x88, 0x76, 0x01, 0x14, + 0xdc, 0x53, 0x87, 0xd8, 0x24, 0xf2, 0xe9, 0xe9, 0x36, 0xb8, 0xc3, 0x38, 0x9b, 0xe7, 0x7c, 0x1a, + 0x19, 0xc5, 0x21, 0xa0, 0x1a, 0x64, 0xb0, 0xa6, 0xf0, 0xe5, 0x64, 0xa8, 0x9a, 0xab, 0xa1, 0xff, + 0x5b, 0x53, 0xfc, 0x8b, 0x49, 0x63, 0x3e, 0x46, 0xb7, 0x21, 0xd5, 0xd6, 0xfb, 0x7d, 0xd5, 0x2e, + 0x03, 0xd5, 0xb0, 0x1e, 0xba, 0x10, 0xca, 0xd5, 0x88, 0x88, 0x9c, 0x1f, 0x1d, 0x42, 0xa1, 0xa7, + 0x5a, 0xb6, 0x64, 0x69, 0xb2, 0x61, 0x75, 0x75, 0xdb, 0x2a, 0x67, 0xa9, 0x86, 0xe7, 0xc2, 0x34, + 0x1c, 0xa8, 0x96, 0x7d, 0xe2, 0x30, 0x37, 0x22, 0x62, 0xbe, 0xe7, 0x27, 0x10, 0x7d, 0xfa, 0xd9, + 0x19, 0x36, 0x5d, 0x85, 0xe5, 0xdc, 0x74, 0x7d, 0x47, 0x84, 0xdb, 0x91, 0x27, 0xfa, 0x74, 0x3f, + 0x01, 0xfd, 0x08, 0x56, 0x7a, 0xba, 0xac, 0xb8, 0xea, 0xa4, 0x76, 0x77, 0xa0, 0x3d, 0x28, 0xe7, + 0xa9, 0xd2, 0x17, 0x43, 0x27, 0xa9, 0xcb, 0x8a, 0xa3, 0xa2, 0x46, 0x04, 0x1a, 0x11, 0x71, 0xb9, + 0x37, 0x4a, 0x44, 0xf7, 0x61, 0x55, 0x36, 0x8c, 0xde, 0xc5, 0xa8, 0xf6, 0x02, 0xd5, 0x7e, 0x23, + 0x4c, 0xfb, 0x0e, 0x91, 0x19, 0x55, 0x8f, 0xe4, 0x31, 0x2a, 0x6a, 0x42, 0xc9, 0x30, 0xb1, 0x21, + 0x9b, 0x58, 0x32, 0x4c, 0xdd, 0xd0, 0x2d, 0xb9, 0x57, 0x2e, 0x52, 0xdd, 0x2f, 0x84, 0xe9, 0x3e, + 0x66, 0xfc, 0xc7, 0x9c, 0xbd, 0x11, 0x11, 0x8b, 0x46, 0x90, 0xc4, 0xb4, 0xea, 0x6d, 0x6c, 0x59, + 0x9e, 0xd6, 0xd2, 0x2c, 0xad, 0x94, 0x3f, 0xa8, 0x35, 0x40, 0x42, 0x75, 0xc8, 0xe2, 0x73, 0x22, + 0x2e, 0x0d, 0x75, 0x1b, 0x97, 0x97, 0xa7, 0x1f, 0xac, 0x3a, 0x65, 0xbd, 0xa7, 0xdb, 0x98, 0x1c, + 0x2a, 0xec, 0x8e, 0x90, 0x0c, 0x4f, 0x0d, 0xb1, 0xa9, 0x9e, 0x5d, 0x50, 0x35, 0x12, 0x7d, 0x63, + 0xa9, 0xba, 0x56, 0x46, 0x54, 0xe1, 0x4b, 0x61, 0x0a, 0xef, 0x51, 0x21, 0xa2, 0xa2, 0xee, 0x88, + 0x34, 0x22, 0xe2, 0xca, 0x70, 0x9c, 0x4c, 0xb6, 0xd8, 0x99, 0xaa, 0xc9, 0x3d, 0xf5, 0x21, 0xe6, + 0xc7, 0x66, 0x65, 0xfa, 0x16, 0xdb, 0xe5, 0xdc, 0xf4, 0xac, 0x90, 0x2d, 0x76, 0xe6, 0x27, 0x54, + 0x97, 0x20, 0x39, 0x94, 0x7b, 0x03, 0x2c, 0xbc, 0x00, 0x59, 0x9f, 0x63, 0x45, 0x65, 0x58, 0xea, + 0x63, 0xcb, 0x92, 0x3b, 0x98, 0xfa, 0xe1, 0x8c, 0xe8, 0x0c, 0x85, 0x02, 0xe4, 0xfc, 0xce, 0x54, + 0xf8, 0x2c, 0xea, 0x4a, 0x12, 0x3f, 0x49, 0x24, 0x87, 0xd8, 0xa4, 0xcb, 0xe6, 0x92, 0x7c, 0x88, + 0xae, 0x41, 0x9e, 0x4e, 0x59, 0x72, 0xde, 0x13, 0x67, 0x9d, 0x10, 0x73, 0x94, 0x78, 0x8f, 0x33, + 0x6d, 0x40, 0xd6, 0xd8, 0x36, 0x5c, 0x96, 0x38, 0x65, 0x01, 0x63, 0xdb, 0x70, 0x18, 0x9e, 0x85, + 0x1c, 0x59, 0x9f, 0xcb, 0x91, 0xa0, 0x1f, 0xc9, 0x12, 0x1a, 0x67, 0x11, 0xfe, 0x14, 0x83, 0xd2, + 0xa8, 0x03, 0x46, 0xb7, 0x21, 0x41, 0x62, 0x11, 0x0f, 0x2b, 0x95, 0x4d, 0x16, 0xa8, 0x36, 0x9d, + 0x40, 0xb5, 0xd9, 0x74, 0x02, 0x55, 0x35, 0xfd, 0xc5, 0x57, 0x1b, 0x91, 0xcf, 0xfe, 0xb6, 0x11, + 0x15, 0xa9, 0x04, 0xba, 0x44, 0x7c, 0xa5, 0xac, 0x6a, 0x92, 0xaa, 0xd0, 0x29, 0x67, 0x88, 0x23, + 0x94, 0x55, 0x6d, 0x4f, 0x41, 0x07, 0x50, 0x6a, 0xeb, 0x9a, 0x85, 0x35, 0x6b, 0x60, 0x49, 0x2c, + 0x10, 0xf2, 0x60, 0x12, 0x70, 0x87, 0x2c, 0xbc, 0xd6, 0x1c, 0xce, 0x63, 0xca, 0x28, 0x16, 0xdb, + 0x41, 0x02, 0x71, 0xab, 0x43, 0xb9, 0xa7, 0x2a, 0xb2, 0xad, 0x9b, 0x56, 0x39, 0x71, 0x35, 0x3e, + 0xd1, 0x1f, 0xde, 0x73, 0x58, 0x4e, 0x0d, 0x45, 0xb6, 0x71, 0x35, 0x41, 0xa6, 0x2b, 0xfa, 0x24, + 0xd1, 0xf3, 0x50, 0x94, 0x0d, 0x43, 0xb2, 0x6c, 0xd9, 0xc6, 0x52, 0xeb, 0xc2, 0xc6, 0x16, 0x0d, + 0x34, 0x39, 0x31, 0x2f, 0x1b, 0xc6, 0x09, 0xa1, 0x56, 0x09, 0x11, 0x3d, 0x07, 0x05, 0x12, 0x93, + 0x54, 0xb9, 0x27, 0x75, 0xb1, 0xda, 0xe9, 0xda, 0x34, 0xa4, 0xc4, 0xc5, 0x3c, 0xa7, 0x36, 0x28, + 0x51, 0x50, 0xdc, 0x3f, 0x4e, 0xe3, 0x11, 0x42, 0x90, 0x50, 0x64, 0x5b, 0xa6, 0x96, 0xcc, 0x89, + 0xf4, 0x99, 0xd0, 0x0c, 0xd9, 0xee, 0x72, 0xfb, 0xd0, 0x67, 0xb4, 0x06, 0x29, 0xae, 0x36, 0x4e, + 0xd5, 0xf2, 0x11, 0x5a, 0x85, 0xa4, 0x61, 0xea, 0x43, 0x4c, 0x7f, 0x5d, 0x5a, 0x64, 0x03, 0xe1, + 0x27, 0x31, 0x58, 0x1e, 0x8b, 0x5c, 0x44, 0x6f, 0x57, 0xb6, 0xba, 0xce, 0xb7, 0xc8, 0x33, 0x7a, + 0x8d, 0xe8, 0x95, 0x15, 0x6c, 0xf2, 0x68, 0x5f, 0x1e, 0x37, 0x75, 0x83, 0xbe, 0xe7, 0xa6, 0xe1, + 0xdc, 0x68, 0x1f, 0x4a, 0x3d, 0xd9, 0xb2, 0x25, 0xe6, 0xfd, 0x25, 0x5f, 0xe4, 0x7f, 0x66, 0xcc, + 0xc8, 0x2c, 0x56, 0x90, 0x0d, 0xcd, 0x95, 0x14, 0x88, 0xa8, 0x47, 0x45, 0x22, 0xac, 0xb6, 0x2e, + 0x1e, 0xca, 0x9a, 0xad, 0x6a, 0x58, 0x1a, 0xfb, 0x6b, 0x97, 0xc6, 0x14, 0xd6, 0x87, 0xaa, 0x82, + 0xb5, 0xb6, 0xf3, 0xbb, 0x56, 0x5c, 0x61, 0xf7, 0x77, 0x5a, 0x82, 0x08, 0x85, 0x60, 0xcc, 0x45, + 0x05, 0x88, 0xd9, 0xe7, 0x7c, 0xf1, 0x31, 0xfb, 0x1c, 0x7d, 0x07, 0x12, 0x64, 0x81, 0x74, 0xe1, + 0x85, 0x09, 0x09, 0x0b, 0x97, 0x6b, 0x5e, 0x18, 0x58, 0xa4, 0x9c, 0x82, 0xe0, 0x1e, 0x05, 0x37, + 0x0e, 0x8f, 0x6a, 0x15, 0x5e, 0x84, 0xe2, 0x48, 0x90, 0xf5, 0xfd, 0xbb, 0xa8, 0xff, 0xdf, 0x09, + 0x45, 0xc8, 0x07, 0xa2, 0xa9, 0xb0, 0x06, 0xab, 0x93, 0x82, 0xa3, 0xd0, 0x75, 0xe9, 0x81, 0x20, + 0x87, 0x5e, 0x85, 0xb4, 0x1b, 0x1d, 0xd9, 0x51, 0x1c, 0xb7, 0x95, 0xc3, 0x2c, 0xba, 0xac, 0xe4, + 0x0c, 0x92, 0x2d, 0x4d, 0xf7, 0x42, 0x8c, 0x4e, 0x7c, 0x49, 0x36, 0x8c, 0x86, 0x6c, 0x75, 0x85, + 0x0f, 0xa0, 0x1c, 0x16, 0xf9, 0x46, 0x96, 0x91, 0x70, 0xb7, 0xe0, 0x1a, 0xa4, 0xce, 0x74, 0xb3, + 0x2f, 0xdb, 0x54, 0x59, 0x5e, 0xe4, 0x23, 0xb2, 0x35, 0x59, 0x14, 0x8c, 0x53, 0x32, 0x1b, 0x08, + 0x12, 0x5c, 0x0a, 0x8d, 0x7e, 0x44, 0x44, 0xd5, 0x14, 0xcc, 0xec, 0x99, 0x17, 0xd9, 0xc0, 0x53, + 0xc4, 0x26, 0xcb, 0x06, 0xe4, 0xb3, 0x16, 0x5d, 0x2b, 0xd5, 0x9f, 0x11, 0xf9, 0x48, 0xf8, 0x81, + 0xbb, 0xf5, 0xbd, 0xd8, 0x82, 0x6e, 0x40, 0x82, 0x46, 0x23, 0x66, 0xa5, 0xb5, 0xf1, 0x4d, 0x4e, + 0xb8, 0x44, 0xca, 0x23, 0x34, 0xa0, 0x12, 0x1e, 0x4b, 0x16, 0xd2, 0xf4, 0xf3, 0x28, 0xac, 0x4d, + 0x0e, 0xc7, 0xe8, 0x0a, 0x00, 0xf3, 0xdf, 0xfc, 0xf4, 0xc7, 0xaf, 0xe7, 0xc4, 0x0c, 0xa5, 0xdc, + 0x21, 0x2e, 0xe0, 0x79, 0x28, 0x7a, 0xaf, 0x25, 0x4b, 0x7d, 0xc8, 0xb6, 0x69, 0x5c, 0xcc, 0xbb, + 0x3c, 0x27, 0xea, 0x43, 0x8c, 0x6e, 0x42, 0x92, 0x7c, 0x89, 0x38, 0xca, 0xf8, 0x94, 0xe9, 0x30, + 0x26, 0xe1, 0xd7, 0x31, 0xdf, 0x7c, 0x82, 0x51, 0xfb, 0x71, 0xfa, 0x86, 0x12, 0xc4, 0xed, 0x73, + 0x36, 0xa5, 0x9c, 0x48, 0x1e, 0xd1, 0x09, 0xac, 0xb2, 0x0c, 0x03, 0x2b, 0x92, 0xcf, 0x6d, 0xf0, + 0x8c, 0x7f, 0x0e, 0x8f, 0x81, 0x1c, 0xf1, 0x03, 0xd7, 0x73, 0x84, 0x7a, 0x8d, 0xe4, 0x23, 0x78, + 0x8d, 0x5f, 0xc5, 0xdc, 0xa3, 0x16, 0x08, 0xf6, 0x4f, 0xd8, 0x3e, 0xef, 0xc0, 0x8a, 0x82, 0xdb, + 0xaa, 0xf2, 0x6d, 0xcd, 0xb3, 0xcc, 0xa5, 0x9f, 0xb0, 0x75, 0xfe, 0x9c, 0x85, 0xb4, 0x88, 0x2d, + 0x83, 0x84, 0x5a, 0x54, 0x85, 0x0c, 0x3e, 0x6f, 0x63, 0xc3, 0x76, 0xb2, 0x93, 0xc9, 0x59, 0x1e, + 0xe3, 0xae, 0x3b, 0x9c, 0x04, 0xb3, 0xb8, 0x62, 0xe8, 0x16, 0x87, 0xa7, 0xe1, 0x48, 0x93, 0x8b, + 0xfb, 0xf1, 0xe9, 0x6b, 0x0e, 0x3e, 0x8d, 0x87, 0x42, 0x14, 0x26, 0x35, 0x02, 0x50, 0x6f, 0x71, + 0x80, 0x9a, 0x98, 0xf1, 0xb1, 0x00, 0x42, 0xad, 0x05, 0x10, 0x6a, 0x72, 0xc6, 0x32, 0x43, 0x20, + 0xea, 0x6b, 0x0e, 0x44, 0x4d, 0xcd, 0x98, 0xf1, 0x08, 0x46, 0xbd, 0x1b, 0xc4, 0xa8, 0x0c, 0x5b, + 0x5e, 0x0b, 0x95, 0x9e, 0x0a, 0x52, 0xbf, 0xe7, 0x03, 0xa9, 0xe9, 0x50, 0x74, 0xc8, 0x14, 0x4d, + 0x40, 0xa9, 0x6f, 0x05, 0x50, 0x6a, 0x66, 0x86, 0x1d, 0xa6, 0xc0, 0xd4, 0x3b, 0x7e, 0x98, 0x0a, + 0xa1, 0x68, 0x97, 0xff, 0xf7, 0x30, 0x9c, 0xfa, 0xba, 0x8b, 0x53, 0xb3, 0xa1, 0x80, 0x9b, 0xaf, + 0x65, 0x14, 0xa8, 0x1e, 0x8d, 0x01, 0x55, 0x06, 0x2c, 0x9f, 0x0f, 0x55, 0x31, 0x03, 0xa9, 0x1e, + 0x8d, 0x21, 0xd5, 0xfc, 0x0c, 0x85, 0x33, 0xa0, 0xea, 0xfb, 0x93, 0xa1, 0x6a, 0x38, 0x98, 0xe4, + 0xd3, 0x9c, 0x0f, 0xab, 0x4a, 0x21, 0x58, 0xb5, 0x18, 0x8a, 0xab, 0x98, 0xfa, 0xb9, 0xc1, 0xea, + 0xe9, 0x04, 0xb0, 0xca, 0x60, 0xe5, 0xf5, 0x50, 0xe5, 0x73, 0xa0, 0xd5, 0xd3, 0x09, 0x68, 0x75, + 0x79, 0xa6, 0xda, 0x99, 0x70, 0x75, 0x37, 0x08, 0x57, 0xd1, 0x8c, 0x33, 0x16, 0x8a, 0x57, 0x5b, + 0x61, 0x78, 0x95, 0x61, 0xca, 0x9b, 0xa1, 0x1a, 0x17, 0x00, 0xac, 0x47, 0x63, 0x80, 0x75, 0x75, + 0xc6, 0x4e, 0x9b, 0x17, 0xb1, 0xbe, 0x48, 0x92, 0xa6, 0x11, 0x57, 0x4d, 0xf2, 0x2e, 0x6c, 0x9a, + 0xba, 0xc9, 0xb1, 0x27, 0x1b, 0x08, 0xd7, 0x09, 0x82, 0xf1, 0xdc, 0xf2, 0x14, 0x74, 0x4b, 0xf3, + 0x5b, 0x9f, 0x2b, 0x16, 0x7e, 0x1f, 0xf5, 0x64, 0x69, 0xe2, 0xef, 0x47, 0x3f, 0x19, 0x8e, 0x7e, + 0x7c, 0x98, 0x37, 0x16, 0xc4, 0xbc, 0x1b, 0x90, 0x25, 0x79, 0xeb, 0x08, 0x9c, 0x95, 0x0d, 0x17, + 0xce, 0xde, 0x80, 0x65, 0x1a, 0x3e, 0x59, 0xea, 0xc4, 0x93, 0xd5, 0x04, 0xcd, 0x9b, 0x8a, 0xe4, + 0x05, 0xb3, 0x02, 0xcb, 0x5a, 0x5f, 0x86, 0x15, 0x1f, 0xaf, 0x9b, 0x0f, 0x33, 0x6c, 0x57, 0x72, + 0xb9, 0x77, 0x78, 0x62, 0xfc, 0xc7, 0xa8, 0x67, 0x21, 0x0f, 0x07, 0x4f, 0x82, 0xac, 0xd1, 0xc7, + 0x04, 0x59, 0x63, 0xdf, 0x1a, 0xb2, 0xfa, 0xf3, 0xfb, 0x78, 0x30, 0xbf, 0xff, 0x67, 0xd4, 0xfb, + 0x27, 0x2e, 0x00, 0x6d, 0xeb, 0x0a, 0xe6, 0x19, 0x37, 0x7d, 0x26, 0x09, 0x4a, 0x4f, 0xef, 0xf0, + 0xbc, 0x9a, 0x3c, 0x12, 0x2e, 0x37, 0x76, 0x66, 0x78, 0x68, 0x74, 0x93, 0xf5, 0x24, 0xb5, 0x30, + 0x4f, 0xd6, 0x4b, 0x10, 0x7f, 0x80, 0x59, 0xa4, 0xcb, 0x89, 0xe4, 0x91, 0xf0, 0xd1, 0x4d, 0x46, + 0xe3, 0x57, 0x4e, 0x64, 0x03, 0x74, 0x1b, 0x32, 0xb4, 0x8c, 0x2e, 0xe9, 0x86, 0xc5, 0x03, 0x52, + 0x20, 0xd1, 0x61, 0xd5, 0xf2, 0xcd, 0x63, 0xc2, 0x73, 0x64, 0x58, 0x62, 0xda, 0xe0, 0x4f, 0x3e, + 0x1c, 0x92, 0x09, 0x40, 0xe1, 0xcb, 0x90, 0x21, 0xb3, 0xb7, 0x0c, 0xb9, 0x8d, 0x69, 0x64, 0xc9, + 0x88, 0x1e, 0x41, 0xb8, 0x0f, 0x68, 0x3c, 0x4e, 0xa2, 0x06, 0xa4, 0xf0, 0x10, 0x6b, 0xb6, 0x45, + 0x53, 0xf0, 0x91, 0x04, 0x9a, 0xe7, 0x45, 0x58, 0xb3, 0xab, 0x65, 0x62, 0xe4, 0x7f, 0x7c, 0xb5, + 0x51, 0x62, 0xdc, 0x37, 0xf5, 0xbe, 0x6a, 0xe3, 0xbe, 0x61, 0x5f, 0x88, 0x5c, 0x5e, 0xf8, 0x6b, + 0x8c, 0x00, 0xbf, 0x40, 0xfc, 0x9c, 0x68, 0x5b, 0x67, 0xcb, 0xc7, 0x7c, 0x80, 0x7f, 0x3e, 0x7b, + 0x5f, 0x01, 0xe8, 0xc8, 0x96, 0xf4, 0xb1, 0xac, 0xd9, 0x58, 0xe1, 0x46, 0xcf, 0x74, 0x64, 0xeb, + 0x5d, 0x4a, 0x20, 0x7f, 0x9d, 0xbc, 0x1e, 0x58, 0x58, 0xe1, 0xa5, 0x87, 0xa5, 0x8e, 0x6c, 0x9d, + 0x5a, 0x58, 0xf1, 0xad, 0x72, 0xe9, 0xd1, 0x56, 0x19, 0xb4, 0x71, 0x7a, 0xc4, 0xc6, 0x3e, 0x48, + 0x96, 0xf1, 0x43, 0x32, 0x54, 0x81, 0xb4, 0x61, 0xaa, 0xba, 0xa9, 0xda, 0x17, 0xf4, 0xc7, 0xc4, + 0x45, 0x77, 0x8c, 0xae, 0x41, 0xbe, 0x8f, 0xfb, 0x86, 0xae, 0xf7, 0x24, 0xe6, 0x6c, 0xb2, 0x54, + 0x34, 0xc7, 0x89, 0x75, 0xea, 0x73, 0x3e, 0x89, 0x79, 0xa7, 0xcf, 0x83, 0xde, 0x8f, 0xd7, 0xbc, + 0xeb, 0x13, 0xcc, 0xeb, 0xa3, 0x90, 0x45, 0x8c, 0xd8, 0xd7, 0x1d, 0xff, 0xaf, 0x0c, 0x2c, 0xfc, + 0x8c, 0x16, 0xe3, 0x82, 0xb9, 0x11, 0x3a, 0x81, 0x65, 0xf7, 0xf0, 0x4b, 0x03, 0xea, 0x14, 0x9c, + 0xed, 0x3c, 0xaf, 0xf7, 0x28, 0x0d, 0x83, 0x64, 0x0b, 0xbd, 0x07, 0x4f, 0x8f, 0x78, 0x36, 0x57, + 0x75, 0x6c, 0x5e, 0x07, 0xf7, 0x54, 0xd0, 0xc1, 0x39, 0xaa, 0x3d, 0x63, 0xc5, 0x1f, 0xf1, 0xcc, + 0xed, 0x41, 0x21, 0x98, 0xe6, 0x4d, 0xfc, 0xfd, 0xd7, 0x20, 0x6f, 0x62, 0x5b, 0x56, 0x35, 0x29, + 0x50, 0x41, 0xcb, 0x31, 0x22, 0xaf, 0xcb, 0x1d, 0xc3, 0x53, 0x13, 0xd3, 0x3d, 0xf4, 0x5d, 0xc8, + 0x78, 0x99, 0x62, 0x34, 0x04, 0x3c, 0xb9, 0x45, 0x16, 0x8f, 0x57, 0xf8, 0x43, 0xd4, 0x53, 0x19, + 0x2c, 0xdb, 0xd4, 0x21, 0x65, 0x62, 0x6b, 0xd0, 0x63, 0x85, 0x94, 0xc2, 0xf6, 0xcb, 0xf3, 0x25, + 0x8a, 0x84, 0x3a, 0xe8, 0xd9, 0x22, 0x17, 0x16, 0xee, 0x43, 0x8a, 0x51, 0x50, 0x16, 0x96, 0x4e, + 0x0f, 0xf7, 0x0f, 0x8f, 0xde, 0x3d, 0x2c, 0x45, 0x10, 0x40, 0x6a, 0xa7, 0x56, 0xab, 0x1f, 0x37, + 0x4b, 0x51, 0x94, 0x81, 0xe4, 0x4e, 0xf5, 0x48, 0x6c, 0x96, 0x62, 0x84, 0x2c, 0xd6, 0xef, 0xd6, + 0x6b, 0xcd, 0x52, 0x1c, 0x2d, 0x43, 0x9e, 0x3d, 0x4b, 0xbb, 0x47, 0xe2, 0xdb, 0x3b, 0xcd, 0x52, + 0xc2, 0x47, 0x3a, 0xa9, 0x1f, 0xde, 0xa9, 0x8b, 0xa5, 0xa4, 0xf0, 0x0a, 0x5c, 0x0a, 0x4d, 0x2d, + 0xbd, 0x9a, 0x4c, 0xd4, 0x57, 0x93, 0x11, 0x7e, 0x19, 0x83, 0x4a, 0x78, 0xbe, 0x88, 0xee, 0x8e, + 0x2c, 0x7c, 0x7b, 0x81, 0x64, 0x73, 0x64, 0xf5, 0xe8, 0x39, 0x28, 0x98, 0xf8, 0x0c, 0xdb, 0xed, + 0x2e, 0xcb, 0x5f, 0x59, 0xc0, 0xcc, 0x8b, 0x79, 0x4e, 0xa5, 0x42, 0x16, 0x63, 0xfb, 0x10, 0xb7, + 0x6d, 0x89, 0xf9, 0x22, 0xb6, 0xe9, 0x32, 0x84, 0x8d, 0x50, 0x4f, 0x18, 0x51, 0xf8, 0x60, 0x21, + 0x5b, 0x66, 0x20, 0x29, 0xd6, 0x9b, 0xe2, 0x7b, 0xa5, 0x38, 0x42, 0x50, 0xa0, 0x8f, 0xd2, 0xc9, + 0xe1, 0xce, 0xf1, 0x49, 0xe3, 0x88, 0xd8, 0x72, 0x05, 0x8a, 0x8e, 0x2d, 0x1d, 0x62, 0x52, 0x78, + 0xdf, 0x8b, 0x3f, 0xbe, 0xba, 0xd4, 0x2e, 0x14, 0x46, 0xd2, 0xc5, 0xe8, 0x38, 0x9e, 0xf1, 0x0a, + 0x39, 0x6e, 0x2a, 0x28, 0xe6, 0x87, 0xfe, 0xa1, 0xf0, 0x9b, 0x28, 0x3c, 0x33, 0x25, 0xa1, 0x44, + 0xfb, 0x23, 0x96, 0xbf, 0xb5, 0x48, 0x3a, 0x3a, 0xba, 0xf1, 0x6e, 0xcf, 0x65, 0xac, 0x93, 0x83, + 0x9d, 0x93, 0x46, 0x70, 0xe3, 0x09, 0xb7, 0xe1, 0xe9, 0x90, 0x8c, 0x7f, 0x46, 0x41, 0x4c, 0xf8, + 0x5d, 0xcc, 0x2f, 0x1a, 0x4c, 0xe1, 0xd7, 0x20, 0x25, 0xb7, 0x49, 0xd2, 0x4a, 0x17, 0x97, 0x16, + 0xf9, 0x68, 0x4a, 0x9d, 0x13, 0xbd, 0x09, 0x60, 0x9f, 0x4b, 0x6c, 0x3d, 0x8e, 0x1f, 0x1a, 0xaf, + 0x08, 0xd4, 0xcf, 0x71, 0xbb, 0x79, 0xce, 0x57, 0x9f, 0xb1, 0xf9, 0x93, 0x85, 0xde, 0x9e, 0xe4, + 0x71, 0xe7, 0x6c, 0x31, 0x2c, 0xe6, 0x6b, 0x93, 0x8f, 0xe6, 0x6b, 0x85, 0x5f, 0xc4, 0x3d, 0x27, + 0x14, 0x2c, 0x68, 0x3d, 0xb6, 0xcc, 0x67, 0xc4, 0x96, 0xb1, 0x05, 0x6d, 0x39, 0x31, 0x7a, 0xc5, + 0x9f, 0x5c, 0xf4, 0x4a, 0x3c, 0x62, 0xf4, 0xf2, 0x6f, 0xaa, 0x64, 0x70, 0x53, 0x8d, 0x05, 0x9a, + 0xd4, 0x84, 0x40, 0xf3, 0x1e, 0x80, 0xaf, 0xf3, 0xb1, 0x0a, 0x49, 0x53, 0x1f, 0x68, 0x0a, 0xdd, + 0xb9, 0x49, 0x91, 0x0d, 0xd0, 0xab, 0x4e, 0x55, 0x37, 0x16, 0x12, 0x6f, 0xc8, 0xf1, 0xf4, 0x95, + 0xff, 0x78, 0x79, 0xf7, 0x21, 0x24, 0xe9, 0x3f, 0x23, 0x51, 0x90, 0x76, 0x36, 0x38, 0xac, 0x22, + 0xcf, 0xe8, 0xc7, 0x00, 0xb2, 0x6d, 0x9b, 0x6a, 0x6b, 0xe0, 0x29, 0xde, 0x98, 0xfc, 0xcf, 0x77, + 0x1c, 0xbe, 0xea, 0x65, 0xfe, 0xf3, 0x57, 0x3d, 0x51, 0xdf, 0x06, 0xf0, 0x29, 0x14, 0x0e, 0xa1, + 0x10, 0x94, 0x75, 0x80, 0x00, 0x9b, 0x43, 0x10, 0x08, 0x30, 0x5c, 0xc7, 0x81, 0x80, 0x0b, 0x23, + 0xe2, 0xac, 0x83, 0x45, 0x07, 0xc2, 0xbf, 0xa3, 0x90, 0xf3, 0x6f, 0x99, 0xff, 0xb7, 0x5c, 0x5a, + 0xf8, 0x24, 0x0a, 0x69, 0x77, 0xf1, 0x21, 0x1d, 0x24, 0xcf, 0x76, 0x31, 0x7f, 0xbf, 0x84, 0xb5, + 0xa4, 0xe2, 0x6e, 0xa3, 0xeb, 0x0d, 0xd7, 0xf9, 0x87, 0x95, 0x3e, 0xfd, 0x96, 0x76, 0x8a, 0xd5, + 0xdc, 0xd9, 0xbf, 0x01, 0x19, 0xf7, 0xd4, 0x11, 0x6c, 0x2e, 0x2b, 0x8a, 0x89, 0x2d, 0x8b, 0xc7, + 0x7d, 0x67, 0x48, 0xfb, 0x90, 0xfa, 0xc7, 0xbc, 0x19, 0x13, 0x17, 0xd9, 0x40, 0x50, 0xa0, 0x38, + 0x72, 0x64, 0xd1, 0x1b, 0xb0, 0x64, 0x0c, 0x5a, 0x92, 0xb3, 0x35, 0x46, 0x6e, 0x0a, 0x39, 0xa8, + 0x6f, 0xd0, 0xea, 0xa9, 0xed, 0x7d, 0x7c, 0xe1, 0x4c, 0xc6, 0x18, 0xb4, 0xf6, 0xd9, 0x0e, 0x62, + 0x5f, 0x89, 0xf9, 0xbf, 0xf2, 0xd3, 0x28, 0xa4, 0x9d, 0x13, 0x81, 0xbe, 0x0f, 0x19, 0xd7, 0x1d, + 0xb8, 0xfd, 0xe9, 0x50, 0x3f, 0xc2, 0xf5, 0x7b, 0x22, 0xe8, 0x06, 0x2c, 0x5b, 0x6a, 0x47, 0x73, + 0x2a, 0xf1, 0xac, 0xcc, 0x12, 0xa3, 0x5b, 0xb3, 0xc8, 0x5e, 0x1c, 0x38, 0xb5, 0x81, 0xbb, 0x89, + 0x74, 0xbc, 0x94, 0xb8, 0x9b, 0x48, 0x27, 0x4a, 0x49, 0xe1, 0x5f, 0x51, 0x48, 0x3b, 0x35, 0x74, + 0xf4, 0x8a, 0xef, 0x00, 0x16, 0x26, 0xd9, 0x9b, 0x33, 0x7a, 0xbd, 0xc5, 0xe0, 0xbc, 0x63, 0x8b, + 0xcf, 0x3b, 0xac, 0x41, 0xec, 0xb4, 0xea, 0x13, 0x0b, 0xb7, 0xea, 0x6f, 0x02, 0xb2, 0x75, 0x5b, + 0xee, 0x49, 0x43, 0xdd, 0x56, 0xb5, 0x8e, 0xc4, 0x2c, 0xcf, 0xce, 0x4a, 0x89, 0xbe, 0xb9, 0x47, + 0x5f, 0x1c, 0xbb, 0x3f, 0xc1, 0xcd, 0x70, 0x17, 0x6d, 0x15, 0xae, 0x41, 0x8a, 0x27, 0x71, 0xac, + 0x57, 0xc8, 0x47, 0x6e, 0xd7, 0x25, 0xe1, 0xeb, 0xba, 0x54, 0x20, 0xdd, 0xc7, 0xb6, 0x4c, 0x0f, + 0x3e, 0x73, 0xc0, 0xee, 0xf8, 0xc6, 0xeb, 0x90, 0xf5, 0x75, 0x6d, 0x89, 0x2f, 0x38, 0xac, 0xbf, + 0x5b, 0x8a, 0x54, 0x96, 0x3e, 0xfd, 0xfc, 0x6a, 0xfc, 0x10, 0x7f, 0x4c, 0x36, 0xb0, 0x58, 0xaf, + 0x35, 0xea, 0xb5, 0xfd, 0x52, 0xb4, 0x92, 0xfd, 0xf4, 0xf3, 0xab, 0x4b, 0x22, 0xa6, 0x25, 0xee, + 0x1b, 0x0d, 0xc8, 0xf9, 0xff, 0x4a, 0x30, 0xb5, 0x41, 0x50, 0xb8, 0x73, 0x7a, 0x7c, 0xb0, 0x57, + 0xdb, 0x69, 0xd6, 0xa5, 0x7b, 0x47, 0xcd, 0x7a, 0x29, 0x8a, 0x9e, 0x86, 0x95, 0x83, 0xbd, 0xb7, + 0x1a, 0x4d, 0xa9, 0x76, 0xb0, 0x57, 0x3f, 0x6c, 0x4a, 0x3b, 0xcd, 0xe6, 0x4e, 0x6d, 0xbf, 0x14, + 0xdb, 0xfe, 0x6d, 0x16, 0x8a, 0x3b, 0xd5, 0xda, 0x1e, 0xc9, 0x61, 0xd5, 0xb6, 0x4c, 0x4b, 0x69, + 0x35, 0x48, 0xd0, 0x62, 0xd9, 0xd4, 0x1b, 0x78, 0x95, 0xe9, 0x0d, 0x10, 0xb4, 0x0b, 0x49, 0x5a, + 0x47, 0x43, 0xd3, 0xaf, 0xe4, 0x55, 0x66, 0x74, 0x44, 0xc8, 0x64, 0xe8, 0x51, 0x99, 0x7a, 0x47, + 0xaf, 0x32, 0xbd, 0x41, 0x82, 0x0e, 0x60, 0xc9, 0x29, 0x73, 0xcc, 0xba, 0xed, 0x56, 0x99, 0xd9, + 0x69, 0x20, 0x4b, 0x63, 0xe5, 0xa8, 0xe9, 0xd7, 0xf7, 0x2a, 0x33, 0x5a, 0x27, 0x68, 0x0f, 0x52, + 0x1c, 0x09, 0xce, 0xb8, 0xb9, 0x56, 0x99, 0xd5, 0x31, 0x40, 0x22, 0x64, 0xbc, 0x42, 0xdf, 0xec, + 0x4b, 0x89, 0x95, 0x39, 0xba, 0x42, 0xe8, 0x3e, 0xe4, 0x83, 0xe8, 0x72, 0xbe, 0xdb, 0x71, 0x95, + 0x39, 0x7b, 0x13, 0x44, 0x7f, 0x10, 0x6a, 0xce, 0x77, 0x5b, 0xae, 0x32, 0x67, 0xab, 0x02, 0x7d, + 0x08, 0xcb, 0xe3, 0x50, 0x70, 0xfe, 0xcb, 0x73, 0x95, 0x05, 0x9a, 0x17, 0xa8, 0x0f, 0x68, 0x02, + 0x84, 0x5c, 0xe0, 0x2e, 0x5d, 0x65, 0x91, 0x5e, 0x06, 0x52, 0xa0, 0x38, 0x0a, 0x49, 0xe6, 0xbd, + 0x5b, 0x57, 0x99, 0xbb, 0xaf, 0xc1, 0xbe, 0x12, 0x44, 0x2f, 0xf3, 0xde, 0xb5, 0xab, 0xcc, 0xdd, + 0xe6, 0x40, 0xa7, 0x00, 0x3e, 0x8c, 0x39, 0xc7, 0xdd, 0xbb, 0xca, 0x3c, 0x0d, 0x0f, 0x64, 0xc0, + 0xca, 0x24, 0x6c, 0xb9, 0xc8, 0x55, 0xbc, 0xca, 0x42, 0x7d, 0x10, 0xb2, 0x9f, 0x83, 0xa8, 0x65, + 0xbe, 0xab, 0x79, 0x95, 0x39, 0x1b, 0x22, 0xd5, 0xfa, 0x17, 0x5f, 0xaf, 0x47, 0xbf, 0xfc, 0x7a, + 0x3d, 0xfa, 0xf7, 0xaf, 0xd7, 0xa3, 0x9f, 0x7d, 0xb3, 0x1e, 0xf9, 0xf2, 0x9b, 0xf5, 0xc8, 0x5f, + 0xbe, 0x59, 0x8f, 0xfc, 0xf0, 0xa5, 0x8e, 0x6a, 0x77, 0x07, 0xad, 0xcd, 0xb6, 0xde, 0xdf, 0xf2, + 0xdf, 0xd2, 0x9e, 0x74, 0x73, 0xbc, 0x95, 0xa2, 0xd1, 0xf4, 0xd6, 0x7f, 0x03, 0x00, 0x00, 0xff, + 0xff, 0x8d, 0xc9, 0xd7, 0xa0, 0x59, 0x2e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -7382,10 +7380,10 @@ func (m *ResponseFinalizeBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x12 } } - if len(m.BlockEvents) > 0 { - for iNdEx := len(m.BlockEvents) - 1; iNdEx >= 0; iNdEx-- { + if len(m.Events) > 0 { + for iNdEx := len(m.Events) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.BlockEvents[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Events[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -7559,10 +7557,10 @@ func (m *ExecTxResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x42 } - if len(m.TxEvents) > 0 { - for iNdEx := len(m.TxEvents) - 1; iNdEx >= 0; iNdEx-- { + if len(m.Events) > 0 { + for iNdEx := len(m.Events) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.TxEvents[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Events[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -9151,8 +9149,8 @@ func (m *ResponseFinalizeBlock) Size() (n int) { } var l int _ = l - if len(m.BlockEvents) > 0 { - for _, e := range m.BlockEvents { + if len(m.Events) > 0 { + for _, e := range m.Events { l = e.Size() n += 1 + l + sovTypes(uint64(l)) } @@ -9267,8 +9265,8 @@ func (m *ExecTxResult) Size() (n int) { if m.GasUsed != 0 { n += 1 + sovTypes(uint64(m.GasUsed)) } - if len(m.TxEvents) > 0 { - for _, e := range m.TxEvents { + if len(m.Events) > 0 { + for _, e := range m.Events { l = e.Size() n += 1 + l + sovTypes(uint64(l)) } @@ -15899,7 +15897,7 @@ func (m *ResponseFinalizeBlock) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockEvents", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Events", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -15926,8 +15924,8 @@ func (m *ResponseFinalizeBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.BlockEvents = append(m.BlockEvents, Event{}) - if err := m.BlockEvents[len(m.BlockEvents)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Events = append(m.Events, Event{}) + if err := m.Events[len(m.Events)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -16648,7 +16646,7 @@ func (m *ExecTxResult) Unmarshal(dAtA []byte) error { } case 7: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxEvents", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Events", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -16675,8 +16673,8 @@ func (m *ExecTxResult) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.TxEvents = append(m.TxEvents, Event{}) - if err := m.TxEvents[len(m.TxEvents)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Events = append(m.Events, Event{}) + if err := m.Events[len(m.Events)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/internal/eventbus/event_bus.go b/internal/eventbus/event_bus.go index eebeac214..1d2d510e3 100644 --- a/internal/eventbus/event_bus.go +++ b/internal/eventbus/event_bus.go @@ -82,7 +82,7 @@ func (b *EventBus) Publish(ctx context.Context, eventValue string, eventData typ } func (b *EventBus) PublishEventNewBlock(ctx context.Context, data types.EventDataNewBlock) error { - events := data.ResultFinalizeBlock.BlockEvents + events := data.ResultFinalizeBlock.Events // add Tendermint-reserved new block event events = append(events, types.EventNewBlock) @@ -93,7 +93,7 @@ func (b *EventBus) PublishEventNewBlock(ctx context.Context, data types.EventDat func (b *EventBus) PublishEventNewBlockHeader(ctx context.Context, data types.EventDataNewBlockHeader) error { // no explicit deadline for publishing events - events := data.ResultFinalizeBlock.BlockEvents + events := data.ResultFinalizeBlock.Events // add Tendermint-reserved new block header event events = append(events, types.EventNewBlockHeader) @@ -125,7 +125,7 @@ func (b *EventBus) PublishEventStateSyncStatus(ctx context.Context, data types.E // predefined keys (EventTypeKey, TxHashKey). Existing events with the same keys // will be overwritten. func (b *EventBus) PublishEventTx(ctx context.Context, data types.EventDataTx) error { - events := data.Result.TxEvents + events := data.Result.Events // add Tendermint-reserved events events = append(events, types.EventTx) diff --git a/internal/eventbus/event_bus_test.go b/internal/eventbus/event_bus_test.go index b582317cf..3ef96b80b 100644 --- a/internal/eventbus/event_bus_test.go +++ b/internal/eventbus/event_bus_test.go @@ -29,7 +29,7 @@ func TestEventBusPublishEventTx(t *testing.T) { tx := types.Tx("foo") result := abci.ExecTxResult{ Data: []byte("bar"), - TxEvents: []abci.Event{ + Events: []abci.Event{ {Type: "testType", Attributes: []abci.EventAttribute{{Key: "baz", Value: "1"}}}, }, } @@ -84,7 +84,7 @@ func TestEventBusPublishEventNewBlock(t *testing.T) { require.NoError(t, err) blockID := types.BlockID{Hash: block.Hash(), PartSetHeader: bps.Header()} resultFinalizeBlock := abci.ResponseFinalizeBlock{ - BlockEvents: []abci.Event{ + Events: []abci.Event{ {Type: "testType", Attributes: []abci.EventAttribute{ {Key: "baz", Value: "1"}, {Key: "foz", Value: "2"}, @@ -136,7 +136,7 @@ func TestEventBusPublishEventTxDuplicateKeys(t *testing.T) { tx := types.Tx("foo") result := abci.ExecTxResult{ Data: []byte("bar"), - TxEvents: []abci.Event{ + Events: []abci.Event{ { Type: "transfer", Attributes: []abci.EventAttribute{ @@ -253,7 +253,7 @@ func TestEventBusPublishEventNewBlockHeader(t *testing.T) { block := types.MakeBlock(0, []types.Tx{}, nil, []types.Evidence{}) resultFinalizeBlock := abci.ResponseFinalizeBlock{ - BlockEvents: []abci.Event{ + Events: []abci.Event{ {Type: "testType", Attributes: []abci.EventAttribute{ {Key: "baz", Value: "1"}, {Key: "foz", Value: "2"}, diff --git a/internal/rpc/core/blocks.go b/internal/rpc/core/blocks.go index d17e50cc1..427e691da 100644 --- a/internal/rpc/core/blocks.go +++ b/internal/rpc/core/blocks.go @@ -214,7 +214,7 @@ func (env *Environment) BlockResults(ctx context.Context, heightPtr *int64) (*co Height: height, TxsResults: results.FinalizeBlock.TxResults, TotalGasUsed: totalGasUsed, - FinalizeBlockEvents: results.FinalizeBlock.BlockEvents, + FinalizeBlockEvents: results.FinalizeBlock.Events, ValidatorUpdates: results.FinalizeBlock.ValidatorUpdates, ConsensusParamUpdates: results.FinalizeBlock.ConsensusParamUpdates, }, nil diff --git a/internal/rpc/core/blocks_test.go b/internal/rpc/core/blocks_test.go index 3c2316e11..c48ac4c48 100644 --- a/internal/rpc/core/blocks_test.go +++ b/internal/rpc/core/blocks_test.go @@ -101,7 +101,7 @@ func TestBlockResults(t *testing.T) { Height: 100, TxsResults: results.FinalizeBlock.TxResults, TotalGasUsed: 15, - FinalizeBlockEvents: results.FinalizeBlock.BlockEvents, + FinalizeBlockEvents: results.FinalizeBlock.Events, ValidatorUpdates: results.FinalizeBlock.ValidatorUpdates, ConsensusParamUpdates: results.FinalizeBlock.ConsensusParamUpdates, }}, diff --git a/internal/state/helpers_test.go b/internal/state/helpers_test.go index 7cfdc85ed..cbb547237 100644 --- a/internal/state/helpers_test.go +++ b/internal/state/helpers_test.go @@ -312,7 +312,7 @@ func (app *testApp) FinalizeBlock(req abci.RequestFinalizeBlock) abci.ResponseFi AppVersion: 1, }, }, - BlockEvents: []abci.Event{}, + Events: []abci.Event{}, TxResults: resTxs, } } diff --git a/internal/state/indexer/block/kv/kv.go b/internal/state/indexer/block/kv/kv.go index f1fd606e4..5356b4c07 100644 --- a/internal/state/indexer/block/kv/kv.go +++ b/internal/state/indexer/block/kv/kv.go @@ -65,7 +65,7 @@ func (idx *BlockerIndexer) Index(bh types.EventDataNewBlockHeader) error { } // 2. index FinalizeBlock events - if err := idx.indexEvents(batch, bh.ResultFinalizeBlock.BlockEvents, types.EventTypeFinalizeBlock, height); err != nil { + if err := idx.indexEvents(batch, bh.ResultFinalizeBlock.Events, types.EventTypeFinalizeBlock, height); err != nil { return fmt.Errorf("failed to index FinalizeBlock events: %w", err) } diff --git a/internal/state/indexer/block/kv/kv_test.go b/internal/state/indexer/block/kv/kv_test.go index b3a73be20..0bca43848 100644 --- a/internal/state/indexer/block/kv/kv_test.go +++ b/internal/state/indexer/block/kv/kv_test.go @@ -21,7 +21,7 @@ func TestBlockIndexer(t *testing.T) { require.NoError(t, indexer.Index(types.EventDataNewBlockHeader{ Header: types.Header{Height: 1}, ResultFinalizeBlock: abci.ResponseFinalizeBlock{ - BlockEvents: []abci.Event{ + Events: []abci.Event{ { Type: "finalize_event1", Attributes: []abci.EventAttribute{ @@ -54,7 +54,7 @@ func TestBlockIndexer(t *testing.T) { require.NoError(t, indexer.Index(types.EventDataNewBlockHeader{ Header: types.Header{Height: int64(i)}, ResultFinalizeBlock: abci.ResponseFinalizeBlock{ - BlockEvents: []abci.Event{ + Events: []abci.Event{ { Type: "finalize_event1", Attributes: []abci.EventAttribute{ diff --git a/internal/state/indexer/sink/kv/kv_test.go b/internal/state/indexer/sink/kv/kv_test.go index c178e6cb7..2c8296c54 100644 --- a/internal/state/indexer/sink/kv/kv_test.go +++ b/internal/state/indexer/sink/kv/kv_test.go @@ -35,7 +35,7 @@ func TestBlockFuncs(t *testing.T) { require.NoError(t, indexer.IndexBlockEvents(types.EventDataNewBlockHeader{ Header: types.Header{Height: 1}, ResultFinalizeBlock: abci.ResponseFinalizeBlock{ - BlockEvents: []abci.Event{ + Events: []abci.Event{ { Type: "finalize_eventA", Attributes: []abci.EventAttribute{ @@ -73,7 +73,7 @@ func TestBlockFuncs(t *testing.T) { require.NoError(t, indexer.IndexBlockEvents(types.EventDataNewBlockHeader{ Header: types.Header{Height: int64(i)}, ResultFinalizeBlock: abci.ResponseFinalizeBlock{ - BlockEvents: []abci.Event{ + Events: []abci.Event{ { Type: "finalize_eventA", Attributes: []abci.EventAttribute{ @@ -342,7 +342,7 @@ func txResultWithEvents(events []abci.Event) *abci.TxResult { Data: []byte{0}, Code: abci.CodeTypeOK, Log: "", - TxEvents: events, + Events: events, }, } } diff --git a/internal/state/indexer/sink/psql/psql.go b/internal/state/indexer/sink/psql/psql.go index 9670d6c13..c06383264 100644 --- a/internal/state/indexer/sink/psql/psql.go +++ b/internal/state/indexer/sink/psql/psql.go @@ -170,7 +170,7 @@ INSERT INTO `+tableBlocks+` (height, chain_id, created_at) return fmt.Errorf("block meta-events: %w", err) } // Insert all the block events. Order is important here, - if err := insertEvents(dbtx, blockID, 0, h.ResultFinalizeBlock.BlockEvents); err != nil { + if err := insertEvents(dbtx, blockID, 0, h.ResultFinalizeBlock.Events); err != nil { return fmt.Errorf("finalize-block events: %w", err) } return nil @@ -221,7 +221,7 @@ INSERT INTO `+tableTxResults+` (block_id, index, created_at, tx_hash, tx_result) return fmt.Errorf("indexing transaction meta-events: %w", err) } // Index any events packaged with the transaction. - if err := insertEvents(dbtx, blockID, txID, txr.Result.TxEvents); err != nil { + if err := insertEvents(dbtx, blockID, txID, txr.Result.Events); err != nil { return fmt.Errorf("indexing transaction events: %w", err) } return nil diff --git a/internal/state/indexer/sink/psql/psql_test.go b/internal/state/indexer/sink/psql/psql_test.go index 5b38e35c0..c0771966d 100644 --- a/internal/state/indexer/sink/psql/psql_test.go +++ b/internal/state/indexer/sink/psql/psql_test.go @@ -221,7 +221,7 @@ func newTestBlockHeader() types.EventDataNewBlockHeader { return types.EventDataNewBlockHeader{ Header: types.Header{Height: 1}, ResultFinalizeBlock: abci.ResponseFinalizeBlock{ - BlockEvents: []abci.Event{ + Events: []abci.Event{ makeIndexedEvent("finalize_event.proposer", "FCAA001"), makeIndexedEvent("thingy.whatzit", "O.O"), makeIndexedEvent("my_event.foo", "100"), @@ -269,7 +269,7 @@ func txResultWithEvents(events []abci.Event) *abci.TxResult { Data: []byte{0}, Code: abci.CodeTypeOK, Log: "", - TxEvents: events, + Events: events, }, } } diff --git a/internal/state/indexer/tx/kv/kv.go b/internal/state/indexer/tx/kv/kv.go index 0e0c83c70..108700523 100644 --- a/internal/state/indexer/tx/kv/kv.go +++ b/internal/state/indexer/tx/kv/kv.go @@ -97,7 +97,7 @@ func (txi *TxIndex) Index(results []*abci.TxResult) error { } func (txi *TxIndex) indexEvents(result *abci.TxResult, hash []byte, store dbm.Batch) error { - for _, event := range result.Result.TxEvents { + for _, event := range result.Result.Events { // only index events with a non-empty type if len(event.Type) == 0 { continue diff --git a/internal/state/indexer/tx/kv/kv_bench_test.go b/internal/state/indexer/tx/kv/kv_bench_test.go index 4d8aee794..1c3f0c314 100644 --- a/internal/state/indexer/tx/kv/kv_bench_test.go +++ b/internal/state/indexer/tx/kv/kv_bench_test.go @@ -47,7 +47,7 @@ func BenchmarkTxSearch(b *testing.B) { Data: []byte{0}, Code: abci.CodeTypeOK, Log: "", - TxEvents: events, + Events: events, }, } diff --git a/internal/state/indexer/tx/kv/kv_test.go b/internal/state/indexer/tx/kv/kv_test.go index 8b92cb2d7..c77a94686 100644 --- a/internal/state/indexer/tx/kv/kv_test.go +++ b/internal/state/indexer/tx/kv/kv_test.go @@ -27,7 +27,7 @@ func TestTxIndex(t *testing.T) { Tx: tx, Result: abci.ExecTxResult{ Data: []byte{0}, - Code: abci.CodeTypeOK, Log: "", TxEvents: nil, + Code: abci.CodeTypeOK, Log: "", Events: nil, }, } hash := tx.Hash() @@ -50,7 +50,7 @@ func TestTxIndex(t *testing.T) { Tx: tx2, Result: abci.ExecTxResult{ Data: []byte{0}, - Code: abci.CodeTypeOK, Log: "", TxEvents: nil, + Code: abci.CodeTypeOK, Log: "", Events: nil, }, } hash2 := tx2.Hash() @@ -326,7 +326,7 @@ func txResultWithEvents(events []abci.Event) *abci.TxResult { Data: []byte{0}, Code: abci.CodeTypeOK, Log: "", - TxEvents: events, + Events: events, }, } } @@ -350,7 +350,7 @@ func benchmarkTxIndex(txsCount int64, b *testing.B) { Data: []byte{0}, Code: abci.CodeTypeOK, Log: "", - TxEvents: []abci.Event{}, + Events: []abci.Event{}, }, } if err := batch.Add(txResult); err != nil { diff --git a/internal/state/state_test.go b/internal/state/state_test.go index 6a9f01511..9c2f6e3db 100644 --- a/internal/state/state_test.go +++ b/internal/state/state_test.go @@ -111,8 +111,8 @@ func TestABCIResponsesSaveLoad1(t *testing.T) { abciResponses.FinalizeBlock = new(abci.ResponseFinalizeBlock) abciResponses.FinalizeBlock.TxResults = dtxs - abciResponses.FinalizeBlock.TxResults[0] = &abci.ExecTxResult{Data: []byte("foo"), TxEvents: nil} - abciResponses.FinalizeBlock.TxResults[1] = &abci.ExecTxResult{Data: []byte("bar"), Log: "ok", TxEvents: nil} + abciResponses.FinalizeBlock.TxResults[0] = &abci.ExecTxResult{Data: []byte("foo"), Events: nil} + abciResponses.FinalizeBlock.TxResults[1] = &abci.ExecTxResult{Data: []byte("bar"), Log: "ok", Events: nil} pbpk, err := encoding.PubKeyToProto(ed25519.GenPrivKey().PubKey()) require.NoError(t, err) abciResponses.FinalizeBlock.ValidatorUpdates = []abci.ValidatorUpdate{{PubKey: pbpk, Power: 10}} @@ -156,7 +156,7 @@ func TestABCIResponsesSaveLoad2(t *testing.T) { {Code: 383}, { Data: []byte("Gotcha!"), - TxEvents: []abci.Event{ + Events: []abci.Event{ {Type: "type1", Attributes: []abci.EventAttribute{{Key: "a", Value: "1"}}}, {Type: "type2", Attributes: []abci.EventAttribute{{Key: "build", Value: "stuff"}}}, }, @@ -164,7 +164,7 @@ func TestABCIResponsesSaveLoad2(t *testing.T) { }, []*abci.ExecTxResult{ {Code: 383, Data: nil}, - {Code: 0, Data: []byte("Gotcha!"), TxEvents: []abci.Event{ + {Code: 0, Data: []byte("Gotcha!"), Events: []abci.Event{ {Type: "type1", Attributes: []abci.EventAttribute{{Key: "a", Value: "1"}}}, {Type: "type2", Attributes: []abci.EventAttribute{{Key: "build", Value: "stuff"}}}, }}, diff --git a/light/rpc/client.go b/light/rpc/client.go index c9b195a0f..54b0a6258 100644 --- a/light/rpc/client.go +++ b/light/rpc/client.go @@ -452,7 +452,7 @@ func (c *Client) BlockResults(ctx context.Context, height *int64) (*coretypes.Re // proto-encode FinalizeBlock events bbeBytes, err := proto.Marshal(&abci.ResponseFinalizeBlock{ - BlockEvents: res.FinalizeBlockEvents, + Events: res.FinalizeBlockEvents, }) if err != nil { return nil, err diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 6ee25c658..26f264958 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -342,7 +342,7 @@ message ResponseVerifyVoteExtension { } message ResponseFinalizeBlock { - repeated Event block_events = 1 + repeated Event events = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; repeated ExecTxResult tx_results = 2; repeated ValidatorUpdate validator_updates = 3; @@ -389,7 +389,7 @@ message ExecTxResult { string info = 4; // nondeterministic int64 gas_wanted = 5; int64 gas_used = 6; - repeated Event tx_events = 7 + repeated Event events = 7 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; // nondeterministic string codespace = 8; } diff --git a/proto/tendermint/abci/types.proto.intermediate b/proto/tendermint/abci/types.proto.intermediate index c913c73ab..b84f4c910 100644 --- a/proto/tendermint/abci/types.proto.intermediate +++ b/proto/tendermint/abci/types.proto.intermediate @@ -342,7 +342,7 @@ message ResponseProcessProposal { } message ResponseFinalizeBlock { - repeated Event block_events = 1 + repeated Event events = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; repeated ExecTxResult tx_results = 2; repeated ValidatorUpdate validator_updates = 3 [(gogoproto.nullable) = false]; @@ -384,7 +384,7 @@ message ExecTxResult { string info = 4; // nondeterministic int64 gas_wanted = 5; int64 gas_used = 6; - repeated Event tx_events = 7 + repeated Event events = 7 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; // nondeterministic string codespace = 8; } diff --git a/spec/abci++/abci++_methods_002_draft.md b/spec/abci++/abci++_methods_002_draft.md index 833ddae31..5f811a03f 100644 --- a/spec/abci++/abci++_methods_002_draft.md +++ b/spec/abci++/abci++_methods_002_draft.md @@ -588,7 +588,7 @@ from this condition, but not sure), and _p_ receives a Precommit message for rou | Name | Type | Description | Field Number | |-------------------------|-------------------------------------------------------------|----------------------------------------------------------------------------------|--------------| - | block_events | repeated [Event](abci++_basic_concepts_002_draft.md#events) | Type & Key-Value events for indexing | 1 | + | events | repeated [Event](abci++_basic_concepts_002_draft.md#events) | Type & Key-Value events for indexing | 1 | | tx_results | repeated [ExecTxResult](#txresult) | List of structures containing the data resulting from executing the transactions | 2 | | validator_updates | repeated [ValidatorUpdate](#validatorupdate) | Changes to validator set (set voting power to 0 to remove). | 3 | | consensus_param_updates | [ConsensusParams](#consensusparams) | Changes to consensus-critical gas, size, and other parameters. | 4 | @@ -832,7 +832,7 @@ Most of the data structures used in ABCI are shared [common data structures](../ | info | string | Additional information. **May be non-deterministic.** | 4 | | gas_wanted | int64 | Amount of gas requested for transaction. | 5 | | gas_used | int64 | Amount of gas consumed by transaction. | 6 | - | tx_events | repeated [Event](abci++_basic_concepts_002_draft.md#events) | Type & Key-Value events for indexing transactions (e.g. by account). | 7 | + | events | repeated [Event](abci++_basic_concepts_002_draft.md#events) | Type & Key-Value events for indexing transactions (e.g. by account). | 7 | | codespace | string | Namespace for the `code`. | 8 | ### TxAction diff --git a/test/e2e/app/app.go b/test/e2e/app/app.go index 53d0a6e46..e0c080f87 100644 --- a/test/e2e/app/app.go +++ b/test/e2e/app/app.go @@ -178,7 +178,7 @@ func (app *Application) FinalizeBlock(req abci.RequestFinalizeBlock) abci.Respon return abci.ResponseFinalizeBlock{ TxResults: txs, ValidatorUpdates: valUpdates, - BlockEvents: []abci.Event{ + Events: []abci.Event{ { Type: "val_updates", Attributes: []abci.EventAttribute{ diff --git a/types/events.go b/types/events.go index 2d2b0e9bd..cd535e71b 100644 --- a/types/events.go +++ b/types/events.go @@ -132,7 +132,7 @@ type EventDataNewBlock struct { func (EventDataNewBlock) TypeTag() string { return "tendermint/event/NewBlock" } // ABCIEvents implements the eventlog.ABCIEventer interface. -func (e EventDataNewBlock) ABCIEvents() []abci.Event { return e.ResultFinalizeBlock.BlockEvents } +func (e EventDataNewBlock) ABCIEvents() []abci.Event { return e.ResultFinalizeBlock.Events } type EventDataNewBlockHeader struct { Header Header `json:"header"` @@ -145,7 +145,7 @@ type EventDataNewBlockHeader struct { func (EventDataNewBlockHeader) TypeTag() string { return "tendermint/event/NewBlockHeader" } // ABCIEvents implements the eventlog.ABCIEventer interface. -func (e EventDataNewBlockHeader) ABCIEvents() []abci.Event { return e.ResultFinalizeBlock.BlockEvents } +func (e EventDataNewBlockHeader) ABCIEvents() []abci.Event { return e.ResultFinalizeBlock.Events } type EventDataNewEvidence struct { Evidence Evidence `json:"evidence"` @@ -170,7 +170,7 @@ func (e EventDataTx) ABCIEvents() []abci.Event { eventWithAttr(TxHashKey, fmt.Sprintf("%X", Tx(e.Tx).Hash())), eventWithAttr(TxHeightKey, fmt.Sprintf("%d", e.Height)), } - return append(base, e.Result.TxEvents...) + return append(base, e.Result.Events...) } // NOTE: This goes into the replay WAL