From ce1f3d5affa1bf9bdb7ff52499d4f1b21b10feab Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 27 Sep 2023 16:29:06 +0200 Subject: [PATCH 1/4] feat: give the application control to validate the app version --- abci/types/types.pb.go | 430 ++++++++++++++++-------------- proto/tendermint/abci/types.proto | 1 + state/execution.go | 1 + state/validation.go | 10 +- 4 files changed, 240 insertions(+), 202 deletions(-) diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index c2b7e90e17..e19280a636 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -6,12 +6,12 @@ package types import ( context "context" fmt "fmt" + crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + types1 "github.com/cometbft/cometbft/proto/tendermint/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - types1 "github.com/cometbft/cometbft/proto/tendermint/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -1318,6 +1318,7 @@ type RequestProcessProposal struct { NextValidatorsHash []byte `protobuf:"bytes,7,opt,name=next_validators_hash,json=nextValidatorsHash,proto3" json:"next_validators_hash,omitempty"` // address of the public key of the original proposer of the block. ProposerAddress []byte `protobuf:"bytes,8,opt,name=proposer_address,json=proposerAddress,proto3" json:"proposer_address,omitempty"` + AppVersion uint64 `protobuf:"varint,9,opt,name=app_version,json=appVersion,proto3" json:"app_version,omitempty"` } func (m *RequestProcessProposal) Reset() { *m = RequestProcessProposal{} } @@ -1409,6 +1410,13 @@ func (m *RequestProcessProposal) GetProposerAddress() []byte { return nil } +func (m *RequestProcessProposal) GetAppVersion() uint64 { + if m != nil { + return m.AppVersion + } + return 0 +} + type Response struct { // Types that are valid to be assigned to Value: // @@ -3582,201 +3590,202 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 3099 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0x23, 0xc5, - 0x15, 0xd7, 0xf7, 0xc7, 0xd3, 0xa7, 0x7b, 0xcd, 0xae, 0x56, 0x2c, 0xb6, 0x99, 0x2d, 0x60, 0x77, - 0x01, 0x2f, 0x31, 0x59, 0x3e, 0x0a, 0x08, 0x58, 0x5a, 0x2d, 0x32, 0x36, 0xb6, 0x33, 0x96, 0x97, - 0x90, 0x8f, 0x1d, 0x5a, 0x9a, 0xb6, 0x34, 0xac, 0x34, 0x33, 0xcc, 0x8c, 0x8c, 0xcc, 0x31, 0x54, - 0xaa, 0x52, 0xe4, 0xc2, 0x91, 0x0b, 0x87, 0x1c, 0xf2, 0x3f, 0xe4, 0x94, 0x4b, 0x2e, 0x54, 0xe5, - 0xc2, 0x21, 0x87, 0x1c, 0x52, 0x24, 0x05, 0xb7, 0xfc, 0x03, 0x39, 0xe4, 0x40, 0xaa, 0x3f, 0xe6, - 0x4b, 0xd2, 0x58, 0x32, 0xa4, 0x52, 0x95, 0xca, 0x6d, 0xfa, 0xcd, 0x7b, 0x6f, 0xba, 0x5f, 0x77, - 0xff, 0xfa, 0xfd, 0xde, 0x34, 0x3c, 0xea, 0x10, 0x5d, 0x25, 0xd6, 0x48, 0xd3, 0x9d, 0xdb, 0xb8, - 0xdb, 0xd3, 0x6e, 0x3b, 0x67, 0x26, 0xb1, 0x37, 0x4d, 0xcb, 0x70, 0x0c, 0x54, 0xf1, 0x5f, 0x6e, - 0xd2, 0x97, 0xf5, 0xc7, 0x02, 0xda, 0x3d, 0xeb, 0xcc, 0x74, 0x8c, 0xdb, 0xa6, 0x65, 0x18, 0x27, - 0x5c, 0xbf, 0x7e, 0x2d, 0xf0, 0x9a, 0xf9, 0x09, 0x7a, 0x0b, 0xbd, 0x15, 0xc6, 0x0f, 0xc9, 0x99, - 0xfb, 0xf6, 0xb1, 0x19, 0x5b, 0x13, 0x5b, 0x78, 0xe4, 0xbe, 0x5e, 0xef, 0x1b, 0x46, 0x7f, 0x48, - 0x6e, 0xb3, 0x56, 0x77, 0x7c, 0x72, 0xdb, 0xd1, 0x46, 0xc4, 0x76, 0xf0, 0xc8, 0x14, 0x0a, 0xab, - 0x7d, 0xa3, 0x6f, 0xb0, 0xc7, 0xdb, 0xf4, 0x89, 0x4b, 0xa5, 0x6f, 0x73, 0x90, 0x95, 0xc9, 0x07, - 0x63, 0x62, 0x3b, 0x68, 0x0b, 0x52, 0xa4, 0x37, 0x30, 0x6a, 0xf1, 0x8d, 0xf8, 0x8d, 0xc2, 0xd6, - 0xb5, 0xcd, 0xa9, 0xc1, 0x6d, 0x0a, 0xbd, 0x56, 0x6f, 0x60, 0xb4, 0x63, 0x32, 0xd3, 0x45, 0x77, - 0x20, 0x7d, 0x32, 0x1c, 0xdb, 0x83, 0x5a, 0x82, 0x19, 0x3d, 0x16, 0x65, 0x74, 0x8f, 0x2a, 0xb5, - 0x63, 0x32, 0xd7, 0xa6, 0x9f, 0xd2, 0xf4, 0x13, 0xa3, 0x96, 0x3c, 0xff, 0x53, 0x3b, 0xfa, 0x09, - 0xfb, 0x14, 0xd5, 0x45, 0x0d, 0x00, 0x4d, 0xd7, 0x1c, 0xa5, 0x37, 0xc0, 0x9a, 0x5e, 0x4b, 0x33, - 0xcb, 0xc7, 0xa3, 0x2d, 0x35, 0xa7, 0x49, 0x15, 0xdb, 0x31, 0x39, 0xaf, 0xb9, 0x0d, 0xda, 0xdd, - 0x0f, 0xc6, 0xc4, 0x3a, 0xab, 0x65, 0xce, 0xef, 0xee, 0x8f, 0xa9, 0x12, 0xed, 0x2e, 0xd3, 0x46, - 0x2d, 0x28, 0x74, 0x49, 0x5f, 0xd3, 0x95, 0xee, 0xd0, 0xe8, 0x3d, 0xac, 0x65, 0x99, 0xb1, 0x14, - 0x65, 0xdc, 0xa0, 0xaa, 0x0d, 0xaa, 0xd9, 0x8e, 0xc9, 0xd0, 0xf5, 0x5a, 0xe8, 0x55, 0xc8, 0xf5, - 0x06, 0xa4, 0xf7, 0x50, 0x71, 0x26, 0xb5, 0x1c, 0xf3, 0xb1, 0x1e, 0xe5, 0xa3, 0x49, 0xf5, 0x3a, - 0x93, 0x76, 0x4c, 0xce, 0xf6, 0xf8, 0x23, 0x1d, 0xbf, 0x4a, 0x86, 0xda, 0x29, 0xb1, 0xa8, 0x7d, - 0xfe, 0xfc, 0xf1, 0xdf, 0xe5, 0x9a, 0xcc, 0x43, 0x5e, 0x75, 0x1b, 0xe8, 0x75, 0xc8, 0x13, 0x5d, - 0x15, 0xc3, 0x00, 0xe6, 0x62, 0x23, 0x72, 0x9e, 0x75, 0xd5, 0x1d, 0x44, 0x8e, 0x88, 0x67, 0xf4, - 0x12, 0x64, 0x7a, 0xc6, 0x68, 0xa4, 0x39, 0xb5, 0x02, 0xb3, 0x5e, 0x8b, 0x1c, 0x00, 0xd3, 0x6a, - 0xc7, 0x64, 0xa1, 0x8f, 0xf6, 0xa1, 0x3c, 0xd4, 0x6c, 0x47, 0xb1, 0x75, 0x6c, 0xda, 0x03, 0xc3, - 0xb1, 0x6b, 0x45, 0xe6, 0xe1, 0x89, 0x28, 0x0f, 0x7b, 0x9a, 0xed, 0x1c, 0xb9, 0xca, 0xed, 0x98, - 0x5c, 0x1a, 0x06, 0x05, 0xd4, 0x9f, 0x71, 0x72, 0x42, 0x2c, 0xcf, 0x61, 0xad, 0x74, 0xbe, 0xbf, - 0x03, 0xaa, 0xed, 0xda, 0x53, 0x7f, 0x46, 0x50, 0x80, 0x7e, 0x06, 0x97, 0x86, 0x06, 0x56, 0x3d, - 0x77, 0x4a, 0x6f, 0x30, 0xd6, 0x1f, 0xd6, 0xca, 0xcc, 0xe9, 0xcd, 0xc8, 0x4e, 0x1a, 0x58, 0x75, - 0x5d, 0x34, 0xa9, 0x41, 0x3b, 0x26, 0xaf, 0x0c, 0xa7, 0x85, 0xe8, 0x01, 0xac, 0x62, 0xd3, 0x1c, - 0x9e, 0x4d, 0x7b, 0xaf, 0x30, 0xef, 0xb7, 0xa2, 0xbc, 0x6f, 0x53, 0x9b, 0x69, 0xf7, 0x08, 0xcf, - 0x48, 0x51, 0x07, 0xaa, 0xa6, 0x45, 0x4c, 0x6c, 0x11, 0xc5, 0xb4, 0x0c, 0xd3, 0xb0, 0xf1, 0xb0, - 0x56, 0x65, 0xbe, 0x9f, 0x8a, 0xf2, 0x7d, 0xc8, 0xf5, 0x0f, 0x85, 0x7a, 0x3b, 0x26, 0x57, 0xcc, - 0xb0, 0x88, 0x7b, 0x35, 0x7a, 0xc4, 0xb6, 0x7d, 0xaf, 0x2b, 0x8b, 0xbc, 0x32, 0xfd, 0xb0, 0xd7, - 0x90, 0xa8, 0x91, 0x85, 0xf4, 0x29, 0x1e, 0x8e, 0xc9, 0x5b, 0xa9, 0x5c, 0xaa, 0x9a, 0x96, 0x9e, - 0x82, 0x42, 0x00, 0x58, 0x50, 0x0d, 0xb2, 0x23, 0x62, 0xdb, 0xb8, 0x4f, 0x18, 0x0e, 0xe5, 0x65, - 0xb7, 0x29, 0x95, 0xa1, 0x18, 0x04, 0x13, 0x69, 0xe4, 0x19, 0x52, 0x98, 0xa0, 0x86, 0xa7, 0xc4, - 0xb2, 0x35, 0x43, 0x77, 0x0d, 0x45, 0x13, 0x5d, 0x87, 0x12, 0x5b, 0xf0, 0x8a, 0xfb, 0x9e, 0x62, - 0x55, 0x4a, 0x2e, 0x32, 0xe1, 0x7d, 0xa1, 0xb4, 0x0e, 0x05, 0x73, 0xcb, 0xf4, 0x54, 0x92, 0x4c, - 0x05, 0xcc, 0x2d, 0x53, 0x28, 0x48, 0x7f, 0x4a, 0x40, 0x75, 0x1a, 0x5c, 0xd0, 0x4b, 0x90, 0xa2, - 0x38, 0x2b, 0x20, 0xb3, 0xbe, 0xc9, 0x41, 0x78, 0xd3, 0x05, 0xe1, 0xcd, 0x8e, 0x0b, 0xc2, 0x8d, - 0xdc, 0x17, 0x5f, 0xad, 0xc7, 0x3e, 0xfd, 0xdb, 0x7a, 0x5c, 0x66, 0x16, 0xe8, 0x2a, 0xc5, 0x02, - 0xac, 0xe9, 0x8a, 0xa6, 0xb2, 0xfe, 0xe4, 0xe9, 0x46, 0xc7, 0x9a, 0xbe, 0xa3, 0xa2, 0x5d, 0xa8, - 0xf6, 0x0c, 0xdd, 0x26, 0xba, 0x3d, 0xb6, 0x15, 0x0e, 0xf2, 0x02, 0x28, 0x67, 0xf7, 0x6a, 0xd3, - 0x55, 0x3c, 0x64, 0x7a, 0x72, 0xa5, 0x17, 0x16, 0xa0, 0x7b, 0x00, 0xa7, 0x78, 0xa8, 0xa9, 0xd8, - 0x31, 0x2c, 0xbb, 0x96, 0xda, 0x48, 0xce, 0x75, 0x73, 0xdf, 0x55, 0x39, 0x36, 0x55, 0xec, 0x90, - 0x46, 0x8a, 0xf6, 0x56, 0x0e, 0x58, 0xa2, 0x27, 0xa1, 0x82, 0x4d, 0x53, 0xb1, 0x1d, 0xec, 0x10, - 0xa5, 0x7b, 0xe6, 0x10, 0x9b, 0x41, 0x70, 0x51, 0x2e, 0x61, 0xd3, 0x3c, 0xa2, 0xd2, 0x06, 0x15, - 0xa2, 0x27, 0xa0, 0x4c, 0xe1, 0x56, 0xc3, 0x43, 0x65, 0x40, 0xb4, 0xfe, 0xc0, 0x61, 0x50, 0x9b, - 0x94, 0x4b, 0x42, 0xda, 0x66, 0x42, 0x49, 0xf5, 0x26, 0x93, 0x41, 0x2d, 0x42, 0x90, 0x52, 0xb1, - 0x83, 0x59, 0x20, 0x8b, 0x32, 0x7b, 0xa6, 0x32, 0x13, 0x3b, 0x03, 0x11, 0x1e, 0xf6, 0x8c, 0x2e, - 0x43, 0x46, 0xb8, 0x4d, 0x32, 0xb7, 0xa2, 0x85, 0x56, 0x21, 0x6d, 0x5a, 0xc6, 0x29, 0xa9, 0xa5, - 0x36, 0xe2, 0x37, 0x72, 0x32, 0x6f, 0x48, 0x1f, 0x27, 0x60, 0x65, 0x06, 0x94, 0xa9, 0xdf, 0x01, - 0xb6, 0x07, 0xee, 0xb7, 0xe8, 0x33, 0x7a, 0x81, 0xfa, 0xc5, 0x2a, 0xb1, 0xc4, 0x41, 0x56, 0x0b, - 0x86, 0x88, 0x1f, 0xd2, 0x6d, 0xf6, 0x5e, 0x84, 0x46, 0x68, 0xd3, 0xb9, 0x1a, 0x62, 0xdb, 0x51, - 0x38, 0xc8, 0x29, 0x81, 0x43, 0xed, 0xd1, 0x39, 0x73, 0x45, 0x75, 0xe8, 0x62, 0x15, 0x4e, 0xca, - 0xd4, 0xd4, 0x97, 0xa2, 0x63, 0x58, 0xed, 0x9e, 0x7d, 0x84, 0x75, 0x47, 0xd3, 0x89, 0x32, 0x33, - 0x6b, 0xb3, 0xa7, 0xe4, 0xdb, 0x9a, 0xdd, 0x25, 0x03, 0x7c, 0xaa, 0x19, 0x6e, 0xb7, 0x2e, 0x79, - 0xf6, 0xde, 0x8c, 0xda, 0x92, 0x0c, 0xe5, 0xf0, 0xa9, 0x82, 0xca, 0x90, 0x70, 0x26, 0x62, 0xfc, - 0x09, 0x67, 0x82, 0x9e, 0x83, 0x14, 0x1d, 0x23, 0x1b, 0x7b, 0x79, 0xce, 0x87, 0x84, 0x5d, 0xe7, - 0xcc, 0x24, 0x32, 0xd3, 0x94, 0x24, 0x6f, 0x33, 0x78, 0x27, 0xcd, 0xb4, 0x57, 0xe9, 0x26, 0x54, - 0xa6, 0x8e, 0x92, 0xc0, 0xf4, 0xc5, 0x83, 0xd3, 0x27, 0x55, 0xa0, 0x14, 0x3a, 0x37, 0xa4, 0xcb, - 0xb0, 0x3a, 0xef, 0x18, 0x90, 0x06, 0x9e, 0x3c, 0x04, 0xe7, 0xe8, 0x0e, 0xe4, 0xbc, 0x73, 0x80, - 0x6f, 0xc6, 0xab, 0x33, 0xa3, 0x70, 0x95, 0x65, 0x4f, 0x95, 0xee, 0x42, 0xba, 0xaa, 0xd9, 0x72, - 0x48, 0xb0, 0x8e, 0x67, 0xb1, 0x69, 0xb6, 0xb1, 0x3d, 0x90, 0xde, 0x83, 0x5a, 0x14, 0xc6, 0x4f, - 0x0d, 0x23, 0xe5, 0xad, 0xc2, 0xcb, 0x90, 0x39, 0x31, 0xac, 0x11, 0x76, 0x98, 0xb3, 0x92, 0x2c, - 0x5a, 0x74, 0x75, 0x72, 0xbc, 0x4f, 0x32, 0x31, 0x6f, 0x48, 0x0a, 0x5c, 0x8d, 0xc4, 0x79, 0x6a, - 0xa2, 0xe9, 0x2a, 0xe1, 0xf1, 0x2c, 0xc9, 0xbc, 0xe1, 0x3b, 0xe2, 0x9d, 0xe5, 0x0d, 0xfa, 0x59, - 0x9b, 0x8d, 0x95, 0xf9, 0xcf, 0xcb, 0xa2, 0x25, 0x7d, 0x96, 0x84, 0xcb, 0xf3, 0xd1, 0x1e, 0x6d, - 0x40, 0x71, 0x84, 0x27, 0x8a, 0x33, 0x11, 0x7b, 0x99, 0x4f, 0x07, 0x8c, 0xf0, 0xa4, 0x33, 0xe1, - 0x1b, 0xb9, 0x0a, 0x49, 0x67, 0x62, 0xd7, 0x12, 0x1b, 0xc9, 0x1b, 0x45, 0x99, 0x3e, 0xa2, 0x63, - 0x58, 0x19, 0x1a, 0x3d, 0x3c, 0x54, 0x02, 0x2b, 0x5e, 0x2c, 0xf6, 0xeb, 0x33, 0xc1, 0x6e, 0x4d, - 0x98, 0x44, 0x9d, 0x59, 0xf4, 0x15, 0xe6, 0x63, 0xcf, 0x5b, 0xf9, 0xe8, 0x2e, 0x14, 0x46, 0xfe, - 0x42, 0xbe, 0xc0, 0x62, 0x0f, 0x9a, 0x05, 0xa6, 0x24, 0x1d, 0x02, 0x06, 0x17, 0xa1, 0x33, 0x17, - 0x46, 0xe8, 0xe7, 0x60, 0x55, 0x27, 0x13, 0x27, 0xb0, 0x11, 0xf9, 0x3a, 0xc9, 0xb2, 0xd0, 0x23, - 0xfa, 0xce, 0xdf, 0x64, 0x74, 0xc9, 0xa0, 0x9b, 0xec, 0xbc, 0x34, 0x0d, 0x9b, 0x58, 0x0a, 0x56, - 0x55, 0x8b, 0xd8, 0x36, 0xcb, 0xf3, 0x8a, 0xec, 0x10, 0x64, 0xf2, 0x6d, 0x2e, 0x96, 0x7e, 0x1d, - 0x9c, 0x9a, 0xd0, 0xf9, 0xe8, 0x06, 0x3e, 0xee, 0x07, 0xfe, 0x08, 0x56, 0x85, 0xbd, 0x1a, 0x8a, - 0x7d, 0x62, 0x59, 0xa0, 0x41, 0xae, 0x79, 0x74, 0xd8, 0x93, 0xdf, 0x2d, 0xec, 0x2e, 0x96, 0xa6, - 0x02, 0x58, 0xfa, 0x3f, 0x36, 0x15, 0x7f, 0xce, 0x43, 0x4e, 0x26, 0xb6, 0x49, 0x0f, 0x4e, 0xd4, - 0x80, 0x3c, 0x99, 0xf4, 0x88, 0xe9, 0xb8, 0x79, 0xc4, 0xfc, 0x3c, 0x9f, 0x6b, 0xb7, 0x5c, 0x4d, - 0x9a, 0x64, 0x7b, 0x66, 0xe8, 0x79, 0xc1, 0xa3, 0xa2, 0x29, 0x91, 0x30, 0x0f, 0x12, 0xa9, 0x17, - 0x5c, 0x22, 0x95, 0x8c, 0xcc, 0xab, 0xb9, 0xd5, 0x14, 0x93, 0x7a, 0x5e, 0x30, 0xa9, 0xd4, 0x82, - 0x8f, 0x85, 0xa8, 0x54, 0x33, 0x44, 0xa5, 0x32, 0x0b, 0x86, 0x19, 0xc1, 0xa5, 0x5e, 0x70, 0xb9, - 0x54, 0x76, 0x41, 0x8f, 0xa7, 0xc8, 0xd4, 0xbd, 0x30, 0x99, 0xca, 0x45, 0x00, 0x88, 0x6b, 0x1d, - 0xc9, 0xa6, 0x5e, 0x0b, 0xb0, 0xa9, 0x7c, 0x24, 0x95, 0xe1, 0x4e, 0xe6, 0xd0, 0xa9, 0x66, 0x88, - 0x4e, 0xc1, 0x82, 0x18, 0x44, 0xf0, 0xa9, 0x37, 0x82, 0x7c, 0xaa, 0x10, 0x49, 0xc9, 0xc4, 0x7c, - 0xcf, 0x23, 0x54, 0x2f, 0x7b, 0x84, 0xaa, 0x18, 0xc9, 0x08, 0xc5, 0x18, 0xa6, 0x19, 0xd5, 0xc1, - 0x0c, 0xa3, 0xe2, 0x0c, 0xe8, 0xc9, 0x48, 0x17, 0x0b, 0x28, 0xd5, 0xc1, 0x0c, 0xa5, 0x2a, 0x2f, - 0x70, 0xb8, 0x80, 0x53, 0xfd, 0x7c, 0x3e, 0xa7, 0x8a, 0x66, 0x3d, 0xa2, 0x9b, 0xcb, 0x91, 0x2a, - 0x25, 0x82, 0x54, 0x71, 0xe2, 0xf3, 0x74, 0xa4, 0xfb, 0xa5, 0x59, 0xd5, 0xf1, 0x1c, 0x56, 0xc5, - 0xf9, 0xcf, 0x8d, 0x48, 0xe7, 0x4b, 0xd0, 0xaa, 0xe3, 0x39, 0xb4, 0x0a, 0x2d, 0x74, 0x7b, 0x11, - 0x5e, 0x95, 0xae, 0x66, 0xa4, 0x9b, 0x34, 0xf5, 0x9d, 0xc2, 0x29, 0x9a, 0x3f, 0x10, 0xcb, 0x32, - 0x2c, 0x41, 0x91, 0x78, 0x43, 0xba, 0x41, 0x93, 0x71, 0x1f, 0x93, 0xce, 0xe1, 0x60, 0x2c, 0x4f, - 0x0b, 0xe0, 0x90, 0xf4, 0xfb, 0xb8, 0x6f, 0xcb, 0x72, 0xd8, 0x60, 0x22, 0x9f, 0x17, 0x89, 0x7c, - 0x80, 0x9a, 0x25, 0xc2, 0xd4, 0x6c, 0x1d, 0x0a, 0x34, 0xff, 0x9a, 0x62, 0x5d, 0xd8, 0x74, 0x59, - 0x17, 0xba, 0x05, 0x2b, 0xec, 0xc4, 0xe3, 0x04, 0x4e, 0x1c, 0x2b, 0x29, 0x76, 0xac, 0x54, 0xe8, - 0x0b, 0xbe, 0xa1, 0xf8, 0xf9, 0xf2, 0x2c, 0x5c, 0x0a, 0xe8, 0x7a, 0x79, 0x1d, 0xa7, 0x29, 0x55, - 0x4f, 0x7b, 0x5b, 0x24, 0x78, 0x7f, 0x8c, 0xfb, 0x11, 0xf2, 0x19, 0xdd, 0x3c, 0xf2, 0x15, 0xff, - 0xcf, 0x90, 0xaf, 0xc4, 0x77, 0x26, 0x5f, 0xc1, 0x34, 0x35, 0x19, 0x4e, 0x53, 0xff, 0x19, 0xf7, - 0xa7, 0xc4, 0xa3, 0x52, 0x3d, 0x43, 0x25, 0x22, 0x71, 0x64, 0xcf, 0x34, 0xa7, 0x18, 0x1a, 0x7d, - 0x91, 0x1e, 0xd2, 0x47, 0xaa, 0xe5, 0x9d, 0x1b, 0x79, 0x71, 0x2c, 0x78, 0x39, 0x27, 0x3f, 0xb7, - 0x45, 0xce, 0x59, 0x85, 0xe4, 0x43, 0xc2, 0x2b, 0x66, 0x45, 0x99, 0x3e, 0x52, 0x3d, 0xb6, 0xd2, - 0xc4, 0xf9, 0xcb, 0x1b, 0xe8, 0x25, 0xc8, 0xb3, 0x5a, 0xa7, 0x62, 0x98, 0xb6, 0x40, 0xf5, 0x50, - 0x6a, 0xc2, 0x4b, 0x9a, 0x9b, 0x87, 0x54, 0xe7, 0xc0, 0xb4, 0xe5, 0x9c, 0x29, 0x9e, 0x02, 0x09, - 0x43, 0x3e, 0x94, 0x30, 0x5c, 0x83, 0x3c, 0xed, 0xbd, 0x6d, 0xe2, 0x1e, 0x61, 0x08, 0x9d, 0x97, - 0x7d, 0x81, 0xf4, 0x00, 0xd0, 0xec, 0x19, 0x81, 0xda, 0x90, 0x21, 0xa7, 0x44, 0x77, 0x78, 0x02, - 0x55, 0xd8, 0xba, 0x3c, 0x9b, 0x99, 0xd2, 0xd7, 0x8d, 0x1a, 0x0d, 0xf2, 0x3f, 0xbe, 0x5a, 0xaf, - 0x72, 0xed, 0x67, 0x8c, 0x91, 0xe6, 0x90, 0x91, 0xe9, 0x9c, 0xc9, 0xc2, 0x5e, 0xfa, 0x6b, 0x82, - 0xf2, 0x97, 0xd0, 0xf9, 0x31, 0x37, 0xb6, 0xee, 0x8a, 0x4f, 0x04, 0xa8, 0xeb, 0x72, 0xf1, 0x5e, - 0x03, 0xe8, 0x63, 0x5b, 0xf9, 0x10, 0xeb, 0x0e, 0x51, 0x45, 0xd0, 0x03, 0x12, 0x54, 0x87, 0x1c, - 0x6d, 0x8d, 0x6d, 0xa2, 0x0a, 0x16, 0xed, 0xb5, 0x03, 0xe3, 0xcc, 0x7e, 0xbf, 0x71, 0x86, 0xa3, - 0x9c, 0x9b, 0x8a, 0x72, 0x80, 0x5b, 0xe4, 0x83, 0xdc, 0x82, 0xf6, 0xcd, 0xb4, 0x34, 0xc3, 0xd2, - 0x9c, 0x33, 0x36, 0x35, 0x49, 0xd9, 0x6b, 0xa3, 0xeb, 0x50, 0x1a, 0x91, 0x91, 0x69, 0x18, 0x43, - 0x85, 0xa3, 0x4d, 0x81, 0x99, 0x16, 0x85, 0xb0, 0xc5, 0x40, 0xe7, 0x57, 0x09, 0x7f, 0xfb, 0xf9, - 0x1c, 0xf2, 0xff, 0x2e, 0xc0, 0xd2, 0x6f, 0x58, 0x5d, 0x29, 0x9c, 0x21, 0xa0, 0x23, 0x58, 0xf1, - 0xb6, 0xbf, 0x32, 0x66, 0xb0, 0xe0, 0x2e, 0xe8, 0x65, 0xf1, 0xa3, 0x7a, 0x1a, 0x16, 0xdb, 0xe8, - 0x27, 0x70, 0x65, 0x0a, 0xda, 0x3c, 0xd7, 0x89, 0x25, 0x11, 0xee, 0x91, 0x30, 0xc2, 0xb9, 0x9e, - 0xfd, 0x58, 0x25, 0xbf, 0xe7, 0xa6, 0xdb, 0x81, 0x72, 0x38, 0xdf, 0x99, 0x3b, 0xfb, 0xd7, 0xa1, - 0x64, 0x11, 0x07, 0x6b, 0xba, 0x12, 0x2a, 0x06, 0x15, 0xb9, 0x50, 0x94, 0x98, 0x0e, 0xe1, 0x91, - 0xb9, 0x79, 0x0f, 0x7a, 0x11, 0xf2, 0x7e, 0xca, 0xc4, 0x83, 0x7a, 0x4e, 0xb1, 0xc0, 0xd7, 0x95, - 0xfe, 0x10, 0xf7, 0x5d, 0x86, 0xcb, 0x0f, 0x2d, 0xc8, 0x58, 0xc4, 0x1e, 0x0f, 0x79, 0x41, 0xa0, - 0xbc, 0xf5, 0xec, 0x72, 0x19, 0x13, 0x95, 0x8e, 0x87, 0x8e, 0x2c, 0x8c, 0xa5, 0x07, 0x90, 0xe1, - 0x12, 0x54, 0x80, 0xec, 0xf1, 0xfe, 0xee, 0xfe, 0xc1, 0x3b, 0xfb, 0xd5, 0x18, 0x02, 0xc8, 0x6c, - 0x37, 0x9b, 0xad, 0xc3, 0x4e, 0x35, 0x8e, 0xf2, 0x90, 0xde, 0x6e, 0x1c, 0xc8, 0x9d, 0x6a, 0x82, - 0x8a, 0xe5, 0xd6, 0x5b, 0xad, 0x66, 0xa7, 0x9a, 0x44, 0x2b, 0x50, 0xe2, 0xcf, 0xca, 0xbd, 0x03, - 0xf9, 0xed, 0xed, 0x4e, 0x35, 0x15, 0x10, 0x1d, 0xb5, 0xf6, 0xef, 0xb6, 0xe4, 0x6a, 0x5a, 0xfa, - 0x01, 0x5c, 0x8d, 0xcc, 0xb1, 0xfc, 0xda, 0x42, 0x3c, 0x50, 0x5b, 0x90, 0x3e, 0x4b, 0x40, 0x3d, - 0x3a, 0x71, 0x42, 0x6f, 0x4d, 0x0d, 0x7c, 0xeb, 0x02, 0x59, 0xd7, 0xd4, 0xe8, 0xd1, 0x13, 0x50, - 0xb6, 0xc8, 0x09, 0x71, 0x7a, 0x03, 0x9e, 0xc8, 0xf1, 0x13, 0xb3, 0x24, 0x97, 0x84, 0x94, 0x19, - 0xd9, 0x5c, 0xed, 0x7d, 0xd2, 0x73, 0x14, 0x0e, 0x45, 0x7c, 0xd1, 0xe5, 0xa9, 0x1a, 0x95, 0x1e, - 0x71, 0xa1, 0xf4, 0xde, 0x85, 0x62, 0x99, 0x87, 0xb4, 0xdc, 0xea, 0xc8, 0xef, 0x56, 0x93, 0x08, - 0x41, 0x99, 0x3d, 0x2a, 0x47, 0xfb, 0xdb, 0x87, 0x47, 0xed, 0x03, 0x1a, 0xcb, 0x4b, 0x50, 0x71, - 0x63, 0xe9, 0x0a, 0xd3, 0xd2, 0xd3, 0x70, 0x25, 0x22, 0xeb, 0x9b, 0xe5, 0xf0, 0xd2, 0x6f, 0xe3, - 0x41, 0xed, 0x30, 0xe3, 0x3f, 0x80, 0x8c, 0xed, 0x60, 0x67, 0x6c, 0x8b, 0x20, 0xbe, 0xb8, 0x6c, - 0x1a, 0xb8, 0xe9, 0x3e, 0x1c, 0x31, 0x73, 0x59, 0xb8, 0x91, 0xee, 0x40, 0x39, 0xfc, 0x26, 0x3a, - 0x06, 0xfe, 0x22, 0x4a, 0x48, 0xdf, 0xc6, 0xa1, 0x32, 0xb5, 0xe3, 0xd1, 0x16, 0xa4, 0x39, 0xbb, - 0x89, 0xfa, 0x2b, 0xc8, 0x00, 0x4b, 0xc0, 0x03, 0x57, 0x45, 0xaf, 0x42, 0x8e, 0x9c, 0x6a, 0x2a, - 0xd1, 0x7b, 0x64, 0x1e, 0xb2, 0xf0, 0x72, 0x6a, 0x4b, 0x68, 0x08, 0x53, 0xcf, 0x02, 0xbd, 0x0e, - 0x79, 0x0f, 0xba, 0x04, 0x1b, 0x7e, 0x7c, 0xd6, 0xdc, 0x03, 0x3d, 0x61, 0xef, 0xdb, 0xa0, 0x97, - 0xfd, 0x74, 0x33, 0x35, 0xcb, 0xa9, 0x84, 0x39, 0x57, 0x10, 0xc6, 0xae, 0xbe, 0xd4, 0x84, 0x42, - 0x60, 0x3c, 0xe8, 0x51, 0xc8, 0x8f, 0x70, 0xb8, 0x44, 0x96, 0x1b, 0x61, 0x51, 0x20, 0xbb, 0x02, - 0x59, 0xfa, 0xb2, 0x8f, 0x39, 0x7c, 0x26, 0xe5, 0xcc, 0x08, 0x4f, 0xde, 0xc4, 0xb6, 0xf4, 0x2e, - 0x40, 0xa0, 0xa8, 0xbb, 0x0a, 0x69, 0xcb, 0x18, 0xeb, 0x2a, 0xb3, 0x4f, 0xcb, 0xbc, 0x81, 0xee, - 0x40, 0xfa, 0xd4, 0xe0, 0xc8, 0x3b, 0x1f, 0x7f, 0xee, 0x1b, 0x0e, 0x09, 0x54, 0x70, 0xb8, 0xb6, - 0xa4, 0x01, 0x9a, 0x2d, 0xac, 0x45, 0x7c, 0xe2, 0xb5, 0xf0, 0x27, 0x1e, 0x8f, 0x2c, 0xd1, 0xcd, - 0xff, 0xd4, 0x47, 0x90, 0x66, 0xa0, 0x4d, 0x01, 0x98, 0x15, 0x87, 0x45, 0x46, 0x4f, 0x9f, 0xd1, - 0x2f, 0x00, 0xb0, 0xe3, 0x58, 0x5a, 0x77, 0xec, 0x7f, 0x60, 0x7d, 0x3e, 0xe8, 0x6f, 0xbb, 0x7a, - 0x8d, 0x6b, 0x02, 0xfd, 0x57, 0x7d, 0xd3, 0xc0, 0x09, 0x10, 0x70, 0x28, 0xed, 0x43, 0x39, 0x6c, - 0xeb, 0x26, 0xa1, 0xbc, 0x0f, 0xe1, 0x24, 0x94, 0x53, 0x0a, 0x91, 0x84, 0x7a, 0x29, 0x6c, 0x92, - 0xff, 0x07, 0x60, 0x0d, 0xe9, 0x93, 0x38, 0xe4, 0x3a, 0x13, 0x01, 0x07, 0x11, 0x35, 0x68, 0xdf, - 0x34, 0x11, 0xac, 0xb8, 0xf2, 0xa2, 0x76, 0xd2, 0x2b, 0x95, 0xbf, 0xe1, 0x01, 0x5e, 0x6a, 0xd9, - 0x92, 0x81, 0xfb, 0xcb, 0x40, 0x80, 0xfc, 0x2b, 0x90, 0xf7, 0x16, 0x2f, 0xa5, 0x46, 0x6e, 0x79, - 0x2a, 0x2e, 0x12, 0x7b, 0xde, 0x64, 0x7f, 0x34, 0x8c, 0x0f, 0x45, 0x4d, 0x37, 0x29, 0xf3, 0x86, - 0xa4, 0x42, 0x65, 0xea, 0xb8, 0x47, 0xaf, 0x40, 0xd6, 0x1c, 0x77, 0x15, 0x37, 0x3c, 0x53, 0x7b, - 0xd4, 0xcd, 0xba, 0xc7, 0xdd, 0xa1, 0xd6, 0xdb, 0x25, 0x67, 0x6e, 0x67, 0xcc, 0x71, 0x77, 0x97, - 0x47, 0x91, 0x7f, 0x25, 0x11, 0xfc, 0xca, 0x29, 0xe4, 0xdc, 0x45, 0x81, 0x7e, 0x14, 0xdc, 0x8e, - 0xee, 0x7f, 0xae, 0xc8, 0x14, 0x44, 0xb8, 0x0f, 0xec, 0xc6, 0x5b, 0xb0, 0x62, 0x6b, 0x7d, 0xdd, - 0x2d, 0x5d, 0x72, 0x30, 0x49, 0xb0, 0xd9, 0xa9, 0xf0, 0x17, 0x7b, 0x2e, 0x33, 0x93, 0x7e, 0x17, - 0x87, 0xea, 0xf4, 0xaa, 0xfc, 0x6f, 0x76, 0x80, 0x9e, 0x2d, 0x74, 0xf5, 0x2b, 0x84, 0x76, 0xc2, - 0xa3, 0xa4, 0x45, 0xb9, 0x44, 0xa5, 0x2d, 0x57, 0x28, 0x7d, 0x9c, 0x80, 0x42, 0xa0, 0x30, 0x8a, - 0x7e, 0x18, 0xd8, 0x22, 0xe5, 0x39, 0x69, 0x54, 0x40, 0xd7, 0xff, 0x87, 0x12, 0x1e, 0x58, 0xe2, - 0xe2, 0x03, 0x8b, 0xfa, 0x17, 0xe6, 0xd6, 0x59, 0x53, 0x17, 0xae, 0xb3, 0x3e, 0x03, 0xc8, 0x31, - 0x1c, 0x3c, 0x54, 0x4e, 0x0d, 0x47, 0xd3, 0xfb, 0x0a, 0x5f, 0x1a, 0x3c, 0x6f, 0xae, 0xb2, 0x37, - 0xf7, 0xd9, 0x8b, 0x43, 0xb6, 0x4a, 0x7e, 0x19, 0x87, 0x9c, 0x97, 0x01, 0x5d, 0xf4, 0x97, 0xc8, - 0x65, 0xc8, 0x88, 0x43, 0x9e, 0xff, 0x13, 0x11, 0xad, 0xb9, 0x05, 0xe5, 0x3a, 0xe4, 0x46, 0xc4, - 0xc1, 0x2c, 0x0d, 0xe4, 0x6c, 0xde, 0x6b, 0xdf, 0x7a, 0x19, 0x0a, 0x81, 0xbf, 0x53, 0x14, 0x27, - 0xf6, 0x5b, 0xef, 0x54, 0x63, 0xf5, 0xec, 0x27, 0x9f, 0x6f, 0x24, 0xf7, 0xc9, 0x87, 0x74, 0x87, - 0xc9, 0xad, 0x66, 0xbb, 0xd5, 0xdc, 0xad, 0xc6, 0xeb, 0x85, 0x4f, 0x3e, 0xdf, 0xc8, 0xca, 0x84, - 0xd5, 0x00, 0x6f, 0xed, 0x42, 0x65, 0x6a, 0x62, 0xc2, 0xc7, 0x24, 0x82, 0xf2, 0xdd, 0xe3, 0xc3, - 0xbd, 0x9d, 0xe6, 0x76, 0xa7, 0xa5, 0xdc, 0x3f, 0xe8, 0xb4, 0xaa, 0x71, 0x74, 0x05, 0x2e, 0xed, - 0xed, 0xbc, 0xd9, 0xee, 0x28, 0xcd, 0xbd, 0x9d, 0xd6, 0x7e, 0x47, 0xd9, 0xee, 0x74, 0xb6, 0x9b, - 0xbb, 0xd5, 0xc4, 0xd6, 0xbf, 0x00, 0x2a, 0xdb, 0x8d, 0xe6, 0x0e, 0x4d, 0x73, 0xb4, 0x1e, 0x66, - 0xd5, 0x96, 0x26, 0xa4, 0x58, 0x3d, 0xe5, 0xdc, 0xab, 0x34, 0xf5, 0xf3, 0x0b, 0xc4, 0xe8, 0x1e, - 0xa4, 0x59, 0xa9, 0x05, 0x9d, 0x7f, 0xb7, 0xa6, 0xbe, 0xa0, 0x62, 0x4c, 0x3b, 0xc3, 0xb6, 0xd3, - 0xb9, 0x97, 0x6d, 0xea, 0xe7, 0x17, 0x90, 0x91, 0x0c, 0x79, 0x9f, 0xab, 0x2d, 0xbe, 0x7c, 0x52, - 0x5f, 0x02, 0x1d, 0xd1, 0x1e, 0x64, 0x5d, 0x7a, 0xbd, 0xe8, 0x3a, 0x4c, 0x7d, 0x61, 0x85, 0x97, - 0x86, 0x8b, 0x97, 0x41, 0xce, 0xbf, 0xdb, 0x53, 0x5f, 0x50, 0xae, 0x46, 0x3b, 0x90, 0x11, 0x04, - 0x64, 0xc1, 0x15, 0x97, 0xfa, 0xa2, 0x8a, 0x2d, 0x0d, 0x9a, 0x5f, 0x5f, 0x5a, 0x7c, 0x63, 0xa9, - 0xbe, 0x44, 0x25, 0x1e, 0x1d, 0x03, 0x04, 0x8a, 0x1e, 0x4b, 0x5c, 0x45, 0xaa, 0x2f, 0x53, 0x61, - 0x47, 0x07, 0x90, 0xf3, 0x38, 0xe8, 0xc2, 0x8b, 0x41, 0xf5, 0xc5, 0xa5, 0x6e, 0xf4, 0x00, 0x4a, - 0x61, 0xf2, 0xb5, 0xdc, 0x75, 0x9f, 0xfa, 0x92, 0x35, 0x6c, 0xea, 0x3f, 0xcc, 0xc4, 0x96, 0xbb, - 0xfe, 0x53, 0x5f, 0xb2, 0xa4, 0x8d, 0xde, 0x87, 0x95, 0x59, 0xa6, 0xb4, 0xfc, 0x6d, 0xa0, 0xfa, - 0x05, 0x8a, 0xdc, 0x68, 0x04, 0x68, 0x0e, 0xc3, 0xba, 0xc0, 0xe5, 0xa0, 0xfa, 0x45, 0x6a, 0xde, - 0x48, 0x85, 0xca, 0x34, 0x6d, 0x59, 0xf6, 0xb2, 0x50, 0x7d, 0xe9, 0xfa, 0x37, 0xff, 0x4a, 0x98, - 0xee, 0x2c, 0x7b, 0x79, 0xa8, 0xbe, 0x74, 0x39, 0xbc, 0xd1, 0xfa, 0xe2, 0xeb, 0xb5, 0xf8, 0x97, - 0x5f, 0xaf, 0xc5, 0xff, 0xfe, 0xf5, 0x5a, 0xfc, 0xd3, 0x6f, 0xd6, 0x62, 0x5f, 0x7e, 0xb3, 0x16, - 0xfb, 0xcb, 0x37, 0x6b, 0xb1, 0x9f, 0x3e, 0xdd, 0xd7, 0x9c, 0xc1, 0xb8, 0xbb, 0xd9, 0x33, 0x46, - 0xb7, 0x83, 0x37, 0x28, 0xe7, 0xdd, 0xea, 0xec, 0x66, 0xd8, 0x19, 0xf9, 0xfc, 0xbf, 0x03, 0x00, - 0x00, 0xff, 0xff, 0xb9, 0x27, 0xe5, 0x82, 0xf5, 0x29, 0x00, 0x00, + // 3113 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x73, 0x23, 0xd5, + 0x15, 0xd6, 0xfb, 0x71, 0x64, 0x3d, 0x7c, 0xc7, 0xcc, 0x68, 0xc4, 0xe0, 0x31, 0x3d, 0x05, 0xcc, + 0x0c, 0x60, 0x13, 0x93, 0xe1, 0x51, 0x40, 0xc0, 0xd6, 0x68, 0x90, 0xb1, 0xb1, 0x9d, 0xb6, 0x3c, + 0x84, 0x3c, 0xa6, 0xb9, 0x92, 0xae, 0xa5, 0x66, 0xa4, 0xee, 0xa6, 0xfb, 0xca, 0xc8, 0x2c, 0x43, + 0x65, 0x43, 0x36, 0x2c, 0xd9, 0xb0, 0xc8, 0x22, 0x8b, 0xfc, 0x83, 0xac, 0xb2, 0xc9, 0x86, 0xaa, + 0x6c, 0x58, 0x64, 0x91, 0x45, 0x8a, 0xa4, 0x60, 0x97, 0x3f, 0x90, 0x45, 0x16, 0xa4, 0xee, 0xa3, + 0x5f, 0x92, 0xda, 0x92, 0x21, 0x95, 0xaa, 0x54, 0x76, 0x7d, 0x4f, 0x9f, 0x73, 0xfa, 0x3e, 0xbf, + 0x73, 0xbe, 0xd3, 0x17, 0x1e, 0xa5, 0xc4, 0xe8, 0x12, 0x7b, 0xa8, 0x1b, 0x74, 0x03, 0xb7, 0x3b, + 0xfa, 0x06, 0x3d, 0xb3, 0x88, 0xb3, 0x6e, 0xd9, 0x26, 0x35, 0x51, 0xd9, 0x7f, 0xb9, 0xce, 0x5e, + 0xd6, 0x1e, 0x0b, 0x68, 0x77, 0xec, 0x33, 0x8b, 0x9a, 0x1b, 0x96, 0x6d, 0x9a, 0x27, 0x42, 0xbf, + 0x76, 0x2d, 0xf0, 0x9a, 0xfb, 0x09, 0x7a, 0x0b, 0xbd, 0x95, 0xc6, 0x0f, 0xc9, 0x99, 0xfb, 0xf6, + 0xb1, 0x29, 0x5b, 0x0b, 0xdb, 0x78, 0xe8, 0xbe, 0xbe, 0xde, 0x33, 0xcd, 0xde, 0x80, 0x6c, 0xf0, + 0x56, 0x7b, 0x74, 0xb2, 0x41, 0xf5, 0x21, 0x71, 0x28, 0x1e, 0x5a, 0x52, 0x61, 0xa5, 0x67, 0xf6, + 0x4c, 0xfe, 0xb8, 0xc1, 0x9e, 0x84, 0x54, 0xf9, 0x36, 0x07, 0x59, 0x95, 0x7c, 0x30, 0x22, 0x0e, + 0x45, 0x9b, 0x90, 0x22, 0x9d, 0xbe, 0x59, 0x8d, 0xaf, 0xc5, 0x6f, 0x16, 0x36, 0xaf, 0xad, 0x4f, + 0x0c, 0x6e, 0x5d, 0xea, 0x35, 0x3a, 0x7d, 0xb3, 0x19, 0x53, 0xb9, 0x2e, 0xba, 0x03, 0xe9, 0x93, + 0xc1, 0xc8, 0xe9, 0x57, 0x13, 0xdc, 0xe8, 0xb1, 0x28, 0xa3, 0x7b, 0x4c, 0xa9, 0x19, 0x53, 0x85, + 0x36, 0xfb, 0x94, 0x6e, 0x9c, 0x98, 0xd5, 0xe4, 0xf9, 0x9f, 0xda, 0x31, 0x4e, 0xf8, 0xa7, 0x98, + 0x2e, 0xda, 0x06, 0xd0, 0x0d, 0x9d, 0x6a, 0x9d, 0x3e, 0xd6, 0x8d, 0x6a, 0x9a, 0x5b, 0x3e, 0x1e, + 0x6d, 0xa9, 0xd3, 0x3a, 0x53, 0x6c, 0xc6, 0xd4, 0xbc, 0xee, 0x36, 0x58, 0x77, 0x3f, 0x18, 0x11, + 0xfb, 0xac, 0x9a, 0x39, 0xbf, 0xbb, 0x3f, 0x66, 0x4a, 0xac, 0xbb, 0x5c, 0x1b, 0x35, 0xa0, 0xd0, + 0x26, 0x3d, 0xdd, 0xd0, 0xda, 0x03, 0xb3, 0xf3, 0xb0, 0x9a, 0xe5, 0xc6, 0x4a, 0x94, 0xf1, 0x36, + 0x53, 0xdd, 0x66, 0x9a, 0xcd, 0x98, 0x0a, 0x6d, 0xaf, 0x85, 0x5e, 0x85, 0x5c, 0xa7, 0x4f, 0x3a, + 0x0f, 0x35, 0x3a, 0xae, 0xe6, 0xb8, 0x8f, 0xeb, 0x51, 0x3e, 0xea, 0x4c, 0xaf, 0x35, 0x6e, 0xc6, + 0xd4, 0x6c, 0x47, 0x3c, 0xb2, 0xf1, 0x77, 0xc9, 0x40, 0x3f, 0x25, 0x36, 0xb3, 0xcf, 0x9f, 0x3f, + 0xfe, 0xbb, 0x42, 0x93, 0x7b, 0xc8, 0x77, 0xdd, 0x06, 0x7a, 0x1d, 0xf2, 0xc4, 0xe8, 0xca, 0x61, + 0x00, 0x77, 0xb1, 0x16, 0xb9, 0xce, 0x46, 0xd7, 0x1d, 0x44, 0x8e, 0xc8, 0x67, 0xf4, 0x12, 0x64, + 0x3a, 0xe6, 0x70, 0xa8, 0xd3, 0x6a, 0x81, 0x5b, 0xaf, 0x46, 0x0e, 0x80, 0x6b, 0x35, 0x63, 0xaa, + 0xd4, 0x47, 0xfb, 0x50, 0x1a, 0xe8, 0x0e, 0xd5, 0x1c, 0x03, 0x5b, 0x4e, 0xdf, 0xa4, 0x4e, 0x75, + 0x89, 0x7b, 0x78, 0x22, 0xca, 0xc3, 0x9e, 0xee, 0xd0, 0x23, 0x57, 0xb9, 0x19, 0x53, 0x8b, 0x83, + 0xa0, 0x80, 0xf9, 0x33, 0x4f, 0x4e, 0x88, 0xed, 0x39, 0xac, 0x16, 0xcf, 0xf7, 0x77, 0xc0, 0xb4, + 0x5d, 0x7b, 0xe6, 0xcf, 0x0c, 0x0a, 0xd0, 0xcf, 0xe0, 0xd2, 0xc0, 0xc4, 0x5d, 0xcf, 0x9d, 0xd6, + 0xe9, 0x8f, 0x8c, 0x87, 0xd5, 0x12, 0x77, 0x7a, 0x2b, 0xb2, 0x93, 0x26, 0xee, 0xba, 0x2e, 0xea, + 0xcc, 0xa0, 0x19, 0x53, 0x97, 0x07, 0x93, 0x42, 0xf4, 0x00, 0x56, 0xb0, 0x65, 0x0d, 0xce, 0x26, + 0xbd, 0x97, 0xb9, 0xf7, 0xdb, 0x51, 0xde, 0xb7, 0x98, 0xcd, 0xa4, 0x7b, 0x84, 0xa7, 0xa4, 0xa8, + 0x05, 0x15, 0xcb, 0x26, 0x16, 0xb6, 0x89, 0x66, 0xd9, 0xa6, 0x65, 0x3a, 0x78, 0x50, 0xad, 0x70, + 0xdf, 0x4f, 0x45, 0xf9, 0x3e, 0x14, 0xfa, 0x87, 0x52, 0xbd, 0x19, 0x53, 0xcb, 0x56, 0x58, 0x24, + 0xbc, 0x9a, 0x1d, 0xe2, 0x38, 0xbe, 0xd7, 0xe5, 0x79, 0x5e, 0xb9, 0x7e, 0xd8, 0x6b, 0x48, 0xb4, + 0x9d, 0x85, 0xf4, 0x29, 0x1e, 0x8c, 0xc8, 0x5b, 0xa9, 0x5c, 0xaa, 0x92, 0x56, 0x9e, 0x82, 0x42, + 0x00, 0x58, 0x50, 0x15, 0xb2, 0x43, 0xe2, 0x38, 0xb8, 0x47, 0x38, 0x0e, 0xe5, 0x55, 0xb7, 0xa9, + 0x94, 0x60, 0x29, 0x08, 0x26, 0xca, 0xd0, 0x33, 0x64, 0x30, 0xc1, 0x0c, 0x4f, 0x89, 0xed, 0xe8, + 0xa6, 0xe1, 0x1a, 0xca, 0x26, 0xba, 0x01, 0x45, 0xbe, 0xe1, 0x35, 0xf7, 0x3d, 0xc3, 0xaa, 0x94, + 0xba, 0xc4, 0x85, 0xf7, 0xa5, 0xd2, 0x75, 0x28, 0x58, 0x9b, 0x96, 0xa7, 0x92, 0xe4, 0x2a, 0x60, + 0x6d, 0x5a, 0x52, 0x41, 0xf9, 0x53, 0x02, 0x2a, 0x93, 0xe0, 0x82, 0x5e, 0x82, 0x14, 0xc3, 0x59, + 0x09, 0x99, 0xb5, 0x75, 0x01, 0xc2, 0xeb, 0x2e, 0x08, 0xaf, 0xb7, 0x5c, 0x10, 0xde, 0xce, 0x7d, + 0xf1, 0xd5, 0xf5, 0xd8, 0xa7, 0x7f, 0xbb, 0x1e, 0x57, 0xb9, 0x05, 0xba, 0xca, 0xb0, 0x00, 0xeb, + 0x86, 0xa6, 0x77, 0x79, 0x7f, 0xf2, 0xec, 0xa0, 0x63, 0xdd, 0xd8, 0xe9, 0xa2, 0x5d, 0xa8, 0x74, + 0x4c, 0xc3, 0x21, 0x86, 0x33, 0x72, 0x34, 0x01, 0xf2, 0x12, 0x28, 0xa7, 0xcf, 0x6a, 0xdd, 0x55, + 0x3c, 0xe4, 0x7a, 0x6a, 0xb9, 0x13, 0x16, 0xa0, 0x7b, 0x00, 0xa7, 0x78, 0xa0, 0x77, 0x31, 0x35, + 0x6d, 0xa7, 0x9a, 0x5a, 0x4b, 0xce, 0x74, 0x73, 0xdf, 0x55, 0x39, 0xb6, 0xba, 0x98, 0x92, 0xed, + 0x14, 0xeb, 0xad, 0x1a, 0xb0, 0x44, 0x4f, 0x42, 0x19, 0x5b, 0x96, 0xe6, 0x50, 0x4c, 0x89, 0xd6, + 0x3e, 0xa3, 0xc4, 0xe1, 0x10, 0xbc, 0xa4, 0x16, 0xb1, 0x65, 0x1d, 0x31, 0xe9, 0x36, 0x13, 0xa2, + 0x27, 0xa0, 0xc4, 0xe0, 0x56, 0xc7, 0x03, 0xad, 0x4f, 0xf4, 0x5e, 0x9f, 0x72, 0xa8, 0x4d, 0xaa, + 0x45, 0x29, 0x6d, 0x72, 0xa1, 0xd2, 0xf5, 0x16, 0x93, 0x43, 0x2d, 0x42, 0x90, 0xea, 0x62, 0x8a, + 0xf9, 0x44, 0x2e, 0xa9, 0xfc, 0x99, 0xc9, 0x2c, 0x4c, 0xfb, 0x72, 0x7a, 0xf8, 0x33, 0xba, 0x0c, + 0x19, 0xe9, 0x36, 0xc9, 0xdd, 0xca, 0x16, 0x5a, 0x81, 0xb4, 0x65, 0x9b, 0xa7, 0xa4, 0x9a, 0x5a, + 0x8b, 0xdf, 0xcc, 0xa9, 0xa2, 0xa1, 0x7c, 0x9c, 0x80, 0xe5, 0x29, 0x50, 0x66, 0x7e, 0xfb, 0xd8, + 0xe9, 0xbb, 0xdf, 0x62, 0xcf, 0xe8, 0x05, 0xe6, 0x17, 0x77, 0x89, 0x2d, 0x03, 0x59, 0x35, 0x38, + 0x45, 0x22, 0x48, 0x37, 0xf9, 0x7b, 0x39, 0x35, 0x52, 0x9b, 0xad, 0xd5, 0x00, 0x3b, 0x54, 0x13, + 0x20, 0xa7, 0x05, 0x82, 0xda, 0xa3, 0x33, 0xd6, 0x8a, 0xe9, 0xb0, 0xcd, 0x2a, 0x9d, 0x94, 0x98, + 0xa9, 0x2f, 0x45, 0xc7, 0xb0, 0xd2, 0x3e, 0xfb, 0x08, 0x1b, 0x54, 0x37, 0x88, 0x36, 0xb5, 0x6a, + 0xd3, 0x51, 0xf2, 0x6d, 0xdd, 0x69, 0x93, 0x3e, 0x3e, 0xd5, 0x4d, 0xb7, 0x5b, 0x97, 0x3c, 0x7b, + 0x6f, 0x45, 0x1d, 0x45, 0x85, 0x52, 0x38, 0xaa, 0xa0, 0x12, 0x24, 0xe8, 0x58, 0x8e, 0x3f, 0x41, + 0xc7, 0xe8, 0x39, 0x48, 0xb1, 0x31, 0xf2, 0xb1, 0x97, 0x66, 0x7c, 0x48, 0xda, 0xb5, 0xce, 0x2c, + 0xa2, 0x72, 0x4d, 0x45, 0xf1, 0x0e, 0x83, 0x17, 0x69, 0x26, 0xbd, 0x2a, 0xb7, 0xa0, 0x3c, 0x11, + 0x4a, 0x02, 0xcb, 0x17, 0x0f, 0x2e, 0x9f, 0x52, 0x86, 0x62, 0x28, 0x6e, 0x28, 0x97, 0x61, 0x65, + 0x56, 0x18, 0x50, 0xfa, 0x9e, 0x3c, 0x04, 0xe7, 0xe8, 0x0e, 0xe4, 0xbc, 0x38, 0x20, 0x0e, 0xe3, + 0xd5, 0xa9, 0x51, 0xb8, 0xca, 0xaa, 0xa7, 0xca, 0x4e, 0x21, 0xdb, 0xd5, 0x7c, 0x3b, 0x24, 0x78, + 0xc7, 0xb3, 0xd8, 0xb2, 0x9a, 0xd8, 0xe9, 0x2b, 0xef, 0x41, 0x35, 0x0a, 0xe3, 0x27, 0x86, 0x91, + 0xf2, 0x76, 0xe1, 0x65, 0xc8, 0x9c, 0x98, 0xf6, 0x10, 0x53, 0xee, 0xac, 0xa8, 0xca, 0x16, 0xdb, + 0x9d, 0x02, 0xef, 0x93, 0x5c, 0x2c, 0x1a, 0x8a, 0x06, 0x57, 0x23, 0x71, 0x9e, 0x99, 0xe8, 0x46, + 0x97, 0x88, 0xf9, 0x2c, 0xaa, 0xa2, 0xe1, 0x3b, 0x12, 0x9d, 0x15, 0x0d, 0xf6, 0x59, 0x87, 0x8f, + 0x95, 0xfb, 0xcf, 0xab, 0xb2, 0xa5, 0x7c, 0x96, 0x84, 0xcb, 0xb3, 0xd1, 0x1e, 0xad, 0xc1, 0xd2, + 0x10, 0x8f, 0x35, 0x3a, 0x96, 0x67, 0x59, 0x2c, 0x07, 0x0c, 0xf1, 0xb8, 0x35, 0x16, 0x07, 0xb9, + 0x02, 0x49, 0x3a, 0x76, 0xaa, 0x89, 0xb5, 0xe4, 0xcd, 0x25, 0x95, 0x3d, 0xa2, 0x63, 0x58, 0x1e, + 0x98, 0x1d, 0x3c, 0xd0, 0x02, 0x3b, 0x5e, 0x6e, 0xf6, 0x1b, 0x53, 0x93, 0xdd, 0x18, 0x73, 0x49, + 0x77, 0x6a, 0xd3, 0x97, 0xb9, 0x8f, 0x3d, 0x6f, 0xe7, 0xa3, 0xbb, 0x50, 0x18, 0xfa, 0x1b, 0xf9, + 0x02, 0x9b, 0x3d, 0x68, 0x16, 0x58, 0x92, 0x74, 0x08, 0x18, 0x5c, 0x84, 0xce, 0x5c, 0x18, 0xa1, + 0x9f, 0x83, 0x15, 0x83, 0x8c, 0x69, 0xe0, 0x20, 0x8a, 0x7d, 0x92, 0xe5, 0x53, 0x8f, 0xd8, 0x3b, + 0xff, 0x90, 0xb1, 0x2d, 0x83, 0x6e, 0xf1, 0x78, 0x69, 0x99, 0x0e, 0xb1, 0x35, 0xdc, 0xed, 0xda, + 0xc4, 0x71, 0x78, 0x9e, 0xb7, 0xc4, 0x83, 0x20, 0x97, 0x6f, 0x09, 0xb1, 0xf2, 0xbb, 0xe0, 0xd2, + 0x84, 0xe2, 0xa3, 0x3b, 0xf1, 0x71, 0x7f, 0xe2, 0x8f, 0x60, 0x45, 0xda, 0x77, 0x43, 0x73, 0x9f, + 0x58, 0x14, 0x68, 0x90, 0x6b, 0x1e, 0x3d, 0xed, 0xc9, 0xef, 0x36, 0xed, 0x2e, 0x96, 0xa6, 0x02, + 0x58, 0xfa, 0xbf, 0xb5, 0x14, 0x2c, 0xf2, 0x33, 0x0c, 0x70, 0x23, 0x7f, 0x5e, 0x44, 0x7e, 0x6c, + 0x79, 0x91, 0xff, 0xcf, 0x79, 0xc8, 0xa9, 0xc4, 0xb1, 0x58, 0x64, 0x45, 0xdb, 0x90, 0x27, 0xe3, + 0x0e, 0xb1, 0xa8, 0x9b, 0x68, 0xcc, 0x26, 0x02, 0x42, 0xbb, 0xe1, 0x6a, 0xb2, 0x2c, 0xdc, 0x33, + 0x43, 0xcf, 0x4b, 0xa2, 0x15, 0xcd, 0x99, 0xa4, 0x79, 0x90, 0x69, 0xbd, 0xe0, 0x32, 0xad, 0x64, + 0x64, 0xe2, 0x2d, 0xac, 0x26, 0xa8, 0xd6, 0xf3, 0x92, 0x6a, 0xa5, 0xe6, 0x7c, 0x2c, 0xc4, 0xb5, + 0xea, 0x21, 0xae, 0x95, 0x99, 0x33, 0xcc, 0x08, 0xb2, 0xf5, 0x82, 0x4b, 0xb6, 0xb2, 0x73, 0x7a, + 0x3c, 0xc1, 0xb6, 0xee, 0x85, 0xd9, 0x56, 0x2e, 0x02, 0x61, 0x5c, 0xeb, 0x48, 0xba, 0xf5, 0x5a, + 0x80, 0x6e, 0xe5, 0x23, 0xb9, 0x8e, 0x70, 0x32, 0x83, 0x6f, 0xd5, 0x43, 0x7c, 0x0b, 0xe6, 0xcc, + 0x41, 0x04, 0xe1, 0x7a, 0x23, 0x48, 0xb8, 0x0a, 0x91, 0x9c, 0x4d, 0xae, 0xf7, 0x2c, 0xc6, 0xf5, + 0xb2, 0xc7, 0xb8, 0x96, 0x22, 0x29, 0xa3, 0x1c, 0xc3, 0x24, 0xe5, 0x3a, 0x98, 0xa2, 0x5c, 0x82, + 0x22, 0x3d, 0x19, 0xe9, 0x62, 0x0e, 0xe7, 0x3a, 0x98, 0xe2, 0x5c, 0xa5, 0x39, 0x0e, 0xe7, 0x90, + 0xae, 0x9f, 0xcf, 0x26, 0x5d, 0xd1, 0xb4, 0x48, 0x76, 0x73, 0x31, 0xd6, 0xa5, 0x45, 0xb0, 0x2e, + 0xc1, 0x8c, 0x9e, 0x8e, 0x74, 0xbf, 0x30, 0xed, 0x3a, 0x9e, 0x41, 0xbb, 0x04, 0x41, 0xba, 0x19, + 0xe9, 0x7c, 0x01, 0xde, 0x75, 0x3c, 0x83, 0x77, 0xa1, 0xb9, 0x6e, 0x2f, 0x42, 0xbc, 0xd2, 0x95, + 0x8c, 0x72, 0x8b, 0xe5, 0xc6, 0x13, 0x38, 0xc5, 0x12, 0x0c, 0x62, 0xdb, 0xa6, 0x2d, 0x39, 0x94, + 0x68, 0x28, 0x37, 0x59, 0xb6, 0xee, 0x63, 0xd2, 0x39, 0x24, 0x8d, 0x27, 0x72, 0x01, 0x1c, 0x52, + 0x7e, 0x1f, 0xf7, 0x6d, 0x79, 0x92, 0x1b, 0xcc, 0xf4, 0xf3, 0x32, 0xd3, 0x0f, 0x70, 0xb7, 0x44, + 0x98, 0xbb, 0x4d, 0x80, 0x73, 0x72, 0x12, 0x9c, 0xd1, 0x6d, 0x58, 0xe6, 0x21, 0x51, 0x30, 0x3c, + 0x19, 0x77, 0x52, 0x3c, 0xee, 0x94, 0xd9, 0x0b, 0x71, 0xa0, 0x44, 0x00, 0x7a, 0x16, 0x2e, 0x05, + 0x74, 0xbd, 0xc4, 0x4f, 0xf0, 0x98, 0x8a, 0xa7, 0xbd, 0x25, 0x33, 0xc0, 0x3f, 0xc6, 0xfd, 0x19, + 0xf2, 0x29, 0xdf, 0x2c, 0x76, 0x16, 0xff, 0xcf, 0xb0, 0xb3, 0xc4, 0x77, 0x66, 0x67, 0xc1, 0x3c, + 0x36, 0x19, 0xce, 0x63, 0xff, 0x19, 0xf7, 0x97, 0xc4, 0xe3, 0x5a, 0x1d, 0xb3, 0x4b, 0x64, 0x66, + 0xc9, 0x9f, 0x59, 0xd2, 0x31, 0x30, 0x7b, 0x32, 0x7f, 0x64, 0x8f, 0x4c, 0xcb, 0x8b, 0x1b, 0x79, + 0x19, 0x16, 0xbc, 0xa4, 0x54, 0x04, 0x76, 0x99, 0x94, 0x56, 0x20, 0xf9, 0x90, 0x88, 0x92, 0xda, + 0x92, 0xca, 0x1e, 0x99, 0x1e, 0xdf, 0x69, 0x32, 0x40, 0x8b, 0x06, 0x7a, 0x09, 0xf2, 0xbc, 0x18, + 0xaa, 0x99, 0x96, 0x23, 0x51, 0x3d, 0x94, 0xbb, 0x88, 0x9a, 0xe7, 0xfa, 0x21, 0xd3, 0x39, 0xb0, + 0x1c, 0x35, 0x67, 0xc9, 0xa7, 0x40, 0x46, 0x91, 0x0f, 0x65, 0x14, 0xd7, 0x20, 0xcf, 0x7a, 0xef, + 0x58, 0xb8, 0x43, 0x38, 0x42, 0xe7, 0x55, 0x5f, 0xa0, 0x3c, 0x00, 0x34, 0x1d, 0x23, 0x50, 0x13, + 0x32, 0xe4, 0x94, 0x18, 0x54, 0x64, 0x58, 0x85, 0xcd, 0xcb, 0xd3, 0xa9, 0x2b, 0x7b, 0xbd, 0x5d, + 0x65, 0x93, 0xfc, 0x8f, 0xaf, 0xae, 0x57, 0x84, 0xf6, 0x33, 0xe6, 0x50, 0xa7, 0x64, 0x68, 0xd1, + 0x33, 0x55, 0xda, 0x2b, 0x7f, 0x4d, 0x30, 0x82, 0x13, 0x8a, 0x1f, 0x33, 0xe7, 0xd6, 0xdd, 0xf1, + 0x89, 0x00, 0xb7, 0x5d, 0x6c, 0xbe, 0x57, 0x01, 0x7a, 0xd8, 0xd1, 0x3e, 0xc4, 0x06, 0x25, 0x5d, + 0x39, 0xe9, 0x01, 0x09, 0xaa, 0x41, 0x8e, 0xb5, 0x46, 0x0e, 0xe9, 0x4a, 0x9a, 0xed, 0xb5, 0x03, + 0xe3, 0xcc, 0x7e, 0xbf, 0x71, 0x86, 0x67, 0x39, 0x37, 0x31, 0xcb, 0x01, 0xf2, 0x91, 0x0f, 0x92, + 0x0f, 0xd6, 0x37, 0xcb, 0xd6, 0x4d, 0x5b, 0xa7, 0x67, 0x7c, 0x69, 0x92, 0xaa, 0xd7, 0x46, 0x37, + 0xa0, 0x38, 0x24, 0x43, 0xcb, 0x34, 0x07, 0x9a, 0x40, 0x9b, 0x02, 0x37, 0x5d, 0x92, 0xc2, 0x06, + 0x07, 0x9d, 0x5f, 0x25, 0xfc, 0xe3, 0xe7, 0x93, 0xcc, 0xff, 0xbb, 0x09, 0x56, 0x7e, 0xcd, 0x0b, + 0x4f, 0xe1, 0x0c, 0x01, 0x1d, 0xc1, 0xb2, 0x77, 0xfc, 0xb5, 0x11, 0x87, 0x05, 0x77, 0x43, 0x2f, + 0x8a, 0x1f, 0x95, 0xd3, 0xb0, 0xd8, 0x41, 0x3f, 0x81, 0x2b, 0x13, 0xd0, 0xe6, 0xb9, 0x4e, 0x2c, + 0x88, 0x70, 0x8f, 0x84, 0x11, 0xce, 0xf5, 0xec, 0xcf, 0x55, 0xf2, 0x7b, 0x1e, 0xba, 0x1d, 0x28, + 0x85, 0xf3, 0x9d, 0x99, 0xab, 0x7f, 0x03, 0x8a, 0x36, 0xa1, 0x58, 0x37, 0xb4, 0x50, 0xb5, 0x68, + 0x49, 0x08, 0x65, 0x0d, 0xea, 0x10, 0x1e, 0x99, 0x99, 0xf7, 0xa0, 0x17, 0x21, 0xef, 0xa7, 0x4c, + 0x62, 0x52, 0xcf, 0xa9, 0x26, 0xf8, 0xba, 0xca, 0x1f, 0xe2, 0xbe, 0xcb, 0x70, 0x7d, 0xa2, 0x01, + 0x19, 0x9b, 0x38, 0xa3, 0x81, 0xa8, 0x18, 0x94, 0x36, 0x9f, 0x5d, 0x2c, 0x63, 0x62, 0xd2, 0xd1, + 0x80, 0xaa, 0xd2, 0x58, 0x79, 0x00, 0x19, 0x21, 0x41, 0x05, 0xc8, 0x1e, 0xef, 0xef, 0xee, 0x1f, + 0xbc, 0xb3, 0x5f, 0x89, 0x21, 0x80, 0xcc, 0x56, 0xbd, 0xde, 0x38, 0x6c, 0x55, 0xe2, 0x28, 0x0f, + 0xe9, 0xad, 0xed, 0x03, 0xb5, 0x55, 0x49, 0x30, 0xb1, 0xda, 0x78, 0xab, 0x51, 0x6f, 0x55, 0x92, + 0x68, 0x19, 0x8a, 0xe2, 0x59, 0xbb, 0x77, 0xa0, 0xbe, 0xbd, 0xd5, 0xaa, 0xa4, 0x02, 0xa2, 0xa3, + 0xc6, 0xfe, 0xdd, 0x86, 0x5a, 0x49, 0x2b, 0x3f, 0x80, 0xab, 0x91, 0x39, 0x96, 0x5f, 0x7c, 0x88, + 0x07, 0x8a, 0x0f, 0xca, 0x67, 0x09, 0xa8, 0x45, 0x27, 0x4e, 0xe8, 0xad, 0x89, 0x81, 0x6f, 0x5e, + 0x20, 0xeb, 0x9a, 0x18, 0x3d, 0x7a, 0x02, 0x4a, 0x36, 0x39, 0x21, 0xb4, 0xd3, 0x17, 0x89, 0x9c, + 0x88, 0x98, 0x45, 0xb5, 0x28, 0xa5, 0xdc, 0xc8, 0x11, 0x6a, 0xef, 0x93, 0x0e, 0xd5, 0x04, 0x14, + 0x89, 0x4d, 0x97, 0x67, 0x6a, 0x4c, 0x7a, 0x24, 0x84, 0xca, 0x7b, 0x17, 0x9a, 0xcb, 0x3c, 0xa4, + 0xd5, 0x46, 0x4b, 0x7d, 0xb7, 0x92, 0x44, 0x08, 0x4a, 0xfc, 0x51, 0x3b, 0xda, 0xdf, 0x3a, 0x3c, + 0x6a, 0x1e, 0xb0, 0xb9, 0xbc, 0x04, 0x65, 0x77, 0x2e, 0x5d, 0x61, 0x5a, 0x79, 0x1a, 0xae, 0x44, + 0x64, 0x7d, 0xd3, 0x24, 0x5f, 0xf9, 0x4d, 0x3c, 0xa8, 0x1d, 0x2e, 0x09, 0x1c, 0x40, 0xc6, 0xa1, + 0x98, 0x8e, 0x1c, 0x39, 0x89, 0x2f, 0x2e, 0x9a, 0x06, 0xae, 0xbb, 0x0f, 0x47, 0xdc, 0x5c, 0x95, + 0x6e, 0x94, 0x3b, 0x50, 0x0a, 0xbf, 0x89, 0x9e, 0x03, 0x7f, 0x13, 0x25, 0x94, 0x6f, 0xe3, 0x50, + 0x9e, 0x38, 0xf1, 0x68, 0x13, 0xd2, 0x82, 0xdd, 0x44, 0xfd, 0x36, 0xe4, 0x80, 0x25, 0xe1, 0x41, + 0xa8, 0xa2, 0x57, 0x21, 0x47, 0x4e, 0xf5, 0x2e, 0x31, 0x3a, 0x64, 0x16, 0xb2, 0x88, 0x7a, 0x6b, + 0x43, 0x6a, 0x48, 0x53, 0xcf, 0x02, 0xbd, 0x0e, 0x79, 0x0f, 0xba, 0x24, 0x1b, 0x7e, 0x7c, 0xda, + 0xdc, 0x03, 0x3d, 0x69, 0xef, 0xdb, 0xa0, 0x97, 0xfd, 0x74, 0x33, 0x35, 0xcd, 0xa9, 0xa4, 0xb9, + 0x50, 0x90, 0xc6, 0xae, 0xbe, 0x52, 0x87, 0x42, 0x60, 0x3c, 0xe8, 0x51, 0xc8, 0x0f, 0x71, 0xb8, + 0x86, 0x96, 0x1b, 0x62, 0x59, 0x41, 0xbb, 0x02, 0x59, 0xf6, 0xb2, 0x87, 0x05, 0x7c, 0x26, 0xd5, + 0xcc, 0x10, 0x8f, 0xdf, 0xc4, 0x8e, 0xf2, 0x2e, 0x40, 0xa0, 0xea, 0xbb, 0x02, 0x69, 0xdb, 0x1c, + 0x19, 0x5d, 0x6e, 0x9f, 0x56, 0x45, 0x03, 0xdd, 0x81, 0xf4, 0xa9, 0x29, 0x90, 0x77, 0x36, 0xfe, + 0xdc, 0x37, 0x29, 0x09, 0x94, 0x78, 0x84, 0xb6, 0xa2, 0x03, 0x9a, 0xae, 0xbc, 0x45, 0x7c, 0xe2, + 0xb5, 0xf0, 0x27, 0x1e, 0x8f, 0xac, 0xe1, 0xcd, 0xfe, 0xd4, 0x47, 0x90, 0xe6, 0xa0, 0xcd, 0x00, + 0x98, 0x57, 0x8f, 0x65, 0x46, 0xcf, 0x9e, 0xd1, 0x2f, 0x00, 0x30, 0xa5, 0xb6, 0xde, 0x1e, 0xf9, + 0x1f, 0xb8, 0x3e, 0x1b, 0xf4, 0xb7, 0x5c, 0xbd, 0xed, 0x6b, 0x12, 0xfd, 0x57, 0x7c, 0xd3, 0x40, + 0x04, 0x08, 0x38, 0x54, 0xf6, 0xa1, 0x14, 0xb6, 0x75, 0x93, 0x50, 0xd1, 0x87, 0x70, 0x12, 0x2a, + 0x28, 0x85, 0x4c, 0x42, 0xbd, 0x14, 0x36, 0x29, 0x7e, 0x14, 0xf0, 0x86, 0xf2, 0x49, 0x1c, 0x72, + 0xad, 0xb1, 0x84, 0x83, 0x88, 0x22, 0xb5, 0x6f, 0x9a, 0x08, 0x96, 0x64, 0x45, 0xd5, 0x3b, 0xe9, + 0xd5, 0xd2, 0xdf, 0xf0, 0x00, 0x2f, 0xb5, 0x68, 0xc9, 0xc0, 0xfd, 0xa7, 0x20, 0x41, 0xfe, 0x15, + 0xc8, 0x7b, 0x9b, 0x97, 0x51, 0x23, 0xb7, 0x7e, 0x15, 0x97, 0x89, 0xbd, 0xac, 0x5b, 0xad, 0x40, + 0xda, 0x32, 0x3f, 0x94, 0x45, 0xdf, 0xa4, 0x2a, 0x1a, 0x4a, 0x17, 0xca, 0x13, 0xe1, 0x1e, 0xbd, + 0x02, 0x59, 0x6b, 0xd4, 0xd6, 0xdc, 0xe9, 0x99, 0x38, 0xa3, 0x6e, 0xd6, 0x3d, 0x6a, 0x0f, 0xf4, + 0xce, 0x2e, 0x39, 0x73, 0x3b, 0x63, 0x8d, 0xda, 0xbb, 0x62, 0x16, 0xc5, 0x57, 0x12, 0xc1, 0xaf, + 0x9c, 0x42, 0xce, 0xdd, 0x14, 0xe8, 0x47, 0xc1, 0xe3, 0xe8, 0xfe, 0x08, 0x8b, 0x4c, 0x41, 0xa4, + 0xfb, 0xc0, 0x69, 0xbc, 0x0d, 0xcb, 0x8e, 0xde, 0x33, 0xdc, 0xda, 0xa6, 0x00, 0x93, 0x04, 0x5f, + 0x9d, 0xb2, 0x78, 0xb1, 0xe7, 0x32, 0x33, 0xe5, 0xb7, 0x71, 0xa8, 0x4c, 0xee, 0xca, 0xff, 0x66, + 0x07, 0x58, 0x6c, 0x61, 0xbb, 0x5f, 0x23, 0xac, 0x13, 0x1e, 0x25, 0x5d, 0x52, 0x8b, 0x4c, 0xda, + 0x70, 0x85, 0xca, 0xc7, 0x09, 0x28, 0x04, 0x2a, 0xa7, 0xe8, 0x87, 0x81, 0x23, 0x52, 0x9a, 0x91, + 0x46, 0x05, 0x74, 0xfd, 0x9f, 0x2c, 0xe1, 0x81, 0x25, 0x2e, 0x3e, 0xb0, 0xa8, 0x9f, 0x65, 0x6e, + 0x21, 0x36, 0x75, 0xe1, 0x42, 0xec, 0x33, 0x80, 0xa8, 0x49, 0xf1, 0x40, 0x3b, 0x35, 0xa9, 0x6e, + 0xf4, 0x34, 0xb1, 0x35, 0x44, 0xde, 0x5c, 0xe1, 0x6f, 0xee, 0xf3, 0x17, 0x87, 0x7c, 0x97, 0xfc, + 0x32, 0x0e, 0x39, 0x2f, 0x03, 0xba, 0xe8, 0x3f, 0x93, 0xcb, 0x90, 0x91, 0x41, 0x5e, 0xfc, 0x34, + 0x91, 0xad, 0x99, 0x15, 0xe7, 0x1a, 0xe4, 0x86, 0x84, 0x62, 0x9e, 0x06, 0x0a, 0x36, 0xef, 0xb5, + 0x6f, 0xbf, 0x0c, 0x85, 0xc0, 0xef, 0x2b, 0x86, 0x13, 0xfb, 0x8d, 0x77, 0x2a, 0xb1, 0x5a, 0xf6, + 0x93, 0xcf, 0xd7, 0x92, 0xfb, 0xe4, 0x43, 0x76, 0xc2, 0xd4, 0x46, 0xbd, 0xd9, 0xa8, 0xef, 0x56, + 0xe2, 0xb5, 0xc2, 0x27, 0x9f, 0xaf, 0x65, 0x55, 0xc2, 0x6b, 0x80, 0xb7, 0x77, 0xa1, 0x3c, 0xb1, + 0x30, 0xe1, 0x30, 0x89, 0xa0, 0x74, 0xf7, 0xf8, 0x70, 0x6f, 0xa7, 0xbe, 0xd5, 0x6a, 0x68, 0xf7, + 0x0f, 0x5a, 0x8d, 0x4a, 0x1c, 0x5d, 0x81, 0x4b, 0x7b, 0x3b, 0x6f, 0x36, 0x5b, 0x5a, 0x7d, 0x6f, + 0xa7, 0xb1, 0xdf, 0xd2, 0xb6, 0x5a, 0xad, 0xad, 0xfa, 0x6e, 0x25, 0xb1, 0xf9, 0x2f, 0x80, 0xf2, + 0xd6, 0x76, 0x7d, 0x87, 0xa5, 0x39, 0x7a, 0x07, 0xf3, 0x6a, 0x4b, 0x1d, 0x52, 0xbc, 0x9e, 0x72, + 0xee, 0x5d, 0x9b, 0xda, 0xf9, 0x05, 0x62, 0x74, 0x0f, 0xd2, 0xbc, 0xd4, 0x82, 0xce, 0xbf, 0x7c, + 0x53, 0x9b, 0x53, 0x31, 0x66, 0x9d, 0xe1, 0xc7, 0xe9, 0xdc, 0xdb, 0x38, 0xb5, 0xf3, 0x0b, 0xc8, + 0x48, 0x85, 0xbc, 0xcf, 0xd5, 0xe6, 0xdf, 0x4e, 0xa9, 0x2d, 0x80, 0x8e, 0x68, 0x0f, 0xb2, 0x2e, + 0xbd, 0x9e, 0x77, 0x5f, 0xa6, 0x36, 0xb7, 0xc2, 0xcb, 0xa6, 0x4b, 0x94, 0x41, 0xce, 0xbf, 0xfc, + 0x53, 0x9b, 0x53, 0xae, 0x46, 0x3b, 0x90, 0x91, 0x04, 0x64, 0xce, 0x1d, 0x98, 0xda, 0xbc, 0x8a, + 0x2d, 0x9b, 0x34, 0xbf, 0xbe, 0x34, 0xff, 0x4a, 0x53, 0x6d, 0x81, 0x4a, 0x3c, 0x3a, 0x06, 0x08, + 0x14, 0x3d, 0x16, 0xb8, 0xab, 0x54, 0x5b, 0xa4, 0xc2, 0x8e, 0x0e, 0x20, 0xe7, 0x71, 0xd0, 0xb9, + 0x37, 0x87, 0x6a, 0xf3, 0x4b, 0xdd, 0xe8, 0x01, 0x14, 0xc3, 0xe4, 0x6b, 0xb1, 0xfb, 0x40, 0xb5, + 0x05, 0x6b, 0xd8, 0xcc, 0x7f, 0x98, 0x89, 0x2d, 0x76, 0x3f, 0xa8, 0xb6, 0x60, 0x49, 0x1b, 0xbd, + 0x0f, 0xcb, 0xd3, 0x4c, 0x69, 0xf1, 0xeb, 0x42, 0xb5, 0x0b, 0x14, 0xb9, 0xd1, 0x10, 0xd0, 0x0c, + 0x86, 0x75, 0x81, 0xdb, 0x43, 0xb5, 0x8b, 0xd4, 0xbc, 0x51, 0x17, 0xca, 0x93, 0xb4, 0x65, 0xd1, + 0xdb, 0x44, 0xb5, 0x85, 0xeb, 0xdf, 0xe2, 0x2b, 0x61, 0xba, 0xb3, 0xe8, 0xed, 0xa2, 0xda, 0xc2, + 0xe5, 0xf0, 0xed, 0xad, 0x2f, 0xbe, 0x5e, 0x8d, 0x7f, 0xf9, 0xf5, 0x6a, 0xfc, 0xef, 0x5f, 0xaf, + 0xc6, 0x3f, 0xfd, 0x66, 0x35, 0xf6, 0xe5, 0x37, 0xab, 0xb1, 0xbf, 0x7c, 0xb3, 0x1a, 0xfb, 0xe9, + 0x53, 0x3d, 0x9d, 0xf6, 0x47, 0xed, 0xf5, 0x8e, 0x39, 0xdc, 0xe8, 0x98, 0x43, 0x42, 0xdb, 0x27, + 0xd4, 0x7f, 0xf0, 0xaf, 0x7c, 0xb6, 0x33, 0x3c, 0x3e, 0x3e, 0xff, 0xef, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x45, 0x17, 0x9a, 0xa3, 0x12, 0x2a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5425,6 +5434,11 @@ func (m *RequestProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if m.AppVersion != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.AppVersion)) + i-- + dAtA[i] = 0x48 + } if len(m.ProposerAddress) > 0 { i -= len(m.ProposerAddress) copy(dAtA[i:], m.ProposerAddress) @@ -7819,6 +7833,9 @@ func (m *RequestProcessProposal) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } + if m.AppVersion != 0 { + n += 1 + sovTypes(uint64(m.AppVersion)) + } return n } @@ -11383,6 +11400,25 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { m.ProposerAddress = []byte{} } iNdEx = postIndex + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field AppVersion", wireType) + } + m.AppVersion = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.AppVersion |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 3f397d669f..916b418924 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -146,6 +146,7 @@ message RequestProcessProposal { bytes next_validators_hash = 7; // address of the public key of the original proposer of the block. bytes proposer_address = 8; + uint64 app_version = 9; } //---------------------------------------- diff --git a/state/execution.go b/state/execution.go index 02786fc6bf..aa86f0e695 100644 --- a/state/execution.go +++ b/state/execution.go @@ -179,6 +179,7 @@ func (blockExec *BlockExecutor) ProcessProposal( Misbehavior: block.Evidence.Evidence.ToABCI(), ProposerAddress: block.ProposerAddress, NextValidatorsHash: block.NextValidatorsHash, + AppVersion: block.Header.Version.App, }) if err != nil { return false, ErrInvalidBlock(err) diff --git a/state/validation.go b/state/validation.go index f040f47f7a..44aca49636 100644 --- a/state/validation.go +++ b/state/validation.go @@ -18,12 +18,12 @@ func validateBlock(state State, block *types.Block) error { return err } - // Validate basic info. - if block.Version.App != state.Version.Consensus.App || - block.Version.Block != state.Version.Consensus.Block { + // Validate block version. App version validation should + // happen on the application side as part of process proposal + if block.Version.Block != state.Version.Consensus.Block { return fmt.Errorf("wrong Block.Header.Version. Expected %v, got %v", - state.Version.Consensus, - block.Version, + state.Version.Consensus.Block, + block.Version.Block, ) } if block.ChainID != state.ChainID { From 4b6b78845c455c6889e21bcfee35ca26ec38f8fb Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 27 Sep 2023 16:56:00 +0200 Subject: [PATCH 2/4] fix test --- state/validation_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/state/validation_test.go b/state/validation_test.go index dbb94cbb1d..f5cb7227c8 100644 --- a/state/validation_test.go +++ b/state/validation_test.go @@ -45,8 +45,6 @@ func TestValidateBlockHeader(t *testing.T) { wrongHash := tmhash.Sum([]byte("this hash is wrong")) wrongVersion1 := state.Version.Consensus wrongVersion1.Block += 2 - wrongVersion2 := state.Version.Consensus - wrongVersion2.App += 2 // Manipulation of any header field causes failure. testCases := []struct { @@ -54,7 +52,6 @@ func TestValidateBlockHeader(t *testing.T) { malleateBlock func(block *types.Block) }{ {"Version wrong1", func(block *types.Block) { block.Version = wrongVersion1 }}, - {"Version wrong2", func(block *types.Block) { block.Version = wrongVersion2 }}, {"ChainID wrong", func(block *types.Block) { block.ChainID = "not-the-real-one" }}, {"Height wrong", func(block *types.Block) { block.Height += 10 }}, {"Time wrong", func(block *types.Block) { block.Time = block.Time.Add(-time.Second * 1) }}, From 23daa74712708c826517925515dd5120d5e33594 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Thu, 28 Sep 2023 13:40:28 +0200 Subject: [PATCH 3/4] remove app version check in state sync --- statesync/syncer.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/statesync/syncer.go b/statesync/syncer.go index aeb58677d7..b12adba9fb 100644 --- a/statesync/syncer.go +++ b/statesync/syncer.go @@ -306,7 +306,7 @@ func (s *syncer) Sync(snapshot *snapshot, chunks *chunkQueue) (sm.State, *types. } // Verify app and app version - if err := s.verifyApp(snapshot, state.Version.Consensus.App); err != nil { + if err := s.verifyApp(snapshot); err != nil { return sm.State{}, nil, err } @@ -482,20 +482,12 @@ func (s *syncer) requestChunk(snapshot *snapshot, chunk uint32) { } // verifyApp verifies the sync, checking the app hash, last block height and app version -func (s *syncer) verifyApp(snapshot *snapshot, appVersion uint64) error { +func (s *syncer) verifyApp(snapshot *snapshot) error { resp, err := s.connQuery.InfoSync(proxy.RequestInfo) if err != nil { return fmt.Errorf("failed to query ABCI app for appHash: %w", err) } - // sanity check that the app version in the block matches the application's own record - // of its version - if resp.AppVersion != appVersion { - // An error here most likely means that the app hasn't inplemented state sync - // or the Info call correctly - return fmt.Errorf("app version mismatch. Expected: %d, got: %d", - appVersion, resp.AppVersion) - } if !bytes.Equal(snapshot.trustedAppHash, resp.LastBlockAppHash) { s.logger.Error("appHash verification failed", "expected", snapshot.trustedAppHash, From 5ca922598e9b66daf6da4c56719de22cdea8cdd4 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Thu, 28 Sep 2023 13:53:34 +0200 Subject: [PATCH 4/4] fix syncer_test --- statesync/syncer_test.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/statesync/syncer_test.go b/statesync/syncer_test.go index e64f01d407..e0f600c449 100644 --- a/statesync/syncer_test.go +++ b/statesync/syncer_test.go @@ -634,7 +634,6 @@ func TestSyncer_applyChunks_RejectSenders(t *testing.T) { func TestSyncer_verifyApp(t *testing.T) { boom := errors.New("boom") const appVersion = 9 - appVersionMismatchErr := errors.New("app version mismatch. Expected: 9, got: 2") s := &snapshot{Height: 3, Format: 1, Chunks: 5, Hash: []byte{1, 2, 3}, trustedAppHash: []byte("app_hash")} testcases := map[string]struct { @@ -647,11 +646,6 @@ func TestSyncer_verifyApp(t *testing.T) { LastBlockAppHash: []byte("app_hash"), AppVersion: appVersion, }, nil, nil}, - "invalid app version": {&abci.ResponseInfo{ - LastBlockHeight: 3, - LastBlockAppHash: []byte("app_hash"), - AppVersion: 2, - }, nil, appVersionMismatchErr}, "invalid height": {&abci.ResponseInfo{ LastBlockHeight: 5, LastBlockAppHash: []byte("app_hash"), @@ -675,7 +669,7 @@ func TestSyncer_verifyApp(t *testing.T) { syncer := newSyncer(*cfg, log.NewNopLogger(), connSnapshot, connQuery, stateProvider, "") connQuery.On("InfoSync", proxy.RequestInfo).Return(tc.response, tc.err) - err := syncer.verifyApp(s, appVersion) + err := syncer.verifyApp(s) unwrapped := errors.Unwrap(err) if unwrapped != nil { err = unwrapped