diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 5b9860d6b7e..3eea01013f4 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -13,6 +13,7 @@ import ( proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + _ "github.com/golang/protobuf/ptypes/duration" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -2748,6 +2749,9 @@ type ResponseFinalizeBlock struct { ConsensusParamUpdates *types1.ConsensusParams `protobuf:"bytes,4,opt,name=consensus_param_updates,json=consensusParamUpdates,proto3" json:"consensus_param_updates,omitempty"` // app_hash is the hash of the applications' state which is used to confirm that execution of the transactions was deterministic. It is up to the application to decide which algorithm to use. AppHash []byte `protobuf:"bytes,5,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` + // delay between the time when this block is committed and the next height is started. + // previously `timeout_commit` in config.toml + NextBlockDelay time.Duration `protobuf:"bytes,6,opt,name=next_block_delay,json=nextBlockDelay,proto3,stdduration" json:"next_block_delay"` } func (m *ResponseFinalizeBlock) Reset() { *m = ResponseFinalizeBlock{} } @@ -2818,6 +2822,13 @@ func (m *ResponseFinalizeBlock) GetAppHash() []byte { return nil } +func (m *ResponseFinalizeBlock) GetNextBlockDelay() time.Duration { + if m != nil { + return m.NextBlockDelay + } + return 0 +} + type CommitInfo struct { Round int32 `protobuf:"varint,1,opt,name=round,proto3" json:"round,omitempty"` Votes []VoteInfo `protobuf:"bytes,2,rep,name=votes,proto3" json:"votes"` @@ -3664,205 +3675,208 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 3167 bytes of a gzipped FileDescriptorProto + // 3216 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcb, 0x73, 0x23, 0xd5, 0xd5, 0x57, 0xeb, 0xad, 0xa3, 0x87, 0xdb, 0xd7, 0x9e, 0x41, 0x23, 0x06, 0xdb, 0x34, 0x05, 0x0c, 0x03, 0xd8, 0x7c, 0x9e, 0x6f, 0x78, 0xd4, 0xc0, 0x57, 0x25, 0x6b, 0x34, 0x9f, 0xec, 0x31, 0xb6, 0x69, 0xcb, 0x43, 0x91, 0x07, 0x4d, 0x5b, 0xba, 0xb2, 0x9a, 0x91, 0xd4, 0x4d, 0xf7, 0x95, 0x91, 0x59, 0xa5, 0x42, 0x52, 0x95, 0x62, 0x45, 0x55, 0xb2, 0x60, 0x11, 0x16, 0x59, 0x64, 0x93, 0xbf, - 0x20, 0xab, 0x64, 0x93, 0x05, 0x8b, 0x2c, 0x58, 0x66, 0x45, 0x52, 0xb0, 0x63, 0x9b, 0x45, 0xb6, - 0xa9, 0xfb, 0xe8, 0x97, 0xa4, 0xb6, 0xa4, 0x81, 0x2c, 0x52, 0xc9, 0xae, 0xef, 0xe9, 0x73, 0xce, - 0xed, 0x7b, 0xee, 0xb9, 0xe7, 0xf1, 0xeb, 0x0b, 0x8f, 0x13, 0x3c, 0x68, 0x63, 0xbb, 0x6f, 0x0c, - 0xc8, 0x96, 0x7e, 0xda, 0x32, 0xb6, 0xc8, 0x85, 0x85, 0x9d, 0x4d, 0xcb, 0x36, 0x89, 0x89, 0x96, - 0xfc, 0x97, 0x9b, 0xf4, 0x65, 0xe5, 0x89, 0x00, 0x77, 0xcb, 0xbe, 0xb0, 0x88, 0xb9, 0x65, 0xd9, - 0xa6, 0xd9, 0xe1, 0xfc, 0x95, 0xeb, 0x93, 0xaf, 0x1f, 0xe2, 0x0b, 0xa1, 0x2d, 0x24, 0xcc, 0x66, - 0xd9, 0xb2, 0x74, 0x5b, 0xef, 0xbb, 0xaf, 0x37, 0x26, 0x5e, 0x9f, 0xeb, 0x3d, 0xa3, 0xad, 0x13, - 0xd3, 0x16, 0x1c, 0xeb, 0x67, 0xa6, 0x79, 0xd6, 0xc3, 0x5b, 0x6c, 0x74, 0x3a, 0xec, 0x6c, 0x11, - 0xa3, 0x8f, 0x1d, 0xa2, 0xf7, 0x2d, 0xc1, 0xb0, 0x7a, 0x66, 0x9e, 0x99, 0xec, 0x71, 0x8b, 0x3e, - 0x71, 0xaa, 0xf2, 0xc7, 0x1c, 0x64, 0x54, 0xfc, 0xc1, 0x10, 0x3b, 0x04, 0x6d, 0x43, 0x12, 0xb7, - 0xba, 0x66, 0x59, 0xda, 0x90, 0x6e, 0xe4, 0xb7, 0xaf, 0x6f, 0x8e, 0x2d, 0x70, 0x53, 0xf0, 0xd5, - 0x5b, 0x5d, 0xb3, 0x11, 0x53, 0x19, 0x2f, 0xba, 0x0d, 0xa9, 0x4e, 0x6f, 0xe8, 0x74, 0xcb, 0x71, - 0x26, 0xf4, 0x44, 0x94, 0xd0, 0x3d, 0xca, 0xd4, 0x88, 0xa9, 0x9c, 0x9b, 0x4e, 0x65, 0x0c, 0x3a, - 0x66, 0x39, 0x71, 0xf9, 0x54, 0xbb, 0x83, 0x0e, 0x9b, 0x8a, 0xf2, 0xa2, 0x1d, 0x00, 0x63, 0x60, - 0x10, 0xad, 0xd5, 0xd5, 0x8d, 0x41, 0x39, 0xc5, 0x24, 0x9f, 0x8c, 0x96, 0x34, 0x48, 0x8d, 0x32, - 0x36, 0x62, 0x6a, 0xce, 0x70, 0x07, 0xf4, 0x73, 0x3f, 0x18, 0x62, 0xfb, 0xa2, 0x9c, 0xbe, 0xfc, - 0x73, 0xdf, 0xa2, 0x4c, 0xf4, 0x73, 0x19, 0x37, 0x7a, 0x1d, 0xb2, 0xad, 0x2e, 0x6e, 0x3d, 0xd4, - 0xc8, 0xa8, 0x9c, 0x65, 0x92, 0xeb, 0x51, 0x92, 0x35, 0xca, 0xd7, 0x1c, 0x35, 0x62, 0x6a, 0xa6, - 0xc5, 0x1f, 0xd1, 0xab, 0x90, 0x6e, 0x99, 0xfd, 0xbe, 0x41, 0xca, 0x79, 0x26, 0xbb, 0x16, 0x29, - 0xcb, 0xb8, 0x1a, 0x31, 0x55, 0xf0, 0xa3, 0x03, 0x28, 0xf5, 0x0c, 0x87, 0x68, 0xce, 0x40, 0xb7, - 0x9c, 0xae, 0x49, 0x9c, 0x72, 0x81, 0x69, 0x78, 0x3a, 0x4a, 0xc3, 0xbe, 0xe1, 0x90, 0x63, 0x97, - 0xb9, 0x11, 0x53, 0x8b, 0xbd, 0x20, 0x81, 0xea, 0x33, 0x3b, 0x1d, 0x6c, 0x7b, 0x0a, 0xcb, 0xc5, - 0xcb, 0xf5, 0x1d, 0x52, 0x6e, 0x57, 0x9e, 0xea, 0x33, 0x83, 0x04, 0xf4, 0x43, 0x58, 0xe9, 0x99, - 0x7a, 0xdb, 0x53, 0xa7, 0xb5, 0xba, 0xc3, 0xc1, 0xc3, 0x72, 0x89, 0x29, 0x7d, 0x2e, 0xf2, 0x23, - 0x4d, 0xbd, 0xed, 0xaa, 0xa8, 0x51, 0x81, 0x46, 0x4c, 0x5d, 0xee, 0x8d, 0x13, 0xd1, 0xbb, 0xb0, - 0xaa, 0x5b, 0x56, 0xef, 0x62, 0x5c, 0xfb, 0x12, 0xd3, 0x7e, 0x33, 0x4a, 0x7b, 0x95, 0xca, 0x8c, - 0xab, 0x47, 0xfa, 0x04, 0x15, 0x35, 0x41, 0xb6, 0x6c, 0x6c, 0xe9, 0x36, 0xd6, 0x2c, 0xdb, 0xb4, - 0x4c, 0x47, 0xef, 0x95, 0x65, 0xa6, 0xfb, 0xd9, 0x28, 0xdd, 0x47, 0x9c, 0xff, 0x48, 0xb0, 0x37, - 0x62, 0xea, 0x92, 0x15, 0x26, 0x71, 0xad, 0x66, 0x0b, 0x3b, 0x8e, 0xaf, 0x75, 0x79, 0x96, 0x56, - 0xc6, 0x1f, 0xd6, 0x1a, 0x22, 0xa1, 0x3a, 0xe4, 0xf1, 0x88, 0x8a, 0x6b, 0xe7, 0x26, 0xc1, 0x65, - 0xc4, 0x14, 0x2a, 0x91, 0x27, 0x94, 0xb1, 0x3e, 0x30, 0x09, 0x6e, 0xc4, 0x54, 0xc0, 0xde, 0x08, - 0xe9, 0x70, 0xe5, 0x1c, 0xdb, 0x46, 0xe7, 0x82, 0xa9, 0xd1, 0xd8, 0x1b, 0xc7, 0x30, 0x07, 0xe5, - 0x15, 0xa6, 0xf0, 0xf9, 0x28, 0x85, 0x0f, 0x98, 0x10, 0x55, 0x51, 0x77, 0x45, 0x1a, 0x31, 0x75, - 0xe5, 0x7c, 0x92, 0x4c, 0x5d, 0xac, 0x63, 0x0c, 0xf4, 0x9e, 0xf1, 0x11, 0xd6, 0x4e, 0x7b, 0x66, - 0xeb, 0x61, 0x79, 0xf5, 0x72, 0x17, 0xbb, 0x27, 0xb8, 0x77, 0x28, 0x33, 0x75, 0xb1, 0x4e, 0x90, - 0xb0, 0x93, 0x81, 0xd4, 0xb9, 0xde, 0x1b, 0xe2, 0xbd, 0x64, 0x36, 0x29, 0xa7, 0xf6, 0x92, 0xd9, - 0x8c, 0x9c, 0xdd, 0x4b, 0x66, 0x73, 0x32, 0xec, 0x25, 0xb3, 0x20, 0xe7, 0x95, 0x67, 0x21, 0x1f, - 0x08, 0x4c, 0xa8, 0x0c, 0x99, 0x3e, 0x76, 0x1c, 0xfd, 0x0c, 0xb3, 0x38, 0x96, 0x53, 0xdd, 0xa1, - 0x52, 0x82, 0x42, 0x30, 0x18, 0x29, 0x9f, 0x4a, 0x9e, 0x24, 0x8d, 0x33, 0x54, 0xf2, 0x1c, 0xdb, - 0xcc, 0x1c, 0x42, 0x52, 0x0c, 0xd1, 0x53, 0x50, 0x64, 0x4b, 0xd1, 0xdc, 0xf7, 0x34, 0xd8, 0x25, - 0xd5, 0x02, 0x23, 0x3e, 0x10, 0x4c, 0xeb, 0x90, 0xb7, 0xb6, 0x2d, 0x8f, 0x25, 0xc1, 0x58, 0xc0, - 0xda, 0xb6, 0x5c, 0x86, 0x27, 0xa1, 0x40, 0xd7, 0xed, 0x71, 0x24, 0xd9, 0x24, 0x79, 0x4a, 0x13, - 0x2c, 0xca, 0x9f, 0xe3, 0x20, 0x8f, 0x07, 0x30, 0xf4, 0x2a, 0x24, 0x69, 0x2c, 0x17, 0x61, 0xb9, - 0xb2, 0xc9, 0x03, 0xfd, 0xa6, 0x1b, 0xe8, 0x37, 0x9b, 0x6e, 0xa0, 0xdf, 0xc9, 0x7e, 0xf1, 0xd5, - 0x7a, 0xec, 0xd3, 0xbf, 0xae, 0x4b, 0x2a, 0x93, 0x40, 0xd7, 0x68, 0xd8, 0xd2, 0x8d, 0x81, 0x66, - 0xb4, 0xd9, 0x27, 0xe7, 0x68, 0x4c, 0xd2, 0x8d, 0xc1, 0x6e, 0x1b, 0xed, 0x83, 0xdc, 0x32, 0x07, - 0x0e, 0x1e, 0x38, 0x43, 0x47, 0xe3, 0xa9, 0x46, 0x04, 0xe3, 0x50, 0x48, 0xe5, 0x09, 0xaf, 0xe6, - 0x72, 0x1e, 0x31, 0x46, 0x75, 0xa9, 0x15, 0x26, 0xa0, 0x7b, 0x00, 0x5e, 0x3e, 0x72, 0xca, 0xc9, - 0x8d, 0xc4, 0x8d, 0xfc, 0xf6, 0xc6, 0xc4, 0x86, 0x3f, 0x70, 0x59, 0x4e, 0xac, 0xb6, 0x4e, 0xf0, - 0x4e, 0x92, 0x7e, 0xae, 0x1a, 0x90, 0x44, 0xcf, 0xc0, 0x92, 0x6e, 0x59, 0x9a, 0x43, 0x74, 0x82, - 0xb5, 0xd3, 0x0b, 0x82, 0x1d, 0x16, 0xe7, 0x0b, 0x6a, 0x51, 0xb7, 0xac, 0x63, 0x4a, 0xdd, 0xa1, - 0x44, 0xf4, 0x34, 0x94, 0x68, 0x4c, 0x37, 0xf4, 0x9e, 0xd6, 0xc5, 0xc6, 0x59, 0x97, 0xb0, 0x78, - 0x9e, 0x50, 0x8b, 0x82, 0xda, 0x60, 0x44, 0xa5, 0xed, 0xed, 0x38, 0x8b, 0xe7, 0x08, 0x41, 0xb2, - 0xad, 0x13, 0x9d, 0x59, 0xb2, 0xa0, 0xb2, 0x67, 0x4a, 0xb3, 0x74, 0xd2, 0x15, 0xf6, 0x61, 0xcf, - 0xe8, 0x2a, 0xa4, 0x85, 0xda, 0x04, 0x53, 0x2b, 0x46, 0x68, 0x15, 0x52, 0x96, 0x6d, 0x9e, 0x63, - 0xb6, 0x75, 0x59, 0x95, 0x0f, 0x14, 0x15, 0x4a, 0xe1, 0xd8, 0x8f, 0x4a, 0x10, 0x27, 0x23, 0x31, - 0x4b, 0x9c, 0x8c, 0xd0, 0x4b, 0x90, 0xa4, 0x86, 0x64, 0x73, 0x94, 0xa6, 0x64, 0x3b, 0x21, 0xd7, - 0xbc, 0xb0, 0xb0, 0xca, 0x38, 0x95, 0x25, 0x28, 0x86, 0x72, 0x82, 0x72, 0x15, 0x56, 0xa7, 0x85, - 0x78, 0xa5, 0xeb, 0xd1, 0x43, 0xa1, 0x1a, 0xdd, 0x86, 0xac, 0x17, 0xe3, 0xb9, 0xe3, 0x5c, 0x9b, - 0x98, 0xd6, 0x65, 0x56, 0x3d, 0x56, 0xea, 0x31, 0x74, 0x03, 0xba, 0xba, 0xc8, 0xe8, 0x05, 0x35, - 0xa3, 0x5b, 0x56, 0x43, 0x77, 0xba, 0xca, 0x7b, 0x50, 0x8e, 0x8a, 0xdf, 0x01, 0x83, 0x49, 0xcc, - 0xed, 0x5d, 0x83, 0x5d, 0x85, 0x74, 0xc7, 0xb4, 0xfb, 0x3a, 0x61, 0xca, 0x8a, 0xaa, 0x18, 0x51, - 0x43, 0xf2, 0x58, 0x9e, 0x60, 0x64, 0x3e, 0x50, 0x34, 0xb8, 0x16, 0x19, 0xc3, 0xa9, 0x88, 0x31, - 0x68, 0x63, 0x6e, 0xd6, 0xa2, 0xca, 0x07, 0xbe, 0x22, 0xfe, 0xb1, 0x7c, 0x40, 0xa7, 0x75, 0xd8, - 0x5a, 0x99, 0xfe, 0x9c, 0x2a, 0x46, 0xca, 0x67, 0x09, 0xb8, 0x3a, 0x3d, 0x92, 0xa3, 0x0d, 0x28, - 0xf4, 0xf5, 0x91, 0x46, 0x46, 0xc2, 0xed, 0x24, 0xb6, 0xf1, 0xd0, 0xd7, 0x47, 0xcd, 0x11, 0xf7, - 0x39, 0x19, 0x12, 0x64, 0xe4, 0x94, 0xe3, 0x1b, 0x89, 0x1b, 0x05, 0x95, 0x3e, 0xa2, 0x13, 0x58, - 0xee, 0x99, 0x2d, 0xbd, 0xa7, 0xf5, 0x74, 0x87, 0x68, 0x22, 0xc5, 0xf3, 0x43, 0xf4, 0xd4, 0x84, - 0xb1, 0x79, 0x4c, 0xc6, 0x6d, 0xbe, 0x9f, 0x34, 0xe0, 0x08, 0xff, 0x5f, 0x62, 0x3a, 0xf6, 0x75, - 0x77, 0xab, 0xd1, 0x5d, 0xc8, 0xf7, 0x0d, 0xe7, 0x14, 0x77, 0xf5, 0x73, 0xc3, 0xb4, 0xc5, 0x69, - 0x9a, 0x74, 0x9a, 0x37, 0x7d, 0x1e, 0xa1, 0x29, 0x28, 0x16, 0xd8, 0x92, 0x54, 0xc8, 0x87, 0xdd, - 0x68, 0x92, 0x5e, 0x38, 0x9a, 0xbc, 0x04, 0xab, 0x03, 0x3c, 0x22, 0x9a, 0x7f, 0x5e, 0xb9, 0x9f, - 0x64, 0x98, 0xe9, 0x11, 0x7d, 0xe7, 0x9d, 0x70, 0x87, 0xba, 0x0c, 0x7a, 0x8e, 0xe5, 0x42, 0xcb, - 0x74, 0xb0, 0xad, 0xe9, 0xed, 0xb6, 0x8d, 0x1d, 0x87, 0x95, 0x4f, 0x05, 0x96, 0xe0, 0x18, 0xbd, - 0xca, 0xc9, 0xca, 0x2f, 0x82, 0x5b, 0x13, 0xce, 0x7d, 0xc2, 0xf0, 0x92, 0x6f, 0xf8, 0x63, 0x58, - 0x15, 0xf2, 0xed, 0x90, 0xed, 0x79, 0x0d, 0xfa, 0xf8, 0xe4, 0xf9, 0x1a, 0xb7, 0x39, 0x72, 0xc5, - 0xa3, 0xcd, 0x9e, 0x78, 0x34, 0xb3, 0x23, 0x48, 0x32, 0xa3, 0x24, 0x79, 0x88, 0xa1, 0xcf, 0xff, - 0x6e, 0x5b, 0xf1, 0x71, 0x02, 0x96, 0x27, 0x0a, 0x09, 0x6f, 0x61, 0xd2, 0xd4, 0x85, 0xc5, 0xa7, - 0x2e, 0x2c, 0xb1, 0xf0, 0xc2, 0xc4, 0x5e, 0x27, 0x67, 0xef, 0x75, 0xea, 0x7b, 0xdc, 0xeb, 0xf4, - 0xa3, 0xed, 0xf5, 0xbf, 0x74, 0x17, 0x7e, 0x2d, 0x41, 0x25, 0xba, 0xfa, 0x9a, 0xba, 0x1d, 0xcf, - 0xc3, 0xb2, 0xf7, 0x29, 0x9e, 0x7a, 0x1e, 0x18, 0x65, 0xef, 0x85, 0xd0, 0x1f, 0x99, 0xe3, 0x9e, - 0x86, 0xd2, 0x58, 0x6d, 0xc8, 0x5d, 0xb9, 0x78, 0x1e, 0x9c, 0x5f, 0xf9, 0x59, 0xc2, 0x4b, 0x3c, - 0xa1, 0x02, 0x6e, 0xca, 0x69, 0x7d, 0x0b, 0x56, 0xda, 0xb8, 0x65, 0xb4, 0x1f, 0xf5, 0xb0, 0x2e, - 0x0b, 0xe9, 0xff, 0x9e, 0xd5, 0x49, 0x2f, 0xf9, 0x15, 0x40, 0x56, 0xc5, 0x8e, 0x45, 0xeb, 0x31, - 0xb4, 0x03, 0x39, 0x3c, 0x6a, 0x61, 0x8b, 0xb8, 0x25, 0xec, 0xf4, 0x16, 0x81, 0x73, 0xd7, 0x5d, - 0x4e, 0xda, 0x20, 0x7b, 0x62, 0xe8, 0x96, 0xc0, 0x00, 0xa2, 0xdb, 0x79, 0x21, 0x1e, 0x04, 0x01, - 0x5e, 0x76, 0x41, 0x80, 0x44, 0x64, 0x7f, 0xcb, 0xa5, 0xc6, 0x50, 0x80, 0x5b, 0x02, 0x05, 0x48, - 0xce, 0x98, 0x2c, 0x04, 0x03, 0xd4, 0x42, 0x30, 0x40, 0x7a, 0xc6, 0x32, 0x23, 0x70, 0x80, 0x97, - 0x5d, 0x1c, 0x20, 0x33, 0xe3, 0x8b, 0xc7, 0x80, 0x80, 0x37, 0x02, 0x40, 0x40, 0x8e, 0x89, 0x6e, - 0x44, 0x8a, 0x4e, 0x41, 0x02, 0x5e, 0xf3, 0x90, 0x80, 0x42, 0x24, 0x8a, 0x20, 0x84, 0xc7, 0xa1, - 0x80, 0xc3, 0x09, 0x28, 0x80, 0xb7, 0xee, 0xcf, 0x44, 0xaa, 0x98, 0x81, 0x05, 0x1c, 0x4e, 0x60, - 0x01, 0xa5, 0x19, 0x0a, 0x67, 0x80, 0x01, 0x3f, 0x9a, 0x0e, 0x06, 0x44, 0xb7, 0xeb, 0xe2, 0x33, - 0xe7, 0x43, 0x03, 0xb4, 0x08, 0x34, 0x40, 0x8e, 0xec, 0x5c, 0xb9, 0xfa, 0xb9, 0xe1, 0x80, 0x93, - 0x29, 0x70, 0x00, 0x6f, 0xdc, 0x6f, 0x44, 0x2a, 0x9f, 0x03, 0x0f, 0x38, 0x99, 0x82, 0x07, 0xa0, - 0x99, 0x6a, 0x67, 0x02, 0x02, 0xf7, 0xc2, 0x80, 0xc0, 0x4a, 0x44, 0xd5, 0xe9, 0x9f, 0xf6, 0x08, - 0x44, 0xe0, 0x34, 0x0a, 0x11, 0xe0, 0x5d, 0xfb, 0x0b, 0x91, 0x1a, 0x17, 0x80, 0x04, 0x0e, 0x27, - 0x20, 0x81, 0x2b, 0x33, 0x3c, 0x6d, 0x7e, 0x4c, 0x20, 0x25, 0xa7, 0xf7, 0x92, 0xd9, 0xac, 0x9c, - 0xe3, 0x68, 0xc0, 0x5e, 0x32, 0x9b, 0x97, 0x0b, 0xca, 0x73, 0xb4, 0x82, 0x19, 0x8b, 0x73, 0xb4, - 0x57, 0xc0, 0xb6, 0x6d, 0xda, 0xa2, 0xbb, 0xe7, 0x03, 0xe5, 0x06, 0xed, 0x11, 0xfd, 0x98, 0x76, - 0x09, 0x7e, 0xc0, 0x7a, 0xb2, 0x40, 0x1c, 0x53, 0x7e, 0x2f, 0xf9, 0xb2, 0x0c, 0x41, 0x08, 0xf6, - 0x97, 0x39, 0xd1, 0x5f, 0x06, 0x50, 0x85, 0x78, 0x18, 0x55, 0x58, 0x87, 0x3c, 0xed, 0xb5, 0xc6, - 0x00, 0x03, 0xdd, 0xf2, 0x00, 0x83, 0x9b, 0xb0, 0xcc, 0x12, 0x26, 0xc7, 0x1e, 0x44, 0x5a, 0x4a, - 0xb2, 0xb4, 0xb4, 0x44, 0x5f, 0x70, 0xeb, 0xf0, 0xfc, 0xf4, 0x22, 0xac, 0x04, 0x78, 0xbd, 0x1e, - 0x8e, 0x77, 0xcf, 0xb2, 0xc7, 0x5d, 0x15, 0xcd, 0xdc, 0x9f, 0x24, 0xdf, 0x42, 0x3e, 0xd2, 0x30, - 0x0d, 0x14, 0x90, 0xbe, 0x27, 0x50, 0x20, 0xfe, 0xc8, 0xa0, 0x40, 0xb0, 0x27, 0x4d, 0x84, 0x7b, - 0xd2, 0x7f, 0x48, 0xfe, 0x9e, 0x78, 0x2d, 0x7e, 0xcb, 0x6c, 0x63, 0xd1, 0x25, 0xb2, 0x67, 0x5a, - 0x92, 0xf4, 0xcc, 0x33, 0xd1, 0x0b, 0xd2, 0x47, 0xca, 0xe5, 0x25, 0x9e, 0x9c, 0xc8, 0x2b, 0x5e, - 0x83, 0xc9, 0x13, 0xbf, 0x68, 0x30, 0x65, 0x48, 0x3c, 0xc4, 0x1c, 0x2e, 0x2e, 0xa8, 0xf4, 0x91, - 0xf2, 0x31, 0xe7, 0x13, 0x09, 0x9c, 0x0f, 0xd0, 0xab, 0x90, 0x63, 0x60, 0xbf, 0x66, 0x5a, 0x8e, - 0x80, 0x88, 0x43, 0xa5, 0x0d, 0x47, 0xfc, 0x37, 0x8f, 0x28, 0xcf, 0xa1, 0xe5, 0xa8, 0x59, 0x4b, - 0x3c, 0x05, 0x2a, 0x8e, 0x5c, 0xa8, 0xe2, 0xb8, 0x0e, 0x39, 0xfa, 0xf5, 0x8e, 0xa5, 0xb7, 0x70, - 0x19, 0xd8, 0x87, 0xfa, 0x04, 0xe5, 0x77, 0x71, 0x58, 0x1a, 0x4b, 0x34, 0x53, 0xd7, 0xee, 0xba, - 0x64, 0x3c, 0x00, 0x79, 0xcc, 0x67, 0x8f, 0x35, 0x80, 0x33, 0xdd, 0xd1, 0x3e, 0xd4, 0x07, 0x04, - 0xb7, 0x85, 0x51, 0x02, 0x14, 0x54, 0x81, 0x2c, 0x1d, 0x0d, 0x1d, 0xdc, 0x16, 0xe8, 0x8b, 0x37, - 0x46, 0x0d, 0x48, 0xe3, 0x73, 0x3c, 0x20, 0x4e, 0x39, 0xc3, 0xb6, 0xfd, 0xea, 0x64, 0x3b, 0x4c, - 0x5f, 0xef, 0x94, 0xe9, 0x66, 0x7f, 0xfb, 0xd5, 0xba, 0xcc, 0xb9, 0x5f, 0x30, 0xfb, 0x06, 0xc1, - 0x7d, 0x8b, 0x5c, 0xa8, 0x42, 0x3e, 0x6c, 0x85, 0xec, 0x98, 0x15, 0x18, 0x0e, 0x58, 0x70, 0xdb, - 0x7b, 0x6a, 0x53, 0xc3, 0xb4, 0x0d, 0x72, 0xa1, 0x16, 0xfb, 0xb8, 0x6f, 0x99, 0x66, 0x4f, 0xe3, - 0x67, 0xbc, 0x0a, 0xa5, 0x70, 0x5e, 0x45, 0x4f, 0x41, 0xd1, 0xc6, 0x44, 0x37, 0x06, 0x5a, 0xa8, - 0x08, 0x2e, 0x70, 0x22, 0x3f, 0x53, 0x7b, 0xc9, 0xac, 0x24, 0xc7, 0xf7, 0x92, 0xd9, 0xb8, 0x9c, - 0x50, 0x8e, 0xe0, 0xca, 0xd4, 0xbc, 0x8a, 0x5e, 0x81, 0x9c, 0x9f, 0x92, 0x25, 0xb6, 0xda, 0x4b, - 0x90, 0x16, 0x9f, 0x57, 0xf9, 0x83, 0xe4, 0xab, 0x0c, 0x63, 0x37, 0x75, 0x48, 0xdb, 0xd8, 0x19, - 0xf6, 0x38, 0x9a, 0x52, 0xda, 0x7e, 0x71, 0xbe, 0x8c, 0x4c, 0xa9, 0xc3, 0x1e, 0x51, 0x85, 0xb0, - 0xf2, 0x2e, 0xa4, 0x39, 0x05, 0xe5, 0x21, 0x73, 0x72, 0x70, 0xff, 0xe0, 0xf0, 0xed, 0x03, 0x39, - 0x86, 0x00, 0xd2, 0xd5, 0x5a, 0xad, 0x7e, 0xd4, 0x94, 0x25, 0x94, 0x83, 0x54, 0x75, 0xe7, 0x50, - 0x6d, 0xca, 0x71, 0x4a, 0x56, 0xeb, 0x7b, 0xf5, 0x5a, 0x53, 0x4e, 0xa0, 0x65, 0x28, 0xf2, 0x67, - 0xed, 0xde, 0xa1, 0xfa, 0x66, 0xb5, 0x29, 0x27, 0x03, 0xa4, 0xe3, 0xfa, 0xc1, 0xdd, 0xba, 0x2a, - 0xa7, 0x94, 0xff, 0x81, 0x6b, 0x91, 0x39, 0xdc, 0x07, 0x66, 0xa4, 0x00, 0x30, 0xa3, 0x7c, 0x16, - 0xa7, 0x4d, 0x4d, 0x54, 0x62, 0x46, 0x7b, 0x63, 0x0b, 0xdf, 0x5e, 0x20, 0xab, 0x8f, 0xad, 0x9e, - 0xf6, 0x31, 0x36, 0xee, 0x60, 0xd2, 0xea, 0xf2, 0x42, 0x81, 0x47, 0xa0, 0xa2, 0x5a, 0x14, 0x54, - 0x26, 0xe4, 0x70, 0xb6, 0xf7, 0x71, 0x8b, 0x68, 0xdc, 0x89, 0x1c, 0xd6, 0x4c, 0xe4, 0x28, 0x1b, - 0xa5, 0x1e, 0x73, 0xa2, 0xf2, 0xde, 0x42, 0xb6, 0xcc, 0x41, 0x4a, 0xad, 0x37, 0xd5, 0x77, 0xe4, - 0x04, 0x42, 0x50, 0x62, 0x8f, 0xda, 0xf1, 0x41, 0xf5, 0xe8, 0xb8, 0x71, 0x48, 0x6d, 0xb9, 0x02, - 0x4b, 0xae, 0x2d, 0x5d, 0x62, 0x4a, 0x79, 0x1e, 0x1e, 0x8b, 0xa8, 0x2a, 0x26, 0x5b, 0x2a, 0xe5, - 0x37, 0x52, 0x90, 0x3b, 0x5c, 0x19, 0x1c, 0x42, 0xda, 0x21, 0x3a, 0x19, 0x3a, 0xc2, 0x88, 0xaf, - 0xcc, 0x5b, 0x66, 0x6c, 0xba, 0x0f, 0xc7, 0x4c, 0x5c, 0x15, 0x6a, 0x94, 0xdb, 0x50, 0x0a, 0xbf, - 0x89, 0xb6, 0x81, 0xef, 0x44, 0x71, 0xe5, 0x0e, 0xa0, 0xc9, 0xea, 0x63, 0x4a, 0x7b, 0x29, 0x4d, - 0x6b, 0x2f, 0x7f, 0x2b, 0xc1, 0xe3, 0x97, 0x54, 0x1a, 0xe8, 0xad, 0xb1, 0x45, 0xbe, 0xb6, 0x48, - 0x9d, 0xb2, 0xc9, 0x69, 0x63, 0xcb, 0xbc, 0x05, 0x85, 0x20, 0x7d, 0xbe, 0x45, 0x7e, 0x1b, 0xf7, - 0x0f, 0x71, 0xb8, 0x0f, 0xf6, 0x43, 0xa0, 0xf4, 0x1d, 0x43, 0xe0, 0xeb, 0x00, 0x64, 0xa4, 0x71, - 0xb7, 0x76, 0xf3, 0xe8, 0x13, 0x53, 0xf0, 0x45, 0xdc, 0x6a, 0x8e, 0xc4, 0x21, 0xc8, 0x11, 0xf1, - 0xe4, 0xa0, 0xe3, 0x20, 0x28, 0x30, 0x64, 0x39, 0xd6, 0x11, 0x0d, 0xf3, 0xbc, 0xc9, 0xd8, 0x07, - 0x0f, 0x38, 0xd9, 0x41, 0xef, 0xc0, 0x63, 0x63, 0x85, 0x82, 0xa7, 0x3a, 0x39, 0x6f, 0xbd, 0x70, - 0x25, 0x5c, 0x2f, 0xb8, 0xaa, 0x83, 0xd9, 0x3e, 0x15, 0xce, 0xf6, 0xef, 0x00, 0xf8, 0xe0, 0x00, - 0x8d, 0x30, 0xb6, 0x39, 0x1c, 0xb4, 0x99, 0x07, 0xa4, 0x54, 0x3e, 0x40, 0xb7, 0x21, 0x45, 0x3d, - 0xc9, 0xb5, 0xd3, 0x64, 0x28, 0xa6, 0x9e, 0x10, 0x00, 0x17, 0x38, 0xb7, 0x62, 0x00, 0x9a, 0x04, - 0x68, 0x23, 0xa6, 0x78, 0x23, 0x3c, 0xc5, 0x93, 0x91, 0x50, 0xef, 0xf4, 0xa9, 0x3e, 0x82, 0x14, - 0xdb, 0x79, 0x9a, 0x74, 0xd9, 0x5f, 0x01, 0x51, 0x2d, 0xd2, 0x67, 0xf4, 0x63, 0x00, 0x9d, 0x10, - 0xdb, 0x38, 0x1d, 0xfa, 0x13, 0xac, 0x4f, 0xf7, 0x9c, 0xaa, 0xcb, 0xb7, 0x73, 0x5d, 0xb8, 0xd0, - 0xaa, 0x2f, 0x1a, 0x70, 0xa3, 0x80, 0x42, 0xe5, 0x00, 0x4a, 0x61, 0x59, 0xb7, 0xbe, 0xe1, 0xdf, - 0x10, 0xae, 0x6f, 0x78, 0xb9, 0x2a, 0xea, 0x1b, 0xaf, 0x3a, 0x4a, 0xf0, 0x5f, 0x1f, 0x6c, 0xa0, - 0xfc, 0x24, 0x0e, 0x85, 0xa0, 0xe3, 0xfd, 0xe7, 0x95, 0x20, 0xca, 0xcf, 0x25, 0xc8, 0x7a, 0xcb, - 0x0f, 0xff, 0x07, 0x09, 0xfd, 0x38, 0xe2, 0xd6, 0x8b, 0x07, 0x7f, 0x5e, 0xf0, 0xdf, 0x44, 0x09, - 0xef, 0x37, 0xd1, 0x1d, 0x2f, 0xfd, 0x45, 0x01, 0x22, 0x41, 0x5b, 0x0b, 0xaf, 0x72, 0xb3, 0xfd, - 0x1d, 0xc8, 0x79, 0xa7, 0x97, 0x36, 0x1d, 0x2e, 0x70, 0x24, 0x89, 0x33, 0x24, 0x60, 0xbf, 0x55, - 0x48, 0x59, 0xe6, 0x87, 0xe2, 0xcf, 0x48, 0x42, 0xe5, 0x03, 0xa5, 0x0d, 0x4b, 0x63, 0x47, 0x1f, - 0xdd, 0x81, 0x8c, 0x35, 0x3c, 0xd5, 0x5c, 0xe7, 0x18, 0x83, 0xd7, 0xdc, 0x72, 0x76, 0x78, 0xda, - 0x33, 0x5a, 0xf7, 0xf1, 0x85, 0xfb, 0x31, 0xd6, 0xf0, 0xf4, 0x3e, 0xf7, 0x21, 0x3e, 0x4b, 0x3c, - 0x38, 0xcb, 0x2f, 0x25, 0xc8, 0xba, 0x67, 0x02, 0xfd, 0x1f, 0xe4, 0xbc, 0xb0, 0xe2, 0xfd, 0xda, - 0x8c, 0x8c, 0x47, 0x42, 0xbf, 0x2f, 0x82, 0xaa, 0xee, 0x3f, 0x59, 0xa3, 0xad, 0x75, 0x7a, 0x3a, - 0xf7, 0xa5, 0x52, 0xd8, 0x66, 0x3c, 0xf0, 0xb0, 0x78, 0xbc, 0x7b, 0xf7, 0x5e, 0x4f, 0x3f, 0x53, - 0xf3, 0x4c, 0x66, 0xb7, 0x4d, 0x07, 0xa2, 0xb2, 0xfb, 0xbb, 0x04, 0xf2, 0xf8, 0x89, 0xfd, 0xce, - 0x5f, 0x37, 0x99, 0xe6, 0x12, 0x53, 0xd2, 0x1c, 0xda, 0x82, 0x15, 0x8f, 0x43, 0x73, 0x8c, 0xb3, - 0x81, 0x4e, 0x86, 0x36, 0x16, 0x80, 0x24, 0xf2, 0x5e, 0x1d, 0xbb, 0x6f, 0x26, 0x57, 0x9d, 0x7a, - 0xc4, 0x55, 0x7f, 0x1c, 0x87, 0x7c, 0x00, 0x1e, 0x45, 0xff, 0x1b, 0x08, 0x46, 0xa5, 0x29, 0x99, - 0x21, 0xc0, 0xeb, 0xff, 0xa6, 0x0c, 0x9b, 0x29, 0xbe, 0xb8, 0x99, 0xa2, 0x40, 0x68, 0x17, 0x6d, - 0x4d, 0x2e, 0x8c, 0xb6, 0xbe, 0x00, 0x88, 0x98, 0x44, 0xef, 0x69, 0xe7, 0x26, 0x31, 0x06, 0x67, - 0x1a, 0x77, 0x43, 0x1e, 0x3a, 0x64, 0xf6, 0xe6, 0x01, 0x7b, 0x71, 0xc4, 0x3c, 0xf2, 0xa7, 0x12, - 0x64, 0xbd, 0xb2, 0x7b, 0xd1, 0x9f, 0x98, 0x57, 0x21, 0x2d, 0x2a, 0x4b, 0xfe, 0x17, 0x53, 0x8c, - 0xa6, 0xc2, 0xca, 0x15, 0xc8, 0xf6, 0x31, 0xd1, 0x59, 0x1c, 0xe4, 0x59, 0xcd, 0x1b, 0xdf, 0x7c, - 0x0d, 0xf2, 0x81, 0x1f, 0xc0, 0x34, 0x34, 0x1e, 0xd4, 0xdf, 0x96, 0x63, 0x95, 0xcc, 0x27, 0x9f, - 0x6f, 0x24, 0x0e, 0xf0, 0x87, 0xf4, 0x34, 0xab, 0xf5, 0x5a, 0xa3, 0x5e, 0xbb, 0x2f, 0x4b, 0x95, - 0xfc, 0x27, 0x9f, 0x6f, 0x64, 0x54, 0xcc, 0x10, 0xc5, 0x9b, 0xf7, 0x61, 0x69, 0x6c, 0x63, 0xc2, - 0x65, 0x0b, 0x82, 0xd2, 0xdd, 0x93, 0xa3, 0xfd, 0xdd, 0x5a, 0xb5, 0x59, 0xd7, 0x1e, 0x1c, 0x36, - 0xeb, 0xb2, 0x84, 0x1e, 0x83, 0x95, 0xfd, 0xdd, 0xff, 0x6f, 0x34, 0xb5, 0xda, 0xfe, 0x6e, 0xfd, - 0xa0, 0xa9, 0x55, 0x9b, 0xcd, 0x6a, 0xed, 0xbe, 0x1c, 0xdf, 0xfe, 0x3c, 0x0f, 0xc9, 0xea, 0x4e, - 0x6d, 0x17, 0xd5, 0x20, 0xc9, 0xa0, 0x90, 0x4b, 0x6f, 0x80, 0x55, 0x2e, 0xc7, 0x86, 0xd1, 0x3d, - 0x48, 0x31, 0x94, 0x04, 0x5d, 0x7e, 0x25, 0xac, 0x32, 0x03, 0x2c, 0xa6, 0x1f, 0xc3, 0x4e, 0xe4, - 0xa5, 0x77, 0xc4, 0x2a, 0x97, 0x63, 0xc7, 0x68, 0x1f, 0x32, 0x6e, 0x93, 0x3c, 0xeb, 0xe2, 0x56, - 0x65, 0x26, 0xa0, 0x4b, 0x97, 0xc6, 0xc1, 0x86, 0xcb, 0xaf, 0x8f, 0x55, 0x66, 0xa0, 0xca, 0x68, - 0x17, 0xd2, 0xa2, 0x1d, 0x9d, 0x71, 0x23, 0xac, 0x32, 0x0b, 0x27, 0x46, 0x2a, 0xe4, 0x7c, 0x18, - 0x67, 0xf6, 0xa5, 0xb8, 0xca, 0x1c, 0x80, 0x39, 0x7a, 0x17, 0x8a, 0xe1, 0x56, 0x77, 0xbe, 0x5b, - 0x67, 0x95, 0x39, 0x11, 0x69, 0xaa, 0x3f, 0xdc, 0xf7, 0xce, 0x77, 0x0b, 0xad, 0x32, 0x27, 0x40, - 0x8d, 0xde, 0x87, 0xe5, 0xc9, 0xbe, 0x74, 0xfe, 0x4b, 0x69, 0x95, 0x05, 0x20, 0x6b, 0xd4, 0x07, - 0x34, 0xa5, 0x9f, 0x5d, 0xe0, 0x8e, 0x5a, 0x65, 0x11, 0x04, 0x1b, 0xb5, 0x61, 0x69, 0xbc, 0x49, - 0x9c, 0xf7, 0xce, 0x5a, 0x65, 0x6e, 0x34, 0x9b, 0xcf, 0x12, 0x6e, 0x2e, 0xe7, 0xbd, 0xc3, 0x56, - 0x99, 0x1b, 0xdc, 0x46, 0x27, 0x00, 0x81, 0xfe, 0x70, 0x8e, 0x3b, 0x6d, 0x95, 0x79, 0x60, 0x6e, - 0x64, 0xc1, 0xca, 0xb4, 0xc6, 0x71, 0x91, 0x2b, 0x6e, 0x95, 0x85, 0xd0, 0x6f, 0xea, 0xcf, 0xe1, - 0x16, 0x70, 0xbe, 0x2b, 0x6f, 0x95, 0x39, 0x61, 0xf0, 0x9d, 0xea, 0x17, 0x5f, 0xaf, 0x49, 0x5f, - 0x7e, 0xbd, 0x26, 0xfd, 0xed, 0xeb, 0x35, 0xe9, 0xd3, 0x6f, 0xd6, 0x62, 0x5f, 0x7e, 0xb3, 0x16, - 0xfb, 0xcb, 0x37, 0x6b, 0xb1, 0x1f, 0x3c, 0x7b, 0x66, 0x90, 0xee, 0xf0, 0x74, 0xb3, 0x65, 0xf6, - 0xb7, 0x5a, 0x66, 0x1f, 0x93, 0xd3, 0x0e, 0xf1, 0x1f, 0xfc, 0x9b, 0xcb, 0xa7, 0x69, 0x96, 0x41, - 0x6f, 0xfd, 0x33, 0x00, 0x00, 0xff, 0xff, 0x64, 0xd0, 0x90, 0x6e, 0xd9, 0x2c, 0x00, 0x00, + 0x20, 0xd9, 0x24, 0x9b, 0x2c, 0x58, 0x64, 0xc1, 0x32, 0x2b, 0x92, 0x82, 0x5d, 0xb6, 0x59, 0x64, + 0x9b, 0xba, 0x8f, 0x7e, 0x49, 0x6a, 0x4b, 0x1a, 0xc8, 0x22, 0x95, 0xec, 0xfa, 0x9e, 0x3e, 0xe7, + 0xdc, 0xbe, 0xe7, 0x9e, 0x7b, 0x1e, 0xbf, 0xdb, 0xf0, 0x38, 0xc1, 0x83, 0x36, 0xb6, 0xfb, 0xc6, + 0x80, 0x6c, 0xe9, 0xa7, 0x2d, 0x63, 0x8b, 0x5c, 0x58, 0xd8, 0xd9, 0xb4, 0x6c, 0x93, 0x98, 0x68, + 0xc9, 0x7f, 0xb9, 0x49, 0x5f, 0x56, 0x9e, 0x08, 0x70, 0xb7, 0xec, 0x0b, 0x8b, 0x98, 0x5b, 0x96, + 0x6d, 0x9a, 0x1d, 0xce, 0x5f, 0xb9, 0x3e, 0xf9, 0xfa, 0x21, 0xbe, 0x10, 0xda, 0x42, 0xc2, 0x6c, + 0x96, 0x2d, 0x4b, 0xb7, 0xf5, 0xbe, 0xfb, 0x7a, 0x63, 0xe2, 0xf5, 0xb9, 0xde, 0x33, 0xda, 0x3a, + 0x31, 0x6d, 0xc1, 0xb1, 0x7e, 0x66, 0x9a, 0x67, 0x3d, 0xbc, 0xc5, 0x46, 0xa7, 0xc3, 0xce, 0x16, + 0x31, 0xfa, 0xd8, 0x21, 0x7a, 0xdf, 0x12, 0x0c, 0xab, 0x67, 0xe6, 0x99, 0xc9, 0x1e, 0xb7, 0xe8, + 0x93, 0xa0, 0xae, 0x8d, 0x8b, 0xb5, 0x87, 0xb6, 0x4e, 0x0c, 0x73, 0xc0, 0xdf, 0x2b, 0x7f, 0xc8, + 0x41, 0x46, 0xc5, 0x1f, 0x0c, 0xb1, 0x43, 0xd0, 0x36, 0x24, 0x71, 0xab, 0x6b, 0x96, 0xa5, 0x0d, + 0xe9, 0x46, 0x7e, 0xfb, 0xfa, 0xe6, 0x98, 0x01, 0x36, 0x05, 0x5f, 0xbd, 0xd5, 0x35, 0x1b, 0x31, + 0x95, 0xf1, 0xa2, 0xdb, 0x90, 0xea, 0xf4, 0x86, 0x4e, 0xb7, 0x1c, 0x67, 0x42, 0x4f, 0x44, 0x09, + 0xdd, 0xa3, 0x4c, 0x8d, 0x98, 0xca, 0xb9, 0xe9, 0x54, 0xc6, 0xa0, 0x63, 0x96, 0x13, 0x97, 0x4f, + 0xb5, 0x3b, 0xe8, 0xb0, 0xa9, 0x28, 0x2f, 0xda, 0x01, 0x30, 0x06, 0x06, 0xd1, 0x5a, 0x5d, 0xdd, + 0x18, 0x94, 0x53, 0x4c, 0xf2, 0xc9, 0x68, 0x49, 0x83, 0xd4, 0x28, 0x63, 0x23, 0xa6, 0xe6, 0x0c, + 0x77, 0x40, 0x3f, 0xf7, 0x83, 0x21, 0xb6, 0x2f, 0xca, 0xe9, 0xcb, 0x3f, 0xf7, 0x2d, 0xca, 0x44, + 0x3f, 0x97, 0x71, 0xa3, 0xd7, 0x21, 0xdb, 0xea, 0xe2, 0xd6, 0x43, 0x8d, 0x8c, 0xca, 0x59, 0x26, + 0xb9, 0x1e, 0x25, 0x59, 0xa3, 0x7c, 0xcd, 0x51, 0x23, 0xa6, 0x66, 0x5a, 0xfc, 0x11, 0xbd, 0x0a, + 0xe9, 0x96, 0xd9, 0xef, 0x1b, 0xa4, 0x9c, 0x67, 0xb2, 0x6b, 0x91, 0xb2, 0x8c, 0xab, 0x11, 0x53, + 0x05, 0x3f, 0x3a, 0x80, 0x52, 0xcf, 0x70, 0x88, 0xe6, 0x0c, 0x74, 0xcb, 0xe9, 0x9a, 0xc4, 0x29, + 0x17, 0x98, 0x86, 0xa7, 0xa3, 0x34, 0xec, 0x1b, 0x0e, 0x39, 0x76, 0x99, 0x1b, 0x31, 0xb5, 0xd8, + 0x0b, 0x12, 0xa8, 0x3e, 0xb3, 0xd3, 0xc1, 0xb6, 0xa7, 0xb0, 0x5c, 0xbc, 0x5c, 0xdf, 0x21, 0xe5, + 0x76, 0xe5, 0xa9, 0x3e, 0x33, 0x48, 0x40, 0xdf, 0x87, 0x95, 0x9e, 0xa9, 0xb7, 0x3d, 0x75, 0x5a, + 0xab, 0x3b, 0x1c, 0x3c, 0x2c, 0x97, 0x98, 0xd2, 0xe7, 0x22, 0x3f, 0xd2, 0xd4, 0xdb, 0xae, 0x8a, + 0x1a, 0x15, 0x68, 0xc4, 0xd4, 0xe5, 0xde, 0x38, 0x11, 0xbd, 0x0b, 0xab, 0xba, 0x65, 0xf5, 0x2e, + 0xc6, 0xb5, 0x2f, 0x31, 0xed, 0x37, 0xa3, 0xb4, 0x57, 0xa9, 0xcc, 0xb8, 0x7a, 0xa4, 0x4f, 0x50, + 0x51, 0x13, 0x64, 0xcb, 0xc6, 0x96, 0x6e, 0x63, 0xcd, 0xb2, 0x4d, 0xcb, 0x74, 0xf4, 0x5e, 0x59, + 0x66, 0xba, 0x9f, 0x8d, 0xd2, 0x7d, 0xc4, 0xf9, 0x8f, 0x04, 0x7b, 0x23, 0xa6, 0x2e, 0x59, 0x61, + 0x12, 0xd7, 0x6a, 0xb6, 0xb0, 0xe3, 0xf8, 0x5a, 0x97, 0x67, 0x69, 0x65, 0xfc, 0x61, 0xad, 0x21, + 0x12, 0xaa, 0x43, 0x1e, 0x8f, 0xa8, 0xb8, 0x76, 0x6e, 0x12, 0x5c, 0x46, 0x4c, 0xa1, 0x12, 0x79, + 0x42, 0x19, 0xeb, 0x03, 0x93, 0xe0, 0x46, 0x4c, 0x05, 0xec, 0x8d, 0x90, 0x0e, 0x57, 0xce, 0xb1, + 0x6d, 0x74, 0x2e, 0x98, 0x1a, 0x8d, 0xbd, 0x71, 0x0c, 0x73, 0x50, 0x5e, 0x61, 0x0a, 0x9f, 0x8f, + 0x52, 0xf8, 0x80, 0x09, 0x51, 0x15, 0x75, 0x57, 0xa4, 0x11, 0x53, 0x57, 0xce, 0x27, 0xc9, 0xd4, + 0xc5, 0x3a, 0xc6, 0x40, 0xef, 0x19, 0x1f, 0x61, 0xed, 0xb4, 0x67, 0xb6, 0x1e, 0x96, 0x57, 0x2f, + 0x77, 0xb1, 0x7b, 0x82, 0x7b, 0x87, 0x32, 0x53, 0x17, 0xeb, 0x04, 0x09, 0x3b, 0x19, 0x48, 0x9d, + 0xeb, 0xbd, 0x21, 0xde, 0x4b, 0x66, 0x93, 0x72, 0x6a, 0x2f, 0x99, 0xcd, 0xc8, 0xd9, 0xbd, 0x64, + 0x36, 0x27, 0xc3, 0x5e, 0x32, 0x0b, 0x72, 0x5e, 0x79, 0x16, 0xf2, 0x81, 0xc0, 0x84, 0xca, 0x90, + 0xe9, 0x63, 0xc7, 0xd1, 0xcf, 0x30, 0x8b, 0x63, 0x39, 0xd5, 0x1d, 0x2a, 0x25, 0x28, 0x04, 0x83, + 0x91, 0xf2, 0xa9, 0xe4, 0x49, 0xd2, 0x38, 0x43, 0x25, 0xcf, 0xb1, 0xcd, 0xcc, 0x21, 0x24, 0xc5, + 0x10, 0x3d, 0x05, 0x45, 0xb6, 0x14, 0xcd, 0x7d, 0x4f, 0x83, 0x5d, 0x52, 0x2d, 0x30, 0xe2, 0x03, + 0xc1, 0xb4, 0x0e, 0x79, 0x6b, 0xdb, 0xf2, 0x58, 0x12, 0x8c, 0x05, 0xac, 0x6d, 0xcb, 0x65, 0x78, + 0x12, 0x0a, 0x74, 0xdd, 0x1e, 0x47, 0x92, 0x4d, 0x92, 0xa7, 0x34, 0xc1, 0xa2, 0xfc, 0x29, 0x0e, + 0xf2, 0x78, 0x00, 0x43, 0xaf, 0x42, 0x92, 0xc6, 0x7a, 0x11, 0x96, 0x2b, 0x9b, 0x3c, 0xa2, 0x6f, + 0xba, 0x11, 0x7d, 0xb3, 0xe9, 0x26, 0x82, 0x9d, 0xec, 0x17, 0x5f, 0xad, 0xc7, 0x3e, 0xfd, 0xcb, + 0xba, 0xa4, 0x32, 0x09, 0x74, 0x8d, 0x86, 0x2d, 0xdd, 0x18, 0x68, 0x46, 0x9b, 0x7d, 0x72, 0x8e, + 0xc6, 0x24, 0xdd, 0x18, 0xec, 0xb6, 0xd1, 0x3e, 0xc8, 0x2d, 0x73, 0xe0, 0xe0, 0x81, 0x33, 0x74, + 0x34, 0x9e, 0x8a, 0x44, 0x30, 0x0e, 0x85, 0x54, 0x9e, 0x10, 0x6b, 0x2e, 0xe7, 0x11, 0x63, 0x54, + 0x97, 0x5a, 0x61, 0x02, 0xba, 0x07, 0xe0, 0xe5, 0x2b, 0xa7, 0x9c, 0xdc, 0x48, 0xdc, 0xc8, 0x6f, + 0x6f, 0x4c, 0x6c, 0xf8, 0x03, 0x97, 0xe5, 0xc4, 0x6a, 0xeb, 0x04, 0xef, 0x24, 0xe9, 0xe7, 0xaa, + 0x01, 0x49, 0xf4, 0x0c, 0x2c, 0xe9, 0x96, 0xa5, 0x39, 0x44, 0x27, 0x58, 0x3b, 0xbd, 0x20, 0xd8, + 0x61, 0x71, 0xbe, 0xa0, 0x16, 0x75, 0xcb, 0x3a, 0xa6, 0xd4, 0x1d, 0x4a, 0x44, 0x4f, 0x43, 0x89, + 0xc6, 0x74, 0x43, 0xef, 0x69, 0x5d, 0x6c, 0x9c, 0x75, 0x09, 0x8b, 0xe7, 0x09, 0xb5, 0x28, 0xa8, + 0x0d, 0x46, 0x54, 0xda, 0xde, 0x8e, 0xb3, 0x78, 0x8e, 0x10, 0x24, 0xdb, 0x3a, 0xd1, 0x99, 0x25, + 0x0b, 0x2a, 0x7b, 0xa6, 0x34, 0x4b, 0x27, 0x5d, 0x61, 0x1f, 0xf6, 0x8c, 0xae, 0x42, 0x5a, 0xa8, + 0x4d, 0x30, 0xb5, 0x62, 0x84, 0x56, 0x21, 0x65, 0xd9, 0xe6, 0x39, 0x66, 0x5b, 0x97, 0x55, 0xf9, + 0x40, 0x51, 0xa1, 0x14, 0x8e, 0xfd, 0xa8, 0x04, 0x71, 0x32, 0x12, 0xb3, 0xc4, 0xc9, 0x08, 0xbd, + 0x04, 0x49, 0x6a, 0x48, 0x36, 0x47, 0x69, 0x4a, 0xb6, 0x13, 0x72, 0xcd, 0x0b, 0x0b, 0xab, 0x8c, + 0x53, 0x59, 0x82, 0x62, 0x28, 0x27, 0x28, 0x57, 0x61, 0x75, 0x5a, 0x88, 0x57, 0xba, 0x1e, 0x3d, + 0x14, 0xaa, 0xd1, 0x6d, 0xc8, 0x7a, 0x31, 0x9e, 0x3b, 0xce, 0xb5, 0x89, 0x69, 0x5d, 0x66, 0xd5, + 0x63, 0xa5, 0x1e, 0x43, 0x37, 0xa0, 0xab, 0x8b, 0x8c, 0x5e, 0x50, 0x33, 0xba, 0x65, 0x35, 0x74, + 0xa7, 0xab, 0xbc, 0x07, 0xe5, 0xa8, 0xf8, 0x1d, 0x30, 0x98, 0xc4, 0xdc, 0xde, 0x35, 0xd8, 0x55, + 0x48, 0x77, 0x4c, 0xbb, 0xaf, 0x13, 0xa6, 0xac, 0xa8, 0x8a, 0x11, 0x35, 0x24, 0x8f, 0xe5, 0x09, + 0x46, 0xe6, 0x03, 0x45, 0x83, 0x6b, 0x91, 0x31, 0x9c, 0x8a, 0x18, 0x83, 0x36, 0xe6, 0x66, 0x2d, + 0xaa, 0x7c, 0xe0, 0x2b, 0xe2, 0x1f, 0xcb, 0x07, 0x74, 0x5a, 0x87, 0xad, 0x95, 0xe9, 0xcf, 0xa9, + 0x62, 0xa4, 0x7c, 0x96, 0x80, 0xab, 0xd3, 0x23, 0x39, 0xda, 0x80, 0x42, 0x5f, 0x1f, 0x69, 0x64, + 0x24, 0xdc, 0x4e, 0x62, 0x1b, 0x0f, 0x7d, 0x7d, 0xd4, 0x1c, 0x71, 0x9f, 0x93, 0x21, 0x41, 0x46, + 0x4e, 0x39, 0xbe, 0x91, 0xb8, 0x51, 0x50, 0xe9, 0x23, 0x3a, 0x81, 0xe5, 0x9e, 0xd9, 0xd2, 0x7b, + 0x5a, 0x4f, 0x77, 0x88, 0x26, 0x52, 0x3c, 0x3f, 0x44, 0x4f, 0x4d, 0x18, 0x9b, 0xc7, 0x64, 0xdc, + 0xe6, 0xfb, 0x49, 0x03, 0x8e, 0xf0, 0xff, 0x25, 0xa6, 0x63, 0x5f, 0x77, 0xb7, 0x1a, 0xdd, 0x85, + 0x7c, 0xdf, 0x70, 0x4e, 0x71, 0x57, 0x3f, 0x37, 0x4c, 0x5b, 0x9c, 0xa6, 0x49, 0xa7, 0x79, 0xd3, + 0xe7, 0x11, 0x9a, 0x82, 0x62, 0x81, 0x2d, 0x49, 0x85, 0x7c, 0xd8, 0x8d, 0x26, 0xe9, 0x85, 0xa3, + 0xc9, 0x4b, 0xb0, 0x3a, 0xc0, 0x23, 0xa2, 0xf9, 0xe7, 0x95, 0xfb, 0x49, 0x86, 0x99, 0x1e, 0xd1, + 0x77, 0xde, 0x09, 0x77, 0xa8, 0xcb, 0xa0, 0xe7, 0x58, 0x2e, 0xb4, 0x4c, 0x07, 0xdb, 0x9a, 0xde, + 0x6e, 0xdb, 0xd8, 0x71, 0x58, 0xf9, 0x54, 0x60, 0x09, 0x8e, 0xd1, 0xab, 0x9c, 0xac, 0xfc, 0x2c, + 0xb8, 0x35, 0xe1, 0xdc, 0x27, 0x0c, 0x2f, 0xf9, 0x86, 0x3f, 0x86, 0x55, 0x21, 0xdf, 0x0e, 0xd9, + 0x9e, 0xd7, 0xa0, 0x8f, 0x4f, 0x9e, 0xaf, 0x71, 0x9b, 0x23, 0x57, 0x3c, 0xda, 0xec, 0x89, 0x47, + 0x33, 0x3b, 0x82, 0x24, 0x33, 0x4a, 0x92, 0x87, 0x18, 0xfa, 0xfc, 0xef, 0xb6, 0x15, 0x1f, 0x27, + 0x60, 0x79, 0xa2, 0x90, 0xf0, 0x16, 0x26, 0x4d, 0x5d, 0x58, 0x7c, 0xea, 0xc2, 0x12, 0x0b, 0x2f, + 0x4c, 0xec, 0x75, 0x72, 0xf6, 0x5e, 0xa7, 0xbe, 0xc3, 0xbd, 0x4e, 0x3f, 0xda, 0x5e, 0xff, 0x4b, + 0x77, 0xe1, 0x97, 0x12, 0x54, 0xa2, 0xab, 0xaf, 0xa9, 0xdb, 0xf1, 0x3c, 0x2c, 0x7b, 0x9f, 0xe2, + 0xa9, 0xe7, 0x81, 0x51, 0xf6, 0x5e, 0x08, 0xfd, 0x91, 0x39, 0xee, 0x69, 0x28, 0x8d, 0xd5, 0x86, + 0xdc, 0x95, 0x8b, 0xe7, 0xc1, 0xf9, 0x95, 0x9f, 0x24, 0xbc, 0xc4, 0x13, 0x2a, 0xe0, 0xa6, 0x9c, + 0xd6, 0xb7, 0x60, 0xa5, 0x8d, 0x5b, 0x46, 0xfb, 0x51, 0x0f, 0xeb, 0xb2, 0x90, 0xfe, 0xef, 0x59, + 0x9d, 0xf4, 0x92, 0x5f, 0x00, 0x64, 0x55, 0xec, 0x58, 0xb4, 0x1e, 0x43, 0x3b, 0x90, 0xc3, 0xa3, + 0x16, 0xb6, 0x88, 0x5b, 0xc2, 0x4e, 0x6f, 0x11, 0x38, 0x77, 0xdd, 0xe5, 0xa4, 0x0d, 0xb2, 0x27, + 0x86, 0x6e, 0x09, 0x0c, 0x20, 0xba, 0x9d, 0x17, 0xe2, 0x41, 0x10, 0xe0, 0x65, 0x17, 0x04, 0x48, + 0x44, 0xf6, 0xb7, 0x5c, 0x6a, 0x0c, 0x05, 0xb8, 0x25, 0x50, 0x80, 0xe4, 0x8c, 0xc9, 0x42, 0x30, + 0x40, 0x2d, 0x04, 0x03, 0xa4, 0x67, 0x2c, 0x33, 0x02, 0x07, 0x78, 0xd9, 0xc5, 0x01, 0x32, 0x33, + 0xbe, 0x78, 0x0c, 0x08, 0x78, 0x23, 0x00, 0x04, 0xe4, 0x98, 0xe8, 0x46, 0xa4, 0xe8, 0x14, 0x24, + 0xe0, 0x35, 0x0f, 0x09, 0x28, 0x44, 0xa2, 0x08, 0x42, 0x78, 0x1c, 0x0a, 0x38, 0x9c, 0x80, 0x02, + 0x78, 0xeb, 0xfe, 0x4c, 0xa4, 0x8a, 0x19, 0x58, 0xc0, 0xe1, 0x04, 0x16, 0x50, 0x9a, 0xa1, 0x70, + 0x06, 0x18, 0xf0, 0x83, 0xe9, 0x60, 0x40, 0x74, 0xbb, 0x2e, 0x3e, 0x73, 0x3e, 0x34, 0x40, 0x8b, + 0x40, 0x03, 0xe4, 0xc8, 0xce, 0x95, 0xab, 0x9f, 0x1b, 0x0e, 0x38, 0x99, 0x02, 0x07, 0xf0, 0xc6, + 0xfd, 0x46, 0xa4, 0xf2, 0x39, 0xf0, 0x80, 0x93, 0x29, 0x78, 0x00, 0x9a, 0xa9, 0x76, 0x26, 0x20, + 0x70, 0x2f, 0x0c, 0x08, 0xac, 0x44, 0x54, 0x9d, 0xfe, 0x69, 0x8f, 0x40, 0x04, 0x4e, 0xa3, 0x10, + 0x01, 0xde, 0xb5, 0xbf, 0x10, 0xa9, 0x71, 0x01, 0x48, 0xe0, 0x70, 0x02, 0x12, 0xb8, 0x32, 0xc3, + 0xd3, 0xe6, 0xc7, 0x04, 0x52, 0x72, 0x7a, 0x2f, 0x99, 0xcd, 0xca, 0x39, 0x8e, 0x06, 0xec, 0x25, + 0xb3, 0x79, 0xb9, 0xa0, 0x3c, 0x47, 0x2b, 0x98, 0xb1, 0x38, 0x47, 0x7b, 0x05, 0x6c, 0xdb, 0xa6, + 0x2d, 0xba, 0x7b, 0x3e, 0x50, 0x6e, 0xd0, 0x1e, 0xd1, 0x8f, 0x69, 0x97, 0xe0, 0x07, 0xac, 0x27, + 0x0b, 0xc4, 0x31, 0xe5, 0xb7, 0x92, 0x2f, 0xcb, 0x10, 0x84, 0x60, 0x7f, 0x99, 0x13, 0xfd, 0x65, + 0x00, 0x55, 0x88, 0x87, 0x51, 0x85, 0x75, 0xc8, 0xd3, 0x5e, 0x6b, 0x0c, 0x30, 0xd0, 0x2d, 0x0f, + 0x30, 0xb8, 0x09, 0xcb, 0x2c, 0x61, 0x72, 0xec, 0x41, 0xa4, 0xa5, 0x24, 0x4b, 0x4b, 0x4b, 0xf4, + 0x05, 0xb7, 0x0e, 0xcf, 0x4f, 0x2f, 0xc2, 0x4a, 0x80, 0xd7, 0xeb, 0xe1, 0x78, 0xf7, 0x2c, 0x7b, + 0xdc, 0x55, 0xd1, 0xcc, 0xfd, 0x51, 0xf2, 0x2d, 0xe4, 0x23, 0x0d, 0xd3, 0x40, 0x01, 0xe9, 0x3b, + 0x02, 0x05, 0xe2, 0x8f, 0x0c, 0x0a, 0x04, 0x7b, 0xd2, 0x44, 0xb8, 0x27, 0xfd, 0x87, 0xe4, 0xef, + 0x89, 0xd7, 0xe2, 0xb7, 0xcc, 0x36, 0x16, 0x5d, 0x22, 0x7b, 0xa6, 0x25, 0x49, 0xcf, 0x3c, 0x13, + 0xbd, 0x20, 0x7d, 0xa4, 0x5c, 0x5e, 0xe2, 0xc9, 0x89, 0xbc, 0xe2, 0x35, 0x98, 0x3c, 0xf1, 0x8b, + 0x06, 0x53, 0x86, 0xc4, 0x43, 0xcc, 0xe1, 0xe2, 0x82, 0x4a, 0x1f, 0x29, 0x1f, 0x73, 0x3e, 0x91, + 0xc0, 0xf9, 0x00, 0xbd, 0x0a, 0x39, 0x76, 0x19, 0xa0, 0x99, 0x96, 0x23, 0x20, 0xe2, 0x50, 0x69, + 0xc3, 0x6f, 0x04, 0x36, 0x8f, 0x28, 0xcf, 0xa1, 0xe5, 0xa8, 0x59, 0x4b, 0x3c, 0x05, 0x2a, 0x8e, + 0x5c, 0xa8, 0xe2, 0xb8, 0x0e, 0x39, 0xfa, 0xf5, 0x8e, 0xa5, 0xb7, 0x70, 0x19, 0xd8, 0x87, 0xfa, + 0x04, 0xe5, 0x37, 0x71, 0x58, 0x1a, 0x4b, 0x34, 0x53, 0xd7, 0xee, 0xba, 0x64, 0x3c, 0x00, 0x79, + 0xcc, 0x67, 0x8f, 0x35, 0x80, 0x33, 0xdd, 0xd1, 0x3e, 0xd4, 0x07, 0x04, 0xb7, 0x85, 0x51, 0x02, + 0x14, 0x54, 0x81, 0x2c, 0x1d, 0x0d, 0x1d, 0xdc, 0x16, 0xe8, 0x8b, 0x37, 0x46, 0x0d, 0x48, 0xe3, + 0x73, 0x3c, 0x20, 0x4e, 0x39, 0xc3, 0xb6, 0xfd, 0xea, 0x64, 0x3b, 0x4c, 0x5f, 0xef, 0x94, 0xe9, + 0x66, 0xff, 0xed, 0xab, 0x75, 0x99, 0x73, 0xbf, 0x60, 0xf6, 0x0d, 0x82, 0xfb, 0x16, 0xb9, 0x50, + 0x85, 0x7c, 0xd8, 0x0a, 0xd9, 0x31, 0x2b, 0x30, 0x1c, 0xb0, 0xe0, 0xb6, 0xf7, 0xd4, 0xa6, 0x86, + 0x69, 0x1b, 0xe4, 0x42, 0x2d, 0xf6, 0x71, 0xdf, 0x32, 0xcd, 0x9e, 0xc6, 0xcf, 0x78, 0x15, 0x4a, + 0xe1, 0xbc, 0x8a, 0x9e, 0x82, 0xa2, 0x8d, 0x89, 0x6e, 0x0c, 0xb4, 0x50, 0x11, 0x5c, 0xe0, 0x44, + 0x7e, 0xa6, 0xf6, 0x92, 0x59, 0x49, 0x8e, 0xef, 0x25, 0xb3, 0x71, 0x39, 0xa1, 0x1c, 0xc1, 0x95, + 0xa9, 0x79, 0x15, 0xbd, 0x02, 0x39, 0x3f, 0x25, 0x4b, 0x6c, 0xb5, 0x97, 0x20, 0x2d, 0x3e, 0xaf, + 0xf2, 0x7b, 0xc9, 0x57, 0x19, 0xc6, 0x6e, 0xea, 0x90, 0xb6, 0xb1, 0x33, 0xec, 0x71, 0x34, 0xa5, + 0xb4, 0xfd, 0xe2, 0x7c, 0x19, 0x99, 0x52, 0x87, 0x3d, 0xa2, 0x0a, 0x61, 0xe5, 0x5d, 0x48, 0x73, + 0x0a, 0xca, 0x43, 0xe6, 0xe4, 0xe0, 0xfe, 0xc1, 0xe1, 0xdb, 0x07, 0x72, 0x0c, 0x01, 0xa4, 0xab, + 0xb5, 0x5a, 0xfd, 0xa8, 0x29, 0x4b, 0x28, 0x07, 0xa9, 0xea, 0xce, 0xa1, 0xda, 0x94, 0xe3, 0x94, + 0xac, 0xd6, 0xf7, 0xea, 0xb5, 0xa6, 0x9c, 0x40, 0xcb, 0x50, 0xe4, 0xcf, 0xda, 0xbd, 0x43, 0xf5, + 0xcd, 0x6a, 0x53, 0x4e, 0x06, 0x48, 0xc7, 0xf5, 0x83, 0xbb, 0x75, 0x55, 0x4e, 0x29, 0xff, 0x03, + 0xd7, 0x22, 0x73, 0xb8, 0x0f, 0xcc, 0x48, 0x01, 0x60, 0x46, 0xf9, 0x2c, 0x4e, 0x9b, 0x9a, 0xa8, + 0xc4, 0x8c, 0xf6, 0xc6, 0x16, 0xbe, 0xbd, 0x40, 0x56, 0x1f, 0x5b, 0x3d, 0xed, 0x63, 0x6c, 0xdc, + 0xc1, 0xa4, 0xd5, 0xe5, 0x85, 0x02, 0x8f, 0x40, 0x45, 0xb5, 0x28, 0xa8, 0x4c, 0xc8, 0xe1, 0x6c, + 0xef, 0xe3, 0x16, 0xd1, 0xb8, 0x13, 0x39, 0xac, 0x99, 0xc8, 0x51, 0x36, 0x4a, 0x3d, 0xe6, 0x44, + 0xe5, 0xbd, 0x85, 0x6c, 0x99, 0x83, 0x94, 0x5a, 0x6f, 0xaa, 0xef, 0xc8, 0x09, 0x84, 0xa0, 0xc4, + 0x1e, 0xb5, 0xe3, 0x83, 0xea, 0xd1, 0x71, 0xe3, 0x90, 0xda, 0x72, 0x05, 0x96, 0x5c, 0x5b, 0xba, + 0xc4, 0x94, 0xf2, 0x3c, 0x3c, 0x16, 0x51, 0x55, 0x4c, 0xb6, 0x54, 0xca, 0xaf, 0xa4, 0x20, 0x77, + 0xb8, 0x32, 0x38, 0x84, 0xb4, 0x43, 0x74, 0x32, 0x74, 0x84, 0x11, 0x5f, 0x99, 0xb7, 0xcc, 0xd8, + 0x74, 0x1f, 0x8e, 0x99, 0xb8, 0x2a, 0xd4, 0x28, 0xb7, 0xa1, 0x14, 0x7e, 0x13, 0x6d, 0x03, 0xdf, + 0x89, 0xe2, 0xca, 0x1d, 0x40, 0x93, 0xd5, 0xc7, 0x94, 0xf6, 0x52, 0x9a, 0xd6, 0x5e, 0xfe, 0x5a, + 0x82, 0xc7, 0x2f, 0xa9, 0x34, 0xd0, 0x5b, 0x63, 0x8b, 0x7c, 0x6d, 0x91, 0x3a, 0x65, 0x93, 0xd3, + 0xc6, 0x96, 0x79, 0x0b, 0x0a, 0x41, 0xfa, 0x7c, 0x8b, 0xfc, 0x5d, 0xc2, 0x3f, 0xc4, 0xe1, 0x3e, + 0xd8, 0x0f, 0x81, 0xd2, 0xb7, 0x0c, 0x81, 0xaf, 0x03, 0x90, 0x91, 0xc6, 0xdd, 0xda, 0xcd, 0xa3, + 0x4f, 0x4c, 0xc1, 0x17, 0x71, 0xab, 0x39, 0x12, 0x87, 0x20, 0x47, 0xc4, 0x93, 0x83, 0x8e, 0x83, + 0xa0, 0xc0, 0x90, 0xe5, 0x58, 0x47, 0x34, 0xcc, 0xf3, 0x26, 0x63, 0x1f, 0x3c, 0xe0, 0x64, 0x07, + 0xbd, 0x03, 0x8f, 0x8d, 0x15, 0x0a, 0x9e, 0xea, 0xe4, 0xbc, 0xf5, 0xc2, 0x95, 0x70, 0xbd, 0xe0, + 0xaa, 0x0e, 0x66, 0xfb, 0x54, 0x28, 0xdb, 0xa3, 0x37, 0x41, 0x66, 0x9d, 0x34, 0xaf, 0x71, 0xda, + 0xb8, 0xa7, 0xbb, 0xf7, 0xb8, 0xd7, 0x26, 0xfa, 0xf1, 0xbb, 0xe2, 0x9a, 0x9b, 0xb7, 0xe3, 0x9f, + 0xd1, 0x76, 0xbc, 0x44, 0x85, 0xd9, 0xe6, 0xdc, 0xa5, 0xa2, 0xca, 0x3b, 0x00, 0x3e, 0xd6, 0x40, + 0x03, 0x96, 0x6d, 0x0e, 0x07, 0x6d, 0xe6, 0x50, 0x29, 0x95, 0x0f, 0xd0, 0x6d, 0x48, 0x51, 0xc7, + 0x74, 0xcd, 0x3e, 0x19, 0xd9, 0xa9, 0x63, 0x05, 0xb0, 0x0a, 0xce, 0xad, 0x18, 0x80, 0x26, 0xf1, + 0xde, 0x88, 0x29, 0xde, 0x08, 0x4f, 0xf1, 0x64, 0x24, 0x72, 0x3c, 0x7d, 0xaa, 0x8f, 0x20, 0xc5, + 0x1c, 0x89, 0xe6, 0x70, 0x76, 0xc9, 0x20, 0x8a, 0x4f, 0xfa, 0x8c, 0x7e, 0x08, 0xa0, 0x13, 0x62, + 0x1b, 0xa7, 0x43, 0x7f, 0x82, 0xf5, 0xe9, 0x8e, 0x58, 0x75, 0xf9, 0x76, 0xae, 0x0b, 0x8f, 0x5c, + 0xf5, 0x45, 0x03, 0x5e, 0x19, 0x50, 0xa8, 0x1c, 0x40, 0x29, 0x2c, 0xeb, 0x96, 0x4b, 0xfc, 0x1b, + 0xc2, 0xe5, 0x12, 0xaf, 0x7e, 0x45, 0xb9, 0xe4, 0x15, 0x5b, 0x09, 0x7e, 0x93, 0xc2, 0x06, 0xca, + 0x8f, 0xe2, 0x50, 0x08, 0xfa, 0xf1, 0x7f, 0x5e, 0x45, 0xa3, 0xfc, 0x54, 0x82, 0xac, 0xb7, 0xfc, + 0xf0, 0xb5, 0x4a, 0xe8, 0x1e, 0x8a, 0x5b, 0x2f, 0x1e, 0xbc, 0x0b, 0xe1, 0xb7, 0x4e, 0x09, 0xef, + 0xd6, 0xe9, 0x8e, 0x97, 0x4d, 0xa3, 0xf0, 0x95, 0xa0, 0xad, 0x85, 0x57, 0xb9, 0xc5, 0xc3, 0x1d, + 0xc8, 0x79, 0xc1, 0x80, 0xf6, 0x30, 0x2e, 0x0e, 0x25, 0x89, 0x23, 0x29, 0x50, 0xc4, 0x55, 0x48, + 0x59, 0xe6, 0x87, 0xe2, 0xa2, 0x25, 0xa1, 0xf2, 0x81, 0xd2, 0x86, 0xa5, 0xb1, 0x48, 0x82, 0xee, + 0x40, 0xc6, 0x1a, 0x9e, 0x6a, 0xae, 0x73, 0x8c, 0xa1, 0x75, 0x6e, 0x75, 0x3c, 0x3c, 0xed, 0x19, + 0xad, 0xfb, 0xf8, 0xc2, 0xfd, 0x18, 0x6b, 0x78, 0x7a, 0x9f, 0xfb, 0x10, 0x9f, 0x25, 0x1e, 0x9c, + 0xe5, 0xe7, 0x12, 0x64, 0xdd, 0x33, 0x81, 0xfe, 0x0f, 0x72, 0x5e, 0x94, 0xf2, 0x6e, 0x4a, 0x23, + 0xc3, 0x9b, 0xd0, 0xef, 0x8b, 0xa0, 0xaa, 0x7b, 0xc5, 0x6b, 0xb4, 0xb5, 0x4e, 0x4f, 0xe7, 0xbe, + 0x54, 0x0a, 0xdb, 0x8c, 0xc7, 0x31, 0x16, 0x41, 0x76, 0xef, 0xde, 0xeb, 0xe9, 0x67, 0x6a, 0x9e, + 0xc9, 0xec, 0xb6, 0xe9, 0x40, 0x14, 0x8a, 0x7f, 0x97, 0x40, 0x1e, 0x3f, 0xb1, 0xdf, 0xfa, 0xeb, + 0x26, 0xb3, 0x66, 0x62, 0x4a, 0xd6, 0x44, 0x5b, 0xb0, 0xe2, 0x71, 0x68, 0x8e, 0x71, 0x36, 0xd0, + 0xc9, 0xd0, 0xc6, 0x02, 0xdf, 0x44, 0xde, 0xab, 0x63, 0xf7, 0xcd, 0xe4, 0xaa, 0x53, 0x8f, 0xb8, + 0xea, 0x8f, 0xe3, 0x90, 0x0f, 0xa0, 0xad, 0xe8, 0x7f, 0x03, 0xc1, 0xa8, 0x34, 0x25, 0xd1, 0x04, + 0x78, 0xfd, 0x5b, 0xcf, 0xb0, 0x99, 0xe2, 0x8b, 0x9b, 0x29, 0x0a, 0xd3, 0x76, 0xc1, 0xdb, 0xe4, + 0xc2, 0xe0, 0xed, 0x0b, 0x80, 0x88, 0x49, 0xf4, 0x9e, 0x76, 0x6e, 0x12, 0x63, 0x70, 0xa6, 0x71, + 0x37, 0xe4, 0xa1, 0x43, 0x66, 0x6f, 0x1e, 0xb0, 0x17, 0x47, 0xcc, 0x23, 0x7f, 0x2c, 0x41, 0xd6, + 0xab, 0xe2, 0x17, 0xbd, 0x13, 0xbd, 0x0a, 0x69, 0x51, 0xa8, 0xf2, 0x4b, 0x51, 0x31, 0x9a, 0x8a, + 0x52, 0x57, 0x20, 0xdb, 0xc7, 0x44, 0x67, 0x71, 0x90, 0x27, 0x49, 0x6f, 0x7c, 0xf3, 0x35, 0xc8, + 0x07, 0xee, 0x93, 0x69, 0x68, 0x3c, 0xa8, 0xbf, 0x2d, 0xc7, 0x2a, 0x99, 0x4f, 0x3e, 0xdf, 0x48, + 0x1c, 0xe0, 0x0f, 0xe9, 0x69, 0x56, 0xeb, 0xb5, 0x46, 0xbd, 0x76, 0x5f, 0x96, 0x2a, 0xf9, 0x4f, + 0x3e, 0xdf, 0xc8, 0xa8, 0x98, 0x01, 0x94, 0x37, 0xef, 0xc3, 0xd2, 0xd8, 0xc6, 0x84, 0xab, 0x20, + 0x04, 0xa5, 0xbb, 0x27, 0x47, 0xfb, 0xbb, 0xb5, 0x6a, 0xb3, 0xae, 0x3d, 0x38, 0x6c, 0xd6, 0x65, + 0x09, 0x3d, 0x06, 0x2b, 0xfb, 0xbb, 0xff, 0xdf, 0x68, 0x6a, 0xb5, 0xfd, 0xdd, 0xfa, 0x41, 0x53, + 0xab, 0x36, 0x9b, 0xd5, 0xda, 0x7d, 0x39, 0xbe, 0xfd, 0x79, 0x1e, 0x92, 0xd5, 0x9d, 0xda, 0x2e, + 0xaa, 0x41, 0x92, 0x21, 0x2b, 0x97, 0xfe, 0x50, 0x56, 0xb9, 0x1c, 0x6a, 0x46, 0xf7, 0x20, 0xc5, + 0x40, 0x17, 0x74, 0xf9, 0x1f, 0x66, 0x95, 0x19, 0xd8, 0x33, 0xfd, 0x18, 0x76, 0x22, 0x2f, 0xfd, + 0xe5, 0xac, 0x72, 0x39, 0x14, 0x8d, 0xf6, 0x21, 0xe3, 0xf6, 0xdc, 0xb3, 0xfe, 0x03, 0xab, 0xcc, + 0xc4, 0x87, 0xe9, 0xd2, 0x38, 0x76, 0x71, 0xf9, 0xdf, 0x68, 0x95, 0x19, 0x20, 0x35, 0xda, 0x85, + 0xb4, 0xe8, 0x6e, 0x67, 0xfc, 0x60, 0x56, 0x99, 0x05, 0x3b, 0x23, 0x15, 0x72, 0x3e, 0x2a, 0x34, + 0xfb, 0x1f, 0xbb, 0xca, 0x1c, 0xf8, 0x3b, 0x7a, 0x17, 0x8a, 0xe1, 0xce, 0x79, 0xbe, 0x9f, 0xd8, + 0x2a, 0x73, 0x02, 0xdc, 0x54, 0x7f, 0xb8, 0x8d, 0x9e, 0xef, 0xa7, 0xb6, 0xca, 0x9c, 0x78, 0x37, + 0x7a, 0x1f, 0x96, 0x27, 0xdb, 0xdc, 0xf9, 0xff, 0x71, 0xab, 0x2c, 0x80, 0x80, 0xa3, 0x3e, 0xa0, + 0x29, 0xed, 0xf1, 0x02, 0xbf, 0xbc, 0x55, 0x16, 0x01, 0xc4, 0x51, 0x1b, 0x96, 0xc6, 0x7b, 0xce, + 0x79, 0x7f, 0x81, 0xab, 0xcc, 0x0d, 0x8e, 0xf3, 0x59, 0xc2, 0xbd, 0xea, 0xbc, 0xbf, 0xc4, 0x55, + 0xe6, 0xc6, 0xca, 0xd1, 0x09, 0x40, 0xa0, 0xdd, 0x9c, 0xe3, 0x17, 0xb9, 0xca, 0x3c, 0xa8, 0x39, + 0xb2, 0x60, 0x65, 0x5a, 0x1f, 0xba, 0xc8, 0x1f, 0x73, 0x95, 0x85, 0xc0, 0x74, 0xea, 0xcf, 0xe1, + 0x8e, 0x72, 0xbe, 0x3f, 0xe8, 0x2a, 0x73, 0xa2, 0xea, 0x3b, 0xd5, 0x2f, 0xbe, 0x5e, 0x93, 0xbe, + 0xfc, 0x7a, 0x4d, 0xfa, 0xeb, 0xd7, 0x6b, 0xd2, 0xa7, 0xdf, 0xac, 0xc5, 0xbe, 0xfc, 0x66, 0x2d, + 0xf6, 0xe7, 0x6f, 0xd6, 0x62, 0xdf, 0x7b, 0xf6, 0xcc, 0x20, 0xdd, 0xe1, 0xe9, 0x66, 0xcb, 0xec, + 0x6f, 0xb5, 0xcc, 0x3e, 0x26, 0xa7, 0x1d, 0xe2, 0x3f, 0xf8, 0x3f, 0x4a, 0x9f, 0xa6, 0x59, 0x06, + 0xbd, 0xf5, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xb0, 0xf8, 0x3a, 0x48, 0x2d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -6777,6 +6791,14 @@ func (m *ResponseFinalizeBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + n49, err49 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.NextBlockDelay, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.NextBlockDelay):]) + if err49 != nil { + return 0, err49 + } + i -= n49 + i = encodeVarintTypes(dAtA, i, uint64(n49)) + i-- + dAtA[i] = 0x32 if len(m.AppHash) > 0 { i -= len(m.AppHash) copy(dAtA[i:], m.AppHash) @@ -7334,12 +7356,12 @@ func (m *Misbehavior) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n54, err54 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) - if err54 != nil { - return 0, err54 + n55, err55 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + if err55 != nil { + return 0, err55 } - i -= n54 - i = encodeVarintTypes(dAtA, i, uint64(n54)) + i -= n55 + i = encodeVarintTypes(dAtA, i, uint64(n55)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -8548,6 +8570,8 @@ func (m *ResponseFinalizeBlock) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } + l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.NextBlockDelay) + n += 1 + l + sovTypes(uint64(l)) return n } @@ -14792,6 +14816,39 @@ func (m *ResponseFinalizeBlock) Unmarshal(dAtA []byte) error { m.AppHash = []byte{} } iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NextBlockDelay", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.NextBlockDelay, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/consensus/state.go b/consensus/state.go index bde7e0157d6..6faf9356702 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -718,15 +718,20 @@ func (cs *State) updateToState(state sm.State) { cs.updateHeight(height) cs.updateRoundStep(0, cstypes.RoundStepNewHeight) + timeoutCommit := state.NextBlockDelay + // If the ABCI app didn't set a delay, use the deprecated config value. + if timeoutCommit == 0 { + timeoutCommit = cs.config.TimeoutCommit //nolint:staticcheck + } if cs.CommitTime.IsZero() { // "Now" makes it easier to sync up dev nodes. - // We add timeoutCommit to allow transactions - // to be gathered for the first block. - // And alternative solution that relies on clocks: - // cs.StartTime = state.LastBlockTime.Add(timeoutCommit) - cs.StartTime = cs.config.Commit(cmttime.Now()) + // + // We add timeoutCommit to allow transactions to be gathered for + // the first block. An alternative solution that relies on clocks: + // `cs.StartTime = state.LastBlockTime.Add(timeoutCommit)` + cs.StartTime = cmttime.Now().Add(timeoutCommit) } else { - cs.StartTime = cs.config.Commit(cs.CommitTime) + cs.StartTime = cs.CommitTime.Add(timeoutCommit) } cs.Validators = validators @@ -1042,7 +1047,7 @@ func (cs *State) handleTxsAvailable() { // Enter: `timeoutNewHeight` by startTime (commitTime+timeoutCommit), // -// or, if SkipTimeoutCommit==true, after receiving all precommits from (height,round-1) +// or, if NextBlockDelay==0, after receiving all precommits from (height,round-1) // // Enter: `timeoutPrecommits` after any +2/3 precommits from (height,round-1) // Enter: +2/3 precommits for nil at (height,round-1) @@ -2217,7 +2222,8 @@ func (cs *State) addVote(vote *types.Vote, peerID p2p.ID) (added bool, err error cs.evsw.FireEvent(types.EventVote, vote) // if we can skip timeoutCommit and have all the votes now, - if cs.config.SkipTimeoutCommit && cs.LastCommit.HasAll() { + skipTimeoutCommit := cs.state.NextBlockDelay == 0 && cs.config.TimeoutCommit == 0 //nolint:staticcheck + if skipTimeoutCommit && cs.LastCommit.HasAll() { // go straight to new round (skip timeout commit) // cs.scheduleTimeout(time.Duration(0), cs.Height, 0, cstypes.RoundStepNewHeight) cs.enterNewRound(cs.Height, 0) @@ -2383,7 +2389,8 @@ func (cs *State) addVote(vote *types.Vote, peerID p2p.ID) (added bool, err error if !blockID.IsNil() { cs.enterCommit(height, vote.Round) - if cs.config.SkipTimeoutCommit && precommits.HasAll() { + skipTimeoutCommit := cs.state.NextBlockDelay == 0 && cs.config.TimeoutCommit == 0 //nolint:staticcheck + if skipTimeoutCommit && precommits.HasAll() { cs.enterNewRound(cs.Height, 0) } } else { diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 89bafb6cd54..8e0029f33f7 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -11,6 +11,7 @@ import "tendermint/types/params.proto"; import "tendermint/types/validator.proto"; import "google/protobuf/timestamp.proto"; import "gogoproto/gogo.proto"; +import "google/protobuf/duration.proto"; // NOTE: When using custom types, mind the warnings. // https://github.com/cosmos/gogoproto/blob/master/custom_types.md#warnings-and-issues @@ -363,6 +364,12 @@ message ResponseFinalizeBlock { tendermint.types.ConsensusParams consensus_param_updates = 4; // app_hash is the hash of the applications' state which is used to confirm that execution of the transactions was deterministic. It is up to the application to decide which algorithm to use. bytes app_hash = 5; + // delay between the time when this block is committed and the next height is started. + // previously `timeout_commit` in config.toml + google.protobuf.Duration next_block_delay = 6 [ + (gogoproto.nullable) = false, + (gogoproto.stdduration) = true + ]; } //---------------------------------------- diff --git a/proto/tendermint/state/types.pb.go b/proto/tendermint/state/types.pb.go index 4426543ed9b..ca648c5614d 100644 --- a/proto/tendermint/state/types.pb.go +++ b/proto/tendermint/state/types.pb.go @@ -12,6 +12,7 @@ import ( proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + _ "github.com/golang/protobuf/ptypes/duration" io "io" math "math" math_bits "math/bits" @@ -445,6 +446,9 @@ type State struct { LastResultsHash []byte `protobuf:"bytes,12,opt,name=last_results_hash,json=lastResultsHash,proto3" json:"last_results_hash,omitempty"` // the latest AppHash we've received from calling abci.Commit() AppHash []byte `protobuf:"bytes,13,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` + // delay between the time when this block is committed and the next height is started. + // previously `timeout_commit` in config.toml + NextBlockDelay time.Duration `protobuf:"bytes,15,opt,name=next_block_delay,json=nextBlockDelay,proto3,stdduration" json:"next_block_delay"` } func (m *State) Reset() { *m = State{} } @@ -578,6 +582,13 @@ func (m *State) GetAppHash() []byte { return nil } +func (m *State) GetNextBlockDelay() time.Duration { + if m != nil { + return m.NextBlockDelay + } + return 0 +} + func init() { proto.RegisterType((*LegacyABCIResponses)(nil), "tendermint.state.LegacyABCIResponses") proto.RegisterType((*ResponseBeginBlock)(nil), "tendermint.state.ResponseBeginBlock") @@ -592,68 +603,70 @@ func init() { func init() { proto.RegisterFile("tendermint/state/types.proto", fileDescriptor_ccfacf933f22bf93) } var fileDescriptor_ccfacf933f22bf93 = []byte{ - // 963 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4b, 0x6f, 0xdb, 0x46, - 0x17, 0x35, 0xe3, 0x44, 0x8f, 0x2b, 0xcb, 0x96, 0x47, 0x9f, 0x13, 0x45, 0xf9, 0x22, 0xa9, 0x42, - 0x12, 0x18, 0x45, 0x41, 0x01, 0xc9, 0xaa, 0x9b, 0x14, 0x96, 0xec, 0xd6, 0x02, 0xdc, 0xa2, 0xa0, - 0xdd, 0x00, 0xe9, 0x22, 0xc4, 0x88, 0x1c, 0x49, 0x83, 0x4a, 0x24, 0xc1, 0x19, 0xa9, 0x72, 0xf7, - 0xdd, 0x75, 0x91, 0x6d, 0xff, 0x51, 0x96, 0x59, 0x76, 0x53, 0xb7, 0x95, 0x81, 0x2e, 0xfa, 0x2b, - 0x8a, 0x79, 0xf0, 0x25, 0xba, 0xa8, 0x8b, 0xec, 0xc8, 0xb9, 0xe7, 0x9e, 0x7b, 0xee, 0x99, 0xb9, - 0x43, 0xc2, 0xff, 0x39, 0xf1, 0x5c, 0x12, 0xce, 0xa9, 0xc7, 0x7b, 0x8c, 0x63, 0x4e, 0x7a, 0xfc, - 0x32, 0x20, 0xcc, 0x0c, 0x42, 0x9f, 0xfb, 0xa8, 0x96, 0x44, 0x4d, 0x19, 0x6d, 0xfe, 0x6f, 0xe2, - 0x4f, 0x7c, 0x19, 0xec, 0x89, 0x27, 0x85, 0x6b, 0x3e, 0x4a, 0xb1, 0xe0, 0x91, 0x43, 0xd3, 0x24, - 0xcd, 0x74, 0x09, 0xb9, 0x9e, 0x89, 0x76, 0x72, 0xd1, 0x25, 0x9e, 0x51, 0x17, 0x73, 0x3f, 0xd4, - 0x88, 0xc7, 0x39, 0x44, 0x80, 0x43, 0x3c, 0x8f, 0x08, 0x5a, 0xa9, 0xf0, 0x92, 0x84, 0x8c, 0xfa, - 0x5e, 0xa6, 0x40, 0x7b, 0xe2, 0xfb, 0x93, 0x19, 0xe9, 0xc9, 0xb7, 0xd1, 0x62, 0xdc, 0xe3, 0x74, - 0x4e, 0x18, 0xc7, 0xf3, 0x40, 0x01, 0xba, 0xbf, 0x1a, 0x50, 0x3f, 0x23, 0x13, 0xec, 0x5c, 0x1e, - 0xf5, 0x07, 0x43, 0x8b, 0xb0, 0xc0, 0xf7, 0x18, 0x61, 0xe8, 0x25, 0x54, 0x5c, 0x32, 0xa3, 0x4b, - 0x12, 0xda, 0x7c, 0xc5, 0x1a, 0x46, 0x67, 0xfb, 0xb0, 0xf2, 0xfc, 0xb1, 0x99, 0xb2, 0x44, 0xb4, - 0x6a, 0x9e, 0xac, 0x88, 0x73, 0xb1, 0xb2, 0x08, 0x5b, 0xcc, 0xb8, 0x05, 0x3a, 0xe3, 0x62, 0xc5, - 0xd0, 0x67, 0x50, 0x26, 0x9e, 0x6b, 0x8f, 0x66, 0xbe, 0xf3, 0x5d, 0xe3, 0x4e, 0xc7, 0x38, 0xac, - 0x3c, 0xef, 0x9a, 0x9b, 0x86, 0x9a, 0x51, 0xbd, 0x13, 0xcf, 0xed, 0x0b, 0xa4, 0x55, 0x22, 0xfa, - 0x09, 0x9d, 0x40, 0x65, 0x44, 0x26, 0xd4, 0xd3, 0x14, 0xdb, 0x92, 0xe2, 0xc9, 0x3f, 0x53, 0xf4, - 0x05, 0x58, 0x91, 0xc0, 0x28, 0x7e, 0xee, 0xbe, 0x01, 0x94, 0x47, 0xa0, 0x53, 0x28, 0x90, 0x25, - 0xf1, 0x78, 0xd4, 0xd8, 0xfd, 0x7c, 0x63, 0x22, 0xdc, 0x6f, 0xbc, 0xbb, 0x6a, 0x6f, 0xfd, 0x75, - 0xd5, 0xae, 0x29, 0xf4, 0x27, 0xfe, 0x9c, 0x72, 0x32, 0x0f, 0xf8, 0xa5, 0xa5, 0xf3, 0xbb, 0x3f, - 0xdd, 0x81, 0xda, 0x66, 0x17, 0xe8, 0x1c, 0xf6, 0xe3, 0x7d, 0xb4, 0x17, 0x81, 0x8b, 0x39, 0x89, - 0x2a, 0x75, 0x72, 0x95, 0x5e, 0x45, 0xc8, 0x6f, 0x24, 0xb0, 0x7f, 0x57, 0xd4, 0xb4, 0x6a, 0xcb, - 0xec, 0x32, 0x43, 0xaf, 0xe1, 0x81, 0x23, 0xaa, 0x78, 0x6c, 0xc1, 0x6c, 0x79, 0x08, 0x62, 0x6a, - 0xe5, 0xef, 0x47, 0x69, 0x6a, 0x75, 0x08, 0x06, 0x51, 0xc2, 0xd7, 0xf2, 0xd0, 0x58, 0x07, 0x4e, - 0x66, 0x21, 0xa2, 0x4e, 0xec, 0xd8, 0xfe, 0x40, 0x3b, 0x7e, 0x34, 0x60, 0x37, 0x6e, 0x88, 0x0d, - 0xbd, 0xb1, 0x8f, 0x06, 0x50, 0x4d, 0xcc, 0x60, 0x84, 0x37, 0x0c, 0xa9, 0xb6, 0x95, 0x57, 0x1b, - 0x27, 0x9e, 0x13, 0x6e, 0xed, 0x2c, 0x53, 0x6f, 0xc8, 0x84, 0xfa, 0x0c, 0x33, 0x6e, 0x4f, 0x09, - 0x9d, 0x4c, 0xb9, 0xed, 0x4c, 0xb1, 0x37, 0x21, 0xae, 0x6c, 0x7c, 0xdb, 0xda, 0x17, 0xa1, 0x53, - 0x19, 0x19, 0xa8, 0x40, 0xf7, 0x67, 0x03, 0xea, 0x1b, 0xcd, 0x4b, 0x31, 0x16, 0xd4, 0x36, 0x4c, - 0x64, 0x5a, 0xcf, 0xbf, 0xbb, 0xa7, 0x77, 0x66, 0x2f, 0xeb, 0x21, 0xfb, 0xcf, 0xda, 0xfe, 0x34, - 0x60, 0x3f, 0x33, 0x6c, 0x52, 0xd9, 0x6b, 0x38, 0x98, 0xc9, 0x39, 0xb4, 0x85, 0xe1, 0x76, 0x18, - 0x05, 0xb5, 0xbc, 0xa7, 0xf9, 0x93, 0x7f, 0xc3, 0xd8, 0x5a, 0x75, 0xc5, 0x71, 0x34, 0x72, 0x68, - 0x32, 0xcb, 0xf7, 0xa1, 0xa0, 0xb4, 0x69, 0x4d, 0xfa, 0x0d, 0xbd, 0x81, 0x07, 0x51, 0x19, 0x7b, - 0x4c, 0x3d, 0x3c, 0xa3, 0x3f, 0x90, 0xcc, 0xb8, 0x3d, 0xcb, 0x9d, 0x83, 0x88, 0xf4, 0x73, 0x0d, - 0x57, 0x03, 0x77, 0x10, 0xde, 0xb4, 0xdc, 0x9d, 0x42, 0xf1, 0x95, 0xba, 0x93, 0xd0, 0x11, 0x94, - 0x63, 0xdb, 0x74, 0x47, 0x99, 0xcb, 0x44, 0xdf, 0x5d, 0x89, 0xe5, 0xda, 0xec, 0x24, 0x0b, 0x35, - 0xa1, 0xc4, 0xfc, 0x31, 0xff, 0x1e, 0x87, 0x44, 0xf6, 0x51, 0xb6, 0xe2, 0xf7, 0xee, 0x1f, 0x05, - 0xb8, 0x77, 0x2e, 0x4c, 0x41, 0x9f, 0x42, 0x51, 0x73, 0xe9, 0x32, 0x0f, 0xf3, 0xc6, 0x69, 0x51, - 0xba, 0x44, 0x84, 0x47, 0xcf, 0xa0, 0xe4, 0x4c, 0x31, 0xf5, 0x6c, 0xaa, 0x36, 0xaf, 0xdc, 0xaf, - 0xac, 0xaf, 0xda, 0xc5, 0x81, 0x58, 0x1b, 0x1e, 0x5b, 0x45, 0x19, 0x1c, 0xba, 0xe8, 0x29, 0xec, - 0x52, 0x8f, 0x72, 0x8a, 0x67, 0x7a, 0xcb, 0x1b, 0xbb, 0xd2, 0xd6, 0xaa, 0x5e, 0x55, 0xbb, 0x8d, - 0x3e, 0x06, 0xb9, 0xf7, 0xca, 0xd0, 0x08, 0xb9, 0x2d, 0x91, 0x7b, 0x22, 0x20, 0x3d, 0xd2, 0x58, - 0x0b, 0xaa, 0x29, 0x2c, 0x75, 0x1b, 0x77, 0xf3, 0xda, 0xd5, 0x99, 0x94, 0x59, 0xc3, 0xe3, 0x7e, - 0x5d, 0x68, 0x5f, 0x5f, 0xb5, 0x2b, 0x67, 0x11, 0xd5, 0xf0, 0xd8, 0xaa, 0xc4, 0xbc, 0x43, 0x17, - 0x9d, 0xc1, 0x5e, 0x8a, 0x53, 0xdc, 0xfb, 0x8d, 0x7b, 0x92, 0xb5, 0x69, 0xaa, 0x8f, 0x82, 0x19, - 0x7d, 0x14, 0xcc, 0x8b, 0xe8, 0xa3, 0xd0, 0x2f, 0x09, 0xda, 0xb7, 0xbf, 0xb5, 0x0d, 0xab, 0x1a, - 0x73, 0x89, 0x28, 0xfa, 0x02, 0xf6, 0x3c, 0xb2, 0xe2, 0x76, 0x3c, 0x95, 0xac, 0x51, 0xb8, 0xd5, - 0x1c, 0xef, 0x8a, 0xb4, 0xe4, 0x4a, 0x40, 0x2f, 0x01, 0x52, 0x1c, 0xc5, 0x5b, 0x71, 0xa4, 0x32, - 0x84, 0x10, 0xd9, 0x56, 0x8a, 0xa4, 0x74, 0x3b, 0x21, 0x22, 0x2d, 0x25, 0x64, 0x00, 0xad, 0xf4, - 0xd8, 0x26, 0x7c, 0xf1, 0x04, 0x97, 0xe5, 0x66, 0x3d, 0x4a, 0x26, 0x38, 0xc9, 0xd6, 0xb3, 0x7c, - 0xe3, 0x7d, 0x02, 0x1f, 0x78, 0x9f, 0x7c, 0x05, 0x4f, 0x32, 0xf7, 0xc9, 0x06, 0x7f, 0x2c, 0xaf, - 0x22, 0xe5, 0x75, 0x52, 0x17, 0x4c, 0x96, 0x28, 0xd2, 0x18, 0x1d, 0xc4, 0x50, 0x7e, 0xa5, 0x99, - 0x3d, 0xc5, 0x6c, 0xda, 0xd8, 0xe9, 0x18, 0x87, 0x3b, 0xea, 0x20, 0xaa, 0xaf, 0x37, 0x3b, 0xc5, - 0x6c, 0x8a, 0x1e, 0x42, 0x09, 0x07, 0x81, 0x82, 0x54, 0x25, 0xa4, 0x88, 0x83, 0x40, 0x84, 0xfa, - 0x5f, 0xbe, 0x5b, 0xb7, 0x8c, 0xf7, 0xeb, 0x96, 0xf1, 0xfb, 0xba, 0x65, 0xbc, 0xbd, 0x6e, 0x6d, - 0xbd, 0xbf, 0x6e, 0x6d, 0xfd, 0x72, 0xdd, 0xda, 0xfa, 0xf6, 0xc5, 0x84, 0xf2, 0xe9, 0x62, 0x64, - 0x3a, 0xfe, 0xbc, 0xe7, 0xf8, 0x73, 0xc2, 0x47, 0x63, 0x9e, 0x3c, 0xa8, 0xff, 0xa5, 0xcd, 0x3f, - 0xad, 0x51, 0x41, 0xae, 0xbf, 0xf8, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xec, 0x26, 0xcf, 0x93, 0x84, - 0x09, 0x00, 0x00, + // 1007 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcd, 0x6e, 0xdb, 0x46, + 0x10, 0x36, 0xe3, 0xc4, 0x92, 0x47, 0xfe, 0x91, 0xd7, 0x75, 0xc2, 0x38, 0x8d, 0xa4, 0x0a, 0x49, + 0x60, 0x14, 0x05, 0x05, 0x24, 0xa7, 0x5e, 0x52, 0x58, 0xb2, 0x5b, 0x0b, 0x70, 0x8a, 0x82, 0x76, + 0x03, 0xa4, 0x87, 0x10, 0x2b, 0x72, 0x25, 0x2d, 0x4a, 0x91, 0x04, 0x77, 0xa5, 0xca, 0xbd, 0xf7, + 0xd6, 0x43, 0x8e, 0xed, 0x5b, 0xf4, 0x31, 0x72, 0xcc, 0xb1, 0x97, 0xba, 0x85, 0x0c, 0xf4, 0xd0, + 0xa7, 0x28, 0xf6, 0x87, 0x7f, 0xa2, 0x8b, 0x3a, 0xc8, 0x8d, 0xbb, 0x33, 0xf3, 0xcd, 0x37, 0xdf, + 0xce, 0xec, 0x12, 0x3e, 0xe6, 0x24, 0xf0, 0x48, 0x3c, 0xa1, 0x01, 0xef, 0x30, 0x8e, 0x39, 0xe9, + 0xf0, 0x8b, 0x88, 0x30, 0x2b, 0x8a, 0x43, 0x1e, 0xa2, 0x7a, 0x66, 0xb5, 0xa4, 0x75, 0xff, 0xa3, + 0x51, 0x38, 0x0a, 0xa5, 0xb1, 0x23, 0xbe, 0x94, 0xdf, 0xfe, 0x83, 0x1c, 0x0a, 0x1e, 0xb8, 0x34, + 0x0f, 0xb2, 0x9f, 0x4f, 0x21, 0xf7, 0x0b, 0xd6, 0x56, 0xc9, 0x3a, 0xc3, 0x3e, 0xf5, 0x30, 0x0f, + 0x63, 0xed, 0xf1, 0xb0, 0xe4, 0x11, 0xe1, 0x18, 0x4f, 0x12, 0x80, 0x46, 0xce, 0x3c, 0x23, 0x31, + 0xa3, 0x61, 0x50, 0x48, 0xd0, 0x1c, 0x85, 0xe1, 0xc8, 0x27, 0x1d, 0xb9, 0x1a, 0x4c, 0x87, 0x1d, + 0x4e, 0x27, 0x84, 0x71, 0x3c, 0x89, 0x12, 0x80, 0x65, 0x07, 0x6f, 0x1a, 0x63, 0x4e, 0xc3, 0x40, + 0xd9, 0xdb, 0x7f, 0x18, 0xb0, 0x7b, 0x4a, 0x46, 0xd8, 0xbd, 0x38, 0xec, 0xf6, 0xfa, 0x36, 0x61, + 0x51, 0x18, 0x30, 0xc2, 0xd0, 0x73, 0xa8, 0x79, 0xc4, 0xa7, 0x33, 0x12, 0x3b, 0x7c, 0xce, 0x4c, + 0xa3, 0xb5, 0x7a, 0x50, 0x7b, 0xfa, 0xd0, 0xca, 0x49, 0x26, 0xa4, 0xb0, 0x8e, 0xe7, 0xc4, 0x3d, + 0x9f, 0xdb, 0x84, 0x4d, 0x7d, 0x6e, 0x83, 0x8e, 0x38, 0x9f, 0x33, 0xf4, 0x05, 0xac, 0x93, 0xc0, + 0x73, 0x06, 0x7e, 0xe8, 0x7e, 0x6f, 0xde, 0x6a, 0x19, 0x07, 0xb5, 0xa7, 0x6d, 0x6b, 0x59, 0x70, + 0x2b, 0xc9, 0x77, 0x1c, 0x78, 0x5d, 0xe1, 0x69, 0x57, 0x89, 0xfe, 0x42, 0xc7, 0x50, 0x1b, 0x90, + 0x11, 0x0d, 0x34, 0xc4, 0xaa, 0x84, 0x78, 0xf4, 0xdf, 0x10, 0x5d, 0xe1, 0xac, 0x40, 0x60, 0x90, + 0x7e, 0xb7, 0x5f, 0x03, 0x2a, 0x7b, 0xa0, 0x13, 0x58, 0x23, 0x33, 0x12, 0xf0, 0xa4, 0xb0, 0xbb, + 0xe5, 0xc2, 0x84, 0xb9, 0x6b, 0xbe, 0xbd, 0x6c, 0xae, 0xfc, 0x73, 0xd9, 0xac, 0x2b, 0xef, 0xcf, + 0xc2, 0x09, 0xe5, 0x64, 0x12, 0xf1, 0x0b, 0x5b, 0xc7, 0xb7, 0x7f, 0xbe, 0x05, 0xf5, 0xe5, 0x2a, + 0xd0, 0x19, 0xec, 0xa4, 0xe7, 0xec, 0x4c, 0x23, 0x0f, 0x73, 0x92, 0x64, 0x6a, 0x95, 0x32, 0xbd, + 0x4c, 0x3c, 0xbf, 0x95, 0x8e, 0xdd, 0xdb, 0x22, 0xa7, 0x5d, 0x9f, 0x15, 0xb7, 0x19, 0x7a, 0x05, + 0xf7, 0x5c, 0x91, 0x25, 0x60, 0x53, 0xe6, 0xc8, 0x26, 0x49, 0xa1, 0x95, 0xbe, 0x9f, 0xe4, 0xa1, + 0x55, 0x93, 0xf4, 0x92, 0x80, 0x6f, 0x64, 0x53, 0xd9, 0x7b, 0x6e, 0x61, 0x23, 0x81, 0xce, 0xe4, + 0x58, 0xfd, 0x40, 0x39, 0x7e, 0x32, 0x60, 0x2b, 0x2d, 0x88, 0xf5, 0x83, 0x61, 0x88, 0x7a, 0xb0, + 0x99, 0x89, 0xc1, 0x08, 0x37, 0x0d, 0xc9, 0xb6, 0x51, 0x66, 0x9b, 0x06, 0x9e, 0x11, 0x6e, 0x6f, + 0xcc, 0x72, 0x2b, 0x64, 0xc1, 0xae, 0x8f, 0x19, 0x77, 0xc6, 0x84, 0x8e, 0xc6, 0xdc, 0x71, 0xc7, + 0x38, 0x18, 0x11, 0x4f, 0x16, 0xbe, 0x6a, 0xef, 0x08, 0xd3, 0x89, 0xb4, 0xf4, 0x94, 0xa1, 0xfd, + 0xab, 0x01, 0xbb, 0x4b, 0xc5, 0x4b, 0x32, 0x36, 0xd4, 0x97, 0x44, 0x64, 0x9a, 0xcf, 0xff, 0xab, + 0xa7, 0x4f, 0x66, 0xbb, 0xa8, 0x21, 0x7b, 0x6f, 0x6e, 0x7f, 0x1b, 0xb0, 0x53, 0x18, 0x36, 0xc9, + 0xec, 0x15, 0xec, 0xf9, 0x72, 0x0e, 0x1d, 0x21, 0xb8, 0x13, 0x27, 0x46, 0x4d, 0xef, 0x71, 0xb9, + 0xf3, 0xaf, 0x19, 0x5b, 0x7b, 0x57, 0x61, 0x1c, 0x0e, 0x5c, 0x9a, 0xcd, 0xf2, 0x5d, 0x58, 0x53, + 0xdc, 0x34, 0x27, 0xbd, 0x42, 0xaf, 0xe1, 0x5e, 0x92, 0xc6, 0x19, 0xd2, 0x00, 0xfb, 0xf4, 0x47, + 0x52, 0x18, 0xb7, 0x27, 0xa5, 0x3e, 0x48, 0x40, 0xbf, 0xd4, 0xee, 0x6a, 0xe0, 0xf6, 0xe2, 0xeb, + 0xb6, 0xdb, 0x63, 0xa8, 0xbc, 0x54, 0x77, 0x16, 0x3a, 0x84, 0xf5, 0x54, 0x36, 0x5d, 0x51, 0xe1, + 0x32, 0xd1, 0x77, 0x5b, 0x26, 0xb9, 0x16, 0x3b, 0x8b, 0x42, 0xfb, 0x50, 0x65, 0xe1, 0x90, 0xff, + 0x80, 0x63, 0x22, 0xeb, 0x58, 0xb7, 0xd3, 0x75, 0xfb, 0xb7, 0x0a, 0xdc, 0x39, 0x13, 0xa2, 0xa0, + 0xcf, 0xa1, 0xa2, 0xb1, 0x74, 0x9a, 0xfb, 0x65, 0xe1, 0x34, 0x29, 0x9d, 0x22, 0xf1, 0x47, 0x4f, + 0xa0, 0xea, 0x8e, 0x31, 0x0d, 0x1c, 0xaa, 0x0e, 0x6f, 0xbd, 0x5b, 0x5b, 0x5c, 0x36, 0x2b, 0x3d, + 0xb1, 0xd7, 0x3f, 0xb2, 0x2b, 0xd2, 0xd8, 0xf7, 0xd0, 0x63, 0xd8, 0xa2, 0x01, 0xe5, 0x14, 0xfb, + 0xfa, 0xc8, 0xcd, 0x2d, 0x29, 0xeb, 0xa6, 0xde, 0x55, 0xa7, 0x8d, 0x3e, 0x05, 0x79, 0xf6, 0x4a, + 0xd0, 0xc4, 0x73, 0x55, 0x7a, 0x6e, 0x0b, 0x83, 0xd4, 0x48, 0xfb, 0xda, 0xb0, 0x99, 0xf3, 0xa5, + 0x9e, 0x79, 0xbb, 0xcc, 0x5d, 0xf5, 0xa4, 0x8c, 0xea, 0x1f, 0x75, 0x77, 0x05, 0xf7, 0xc5, 0x65, + 0xb3, 0x76, 0x9a, 0x40, 0xf5, 0x8f, 0xec, 0x5a, 0x8a, 0xdb, 0xf7, 0xd0, 0x29, 0x6c, 0xe7, 0x30, + 0xc5, 0xbb, 0x60, 0xde, 0x91, 0xa8, 0xfb, 0x96, 0x7a, 0x13, 0xac, 0xe4, 0x4d, 0xb0, 0xce, 0x93, + 0x47, 0xa3, 0x5b, 0x15, 0xb0, 0x6f, 0xfe, 0x6c, 0x1a, 0xf6, 0x66, 0x8a, 0x25, 0xac, 0xe8, 0x2b, + 0xd8, 0x0e, 0xc8, 0x9c, 0x3b, 0xe9, 0x54, 0x32, 0x73, 0xed, 0x46, 0x73, 0xbc, 0x25, 0xc2, 0xb2, + 0x2b, 0x01, 0x3d, 0x07, 0xc8, 0x61, 0x54, 0x6e, 0x84, 0x91, 0x8b, 0x10, 0x44, 0x64, 0x59, 0x39, + 0x90, 0xea, 0xcd, 0x88, 0x88, 0xb0, 0x1c, 0x91, 0x1e, 0x34, 0xf2, 0x63, 0x9b, 0xe1, 0xa5, 0x13, + 0xbc, 0x2e, 0x0f, 0xeb, 0x41, 0x36, 0xc1, 0x59, 0xb4, 0x9e, 0xe5, 0x6b, 0xef, 0x13, 0xf8, 0xc0, + 0xfb, 0xe4, 0x6b, 0x78, 0x54, 0xb8, 0x4f, 0x96, 0xf0, 0x53, 0x7a, 0x35, 0x49, 0xaf, 0x95, 0xbb, + 0x60, 0x8a, 0x40, 0x09, 0xc7, 0xa4, 0x11, 0x63, 0xf9, 0x4a, 0x33, 0x67, 0x8c, 0xd9, 0xd8, 0xdc, + 0x68, 0x19, 0x07, 0x1b, 0xaa, 0x11, 0xd5, 0xeb, 0xcd, 0x4e, 0x30, 0x1b, 0xa3, 0xfb, 0x50, 0xc5, + 0x51, 0xa4, 0x5c, 0x36, 0xa5, 0x4b, 0x05, 0x47, 0x91, 0x34, 0xbd, 0x80, 0xba, 0xec, 0x00, 0xd5, + 0x4f, 0x1e, 0xf1, 0xf1, 0x85, 0xb9, 0xad, 0xdb, 0x74, 0xb9, 0xa1, 0x8e, 0xf4, 0x4f, 0x86, 0xea, + 0xa7, 0x5f, 0x44, 0x3f, 0xc9, 0x3e, 0x90, 0xfd, 0x74, 0x24, 0x42, 0xbb, 0x2f, 0xde, 0x2e, 0x1a, + 0xc6, 0xbb, 0x45, 0xc3, 0xf8, 0x6b, 0xd1, 0x30, 0xde, 0x5c, 0x35, 0x56, 0xde, 0x5d, 0x35, 0x56, + 0x7e, 0xbf, 0x6a, 0xac, 0x7c, 0xf7, 0x6c, 0x44, 0xf9, 0x78, 0x3a, 0xb0, 0xdc, 0x70, 0xd2, 0x71, + 0xc3, 0x09, 0xe1, 0x83, 0x21, 0xcf, 0x3e, 0xd4, 0xef, 0xd9, 0xf2, 0x8f, 0xdd, 0x60, 0x4d, 0xee, + 0x3f, 0xfb, 0x37, 0x00, 0x00, 0xff, 0xff, 0x55, 0x6f, 0x26, 0x24, 0xf3, 0x09, 0x00, 0x00, } func (m *LegacyABCIResponses) Marshal() (dAtA []byte, err error) { @@ -1007,6 +1020,14 @@ func (m *State) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + n9, err9 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.NextBlockDelay, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.NextBlockDelay):]) + if err9 != nil { + return 0, err9 + } + i -= n9 + i = encodeVarintTypes(dAtA, i, uint64(n9)) + i-- + dAtA[i] = 0x7a if m.InitialHeight != 0 { i = encodeVarintTypes(dAtA, i, uint64(m.InitialHeight)) i-- @@ -1082,12 +1103,12 @@ func (m *State) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - n13, err13 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.LastBlockTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.LastBlockTime):]) - if err13 != nil { - return 0, err13 + n14, err14 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.LastBlockTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.LastBlockTime):]) + if err14 != nil { + return 0, err14 } - i -= n13 - i = encodeVarintTypes(dAtA, i, uint64(n13)) + i -= n14 + i = encodeVarintTypes(dAtA, i, uint64(n14)) i-- dAtA[i] = 0x2a { @@ -1314,6 +1335,8 @@ func (m *State) Size() (n int) { if m.InitialHeight != 0 { n += 1 + sovTypes(uint64(m.InitialHeight)) } + l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.NextBlockDelay) + n += 1 + l + sovTypes(uint64(l)) return n } @@ -2625,6 +2648,39 @@ func (m *State) Unmarshal(dAtA []byte) error { break } } + case 15: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NextBlockDelay", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.NextBlockDelay, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/proto/tendermint/state/types.proto b/proto/tendermint/state/types.proto index c76c25fa852..1175cec1760 100644 --- a/proto/tendermint/state/types.proto +++ b/proto/tendermint/state/types.proto @@ -10,6 +10,7 @@ import "tendermint/types/validator.proto"; import "tendermint/types/params.proto"; import "tendermint/version/types.proto"; import "google/protobuf/timestamp.proto"; +import "google/protobuf/duration.proto"; // LegacyABCIResponses retains the responses // of the legacy ABCI calls during block processing. @@ -93,4 +94,11 @@ message State { // the latest AppHash we've received from calling abci.Commit() bytes app_hash = 13; + + // delay between the time when this block is committed and the next height is started. + // previously `timeout_commit` in config.toml + google.protobuf.Duration next_block_delay = 15 [ + (gogoproto.nullable) = false, + (gogoproto.stdduration) = true + ]; } diff --git a/state/execution.go b/state/execution.go index 20e8928142d..bec0ae38f6f 100644 --- a/state/execution.go +++ b/state/execution.go @@ -3,6 +3,7 @@ package state import ( "bytes" "context" + "errors" "fmt" "time" @@ -282,6 +283,11 @@ func (blockExec *BlockExecutor) ApplyBlock( blockExec.metrics.ConsensusParamUpdates.Add(1) } + err = validateNextBlockDelay(abciResponse.NextBlockDelay) + if err != nil { + return state, fmt.Errorf("error in next block delay: %w", err) + } + // Update the state with the block and responses. state, err = updateState(state, blockID, &block.Header, abciResponse, validatorUpdates) if err != nil { @@ -581,6 +587,13 @@ func validateValidatorUpdates(abciUpdates []abci.ValidatorUpdate, return nil } +func validateNextBlockDelay(nextBlockDelay time.Duration) error { + if nextBlockDelay < 0 { + return errors.New("negative duration") + } + return nil +} + // updateState returns a new State updated according to the header and responses. func updateState( state State, @@ -649,6 +662,7 @@ func updateState( LastHeightConsensusParamsChanged: lastHeightParamsChanged, LastResultsHash: TxResultsHash(abciResponse.TxResults), AppHash: nil, + NextBlockDelay: abciResponse.NextBlockDelay, }, nil } diff --git a/state/state.go b/state/state.go index 15fb8e5e62b..6ddf9a6b27a 100644 --- a/state/state.go +++ b/state/state.go @@ -77,6 +77,10 @@ type State struct { // the latest AppHash we've received from calling abci.Commit() AppHash []byte + + // delay between the time when this block is committed and the next height is started. + // previously `timeout_commit` in config.toml + NextBlockDelay time.Duration } // Copy makes a copy of the State for mutating. @@ -102,6 +106,8 @@ func (state State) Copy() State { AppHash: state.AppHash, LastResultsHash: state.LastResultsHash, + + NextBlockDelay: state.NextBlockDelay, } } @@ -170,6 +176,7 @@ func (state *State) ToProto() (*cmtstate.State, error) { sm.LastHeightConsensusParamsChanged = state.LastHeightConsensusParamsChanged sm.LastResultsHash = state.LastResultsHash sm.AppHash = state.AppHash + sm.NextBlockDelay = state.NextBlockDelay return sm, nil } @@ -221,6 +228,7 @@ func FromProto(pb *cmtstate.State) (*State, error) { //nolint:golint state.LastHeightConsensusParamsChanged = pb.LastHeightConsensusParamsChanged state.LastResultsHash = pb.LastResultsHash state.AppHash = pb.AppHash + state.NextBlockDelay = pb.NextBlockDelay return state, nil } @@ -351,5 +359,7 @@ func MakeGenesisState(genDoc *types.GenesisDoc) (State, error) { LastHeightConsensusParamsChanged: genDoc.InitialHeight, AppHash: genDoc.AppHash, + // NextBlockDelay is set to 0 because the genesis block is committed. + NextBlockDelay: 0, }, nil } diff --git a/test/e2e/app/app.go b/test/e2e/app/app.go index 34489a892d3..d497d17a645 100644 --- a/test/e2e/app/app.go +++ b/test/e2e/app/app.go @@ -277,6 +277,7 @@ func (app *Application) FinalizeBlock(_ context.Context, req *abci.RequestFinali }, }, }, + NextBlockDelay: 1 * time.Second, }, nil }