diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md index 9350d70b7..f16a21aa4 100644 --- a/CHANGELOG_PENDING.md +++ b/CHANGELOG_PENDING.md @@ -27,7 +27,7 @@ Special thanks to external contributors on this release: - [tendermint/spec] \#7804 Migrate spec from [spec repo](https://github.com/tendermint/spec). - [abci] \#7984 Remove the locks preventing concurrent use of ABCI applications by Tendermint. (@tychoish) - - [abci] \#8605 Remove info, log, events and gasUsed fields from ResponseCheckTx as they are not used by Tendermint. (@jmalicevic) + - [abci] \#8605 Remove info, log, events, gasUsed and mempoolError fields from ResponseCheckTx as they are not used by Tendermint. (@jmalicevic) - P2P Protocol diff --git a/UPGRADING.md b/UPGRADING.md index 324a891d5..43caddb6b 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -6,6 +6,14 @@ This guide provides instructions for upgrading to specific versions of Tendermin ### ABCI Changes +### ResponseCheckTx Parameter Change + +`ResponseCheckTx` had fields that are not used by Tendermint, they are now removed. +In 0.36, we removed the following fields, from `ResponseCheckTx`: `Log`, `Info`, `Events`, + `GasUsed` and `MempoolError`. +`MempoolError` was used to signal to operators that a transaction was rejected from the mempool +by Tendermint itself. Right now, we return a regular error when this happens. + #### ABCI++ Coming soon... @@ -137,7 +145,7 @@ network-wide coordinated variable so that applications can be written knowing either all nodes agree on whether to run `RecheckTx`. Applications can turn on `RecheckTx` by altering the `ConsensusParams` in the -`FinalizeBlock` ABCI response. +`FinalizeBlock` ABCI response. ### CLI Changes diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 47e346298..5b43a74ce 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -2487,8 +2487,6 @@ type ResponseCheckTx struct { Codespace string `protobuf:"bytes,8,opt,name=codespace,proto3" json:"codespace,omitempty"` Sender string `protobuf:"bytes,9,opt,name=sender,proto3" json:"sender,omitempty"` Priority int64 `protobuf:"varint,10,opt,name=priority,proto3" json:"priority,omitempty"` - // ABCI applications creating a ResponseCheckTX should not set mempool_error. - MempoolError string `protobuf:"bytes,11,opt,name=mempool_error,json=mempoolError,proto3" json:"mempool_error,omitempty"` } func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } @@ -2566,13 +2564,6 @@ func (m *ResponseCheckTx) GetPriority() int64 { return 0 } -func (m *ResponseCheckTx) GetMempoolError() string { - if m != nil { - return m.MempoolError - } - return "" -} - type ResponseDeliverTx struct { Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` @@ -4203,225 +4194,224 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 3474 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcb, 0x73, 0x23, 0xd5, - 0xd5, 0xd7, 0xfb, 0x71, 0x64, 0x49, 0xed, 0x6b, 0x33, 0x68, 0xc4, 0x8c, 0x3d, 0xf4, 0x14, 0x30, - 0x33, 0x80, 0x87, 0xcf, 0xf3, 0x0d, 0x0c, 0xdf, 0xc0, 0x47, 0xd9, 0xb2, 0x06, 0x79, 0xc6, 0x63, - 0x9b, 0xb6, 0x6c, 0x8a, 0x3c, 0xa6, 0x69, 0x49, 0xd7, 0x56, 0x33, 0x92, 0xba, 0xe9, 0x6e, 0x19, - 0x99, 0x65, 0x28, 0x36, 0x54, 0xaa, 0xc2, 0x26, 0x95, 0xa4, 0x2a, 0xec, 0x92, 0xaa, 0xe4, 0x3f, - 0xc8, 0x2a, 0xab, 0x2c, 0x58, 0x64, 0xc1, 0x2a, 0xc9, 0x8a, 0xa4, 0x60, 0x91, 0xaa, 0xfc, 0x03, - 0xd9, 0x25, 0xa9, 0xfb, 0xe8, 0x97, 0xd4, 0x2d, 0xb5, 0x18, 0xa0, 0x2a, 0x55, 0xec, 0x74, 0x4f, - 0x9f, 0x73, 0xfa, 0x3e, 0xce, 0x3d, 0x8f, 0xdf, 0x69, 0xc1, 0x13, 0x16, 0x1e, 0x74, 0xb0, 0xd1, - 0x57, 0x07, 0xd6, 0x75, 0xa5, 0xd5, 0x56, 0xaf, 0x5b, 0x67, 0x3a, 0x36, 0xd7, 0x74, 0x43, 0xb3, - 0x34, 0x54, 0x76, 0x1f, 0xae, 0x91, 0x87, 0xd5, 0x8b, 0x1e, 0xee, 0xb6, 0x71, 0xa6, 0x5b, 0xda, - 0x75, 0xdd, 0xd0, 0xb4, 0x63, 0xc6, 0x5f, 0xbd, 0xe0, 0x79, 0x4c, 0xf5, 0x78, 0xb5, 0xf9, 0x9e, - 0x72, 0xe1, 0x87, 0xf8, 0xcc, 0x7e, 0x7a, 0x71, 0x42, 0x56, 0x57, 0x0c, 0xa5, 0x6f, 0x3f, 0x5e, - 0x3d, 0xd1, 0xb4, 0x93, 0x1e, 0xbe, 0x4e, 0x47, 0xad, 0xe1, 0xf1, 0x75, 0x4b, 0xed, 0x63, 0xd3, - 0x52, 0xfa, 0x3a, 0x67, 0x58, 0x3e, 0xd1, 0x4e, 0x34, 0xfa, 0xf3, 0x3a, 0xf9, 0xc5, 0xa8, 0xe2, - 0xbf, 0x01, 0xb2, 0x12, 0x7e, 0x77, 0x88, 0x4d, 0x0b, 0xad, 0x43, 0x0a, 0xb7, 0xbb, 0x5a, 0x25, - 0x7e, 0x29, 0x7e, 0xa5, 0xb0, 0x7e, 0x61, 0x6d, 0x6c, 0x71, 0x6b, 0x9c, 0xaf, 0xde, 0xee, 0x6a, - 0x8d, 0x98, 0x44, 0x79, 0xd1, 0x4d, 0x48, 0x1f, 0xf7, 0x86, 0x66, 0xb7, 0x92, 0xa0, 0x42, 0x17, - 0xc3, 0x84, 0xee, 0x10, 0xa6, 0x46, 0x4c, 0x62, 0xdc, 0xe4, 0x55, 0xea, 0xe0, 0x58, 0xab, 0x24, - 0xa7, 0xbf, 0x6a, 0x7b, 0x70, 0x4c, 0x5f, 0x45, 0x78, 0xd1, 0x26, 0x80, 0x3a, 0x50, 0x2d, 0xb9, - 0xdd, 0x55, 0xd4, 0x41, 0x25, 0x45, 0x25, 0x9f, 0x0c, 0x97, 0x54, 0xad, 0x1a, 0x61, 0x6c, 0xc4, - 0xa4, 0xbc, 0x6a, 0x0f, 0xc8, 0x74, 0xdf, 0x1d, 0x62, 0xe3, 0xac, 0x92, 0x9e, 0x3e, 0xdd, 0x37, - 0x08, 0x13, 0x99, 0x2e, 0xe5, 0x46, 0xdb, 0x50, 0x68, 0xe1, 0x13, 0x75, 0x20, 0xb7, 0x7a, 0x5a, - 0xfb, 0x61, 0x25, 0x43, 0x85, 0xc5, 0x30, 0xe1, 0x4d, 0xc2, 0xba, 0x49, 0x38, 0x37, 0x13, 0x95, - 0x78, 0x23, 0x26, 0x41, 0xcb, 0xa1, 0xa0, 0x57, 0x20, 0xd7, 0xee, 0xe2, 0xf6, 0x43, 0xd9, 0x1a, - 0x55, 0xb2, 0x54, 0xcf, 0x6a, 0x98, 0x9e, 0x1a, 0xe1, 0x6b, 0x8e, 0x1a, 0x31, 0x29, 0xdb, 0x66, - 0x3f, 0xd1, 0x1d, 0x80, 0x0e, 0xee, 0xa9, 0xa7, 0xd8, 0x20, 0xf2, 0xb9, 0xe9, 0x7b, 0xb0, 0xc5, - 0x38, 0x9b, 0x23, 0x3e, 0x8d, 0x7c, 0xc7, 0x26, 0xa0, 0x1a, 0xe4, 0xf1, 0xa0, 0xc3, 0x97, 0x93, - 0xa7, 0x6a, 0x2e, 0x85, 0x9e, 0xf7, 0xa0, 0xe3, 0x5d, 0x4c, 0x0e, 0xf3, 0x31, 0xba, 0x05, 0x99, - 0xb6, 0xd6, 0xef, 0xab, 0x56, 0x05, 0xa8, 0x86, 0x95, 0xd0, 0x85, 0x50, 0xae, 0x46, 0x4c, 0xe2, - 0xfc, 0x68, 0x17, 0x4a, 0x3d, 0xd5, 0xb4, 0x64, 0x73, 0xa0, 0xe8, 0x66, 0x57, 0xb3, 0xcc, 0x4a, - 0x81, 0x6a, 0x78, 0x2a, 0x4c, 0xc3, 0x8e, 0x6a, 0x5a, 0x07, 0x36, 0x73, 0x23, 0x26, 0x15, 0x7b, - 0x5e, 0x02, 0xd1, 0xa7, 0x1d, 0x1f, 0x63, 0xc3, 0x51, 0x58, 0x59, 0x98, 0xae, 0x6f, 0x8f, 0x70, - 0xdb, 0xf2, 0x44, 0x9f, 0xe6, 0x25, 0xa0, 0xef, 0xc3, 0x52, 0x4f, 0x53, 0x3a, 0x8e, 0x3a, 0xb9, - 0xdd, 0x1d, 0x0e, 0x1e, 0x56, 0x8a, 0x54, 0xe9, 0xd5, 0xd0, 0x49, 0x6a, 0x4a, 0xc7, 0x56, 0x51, - 0x23, 0x02, 0x8d, 0x98, 0xb4, 0xd8, 0x1b, 0x27, 0xa2, 0x07, 0xb0, 0xac, 0xe8, 0x7a, 0xef, 0x6c, - 0x5c, 0x7b, 0x89, 0x6a, 0xbf, 0x16, 0xa6, 0x7d, 0x83, 0xc8, 0x8c, 0xab, 0x47, 0xca, 0x04, 0x15, - 0x35, 0x41, 0xd0, 0x0d, 0xac, 0x2b, 0x06, 0x96, 0x75, 0x43, 0xd3, 0x35, 0x53, 0xe9, 0x55, 0xca, - 0x54, 0xf7, 0x33, 0x61, 0xba, 0xf7, 0x19, 0xff, 0x3e, 0x67, 0x6f, 0xc4, 0xa4, 0xb2, 0xee, 0x27, - 0x31, 0xad, 0x5a, 0x1b, 0x9b, 0xa6, 0xab, 0x55, 0x98, 0xa5, 0x95, 0xf2, 0xfb, 0xb5, 0xfa, 0x48, - 0xa8, 0x0e, 0x05, 0x3c, 0x22, 0xe2, 0xf2, 0xa9, 0x66, 0xe1, 0xca, 0xe2, 0xf4, 0x8b, 0x55, 0xa7, - 0xac, 0x47, 0x9a, 0x85, 0xc9, 0xa5, 0xc2, 0xce, 0x08, 0x29, 0xf0, 0xd8, 0x29, 0x36, 0xd4, 0xe3, - 0x33, 0xaa, 0x46, 0xa6, 0x4f, 0x4c, 0x55, 0x1b, 0x54, 0x10, 0x55, 0xf8, 0x6c, 0x98, 0xc2, 0x23, - 0x2a, 0x44, 0x54, 0xd4, 0x6d, 0x91, 0x46, 0x4c, 0x5a, 0x3a, 0x9d, 0x24, 0x13, 0x13, 0x3b, 0x56, - 0x07, 0x4a, 0x4f, 0x7d, 0x1f, 0xf3, 0x6b, 0xb3, 0x34, 0xdd, 0xc4, 0xee, 0x70, 0x6e, 0x7a, 0x57, - 0x88, 0x89, 0x1d, 0x7b, 0x09, 0x9b, 0x59, 0x48, 0x9f, 0x2a, 0xbd, 0x21, 0x16, 0x9f, 0x81, 0x82, - 0xc7, 0xb1, 0xa2, 0x0a, 0x64, 0xfb, 0xd8, 0x34, 0x95, 0x13, 0x4c, 0xfd, 0x70, 0x5e, 0xb2, 0x87, - 0x62, 0x09, 0x16, 0xbc, 0xce, 0x54, 0xfc, 0x38, 0xee, 0x48, 0x12, 0x3f, 0x49, 0x24, 0x4f, 0xb1, - 0x41, 0x97, 0xcd, 0x25, 0xf9, 0x10, 0x5d, 0x86, 0x22, 0x9d, 0xb2, 0x6c, 0x3f, 0x27, 0xce, 0x3a, - 0x25, 0x2d, 0x50, 0xe2, 0x11, 0x67, 0x5a, 0x85, 0x82, 0xbe, 0xae, 0x3b, 0x2c, 0x49, 0xca, 0x02, - 0xfa, 0xba, 0x6e, 0x33, 0x3c, 0x09, 0x0b, 0x64, 0x7d, 0x0e, 0x47, 0x8a, 0xbe, 0xa4, 0x40, 0x68, - 0x9c, 0x45, 0xfc, 0x63, 0x02, 0x84, 0x71, 0x07, 0x8c, 0x6e, 0x41, 0x8a, 0xc4, 0x22, 0x1e, 0x56, - 0xaa, 0x6b, 0x2c, 0x50, 0xad, 0xd9, 0x81, 0x6a, 0xad, 0x69, 0x07, 0xaa, 0xcd, 0xdc, 0xa7, 0x9f, - 0xaf, 0xc6, 0x3e, 0xfe, 0xeb, 0x6a, 0x5c, 0xa2, 0x12, 0xe8, 0x3c, 0xf1, 0x95, 0x8a, 0x3a, 0x90, - 0xd5, 0x0e, 0x9d, 0x72, 0x9e, 0x38, 0x42, 0x45, 0x1d, 0x6c, 0x77, 0xd0, 0x0e, 0x08, 0x6d, 0x6d, - 0x60, 0xe2, 0x81, 0x39, 0x34, 0x65, 0x16, 0x08, 0x79, 0x30, 0xf1, 0xb9, 0x43, 0x16, 0x5e, 0x6b, - 0x36, 0xe7, 0x3e, 0x65, 0x94, 0xca, 0x6d, 0x3f, 0x81, 0xb8, 0xd5, 0x53, 0xa5, 0xa7, 0x76, 0x14, - 0x4b, 0x33, 0xcc, 0x4a, 0xea, 0x52, 0x32, 0xd0, 0x1f, 0x1e, 0xd9, 0x2c, 0x87, 0x7a, 0x47, 0xb1, - 0xf0, 0x66, 0x8a, 0x4c, 0x57, 0xf2, 0x48, 0xa2, 0xa7, 0xa1, 0xac, 0xe8, 0xba, 0x6c, 0x5a, 0x8a, - 0x85, 0xe5, 0xd6, 0x99, 0x85, 0x4d, 0x1a, 0x68, 0x16, 0xa4, 0xa2, 0xa2, 0xeb, 0x07, 0x84, 0xba, - 0x49, 0x88, 0xe8, 0x29, 0x28, 0x91, 0x98, 0xa4, 0x2a, 0x3d, 0xb9, 0x8b, 0xd5, 0x93, 0xae, 0x45, - 0x43, 0x4a, 0x52, 0x2a, 0x72, 0x6a, 0x83, 0x12, 0xc5, 0x8e, 0x73, 0xe2, 0x34, 0x1e, 0x21, 0x04, - 0xa9, 0x8e, 0x62, 0x29, 0x74, 0x27, 0x17, 0x24, 0xfa, 0x9b, 0xd0, 0x74, 0xc5, 0xea, 0xf2, 0xfd, - 0xa1, 0xbf, 0xd1, 0x39, 0xc8, 0x70, 0xb5, 0x49, 0xaa, 0x96, 0x8f, 0xd0, 0x32, 0xa4, 0x75, 0x43, - 0x3b, 0xc5, 0xf4, 0xe8, 0x72, 0x12, 0x1b, 0x88, 0x1f, 0x24, 0x60, 0x71, 0x22, 0x72, 0x11, 0xbd, - 0x5d, 0xc5, 0xec, 0xda, 0xef, 0x22, 0xbf, 0xd1, 0x8b, 0x44, 0xaf, 0xd2, 0xc1, 0x06, 0x8f, 0xf6, - 0x95, 0xc9, 0xad, 0x6e, 0xd0, 0xe7, 0x7c, 0x6b, 0x38, 0x37, 0xba, 0x07, 0x42, 0x4f, 0x31, 0x2d, - 0x99, 0x79, 0x7f, 0xd9, 0x13, 0xf9, 0x9f, 0x98, 0xd8, 0x64, 0x16, 0x2b, 0x88, 0x41, 0x73, 0x25, - 0x25, 0x22, 0xea, 0x52, 0xd1, 0x21, 0x2c, 0xb7, 0xce, 0xde, 0x57, 0x06, 0x96, 0x3a, 0xc0, 0xf2, - 0xc4, 0xa9, 0x4d, 0xa6, 0x12, 0xf7, 0x55, 0xb3, 0x85, 0xbb, 0xca, 0xa9, 0xaa, 0xd9, 0xd3, 0x5a, - 0x72, 0xe4, 0x9d, 0x13, 0x35, 0x45, 0x09, 0x4a, 0xfe, 0xb0, 0x8b, 0x4a, 0x90, 0xb0, 0x46, 0x7c, - 0xfd, 0x09, 0x6b, 0x84, 0x5e, 0x80, 0x14, 0x59, 0x23, 0x5d, 0x7b, 0x29, 0xe0, 0x45, 0x5c, 0xae, - 0x79, 0xa6, 0x63, 0x89, 0x72, 0x8a, 0xa2, 0x73, 0x1b, 0x9c, 0x50, 0x3c, 0xae, 0x55, 0xbc, 0x0a, - 0xe5, 0xb1, 0x38, 0xeb, 0x39, 0xbe, 0xb8, 0xf7, 0xf8, 0xc4, 0x32, 0x14, 0x7d, 0x01, 0x55, 0x3c, - 0x07, 0xcb, 0x41, 0xf1, 0x51, 0xec, 0x3a, 0x74, 0x5f, 0x9c, 0x43, 0x37, 0x21, 0xe7, 0x04, 0x48, - 0x76, 0x1b, 0xcf, 0x4f, 0xac, 0xc2, 0x66, 0x96, 0x1c, 0x56, 0x72, 0x0d, 0x89, 0x55, 0x53, 0x73, - 0x48, 0xd0, 0x89, 0x67, 0x15, 0x5d, 0x6f, 0x28, 0x66, 0x57, 0x7c, 0x1b, 0x2a, 0x61, 0xc1, 0x6f, - 0x6c, 0x19, 0x29, 0xc7, 0x0a, 0xcf, 0x41, 0xe6, 0x58, 0x33, 0xfa, 0x8a, 0x45, 0x95, 0x15, 0x25, - 0x3e, 0x22, 0xd6, 0xc9, 0x02, 0x61, 0x92, 0x92, 0xd9, 0x40, 0x94, 0xe1, 0x7c, 0x68, 0x00, 0x24, - 0x22, 0xea, 0xa0, 0x83, 0xd9, 0x7e, 0x16, 0x25, 0x36, 0x70, 0x15, 0xb1, 0xc9, 0xb2, 0x01, 0x79, - 0xad, 0x49, 0xd7, 0x4a, 0xf5, 0xe7, 0x25, 0x3e, 0x12, 0x7f, 0x9b, 0x84, 0x73, 0xc1, 0x61, 0x10, - 0x5d, 0x82, 0x85, 0xbe, 0x32, 0x92, 0xad, 0x11, 0xbf, 0xcb, 0xec, 0x38, 0xa0, 0xaf, 0x8c, 0x9a, - 0x23, 0x76, 0x91, 0x05, 0x48, 0x5a, 0x23, 0xb3, 0x92, 0xb8, 0x94, 0xbc, 0xb2, 0x20, 0x91, 0x9f, - 0xe8, 0x10, 0x16, 0x7b, 0x5a, 0x5b, 0xe9, 0xc9, 0x1e, 0x8b, 0xe7, 0xc6, 0x7e, 0x79, 0x62, 0xb3, - 0x59, 0x40, 0xc3, 0x9d, 0x09, 0xa3, 0x2f, 0x53, 0x1d, 0x3b, 0x8e, 0xe5, 0x7f, 0x43, 0x56, 0xef, - 0x39, 0xa3, 0xb4, 0xcf, 0x53, 0xd8, 0x3e, 0x3b, 0x33, 0xb7, 0xcf, 0x7e, 0x01, 0x96, 0x07, 0x78, - 0x64, 0x79, 0xe6, 0xc8, 0x0c, 0x27, 0x4b, 0xcf, 0x02, 0x91, 0x67, 0xee, 0xfb, 0x89, 0x0d, 0xa1, - 0xab, 0x34, 0xb3, 0xd0, 0x35, 0x13, 0x1b, 0xb2, 0xd2, 0xe9, 0x18, 0xd8, 0x34, 0x69, 0x66, 0xbb, - 0x40, 0xd3, 0x05, 0x4a, 0xdf, 0x60, 0x64, 0xf1, 0x17, 0xde, 0xb3, 0xf2, 0x67, 0x12, 0xfc, 0x24, - 0xe2, 0xee, 0x49, 0x1c, 0xc0, 0x32, 0x97, 0xef, 0xf8, 0x0e, 0x23, 0x11, 0xd5, 0xf3, 0x20, 0x5b, - 0x3c, 0xc2, 0x39, 0x24, 0x1f, 0xed, 0x1c, 0x6c, 0x6f, 0x9b, 0xf2, 0x78, 0xdb, 0xff, 0xb2, 0xb3, - 0x79, 0xcd, 0x89, 0x22, 0x6e, 0x9a, 0x16, 0x18, 0x45, 0xdc, 0x75, 0x25, 0x7c, 0xee, 0xed, 0x97, - 0x71, 0xa8, 0x86, 0xe7, 0x65, 0x81, 0xaa, 0x9e, 0x85, 0x45, 0x67, 0x2d, 0xce, 0xfc, 0xd8, 0xad, - 0x17, 0x9c, 0x07, 0x7c, 0x82, 0xa1, 0x51, 0xf1, 0x29, 0x28, 0x8d, 0x65, 0x8d, 0xec, 0x14, 0x8a, - 0xa7, 0xde, 0xf7, 0x8b, 0x3f, 0x4d, 0x3a, 0x5e, 0xd5, 0x97, 0xda, 0x05, 0x58, 0xde, 0x1b, 0xb0, - 0xd4, 0xc1, 0x6d, 0xb5, 0xf3, 0x55, 0x0d, 0x6f, 0x91, 0x4b, 0x7f, 0x67, 0x77, 0x11, 0xec, 0xee, - 0xcf, 0x05, 0xc8, 0x49, 0xd8, 0xd4, 0x49, 0x4a, 0x87, 0x36, 0x21, 0x8f, 0x47, 0x6d, 0xac, 0x5b, - 0x76, 0x16, 0x1c, 0x5c, 0x4d, 0x30, 0xee, 0xba, 0xcd, 0x49, 0x6a, 0x63, 0x47, 0x0c, 0xdd, 0xe0, - 0x30, 0x48, 0x38, 0xa2, 0xc1, 0xc5, 0xbd, 0x38, 0xc8, 0x8b, 0x36, 0x0e, 0x92, 0x0c, 0x2d, 0x85, - 0x99, 0xd4, 0x18, 0x10, 0x72, 0x83, 0x03, 0x21, 0xa9, 0x19, 0x2f, 0xf3, 0x21, 0x21, 0x35, 0x1f, - 0x12, 0x92, 0x9e, 0xb1, 0xcc, 0x10, 0x28, 0xe4, 0x45, 0x1b, 0x0a, 0xc9, 0xcc, 0x98, 0xf1, 0x18, - 0x16, 0x72, 0xd7, 0x8f, 0x85, 0x64, 0x43, 0x42, 0x9b, 0x2d, 0x3d, 0x15, 0x0c, 0x79, 0xd5, 0x03, - 0x86, 0xe4, 0x42, 0x51, 0x08, 0xa6, 0x28, 0x00, 0x0d, 0x79, 0xdd, 0x87, 0x86, 0xe4, 0x67, 0xec, - 0xc3, 0x14, 0x38, 0x64, 0xcb, 0x0b, 0x87, 0x40, 0x28, 0xaa, 0xc2, 0xcf, 0x3d, 0x0c, 0x0f, 0x79, - 0xd9, 0xc1, 0x43, 0x0a, 0xa1, 0xc0, 0x0e, 0x5f, 0xcb, 0x38, 0x20, 0xb2, 0x37, 0x01, 0x88, 0x30, - 0x00, 0xe3, 0xe9, 0x50, 0x15, 0x33, 0x10, 0x91, 0xbd, 0x09, 0x44, 0xa4, 0x38, 0x43, 0xe1, 0x0c, - 0x48, 0xe4, 0x07, 0xc1, 0x90, 0x48, 0x38, 0x68, 0xc1, 0xa7, 0x19, 0x0d, 0x13, 0x91, 0x43, 0x30, - 0x91, 0x72, 0x68, 0xfd, 0xce, 0xd4, 0x47, 0x06, 0x45, 0x0e, 0x03, 0x40, 0x11, 0x06, 0x5f, 0x5c, - 0x09, 0x55, 0x1e, 0x01, 0x15, 0x39, 0x0c, 0x40, 0x45, 0x16, 0x67, 0xaa, 0x9d, 0x09, 0x8b, 0xdc, - 0xf1, 0xc3, 0x22, 0x68, 0xc6, 0x1d, 0x0b, 0xc5, 0x45, 0x5a, 0x61, 0xb8, 0x08, 0xc3, 0x2e, 0x9e, - 0x0b, 0xd5, 0x38, 0x07, 0x30, 0xb2, 0x37, 0x01, 0x8c, 0x2c, 0xcf, 0xb0, 0xb4, 0xa8, 0xc8, 0xc8, - 0x55, 0x92, 0x51, 0x8c, 0xb9, 0x6a, 0x92, 0xdc, 0x63, 0xc3, 0xd0, 0x0c, 0x8e, 0x71, 0xb0, 0x81, - 0x78, 0x85, 0x54, 0xca, 0xae, 0x5b, 0x9e, 0x82, 0xa2, 0xd0, 0x22, 0xca, 0xe3, 0x8a, 0xc5, 0xdf, - 0xc5, 0x5d, 0x59, 0x5a, 0x60, 0x7a, 0xab, 0xec, 0x3c, 0xaf, 0xb2, 0x3d, 0xd8, 0x4a, 0xc2, 0x8f, - 0xad, 0xac, 0x42, 0x81, 0x14, 0x47, 0x63, 0xb0, 0x89, 0xa2, 0x3b, 0xb0, 0xc9, 0x35, 0x58, 0xa4, - 0x49, 0x00, 0x43, 0x60, 0x78, 0x64, 0x4d, 0xd1, 0xc8, 0x5a, 0x26, 0x0f, 0xd8, 0x2e, 0xb0, 0x10, - 0xfb, 0x3c, 0x2c, 0x79, 0x78, 0x9d, 0xa2, 0x8b, 0x61, 0x08, 0x82, 0xc3, 0xbd, 0xc1, 0xab, 0xaf, - 0x3f, 0xc4, 0xdd, 0x1d, 0x72, 0xf1, 0x96, 0x20, 0x68, 0x24, 0xfe, 0x35, 0x41, 0x23, 0x89, 0xaf, - 0x0c, 0x8d, 0x78, 0x8b, 0xc8, 0xa4, 0xbf, 0x88, 0xfc, 0x67, 0xdc, 0x3d, 0x13, 0x07, 0xe8, 0x68, - 0x6b, 0x1d, 0xcc, 0xcb, 0x3a, 0xfa, 0x9b, 0xa4, 0x59, 0x3d, 0xed, 0x84, 0x17, 0x6f, 0xe4, 0x27, - 0xe1, 0x72, 0x62, 0x67, 0x9e, 0x87, 0x46, 0xa7, 0x22, 0x64, 0xb9, 0x0b, 0xaf, 0x08, 0x05, 0x48, - 0x3e, 0xc4, 0x2c, 0xd2, 0x2d, 0x48, 0xe4, 0x27, 0xe1, 0xa3, 0x46, 0xc6, 0x73, 0x10, 0x36, 0x40, - 0xb7, 0x20, 0x4f, 0xdb, 0x35, 0xb2, 0xa6, 0x9b, 0x3c, 0x20, 0xf9, 0xd2, 0x35, 0xd6, 0x95, 0x59, - 0xdb, 0x27, 0x3c, 0x7b, 0xba, 0x29, 0xe5, 0x74, 0xfe, 0xcb, 0x93, 0x34, 0xe5, 0x7d, 0x49, 0xd3, - 0x05, 0xc8, 0x93, 0xd9, 0x9b, 0xba, 0xd2, 0xc6, 0x34, 0xb2, 0xe4, 0x25, 0x97, 0x20, 0x3e, 0x00, - 0x34, 0x19, 0x27, 0x51, 0x03, 0x32, 0xf8, 0x14, 0x0f, 0x2c, 0x96, 0x53, 0x16, 0xd6, 0xcf, 0x4d, - 0xd6, 0x8d, 0xe4, 0xf1, 0x66, 0x85, 0x6c, 0xf2, 0x3f, 0x3e, 0x5f, 0x15, 0x18, 0xf7, 0x73, 0x5a, - 0x5f, 0xb5, 0x70, 0x5f, 0xb7, 0xce, 0x24, 0x2e, 0x2f, 0xfe, 0x3d, 0x0e, 0xe5, 0xb1, 0xf8, 0x19, - 0xb8, 0xb7, 0xb6, 0xc9, 0x27, 0x3c, 0xc0, 0xd2, 0x45, 0x80, 0x13, 0xc5, 0x94, 0xdf, 0x53, 0x06, - 0x16, 0xee, 0xf0, 0xed, 0xcc, 0x9f, 0x28, 0xe6, 0x9b, 0x94, 0xe0, 0x5f, 0x58, 0x6e, 0x6c, 0x61, - 0x9e, 0x62, 0x3b, 0xef, 0x2d, 0xb6, 0x51, 0x15, 0x72, 0xba, 0xa1, 0x6a, 0x86, 0x6a, 0x9d, 0xd1, - 0xdd, 0x48, 0x4a, 0xce, 0x18, 0x5d, 0x86, 0x62, 0x1f, 0xf7, 0x75, 0x4d, 0xeb, 0xc9, 0xec, 0x86, - 0x17, 0xa8, 0xe8, 0x02, 0x27, 0xd6, 0x09, 0xed, 0x6e, 0x2a, 0x97, 0x14, 0x52, 0x77, 0x53, 0xb9, - 0x94, 0x90, 0xbe, 0x9b, 0xca, 0x65, 0x84, 0xec, 0xdd, 0x54, 0x2e, 0x2b, 0xe4, 0xc4, 0x0f, 0x13, - 0xee, 0x55, 0x70, 0xc1, 0x96, 0xa8, 0x6b, 0x8d, 0x66, 0x5b, 0x2b, 0x01, 0x3b, 0xe2, 0xa1, 0x90, - 0xc5, 0x91, 0xd1, 0xd0, 0xc4, 0x1d, 0x8e, 0xe7, 0x39, 0x63, 0xcf, 0x99, 0x66, 0x1f, 0xed, 0x4c, - 0xa7, 0x6f, 0xbc, 0xf8, 0x63, 0x8a, 0xc0, 0xfa, 0x13, 0x15, 0x74, 0xe0, 0x2d, 0x93, 0x86, 0xf4, - 0x86, 0xda, 0xb6, 0x15, 0xf5, 0x2a, 0xbb, 0xe5, 0x14, 0x23, 0x9b, 0xe8, 0x2d, 0x78, 0x7c, 0xcc, - 0xcd, 0x38, 0xaa, 0x13, 0x51, 0xbd, 0xcd, 0x63, 0x7e, 0x6f, 0x63, 0xab, 0x76, 0x37, 0x2b, 0xf9, - 0x88, 0x17, 0x60, 0x1b, 0x4a, 0xfe, 0x9c, 0x2b, 0xf0, 0xf8, 0x2f, 0x43, 0xd1, 0xc0, 0x96, 0xa2, - 0x0e, 0x64, 0x5f, 0x81, 0xb8, 0xc0, 0x88, 0x1c, 0x8c, 0xdd, 0x87, 0xc7, 0x02, 0x73, 0x2f, 0xf4, - 0x12, 0xe4, 0xdd, 0xb4, 0x8d, 0xed, 0xea, 0x14, 0x58, 0xcd, 0xe5, 0x15, 0x7f, 0x1f, 0x77, 0x55, - 0xfa, 0x81, 0xba, 0x3a, 0x64, 0x0c, 0x6c, 0x0e, 0x7b, 0x0c, 0x3a, 0x2b, 0xad, 0x3f, 0x1f, 0x2d, - 0x6b, 0x23, 0xd4, 0x61, 0xcf, 0x92, 0xb8, 0xb0, 0xf8, 0x00, 0x32, 0x8c, 0x82, 0x0a, 0x90, 0x3d, - 0xdc, 0xbd, 0xb7, 0xbb, 0xf7, 0xe6, 0xae, 0x10, 0x43, 0x00, 0x99, 0x8d, 0x5a, 0xad, 0xbe, 0xdf, - 0x14, 0xe2, 0x28, 0x0f, 0xe9, 0x8d, 0xcd, 0x3d, 0xa9, 0x29, 0x24, 0x08, 0x59, 0xaa, 0xdf, 0xad, - 0xd7, 0x9a, 0x42, 0x12, 0x2d, 0x42, 0x91, 0xfd, 0x96, 0xef, 0xec, 0x49, 0xf7, 0x37, 0x9a, 0x42, - 0xca, 0x43, 0x3a, 0xa8, 0xef, 0x6e, 0xd5, 0x25, 0x21, 0x2d, 0xfe, 0x0f, 0x9c, 0x0f, 0xcd, 0xf3, - 0x5c, 0x14, 0x2e, 0xee, 0x41, 0xe1, 0xc4, 0x9f, 0x27, 0x48, 0x91, 0x1f, 0x96, 0xbc, 0xa1, 0xbb, - 0x63, 0x0b, 0x5f, 0x9f, 0x23, 0xf3, 0x1b, 0x5b, 0x3d, 0xa9, 0xeb, 0x0d, 0x7c, 0x8c, 0xad, 0x76, - 0x97, 0x25, 0x93, 0x2c, 0x7a, 0x15, 0xa5, 0x22, 0xa7, 0x52, 0x21, 0x93, 0xb1, 0xbd, 0x83, 0xdb, - 0x96, 0xcc, 0x7c, 0x14, 0x33, 0xba, 0x3c, 0x61, 0x23, 0xd4, 0x03, 0x46, 0x14, 0xdf, 0x9e, 0x6b, - 0x2f, 0xf3, 0x90, 0x96, 0xea, 0x4d, 0xe9, 0x2d, 0x21, 0x89, 0x10, 0x94, 0xe8, 0x4f, 0xf9, 0x60, - 0x77, 0x63, 0xff, 0xa0, 0xb1, 0x47, 0xf6, 0x72, 0x09, 0xca, 0xf6, 0x5e, 0xda, 0xc4, 0xb4, 0xf8, - 0xa7, 0x04, 0x3c, 0x1e, 0x92, 0x7a, 0xa2, 0x5b, 0x00, 0xd6, 0x48, 0x36, 0x70, 0x5b, 0x33, 0x3a, - 0xe1, 0x46, 0xd6, 0x1c, 0x49, 0x94, 0x43, 0xca, 0x5b, 0xfc, 0x97, 0x39, 0x05, 0xbc, 0x45, 0xaf, - 0x70, 0xa5, 0x64, 0x55, 0xf6, 0x55, 0xbb, 0x18, 0x80, 0x51, 0xe2, 0x36, 0x51, 0x4c, 0xf7, 0x96, - 0x2a, 0xa6, 0xfc, 0xe8, 0x7e, 0x90, 0x53, 0x89, 0xd8, 0x3a, 0x99, 0xcf, 0x9d, 0xa4, 0x1f, 0xcd, - 0x9d, 0x88, 0xbf, 0x4a, 0x7a, 0x37, 0xd6, 0x9f, 0x69, 0xef, 0x41, 0xc6, 0xb4, 0x14, 0x6b, 0x68, - 0x72, 0x83, 0x7b, 0x29, 0x6a, 0xda, 0xbe, 0x66, 0xff, 0x38, 0xa0, 0xe2, 0x12, 0x57, 0xf3, 0xdd, - 0x7e, 0x9b, 0xe2, 0x4d, 0x28, 0xf9, 0x37, 0x27, 0xfc, 0xca, 0xb8, 0x3e, 0x27, 0x21, 0xde, 0x76, - 0x93, 0x21, 0x0f, 0x82, 0x38, 0x89, 0xce, 0xc5, 0x83, 0xd0, 0xb9, 0x5f, 0xc7, 0xe1, 0x89, 0x29, - 0xc5, 0x0b, 0x7a, 0x63, 0xec, 0x9c, 0x5f, 0x9e, 0xa7, 0xf4, 0x59, 0x63, 0x34, 0xff, 0x49, 0x8b, - 0x37, 0x60, 0xc1, 0x4b, 0x8f, 0xb6, 0xc8, 0x9f, 0x24, 0x5d, 0x9f, 0xef, 0x87, 0x11, 0xbf, 0xb6, - 0xac, 0x6f, 0xcc, 0xce, 0x12, 0x73, 0xda, 0x59, 0x60, 0xb2, 0x90, 0xfc, 0xe6, 0x92, 0x85, 0xd4, - 0x23, 0x26, 0x0b, 0xde, 0x0b, 0x97, 0xf6, 0x5f, 0xb8, 0x89, 0xb8, 0x9e, 0x09, 0x88, 0xeb, 0x6f, - 0x01, 0x78, 0xba, 0x8b, 0xcb, 0x90, 0x36, 0xb4, 0xe1, 0xa0, 0x43, 0xcd, 0x24, 0x2d, 0xb1, 0x01, - 0xba, 0x09, 0x69, 0x62, 0x6e, 0xf6, 0x66, 0x4e, 0x7a, 0x5e, 0x62, 0x2e, 0x1e, 0x00, 0x97, 0x71, - 0x8b, 0x2a, 0xa0, 0xc9, 0x0e, 0x4f, 0xc8, 0x2b, 0x5e, 0xf5, 0xbf, 0xe2, 0xc9, 0xd0, 0x5e, 0x51, - 0xf0, 0xab, 0xde, 0x87, 0x34, 0x35, 0x0f, 0x92, 0xdf, 0xd0, 0x2e, 0x25, 0xaf, 0x5e, 0xc9, 0x6f, - 0xf4, 0x43, 0x00, 0xc5, 0xb2, 0x0c, 0xb5, 0x35, 0x74, 0x5f, 0xb0, 0x1a, 0x6c, 0x5e, 0x1b, 0x36, - 0xdf, 0xe6, 0x05, 0x6e, 0x67, 0xcb, 0xae, 0xa8, 0xc7, 0xd6, 0x3c, 0x0a, 0xc5, 0x5d, 0x28, 0xf9, - 0x65, 0xed, 0x7a, 0x8b, 0xcd, 0xc1, 0x5f, 0x6f, 0xb1, 0xf2, 0x99, 0xd7, 0x5b, 0x4e, 0xb5, 0x96, - 0x64, 0x0d, 0x69, 0x3a, 0x10, 0xff, 0x15, 0x87, 0x05, 0xaf, 0x75, 0x7e, 0xcd, 0x69, 0xfc, 0x8c, - 0xc2, 0xe6, 0xfc, 0x44, 0x16, 0x9f, 0x3d, 0x51, 0xcc, 0xc3, 0x6f, 0x33, 0x89, 0xff, 0x30, 0x0e, - 0x39, 0x67, 0xf1, 0x21, 0xdd, 0x60, 0x77, 0xef, 0x12, 0xde, 0xde, 0x27, 0x6b, 0x2f, 0x27, 0x9d, - 0xa6, 0xf5, 0x6d, 0x27, 0xa1, 0x0a, 0x43, 0x98, 0xbd, 0x3b, 0x6d, 0xf7, 0xed, 0x79, 0xfe, 0xf8, - 0x33, 0x3e, 0x0f, 0x92, 0x49, 0xa0, 0xff, 0x83, 0x8c, 0xd2, 0x76, 0x70, 0xf5, 0x52, 0x00, 0xd0, - 0x6a, 0xb3, 0xae, 0x35, 0x47, 0x1b, 0x94, 0x53, 0xe2, 0x12, 0x7c, 0x56, 0x09, 0xa7, 0xe9, 0xfd, - 0x1a, 0xd1, 0xcb, 0x78, 0xfc, 0x6e, 0xb3, 0x04, 0x70, 0xb8, 0x7b, 0x7f, 0x6f, 0x6b, 0xfb, 0xce, - 0x76, 0x7d, 0x8b, 0xa7, 0x54, 0x5b, 0x5b, 0xf5, 0x2d, 0x21, 0x41, 0xf8, 0xa4, 0xfa, 0xfd, 0xbd, - 0xa3, 0xfa, 0x96, 0x90, 0x14, 0x6f, 0x43, 0xde, 0x71, 0x3d, 0xa8, 0x02, 0x59, 0xbb, 0x47, 0x10, - 0xe7, 0x0e, 0x80, 0xb7, 0x7c, 0x96, 0x21, 0xad, 0x6b, 0xef, 0xf1, 0x96, 0x6f, 0x52, 0x62, 0x03, - 0xb1, 0x03, 0xe5, 0x31, 0xbf, 0x85, 0x6e, 0x43, 0x56, 0x1f, 0xb6, 0x64, 0xdb, 0x68, 0xc7, 0x3a, - 0x2a, 0x76, 0xd9, 0x3f, 0x6c, 0xf5, 0xd4, 0xf6, 0x3d, 0x7c, 0x66, 0x6f, 0x93, 0x3e, 0x6c, 0xdd, - 0x63, 0xb6, 0xcd, 0xde, 0x92, 0xf0, 0xbe, 0xe5, 0x14, 0x72, 0xf6, 0x55, 0x45, 0xff, 0x0f, 0x79, - 0xc7, 0x25, 0x3a, 0xdf, 0xc1, 0x84, 0xfa, 0x52, 0xae, 0xde, 0x15, 0x41, 0xd7, 0x60, 0xd1, 0x54, - 0x4f, 0x06, 0x76, 0x3f, 0x89, 0xc1, 0x6c, 0x09, 0x7a, 0x67, 0xca, 0xec, 0xc1, 0x8e, 0x8d, 0x0d, - 0x91, 0x48, 0x28, 0x8c, 0xfb, 0x8a, 0x6f, 0x73, 0x02, 0x01, 0x11, 0x3b, 0x19, 0x14, 0xb1, 0x3f, - 0x48, 0x40, 0xc1, 0xd3, 0xa5, 0x42, 0xff, 0xeb, 0x71, 0x5c, 0xa5, 0x80, 0x50, 0xe3, 0xe1, 0x75, - 0x3f, 0xb1, 0xf0, 0x2f, 0x2c, 0x31, 0xff, 0xc2, 0xc2, 0x9a, 0x82, 0x76, 0xb3, 0x2b, 0x35, 0x77, - 0xb3, 0xeb, 0x39, 0x40, 0x96, 0x66, 0x29, 0x3d, 0xf9, 0x54, 0xb3, 0xd4, 0xc1, 0x89, 0xcc, 0x4c, - 0x83, 0xb9, 0x19, 0x81, 0x3e, 0x39, 0xa2, 0x0f, 0xf6, 0xa9, 0x95, 0xfc, 0x28, 0x0e, 0x39, 0xa7, - 0xec, 0x9b, 0xf7, 0x8b, 0x89, 0x73, 0x90, 0xe1, 0x95, 0x0d, 0xfb, 0x64, 0x82, 0x8f, 0x02, 0xbb, - 0x7a, 0x55, 0xc8, 0xf5, 0xb1, 0xa5, 0x50, 0x9f, 0xc9, 0xc2, 0xa4, 0x33, 0xbe, 0xf6, 0x32, 0x14, - 0x3c, 0x1f, 0xaf, 0x10, 0x37, 0xba, 0x5b, 0x7f, 0x53, 0x88, 0x55, 0xb3, 0x1f, 0x7d, 0x72, 0x29, - 0xb9, 0x8b, 0xdf, 0x23, 0x37, 0x4c, 0xaa, 0xd7, 0x1a, 0xf5, 0xda, 0x3d, 0x21, 0x5e, 0x2d, 0x7c, - 0xf4, 0xc9, 0xa5, 0xac, 0x84, 0x69, 0x13, 0xe6, 0xda, 0x3d, 0x28, 0x8f, 0x1d, 0x8c, 0xff, 0x42, - 0x23, 0x28, 0x6d, 0x1d, 0xee, 0xef, 0x6c, 0xd7, 0x36, 0x9a, 0x75, 0xf9, 0x68, 0xaf, 0x59, 0x17, - 0xe2, 0xe8, 0x71, 0x58, 0xda, 0xd9, 0x7e, 0xbd, 0xd1, 0x94, 0x6b, 0x3b, 0xdb, 0xf5, 0xdd, 0xa6, - 0xbc, 0xd1, 0x6c, 0x6e, 0xd4, 0xee, 0x09, 0x89, 0xf5, 0xdf, 0x14, 0xa0, 0xbc, 0xb1, 0x59, 0xdb, - 0x26, 0xb5, 0x9d, 0xda, 0x56, 0xa8, 0x7b, 0xa8, 0x41, 0x8a, 0x22, 0xba, 0x53, 0x3f, 0x47, 0xae, - 0x4e, 0xef, 0xd2, 0xa1, 0x3b, 0x90, 0xa6, 0x60, 0x2f, 0x9a, 0xfe, 0x7d, 0x72, 0x75, 0x46, 0xdb, - 0x8e, 0x4c, 0x86, 0x5e, 0xa7, 0xa9, 0x1f, 0x2c, 0x57, 0xa7, 0x77, 0xf1, 0xd0, 0x0e, 0x64, 0x6d, - 0x2c, 0x6e, 0xd6, 0xa7, 0xbf, 0xd5, 0x99, 0xed, 0x30, 0xb2, 0x34, 0x86, 0x99, 0x4e, 0xff, 0x96, - 0xb9, 0x3a, 0xa3, 0xbf, 0x87, 0xb6, 0x21, 0xc3, 0x11, 0x92, 0x19, 0x9f, 0xf1, 0x56, 0x67, 0xb5, - 0xb5, 0x90, 0x04, 0x79, 0x17, 0x8d, 0x9e, 0xfd, 0x85, 0x76, 0x35, 0x42, 0xeb, 0x12, 0x3d, 0x80, - 0xa2, 0x1f, 0x75, 0x89, 0xf6, 0xa9, 0x70, 0x35, 0x62, 0x03, 0x8d, 0xe8, 0xf7, 0x43, 0x30, 0xd1, - 0x3e, 0x1d, 0xae, 0x46, 0xec, 0xa7, 0xa1, 0x77, 0x60, 0x71, 0x12, 0x22, 0x89, 0xfe, 0x25, 0x71, - 0x75, 0x8e, 0x0e, 0x1b, 0xea, 0x03, 0x0a, 0x80, 0x56, 0xe6, 0xf8, 0xb0, 0xb8, 0x3a, 0x4f, 0xc3, - 0x0d, 0x75, 0xa0, 0x3c, 0x0e, 0x57, 0x44, 0xfd, 0xd0, 0xb8, 0x1a, 0xb9, 0xf9, 0xc6, 0xde, 0xe2, - 0xaf, 0xdd, 0xa3, 0x7e, 0x78, 0x5c, 0x8d, 0xdc, 0x8b, 0x43, 0x87, 0x00, 0x9e, 0xda, 0x33, 0xc2, - 0x87, 0xc8, 0xd5, 0x28, 0x5d, 0x39, 0xa4, 0xc3, 0x52, 0x50, 0x51, 0x3a, 0xcf, 0x77, 0xc9, 0xd5, - 0xb9, 0x9a, 0x75, 0xc4, 0x9e, 0xfd, 0xe5, 0x65, 0xb4, 0xef, 0x94, 0xab, 0x11, 0xbb, 0x76, 0x9b, - 0xf5, 0x4f, 0xbf, 0x58, 0x89, 0x7f, 0xf6, 0xc5, 0x4a, 0xfc, 0x6f, 0x5f, 0xac, 0xc4, 0x3f, 0xfe, - 0x72, 0x25, 0xf6, 0xd9, 0x97, 0x2b, 0xb1, 0xbf, 0x7c, 0xb9, 0x12, 0xfb, 0xde, 0xb3, 0x27, 0xaa, - 0xd5, 0x1d, 0xb6, 0xd6, 0xda, 0x5a, 0xff, 0xba, 0xf7, 0x2f, 0x2b, 0x41, 0x7f, 0xa3, 0x69, 0x65, - 0x68, 0x40, 0xbd, 0xf1, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xce, 0x0a, 0x41, 0x94, 0x66, 0x33, - 0x00, 0x00, + // 3459 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcb, 0x73, 0x23, 0xe5, + 0xb5, 0xd7, 0xfb, 0x71, 0x64, 0x49, 0xed, 0xcf, 0x66, 0xd0, 0x88, 0x19, 0x7b, 0x68, 0x0a, 0x98, + 0x19, 0xc0, 0xc3, 0xf5, 0xdc, 0x81, 0xe1, 0x0e, 0x5c, 0xca, 0x96, 0x35, 0xc8, 0x1e, 0x8f, 0x6d, + 0xda, 0xb2, 0x29, 0xee, 0x4d, 0xa6, 0x69, 0x49, 0x9f, 0xad, 0x66, 0x24, 0x75, 0xd3, 0xdd, 0x32, + 0x32, 0xcb, 0x50, 0x6c, 0xa8, 0x54, 0x85, 0x4d, 0x2a, 0x49, 0x55, 0xd8, 0x25, 0x55, 0xc9, 0x7f, + 0x90, 0x55, 0x56, 0x59, 0xb0, 0xc8, 0x82, 0x55, 0x92, 0x15, 0x49, 0xc1, 0x2e, 0xff, 0x40, 0x76, + 0x49, 0xea, 0x7b, 0xf4, 0x4b, 0xea, 0x96, 0x5a, 0x0c, 0x50, 0x95, 0x2a, 0x76, 0xfa, 0x4e, 0x9f, + 0x73, 0xfa, 0x7b, 0x9c, 0xef, 0x3c, 0x7e, 0xa7, 0x05, 0x4f, 0x58, 0x78, 0xd0, 0xc1, 0x46, 0x5f, + 0x1d, 0x58, 0x37, 0x94, 0x56, 0x5b, 0xbd, 0x61, 0x9d, 0xeb, 0xd8, 0x5c, 0xd3, 0x0d, 0xcd, 0xd2, + 0x50, 0xd9, 0x7d, 0xb8, 0x46, 0x1e, 0x56, 0x2f, 0x7b, 0xb8, 0xdb, 0xc6, 0xb9, 0x6e, 0x69, 0x37, + 0x74, 0x43, 0xd3, 0x4e, 0x18, 0x7f, 0xf5, 0x92, 0xe7, 0x31, 0xd5, 0xe3, 0xd5, 0xe6, 0x7b, 0xca, + 0x85, 0x1f, 0xe2, 0x73, 0xfb, 0xe9, 0xe5, 0x09, 0x59, 0x5d, 0x31, 0x94, 0xbe, 0xfd, 0x78, 0xf5, + 0x54, 0xd3, 0x4e, 0x7b, 0xf8, 0x06, 0x1d, 0xb5, 0x86, 0x27, 0x37, 0x2c, 0xb5, 0x8f, 0x4d, 0x4b, + 0xe9, 0xeb, 0x9c, 0x61, 0xf9, 0x54, 0x3b, 0xd5, 0xe8, 0xcf, 0x1b, 0xe4, 0x17, 0xa3, 0x8a, 0xff, + 0x02, 0xc8, 0x4a, 0xf8, 0xbd, 0x21, 0x36, 0x2d, 0xb4, 0x0e, 0x29, 0xdc, 0xee, 0x6a, 0x95, 0xf8, + 0x95, 0xf8, 0xd5, 0xc2, 0xfa, 0xa5, 0xb5, 0xb1, 0xc5, 0xad, 0x71, 0xbe, 0x7a, 0xbb, 0xab, 0x35, + 0x62, 0x12, 0xe5, 0x45, 0xb7, 0x20, 0x7d, 0xd2, 0x1b, 0x9a, 0xdd, 0x4a, 0x82, 0x0a, 0x5d, 0x0e, + 0x13, 0xba, 0x4b, 0x98, 0x1a, 0x31, 0x89, 0x71, 0x93, 0x57, 0xa9, 0x83, 0x13, 0xad, 0x92, 0x9c, + 0xfe, 0xaa, 0xed, 0xc1, 0x09, 0x7d, 0x15, 0xe1, 0x45, 0x9b, 0x00, 0xea, 0x40, 0xb5, 0xe4, 0x76, + 0x57, 0x51, 0x07, 0x95, 0x14, 0x95, 0x7c, 0x32, 0x5c, 0x52, 0xb5, 0x6a, 0x84, 0xb1, 0x11, 0x93, + 0xf2, 0xaa, 0x3d, 0x20, 0xd3, 0x7d, 0x6f, 0x88, 0x8d, 0xf3, 0x4a, 0x7a, 0xfa, 0x74, 0xdf, 0x24, + 0x4c, 0x64, 0xba, 0x94, 0x1b, 0x6d, 0x43, 0xa1, 0x85, 0x4f, 0xd5, 0x81, 0xdc, 0xea, 0x69, 0xed, + 0x87, 0x95, 0x0c, 0x15, 0x16, 0xc3, 0x84, 0x37, 0x09, 0xeb, 0x26, 0xe1, 0xdc, 0x4c, 0x54, 0xe2, + 0x8d, 0x98, 0x04, 0x2d, 0x87, 0x82, 0x5e, 0x85, 0x5c, 0xbb, 0x8b, 0xdb, 0x0f, 0x65, 0x6b, 0x54, + 0xc9, 0x52, 0x3d, 0xab, 0x61, 0x7a, 0x6a, 0x84, 0xaf, 0x39, 0x6a, 0xc4, 0xa4, 0x6c, 0x9b, 0xfd, + 0x44, 0x77, 0x01, 0x3a, 0xb8, 0xa7, 0x9e, 0x61, 0x83, 0xc8, 0xe7, 0xa6, 0xef, 0xc1, 0x16, 0xe3, + 0x6c, 0x8e, 0xf8, 0x34, 0xf2, 0x1d, 0x9b, 0x80, 0x6a, 0x90, 0xc7, 0x83, 0x0e, 0x5f, 0x4e, 0x9e, + 0xaa, 0xb9, 0x12, 0x7a, 0xde, 0x83, 0x8e, 0x77, 0x31, 0x39, 0xcc, 0xc7, 0xe8, 0x36, 0x64, 0xda, + 0x5a, 0xbf, 0xaf, 0x5a, 0x15, 0xa0, 0x1a, 0x56, 0x42, 0x17, 0x42, 0xb9, 0x1a, 0x31, 0x89, 0xf3, + 0xa3, 0x3d, 0x28, 0xf5, 0x54, 0xd3, 0x92, 0xcd, 0x81, 0xa2, 0x9b, 0x5d, 0xcd, 0x32, 0x2b, 0x05, + 0xaa, 0xe1, 0xe9, 0x30, 0x0d, 0xbb, 0xaa, 0x69, 0x1d, 0xda, 0xcc, 0x8d, 0x98, 0x54, 0xec, 0x79, + 0x09, 0x44, 0x9f, 0x76, 0x72, 0x82, 0x0d, 0x47, 0x61, 0x65, 0x61, 0xba, 0xbe, 0x7d, 0xc2, 0x6d, + 0xcb, 0x13, 0x7d, 0x9a, 0x97, 0x80, 0xfe, 0x1f, 0x96, 0x7a, 0x9a, 0xd2, 0x71, 0xd4, 0xc9, 0xed, + 0xee, 0x70, 0xf0, 0xb0, 0x52, 0xa4, 0x4a, 0xaf, 0x85, 0x4e, 0x52, 0x53, 0x3a, 0xb6, 0x8a, 0x1a, + 0x11, 0x68, 0xc4, 0xa4, 0xc5, 0xde, 0x38, 0x11, 0x3d, 0x80, 0x65, 0x45, 0xd7, 0x7b, 0xe7, 0xe3, + 0xda, 0x4b, 0x54, 0xfb, 0xf5, 0x30, 0xed, 0x1b, 0x44, 0x66, 0x5c, 0x3d, 0x52, 0x26, 0xa8, 0xa8, + 0x09, 0x82, 0x6e, 0x60, 0x5d, 0x31, 0xb0, 0xac, 0x1b, 0x9a, 0xae, 0x99, 0x4a, 0xaf, 0x52, 0xa6, + 0xba, 0x9f, 0x0d, 0xd3, 0x7d, 0xc0, 0xf8, 0x0f, 0x38, 0x7b, 0x23, 0x26, 0x95, 0x75, 0x3f, 0x89, + 0x69, 0xd5, 0xda, 0xd8, 0x34, 0x5d, 0xad, 0xc2, 0x2c, 0xad, 0x94, 0xdf, 0xaf, 0xd5, 0x47, 0x42, + 0x75, 0x28, 0xe0, 0x11, 0x11, 0x97, 0xcf, 0x34, 0x0b, 0x57, 0x16, 0xa7, 0x5f, 0xac, 0x3a, 0x65, + 0x3d, 0xd6, 0x2c, 0x4c, 0x2e, 0x15, 0x76, 0x46, 0x48, 0x81, 0xc7, 0xce, 0xb0, 0xa1, 0x9e, 0x9c, + 0x53, 0x35, 0x32, 0x7d, 0x62, 0xaa, 0xda, 0xa0, 0x82, 0xa8, 0xc2, 0xe7, 0xc2, 0x14, 0x1e, 0x53, + 0x21, 0xa2, 0xa2, 0x6e, 0x8b, 0x34, 0x62, 0xd2, 0xd2, 0xd9, 0x24, 0x99, 0x98, 0xd8, 0x89, 0x3a, + 0x50, 0x7a, 0xea, 0x07, 0x98, 0x5f, 0x9b, 0xa5, 0xe9, 0x26, 0x76, 0x97, 0x73, 0xd3, 0xbb, 0x42, + 0x4c, 0xec, 0xc4, 0x4b, 0xd8, 0xcc, 0x42, 0xfa, 0x4c, 0xe9, 0x0d, 0xb1, 0xf8, 0x2c, 0x14, 0x3c, + 0x8e, 0x15, 0x55, 0x20, 0xdb, 0xc7, 0xa6, 0xa9, 0x9c, 0x62, 0xea, 0x87, 0xf3, 0x92, 0x3d, 0x14, + 0x4b, 0xb0, 0xe0, 0x75, 0xa6, 0xe2, 0x27, 0x71, 0x47, 0x92, 0xf8, 0x49, 0x22, 0x79, 0x86, 0x0d, + 0xba, 0x6c, 0x2e, 0xc9, 0x87, 0xe8, 0x29, 0x28, 0xd2, 0x29, 0xcb, 0xf6, 0x73, 0xe2, 0xac, 0x53, + 0xd2, 0x02, 0x25, 0x1e, 0x73, 0xa6, 0x55, 0x28, 0xe8, 0xeb, 0xba, 0xc3, 0x92, 0xa4, 0x2c, 0xa0, + 0xaf, 0xeb, 0x36, 0xc3, 0x93, 0xb0, 0x40, 0xd6, 0xe7, 0x70, 0xa4, 0xe8, 0x4b, 0x0a, 0x84, 0xc6, + 0x59, 0xc4, 0x3f, 0x26, 0x40, 0x18, 0x77, 0xc0, 0xe8, 0x36, 0xa4, 0x48, 0x2c, 0xe2, 0x61, 0xa5, + 0xba, 0xc6, 0x02, 0xd5, 0x9a, 0x1d, 0xa8, 0xd6, 0x9a, 0x76, 0xa0, 0xda, 0xcc, 0x7d, 0xf6, 0xc5, + 0x6a, 0xec, 0x93, 0xbf, 0xae, 0xc6, 0x25, 0x2a, 0x81, 0x2e, 0x12, 0x5f, 0xa9, 0xa8, 0x03, 0x59, + 0xed, 0xd0, 0x29, 0xe7, 0x89, 0x23, 0x54, 0xd4, 0xc1, 0x76, 0x07, 0xed, 0x82, 0xd0, 0xd6, 0x06, + 0x26, 0x1e, 0x98, 0x43, 0x53, 0x66, 0x81, 0x90, 0x07, 0x13, 0x9f, 0x3b, 0x64, 0xe1, 0xb5, 0x66, + 0x73, 0x1e, 0x50, 0x46, 0xa9, 0xdc, 0xf6, 0x13, 0x88, 0x5b, 0x3d, 0x53, 0x7a, 0x6a, 0x47, 0xb1, + 0x34, 0xc3, 0xac, 0xa4, 0xae, 0x24, 0x03, 0xfd, 0xe1, 0xb1, 0xcd, 0x72, 0xa4, 0x77, 0x14, 0x0b, + 0x6f, 0xa6, 0xc8, 0x74, 0x25, 0x8f, 0x24, 0x7a, 0x06, 0xca, 0x8a, 0xae, 0xcb, 0xa6, 0xa5, 0x58, + 0x58, 0x6e, 0x9d, 0x5b, 0xd8, 0xa4, 0x81, 0x66, 0x41, 0x2a, 0x2a, 0xba, 0x7e, 0x48, 0xa8, 0x9b, + 0x84, 0x88, 0x9e, 0x86, 0x12, 0x89, 0x49, 0xaa, 0xd2, 0x93, 0xbb, 0x58, 0x3d, 0xed, 0x5a, 0x34, + 0xa4, 0x24, 0xa5, 0x22, 0xa7, 0x36, 0x28, 0x51, 0xec, 0x38, 0x27, 0x4e, 0xe3, 0x11, 0x42, 0x90, + 0xea, 0x28, 0x96, 0x42, 0x77, 0x72, 0x41, 0xa2, 0xbf, 0x09, 0x4d, 0x57, 0xac, 0x2e, 0xdf, 0x1f, + 0xfa, 0x1b, 0x5d, 0x80, 0x0c, 0x57, 0x9b, 0xa4, 0x6a, 0xf9, 0x08, 0x2d, 0x43, 0x5a, 0x37, 0xb4, + 0x33, 0x4c, 0x8f, 0x2e, 0x27, 0xb1, 0x81, 0xf8, 0x61, 0x02, 0x16, 0x27, 0x22, 0x17, 0xd1, 0xdb, + 0x55, 0xcc, 0xae, 0xfd, 0x2e, 0xf2, 0x1b, 0xbd, 0x44, 0xf4, 0x2a, 0x1d, 0x6c, 0xf0, 0x68, 0x5f, + 0x99, 0xdc, 0xea, 0x06, 0x7d, 0xce, 0xb7, 0x86, 0x73, 0xa3, 0x7b, 0x20, 0xf4, 0x14, 0xd3, 0x92, + 0x99, 0xf7, 0x97, 0x3d, 0x91, 0xff, 0x89, 0x89, 0x4d, 0x66, 0xb1, 0x82, 0x18, 0x34, 0x57, 0x52, + 0x22, 0xa2, 0x2e, 0x15, 0x1d, 0xc1, 0x72, 0xeb, 0xfc, 0x03, 0x65, 0x60, 0xa9, 0x03, 0x2c, 0x4f, + 0x9c, 0xda, 0x64, 0x2a, 0x71, 0x5f, 0x35, 0x5b, 0xb8, 0xab, 0x9c, 0xa9, 0x9a, 0x3d, 0xad, 0x25, + 0x47, 0xde, 0x39, 0x51, 0x53, 0x94, 0xa0, 0xe4, 0x0f, 0xbb, 0xa8, 0x04, 0x09, 0x6b, 0xc4, 0xd7, + 0x9f, 0xb0, 0x46, 0xe8, 0x45, 0x48, 0x91, 0x35, 0xd2, 0xb5, 0x97, 0x02, 0x5e, 0xc4, 0xe5, 0x9a, + 0xe7, 0x3a, 0x96, 0x28, 0xa7, 0x28, 0x3a, 0xb7, 0xc1, 0x09, 0xc5, 0xe3, 0x5a, 0xc5, 0x6b, 0x50, + 0x1e, 0x8b, 0xb3, 0x9e, 0xe3, 0x8b, 0x7b, 0x8f, 0x4f, 0x2c, 0x43, 0xd1, 0x17, 0x50, 0xc5, 0x0b, + 0xb0, 0x1c, 0x14, 0x1f, 0xc5, 0xae, 0x43, 0xf7, 0xc5, 0x39, 0x74, 0x0b, 0x72, 0x4e, 0x80, 0x64, + 0xb7, 0xf1, 0xe2, 0xc4, 0x2a, 0x6c, 0x66, 0xc9, 0x61, 0x25, 0xd7, 0x90, 0x58, 0x35, 0x35, 0x87, + 0x04, 0x9d, 0x78, 0x56, 0xd1, 0xf5, 0x86, 0x62, 0x76, 0xc5, 0x77, 0xa0, 0x12, 0x16, 0xfc, 0xc6, + 0x96, 0x91, 0x72, 0xac, 0xf0, 0x02, 0x64, 0x4e, 0x34, 0xa3, 0xaf, 0x58, 0x54, 0x59, 0x51, 0xe2, + 0x23, 0x62, 0x9d, 0x2c, 0x10, 0x26, 0x29, 0x99, 0x0d, 0x44, 0x19, 0x2e, 0x86, 0x06, 0x40, 0x22, + 0xa2, 0x0e, 0x3a, 0x98, 0xed, 0x67, 0x51, 0x62, 0x03, 0x57, 0x11, 0x9b, 0x2c, 0x1b, 0x90, 0xd7, + 0x9a, 0x74, 0xad, 0x54, 0x7f, 0x5e, 0xe2, 0x23, 0xf1, 0xb7, 0x49, 0xb8, 0x10, 0x1c, 0x06, 0xd1, + 0x15, 0x58, 0xe8, 0x2b, 0x23, 0xd9, 0x1a, 0xf1, 0xbb, 0xcc, 0x8e, 0x03, 0xfa, 0xca, 0xa8, 0x39, + 0x62, 0x17, 0x59, 0x80, 0xa4, 0x35, 0x32, 0x2b, 0x89, 0x2b, 0xc9, 0xab, 0x0b, 0x12, 0xf9, 0x89, + 0x8e, 0x60, 0xb1, 0xa7, 0xb5, 0x95, 0x9e, 0xec, 0xb1, 0x78, 0x6e, 0xec, 0x4f, 0x4d, 0x6c, 0x36, + 0x0b, 0x68, 0xb8, 0x33, 0x61, 0xf4, 0x65, 0xaa, 0x63, 0xd7, 0xb1, 0xfc, 0x6f, 0xc9, 0xea, 0x3d, + 0x67, 0x94, 0xf6, 0x79, 0x0a, 0xdb, 0x67, 0x67, 0xe6, 0xf6, 0xd9, 0x2f, 0xc2, 0xf2, 0x00, 0x8f, + 0x2c, 0xcf, 0x1c, 0x99, 0xe1, 0x64, 0xe9, 0x59, 0x20, 0xf2, 0xcc, 0x7d, 0x3f, 0xb1, 0x21, 0x74, + 0x8d, 0x66, 0x16, 0xba, 0x66, 0x62, 0x43, 0x56, 0x3a, 0x1d, 0x03, 0x9b, 0x26, 0xcd, 0x6c, 0x17, + 0x68, 0xba, 0x40, 0xe9, 0x1b, 0x8c, 0x2c, 0xfe, 0xc2, 0x7b, 0x56, 0xfe, 0x4c, 0x82, 0x9f, 0x44, + 0xdc, 0x3d, 0x89, 0x43, 0x58, 0xe6, 0xf2, 0x1d, 0xdf, 0x61, 0x24, 0xa2, 0x7a, 0x1e, 0x64, 0x8b, + 0x47, 0x38, 0x87, 0xe4, 0xa3, 0x9d, 0x83, 0xed, 0x6d, 0x53, 0x1e, 0x6f, 0xfb, 0x1f, 0x76, 0x36, + 0xaf, 0x3b, 0x51, 0xc4, 0x4d, 0xd3, 0x02, 0xa3, 0x88, 0xbb, 0xae, 0x84, 0xcf, 0xbd, 0xfd, 0x32, + 0x0e, 0xd5, 0xf0, 0xbc, 0x2c, 0x50, 0xd5, 0x73, 0xb0, 0xe8, 0xac, 0xc5, 0x99, 0x1f, 0xbb, 0xf5, + 0x82, 0xf3, 0x80, 0x4f, 0x30, 0x34, 0x2a, 0x3e, 0x0d, 0xa5, 0xb1, 0xac, 0x91, 0x9d, 0x42, 0xf1, + 0xcc, 0xfb, 0x7e, 0xf1, 0xa7, 0x49, 0xc7, 0xab, 0xfa, 0x52, 0xbb, 0x00, 0xcb, 0x7b, 0x13, 0x96, + 0x3a, 0xb8, 0xad, 0x76, 0xbe, 0xae, 0xe1, 0x2d, 0x72, 0xe9, 0xef, 0xed, 0x2e, 0x82, 0xdd, 0xfd, + 0xb9, 0x00, 0x39, 0x09, 0x9b, 0x3a, 0x49, 0xe9, 0xd0, 0x26, 0xe4, 0xf1, 0xa8, 0x8d, 0x75, 0xcb, + 0xce, 0x82, 0x83, 0xab, 0x09, 0xc6, 0x5d, 0xb7, 0x39, 0x49, 0x6d, 0xec, 0x88, 0xa1, 0x9b, 0x1c, + 0x06, 0x09, 0x47, 0x34, 0xb8, 0xb8, 0x17, 0x07, 0x79, 0xc9, 0xc6, 0x41, 0x92, 0xa1, 0xa5, 0x30, + 0x93, 0x1a, 0x03, 0x42, 0x6e, 0x72, 0x20, 0x24, 0x35, 0xe3, 0x65, 0x3e, 0x24, 0xa4, 0xe6, 0x43, + 0x42, 0xd2, 0x33, 0x96, 0x19, 0x02, 0x85, 0xbc, 0x64, 0x43, 0x21, 0x99, 0x19, 0x33, 0x1e, 0xc3, + 0x42, 0x76, 0xfc, 0x58, 0x48, 0x36, 0x24, 0xb4, 0xd9, 0xd2, 0x53, 0xc1, 0x90, 0xd7, 0x3c, 0x60, + 0x48, 0x2e, 0x14, 0x85, 0x60, 0x8a, 0x02, 0xd0, 0x90, 0x37, 0x7c, 0x68, 0x48, 0x7e, 0xc6, 0x3e, + 0x4c, 0x81, 0x43, 0xb6, 0xbc, 0x70, 0x08, 0x84, 0xa2, 0x2a, 0xfc, 0xdc, 0xc3, 0xf0, 0x90, 0x57, + 0x1c, 0x3c, 0xa4, 0x10, 0x0a, 0xec, 0xf0, 0xb5, 0x8c, 0x03, 0x22, 0xfb, 0x13, 0x80, 0x08, 0x03, + 0x30, 0x9e, 0x09, 0x55, 0x31, 0x03, 0x11, 0xd9, 0x9f, 0x40, 0x44, 0x8a, 0x33, 0x14, 0xce, 0x80, + 0x44, 0x7e, 0x10, 0x0c, 0x89, 0x84, 0x83, 0x16, 0x7c, 0x9a, 0xd1, 0x30, 0x11, 0x39, 0x04, 0x13, + 0x29, 0x87, 0xd6, 0xef, 0x4c, 0x7d, 0x64, 0x50, 0xe4, 0x28, 0x00, 0x14, 0x61, 0xf0, 0xc5, 0xd5, + 0x50, 0xe5, 0x11, 0x50, 0x91, 0xa3, 0x00, 0x54, 0x64, 0x71, 0xa6, 0xda, 0x99, 0xb0, 0xc8, 0x5d, + 0x3f, 0x2c, 0x82, 0x66, 0xdc, 0xb1, 0x50, 0x5c, 0xa4, 0x15, 0x86, 0x8b, 0x30, 0xec, 0xe2, 0xf9, + 0x50, 0x8d, 0x73, 0x00, 0x23, 0xfb, 0x13, 0xc0, 0xc8, 0xf2, 0x0c, 0x4b, 0x8b, 0x8a, 0x8c, 0x5c, + 0x23, 0x19, 0xc5, 0x98, 0xab, 0x26, 0xc9, 0x3d, 0x36, 0x0c, 0xcd, 0xe0, 0x18, 0x07, 0x1b, 0x88, + 0x57, 0x49, 0xa5, 0xec, 0xba, 0xe5, 0x29, 0x28, 0x0a, 0x2d, 0xa2, 0x3c, 0xae, 0x58, 0xfc, 0x5d, + 0xdc, 0x95, 0xa5, 0x05, 0xa6, 0xb7, 0xca, 0xce, 0xf3, 0x2a, 0xdb, 0x83, 0xad, 0x24, 0xfc, 0xd8, + 0xca, 0x2a, 0x14, 0x48, 0x71, 0x34, 0x06, 0x9b, 0x28, 0xba, 0x03, 0x9b, 0x5c, 0x87, 0x45, 0x9a, + 0x04, 0x30, 0x04, 0x86, 0x47, 0xd6, 0x14, 0x8d, 0xac, 0x65, 0xf2, 0x80, 0xed, 0x02, 0x0b, 0xb1, + 0x2f, 0xc0, 0x92, 0x87, 0xd7, 0x29, 0xba, 0x18, 0x86, 0x20, 0x38, 0xdc, 0x1b, 0xbc, 0xfa, 0xfa, + 0x43, 0xdc, 0xdd, 0x21, 0x17, 0x6f, 0x09, 0x82, 0x46, 0xe2, 0xdf, 0x10, 0x34, 0x92, 0xf8, 0xda, + 0xd0, 0x88, 0xb7, 0x88, 0x4c, 0xfa, 0x8b, 0xc8, 0x7f, 0xc4, 0xdd, 0x33, 0x71, 0x80, 0x8e, 0xb6, + 0xd6, 0xc1, 0xbc, 0xac, 0xa3, 0xbf, 0x49, 0x9a, 0xd5, 0xd3, 0x4e, 0x79, 0xf1, 0x46, 0x7e, 0x12, + 0x2e, 0x27, 0x76, 0xe6, 0x79, 0x68, 0x74, 0x2a, 0x42, 0x96, 0xbb, 0xf0, 0x8a, 0x50, 0x80, 0xe4, + 0x43, 0xcc, 0x22, 0xdd, 0x82, 0x44, 0x7e, 0x12, 0x3e, 0x6a, 0x64, 0x3c, 0x07, 0x61, 0x03, 0x74, + 0x1b, 0xf2, 0xb4, 0x5d, 0x23, 0x6b, 0xba, 0xc9, 0x03, 0x92, 0x2f, 0x5d, 0x63, 0x5d, 0x99, 0xb5, + 0x03, 0xc2, 0xb3, 0xaf, 0x9b, 0x52, 0x4e, 0xe7, 0xbf, 0x3c, 0x49, 0x53, 0xde, 0x97, 0x34, 0x5d, + 0x82, 0x3c, 0x99, 0xbd, 0xa9, 0x2b, 0x6d, 0x4c, 0x23, 0x4b, 0x5e, 0x72, 0x09, 0xe2, 0x03, 0x40, + 0x93, 0x71, 0x12, 0x35, 0x20, 0x83, 0xcf, 0xf0, 0xc0, 0x62, 0x39, 0x65, 0x61, 0xfd, 0xc2, 0x64, + 0xdd, 0x48, 0x1e, 0x6f, 0x56, 0xc8, 0x26, 0xff, 0xfd, 0x8b, 0x55, 0x81, 0x71, 0x3f, 0xaf, 0xf5, + 0x55, 0x0b, 0xf7, 0x75, 0xeb, 0x5c, 0xe2, 0xf2, 0xe2, 0x67, 0x71, 0x28, 0x8f, 0xc5, 0xcf, 0xc0, + 0xbd, 0xb5, 0x4d, 0x3e, 0xe1, 0x01, 0x96, 0x2e, 0x03, 0x9c, 0x2a, 0xa6, 0xfc, 0xbe, 0x32, 0xb0, + 0x70, 0x87, 0x6f, 0x67, 0xfe, 0x54, 0x31, 0xdf, 0xa2, 0x04, 0xff, 0xc2, 0x72, 0x63, 0x0b, 0xf3, + 0x14, 0xdb, 0x79, 0x6f, 0xb1, 0x8d, 0xaa, 0x90, 0xd3, 0x0d, 0x55, 0x33, 0x54, 0xeb, 0x9c, 0xee, + 0x46, 0x52, 0x72, 0xc6, 0x3b, 0xa9, 0x5c, 0x52, 0x48, 0xed, 0xa4, 0x72, 0x29, 0x21, 0xbd, 0x93, + 0xca, 0x65, 0x84, 0xec, 0x4e, 0x2a, 0x97, 0x15, 0x72, 0x3b, 0xa9, 0x5c, 0x41, 0x58, 0x10, 0x3f, + 0x4a, 0xb8, 0xb6, 0xee, 0xa2, 0x29, 0x51, 0x17, 0x13, 0xcd, 0x78, 0x56, 0x02, 0x96, 0xec, 0xa1, + 0x90, 0xd9, 0x93, 0xd1, 0xd0, 0xc4, 0x1d, 0x0e, 0xd8, 0x39, 0x63, 0xcf, 0xa1, 0x65, 0x1f, 0xed, + 0xd0, 0xa6, 0xef, 0xac, 0xf8, 0x63, 0x0a, 0xb1, 0xfa, 0x33, 0x11, 0x74, 0xe8, 0xad, 0x83, 0x86, + 0xf4, 0x0a, 0xda, 0xc6, 0x13, 0xf5, 0xae, 0xba, 0xf5, 0x12, 0x23, 0x9b, 0xe8, 0x6d, 0x78, 0x7c, + 0xcc, 0x8f, 0x38, 0xaa, 0x13, 0x51, 0xdd, 0xc9, 0x63, 0x7e, 0x77, 0x62, 0xab, 0x76, 0x37, 0x2b, + 0xf9, 0x88, 0x16, 0xbe, 0x0d, 0x25, 0x7f, 0x52, 0x15, 0x78, 0xfc, 0x4f, 0x41, 0xd1, 0xc0, 0x96, + 0xa2, 0x0e, 0x64, 0x5f, 0x05, 0xb8, 0xc0, 0x88, 0x1c, 0x6d, 0x3d, 0x80, 0xc7, 0x02, 0x93, 0x2b, + 0xf4, 0x32, 0xe4, 0xdd, 0xbc, 0x8c, 0xed, 0xea, 0x14, 0xdc, 0xcc, 0xe5, 0x15, 0x7f, 0x1f, 0x77, + 0x55, 0xfa, 0x91, 0xb8, 0x3a, 0x64, 0x0c, 0x6c, 0x0e, 0x7b, 0x0c, 0x1b, 0x2b, 0xad, 0xbf, 0x10, + 0x2d, 0x2d, 0x23, 0xd4, 0x61, 0xcf, 0x92, 0xb8, 0xb0, 0xf8, 0x00, 0x32, 0x8c, 0x82, 0x0a, 0x90, + 0x3d, 0xda, 0xbb, 0xb7, 0xb7, 0xff, 0xd6, 0x9e, 0x10, 0x43, 0x00, 0x99, 0x8d, 0x5a, 0xad, 0x7e, + 0xd0, 0x14, 0xe2, 0x28, 0x0f, 0xe9, 0x8d, 0xcd, 0x7d, 0xa9, 0x29, 0x24, 0x08, 0x59, 0xaa, 0xef, + 0xd4, 0x6b, 0x4d, 0x21, 0x89, 0x16, 0xa1, 0xc8, 0x7e, 0xcb, 0x77, 0xf7, 0xa5, 0xfb, 0x1b, 0x4d, + 0x21, 0xe5, 0x21, 0x1d, 0xd6, 0xf7, 0xb6, 0xea, 0x92, 0x90, 0x16, 0xff, 0x0b, 0x2e, 0x86, 0x26, + 0x72, 0x2e, 0xcc, 0x16, 0xf7, 0xc0, 0x6c, 0xe2, 0xcf, 0x13, 0xa4, 0x8a, 0x0f, 0xcb, 0xce, 0xd0, + 0xce, 0xd8, 0xc2, 0xd7, 0xe7, 0x48, 0xed, 0xc6, 0x56, 0x4f, 0x0a, 0x77, 0x03, 0x9f, 0x60, 0xab, + 0xdd, 0x65, 0xd9, 0x22, 0x0b, 0x4f, 0x45, 0xa9, 0xc8, 0xa9, 0x54, 0xc8, 0x64, 0x6c, 0xef, 0xe2, + 0xb6, 0x25, 0x33, 0x27, 0xc4, 0x8c, 0x2e, 0x4f, 0xd8, 0x08, 0xf5, 0x90, 0x11, 0xc5, 0x77, 0xe6, + 0xda, 0xcb, 0x3c, 0xa4, 0xa5, 0x7a, 0x53, 0x7a, 0x5b, 0x48, 0x22, 0x04, 0x25, 0xfa, 0x53, 0x3e, + 0xdc, 0xdb, 0x38, 0x38, 0x6c, 0xec, 0x93, 0xbd, 0x5c, 0x82, 0xb2, 0xbd, 0x97, 0x36, 0x31, 0x2d, + 0xfe, 0x29, 0x01, 0x8f, 0x87, 0xe4, 0x96, 0xe8, 0x36, 0x80, 0x35, 0x92, 0x0d, 0xdc, 0xd6, 0x8c, + 0x4e, 0xb8, 0x91, 0x35, 0x47, 0x12, 0xe5, 0x90, 0xf2, 0x16, 0xff, 0x65, 0x4e, 0x41, 0x67, 0xd1, + 0xab, 0x5c, 0x29, 0x59, 0x95, 0x7d, 0xd5, 0x2e, 0x07, 0x80, 0x90, 0xb8, 0x4d, 0x14, 0xd3, 0xbd, + 0xa5, 0x8a, 0x29, 0x3f, 0xba, 0x1f, 0xe4, 0x54, 0x22, 0xf6, 0x46, 0xe6, 0x73, 0x27, 0xe9, 0x47, + 0x73, 0x27, 0xe2, 0xaf, 0x92, 0xde, 0x8d, 0xf5, 0xa7, 0xd2, 0xfb, 0x90, 0x31, 0x2d, 0xc5, 0x1a, + 0x9a, 0xdc, 0xe0, 0x5e, 0x8e, 0x9a, 0x97, 0xaf, 0xd9, 0x3f, 0x0e, 0xa9, 0xb8, 0xc4, 0xd5, 0x7c, + 0xbf, 0xdf, 0xa6, 0x78, 0x0b, 0x4a, 0xfe, 0xcd, 0x09, 0xbf, 0x32, 0xae, 0xcf, 0x49, 0x88, 0x77, + 0xdc, 0x6c, 0xc7, 0x03, 0x11, 0x4e, 0xc2, 0x6f, 0xf1, 0x20, 0xf8, 0xed, 0xd7, 0x71, 0x78, 0x62, + 0x4a, 0x75, 0x82, 0xde, 0x1c, 0x3b, 0xe7, 0x57, 0xe6, 0xa9, 0x6d, 0xd6, 0x18, 0xcd, 0x7f, 0xd2, + 0xe2, 0x4d, 0x58, 0xf0, 0xd2, 0xa3, 0x2d, 0xf2, 0x27, 0x49, 0xd7, 0xe7, 0xfb, 0x71, 0xc2, 0x6f, + 0x2c, 0xad, 0x1b, 0xb3, 0xb3, 0xc4, 0x9c, 0x76, 0x16, 0x98, 0x2c, 0x24, 0xbf, 0xbd, 0x64, 0x21, + 0xf5, 0x88, 0xc9, 0x82, 0xf7, 0xc2, 0xa5, 0xfd, 0x17, 0x6e, 0x22, 0xae, 0x67, 0x02, 0xe2, 0xfa, + 0xdb, 0x00, 0x9e, 0xf6, 0xe1, 0x32, 0xa4, 0x0d, 0x6d, 0x38, 0xe8, 0x50, 0x33, 0x49, 0x4b, 0x6c, + 0x80, 0x6e, 0x41, 0x9a, 0x98, 0x9b, 0xbd, 0x99, 0x93, 0x9e, 0x97, 0x98, 0x8b, 0x07, 0xa1, 0x65, + 0xdc, 0xa2, 0x0a, 0x68, 0xb2, 0x85, 0x13, 0xf2, 0x8a, 0xd7, 0xfc, 0xaf, 0x78, 0x32, 0xb4, 0x19, + 0x14, 0xfc, 0xaa, 0x0f, 0x20, 0x4d, 0xcd, 0x83, 0xe4, 0x37, 0xb4, 0x0d, 0xc9, 0xcb, 0x53, 0xf2, + 0x1b, 0xfd, 0x10, 0x40, 0xb1, 0x2c, 0x43, 0x6d, 0x0d, 0xdd, 0x17, 0xac, 0x06, 0x9b, 0xd7, 0x86, + 0xcd, 0xb7, 0x79, 0x89, 0xdb, 0xd9, 0xb2, 0x2b, 0xea, 0xb1, 0x35, 0x8f, 0x42, 0x71, 0x0f, 0x4a, + 0x7e, 0x59, 0xbb, 0xa0, 0x62, 0x73, 0xf0, 0x17, 0x54, 0xac, 0x3e, 0xe6, 0x05, 0x95, 0x53, 0x8e, + 0x25, 0x59, 0xc7, 0x99, 0x0e, 0xc4, 0x7f, 0xc6, 0x61, 0xc1, 0x6b, 0x9d, 0xdf, 0x70, 0x1a, 0x3f, + 0xa3, 0x72, 0xb9, 0x38, 0x91, 0xc5, 0x67, 0x4f, 0x15, 0xf3, 0xe8, 0xbb, 0x4c, 0xe2, 0x3f, 0x8a, + 0x43, 0xce, 0x59, 0x7c, 0x48, 0xbb, 0xd7, 0xdd, 0xbb, 0x84, 0xb7, 0xb9, 0xc9, 0xfa, 0xc7, 0x49, + 0xa7, 0x2b, 0x7d, 0xc7, 0x49, 0xa8, 0xc2, 0x20, 0x64, 0xef, 0x4e, 0xdb, 0x8d, 0x79, 0x9e, 0x3f, + 0xfe, 0x8c, 0xcf, 0x83, 0x64, 0x12, 0xe8, 0x7f, 0x20, 0xa3, 0xb4, 0x1d, 0xe0, 0xbc, 0x14, 0x80, + 0xa4, 0xda, 0xac, 0x6b, 0xcd, 0xd1, 0x06, 0xe5, 0x94, 0xb8, 0x04, 0x9f, 0x55, 0xc2, 0xe9, 0x6a, + 0xbf, 0x4e, 0xf4, 0x32, 0x1e, 0xbf, 0xdb, 0x2c, 0x01, 0x1c, 0xed, 0xdd, 0xdf, 0xdf, 0xda, 0xbe, + 0xbb, 0x5d, 0xdf, 0xe2, 0x29, 0xd5, 0xd6, 0x56, 0x7d, 0x4b, 0x48, 0x10, 0x3e, 0xa9, 0x7e, 0x7f, + 0xff, 0xb8, 0xbe, 0x25, 0x24, 0xc5, 0x3b, 0x90, 0x77, 0x5c, 0x0f, 0xaa, 0x40, 0xd6, 0x6e, 0x02, + 0xc4, 0xb9, 0x03, 0xe0, 0x3d, 0x9d, 0x65, 0x48, 0xeb, 0xda, 0xfb, 0xbc, 0xa7, 0x9b, 0x94, 0xd8, + 0x40, 0xec, 0x40, 0x79, 0xcc, 0x6f, 0xa1, 0x3b, 0x90, 0xd5, 0x87, 0x2d, 0xd9, 0x36, 0xda, 0xb1, + 0x96, 0x89, 0x5d, 0xd7, 0x0f, 0x5b, 0x3d, 0xb5, 0x7d, 0x0f, 0x9f, 0xdb, 0xdb, 0xa4, 0x0f, 0x5b, + 0xf7, 0x98, 0x6d, 0xb3, 0xb7, 0x24, 0xbc, 0x6f, 0x39, 0x83, 0x9c, 0x7d, 0x55, 0xd1, 0xff, 0x42, + 0xde, 0x71, 0x89, 0xce, 0x87, 0x2e, 0xa1, 0xbe, 0x94, 0xab, 0x77, 0x45, 0xd0, 0x75, 0x58, 0x34, + 0xd5, 0xd3, 0x81, 0xdd, 0x30, 0x62, 0x38, 0x5a, 0x82, 0xde, 0x99, 0x32, 0x7b, 0xb0, 0x6b, 0x83, + 0x3f, 0x24, 0x12, 0x0a, 0xe3, 0xbe, 0xe2, 0xbb, 0x9c, 0x40, 0x40, 0xc4, 0x4e, 0x06, 0x45, 0xec, + 0x0f, 0x13, 0x50, 0xf0, 0xb4, 0xa1, 0xd0, 0x7f, 0x7b, 0x1c, 0x57, 0x29, 0x20, 0xd4, 0x78, 0x78, + 0xdd, 0x6f, 0x28, 0xfc, 0x0b, 0x4b, 0xcc, 0xbf, 0xb0, 0xb0, 0xae, 0x9f, 0xdd, 0xcd, 0x4a, 0xcd, + 0xdd, 0xcd, 0x7a, 0x1e, 0x90, 0xa5, 0x59, 0x4a, 0x4f, 0x3e, 0xd3, 0x2c, 0x75, 0x70, 0x2a, 0x33, + 0xd3, 0x60, 0x6e, 0x46, 0xa0, 0x4f, 0x8e, 0xe9, 0x83, 0x03, 0x6a, 0x25, 0x3f, 0x8a, 0x43, 0xce, + 0x29, 0xfb, 0xe6, 0xfd, 0x24, 0xe2, 0x02, 0x64, 0x78, 0x65, 0xc3, 0xbe, 0x89, 0xe0, 0xa3, 0xc0, + 0xb6, 0x5d, 0x15, 0x72, 0x7d, 0x6c, 0x29, 0xd4, 0x67, 0xb2, 0x30, 0xe9, 0x8c, 0xaf, 0xbf, 0x02, + 0x05, 0xcf, 0xd7, 0x29, 0xc4, 0x8d, 0xee, 0xd5, 0xdf, 0x12, 0x62, 0xd5, 0xec, 0xc7, 0x9f, 0x5e, + 0x49, 0xee, 0xe1, 0xf7, 0xc9, 0x0d, 0x93, 0xea, 0xb5, 0x46, 0xbd, 0x76, 0x4f, 0x88, 0x57, 0x0b, + 0x1f, 0x7f, 0x7a, 0x25, 0x2b, 0x61, 0xda, 0x65, 0xb9, 0x7e, 0x0f, 0xca, 0x63, 0x07, 0xe3, 0xbf, + 0xd0, 0x08, 0x4a, 0x5b, 0x47, 0x07, 0xbb, 0xdb, 0xb5, 0x8d, 0x66, 0x5d, 0x3e, 0xde, 0x6f, 0xd6, + 0x85, 0x38, 0x7a, 0x1c, 0x96, 0x76, 0xb7, 0xdf, 0x68, 0x34, 0xe5, 0xda, 0xee, 0x76, 0x7d, 0xaf, + 0x29, 0x6f, 0x34, 0x9b, 0x1b, 0xb5, 0x7b, 0x42, 0x62, 0xfd, 0x37, 0x05, 0x28, 0x6f, 0x6c, 0xd6, + 0xb6, 0x49, 0x6d, 0xa7, 0xb6, 0x15, 0xea, 0x1e, 0x6a, 0x90, 0xa2, 0x90, 0xed, 0xd4, 0xef, 0x8d, + 0xab, 0xd3, 0xdb, 0x70, 0xe8, 0x2e, 0xa4, 0x29, 0x9a, 0x8b, 0xa6, 0x7f, 0x80, 0x5c, 0x9d, 0xd1, + 0x97, 0x23, 0x93, 0xa1, 0xd7, 0x69, 0xea, 0x17, 0xc9, 0xd5, 0xe9, 0x6d, 0x3a, 0xb4, 0x0b, 0x59, + 0x1b, 0x6c, 0x9b, 0xf5, 0x6d, 0x6f, 0x75, 0x66, 0xbf, 0x8b, 0x2c, 0x8d, 0x81, 0xa2, 0xd3, 0x3f, + 0x56, 0xae, 0xce, 0x68, 0xe0, 0xa1, 0x6d, 0xc8, 0x70, 0x84, 0x64, 0xc6, 0x77, 0xba, 0xd5, 0x59, + 0x7d, 0x2b, 0x24, 0x41, 0xde, 0x85, 0x9b, 0x67, 0x7f, 0x82, 0x5d, 0x8d, 0xd0, 0x9b, 0x44, 0x0f, + 0xa0, 0xe8, 0x47, 0x5d, 0xa2, 0x7d, 0x0b, 0x5c, 0x8d, 0xd8, 0x21, 0x23, 0xfa, 0xfd, 0x10, 0x4c, + 0xb4, 0x6f, 0x83, 0xab, 0x11, 0x1b, 0x66, 0xe8, 0x5d, 0x58, 0x9c, 0x84, 0x48, 0xa2, 0x7f, 0x2a, + 0x5c, 0x9d, 0xa3, 0x85, 0x86, 0xfa, 0x80, 0x02, 0xa0, 0x95, 0x39, 0xbe, 0x1c, 0xae, 0xce, 0xd3, + 0x51, 0x43, 0x1d, 0x28, 0x8f, 0xc3, 0x15, 0x51, 0xbf, 0x24, 0xae, 0x46, 0xee, 0xae, 0xb1, 0xb7, + 0xf8, 0x6b, 0xf7, 0xa8, 0x5f, 0x16, 0x57, 0x23, 0x37, 0xdb, 0xd0, 0x11, 0x80, 0xa7, 0xf6, 0x8c, + 0xf0, 0xa5, 0x71, 0x35, 0x4a, 0xdb, 0x0d, 0xe9, 0xb0, 0x14, 0x54, 0x94, 0xce, 0xf3, 0xe1, 0x71, + 0x75, 0xae, 0x6e, 0x1c, 0xb1, 0x67, 0x7f, 0x79, 0x19, 0xed, 0x43, 0xe4, 0x6a, 0xc4, 0xb6, 0xdc, + 0x66, 0xfd, 0xb3, 0x2f, 0x57, 0xe2, 0x9f, 0x7f, 0xb9, 0x12, 0xff, 0xdb, 0x97, 0x2b, 0xf1, 0x4f, + 0xbe, 0x5a, 0x89, 0x7d, 0xfe, 0xd5, 0x4a, 0xec, 0x2f, 0x5f, 0xad, 0xc4, 0xfe, 0xef, 0xb9, 0x53, + 0xd5, 0xea, 0x0e, 0x5b, 0x6b, 0x6d, 0xad, 0x7f, 0xc3, 0xfb, 0x9f, 0x94, 0xa0, 0xff, 0xc9, 0xb4, + 0x32, 0x34, 0xa0, 0xde, 0xfc, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x7e, 0xbe, 0x60, 0x47, + 0x33, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -7185,13 +7175,6 @@ func (m *ResponseCheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.MempoolError) > 0 { - i -= len(m.MempoolError) - copy(dAtA[i:], m.MempoolError) - i = encodeVarintTypes(dAtA, i, uint64(len(m.MempoolError))) - i-- - dAtA[i] = 0x5a - } if m.Priority != 0 { i = encodeVarintTypes(dAtA, i, uint64(m.Priority)) i-- @@ -9547,10 +9530,6 @@ func (m *ResponseCheckTx) Size() (n int) { if m.Priority != 0 { n += 1 + sovTypes(uint64(m.Priority)) } - l = len(m.MempoolError) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } return n } @@ -10798,10 +10777,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -10883,10 +10859,7 @@ func (m *RequestEcho) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -10936,10 +10909,7 @@ func (m *RequestFlush) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -11091,10 +11061,7 @@ func (m *RequestInfo) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -11332,10 +11299,7 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -11490,10 +11454,7 @@ func (m *RequestQuery) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -11677,10 +11638,7 @@ func (m *RequestBeginBlock) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -11783,10 +11741,7 @@ func (m *RequestCheckTx) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -11870,10 +11825,7 @@ func (m *RequestDeliverTx) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -11942,10 +11894,7 @@ func (m *RequestEndBlock) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -11995,10 +11944,7 @@ func (m *RequestCommit) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -12048,10 +11994,7 @@ func (m *RequestListSnapshots) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -12171,10 +12114,7 @@ func (m *RequestOfferSnapshot) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -12281,10 +12221,7 @@ func (m *RequestLoadSnapshotChunk) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -12419,10 +12356,7 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -12710,10 +12644,7 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -13016,10 +12947,7 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -13122,10 +13050,7 @@ func (m *RequestExtendVote) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -13296,10 +13221,7 @@ func (m *RequestVerifyVoteExtension) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -13602,10 +13524,7 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -14355,10 +14274,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -14440,10 +14356,7 @@ func (m *ResponseException) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -14525,10 +14438,7 @@ func (m *ResponseEcho) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -14578,10 +14488,7 @@ func (m *ResponseFlush) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -14767,10 +14674,7 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -14924,10 +14828,7 @@ func (m *ResponseInitChain) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -15234,10 +15135,7 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -15321,10 +15219,7 @@ func (m *ResponseBeginBlock) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -15523,48 +15418,13 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { break } } - case 11: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MempoolError", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.MempoolError = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -15835,10 +15695,7 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -15992,10 +15849,7 @@ func (m *ResponseEndBlock) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -16098,10 +15952,7 @@ func (m *ResponseCommit) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -16185,10 +16036,7 @@ func (m *ResponseListSnapshots) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -16257,10 +16105,7 @@ func (m *ResponseOfferSnapshot) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -16344,10 +16189,7 @@ func (m *ResponseLoadSnapshotChunk) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -16524,10 +16366,7 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -16749,10 +16588,7 @@ func (m *ResponsePrepareProposal) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -16959,10 +16795,7 @@ func (m *ResponseProcessProposal) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -17046,10 +16879,7 @@ func (m *ResponseExtendVote) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -17118,10 +16948,7 @@ func (m *ResponseVerifyVoteExtension) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -17362,10 +17189,7 @@ func (m *ResponseFinalizeBlock) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -17468,10 +17292,7 @@ func (m *CommitInfo) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -17574,10 +17395,7 @@ func (m *ExtendedCommitInfo) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -17693,10 +17511,7 @@ func (m *Event) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -17830,10 +17645,7 @@ func (m *EventAttribute) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -18104,10 +17916,7 @@ func (m *ExecTxResult) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -18262,10 +18071,7 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -18368,10 +18174,7 @@ func (m *TxRecord) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -18474,10 +18277,7 @@ func (m *Validator) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -18579,10 +18379,7 @@ func (m *ValidatorUpdate) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -18685,10 +18482,7 @@ func (m *VoteInfo) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -18825,10 +18619,7 @@ func (m *ExtendedVoteInfo) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -19001,10 +18792,7 @@ func (m *Misbehavior) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -19179,10 +18967,7 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { diff --git a/internal/mempool/mempool.go b/internal/mempool/mempool.go index ef85af088..caee97ff8 100644 --- a/internal/mempool/mempool.go +++ b/internal/mempool/mempool.go @@ -278,8 +278,11 @@ func (txmp *TxMempool) CheckTx( } txmp.defaultTxCallback(tx, res) - txmp.initTxCallback(wtx, res, txInfo) + err = txmp.initTxCallback(wtx, res, txInfo) + if err != nil { + return err + } if cb != nil { cb(res) } @@ -488,7 +491,7 @@ func (txmp *TxMempool) Update( // // NOTE: // - An explicit lock is NOT required. -func (txmp *TxMempool) initTxCallback(wtx *WrappedTx, res *abci.ResponseCheckTx, txInfo TxInfo) { +func (txmp *TxMempool) initTxCallback(wtx *WrappedTx, res *abci.ResponseCheckTx, txInfo TxInfo) error { var err error if txmp.postCheck != nil { err = txmp.postCheck(wtx.tx, res) @@ -510,10 +513,7 @@ func (txmp *TxMempool) initTxCallback(wtx *WrappedTx, res *abci.ResponseCheckTx, if !txmp.config.KeepInvalidTxsInCache { txmp.cache.Remove(wtx.tx) } - if err != nil { - res.MempoolError = err.Error() - } - return + return err } sender := res.Sender @@ -527,7 +527,7 @@ func (txmp *TxMempool) initTxCallback(wtx *WrappedTx, res *abci.ResponseCheckTx, "sender", sender, ) txmp.metrics.RejectedTxs.Add(1) - return + return nil } } @@ -548,7 +548,7 @@ func (txmp *TxMempool) initTxCallback(wtx *WrappedTx, res *abci.ResponseCheckTx, "err", err.Error(), ) txmp.metrics.RejectedTxs.Add(1) - return + return nil } // evict an existing transaction(s) @@ -588,6 +588,7 @@ func (txmp *TxMempool) initTxCallback(wtx *WrappedTx, res *abci.ResponseCheckTx, "num_txs", txmp.Size(), ) txmp.notifyTxsAvailable() + return nil } // defaultTxCallback is the CheckTx application callback used when a diff --git a/internal/mempool/mempool_test.go b/internal/mempool/mempool_test.go index 33b6dd8aa..538cb3e1f 100644 --- a/internal/mempool/mempool_test.go +++ b/internal/mempool/mempool_test.go @@ -622,10 +622,17 @@ func TestTxMempool_CheckTxPostCheckError(t *testing.T) { expectedErrString := "" if testCase.err != nil { expectedErrString = testCase.err.Error() + require.Equal(t, expectedErrString, txmp.postCheck(tx, res).Error()) + } else { + require.Equal(t, nil, txmp.postCheck(tx, res)) } - require.Equal(t, expectedErrString, res.MempoolError) } - require.NoError(t, txmp.CheckTx(ctx, tx, callback, TxInfo{SenderID: 0})) + if testCase.err == nil { + require.NoError(t, txmp.CheckTx(ctx, tx, callback, TxInfo{SenderID: 0})) + } else { + err = txmp.CheckTx(ctx, tx, callback, TxInfo{SenderID: 0}) + fmt.Print(err.Error()) + } }) } } diff --git a/internal/rpc/core/mempool.go b/internal/rpc/core/mempool.go index ca649ec3a..195179584 100644 --- a/internal/rpc/core/mempool.go +++ b/internal/rpc/core/mempool.go @@ -54,11 +54,10 @@ func (env *Environment) BroadcastTxSync(ctx context.Context, req *coretypes.Requ return nil, fmt.Errorf("broadcast confirmation not received: %w", ctx.Err()) case r := <-resCh: return &coretypes.ResultBroadcastTx{ - Code: r.Code, - Data: r.Data, - Codespace: r.Codespace, - MempoolError: r.MempoolError, - Hash: req.Tx.Hash(), + Code: r.Code, + Data: r.Data, + Codespace: r.Codespace, + Hash: req.Tx.Hash(), }, nil } } @@ -90,7 +89,7 @@ func (env *Environment) BroadcastTxCommit(ctx context.Context, req *coretypes.Re return &coretypes.ResultBroadcastTxCommit{ CheckTx: *r, Hash: req.Tx.Hash(), - }, fmt.Errorf("transaction encountered error (%s)", r.MempoolError) + }, fmt.Errorf("wrong ABCI CodeType, got (%d) instead of OK", r.Code) } if !indexer.KVSinkEnabled(env.EventSinks) { diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 6e3579c8d..90632bf6e 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -256,12 +256,7 @@ message ResponseCheckTx { string sender = 9; int64 priority = 10; - // mempool_error is set by Tendermint. - - // ABCI applications creating a ResponseCheckTX should not set mempool_error. - string mempool_error = 11; - - reserved 3, 4, 6, 7; // see https://github.com/tendermint/tendermint/issues/8543 + reserved 3, 4, 6, 7, 11; // see https://github.com/tendermint/tendermint/issues/8543 } message ResponseDeliverTx { diff --git a/proto/tendermint/blocksync/types.pb.go b/proto/tendermint/blocksync/types.pb.go index 910ccea47..8757f8ab3 100644 --- a/proto/tendermint/blocksync/types.pb.go +++ b/proto/tendermint/blocksync/types.pb.go @@ -927,10 +927,7 @@ func (m *BlockRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -999,10 +996,7 @@ func (m *NoBlockResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1124,10 +1118,7 @@ func (m *BlockResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1177,10 +1168,7 @@ func (m *StatusRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1268,10 +1256,7 @@ func (m *StatusResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1496,10 +1481,7 @@ func (m *Message) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/consensus/types.pb.go b/proto/tendermint/consensus/types.pb.go index d542d929e..4ae9abc9e 100644 --- a/proto/tendermint/consensus/types.pb.go +++ b/proto/tendermint/consensus/types.pb.go @@ -1935,10 +1935,7 @@ func (m *NewRoundStep) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2115,10 +2112,7 @@ func (m *NewValidBlock) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2201,10 +2195,7 @@ func (m *Proposal) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2325,10 +2316,7 @@ func (m *ProposalPOL) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2449,10 +2437,7 @@ func (m *BlockPart) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2538,10 +2523,7 @@ func (m *Vote) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2667,10 +2649,7 @@ func (m *HasVote) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2810,10 +2789,7 @@ func (m *VoteSetMaj23) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2986,10 +2962,7 @@ func (m *VoteSetBits) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -3354,10 +3327,7 @@ func (m *Message) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/consensus/wal.pb.go b/proto/tendermint/consensus/wal.pb.go index 86ff1be01..fd80819cd 100644 --- a/proto/tendermint/consensus/wal.pb.go +++ b/proto/tendermint/consensus/wal.pb.go @@ -921,10 +921,7 @@ func (m *MsgInfo) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthWal - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthWal } if (iNdEx + skippy) > l { @@ -1064,10 +1061,7 @@ func (m *TimeoutInfo) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthWal - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthWal } if (iNdEx + skippy) > l { @@ -1136,10 +1130,7 @@ func (m *EndHeight) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthWal - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthWal } if (iNdEx + skippy) > l { @@ -1329,10 +1320,7 @@ func (m *WALMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthWal - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthWal } if (iNdEx + skippy) > l { @@ -1451,10 +1439,7 @@ func (m *TimedWALMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthWal - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthWal } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/crypto/keys.pb.go b/proto/tendermint/crypto/keys.pb.go index 8ff4c4a4f..24c6c1b1b 100644 --- a/proto/tendermint/crypto/keys.pb.go +++ b/proto/tendermint/crypto/keys.pb.go @@ -687,10 +687,7 @@ func (m *PublicKey) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthKeys - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthKeys } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/crypto/proof.pb.go b/proto/tendermint/crypto/proof.pb.go index 97350c64c..82fb943fc 100644 --- a/proto/tendermint/crypto/proof.pb.go +++ b/proto/tendermint/crypto/proof.pb.go @@ -820,10 +820,7 @@ func (m *Proof) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthProof - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthProof } if (iNdEx + skippy) > l { @@ -943,10 +940,7 @@ func (m *ValueOp) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthProof - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthProof } if (iNdEx + skippy) > l { @@ -1092,10 +1086,7 @@ func (m *DominoOp) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthProof - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthProof } if (iNdEx + skippy) > l { @@ -1245,10 +1236,7 @@ func (m *ProofOp) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthProof - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthProof } if (iNdEx + skippy) > l { @@ -1332,10 +1320,7 @@ func (m *ProofOps) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthProof - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthProof } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/libs/bits/types.pb.go b/proto/tendermint/libs/bits/types.pb.go index ad87f854f..c0ebcb976 100644 --- a/proto/tendermint/libs/bits/types.pb.go +++ b/proto/tendermint/libs/bits/types.pb.go @@ -307,10 +307,7 @@ func (m *BitArray) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/mempool/types.pb.go b/proto/tendermint/mempool/types.pb.go index 3487652bc..11e259551 100644 --- a/proto/tendermint/mempool/types.pb.go +++ b/proto/tendermint/mempool/types.pb.go @@ -370,10 +370,7 @@ func (m *Txs) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -458,10 +455,7 @@ func (m *Message) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/p2p/conn.pb.go b/proto/tendermint/p2p/conn.pb.go index 7c26d3fcd..47a3bb0cd 100644 --- a/proto/tendermint/p2p/conn.pb.go +++ b/proto/tendermint/p2p/conn.pb.go @@ -723,10 +723,7 @@ func (m *PacketPing) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthConn - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthConn } if (iNdEx + skippy) > l { @@ -776,10 +773,7 @@ func (m *PacketPong) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthConn - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthConn } if (iNdEx + skippy) > l { @@ -902,10 +896,7 @@ func (m *PacketMsg) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthConn - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthConn } if (iNdEx + skippy) > l { @@ -1060,10 +1051,7 @@ func (m *Packet) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthConn - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthConn } if (iNdEx + skippy) > l { @@ -1180,10 +1168,7 @@ func (m *AuthSigMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthConn - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthConn } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/p2p/pex.pb.go b/proto/tendermint/p2p/pex.pb.go index 25d636e43..15ccce15e 100644 --- a/proto/tendermint/p2p/pex.pb.go +++ b/proto/tendermint/p2p/pex.pb.go @@ -587,10 +587,7 @@ func (m *PexAddress) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthPex - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthPex } if (iNdEx + skippy) > l { @@ -640,10 +637,7 @@ func (m *PexRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthPex - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthPex } if (iNdEx + skippy) > l { @@ -727,10 +721,7 @@ func (m *PexResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthPex - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthPex } if (iNdEx + skippy) > l { @@ -850,10 +841,7 @@ func (m *PexMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthPex - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthPex } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/p2p/types.pb.go b/proto/tendermint/p2p/types.pb.go index a0e647ee7..bffa6884f 100644 --- a/proto/tendermint/p2p/types.pb.go +++ b/proto/tendermint/p2p/types.pb.go @@ -917,10 +917,7 @@ func (m *ProtocolVersion) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1230,10 +1227,7 @@ func (m *NodeInfo) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1347,10 +1341,7 @@ func (m *NodeInfoOther) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1502,10 +1493,7 @@ func (m *PeerInfo) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1678,10 +1666,7 @@ func (m *PeerAddressInfo) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/privval/types.pb.go b/proto/tendermint/privval/types.pb.go index da30f7527..56b35e727 100644 --- a/proto/tendermint/privval/types.pb.go +++ b/proto/tendermint/privval/types.pb.go @@ -1708,10 +1708,7 @@ func (m *RemoteSignerError) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1793,10 +1790,7 @@ func (m *PubKeyRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1915,10 +1909,7 @@ func (m *PubKeyResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2036,10 +2027,7 @@ func (m *SignVoteRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2158,10 +2146,7 @@ func (m *SignedVoteResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2279,10 +2264,7 @@ func (m *SignProposalRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2401,10 +2383,7 @@ func (m *SignedProposalResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2454,10 +2433,7 @@ func (m *PingRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2507,10 +2483,7 @@ func (m *PingResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2840,10 +2813,7 @@ func (m *Message) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2960,10 +2930,7 @@ func (m *AuthSigMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/state/types.pb.go b/proto/tendermint/state/types.pb.go index 8db184011..af5c64ecf 100644 --- a/proto/tendermint/state/types.pb.go +++ b/proto/tendermint/state/types.pb.go @@ -944,10 +944,7 @@ func (m *ABCIResponses) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1052,10 +1049,7 @@ func (m *ValidatorsInfo) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1157,10 +1151,7 @@ func (m *ConsensusParamsInfo) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1275,10 +1266,7 @@ func (m *Version) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1744,10 +1732,7 @@ func (m *State) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/statesync/types.pb.go b/proto/tendermint/statesync/types.pb.go index 93e844730..5541c2803 100644 --- a/proto/tendermint/statesync/types.pb.go +++ b/proto/tendermint/statesync/types.pb.go @@ -1740,10 +1740,7 @@ func (m *Message) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1793,10 +1790,7 @@ func (m *SnapshotsRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -1971,10 +1965,7 @@ func (m *SnapshotsResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2081,10 +2072,7 @@ func (m *ChunkRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2245,10 +2233,7 @@ func (m *ChunkResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2317,10 +2302,7 @@ func (m *LightBlockRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2406,10 +2388,7 @@ func (m *LightBlockResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2478,10 +2457,7 @@ func (m *ParamsRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2583,10 +2559,7 @@ func (m *ParamsResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/types/block.pb.go b/proto/tendermint/types/block.pb.go index aacb90fab..f2077aad8 100644 --- a/proto/tendermint/types/block.pb.go +++ b/proto/tendermint/types/block.pb.go @@ -389,10 +389,7 @@ func (m *Block) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthBlock - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthBlock } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go index e08342a46..50c0c84fa 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/tendermint/types/canonical.pb.go @@ -920,10 +920,7 @@ func (m *CanonicalBlockID) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthCanonical - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthCanonical } if (iNdEx + skippy) > l { @@ -1026,10 +1023,7 @@ func (m *CanonicalPartSetHeader) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthCanonical - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthCanonical } if (iNdEx + skippy) > l { @@ -1238,10 +1232,7 @@ func (m *CanonicalProposal) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthCanonical - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthCanonical } if (iNdEx + skippy) > l { @@ -1431,10 +1422,7 @@ func (m *CanonicalVote) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthCanonical - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthCanonical } if (iNdEx + skippy) > l { @@ -1570,10 +1558,7 @@ func (m *CanonicalVoteExtension) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthCanonical - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthCanonical } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/types/events.pb.go b/proto/tendermint/types/events.pb.go index 1c49aef64..a9aa26a79 100644 --- a/proto/tendermint/types/events.pb.go +++ b/proto/tendermint/types/events.pb.go @@ -285,10 +285,7 @@ func (m *EventDataRoundState) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthEvents } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/types/evidence.pb.go b/proto/tendermint/types/evidence.pb.go index 746d85313..052fb0e6b 100644 --- a/proto/tendermint/types/evidence.pb.go +++ b/proto/tendermint/types/evidence.pb.go @@ -827,10 +827,7 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthEvidence - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthEvidence } if (iNdEx + skippy) > l { @@ -1023,10 +1020,7 @@ func (m *DuplicateVoteEvidence) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthEvidence - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthEvidence } if (iNdEx + skippy) > l { @@ -1217,10 +1211,7 @@ func (m *LightClientAttackEvidence) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthEvidence - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthEvidence } if (iNdEx + skippy) > l { @@ -1304,10 +1295,7 @@ func (m *EvidenceList) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthEvidence - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthEvidence } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/types/params.pb.go b/proto/tendermint/types/params.pb.go index a13ff7723..89ca14f95 100644 --- a/proto/tendermint/types/params.pb.go +++ b/proto/tendermint/types/params.pb.go @@ -1935,10 +1935,7 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthParams - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthParams } if (iNdEx + skippy) > l { @@ -2026,10 +2023,7 @@ func (m *BlockParams) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthParams - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthParams } if (iNdEx + skippy) > l { @@ -2150,10 +2144,7 @@ func (m *EvidenceParams) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthParams - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthParams } if (iNdEx + skippy) > l { @@ -2235,10 +2226,7 @@ func (m *ValidatorParams) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthParams - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthParams } if (iNdEx + skippy) > l { @@ -2307,10 +2295,7 @@ func (m *VersionParams) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthParams - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthParams } if (iNdEx + skippy) > l { @@ -2398,10 +2383,7 @@ func (m *HashedParams) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthParams - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthParams } if (iNdEx + skippy) > l { @@ -2523,10 +2505,7 @@ func (m *SynchronyParams) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthParams - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthParams } if (iNdEx + skippy) > l { @@ -2776,10 +2755,7 @@ func (m *TimeoutParams) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthParams - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthParams } if (iNdEx + skippy) > l { @@ -2868,10 +2844,7 @@ func (m *ABCIParams) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthParams - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthParams } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index f6f8a33f3..fcfbc01f5 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -2650,10 +2650,7 @@ func (m *PartSetHeader) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2789,10 +2786,7 @@ func (m *Part) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -2909,10 +2903,7 @@ func (m *BlockID) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -3418,10 +3409,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -3503,10 +3491,7 @@ func (m *Data) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -3834,10 +3819,7 @@ func (m *Vote) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -3992,10 +3974,7 @@ func (m *Commit) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -4165,10 +4144,7 @@ func (m *CommitSig) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -4323,10 +4299,7 @@ func (m *ExtendedCommit) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -4564,10 +4537,7 @@ func (m *ExtendedCommitSig) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -4793,10 +4763,7 @@ func (m *Proposal) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -4918,10 +4885,7 @@ func (m *SignedHeader) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -5043,10 +5007,7 @@ func (m *LightBlock) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -5200,10 +5161,7 @@ func (m *BlockMeta) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { @@ -5357,10 +5315,7 @@ func (m *TxProof) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/types/validator.pb.go b/proto/tendermint/types/validator.pb.go index 2c3468b83..23b30ed3c 100644 --- a/proto/tendermint/types/validator.pb.go +++ b/proto/tendermint/types/validator.pb.go @@ -583,10 +583,7 @@ func (m *ValidatorSet) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthValidator - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthValidator } if (iNdEx + skippy) > l { @@ -741,10 +738,7 @@ func (m *Validator) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthValidator - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthValidator } if (iNdEx + skippy) > l { @@ -849,10 +843,7 @@ func (m *SimpleValidator) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthValidator - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthValidator } if (iNdEx + skippy) > l { diff --git a/proto/tendermint/version/types.pb.go b/proto/tendermint/version/types.pb.go index 7aefd7747..76a94fd3c 100644 --- a/proto/tendermint/version/types.pb.go +++ b/proto/tendermint/version/types.pb.go @@ -265,10 +265,7 @@ func (m *Consensus) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTypes } if (iNdEx + skippy) > l { diff --git a/rpc/coretypes/responses.go b/rpc/coretypes/responses.go index 8fda32683..ef740f89d 100644 --- a/rpc/coretypes/responses.go +++ b/rpc/coretypes/responses.go @@ -231,11 +231,10 @@ type ResultConsensusState struct { // CheckTx result type ResultBroadcastTx struct { - Code uint32 `json:"code"` - Data bytes.HexBytes `json:"data"` - Codespace string `json:"codespace"` - MempoolError string `json:"mempool_error"` - Hash bytes.HexBytes `json:"hash"` + Code uint32 `json:"code"` + Data bytes.HexBytes `json:"data"` + Codespace string `json:"codespace"` + Hash bytes.HexBytes `json:"hash"` } // CheckTx and DeliverTx results