From c770402dfd69f13f5a62e9722f9289f906f58f49 Mon Sep 17 00:00:00 2001 From: evan-forbes Date: Tue, 4 Jul 2023 07:01:03 -0500 Subject: [PATCH] feat: pass chain-id in prepareProposal --- abci/types/types.pb.go | 428 ++++++++++++++----------- proto/tendermint/abci/types.proto | 2 + proto/tendermint/crypto/keys.pb.go | 1 - proto/tendermint/mempool/types.pb.go | 1 - proto/tendermint/p2p/conn.pb.go | 1 - proto/tendermint/statesync/types.pb.go | 1 - proto/tendermint/types/types.proto | 22 +- state/execution.go | 4 +- 8 files changed, 256 insertions(+), 204 deletions(-) diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 51c0dec764..01e555c881 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -1276,6 +1276,8 @@ type RequestPrepareProposal struct { BlockData *types1.Data `protobuf:"bytes,1,opt,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` // If an application decides to populate block_data with extra information, they can not exceed this value. BlockDataSize int64 `protobuf:"varint,2,opt,name=block_data_size,json=blockDataSize,proto3" json:"block_data_size,omitempty"` + // proposal_header is the header from the proposal + ChainId string `protobuf:"bytes,3,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` } func (m *RequestPrepareProposal) Reset() { *m = RequestPrepareProposal{} } @@ -1325,6 +1327,13 @@ func (m *RequestPrepareProposal) GetBlockDataSize() int64 { return 0 } +func (m *RequestPrepareProposal) GetChainId() string { + if m != nil { + return m.ChainId + } + return "" +} + type RequestProcessProposal struct { Header types1.Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header"` BlockData *types1.Data `protobuf:"bytes,2,opt,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` @@ -3514,195 +3523,195 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2995 bytes of a gzipped FileDescriptorProto + // 3002 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x73, 0xe3, 0xc6, - 0x11, 0xe6, 0x9b, 0x44, 0x53, 0x7c, 0x68, 0x76, 0xbd, 0x4b, 0xc3, 0x6b, 0x69, 0x8d, 0x2d, 0xbf, - 0xd6, 0xb6, 0x14, 0xcb, 0xb5, 0x8e, 0x1d, 0x3b, 0xb1, 0x45, 0x2e, 0xd7, 0x94, 0x57, 0x96, 0x14, - 0x88, 0x5a, 0xe7, 0xe5, 0x85, 0x41, 0x72, 0x44, 0xc2, 0x4b, 0x02, 0x30, 0x30, 0xd4, 0x4a, 0x7b, - 0x4c, 0x25, 0x95, 0x2a, 0xe7, 0xe2, 0xaa, 0x5c, 0x72, 0xf1, 0x4f, 0xc8, 0x3d, 0x97, 0xe4, 0x92, - 0x8b, 0xab, 0x72, 0x88, 0x8f, 0x39, 0xa4, 0x9c, 0x94, 0x7d, 0xcb, 0x1f, 0xc8, 0x29, 0x95, 0xd4, - 0x3c, 0xf0, 0x22, 0x09, 0x11, 0xb2, 0x73, 0xcb, 0x0d, 0xd3, 0xe8, 0xfe, 0x80, 0x69, 0xcc, 0x74, - 0x7f, 0xdd, 0x18, 0x78, 0x82, 0x60, 0x73, 0x80, 0x9d, 0x89, 0x61, 0x92, 0x4d, 0xbd, 0xd7, 0x37, - 0x36, 0xc9, 0x99, 0x8d, 0xdd, 0x0d, 0xdb, 0xb1, 0x88, 0x85, 0x6a, 0xc1, 0xcd, 0x0d, 0x7a, 0x53, - 0x7e, 0x32, 0xa4, 0xdd, 0x77, 0xce, 0x6c, 0x62, 0x6d, 0xda, 0x8e, 0x65, 0x1d, 0x73, 0x7d, 0xf9, - 0x5a, 0xe8, 0x36, 0xc3, 0x09, 0xa3, 0x45, 0xee, 0x0a, 0xe3, 0x07, 0xf8, 0xcc, 0xbb, 0xfb, 0xe4, - 0x9c, 0xad, 0xad, 0x3b, 0xfa, 0xc4, 0xbb, 0xbd, 0x3e, 0xb4, 0xac, 0xe1, 0x18, 0x6f, 0xb2, 0x51, - 0x6f, 0x7a, 0xbc, 0x49, 0x8c, 0x09, 0x76, 0x89, 0x3e, 0xb1, 0x85, 0xc2, 0xe5, 0xa1, 0x35, 0xb4, - 0xd8, 0xe5, 0x26, 0xbd, 0xe2, 0x52, 0xe5, 0x0f, 0x12, 0x14, 0x55, 0xfc, 0xf1, 0x14, 0xbb, 0x04, - 0x6d, 0x41, 0x0e, 0xf7, 0x47, 0x56, 0x23, 0x7d, 0x3d, 0xfd, 0x5c, 0x79, 0xeb, 0xda, 0xc6, 0xcc, - 0xe4, 0x36, 0x84, 0x5e, 0xbb, 0x3f, 0xb2, 0x3a, 0x29, 0x95, 0xe9, 0xa2, 0x5b, 0x90, 0x3f, 0x1e, - 0x4f, 0xdd, 0x51, 0x23, 0xc3, 0x8c, 0x9e, 0x8c, 0x33, 0xba, 0x43, 0x95, 0x3a, 0x29, 0x95, 0x6b, - 0xd3, 0x47, 0x19, 0xe6, 0xb1, 0xd5, 0xc8, 0x9e, 0xff, 0xa8, 0x1d, 0xf3, 0x98, 0x3d, 0x8a, 0xea, - 0xa2, 0x26, 0x80, 0x8b, 0x89, 0x66, 0xd9, 0xc4, 0xb0, 0xcc, 0x46, 0x8e, 0x59, 0x3e, 0x15, 0x67, - 0x79, 0x88, 0xc9, 0x3e, 0x53, 0xec, 0xa4, 0x54, 0xc9, 0xf5, 0x06, 0x14, 0xc3, 0x30, 0x0d, 0xa2, - 0xf5, 0x47, 0xba, 0x61, 0x36, 0xf2, 0xe7, 0x63, 0xec, 0x98, 0x06, 0x69, 0x51, 0x45, 0x8a, 0x61, - 0x78, 0x03, 0x3a, 0xe5, 0x8f, 0xa7, 0xd8, 0x39, 0x6b, 0x14, 0xce, 0x9f, 0xf2, 0x0f, 0xa9, 0x12, - 0x9d, 0x32, 0xd3, 0x46, 0x6d, 0x28, 0xf7, 0xf0, 0xd0, 0x30, 0xb5, 0xde, 0xd8, 0xea, 0x3f, 0x68, - 0x14, 0x99, 0xb1, 0x12, 0x67, 0xdc, 0xa4, 0xaa, 0x4d, 0xaa, 0xd9, 0x49, 0xa9, 0xd0, 0xf3, 0x47, - 0xe8, 0x4d, 0x28, 0xf5, 0x47, 0xb8, 0xff, 0x40, 0x23, 0xa7, 0x8d, 0x12, 0xc3, 0x58, 0x8f, 0xc3, - 0x68, 0x51, 0xbd, 0xee, 0x69, 0x27, 0xa5, 0x16, 0xfb, 0xfc, 0x92, 0xce, 0x7f, 0x80, 0xc7, 0xc6, - 0x09, 0x76, 0xa8, 0xbd, 0x74, 0xfe, 0xfc, 0x6f, 0x73, 0x4d, 0x86, 0x20, 0x0d, 0xbc, 0x01, 0x7a, - 0x0b, 0x24, 0x6c, 0x0e, 0xc4, 0x34, 0x80, 0x41, 0x5c, 0x8f, 0x5d, 0x2b, 0xe6, 0xc0, 0x9b, 0x44, - 0x09, 0x8b, 0x6b, 0xf4, 0x1a, 0x14, 0xfa, 0xd6, 0x64, 0x62, 0x90, 0x46, 0x99, 0x59, 0xaf, 0xc5, - 0x4e, 0x80, 0x69, 0x75, 0x52, 0xaa, 0xd0, 0x47, 0x7b, 0x50, 0x1d, 0x1b, 0x2e, 0xd1, 0x5c, 0x53, - 0xb7, 0xdd, 0x91, 0x45, 0xdc, 0xc6, 0x0a, 0x43, 0x78, 0x3a, 0x0e, 0x61, 0xd7, 0x70, 0xc9, 0xa1, - 0xa7, 0xdc, 0x49, 0xa9, 0x95, 0x71, 0x58, 0x40, 0xf1, 0xac, 0xe3, 0x63, 0xec, 0xf8, 0x80, 0x8d, - 0xca, 0xf9, 0x78, 0xfb, 0x54, 0xdb, 0xb3, 0xa7, 0x78, 0x56, 0x58, 0x80, 0x7e, 0x0a, 0x97, 0xc6, - 0x96, 0x3e, 0xf0, 0xe1, 0xb4, 0xfe, 0x68, 0x6a, 0x3e, 0x68, 0x54, 0x19, 0xe8, 0xf3, 0xb1, 0x2f, - 0x69, 0xe9, 0x03, 0x0f, 0xa2, 0x45, 0x0d, 0x3a, 0x29, 0x75, 0x75, 0x3c, 0x2b, 0x44, 0xf7, 0xe1, - 0xb2, 0x6e, 0xdb, 0xe3, 0xb3, 0x59, 0xf4, 0x1a, 0x43, 0xbf, 0x19, 0x87, 0xbe, 0x4d, 0x6d, 0x66, - 0xe1, 0x91, 0x3e, 0x27, 0x45, 0x5d, 0xa8, 0xdb, 0x0e, 0xb6, 0x75, 0x07, 0x6b, 0xb6, 0x63, 0xd9, - 0x96, 0xab, 0x8f, 0x1b, 0x75, 0x86, 0xfd, 0x6c, 0x1c, 0xf6, 0x01, 0xd7, 0x3f, 0x10, 0xea, 0x9d, - 0x94, 0x5a, 0xb3, 0xa3, 0x22, 0x8e, 0x6a, 0xf5, 0xb1, 0xeb, 0x06, 0xa8, 0xab, 0xcb, 0x50, 0x99, - 0x7e, 0x14, 0x35, 0x22, 0x6a, 0x16, 0x21, 0x7f, 0xa2, 0x8f, 0xa7, 0x58, 0x79, 0x16, 0xca, 0xa1, - 0xb0, 0x84, 0x1a, 0x50, 0x9c, 0x60, 0xd7, 0xd5, 0x87, 0x98, 0x45, 0x31, 0x49, 0xf5, 0x86, 0x4a, - 0x15, 0x56, 0xc2, 0xa1, 0x48, 0x99, 0xf8, 0x86, 0x34, 0xc8, 0x50, 0xc3, 0x13, 0xec, 0xb8, 0x34, - 0xb2, 0x08, 0x43, 0x31, 0x44, 0x37, 0xa0, 0xc2, 0x96, 0xba, 0xe6, 0xdd, 0xa7, 0x91, 0x2e, 0xa7, - 0xae, 0x30, 0xe1, 0x3d, 0xa1, 0xb4, 0x0e, 0x65, 0x7b, 0xcb, 0xf6, 0x55, 0xb2, 0x4c, 0x05, 0xec, - 0x2d, 0x5b, 0x28, 0x28, 0xdf, 0x83, 0xfa, 0x6c, 0x64, 0x42, 0x75, 0xc8, 0x3e, 0xc0, 0x67, 0xe2, - 0x79, 0xf4, 0x12, 0x5d, 0x16, 0xd3, 0x62, 0xcf, 0x90, 0x54, 0x31, 0xc7, 0x3f, 0x67, 0x7c, 0x63, - 0x3f, 0x24, 0xa1, 0xd7, 0x20, 0x47, 0x23, 0xbc, 0x08, 0xd6, 0xf2, 0x06, 0x0f, 0xff, 0x1b, 0x5e, - 0xf8, 0xdf, 0xe8, 0x7a, 0xe1, 0xbf, 0x59, 0xfa, 0xfc, 0xcb, 0xf5, 0xd4, 0xa7, 0x7f, 0x5f, 0x4f, - 0xab, 0xcc, 0x02, 0x3d, 0x4e, 0x23, 0x88, 0x6e, 0x98, 0x9a, 0x31, 0x10, 0xcf, 0x29, 0xb2, 0xf1, - 0xce, 0x00, 0xdd, 0x85, 0x7a, 0xdf, 0x32, 0x5d, 0x6c, 0xba, 0x53, 0x57, 0xe3, 0xe9, 0x45, 0x84, - 0xe8, 0xf9, 0x1d, 0xde, 0xf2, 0x14, 0x0f, 0x98, 0x9e, 0x5a, 0xeb, 0x47, 0x05, 0xe8, 0x0e, 0xc0, - 0x89, 0x3e, 0x36, 0x06, 0x3a, 0xb1, 0x1c, 0xb7, 0x91, 0xbb, 0x9e, 0x5d, 0x08, 0x73, 0xcf, 0x53, - 0x39, 0xb2, 0x07, 0x3a, 0xc1, 0xcd, 0x1c, 0x7d, 0x5b, 0x35, 0x64, 0x89, 0x9e, 0x81, 0x9a, 0x6e, - 0xdb, 0x9a, 0x4b, 0x74, 0x82, 0xb5, 0xde, 0x19, 0xc1, 0x2e, 0x0b, 0xdc, 0x2b, 0x6a, 0x45, 0xb7, - 0xed, 0x43, 0x2a, 0x6d, 0x52, 0x21, 0x7a, 0x1a, 0xaa, 0x34, 0x48, 0x1b, 0xfa, 0x58, 0x1b, 0x61, - 0x63, 0x38, 0x22, 0x2c, 0x40, 0x67, 0xd5, 0x8a, 0x90, 0x76, 0x98, 0x50, 0x19, 0xf8, 0x0b, 0x81, - 0x05, 0x68, 0x84, 0x20, 0x37, 0xd0, 0x89, 0xce, 0x1c, 0xb9, 0xa2, 0xb2, 0x6b, 0x2a, 0xb3, 0x75, - 0x32, 0x12, 0xee, 0x61, 0xd7, 0xe8, 0x0a, 0x14, 0x04, 0x6c, 0x96, 0xc1, 0x8a, 0x11, 0xfd, 0x66, - 0xb6, 0x63, 0x9d, 0x60, 0x96, 0x91, 0x4a, 0x2a, 0x1f, 0x28, 0xbf, 0xc8, 0xc0, 0xea, 0x5c, 0x28, - 0xa7, 0xb8, 0x23, 0xdd, 0x1d, 0x79, 0xcf, 0xa2, 0xd7, 0xe8, 0x55, 0x8a, 0xab, 0x0f, 0xb0, 0x23, - 0x52, 0x68, 0x23, 0xec, 0x22, 0x4e, 0x0f, 0x3a, 0xec, 0xbe, 0x70, 0x8d, 0xd0, 0x46, 0xfb, 0x50, - 0x1f, 0xeb, 0x2e, 0xd1, 0x78, 0x68, 0xd4, 0x42, 0xe9, 0x74, 0x3e, 0x21, 0xec, 0xea, 0x5e, 0x30, - 0xa5, 0x8b, 0x5d, 0x00, 0x55, 0xc7, 0x11, 0x29, 0x52, 0xe1, 0x72, 0xef, 0xec, 0x91, 0x6e, 0x12, - 0xc3, 0xc4, 0xda, 0xdc, 0x97, 0x7b, 0x7c, 0x0e, 0xb4, 0x7d, 0x62, 0x0c, 0xb0, 0xd9, 0xf7, 0x3e, - 0xd9, 0x25, 0xdf, 0xd8, 0xff, 0xa4, 0xae, 0xa2, 0x42, 0x35, 0x9a, 0x8c, 0x50, 0x15, 0x32, 0xe4, - 0x54, 0x38, 0x20, 0x43, 0x4e, 0xd1, 0x77, 0x20, 0x47, 0x27, 0xc9, 0x26, 0x5f, 0x5d, 0xc0, 0x04, - 0x84, 0x5d, 0xf7, 0xcc, 0xc6, 0x2a, 0xd3, 0x54, 0x14, 0x7f, 0x37, 0xf8, 0x09, 0x6a, 0x16, 0x55, - 0x79, 0x1e, 0x6a, 0x33, 0x19, 0x28, 0xf4, 0xfd, 0xd2, 0xe1, 0xef, 0xa7, 0xd4, 0xa0, 0x12, 0x49, - 0x37, 0xca, 0x15, 0xb8, 0xbc, 0x28, 0x7b, 0x28, 0x23, 0x5f, 0x1e, 0xc9, 0x02, 0xe8, 0x16, 0x94, - 0xfc, 0xf4, 0xc1, 0x77, 0xe3, 0xbc, 0xaf, 0x3c, 0x65, 0xd5, 0x57, 0xa5, 0xdb, 0x90, 0x2e, 0x6b, - 0xb6, 0x1e, 0x32, 0xec, 0xc5, 0x8b, 0xba, 0x6d, 0x77, 0x74, 0x77, 0xa4, 0x7c, 0x08, 0x8d, 0xb8, - 0xd4, 0x30, 0x33, 0x8d, 0x9c, 0xbf, 0x0c, 0xaf, 0x40, 0xe1, 0xd8, 0x72, 0x26, 0x3a, 0x61, 0x60, - 0x15, 0x55, 0x8c, 0xe8, 0xf2, 0xe4, 0x69, 0x22, 0xcb, 0xc4, 0x7c, 0xa0, 0x68, 0xf0, 0x78, 0x6c, - 0x7a, 0xa0, 0x26, 0x86, 0x39, 0xc0, 0xdc, 0x9f, 0x15, 0x95, 0x0f, 0x02, 0x20, 0xfe, 0xb2, 0x7c, - 0x40, 0x1f, 0xeb, 0xb2, 0xb9, 0x32, 0x7c, 0x49, 0x15, 0x23, 0xe5, 0x21, 0x5c, 0x59, 0x9c, 0x23, - 0xd0, 0x2d, 0x00, 0x1e, 0x4f, 0xfd, 0x5d, 0x57, 0xde, 0xba, 0x32, 0xbf, 0xe6, 0x6f, 0xeb, 0x44, - 0x57, 0x25, 0xa6, 0x49, 0x2f, 0x69, 0x14, 0x08, 0xcc, 0x34, 0xd7, 0x78, 0xc4, 0x97, 0x4c, 0x56, - 0xad, 0xf8, 0x3a, 0x87, 0xc6, 0x23, 0xac, 0xfc, 0x2a, 0x1d, 0x7a, 0x72, 0x24, 0x69, 0x84, 0x76, - 0x5a, 0xfa, 0x42, 0x3b, 0x2d, 0xfa, 0xc6, 0x99, 0x84, 0x6f, 0xac, 0xfc, 0x06, 0xa0, 0xa4, 0x62, - 0xd7, 0xa6, 0x61, 0x11, 0x35, 0x41, 0xc2, 0xa7, 0x7d, 0xcc, 0xb9, 0x6b, 0x3a, 0x96, 0xfb, 0x71, - 0xed, 0xb6, 0xa7, 0x49, 0x89, 0x97, 0x6f, 0x86, 0x5e, 0x11, 0xfc, 0x3c, 0x9e, 0x6a, 0x0b, 0xf3, - 0x30, 0x41, 0x7f, 0xd5, 0x23, 0xe8, 0xd9, 0x58, 0xae, 0xc5, 0xad, 0x66, 0x18, 0xfa, 0x2b, 0x82, - 0xa1, 0xe7, 0x96, 0x3c, 0x2c, 0x42, 0xd1, 0x5b, 0x11, 0x8a, 0x9e, 0x5f, 0x32, 0xcd, 0x18, 0x8e, - 0xde, 0x8a, 0x70, 0xf4, 0xc2, 0x12, 0x90, 0x18, 0x92, 0xfe, 0xaa, 0x47, 0xd2, 0x8b, 0x4b, 0xa6, - 0x3d, 0xc3, 0xd2, 0xef, 0x44, 0x59, 0x3a, 0x67, 0xd8, 0x37, 0x62, 0xad, 0x63, 0x69, 0xfa, 0xf7, - 0x43, 0x34, 0x5d, 0x8a, 0xe5, 0xc8, 0x1c, 0x64, 0x01, 0x4f, 0x6f, 0x45, 0x78, 0x3a, 0x2c, 0xf1, - 0x41, 0x0c, 0x51, 0x7f, 0x3b, 0x4c, 0xd4, 0xcb, 0xb1, 0x5c, 0x5f, 0x2c, 0x9a, 0x45, 0x4c, 0xfd, - 0x75, 0x9f, 0xa9, 0xaf, 0xc4, 0x96, 0x1a, 0x62, 0x0e, 0xb3, 0x54, 0x7d, 0x7f, 0x8e, 0xaa, 0x73, - 0x6a, 0xfd, 0x4c, 0x2c, 0xc4, 0x12, 0xae, 0xbe, 0x3f, 0xc7, 0xd5, 0xab, 0x4b, 0x00, 0x97, 0x90, - 0xf5, 0x9f, 0x2d, 0x26, 0xeb, 0xf1, 0x74, 0x5a, 0xbc, 0x66, 0x32, 0xb6, 0xae, 0xc5, 0xb0, 0x75, - 0xce, 0xa8, 0x5f, 0x88, 0x85, 0x4f, 0x4c, 0xd7, 0x8f, 0x16, 0xd0, 0x75, 0x4e, 0xac, 0x9f, 0x8b, - 0x05, 0x4f, 0xc0, 0xd7, 0x8f, 0x16, 0xf0, 0x75, 0xb4, 0x14, 0x36, 0x39, 0x61, 0x7f, 0x9e, 0xf2, - 0xa2, 0x99, 0x30, 0x47, 0x73, 0x0b, 0x76, 0x1c, 0xcb, 0x11, 0x5c, 0x98, 0x0f, 0x94, 0xe7, 0x28, - 0x53, 0x0b, 0x42, 0xda, 0x39, 0xe4, 0x9e, 0xe5, 0xf0, 0x50, 0x18, 0x53, 0x7e, 0x9f, 0x0e, 0x6c, - 0x19, 0xb9, 0x09, 0xb3, 0x3c, 0x49, 0xb0, 0xbc, 0x10, 0xe7, 0xcf, 0x44, 0x39, 0xff, 0x3a, 0x94, - 0x69, 0x6e, 0x9e, 0xa1, 0xf3, 0xba, 0xed, 0xd1, 0x79, 0x74, 0x13, 0x56, 0x19, 0xf9, 0xe2, 0x79, - 0x41, 0x24, 0xe4, 0x1c, 0xcb, 0x47, 0x35, 0x7a, 0x83, 0x6f, 0x25, 0x9e, 0x99, 0x5f, 0x82, 0x4b, - 0x21, 0x5d, 0x3f, 0xe7, 0x73, 0x0e, 0x5b, 0xf7, 0xb5, 0xb7, 0x45, 0xf2, 0x7f, 0x2f, 0x70, 0x50, - 0x50, 0x2a, 0x20, 0xc8, 0xf5, 0xad, 0x01, 0x16, 0x19, 0x99, 0x5d, 0xd3, 0xf2, 0x61, 0x6c, 0x0d, - 0x45, 0xde, 0xa5, 0x97, 0x54, 0xcb, 0x8f, 0xd9, 0x12, 0x0f, 0xc9, 0xca, 0x9f, 0xd2, 0x01, 0x5e, - 0x50, 0x3d, 0x2c, 0x22, 0xfa, 0xe9, 0xff, 0x0d, 0xd1, 0xcf, 0x7c, 0x63, 0xa2, 0x1f, 0x66, 0x44, - 0xd9, 0x28, 0x23, 0xfa, 0x57, 0x3a, 0xf8, 0xc2, 0x3e, 0x6d, 0xff, 0x66, 0x1e, 0x09, 0xe8, 0x4d, - 0x9e, 0x7d, 0x2f, 0x41, 0x6f, 0x44, 0x31, 0x56, 0x60, 0xcf, 0x8d, 0x16, 0x63, 0x45, 0x4e, 0x78, - 0xd8, 0x00, 0xbd, 0x06, 0x12, 0xeb, 0xe8, 0x69, 0x96, 0xed, 0x8a, 0xf4, 0xf0, 0x44, 0x78, 0xae, - 0xbc, 0x71, 0xb7, 0x71, 0x40, 0x75, 0xf6, 0x6d, 0x57, 0x2d, 0xd9, 0xe2, 0x2a, 0xc4, 0xdc, 0xa4, - 0x48, 0x01, 0x71, 0x0d, 0x24, 0xfa, 0xf6, 0xae, 0xad, 0xf7, 0x31, 0x0b, 0xf5, 0x92, 0x1a, 0x08, - 0x94, 0xfb, 0x80, 0xe6, 0x93, 0x0d, 0xea, 0x40, 0x01, 0x9f, 0x60, 0x93, 0xd0, 0xaf, 0x96, 0x9d, - 0xa5, 0x23, 0x82, 0x9d, 0x63, 0x93, 0x34, 0x1b, 0xd4, 0xc9, 0xff, 0xfc, 0x72, 0xbd, 0xce, 0xb5, - 0x5f, 0xb4, 0x26, 0x06, 0xc1, 0x13, 0x9b, 0x9c, 0xa9, 0xc2, 0x5e, 0xf9, 0x5b, 0x86, 0x52, 0xe5, - 0x48, 0x22, 0x5a, 0xe8, 0x5b, 0x6f, 0x03, 0x65, 0x42, 0x65, 0x52, 0x32, 0x7f, 0xaf, 0x01, 0x0c, - 0x75, 0x57, 0x7b, 0xa8, 0x9b, 0x04, 0x0f, 0x84, 0xd3, 0x43, 0x12, 0x24, 0x43, 0x89, 0x8e, 0xa6, - 0x2e, 0x1e, 0x88, 0x8a, 0xcd, 0x1f, 0x87, 0xe6, 0x59, 0xfc, 0x76, 0xf3, 0x8c, 0x7a, 0xb9, 0x34, - 0xe3, 0xe5, 0x10, 0x8d, 0x95, 0xc2, 0x34, 0x96, 0xbe, 0x9b, 0xed, 0x18, 0x96, 0x63, 0x90, 0x33, - 0xf6, 0x69, 0xb2, 0xaa, 0x3f, 0x46, 0x37, 0xa0, 0x32, 0xc1, 0x13, 0xdb, 0xb2, 0xc6, 0x1a, 0x0f, - 0x5e, 0x65, 0x66, 0xba, 0x22, 0x84, 0x6d, 0x16, 0xc3, 0x7e, 0x99, 0x09, 0xb6, 0x5f, 0x50, 0xae, - 0xfc, 0xdf, 0x39, 0x58, 0xf9, 0x35, 0xeb, 0x61, 0x44, 0xa9, 0x06, 0x3a, 0x84, 0x55, 0x7f, 0xfb, - 0x6b, 0x53, 0x16, 0x16, 0xbc, 0x05, 0x9d, 0x34, 0x7e, 0xd4, 0x4f, 0xa2, 0x62, 0x17, 0xfd, 0x08, - 0xae, 0xce, 0x84, 0x36, 0x1f, 0x3a, 0x93, 0x30, 0xc2, 0x3d, 0x16, 0x8d, 0x70, 0x1e, 0x72, 0xe0, - 0xab, 0xec, 0xb7, 0xdc, 0x74, 0x3b, 0xb4, 0x2c, 0x0e, 0x13, 0xa7, 0x85, 0x5f, 0xff, 0x06, 0x54, - 0x1c, 0x4c, 0x74, 0xc3, 0xd4, 0x22, 0x8d, 0x87, 0x15, 0x2e, 0x14, 0xed, 0x8c, 0x03, 0x78, 0x6c, - 0x21, 0x81, 0x42, 0xdf, 0x05, 0x29, 0xe0, 0x5e, 0xe9, 0x98, 0x1a, 0xde, 0xaf, 0x4b, 0x03, 0x5d, - 0xe5, 0x8f, 0xe9, 0x00, 0x32, 0x5a, 0xe9, 0xb6, 0xa1, 0xe0, 0x60, 0x77, 0x3a, 0xe6, 0xb5, 0x67, - 0x75, 0xeb, 0xa5, 0x64, 0xd4, 0x8b, 0x4a, 0xa7, 0x63, 0xa2, 0x0a, 0x63, 0xe5, 0x3e, 0x14, 0xb8, - 0x04, 0x95, 0xa1, 0x78, 0xb4, 0x77, 0x77, 0x6f, 0xff, 0xfd, 0xbd, 0x7a, 0x0a, 0x01, 0x14, 0xb6, - 0x5b, 0xad, 0xf6, 0x41, 0xb7, 0x9e, 0x46, 0x12, 0xe4, 0xb7, 0x9b, 0xfb, 0x6a, 0xb7, 0x9e, 0xa1, - 0x62, 0xb5, 0xfd, 0x6e, 0xbb, 0xd5, 0xad, 0x67, 0xd1, 0x2a, 0x54, 0xf8, 0xb5, 0x76, 0x67, 0x5f, - 0x7d, 0x6f, 0xbb, 0x5b, 0xcf, 0x85, 0x44, 0x87, 0xed, 0xbd, 0xdb, 0x6d, 0xb5, 0x9e, 0x57, 0x5e, - 0xa6, 0xc5, 0x6d, 0x0c, 0x59, 0x0b, 0xca, 0xd8, 0x74, 0xa8, 0x8c, 0x55, 0x7e, 0x9b, 0x01, 0x39, - 0x9e, 0x81, 0xa1, 0x77, 0x67, 0x26, 0xbe, 0x75, 0x01, 0xfa, 0x36, 0x33, 0x7b, 0xf4, 0x34, 0x54, - 0x1d, 0x7c, 0x8c, 0x49, 0x7f, 0xc4, 0x19, 0x21, 0xcf, 0x98, 0x15, 0xb5, 0x22, 0xa4, 0xcc, 0xc8, - 0xe5, 0x6a, 0x1f, 0xe1, 0x3e, 0xd1, 0x78, 0x28, 0xe2, 0x8b, 0x4e, 0xa2, 0x6a, 0x54, 0x7a, 0xc8, - 0x85, 0xca, 0x87, 0x17, 0xf2, 0xa5, 0x04, 0x79, 0xb5, 0xdd, 0x55, 0x7f, 0x5c, 0xcf, 0x22, 0x04, - 0x55, 0x76, 0xa9, 0x1d, 0xee, 0x6d, 0x1f, 0x1c, 0x76, 0xf6, 0xa9, 0x2f, 0x2f, 0x41, 0xcd, 0xf3, - 0xa5, 0x27, 0xcc, 0x2b, 0x07, 0x70, 0x35, 0x86, 0x3e, 0x7e, 0xc3, 0x52, 0x5e, 0xf9, 0x5d, 0x3a, - 0x0c, 0x19, 0xad, 0xd1, 0xdf, 0x99, 0xf1, 0xf4, 0x66, 0x52, 0xd2, 0x39, 0xeb, 0x66, 0x19, 0x4a, - 0x58, 0x34, 0xa8, 0x98, 0x83, 0x57, 0x54, 0x7f, 0xac, 0xbc, 0xb4, 0xdc, 0x69, 0xc1, 0xaa, 0xcb, - 0x28, 0xff, 0x49, 0x43, 0x6d, 0x26, 0x44, 0xa0, 0x2d, 0xc8, 0xf3, 0xba, 0x2a, 0xee, 0x67, 0x19, - 0x8b, 0x70, 0x22, 0x9e, 0x70, 0x55, 0xf4, 0x66, 0xe4, 0x95, 0xe6, 0x42, 0x11, 0x77, 0x96, 0xd7, - 0x55, 0x13, 0xa6, 0xbe, 0x05, 0x7a, 0x0b, 0x24, 0x3f, 0xd6, 0x89, 0x62, 0xfe, 0xa9, 0x79, 0x73, - 0x3f, 0x4a, 0x0a, 0xfb, 0xc0, 0x06, 0xbd, 0x1e, 0xd0, 0xdd, 0xdc, 0x7c, 0x35, 0x27, 0xcc, 0xb9, - 0x82, 0x30, 0xf6, 0xf4, 0x95, 0x16, 0x94, 0x43, 0xf3, 0x41, 0x4f, 0x80, 0x34, 0xd1, 0x4f, 0x45, - 0x2f, 0x96, 0x77, 0xd3, 0x4a, 0x13, 0xfd, 0x94, 0xb7, 0x61, 0xaf, 0x42, 0x91, 0xde, 0x1c, 0xea, - 0xae, 0x68, 0xd0, 0x14, 0x26, 0xfa, 0xe9, 0x3b, 0xba, 0xab, 0x7c, 0x00, 0xd5, 0x68, 0x1f, 0x92, - 0xee, 0x45, 0xc7, 0x9a, 0x9a, 0x03, 0x86, 0x91, 0x57, 0xf9, 0x00, 0xdd, 0x82, 0xfc, 0x89, 0xc5, - 0xc3, 0xf5, 0xe2, 0xa0, 0x75, 0xcf, 0x22, 0x38, 0xd4, 0xc7, 0xe4, 0xda, 0xca, 0x23, 0xc8, 0xb3, - 0xf0, 0x4b, 0x43, 0x29, 0xeb, 0x28, 0x0a, 0xaa, 0x4f, 0xaf, 0xd1, 0x07, 0x00, 0x3a, 0x21, 0x8e, - 0xd1, 0x9b, 0x06, 0xc0, 0xeb, 0x8b, 0xc3, 0xf7, 0xb6, 0xa7, 0xd7, 0xbc, 0x26, 0xe2, 0xf8, 0xe5, - 0xc0, 0x34, 0x14, 0xcb, 0x43, 0x80, 0xca, 0x1e, 0x54, 0xa3, 0xb6, 0xe1, 0xde, 0xfe, 0xca, 0x82, - 0xde, 0xbe, 0x4f, 0x27, 0x7d, 0x32, 0x9a, 0xe5, 0xdd, 0x63, 0x36, 0x50, 0x3e, 0x49, 0x43, 0xa9, - 0x7b, 0x2a, 0xd6, 0x68, 0x4c, 0xe3, 0x32, 0x30, 0xcd, 0x84, 0xdb, 0x74, 0xbc, 0x13, 0x9a, 0xf5, - 0xfb, 0xab, 0x6f, 0xfb, 0x1b, 0x2a, 0x97, 0xb4, 0x8b, 0xe0, 0xb5, 0xbf, 0x44, 0xb8, 0x7e, 0x03, - 0x24, 0x7f, 0x55, 0xd1, 0x9a, 0x49, 0x1f, 0x0c, 0x1c, 0xec, 0xba, 0x62, 0x6e, 0xde, 0x90, 0xf5, - 0xc1, 0xad, 0x87, 0xa2, 0x11, 0x98, 0x55, 0xf9, 0x40, 0x19, 0x40, 0x6d, 0x26, 0x71, 0xa3, 0x37, - 0xa0, 0x68, 0x4f, 0x7b, 0x9a, 0xe7, 0x9e, 0x99, 0xcd, 0xe3, 0xf1, 0xe7, 0x69, 0x6f, 0x6c, 0xf4, - 0xef, 0xe2, 0x33, 0xef, 0x65, 0xec, 0x69, 0xef, 0x2e, 0xf7, 0x22, 0x7f, 0x4a, 0x26, 0xfc, 0x94, - 0x13, 0x28, 0x79, 0x8b, 0x02, 0xfd, 0x20, 0xbc, 0x4f, 0xbc, 0xbf, 0x23, 0xb1, 0x64, 0x42, 0xc0, - 0x87, 0xb6, 0xc9, 0x4d, 0x58, 0x75, 0x8d, 0xa1, 0x89, 0x07, 0x5a, 0x50, 0xb5, 0xb1, 0xa7, 0x95, - 0xd4, 0x1a, 0xbf, 0xb1, 0xeb, 0x95, 0x6c, 0xca, 0xbf, 0xd3, 0x50, 0xf2, 0x36, 0x2c, 0x7a, 0x39, - 0xb4, 0xee, 0xaa, 0x0b, 0x3a, 0x66, 0x9e, 0x62, 0xd0, 0xca, 0x8e, 0xbe, 0x6b, 0xe6, 0xe2, 0xef, - 0x1a, 0xf7, 0x4f, 0xc2, 0xfb, 0x39, 0x94, 0xbb, 0xf0, 0xcf, 0xa1, 0x17, 0x01, 0x11, 0x8b, 0xe8, - 0x63, 0xed, 0xc4, 0x22, 0x86, 0x39, 0xd4, 0xb8, 0xb3, 0x39, 0xa7, 0xac, 0xb3, 0x3b, 0xf7, 0xd8, - 0x8d, 0x03, 0xe6, 0xf7, 0x9f, 0xa7, 0xa1, 0xe4, 0xb3, 0x83, 0x8b, 0x76, 0xa6, 0xaf, 0x40, 0x41, - 0x24, 0x40, 0xde, 0x9a, 0x16, 0x23, 0xff, 0x27, 0x49, 0x2e, 0xf4, 0x93, 0x44, 0x86, 0xd2, 0x04, - 0x13, 0x9d, 0xe5, 0x19, 0x5e, 0x38, 0xfb, 0xe3, 0x9b, 0xaf, 0x43, 0x39, 0xf4, 0x93, 0x80, 0xee, - 0xbc, 0xbd, 0xf6, 0xfb, 0xf5, 0x94, 0x5c, 0xfc, 0xe4, 0xb3, 0xeb, 0xd9, 0x3d, 0xfc, 0x90, 0xae, - 0x59, 0xb5, 0xdd, 0xea, 0xb4, 0x5b, 0x77, 0xeb, 0x69, 0xb9, 0xfc, 0xc9, 0x67, 0xd7, 0x8b, 0x2a, - 0x66, 0x8d, 0xb6, 0x9b, 0x1d, 0x58, 0x09, 0x7f, 0x95, 0x68, 0x3a, 0x40, 0x50, 0xbd, 0x7d, 0x74, - 0xb0, 0xbb, 0xd3, 0xda, 0xee, 0xb6, 0xb5, 0x7b, 0xfb, 0xdd, 0x76, 0x3d, 0x8d, 0xae, 0xc2, 0xa5, - 0xdd, 0x9d, 0x77, 0x3a, 0x5d, 0xad, 0xb5, 0xbb, 0xd3, 0xde, 0xeb, 0x6a, 0xdb, 0xdd, 0xee, 0x76, - 0xeb, 0x6e, 0x3d, 0xb3, 0xf5, 0x97, 0x32, 0xd4, 0xb6, 0x9b, 0xad, 0x1d, 0x9a, 0xff, 0x8d, 0xbe, - 0x2e, 0x1a, 0x99, 0x39, 0xd6, 0xb7, 0x38, 0xf7, 0x24, 0x85, 0x7c, 0x7e, 0x1f, 0x17, 0xdd, 0x81, - 0x3c, 0x6b, 0x69, 0xa0, 0xf3, 0x8f, 0x56, 0xc8, 0x4b, 0x1a, 0xbb, 0xf4, 0x65, 0xd8, 0xf6, 0x38, - 0xf7, 0xac, 0x85, 0x7c, 0x7e, 0x9f, 0x17, 0xa9, 0x20, 0x05, 0x3d, 0x89, 0xe5, 0x67, 0x2f, 0xe4, - 0x04, 0xbd, 0x5f, 0x8a, 0x19, 0x14, 0x46, 0xcb, 0xcf, 0x22, 0xc8, 0x09, 0x02, 0x18, 0xda, 0x85, - 0xa2, 0x57, 0xcb, 0x2e, 0x3b, 0x1d, 0x21, 0x2f, 0xed, 0xcb, 0xd2, 0x4f, 0xc0, 0x7b, 0x0e, 0xe7, - 0x1f, 0xf5, 0x90, 0x97, 0x34, 0x99, 0xd1, 0x0e, 0x14, 0x04, 0xdb, 0x5f, 0x72, 0xe2, 0x41, 0x5e, - 0xd6, 0x67, 0xa5, 0x4e, 0x0b, 0x9a, 0x39, 0xcb, 0x0f, 0xb0, 0xc8, 0x09, 0xfa, 0xe7, 0xe8, 0x08, - 0x20, 0xd4, 0x61, 0x48, 0x70, 0x32, 0x45, 0x4e, 0xd2, 0x17, 0x47, 0xfb, 0x50, 0xf2, 0x0b, 0xbe, - 0xa5, 0xe7, 0x44, 0xe4, 0xe5, 0x0d, 0x6a, 0x74, 0x1f, 0x2a, 0xd1, 0x4a, 0x27, 0xd9, 0xe9, 0x0f, - 0x39, 0x61, 0xe7, 0x99, 0xe2, 0x47, 0xcb, 0x9e, 0x64, 0xa7, 0x41, 0xe4, 0x84, 0x8d, 0x68, 0xf4, - 0x11, 0xac, 0xce, 0x97, 0x25, 0xc9, 0x0f, 0x87, 0xc8, 0x17, 0x68, 0x4d, 0xa3, 0x09, 0xa0, 0x05, - 0xe5, 0xcc, 0x05, 0xce, 0x8a, 0xc8, 0x17, 0xe9, 0x54, 0xa3, 0x01, 0xd4, 0x66, 0x6b, 0x84, 0xa4, - 0x67, 0x47, 0xe4, 0xc4, 0x5d, 0x6b, 0xfe, 0x94, 0x68, 0xd9, 0x90, 0xf4, 0x2c, 0x89, 0x9c, 0xb8, - 0x89, 0xdd, 0x6c, 0x7f, 0xfe, 0xd5, 0x5a, 0xfa, 0x8b, 0xaf, 0xd6, 0xd2, 0xff, 0xf8, 0x6a, 0x2d, - 0xfd, 0xe9, 0xd7, 0x6b, 0xa9, 0x2f, 0xbe, 0x5e, 0x4b, 0xfd, 0xf5, 0xeb, 0xb5, 0xd4, 0x4f, 0x5e, - 0x18, 0x1a, 0x64, 0x34, 0xed, 0x6d, 0xf4, 0xad, 0xc9, 0x66, 0xf8, 0x50, 0xde, 0xa2, 0x83, 0x82, - 0xbd, 0x02, 0x4b, 0xba, 0xaf, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xc2, 0x6e, 0x96, 0x48, - 0x28, 0x00, 0x00, + 0xf1, 0xe7, 0x9b, 0x44, 0x53, 0x7c, 0x68, 0x76, 0xbd, 0x4b, 0xc3, 0x6b, 0x69, 0x8d, 0x2d, 0xbf, + 0xd6, 0xb6, 0xf4, 0xb7, 0x5c, 0xeb, 0xbf, 0x1d, 0x3b, 0xb1, 0x45, 0x2e, 0xd7, 0x94, 0x57, 0x96, + 0x14, 0x88, 0x5a, 0xe7, 0xe5, 0x85, 0x41, 0x72, 0x44, 0xc2, 0x4b, 0x02, 0x30, 0x30, 0x94, 0xa5, + 0x3d, 0xa6, 0x92, 0x4a, 0x95, 0x73, 0x71, 0x25, 0x97, 0x5c, 0xfc, 0x11, 0x72, 0xcf, 0x25, 0xb9, + 0xe4, 0xe2, 0xaa, 0x1c, 0xe2, 0x63, 0x0e, 0x29, 0x27, 0x65, 0xdf, 0xf2, 0x05, 0x72, 0x4a, 0x25, + 0x35, 0x0f, 0xbc, 0x48, 0x42, 0x84, 0xd6, 0xb9, 0xe5, 0x86, 0x69, 0x74, 0xff, 0x80, 0x69, 0xcc, + 0x74, 0xff, 0xba, 0x31, 0xf0, 0x04, 0xc1, 0xe6, 0x00, 0x3b, 0x13, 0xc3, 0x24, 0x9b, 0x7a, 0xaf, + 0x6f, 0x6c, 0x92, 0x33, 0x1b, 0xbb, 0x1b, 0xb6, 0x63, 0x11, 0x0b, 0xd5, 0x82, 0x9b, 0x1b, 0xf4, + 0xa6, 0xfc, 0x64, 0x48, 0xbb, 0xef, 0x9c, 0xd9, 0xc4, 0xda, 0xb4, 0x1d, 0xcb, 0x3a, 0xe6, 0xfa, + 0xf2, 0xb5, 0xd0, 0x6d, 0x86, 0x13, 0x46, 0x8b, 0xdc, 0x15, 0xc6, 0x0f, 0xf0, 0x99, 0x77, 0xf7, + 0xc9, 0x39, 0x5b, 0x5b, 0x77, 0xf4, 0x89, 0x77, 0x7b, 0x7d, 0x68, 0x59, 0xc3, 0x31, 0xde, 0x64, + 0xa3, 0xde, 0xf4, 0x78, 0x93, 0x18, 0x13, 0xec, 0x12, 0x7d, 0x62, 0x0b, 0x85, 0xcb, 0x43, 0x6b, + 0x68, 0xb1, 0xcb, 0x4d, 0x7a, 0xc5, 0xa5, 0xca, 0xef, 0x25, 0x28, 0xaa, 0xf8, 0xe3, 0x29, 0x76, + 0x09, 0xda, 0x82, 0x1c, 0xee, 0x8f, 0xac, 0x46, 0xfa, 0x7a, 0xfa, 0xb9, 0xf2, 0xd6, 0xb5, 0x8d, + 0x99, 0xc9, 0x6d, 0x08, 0xbd, 0x76, 0x7f, 0x64, 0x75, 0x52, 0x2a, 0xd3, 0x45, 0xb7, 0x20, 0x7f, + 0x3c, 0x9e, 0xba, 0xa3, 0x46, 0x86, 0x19, 0x3d, 0x19, 0x67, 0x74, 0x87, 0x2a, 0x75, 0x52, 0x2a, + 0xd7, 0xa6, 0x8f, 0x32, 0xcc, 0x63, 0xab, 0x91, 0x3d, 0xff, 0x51, 0x3b, 0xe6, 0x31, 0x7b, 0x14, + 0xd5, 0x45, 0x4d, 0x00, 0x17, 0x13, 0xcd, 0xb2, 0x89, 0x61, 0x99, 0x8d, 0x1c, 0xb3, 0x7c, 0x2a, + 0xce, 0xf2, 0x10, 0x93, 0x7d, 0xa6, 0xd8, 0x49, 0xa9, 0x92, 0xeb, 0x0d, 0x28, 0x86, 0x61, 0x1a, + 0x44, 0xeb, 0x8f, 0x74, 0xc3, 0x6c, 0xe4, 0xcf, 0xc7, 0xd8, 0x31, 0x0d, 0xd2, 0xa2, 0x8a, 0x14, + 0xc3, 0xf0, 0x06, 0x74, 0xca, 0x1f, 0x4f, 0xb1, 0x73, 0xd6, 0x28, 0x9c, 0x3f, 0xe5, 0xef, 0x53, + 0x25, 0x3a, 0x65, 0xa6, 0x8d, 0xda, 0x50, 0xee, 0xe1, 0xa1, 0x61, 0x6a, 0xbd, 0xb1, 0xd5, 0x7f, + 0xd0, 0x28, 0x32, 0x63, 0x25, 0xce, 0xb8, 0x49, 0x55, 0x9b, 0x54, 0xb3, 0x93, 0x52, 0xa1, 0xe7, + 0x8f, 0xd0, 0x9b, 0x50, 0xea, 0x8f, 0x70, 0xff, 0x81, 0x46, 0x4e, 0x1b, 0x25, 0x86, 0xb1, 0x1e, + 0x87, 0xd1, 0xa2, 0x7a, 0xdd, 0xd3, 0x4e, 0x4a, 0x2d, 0xf6, 0xf9, 0x25, 0x9d, 0xff, 0x00, 0x8f, + 0x8d, 0x13, 0xec, 0x50, 0x7b, 0xe9, 0xfc, 0xf9, 0xdf, 0xe6, 0x9a, 0x0c, 0x41, 0x1a, 0x78, 0x03, + 0xf4, 0x16, 0x48, 0xd8, 0x1c, 0x88, 0x69, 0x00, 0x83, 0xb8, 0x1e, 0xbb, 0x56, 0xcc, 0x81, 0x37, + 0x89, 0x12, 0x16, 0xd7, 0xe8, 0x35, 0x28, 0xf4, 0xad, 0xc9, 0xc4, 0x20, 0x8d, 0x32, 0xb3, 0x5e, + 0x8b, 0x9d, 0x00, 0xd3, 0xea, 0xa4, 0x54, 0xa1, 0x8f, 0xf6, 0xa0, 0x3a, 0x36, 0x5c, 0xa2, 0xb9, + 0xa6, 0x6e, 0xbb, 0x23, 0x8b, 0xb8, 0x8d, 0x15, 0x86, 0xf0, 0x74, 0x1c, 0xc2, 0xae, 0xe1, 0x92, + 0x43, 0x4f, 0xb9, 0x93, 0x52, 0x2b, 0xe3, 0xb0, 0x80, 0xe2, 0x59, 0xc7, 0xc7, 0xd8, 0xf1, 0x01, + 0x1b, 0x95, 0xf3, 0xf1, 0xf6, 0xa9, 0xb6, 0x67, 0x4f, 0xf1, 0xac, 0xb0, 0x00, 0xfd, 0x18, 0x2e, + 0x8d, 0x2d, 0x7d, 0xe0, 0xc3, 0x69, 0xfd, 0xd1, 0xd4, 0x7c, 0xd0, 0xa8, 0x32, 0xd0, 0xe7, 0x63, + 0x5f, 0xd2, 0xd2, 0x07, 0x1e, 0x44, 0x8b, 0x1a, 0x74, 0x52, 0xea, 0xea, 0x78, 0x56, 0x88, 0xee, + 0xc3, 0x65, 0xdd, 0xb6, 0xc7, 0x67, 0xb3, 0xe8, 0x35, 0x86, 0x7e, 0x33, 0x0e, 0x7d, 0x9b, 0xda, + 0xcc, 0xc2, 0x23, 0x7d, 0x4e, 0x8a, 0xba, 0x50, 0xb7, 0x1d, 0x6c, 0xeb, 0x0e, 0xd6, 0x6c, 0xc7, + 0xb2, 0x2d, 0x57, 0x1f, 0x37, 0xea, 0x0c, 0xfb, 0xd9, 0x38, 0xec, 0x03, 0xae, 0x7f, 0x20, 0xd4, + 0x3b, 0x29, 0xb5, 0x66, 0x47, 0x45, 0x1c, 0xd5, 0xea, 0x63, 0xd7, 0x0d, 0x50, 0x57, 0x97, 0xa1, + 0x32, 0xfd, 0x28, 0x6a, 0x44, 0xd4, 0x2c, 0x42, 0xfe, 0x44, 0x1f, 0x4f, 0xb1, 0xf2, 0x2c, 0x94, + 0x43, 0x61, 0x09, 0x35, 0xa0, 0x38, 0xc1, 0xae, 0xab, 0x0f, 0x31, 0x8b, 0x62, 0x92, 0xea, 0x0d, + 0x95, 0x2a, 0xac, 0x84, 0x43, 0x91, 0x32, 0xf1, 0x0d, 0x69, 0x90, 0xa1, 0x86, 0x27, 0xd8, 0x71, + 0x69, 0x64, 0x11, 0x86, 0x62, 0x88, 0x6e, 0x40, 0x85, 0x2d, 0x75, 0xcd, 0xbb, 0x4f, 0x23, 0x5d, + 0x4e, 0x5d, 0x61, 0xc2, 0x7b, 0x42, 0x69, 0x1d, 0xca, 0xf6, 0x96, 0xed, 0xab, 0x64, 0x99, 0x0a, + 0xd8, 0x5b, 0xb6, 0x50, 0x50, 0xbe, 0x03, 0xf5, 0xd9, 0xc8, 0x84, 0xea, 0x90, 0x7d, 0x80, 0xcf, + 0xc4, 0xf3, 0xe8, 0x25, 0xba, 0x2c, 0xa6, 0xc5, 0x9e, 0x21, 0xa9, 0x62, 0x8e, 0x7f, 0xca, 0xf8, + 0xc6, 0x7e, 0x48, 0x42, 0xaf, 0x41, 0x8e, 0x46, 0x78, 0x11, 0xac, 0xe5, 0x0d, 0x1e, 0xfe, 0x37, + 0xbc, 0xf0, 0xbf, 0xd1, 0xf5, 0xc2, 0x7f, 0xb3, 0xf4, 0xc5, 0x57, 0xeb, 0xa9, 0xcf, 0xfe, 0xb6, + 0x9e, 0x56, 0x99, 0x05, 0x7a, 0x9c, 0x46, 0x10, 0xdd, 0x30, 0x35, 0x63, 0x20, 0x9e, 0x53, 0x64, + 0xe3, 0x9d, 0x01, 0xba, 0x0b, 0xf5, 0xbe, 0x65, 0xba, 0xd8, 0x74, 0xa7, 0xae, 0xc6, 0xd3, 0x8b, + 0x08, 0xd1, 0xf3, 0x3b, 0xbc, 0xe5, 0x29, 0x1e, 0x30, 0x3d, 0xb5, 0xd6, 0x8f, 0x0a, 0xd0, 0x1d, + 0x80, 0x13, 0x7d, 0x6c, 0x0c, 0x74, 0x62, 0x39, 0x6e, 0x23, 0x77, 0x3d, 0xbb, 0x10, 0xe6, 0x9e, + 0xa7, 0x72, 0x64, 0x0f, 0x74, 0x82, 0x9b, 0x39, 0xfa, 0xb6, 0x6a, 0xc8, 0x12, 0x3d, 0x03, 0x35, + 0xdd, 0xb6, 0x35, 0x97, 0xe8, 0x04, 0x6b, 0xbd, 0x33, 0x82, 0x5d, 0x16, 0xb8, 0x57, 0xd4, 0x8a, + 0x6e, 0xdb, 0x87, 0x54, 0xda, 0xa4, 0x42, 0xf4, 0x34, 0x54, 0x69, 0x90, 0x36, 0xf4, 0xb1, 0x36, + 0xc2, 0xc6, 0x70, 0x44, 0x58, 0x80, 0xce, 0xaa, 0x15, 0x21, 0xed, 0x30, 0xa1, 0x32, 0xf0, 0x17, + 0x02, 0x0b, 0xd0, 0x08, 0x41, 0x6e, 0xa0, 0x13, 0x9d, 0x39, 0x72, 0x45, 0x65, 0xd7, 0x54, 0x66, + 0xeb, 0x64, 0x24, 0xdc, 0xc3, 0xae, 0xd1, 0x15, 0x28, 0x08, 0xd8, 0x2c, 0x83, 0x15, 0x23, 0xfa, + 0xcd, 0x6c, 0xc7, 0x3a, 0xc1, 0x2c, 0x23, 0x95, 0x54, 0x3e, 0x50, 0x7e, 0x96, 0x81, 0xd5, 0xb9, + 0x50, 0x4e, 0x71, 0x47, 0xba, 0x3b, 0xf2, 0x9e, 0x45, 0xaf, 0xd1, 0xab, 0x14, 0x57, 0x1f, 0x60, + 0x47, 0xa4, 0xd0, 0x46, 0xd8, 0x45, 0x9c, 0x1e, 0x74, 0xd8, 0x7d, 0xe1, 0x1a, 0xa1, 0x8d, 0xf6, + 0xa1, 0x3e, 0xd6, 0x5d, 0xa2, 0xf1, 0xd0, 0xa8, 0x85, 0xd2, 0xe9, 0x7c, 0x42, 0xd8, 0xd5, 0xbd, + 0x60, 0x4a, 0x17, 0xbb, 0x00, 0xaa, 0x8e, 0x23, 0x52, 0xa4, 0xc2, 0xe5, 0xde, 0xd9, 0x43, 0xdd, + 0x24, 0x86, 0x89, 0xb5, 0xb9, 0x2f, 0xf7, 0xf8, 0x1c, 0x68, 0xfb, 0xc4, 0x18, 0x60, 0xb3, 0xef, + 0x7d, 0xb2, 0x4b, 0xbe, 0xb1, 0xff, 0x49, 0x5d, 0x45, 0x85, 0x6a, 0x34, 0x19, 0xa1, 0x2a, 0x64, + 0xc8, 0xa9, 0x70, 0x40, 0x86, 0x9c, 0xa2, 0xff, 0x83, 0x1c, 0x9d, 0x24, 0x9b, 0x7c, 0x75, 0x01, + 0x13, 0x10, 0x76, 0xdd, 0x33, 0x1b, 0xab, 0x4c, 0x53, 0x51, 0xfc, 0xdd, 0xe0, 0x27, 0xa8, 0x59, + 0x54, 0xe5, 0x79, 0xa8, 0xcd, 0x64, 0xa0, 0xd0, 0xf7, 0x4b, 0x87, 0xbf, 0x9f, 0x52, 0x83, 0x4a, + 0x24, 0xdd, 0x28, 0x57, 0xe0, 0xf2, 0xa2, 0xec, 0xa1, 0x8c, 0x7c, 0x79, 0x24, 0x0b, 0xa0, 0x5b, + 0x50, 0xf2, 0xd3, 0x07, 0xdf, 0x8d, 0xf3, 0xbe, 0xf2, 0x94, 0x55, 0x5f, 0x95, 0x6e, 0x43, 0xba, + 0xac, 0xd9, 0x7a, 0xc8, 0xb0, 0x17, 0x2f, 0xea, 0xb6, 0xdd, 0xd1, 0xdd, 0x91, 0xf2, 0x21, 0x34, + 0xe2, 0x52, 0xc3, 0xcc, 0x34, 0x72, 0xfe, 0x32, 0xbc, 0x02, 0x85, 0x63, 0xcb, 0x99, 0xe8, 0x84, + 0x81, 0x55, 0x54, 0x31, 0xa2, 0xcb, 0x93, 0xa7, 0x89, 0x2c, 0x13, 0xf3, 0x81, 0xa2, 0xc1, 0xe3, + 0xb1, 0xe9, 0x81, 0x9a, 0x18, 0xe6, 0x00, 0x73, 0x7f, 0x56, 0x54, 0x3e, 0x08, 0x80, 0xf8, 0xcb, + 0xf2, 0x01, 0x7d, 0xac, 0xcb, 0xe6, 0xca, 0xf0, 0x25, 0x55, 0x8c, 0x94, 0x5f, 0xa5, 0xe1, 0xca, + 0xe2, 0x24, 0x81, 0x6e, 0x01, 0xf0, 0x80, 0xea, 0x6f, 0xbb, 0xf2, 0xd6, 0x95, 0xf9, 0x45, 0x7f, + 0x5b, 0x27, 0xba, 0x2a, 0x31, 0x4d, 0x7a, 0x49, 0xc3, 0x40, 0x60, 0xa6, 0xb9, 0xc6, 0x43, 0xbe, + 0x66, 0xb2, 0x6a, 0xc5, 0xd7, 0x39, 0x34, 0x1e, 0x46, 0xc3, 0x5b, 0x36, 0x12, 0xde, 0x94, 0x5f, + 0x84, 0x5f, 0x2a, 0x92, 0x50, 0x42, 0xbb, 0x30, 0x7d, 0xa1, 0x5d, 0x18, 0x9d, 0x4c, 0x26, 0xe1, + 0x64, 0x94, 0x5f, 0x03, 0x94, 0x54, 0xec, 0xda, 0x34, 0x64, 0xa2, 0x26, 0x48, 0xf8, 0xb4, 0x8f, + 0x39, 0xaf, 0x4d, 0xc7, 0xf2, 0x42, 0xae, 0xdd, 0xf6, 0x34, 0x29, 0x29, 0xf3, 0xcd, 0xd0, 0x2b, + 0x82, 0xbb, 0xc7, 0xd3, 0x70, 0x61, 0x1e, 0x26, 0xef, 0xaf, 0x7a, 0xe4, 0x3d, 0x1b, 0xcb, 0xc3, + 0xb8, 0xd5, 0x0c, 0x7b, 0x7f, 0x45, 0xb0, 0xf7, 0xdc, 0x92, 0x87, 0x45, 0xe8, 0x7b, 0x2b, 0x42, + 0xdf, 0xf3, 0x4b, 0xa6, 0x19, 0xc3, 0xdf, 0x5b, 0x11, 0xfe, 0x5e, 0x58, 0x02, 0x12, 0x43, 0xe0, + 0x5f, 0xf5, 0x08, 0x7c, 0x71, 0xc9, 0xb4, 0x67, 0x18, 0xfc, 0x9d, 0x28, 0x83, 0xe7, 0xec, 0xfb, + 0x46, 0xac, 0x75, 0x2c, 0x85, 0xff, 0x6e, 0x88, 0xc2, 0x4b, 0xb1, 0xfc, 0x99, 0x83, 0x2c, 0xe0, + 0xf0, 0xad, 0x08, 0x87, 0x87, 0x25, 0x3e, 0x88, 0x21, 0xf1, 0x6f, 0x87, 0x49, 0x7c, 0x39, 0xb6, + 0x0e, 0x10, 0x8b, 0x66, 0x11, 0x8b, 0x7f, 0xdd, 0x67, 0xf1, 0x2b, 0xb1, 0x65, 0x88, 0x98, 0xc3, + 0x2c, 0x8d, 0xdf, 0x9f, 0xa3, 0xf1, 0x9c, 0x76, 0x3f, 0x13, 0x0b, 0xb1, 0x84, 0xc7, 0xef, 0xcf, + 0xf1, 0xf8, 0xea, 0x12, 0xc0, 0x25, 0x44, 0xfe, 0x27, 0x8b, 0x89, 0x7c, 0x3c, 0xd5, 0x16, 0xaf, + 0x99, 0x8c, 0xc9, 0x6b, 0x31, 0x4c, 0x9e, 0xb3, 0xed, 0x17, 0x62, 0xe1, 0x13, 0x53, 0xf9, 0xa3, + 0x05, 0x54, 0x9e, 0x93, 0xee, 0xe7, 0x62, 0xc1, 0x13, 0x70, 0xf9, 0xa3, 0x05, 0x5c, 0x1e, 0x2d, + 0x85, 0x4d, 0x4e, 0xe6, 0x9f, 0xa7, 0x9c, 0x69, 0x26, 0xcc, 0xd1, 0xbc, 0x83, 0x1d, 0xc7, 0x72, + 0x04, 0x4f, 0xe6, 0x03, 0xe5, 0x39, 0xca, 0xe2, 0x82, 0x90, 0x76, 0x0e, 0xf1, 0x67, 0xf9, 0x3d, + 0x14, 0xc6, 0x94, 0xdf, 0xa5, 0x03, 0x5b, 0x46, 0x7c, 0xc2, 0x0c, 0x50, 0x12, 0x0c, 0x30, 0x54, + 0x0f, 0x64, 0xa2, 0xf5, 0xc0, 0x3a, 0x94, 0x69, 0xde, 0x9e, 0xa1, 0xfa, 0xba, 0xed, 0x51, 0x7d, + 0x74, 0x13, 0x56, 0x19, 0x31, 0xe3, 0x79, 0x41, 0x24, 0xeb, 0x1c, 0x4b, 0x55, 0x35, 0x7a, 0x83, + 0x6f, 0x25, 0x9e, 0xb5, 0x5f, 0x82, 0x4b, 0x21, 0x5d, 0x9f, 0x0f, 0x70, 0x7e, 0x5b, 0xf7, 0xb5, + 0xb7, 0x05, 0x31, 0x78, 0x2f, 0x70, 0x50, 0x50, 0x46, 0x20, 0xc8, 0xf5, 0xad, 0x01, 0x16, 0xd9, + 0x9a, 0x5d, 0xd3, 0xd2, 0x62, 0x6c, 0x0d, 0x45, 0xfe, 0xa3, 0x97, 0x54, 0xcb, 0x8f, 0xd9, 0x12, + 0x0f, 0xc9, 0xca, 0x1f, 0xd3, 0x01, 0x5e, 0x50, 0x59, 0x2c, 0x2a, 0x02, 0xd2, 0xff, 0x9d, 0x22, + 0x20, 0xf3, 0xc8, 0x45, 0x40, 0x98, 0x2d, 0x65, 0xa3, 0x6c, 0xe9, 0x9f, 0xe9, 0xe0, 0x0b, 0xfb, + 0x94, 0xfe, 0xd1, 0x3c, 0x12, 0x50, 0x9f, 0x3c, 0xfb, 0x5e, 0x82, 0xfa, 0x88, 0x42, 0xad, 0xc0, + 0x9e, 0x1b, 0x2d, 0xd4, 0x8a, 0x9c, 0x0c, 0xb1, 0x01, 0x7a, 0x0d, 0x24, 0xd6, 0xed, 0xd3, 0x2c, + 0xdb, 0x15, 0xe9, 0xe1, 0x89, 0xf0, 0x5c, 0x79, 0x53, 0x6f, 0xe3, 0x80, 0xea, 0xec, 0xdb, 0xae, + 0x5a, 0xb2, 0xc5, 0x55, 0x88, 0xd5, 0x49, 0x91, 0xe2, 0xe2, 0x1a, 0x48, 0xf4, 0xed, 0x5d, 0x5b, + 0xef, 0x63, 0x16, 0xea, 0x25, 0x35, 0x10, 0x28, 0xf7, 0x01, 0xcd, 0x27, 0x1b, 0xd4, 0x81, 0x02, + 0x3e, 0xc1, 0x26, 0xa1, 0x5f, 0x2d, 0x3b, 0x4b, 0x47, 0x04, 0x73, 0xc7, 0x26, 0x69, 0x36, 0xa8, + 0x93, 0xff, 0xf1, 0xd5, 0x7a, 0x9d, 0x6b, 0xbf, 0x68, 0x4d, 0x0c, 0x82, 0x27, 0x36, 0x39, 0x53, + 0x85, 0xbd, 0xf2, 0xd7, 0x0c, 0xa5, 0xd1, 0x91, 0x44, 0xb4, 0xd0, 0xb7, 0xde, 0x06, 0xca, 0x84, + 0x4a, 0xa8, 0x64, 0xfe, 0x5e, 0x03, 0x18, 0xea, 0xae, 0xf6, 0x89, 0x6e, 0x12, 0x3c, 0x10, 0x4e, + 0x0f, 0x49, 0x90, 0x0c, 0x25, 0x3a, 0x9a, 0xba, 0x78, 0x20, 0xaa, 0x39, 0x7f, 0x1c, 0x9a, 0x67, + 0xf1, 0xdb, 0xcd, 0x33, 0xea, 0xe5, 0xd2, 0x8c, 0x97, 0x43, 0x14, 0x57, 0x0a, 0x53, 0x5c, 0xfa, + 0x6e, 0xb6, 0x63, 0x58, 0x8e, 0x41, 0xce, 0xd8, 0xa7, 0xc9, 0xaa, 0xfe, 0x18, 0xdd, 0x80, 0xca, + 0x04, 0x4f, 0x6c, 0xcb, 0x1a, 0x6b, 0x3c, 0x78, 0x95, 0x99, 0xe9, 0x8a, 0x10, 0xb6, 0x59, 0x0c, + 0xfb, 0x79, 0x26, 0xd8, 0x7e, 0x41, 0x29, 0xf3, 0x3f, 0xe7, 0x60, 0xe5, 0x97, 0xac, 0xbf, 0x11, + 0xa5, 0x1a, 0xe8, 0x10, 0x56, 0xfd, 0xed, 0xaf, 0x4d, 0x59, 0x58, 0xf0, 0x16, 0x74, 0xd2, 0xf8, + 0x51, 0x3f, 0x89, 0x8a, 0x5d, 0xf4, 0x03, 0xb8, 0x3a, 0x13, 0xda, 0x7c, 0xe8, 0x4c, 0xc2, 0x08, + 0xf7, 0x58, 0x34, 0xc2, 0x79, 0xc8, 0x81, 0xaf, 0xb2, 0xdf, 0x72, 0xd3, 0xed, 0xd0, 0x92, 0x39, + 0x4c, 0x9c, 0x16, 0x7e, 0xfd, 0x1b, 0x50, 0x71, 0x30, 0xa1, 0x65, 0x4e, 0xa4, 0x29, 0xb1, 0xc2, + 0x85, 0xa2, 0xd5, 0x71, 0x00, 0x8f, 0x2d, 0x24, 0x50, 0xe8, 0xff, 0x41, 0x0a, 0xb8, 0x57, 0x3a, + 0xa6, 0xbe, 0xf7, 0x6b, 0xd6, 0x40, 0x57, 0xf9, 0x43, 0x3a, 0x80, 0x8c, 0x56, 0xc1, 0x6d, 0x28, + 0x38, 0xd8, 0x9d, 0x8e, 0x79, 0x5d, 0x5a, 0xdd, 0x7a, 0x29, 0x19, 0xf5, 0xa2, 0xd2, 0xe9, 0x98, + 0xa8, 0xc2, 0x58, 0xb9, 0x0f, 0x05, 0x2e, 0x41, 0x65, 0x28, 0x1e, 0xed, 0xdd, 0xdd, 0xdb, 0x7f, + 0x7f, 0xaf, 0x9e, 0x42, 0x00, 0x85, 0xed, 0x56, 0xab, 0x7d, 0xd0, 0xad, 0xa7, 0x91, 0x04, 0xf9, + 0xed, 0xe6, 0xbe, 0xda, 0xad, 0x67, 0xa8, 0x58, 0x6d, 0xbf, 0xdb, 0x6e, 0x75, 0xeb, 0x59, 0xb4, + 0x0a, 0x15, 0x7e, 0xad, 0xdd, 0xd9, 0x57, 0xdf, 0xdb, 0xee, 0xd6, 0x73, 0x21, 0xd1, 0x61, 0x7b, + 0xef, 0x76, 0x5b, 0xad, 0xe7, 0x95, 0x97, 0x69, 0xe1, 0x1b, 0x43, 0xd6, 0x82, 0x12, 0x37, 0x1d, + 0x2a, 0x71, 0x95, 0xdf, 0x64, 0x40, 0x8e, 0x67, 0x60, 0xe8, 0xdd, 0x99, 0x89, 0x6f, 0x5d, 0x80, + 0xbe, 0xcd, 0xcc, 0x1e, 0x3d, 0x0d, 0x55, 0x07, 0x1f, 0x63, 0xd2, 0x1f, 0x71, 0x46, 0xc8, 0x33, + 0x66, 0x45, 0xad, 0x08, 0x29, 0x33, 0x72, 0xb9, 0xda, 0x47, 0xb8, 0x4f, 0x34, 0x1e, 0x8a, 0xf8, + 0xa2, 0x93, 0xa8, 0x1a, 0x95, 0x1e, 0x72, 0xa1, 0xf2, 0xe1, 0x85, 0x7c, 0x29, 0x41, 0x5e, 0x6d, + 0x77, 0xd5, 0x1f, 0xd6, 0xb3, 0x08, 0x41, 0x95, 0x5d, 0x6a, 0x87, 0x7b, 0xdb, 0x07, 0x87, 0x9d, + 0x7d, 0xea, 0xcb, 0x4b, 0x50, 0xf3, 0x7c, 0xe9, 0x09, 0xf3, 0xca, 0x01, 0x5c, 0x8d, 0xa1, 0x8f, + 0x8f, 0x58, 0xe5, 0x2b, 0xbf, 0x4d, 0x87, 0x21, 0xa3, 0x35, 0xfa, 0x3b, 0x33, 0x9e, 0xde, 0x4c, + 0x4a, 0x3a, 0x67, 0xdd, 0x2c, 0x43, 0x09, 0x8b, 0xe6, 0x15, 0x73, 0xf0, 0x8a, 0xea, 0x8f, 0x95, + 0x97, 0x96, 0x3b, 0x2d, 0x58, 0x75, 0x19, 0xe5, 0xdf, 0x69, 0xa8, 0xcd, 0x84, 0x08, 0xb4, 0x05, + 0x79, 0x5e, 0x57, 0xc5, 0xfd, 0x48, 0x63, 0x11, 0x4e, 0xc4, 0x13, 0xae, 0x8a, 0xde, 0x8c, 0xbc, + 0xd2, 0x5c, 0x28, 0xe2, 0xce, 0xf2, 0x3a, 0x6e, 0xc2, 0xd4, 0xb7, 0x40, 0x6f, 0x81, 0xe4, 0xc7, + 0x3a, 0x51, 0xcc, 0x3f, 0x35, 0x6f, 0xee, 0x47, 0x49, 0x61, 0x1f, 0xd8, 0xa0, 0xd7, 0x03, 0xba, + 0x9b, 0x9b, 0xaf, 0xe6, 0x84, 0x39, 0x57, 0x10, 0xc6, 0x9e, 0xbe, 0xd2, 0x82, 0x72, 0x68, 0x3e, + 0xe8, 0x09, 0x90, 0x26, 0xfa, 0xa9, 0xe8, 0xd3, 0xf2, 0x4e, 0x5b, 0x69, 0xa2, 0x9f, 0xf2, 0x16, + 0xed, 0x55, 0x28, 0xd2, 0x9b, 0x43, 0xdd, 0x15, 0xbd, 0x9b, 0xc2, 0x44, 0x3f, 0x7d, 0x47, 0x77, + 0x95, 0x0f, 0xa0, 0x1a, 0xed, 0x51, 0xd2, 0xbd, 0xe8, 0x58, 0x53, 0x73, 0xc0, 0x30, 0xf2, 0x2a, + 0x1f, 0xa0, 0x5b, 0x90, 0x3f, 0xb1, 0x78, 0xb8, 0x5e, 0x1c, 0xb4, 0xee, 0x59, 0x04, 0x87, 0x7a, + 0x9c, 0x5c, 0x5b, 0x79, 0x08, 0x79, 0x16, 0x7e, 0x69, 0x28, 0x65, 0xdd, 0x46, 0x41, 0xf5, 0xe9, + 0x35, 0xfa, 0x00, 0x40, 0x27, 0xc4, 0x31, 0x7a, 0xd3, 0x00, 0x78, 0x7d, 0x71, 0xf8, 0xde, 0xf6, + 0xf4, 0x9a, 0xd7, 0x44, 0x1c, 0xbf, 0x1c, 0x98, 0x86, 0x62, 0x79, 0x08, 0x50, 0xd9, 0x83, 0x6a, + 0xd4, 0x36, 0xdc, 0xf7, 0x5f, 0x59, 0xd0, 0xf7, 0xf7, 0xe9, 0xa4, 0x4f, 0x46, 0xb3, 0xbc, 0xb3, + 0xcc, 0x06, 0xca, 0xa7, 0x69, 0x28, 0x75, 0x4f, 0xc5, 0x1a, 0x8d, 0x69, 0x6a, 0x06, 0xa6, 0x99, + 0x70, 0x0b, 0x8f, 0x77, 0x49, 0xb3, 0x7e, 0xef, 0xf5, 0x6d, 0x7f, 0x43, 0xe5, 0x92, 0x76, 0x11, + 0xbc, 0xf6, 0x97, 0x08, 0xd7, 0x6f, 0x80, 0xe4, 0xaf, 0x2a, 0x5a, 0x33, 0xe9, 0x83, 0x81, 0x83, + 0x5d, 0x57, 0xcc, 0xcd, 0x1b, 0xb2, 0x1e, 0xb9, 0xf5, 0x89, 0x68, 0x12, 0x66, 0x55, 0x3e, 0x50, + 0x06, 0x50, 0x9b, 0x49, 0xdc, 0xe8, 0x0d, 0x28, 0xda, 0xd3, 0x9e, 0xe6, 0xb9, 0x67, 0x66, 0xf3, + 0x78, 0xfc, 0x79, 0xda, 0x1b, 0x1b, 0xfd, 0xbb, 0xf8, 0xcc, 0x7b, 0x19, 0x7b, 0xda, 0xbb, 0xcb, + 0xbd, 0xc8, 0x9f, 0x92, 0x09, 0x3f, 0xe5, 0x04, 0x4a, 0xde, 0xa2, 0x40, 0xdf, 0x0b, 0xef, 0x13, + 0xef, 0xcf, 0x49, 0x2c, 0x99, 0x10, 0xf0, 0xa1, 0x6d, 0x72, 0x13, 0x56, 0x5d, 0x63, 0x68, 0xe2, + 0x81, 0x16, 0x54, 0x6d, 0xec, 0x69, 0x25, 0xb5, 0xc6, 0x6f, 0xec, 0x7a, 0x25, 0x9b, 0xf2, 0xaf, + 0x34, 0x94, 0xbc, 0x0d, 0x8b, 0x5e, 0x0e, 0xad, 0xbb, 0xea, 0x82, 0x8e, 0x99, 0xa7, 0x18, 0xb4, + 0xb9, 0xa3, 0xef, 0x9a, 0xb9, 0xf8, 0xbb, 0xc6, 0xfd, 0xaf, 0xf0, 0x7e, 0x1c, 0xe5, 0x2e, 0xfc, + 0xe3, 0xe8, 0x45, 0x40, 0xc4, 0x22, 0xfa, 0x58, 0x3b, 0xb1, 0x88, 0x61, 0x0e, 0x35, 0xee, 0x6c, + 0xce, 0x29, 0xeb, 0xec, 0xce, 0x3d, 0x76, 0xe3, 0x80, 0xf9, 0xfd, 0xa7, 0x69, 0x28, 0xf9, 0xec, + 0xe0, 0xa2, 0x5d, 0xeb, 0x2b, 0x50, 0x10, 0x09, 0x90, 0xb7, 0xad, 0xc5, 0xc8, 0xff, 0x81, 0x92, + 0x0b, 0xfd, 0x40, 0x91, 0xa1, 0x34, 0xc1, 0x44, 0x67, 0x79, 0x86, 0x17, 0xce, 0xfe, 0xf8, 0xe6, + 0xeb, 0x50, 0x0e, 0xfd, 0x40, 0xa0, 0x3b, 0x6f, 0xaf, 0xfd, 0x7e, 0x3d, 0x25, 0x17, 0x3f, 0xfd, + 0xfc, 0x7a, 0x76, 0x0f, 0x7f, 0x42, 0xd7, 0xac, 0xda, 0x6e, 0x75, 0xda, 0xad, 0xbb, 0xf5, 0xb4, + 0x5c, 0xfe, 0xf4, 0xf3, 0xeb, 0x45, 0x15, 0xb3, 0x46, 0xdb, 0xcd, 0x0e, 0xac, 0x84, 0xbf, 0x4a, + 0x34, 0x1d, 0x20, 0xa8, 0xde, 0x3e, 0x3a, 0xd8, 0xdd, 0x69, 0x6d, 0x77, 0xdb, 0xda, 0xbd, 0xfd, + 0x6e, 0xbb, 0x9e, 0x46, 0x57, 0xe1, 0xd2, 0xee, 0xce, 0x3b, 0x9d, 0xae, 0xd6, 0xda, 0xdd, 0x69, + 0xef, 0x75, 0xb5, 0xed, 0x6e, 0x77, 0xbb, 0x75, 0xb7, 0x9e, 0xd9, 0xfa, 0x73, 0x19, 0x6a, 0xdb, + 0xcd, 0xd6, 0x0e, 0xcd, 0xff, 0x46, 0x5f, 0x17, 0x8d, 0xcc, 0x1c, 0xeb, 0x5b, 0x9c, 0x7b, 0xca, + 0x42, 0x3e, 0xbf, 0x8f, 0x8b, 0xee, 0x40, 0x9e, 0xb5, 0x34, 0xd0, 0xf9, 0xc7, 0x2e, 0xe4, 0x25, + 0x8d, 0x5d, 0xfa, 0x32, 0x6c, 0x7b, 0x9c, 0x7b, 0x0e, 0x43, 0x3e, 0xbf, 0xcf, 0x8b, 0x54, 0x90, + 0x82, 0x9e, 0xc4, 0xf2, 0x73, 0x19, 0x72, 0x82, 0xde, 0x2f, 0xc5, 0x0c, 0x0a, 0xa3, 0xe5, 0xe7, + 0x14, 0xe4, 0x04, 0x01, 0x0c, 0xed, 0x42, 0xd1, 0xab, 0x65, 0x97, 0x9d, 0x9c, 0x90, 0x97, 0xf6, + 0x65, 0xe9, 0x27, 0xe0, 0x3d, 0x87, 0xf3, 0x8f, 0x81, 0xc8, 0x4b, 0x9a, 0xcc, 0x68, 0x07, 0x0a, + 0x82, 0xed, 0x2f, 0x39, 0x0d, 0x21, 0x2f, 0xeb, 0xb3, 0x52, 0xa7, 0x05, 0xcd, 0x9c, 0xe5, 0x87, + 0x5b, 0xe4, 0x04, 0xfd, 0x73, 0x74, 0x04, 0x10, 0xea, 0x30, 0x24, 0x38, 0xb5, 0x22, 0x27, 0xe9, + 0x8b, 0xa3, 0x7d, 0x28, 0xf9, 0x05, 0xdf, 0xd2, 0x33, 0x24, 0xf2, 0xf2, 0x06, 0x35, 0xba, 0x0f, + 0x95, 0x68, 0xa5, 0x93, 0xec, 0x64, 0x88, 0x9c, 0xb0, 0xf3, 0x4c, 0xf1, 0xa3, 0x65, 0x4f, 0xb2, + 0x93, 0x22, 0x72, 0xc2, 0x46, 0x34, 0xfa, 0x08, 0x56, 0xe7, 0xcb, 0x92, 0xe4, 0x07, 0x47, 0xe4, + 0x0b, 0xb4, 0xa6, 0xd1, 0x04, 0xd0, 0x82, 0x72, 0xe6, 0x02, 0xe7, 0x48, 0xe4, 0x8b, 0x74, 0xaa, + 0xd1, 0x00, 0x6a, 0xb3, 0x35, 0x42, 0xd2, 0x73, 0x25, 0x72, 0xe2, 0xae, 0x35, 0x7f, 0x4a, 0xb4, + 0x6c, 0x48, 0x7a, 0xce, 0x44, 0x4e, 0xdc, 0xc4, 0x6e, 0xb6, 0xbf, 0xf8, 0x7a, 0x2d, 0xfd, 0xe5, + 0xd7, 0x6b, 0xe9, 0xbf, 0x7f, 0xbd, 0x96, 0xfe, 0xec, 0x9b, 0xb5, 0xd4, 0x97, 0xdf, 0xac, 0xa5, + 0xfe, 0xf2, 0xcd, 0x5a, 0xea, 0x47, 0x2f, 0x0c, 0x0d, 0x32, 0x9a, 0xf6, 0x36, 0xfa, 0xd6, 0x64, + 0x33, 0x7c, 0x60, 0x6f, 0xd1, 0x21, 0xc2, 0x5e, 0x81, 0x25, 0xdd, 0x57, 0xfe, 0x13, 0x00, 0x00, + 0xff, 0xff, 0x86, 0x33, 0x44, 0x59, 0x64, 0x28, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5357,6 +5366,13 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if len(m.ChainId) > 0 { + i -= len(m.ChainId) + copy(dAtA[i:], m.ChainId) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ChainId))) + i-- + dAtA[i] = 0x1a + } if m.BlockDataSize != 0 { i = encodeVarintTypes(dAtA, i, uint64(m.BlockDataSize)) i-- @@ -7695,6 +7711,10 @@ func (m *RequestPrepareProposal) Size() (n int) { if m.BlockDataSize != 0 { n += 1 + sovTypes(uint64(m.BlockDataSize)) } + l = len(m.ChainId) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } return n } @@ -10937,6 +10957,38 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { break } } + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChainId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 4947a44161..452578e89b 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -133,6 +133,8 @@ message RequestPrepareProposal { tendermint.types.Data block_data = 1; // If an application decides to populate block_data with extra information, they can not exceed this value. int64 block_data_size = 2; + // proposal_header is the header from the proposal + string chain_id = 3; } message RequestProcessProposal { diff --git a/proto/tendermint/crypto/keys.pb.go b/proto/tendermint/crypto/keys.pb.go index c5cdf19a2f..e80207ed9b 100644 --- a/proto/tendermint/crypto/keys.pb.go +++ b/proto/tendermint/crypto/keys.pb.go @@ -27,7 +27,6 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // PublicKey defines the keys available for use with Validators type PublicKey struct { // Types that are valid to be assigned to Sum: - // // *PublicKey_Ed25519 // *PublicKey_Secp256K1 Sum isPublicKey_Sum `protobuf_oneof:"sum"` diff --git a/proto/tendermint/mempool/types.pb.go b/proto/tendermint/mempool/types.pb.go index 14d1197ef9..b4dfb43a36 100644 --- a/proto/tendermint/mempool/types.pb.go +++ b/proto/tendermint/mempool/types.pb.go @@ -156,7 +156,6 @@ func (m *WantTx) GetTxKey() []byte { type Message struct { // Types that are valid to be assigned to Sum: - // // *Message_Txs // *Message_SeenTx // *Message_WantTx diff --git a/proto/tendermint/p2p/conn.pb.go b/proto/tendermint/p2p/conn.pb.go index 16ee463a6a..47a3bb0cd8 100644 --- a/proto/tendermint/p2p/conn.pb.go +++ b/proto/tendermint/p2p/conn.pb.go @@ -158,7 +158,6 @@ func (m *PacketMsg) GetData() []byte { type Packet struct { // Types that are valid to be assigned to Sum: - // // *Packet_PacketPing // *Packet_PacketPong // *Packet_PacketMsg diff --git a/proto/tendermint/statesync/types.pb.go b/proto/tendermint/statesync/types.pb.go index c54d57798a..8391e0ead4 100644 --- a/proto/tendermint/statesync/types.pb.go +++ b/proto/tendermint/statesync/types.pb.go @@ -24,7 +24,6 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Message struct { // Types that are valid to be assigned to Sum: - // // *Message_SnapshotsRequest // *Message_SnapshotsResponse // *Message_ChunkRequest diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index 2fe5aa16aa..d3ccf4a28f 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -95,12 +95,12 @@ message Data { // field number 4 is reserved for blobs // SquareSize is the number of rows or columns in the original data square. - uint64 square_size = 5; + uint64 square_size = 5; // Hash is the root of a binary Merkle tree where the leaves of the tree are // the row and column roots of an extended data square. Hash is often referred // to as the "data root". - bytes hash = 6; + bytes hash = 6; } // Blob (named after binary large object) is a chunk of data submitted by a user @@ -108,9 +108,9 @@ message Data { // to a namespace and is encoded into shares based on the format specified by // share_version. message Blob { - bytes namespace_id = 1; - bytes data = 2; - uint32 share_version = 3; + bytes namespace_id = 1; + bytes data = 2; + uint32 share_version = 3; uint32 namespace_version = 4; } @@ -211,17 +211,17 @@ message BlobTx { // ShareProof is an NMT proof that a set of shares exist in a set of rows and a // Merkle proof that those rows exist in a Merkle tree with a given data root. message ShareProof { - repeated bytes data = 1; - repeated NMTProof share_proofs = 2; - bytes namespace_id = 3; - RowProof row_proof = 4; - uint32 namespace_version = 5; + repeated bytes data = 1; + repeated NMTProof share_proofs = 2; + bytes namespace_id = 3; + RowProof row_proof = 4; + uint32 namespace_version = 5; } // RowProof is a Merkle proof that a set of rows exist in a Merkle tree with a // given data root. message RowProof { - repeated bytes row_roots = 1; + repeated bytes row_roots = 1; repeated tendermint.crypto.Proof proofs = 2; bytes root = 3; uint32 start_row = 4; diff --git a/state/execution.go b/state/execution.go index 1fcf43a982..4818d4fba8 100644 --- a/state/execution.go +++ b/state/execution.go @@ -118,7 +118,9 @@ func (blockExec *BlockExecutor) CreateProposalBlock( preparedProposal, err := blockExec.proxyApp.PrepareProposalSync( abci.RequestPrepareProposal{ BlockData: &cmtproto.Data{Txs: txs.ToSliceOfBytes()}, - BlockDataSize: maxDataBytes}, + BlockDataSize: maxDataBytes, + ChainId: state.ChainID, + }, ) if err != nil { // The App MUST ensure that only valid (and hence 'processable') transactions