From 8c94c5f3f124b98eb59a97cbb2860fca9e75c6b8 Mon Sep 17 00:00:00 2001 From: Samuel Hawksby-Robinson Date: Mon, 17 Apr 2023 09:54:03 +0100 Subject: [PATCH] Added versioning package and addressed feedback --- protocol/protobuf/pairing.pb.go | 352 ++++++++++++++------------- protocol/protobuf/pairing.proto | 9 +- server/pairing/connection.go | 18 +- server/pairing/peers/payload.go | 20 +- server/pairing/peers/udp_notifier.go | 9 +- server/pairing/versioning/version.go | 18 ++ 6 files changed, 229 insertions(+), 197 deletions(-) create mode 100644 server/pairing/versioning/version.go diff --git a/protocol/protobuf/pairing.pb.go b/protocol/protobuf/pairing.pb.go index 6c71df63b..29d76f7e3 100644 --- a/protocol/protobuf/pairing.pb.go +++ b/protocol/protobuf/pairing.pb.go @@ -667,10 +667,11 @@ func (m *LocalPairingPayload_Key) GetData() []byte { } type LocalPairingPeerHello struct { - PeerId []byte `protobuf:"bytes,1,opt,name=peer_id,json=peerId,proto3" json:"peer_id,omitempty"` - DeviceName string `protobuf:"bytes,2,opt,name=device_name,json=deviceName,proto3" json:"device_name,omitempty"` - DeviceType string `protobuf:"bytes,3,opt,name=device_type,json=deviceType,proto3" json:"device_type,omitempty"` - Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` + PairingVersion int32 `protobuf:"varint,1,opt,name=pairing_version,json=pairingVersion,proto3" json:"pairing_version,omitempty"` + PeerId []byte `protobuf:"bytes,2,opt,name=peer_id,json=peerId,proto3" json:"peer_id,omitempty"` + DeviceName string `protobuf:"bytes,3,opt,name=device_name,json=deviceName,proto3" json:"device_name,omitempty"` + DeviceType string `protobuf:"bytes,4,opt,name=device_type,json=deviceType,proto3" json:"device_type,omitempty"` + Signature []byte `protobuf:"bytes,5,opt,name=signature,proto3" json:"signature,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -701,6 +702,13 @@ func (m *LocalPairingPeerHello) XXX_DiscardUnknown() { var xxx_messageInfo_LocalPairingPeerHello proto.InternalMessageInfo +func (m *LocalPairingPeerHello) GetPairingVersion() int32 { + if m != nil { + return m.PairingVersion + } + return 0 +} + func (m *LocalPairingPeerHello) GetPeerId() []byte { if m != nil { return m.PeerId @@ -2881,180 +2889,182 @@ func init() { } var fileDescriptor_d61ab7221f0b5518 = []byte{ - // 2799 bytes of a gzipped FileDescriptorProto + // 2819 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x39, 0xcd, 0x73, 0x23, 0x47, - 0xf5, 0x19, 0x49, 0xab, 0x8f, 0x27, 0x59, 0xd6, 0xf6, 0x7e, 0x69, 0xbd, 0x4e, 0xad, 0x77, 0x92, + 0xf5, 0x19, 0x49, 0xd6, 0xc7, 0x93, 0x2c, 0x6b, 0x7b, 0xbf, 0xb4, 0xde, 0x4d, 0xad, 0x77, 0x92, 0x54, 0xf6, 0xf7, 0xab, 0xe0, 0x05, 0x87, 0x90, 0xb0, 0x49, 0x2a, 0x68, 0x25, 0x91, 0xf5, 0x7a, 0x2d, 0xbb, 0xda, 0xd6, 0x86, 0xa4, 0xa8, 0x9a, 0x6a, 0xcf, 0xf4, 0x5a, 0x83, 0x47, 0x33, 0x62, - 0xba, 0xe5, 0x45, 0xb9, 0xc1, 0x5f, 0x40, 0x71, 0x81, 0x63, 0xce, 0x70, 0xa3, 0x2a, 0x77, 0x8e, - 0xdc, 0x39, 0xc2, 0x81, 0x33, 0xc5, 0x1f, 0xc0, 0x91, 0xea, 0xd7, 0x3d, 0xa3, 0x19, 0x59, 0x32, - 0xde, 0xe2, 0xc4, 0x49, 0xfd, 0xde, 0xbc, 0xf7, 0xe6, 0xf5, 0xfb, 0x7e, 0x23, 0x58, 0x9b, 0x30, - 0x3f, 0xf6, 0xc3, 0xd3, 0xed, 0x49, 0x1c, 0xc9, 0x88, 0x54, 0xf1, 0xe7, 0x64, 0xfa, 0x72, 0xe3, - 0x86, 0x98, 0x85, 0xae, 0x23, 0xb8, 0x94, 0x7e, 0x78, 0x2a, 0xf4, 0xe3, 0x0d, 0x9b, 0x4d, 0x26, - 0x81, 0xef, 0x32, 0xe9, 0x47, 0xa1, 0x33, 0xe6, 0x92, 0x79, 0x4c, 0x32, 0x67, 0xcc, 0x85, 0x60, - 0xa7, 0x5c, 0xd3, 0xd8, 0x0c, 0xee, 0xfd, 0x98, 0x4b, 0x77, 0xe4, 0x87, 0xa7, 0x4f, 0x98, 0x7b, - 0xc6, 0xbd, 0xe1, 0xa4, 0xc7, 0x24, 0xeb, 0x71, 0xc9, 0xfc, 0x40, 0x90, 0xfb, 0x50, 0x47, 0xa6, - 0x70, 0x3a, 0x3e, 0xe1, 0x71, 0xdb, 0xda, 0xb2, 0x1e, 0xae, 0x51, 0x50, 0xa8, 0x01, 0x62, 0xc8, - 0x03, 0x68, 0xc8, 0x48, 0xb2, 0x20, 0xa1, 0x28, 0x20, 0x45, 0x1d, 0x71, 0x9a, 0xc4, 0xfe, 0xfb, - 0x35, 0x28, 0x2b, 0xd9, 0xd3, 0x09, 0xb9, 0x09, 0xd7, 0xdc, 0x20, 0x72, 0xcf, 0x50, 0x50, 0x89, - 0x6a, 0x80, 0x34, 0xa1, 0xe0, 0x7b, 0xc8, 0x59, 0xa3, 0x05, 0xdf, 0x23, 0x9f, 0x41, 0xd5, 0x8d, - 0x42, 0xc9, 0x5c, 0x29, 0xda, 0xc5, 0xad, 0xe2, 0xc3, 0xfa, 0xce, 0x5b, 0xdb, 0xc9, 0x4d, 0xb7, - 0x8f, 0x66, 0xa1, 0xbb, 0x1b, 0x0a, 0xc9, 0x82, 0x00, 0x2f, 0xd6, 0xd5, 0x94, 0x2f, 0x76, 0x68, - 0xca, 0x44, 0x7e, 0x08, 0x75, 0x37, 0x1a, 0x8f, 0xa7, 0xa1, 0x2f, 0x7d, 0x2e, 0xda, 0x25, 0x94, - 0x71, 0x27, 0x2f, 0xa3, 0x6b, 0x08, 0x66, 0x34, 0x4b, 0x4b, 0x0e, 0x60, 0x3d, 0x11, 0x63, 0x6c, - 0xd0, 0xbe, 0xb6, 0x65, 0x3d, 0xac, 0xef, 0xbc, 0x33, 0x67, 0xbf, 0xc4, 0x60, 0x74, 0x91, 0x9b, + 0xba, 0xe5, 0x45, 0xb9, 0xc1, 0x9f, 0xc0, 0x05, 0x8e, 0x39, 0xc3, 0x8d, 0xaa, 0x1c, 0xb8, 0x71, + 0xe4, 0xce, 0x11, 0x0e, 0x9c, 0x29, 0xfe, 0x00, 0x8e, 0x54, 0xbf, 0xee, 0x19, 0xcd, 0xc8, 0x92, + 0xf1, 0x16, 0x27, 0x4e, 0xea, 0xf7, 0xe6, 0xbd, 0x37, 0xaf, 0xdf, 0xf7, 0x1b, 0xc1, 0xfa, 0x84, + 0xf9, 0xb1, 0x1f, 0x9e, 0x6e, 0x4f, 0xe2, 0x48, 0x46, 0xa4, 0x8a, 0x3f, 0x27, 0xd3, 0x97, 0x9b, + 0xd7, 0xc5, 0x2c, 0x74, 0x1d, 0xc1, 0xa5, 0xf4, 0xc3, 0x53, 0xa1, 0x1f, 0x6f, 0xda, 0x6c, 0x32, + 0x09, 0x7c, 0x97, 0x49, 0x3f, 0x0a, 0x9d, 0x31, 0x97, 0xcc, 0x63, 0x92, 0x39, 0x63, 0x2e, 0x04, + 0x3b, 0xe5, 0x9a, 0xc6, 0x66, 0x70, 0xf7, 0xc7, 0x5c, 0xba, 0x23, 0x3f, 0x3c, 0x7d, 0xc2, 0xdc, + 0x33, 0xee, 0x0d, 0x27, 0x3d, 0x26, 0x59, 0x8f, 0x4b, 0xe6, 0x07, 0x82, 0xdc, 0x87, 0x3a, 0x32, + 0x85, 0xd3, 0xf1, 0x09, 0x8f, 0xdb, 0xd6, 0x96, 0xf5, 0x70, 0x9d, 0x82, 0x42, 0x0d, 0x10, 0x43, + 0x1e, 0x40, 0x43, 0x46, 0x92, 0x05, 0x09, 0x45, 0x01, 0x29, 0xea, 0x88, 0xd3, 0x24, 0xf6, 0xdf, + 0xd7, 0xa0, 0xac, 0x64, 0x4f, 0x27, 0xe4, 0x06, 0xac, 0xb9, 0x41, 0xe4, 0x9e, 0xa1, 0xa0, 0x12, + 0xd5, 0x00, 0x69, 0x42, 0xc1, 0xf7, 0x90, 0xb3, 0x46, 0x0b, 0xbe, 0x47, 0x3e, 0x83, 0xaa, 0x1b, + 0x85, 0x92, 0xb9, 0x52, 0xb4, 0x8b, 0x5b, 0xc5, 0x87, 0xf5, 0x9d, 0xb7, 0xb6, 0x93, 0x9b, 0x6e, + 0x1f, 0xcd, 0x42, 0x77, 0x37, 0x14, 0x92, 0x05, 0x01, 0x5e, 0xac, 0xab, 0x29, 0x5f, 0xec, 0xd0, + 0x94, 0x89, 0xfc, 0x10, 0xea, 0x6e, 0x34, 0x1e, 0x4f, 0x43, 0x5f, 0xfa, 0x5c, 0xb4, 0x4b, 0x28, + 0xe3, 0x76, 0x5e, 0x46, 0xd7, 0x10, 0xcc, 0x68, 0x96, 0x96, 0x1c, 0xc0, 0x46, 0x22, 0xc6, 0xd8, + 0xa0, 0xbd, 0xb6, 0x65, 0x3d, 0xac, 0xef, 0xbc, 0x33, 0x67, 0xbf, 0xc4, 0x60, 0x74, 0x91, 0x9b, 0x0c, 0x81, 0x64, 0xe4, 0x27, 0x32, 0xcb, 0xaf, 0x23, 0x73, 0x89, 0x00, 0xf2, 0x3e, 0x54, 0x26, - 0x71, 0xf4, 0xd2, 0x0f, 0x78, 0xbb, 0x82, 0xb2, 0xee, 0xce, 0x65, 0x25, 0x32, 0x0e, 0x35, 0x01, + 0x71, 0xf4, 0xd2, 0x0f, 0x78, 0xbb, 0x82, 0xb2, 0xee, 0xcc, 0x65, 0x25, 0x32, 0x0e, 0x35, 0x01, 0x4d, 0x28, 0xc9, 0x3e, 0x34, 0xcd, 0x31, 0xd1, 0xa3, 0xfa, 0x3a, 0x7a, 0x2c, 0x30, 0x93, 0x47, - 0x50, 0x31, 0x11, 0xd7, 0xae, 0xa1, 0x9c, 0x5b, 0x79, 0x13, 0x1f, 0xe9, 0x87, 0x34, 0xa1, 0x52, + 0x50, 0x31, 0x11, 0xd7, 0xae, 0xa1, 0x9c, 0x9b, 0x79, 0x13, 0x1f, 0xe9, 0x87, 0x34, 0xa1, 0x52, 0xc6, 0x4d, 0x42, 0x34, 0x51, 0x00, 0x5e, 0xcb, 0xb8, 0x0b, 0xdc, 0xe4, 0x03, 0xa8, 0x9e, 0xf1, 0x99, 0xcb, 0x62, 0x4f, 0xb4, 0xeb, 0x8b, 0x66, 0x50, 0x2a, 0x74, 0x82, 0x60, 0xcf, 0x10, 0xd0, 0x94, 0x54, 0xe9, 0x91, 0x9c, 0x13, 0x3d, 0x1a, 0xaf, 0xa5, 0xc7, 0x02, 0xb7, 0xfd, 0xcf, 0x12, 0x34, 0xf6, 0xa7, 0x81, 0xf4, 0x3b, 0xae, 0x1b, 0x4d, 0x43, 0x49, 0x08, 0x94, 0x42, 0x36, 0xe6, - 0x18, 0xe7, 0x35, 0x8a, 0x67, 0xb2, 0x09, 0x35, 0xe9, 0x8f, 0xb9, 0x90, 0x6c, 0x3c, 0xc1, 0x68, - 0x2f, 0xd2, 0x39, 0x42, 0x3d, 0xf5, 0x3d, 0x1e, 0x4a, 0xdf, 0x8d, 0xc2, 0x76, 0x11, 0xd9, 0xe6, - 0x08, 0xf2, 0x19, 0x80, 0x1b, 0x05, 0x51, 0xec, 0x8c, 0x98, 0x18, 0x99, 0x80, 0xde, 0x9a, 0x2b, - 0x9b, 0x7d, 0xf7, 0x76, 0x57, 0x11, 0x3e, 0x65, 0x62, 0x44, 0x6b, 0x6e, 0x72, 0x24, 0x77, 0x55, - 0x4e, 0x29, 0x01, 0xbe, 0x87, 0x01, 0x5d, 0xa4, 0x15, 0x84, 0x77, 0x3d, 0xf2, 0x6e, 0x6a, 0x0d, - 0xc7, 0x94, 0x17, 0x0c, 0xcf, 0x1a, 0x6d, 0x1a, 0xf4, 0xa1, 0xc6, 0x92, 0x3b, 0x50, 0x39, 0xe3, - 0x33, 0x67, 0xea, 0x7b, 0x18, 0x73, 0x35, 0x5a, 0x3e, 0xe3, 0xb3, 0xa1, 0xef, 0x91, 0x4f, 0xa0, - 0xec, 0x8f, 0xd9, 0x29, 0x57, 0xf1, 0xa4, 0x34, 0x7b, 0x7b, 0x85, 0x66, 0xbb, 0x78, 0x1f, 0x39, - 0xdb, 0x55, 0xc4, 0xd4, 0xf0, 0x90, 0x47, 0x70, 0xc3, 0x9d, 0x0a, 0x19, 0x8d, 0xfd, 0xaf, 0x75, - 0xa9, 0x42, 0xc5, 0x30, 0xa4, 0x6a, 0x94, 0xe4, 0x1e, 0xe1, 0xd5, 0x36, 0x1e, 0x40, 0x2d, 0xbd, - 0xa3, 0x2a, 0x29, 0x7e, 0xe8, 0xf1, 0x5f, 0xb4, 0xad, 0xad, 0xe2, 0xc3, 0x22, 0xd5, 0xc0, 0xc6, - 0x5f, 0x2d, 0x58, 0xcb, 0xbd, 0x2d, 0xab, 0xbc, 0x95, 0x53, 0x3e, 0x71, 0x55, 0x21, 0xe3, 0xaa, - 0x36, 0x54, 0x26, 0x6c, 0x16, 0x44, 0xcc, 0x43, 0x57, 0x34, 0x68, 0x02, 0xaa, 0xd7, 0xbd, 0xf2, - 0x3d, 0xa9, 0x7c, 0xa0, 0x8c, 0xa8, 0x01, 0x72, 0x1b, 0xca, 0x23, 0xee, 0x9f, 0x8e, 0xa4, 0xb1, - 0xad, 0x81, 0xc8, 0x06, 0x54, 0x55, 0xc2, 0x08, 0xff, 0x6b, 0x8e, 0x36, 0x2d, 0xd2, 0x14, 0x26, - 0x6f, 0xc1, 0x5a, 0x8c, 0x27, 0x47, 0xb2, 0xf8, 0x94, 0x4b, 0xb4, 0x69, 0x91, 0x36, 0x34, 0xf2, - 0x18, 0x71, 0xf3, 0x82, 0x59, 0xcd, 0x14, 0x4c, 0xfb, 0x2f, 0x16, 0xdc, 0x78, 0x1e, 0xb9, 0x2c, - 0x30, 0x9e, 0x39, 0x34, 0xca, 0x7d, 0x00, 0xa5, 0x33, 0x3e, 0x13, 0x68, 0x8a, 0xfa, 0xce, 0x83, - 0xb9, 0x17, 0x96, 0x10, 0x6f, 0xef, 0xf1, 0x19, 0x45, 0x72, 0xf2, 0x18, 0x1a, 0x63, 0xe5, 0x26, - 0xa6, 0xdd, 0x84, 0x96, 0xa8, 0xef, 0xdc, 0x5e, 0xee, 0x44, 0x9a, 0xa3, 0x55, 0x37, 0x9c, 0x30, - 0x21, 0x5e, 0x45, 0xb1, 0x67, 0xa2, 0x36, 0x85, 0x37, 0xbe, 0x03, 0xc5, 0x3d, 0x3e, 0x5b, 0x9a, - 0x0b, 0x04, 0x4a, 0xaa, 0x89, 0xe0, 0xab, 0x1a, 0x14, 0xcf, 0xf6, 0xaf, 0x2d, 0xb8, 0x95, 0x53, - 0x94, 0xf3, 0xf8, 0x29, 0x0f, 0x82, 0x48, 0xf9, 0x6e, 0xc2, 0x39, 0xc6, 0xae, 0x85, 0x0c, 0x65, - 0x05, 0xee, 0x7a, 0xd8, 0x9e, 0xf8, 0xb9, 0xef, 0x72, 0x27, 0xe3, 0x42, 0xd0, 0xa8, 0x81, 0x7a, - 0xcf, 0x9c, 0x40, 0xce, 0x26, 0xdc, 0x68, 0x68, 0x08, 0x8e, 0x67, 0x13, 0x4c, 0x4a, 0xe1, 0x9f, - 0x86, 0x4c, 0x4e, 0x63, 0x8e, 0x3e, 0x6d, 0xd0, 0x39, 0xc2, 0xfe, 0xc6, 0x82, 0x96, 0xd2, 0x26, - 0xdb, 0x70, 0x56, 0x34, 0xb1, 0x77, 0x61, 0xdd, 0xcf, 0x50, 0x39, 0x69, 0x47, 0x6b, 0x66, 0xd1, - 0x39, 0x9d, 0x57, 0xa8, 0x94, 0xd8, 0xab, 0x94, 0x0f, 0xc8, 0x73, 0x1e, 0x0b, 0x3f, 0x0a, 0x31, - 0xc2, 0xd6, 0x68, 0x02, 0xda, 0xff, 0xb0, 0xe0, 0xce, 0x8a, 0x9e, 0x78, 0xc5, 0x76, 0xfb, 0x16, - 0xac, 0x99, 0xc2, 0xee, 0x60, 0x46, 0x1a, 0x95, 0x1a, 0x06, 0xa9, 0xd3, 0xe7, 0x2e, 0x54, 0x79, - 0x28, 0x9c, 0x8c, 0x62, 0x15, 0x1e, 0x0a, 0xb4, 0xf1, 0x03, 0x68, 0x04, 0x4c, 0x48, 0x67, 0x3a, - 0xf1, 0x98, 0xe4, 0xba, 0xbc, 0x94, 0x68, 0x5d, 0xe1, 0x86, 0x1a, 0xa5, 0xee, 0x2c, 0x66, 0x42, - 0xf2, 0xb1, 0x23, 0xd9, 0xa9, 0xea, 0x7e, 0x45, 0x75, 0x67, 0x8d, 0x3a, 0x66, 0xa7, 0x82, 0xbc, - 0x03, 0xcd, 0x40, 0xb9, 0xde, 0x09, 0x7d, 0xf7, 0x0c, 0x5f, 0xa2, 0x2b, 0xcc, 0x1a, 0x62, 0x07, - 0x06, 0x69, 0xff, 0xb2, 0x0c, 0x77, 0x57, 0x0e, 0x00, 0xe4, 0xbb, 0x70, 0x33, 0xab, 0x88, 0x83, - 0xbc, 0xc1, 0xcc, 0xdc, 0x9e, 0x64, 0x14, 0x7a, 0xae, 0x9f, 0xfc, 0x0f, 0x9b, 0x42, 0xf9, 0x96, - 0x79, 0x1e, 0xf7, 0xb0, 0x4e, 0x56, 0xa9, 0x06, 0x54, 0x9c, 0x9c, 0x28, 0x27, 0x73, 0x0f, 0x3b, - 0x6b, 0x95, 0x26, 0xa0, 0xa2, 0x1f, 0x4f, 0x95, 0x4e, 0x75, 0x4d, 0x8f, 0x80, 0xa2, 0x8f, 0xf9, - 0x38, 0x3a, 0xe7, 0x1e, 0x76, 0xc0, 0x2a, 0x4d, 0x40, 0xb2, 0x05, 0x8d, 0x11, 0x13, 0x0e, 0x8a, - 0x75, 0xa6, 0xa2, 0xbd, 0x86, 0x8f, 0x61, 0xc4, 0x44, 0x47, 0xa1, 0x86, 0x58, 0xb7, 0xcf, 0x79, - 0xec, 0xbf, 0x4c, 0x26, 0x4c, 0x21, 0x99, 0x9c, 0x8a, 0x76, 0x13, 0xcb, 0x18, 0xc9, 0x3e, 0x3a, - 0xc2, 0x27, 0x38, 0x2b, 0xc6, 0x53, 0x21, 0x13, 0xca, 0x75, 0xa4, 0xac, 0x23, 0xce, 0x90, 0x7c, - 0x0a, 0xf7, 0xcc, 0x00, 0xe5, 0xc4, 0xfc, 0xe7, 0x53, 0x2e, 0xa4, 0xf6, 0x22, 0xb2, 0xf0, 0x76, - 0x0b, 0x39, 0xda, 0x86, 0x84, 0x6a, 0x0a, 0x74, 0xa6, 0xe2, 0xe7, 0xab, 0xd9, 0x75, 0x1a, 0x5c, - 0x5f, 0xc9, 0xde, 0xc5, 0xcc, 0xf8, 0x0c, 0x36, 0x17, 0xd9, 0x95, 0x39, 0x24, 0x37, 0xaf, 0x27, - 0xc8, 0x7f, 0x37, 0xcf, 0x4f, 0x91, 0x42, 0xbf, 0x7f, 0xb5, 0x00, 0xad, 0xc0, 0x8d, 0xd5, 0x02, - 0xb4, 0x06, 0x0f, 0xa0, 0xe1, 0xf9, 0x62, 0x12, 0xb0, 0x99, 0x8e, 0xaf, 0x9b, 0xe8, 0xfa, 0xba, - 0xc1, 0xa9, 0x18, 0xb3, 0x5f, 0x5d, 0xcc, 0xf7, 0x64, 0xea, 0x58, 0x9e, 0xef, 0x17, 0x82, 0xba, - 0xb0, 0x24, 0xa8, 0x17, 0x23, 0xb7, 0x78, 0x21, 0x72, 0xed, 0x27, 0xb0, 0xb1, 0xf8, 0xe2, 0xc3, - 0xe9, 0x49, 0xe0, 0xbb, 0xdd, 0x11, 0xbb, 0x62, 0xad, 0xb1, 0xbf, 0x2d, 0xc2, 0x5a, 0x6e, 0xfa, - 0xfe, 0x8f, 0x7c, 0x0d, 0x4c, 0xcc, 0xfb, 0x50, 0x9f, 0xc4, 0xfe, 0x39, 0x93, 0xdc, 0x39, 0xe3, - 0x33, 0xd3, 0x94, 0xc1, 0xa0, 0x54, 0x93, 0xd9, 0x52, 0x55, 0x55, 0xb8, 0xb1, 0x3f, 0x51, 0x7a, - 0x99, 0x4a, 0x9e, 0x45, 0xa9, 0x1e, 0xfd, 0xb3, 0xc8, 0x0f, 0x4d, 0x56, 0x56, 0xa9, 0x81, 0x54, - 0x07, 0xd3, 0xb1, 0xca, 0x3d, 0xec, 0xd1, 0x55, 0x9a, 0xc2, 0xf3, 0xa4, 0xa9, 0x64, 0x93, 0xe6, - 0x00, 0x5a, 0xc6, 0xbb, 0xc2, 0x91, 0x91, 0xa3, 0xe4, 0x98, 0xc1, 0xe7, 0x9d, 0x55, 0x3b, 0x86, - 0x21, 0x3f, 0x8e, 0x9e, 0x45, 0x7e, 0x48, 0x9b, 0x71, 0x0e, 0x26, 0x1f, 0x43, 0x35, 0x99, 0x6c, - 0xcd, 0x24, 0x7d, 0x7f, 0x85, 0x20, 0x33, 0x52, 0x0b, 0x9a, 0x32, 0xa8, 0x0e, 0xc6, 0x43, 0x37, - 0x9e, 0x4d, 0x64, 0x9a, 0xf4, 0x73, 0x04, 0xf6, 0xb7, 0x09, 0x77, 0x25, 0x9b, 0xa7, 0xfe, 0x1c, - 0xa1, 0x9a, 0x96, 0x21, 0x55, 0x09, 0x8c, 0xb3, 0x43, 0x03, 0x2d, 0xd7, 0x9c, 0xa3, 0xf7, 0xf8, - 0x4c, 0xd8, 0xbf, 0x2a, 0xc2, 0xbd, 0x4b, 0x6e, 0x64, 0xfc, 0x65, 0xa5, 0xfe, 0x7a, 0x13, 0x60, - 0x82, 0xb1, 0x81, 0xee, 0xd2, 0xfe, 0xaf, 0x69, 0x8c, 0xf2, 0x56, 0xea, 0xf4, 0x62, 0xd6, 0xe9, - 0x97, 0x14, 0xd6, 0x3b, 0x50, 0x71, 0x47, 0x4c, 0x26, 0xd3, 0x6b, 0x8d, 0x96, 0x15, 0xb8, 0xeb, - 0xa9, 0xb8, 0x4d, 0xb6, 0xa3, 0x99, 0x7a, 0x5a, 0xd6, 0x8e, 0x4f, 0x71, 0xbb, 0xe8, 0x44, 0x9d, - 0xbe, 0x15, 0xfd, 0x32, 0x04, 0xc8, 0x19, 0x90, 0x98, 0x9f, 0x73, 0x16, 0x70, 0x4f, 0x15, 0xb9, - 0x98, 0x0b, 0x91, 0xce, 0xaf, 0x9f, 0x5c, 0xc9, 0x8d, 0xdb, 0xd4, 0xf0, 0x77, 0x12, 0xf6, 0x7e, - 0x28, 0xe3, 0x19, 0xbd, 0x1e, 0x2f, 0xe2, 0x37, 0x7a, 0x70, 0x7b, 0x39, 0x31, 0x69, 0x41, 0x51, - 0x59, 0x48, 0xcf, 0x46, 0xea, 0xa8, 0xd4, 0x3d, 0x67, 0xc1, 0x94, 0x9b, 0xe8, 0xd7, 0xc0, 0xe3, - 0xc2, 0x47, 0x96, 0xfd, 0x9b, 0x02, 0xb4, 0x16, 0x33, 0x90, 0x7c, 0x9a, 0x59, 0x96, 0x2f, 0xcc, - 0x7d, 0x2b, 0x7a, 0x65, 0x66, 0x55, 0xfe, 0x1c, 0x1a, 0xc6, 0x51, 0xca, 0xa0, 0xa2, 0x5d, 0x58, - 0x1c, 0xe0, 0x57, 0xa7, 0x3c, 0xad, 0x4f, 0xd2, 0xb3, 0x20, 0x1f, 0x43, 0x25, 0x99, 0x1f, 0x8b, - 0x18, 0xc2, 0x97, 0xa8, 0x91, 0x8c, 0x92, 0x09, 0xc7, 0x7f, 0xb1, 0xb0, 0xdb, 0x1f, 0xc2, 0x3a, - 0x3e, 0x55, 0x0a, 0x99, 0xd6, 0x75, 0xb5, 0x52, 0xf4, 0x09, 0xdc, 0x4c, 0x18, 0xf7, 0xf5, 0x27, - 0x11, 0x41, 0x39, 0xbb, 0x2a, 0xf7, 0x8f, 0xe0, 0x36, 0xee, 0x97, 0xae, 0xf4, 0xcf, 0x7d, 0x39, - 0xeb, 0xf2, 0x50, 0xf2, 0xf8, 0x12, 0xfe, 0x16, 0x14, 0x7d, 0x4f, 0x9b, 0xb7, 0x41, 0xd5, 0xd1, - 0xee, 0xe9, 0x72, 0x9a, 0x97, 0xd0, 0x71, 0x5d, 0x8e, 0x79, 0x7b, 0x55, 0x29, 0x7d, 0x9d, 0x97, - 0x79, 0x29, 0x3d, 0x5f, 0x8c, 0x7d, 0x21, 0x5e, 0x43, 0xcc, 0x37, 0x16, 0x34, 0x94, 0x9c, 0x27, - 0x51, 0x74, 0x36, 0x66, 0xf1, 0xd9, 0x6a, 0xc6, 0x69, 0x1c, 0x18, 0x33, 0xa8, 0x63, 0x3a, 0xac, - 0x16, 0x33, 0xc3, 0xea, 0x3d, 0xa8, 0x61, 0xa3, 0x71, 0x14, 0xad, 0x4e, 0xe4, 0x2a, 0x22, 0x86, - 0x71, 0x90, 0x9d, 0x38, 0xae, 0xe5, 0x27, 0x8e, 0x37, 0x01, 0x3c, 0x1e, 0x70, 0x35, 0xb9, 0x31, - 0x89, 0x89, 0x5c, 0xa2, 0x35, 0x83, 0xe9, 0x48, 0xfb, 0x99, 0x0e, 0xfe, 0x6e, 0xc0, 0x59, 0xfc, - 0xd4, 0x17, 0x32, 0x8a, 0x67, 0xd9, 0xb2, 0x60, 0xe5, 0xca, 0xc2, 0x9b, 0x00, 0xae, 0x22, 0xd4, - 0xb2, 0x0a, 0x5a, 0x96, 0xc1, 0x74, 0xa4, 0xfd, 0x67, 0x0b, 0x88, 0x12, 0x66, 0xbe, 0x90, 0x1c, - 0xfa, 0xae, 0x1a, 0xf7, 0x97, 0x6e, 0x2a, 0x99, 0x55, 0xb0, 0xb0, 0x62, 0x15, 0x2c, 0xe2, 0x44, - 0x7e, 0x61, 0x15, 0x2c, 0x21, 0x3a, 0x59, 0x05, 0xef, 0x41, 0x0d, 0x5b, 0x30, 0xee, 0x82, 0x7a, - 0x86, 0xc7, 0x5d, 0xf0, 0x68, 0xe9, 0x2e, 0x58, 0x46, 0x82, 0x15, 0xbb, 0x60, 0x25, 0xbb, 0x0b, - 0x8e, 0xe0, 0xc6, 0xc5, 0x9b, 0x88, 0xd5, 0xeb, 0xee, 0x47, 0x50, 0x9d, 0x18, 0x22, 0x93, 0xec, - 0x9b, 0xf9, 0x3c, 0xcb, 0x4b, 0xa2, 0x29, 0xb5, 0xfd, 0x87, 0x02, 0x5c, 0x57, 0x04, 0x5f, 0xb0, - 0x20, 0xe0, 0xf2, 0xf2, 0x99, 0xa3, 0x0d, 0x15, 0x53, 0x54, 0x13, 0xab, 0x19, 0x50, 0xd9, 0xe7, - 0x15, 0x0a, 0x40, 0xb3, 0x55, 0xa9, 0x81, 0x94, 0xed, 0x95, 0xef, 0xd0, 0x6a, 0x55, 0x8a, 0x67, - 0x85, 0xc3, 0x1d, 0x49, 0x97, 0x7c, 0x3c, 0x2b, 0xc9, 0xca, 0xf7, 0x6a, 0x8e, 0xd1, 0x5f, 0x29, - 0x12, 0x50, 0x51, 0x4f, 0x98, 0x1c, 0x99, 0x71, 0x19, 0xcf, 0xaa, 0xfd, 0xa5, 0x5d, 0x07, 0x77, - 0xe8, 0x46, 0xb6, 0x0d, 0x25, 0xfe, 0xae, 0x65, 0xfc, 0xad, 0xee, 0x83, 0xdf, 0x1f, 0x00, 0x91, - 0x1a, 0x40, 0xaf, 0xfa, 0x9e, 0xc7, 0x43, 0xd3, 0x43, 0x0d, 0xb4, 0x7a, 0x7e, 0xb6, 0xf7, 0x75, - 0x84, 0xe5, 0x8c, 0x25, 0xc8, 0x87, 0x50, 0x35, 0x35, 0x2f, 0xa9, 0xd6, 0xf7, 0xf2, 0xd6, 0xcf, - 0xd1, 0xd3, 0x94, 0xd8, 0xfe, 0x97, 0xa5, 0xc3, 0xff, 0x88, 0x9d, 0xa7, 0x3d, 0x24, 0x6b, 0x65, - 0x2b, 0x6f, 0xe5, 0x65, 0x1f, 0x35, 0x36, 0xa1, 0xf6, 0x92, 0x9d, 0x47, 0xd3, 0xd8, 0x97, 0xdc, - 0x18, 0x7f, 0x8e, 0xb8, 0x24, 0x2f, 0x1f, 0x40, 0x43, 0x4f, 0x85, 0x4e, 0x36, 0xfc, 0xea, 0x1a, - 0xa7, 0xc7, 0xd6, 0xff, 0x87, 0xeb, 0xee, 0x88, 0xf9, 0xa1, 0x23, 0x46, 0x51, 0x2c, 0xb1, 0x83, - 0xeb, 0x6f, 0x8b, 0x35, 0xba, 0x8e, 0x0f, 0x8e, 0x14, 0x5e, 0x75, 0x72, 0xa1, 0x6a, 0x08, 0x0f, - 0x85, 0xb1, 0xb9, 0x3a, 0xaa, 0x58, 0xf5, 0x85, 0x23, 0xb9, 0x90, 0x66, 0x7e, 0x29, 0xfb, 0xe2, - 0x98, 0x0b, 0xf9, 0xac, 0x54, 0x2d, 0xb5, 0xae, 0xd9, 0xbf, 0xb5, 0xe0, 0xd6, 0xd2, 0x21, 0x68, - 0x45, 0xec, 0x2d, 0x8e, 0x04, 0xda, 0x06, 0xb9, 0x91, 0xa0, 0x0f, 0xf7, 0x47, 0xba, 0x84, 0x38, - 0x2c, 0x76, 0x47, 0xfe, 0x39, 0x77, 0xc4, 0x74, 0x32, 0x51, 0xba, 0xf3, 0x90, 0x9d, 0x04, 0x66, - 0x00, 0xae, 0xd2, 0x4d, 0x43, 0xd6, 0xd1, 0x54, 0x47, 0x9a, 0xa8, 0xaf, 0x69, 0xec, 0x3f, 0x5a, - 0xba, 0xf9, 0x1c, 0xab, 0x0d, 0x46, 0xed, 0x44, 0x3c, 0xbe, 0xe2, 0xce, 0xfd, 0x29, 0x94, 0xcd, - 0x12, 0xa4, 0xde, 0xd3, 0x5c, 0x1c, 0x1c, 0x33, 0x02, 0xb7, 0x8f, 0xe7, 0xeb, 0x11, 0x35, 0x4c, - 0xf6, 0x63, 0xa8, 0x67, 0xd0, 0xa4, 0x0e, 0x95, 0xe1, 0x60, 0x6f, 0x70, 0xf0, 0xc5, 0xa0, 0xf5, - 0x86, 0x02, 0x8e, 0xe9, 0xf0, 0xe8, 0xb8, 0xdf, 0x6b, 0x59, 0xe4, 0x3a, 0xac, 0x0d, 0x07, 0x08, - 0x7e, 0x71, 0x40, 0x8f, 0x9f, 0x7e, 0xd9, 0x2a, 0xd8, 0xdf, 0x14, 0xf5, 0x02, 0xf1, 0x22, 0xb3, - 0xa0, 0x99, 0xc1, 0x66, 0x85, 0xf2, 0x04, 0x4a, 0x2f, 0xe3, 0x68, 0x9c, 0x04, 0x93, 0x3a, 0xab, - 0x0b, 0xc9, 0xc8, 0x54, 0xfd, 0x82, 0x8c, 0x54, 0x70, 0xb9, 0x23, 0x15, 0xbb, 0xe1, 0x69, 0x32, - 0xbc, 0xcd, 0x11, 0xca, 0x25, 0x66, 0xe4, 0xd5, 0x05, 0xd9, 0xec, 0xc5, 0x29, 0xae, 0x83, 0x1f, - 0x92, 0x62, 0x2e, 0x26, 0x51, 0x28, 0x92, 0xc4, 0x4e, 0x61, 0x55, 0xcd, 0x63, 0x3e, 0x09, 0x7c, - 0xcd, 0xac, 0xe3, 0xaf, 0x66, 0x30, 0x1d, 0x49, 0xf8, 0xf2, 0x45, 0xb4, 0x8a, 0x96, 0xfd, 0x7e, - 0xde, 0xb2, 0x4b, 0x6e, 0xbd, 0xfd, 0xe2, 0xc2, 0xaa, 0xba, 0x74, 0x7d, 0xd5, 0x3e, 0xac, 0xa5, - 0x23, 0xc0, 0x4f, 0x80, 0x5c, 0xe4, 0xbc, 0xe0, 0x8b, 0xc3, 0xfe, 0xa0, 0xb7, 0x3b, 0xf8, 0xbc, - 0x65, 0x91, 0x06, 0x54, 0x3b, 0xdd, 0x6e, 0xff, 0x50, 0x79, 0xa6, 0xa0, 0xa0, 0x5e, 0xbf, 0xfb, - 0x7c, 0x77, 0xd0, 0xef, 0xb5, 0x8a, 0x0a, 0xea, 0x76, 0x06, 0xdd, 0xfe, 0xf3, 0x7e, 0xaf, 0x55, - 0xb2, 0xff, 0x66, 0xe9, 0xd9, 0xa0, 0x9b, 0xdb, 0x13, 0x7b, 0xdc, 0xf5, 0xc5, 0xea, 0x0f, 0x50, - 0x9b, 0x50, 0x33, 0xf6, 0xdc, 0x4d, 0x22, 0x6d, 0x8e, 0x20, 0x3f, 0x85, 0x75, 0xcf, 0xf0, 0x3b, - 0xb9, 0xc8, 0x7b, 0x7f, 0x71, 0xca, 0x5a, 0xf6, 0xca, 0xed, 0xe4, 0x60, 0xcc, 0xd3, 0xf4, 0x72, - 0xb0, 0xfd, 0x1e, 0x34, 0xf3, 0x14, 0xb9, 0xcb, 0xbe, 0x91, 0xbb, 0xac, 0x65, 0x7f, 0x6b, 0xc1, - 0xfa, 0xc2, 0x7f, 0x14, 0xab, 0xfb, 0xd5, 0xe2, 0x46, 0x5c, 0xb8, 0xb0, 0x11, 0x93, 0xf7, 0x80, - 0x64, 0x49, 0x9c, 0xec, 0x6a, 0xd1, 0xca, 0x10, 0xea, 0x5a, 0x95, 0x6d, 0x80, 0xa5, 0xd7, 0x6a, - 0x80, 0x02, 0x80, 0xb2, 0x57, 0x66, 0x58, 0xcc, 0x0e, 0x06, 0x56, 0x7e, 0x30, 0xd8, 0x83, 0xba, - 0xf9, 0x93, 0xed, 0x58, 0x75, 0xaf, 0x02, 0xda, 0xf9, 0xff, 0xe6, 0x2f, 0xe9, 0xcc, 0xff, 0x96, - 0xdb, 0x37, 0xff, 0xca, 0x19, 0xa1, 0xdb, 0x8a, 0x81, 0x66, 0xb9, 0xed, 0xdf, 0x5b, 0xd0, 0x54, - 0x5a, 0x65, 0xde, 0xfc, 0x03, 0xa8, 0xc7, 0x29, 0x94, 0xf4, 0x91, 0x9b, 0x73, 0xf9, 0x73, 0x52, - 0x9a, 0x25, 0x24, 0x3b, 0x70, 0x53, 0x4c, 0x4f, 0x92, 0x5e, 0xf4, 0x4c, 0x44, 0xe1, 0x93, 0x99, - 0xe4, 0x49, 0x87, 0x5e, 0xfa, 0x8c, 0xbc, 0x07, 0xd7, 0x93, 0x4d, 0x73, 0xce, 0xa0, 0xd7, 0xef, - 0x8b, 0x0f, 0xec, 0xdf, 0x59, 0x50, 0x57, 0xca, 0x9a, 0xff, 0x5c, 0x70, 0x5e, 0x4c, 0x3d, 0xaa, - 0x8e, 0x4b, 0x1b, 0xd3, 0x6d, 0x28, 0x9b, 0x6f, 0x56, 0x66, 0x24, 0x30, 0x9f, 0xac, 0x32, 0x31, - 0x51, 0xca, 0xc5, 0xc4, 0x26, 0xd4, 0xe6, 0x2b, 0xdb, 0x35, 0x9c, 0x62, 0xe7, 0x88, 0x79, 0x7a, - 0x94, 0xb3, 0x73, 0xd2, 0x9f, 0xcc, 0xf4, 0x62, 0x54, 0x53, 0x03, 0x73, 0x14, 0x92, 0xc7, 0x50, - 0x66, 0x78, 0x42, 0x1d, 0x9b, 0x3b, 0x76, 0x3e, 0x14, 0x72, 0xc4, 0xdb, 0xfa, 0x87, 0x1a, 0x0e, - 0xf2, 0x36, 0xac, 0x45, 0x81, 0x67, 0x48, 0x86, 0x69, 0x79, 0xcf, 0x23, 0xc9, 0x23, 0xbc, 0x84, - 0x82, 0xcc, 0x5e, 0x74, 0x6b, 0xe9, 0x2b, 0x68, 0x42, 0xa5, 0xda, 0x5d, 0xd9, 0x68, 0x77, 0x1d, - 0xd6, 0xf6, 0xfa, 0x5f, 0x76, 0x3b, 0xb4, 0xe7, 0x74, 0x7a, 0x3d, 0xcc, 0x24, 0x02, 0xcd, 0x4e, - 0xb7, 0x7b, 0x30, 0x1c, 0x1c, 0x1f, 0x19, 0x9c, 0x45, 0x6e, 0xc0, 0x7a, 0x42, 0xd6, 0xeb, 0x3f, - 0xef, 0xeb, 0xfa, 0x72, 0x13, 0x5a, 0x29, 0x21, 0xed, 0xef, 0x1f, 0xbc, 0xc0, 0x3a, 0x03, 0x50, - 0x7e, 0x7e, 0xd0, 0xdd, 0x53, 0x55, 0x46, 0x25, 0xe5, 0x70, 0x60, 0xa0, 0x6b, 0x64, 0x1d, 0xea, - 0xc3, 0xdd, 0x9e, 0x33, 0x3c, 0xec, 0x75, 0x94, 0x80, 0x32, 0x69, 0x41, 0x63, 0xd0, 0xd9, 0xef, - 0x3b, 0xdd, 0xa7, 0x9d, 0xc1, 0xe7, 0xfd, 0x5e, 0xab, 0x62, 0x7f, 0xa5, 0xbb, 0x5d, 0xe6, 0x3f, - 0x35, 0xf2, 0xbd, 0xcc, 0x1f, 0x70, 0x3a, 0x0e, 0x57, 0x5c, 0x6f, 0xfe, 0xe7, 0x5b, 0xea, 0x9e, - 0x42, 0xc6, 0x3d, 0x4f, 0xd6, 0xbe, 0xaa, 0x6f, 0x3f, 0xfa, 0x38, 0x61, 0x3d, 0x29, 0xe3, 0xe9, - 0xfd, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xb1, 0x97, 0x4f, 0xb0, 0xf1, 0x1e, 0x00, 0x00, + 0x18, 0xe7, 0x35, 0x8a, 0x67, 0x72, 0x0f, 0x6a, 0xd2, 0x1f, 0x73, 0x21, 0xd9, 0x78, 0x82, 0xd1, + 0x5e, 0xa4, 0x73, 0x84, 0x7a, 0xea, 0x7b, 0x3c, 0x94, 0xbe, 0x1b, 0x85, 0xed, 0x22, 0xb2, 0xcd, + 0x11, 0xe4, 0x33, 0x00, 0x37, 0x0a, 0xa2, 0xd8, 0x19, 0x31, 0x31, 0x32, 0x01, 0xbd, 0x35, 0x57, + 0x36, 0xfb, 0xee, 0xed, 0xae, 0x22, 0x7c, 0xca, 0xc4, 0x88, 0xd6, 0xdc, 0xe4, 0x48, 0xee, 0xa8, + 0x9c, 0x52, 0x02, 0x7c, 0x0f, 0x03, 0xba, 0x48, 0x2b, 0x08, 0xef, 0x7a, 0xe4, 0xdd, 0xd4, 0x1a, + 0x8e, 0x29, 0x2f, 0x18, 0x9e, 0x35, 0xda, 0x34, 0xe8, 0x43, 0x8d, 0x25, 0xb7, 0xa1, 0x72, 0xc6, + 0x67, 0xce, 0xd4, 0xf7, 0x30, 0xe6, 0x6a, 0xb4, 0x7c, 0xc6, 0x67, 0x43, 0xdf, 0x23, 0x9f, 0x40, + 0xd9, 0x1f, 0xb3, 0x53, 0xae, 0xe2, 0x49, 0x69, 0xf6, 0xf6, 0x0a, 0xcd, 0x76, 0xf1, 0x3e, 0x72, + 0xb6, 0xab, 0x88, 0xa9, 0xe1, 0x21, 0x8f, 0xe0, 0xba, 0x3b, 0x15, 0x32, 0x1a, 0xfb, 0x5f, 0xeb, + 0x52, 0x85, 0x8a, 0x61, 0x48, 0xd5, 0x28, 0xc9, 0x3d, 0xc2, 0xab, 0x6d, 0x3e, 0x80, 0x5a, 0x7a, + 0x47, 0x55, 0x52, 0xfc, 0xd0, 0xe3, 0xbf, 0x68, 0x5b, 0x5b, 0xc5, 0x87, 0x45, 0xaa, 0x81, 0xcd, + 0xbf, 0x5a, 0xb0, 0x9e, 0x7b, 0x5b, 0x56, 0x79, 0x2b, 0xa7, 0x7c, 0xe2, 0xaa, 0x42, 0xc6, 0x55, + 0x6d, 0xa8, 0x4c, 0xd8, 0x2c, 0x88, 0x98, 0x87, 0xae, 0x68, 0xd0, 0x04, 0x54, 0xaf, 0x7b, 0xe5, + 0x7b, 0x52, 0xf9, 0x40, 0x19, 0x51, 0x03, 0xe4, 0x16, 0x94, 0x47, 0xdc, 0x3f, 0x1d, 0x49, 0x63, + 0x5b, 0x03, 0x91, 0x4d, 0xa8, 0xaa, 0x84, 0x11, 0xfe, 0xd7, 0x1c, 0x6d, 0x5a, 0xa4, 0x29, 0x4c, + 0xde, 0x82, 0xf5, 0x18, 0x4f, 0x8e, 0x64, 0xf1, 0x29, 0x97, 0x68, 0xd3, 0x22, 0x6d, 0x68, 0xe4, + 0x31, 0xe2, 0xe6, 0x05, 0xb3, 0x9a, 0x29, 0x98, 0xf6, 0x5f, 0x2c, 0xb8, 0xfe, 0x3c, 0x72, 0x59, + 0x60, 0x3c, 0x73, 0x68, 0x94, 0xfb, 0x00, 0x4a, 0x67, 0x7c, 0x26, 0xd0, 0x14, 0xf5, 0x9d, 0x07, + 0x73, 0x2f, 0x2c, 0x21, 0xde, 0xde, 0xe3, 0x33, 0x8a, 0xe4, 0xe4, 0x31, 0x34, 0xc6, 0xca, 0x4d, + 0x4c, 0xbb, 0x09, 0x2d, 0x51, 0xdf, 0xb9, 0xb5, 0xdc, 0x89, 0x34, 0x47, 0xab, 0x6e, 0x38, 0x61, + 0x42, 0xbc, 0x8a, 0x62, 0xcf, 0x44, 0x6d, 0x0a, 0x6f, 0x7e, 0x07, 0x8a, 0x7b, 0x7c, 0xb6, 0x34, + 0x17, 0x08, 0x94, 0x54, 0x13, 0xc1, 0x57, 0x35, 0x28, 0x9e, 0xed, 0x3f, 0x5a, 0x70, 0x33, 0xa7, + 0x28, 0xe7, 0xf1, 0x53, 0x1e, 0x04, 0x91, 0x8a, 0x50, 0x13, 0x99, 0xce, 0x39, 0x8f, 0x85, 0x1f, + 0x85, 0x28, 0x6c, 0x8d, 0x36, 0x0d, 0xfa, 0x85, 0xc6, 0x2a, 0x27, 0x4f, 0x38, 0xc7, 0x20, 0xd7, + 0x92, 0xcb, 0x0a, 0xdc, 0xf5, 0xb0, 0x8f, 0xf1, 0x73, 0xdf, 0xe5, 0x0e, 0xaa, 0xa2, 0x35, 0x05, + 0x8d, 0x1a, 0x28, 0x85, 0xe6, 0x04, 0x72, 0x36, 0xe1, 0xe8, 0xdd, 0x94, 0xe0, 0x78, 0x36, 0xc1, + 0xec, 0x15, 0xfe, 0x69, 0xc8, 0xe4, 0x34, 0xe6, 0xe8, 0xe5, 0x06, 0x9d, 0x23, 0xec, 0x6f, 0x2c, + 0x68, 0x29, 0xb5, 0xb3, 0x9d, 0x69, 0x45, 0xb7, 0x7b, 0x17, 0x36, 0xfc, 0x0c, 0x95, 0x93, 0xb6, + 0xbe, 0x66, 0x16, 0x9d, 0xd3, 0x19, 0x55, 0x2a, 0x5e, 0x50, 0x29, 0x31, 0x6c, 0x29, 0x1f, 0xb9, + 0x89, 0x89, 0xd6, 0xb0, 0x15, 0x27, 0xa0, 0xfd, 0x0f, 0x0b, 0x6e, 0xaf, 0x68, 0x9e, 0x57, 0xec, + 0xcb, 0x6f, 0xc1, 0xba, 0xe9, 0x00, 0x0e, 0xa6, 0xae, 0x51, 0xa9, 0x61, 0x90, 0x3a, 0xcf, 0xee, + 0x40, 0x95, 0x87, 0xc2, 0xc9, 0x28, 0x56, 0xe1, 0xa1, 0x40, 0x1b, 0x3f, 0x80, 0x46, 0xc0, 0x84, + 0x74, 0xa6, 0x13, 0x8f, 0x49, 0xae, 0xeb, 0x50, 0x89, 0xd6, 0x15, 0x6e, 0xa8, 0x51, 0xea, 0xce, + 0x62, 0x26, 0x24, 0x1f, 0x3b, 0x92, 0x9d, 0xaa, 0x36, 0x59, 0x54, 0x77, 0xd6, 0xa8, 0x63, 0x76, + 0x2a, 0xc8, 0x3b, 0xd0, 0x0c, 0x54, 0x8c, 0x38, 0xa1, 0xef, 0x9e, 0xe1, 0x4b, 0x74, 0x29, 0x5a, + 0x47, 0xec, 0xc0, 0x20, 0xed, 0x5f, 0x96, 0xe1, 0xce, 0xca, 0x49, 0x81, 0x7c, 0x17, 0x6e, 0x64, + 0x15, 0x71, 0x90, 0x37, 0x98, 0x99, 0xdb, 0x93, 0x8c, 0x42, 0xcf, 0xf5, 0x93, 0xff, 0x61, 0x53, + 0x28, 0xdf, 0x32, 0xcf, 0xe3, 0x1e, 0x16, 0xd4, 0x2a, 0xd5, 0x80, 0x8a, 0x93, 0x13, 0xe5, 0x64, + 0xee, 0x61, 0x0b, 0xae, 0xd2, 0x04, 0x54, 0xf4, 0xe3, 0xa9, 0xd2, 0xa9, 0xae, 0xe9, 0x11, 0x50, + 0xf4, 0x31, 0x1f, 0x47, 0xe7, 0xdc, 0xc3, 0x56, 0x59, 0xa5, 0x09, 0x48, 0xb6, 0xa0, 0x31, 0x62, + 0xc2, 0x41, 0xb1, 0xce, 0x54, 0xb4, 0xd7, 0xf1, 0x31, 0x8c, 0x98, 0xe8, 0x28, 0xd4, 0x10, 0x0b, + 0xfc, 0x39, 0x8f, 0xfd, 0x97, 0xc9, 0x28, 0x2a, 0x24, 0x93, 0x53, 0xd1, 0x6e, 0x62, 0xbd, 0x23, + 0xd9, 0x47, 0x47, 0xf8, 0x04, 0x87, 0xca, 0x78, 0x2a, 0x64, 0x42, 0xb9, 0x81, 0x94, 0x75, 0xc4, + 0x19, 0x92, 0x4f, 0xe1, 0xae, 0x99, 0xb4, 0x9c, 0x98, 0xff, 0x7c, 0xca, 0x85, 0xd4, 0x5e, 0x44, + 0x16, 0xde, 0x6e, 0x21, 0x47, 0xdb, 0x90, 0x50, 0x4d, 0x81, 0xce, 0x54, 0xfc, 0x7c, 0x35, 0xbb, + 0x4e, 0x83, 0x6b, 0x2b, 0xd9, 0xbb, 0x98, 0x19, 0x9f, 0xc1, 0xbd, 0x45, 0x76, 0x65, 0x0e, 0xc9, + 0xcd, 0xeb, 0x09, 0xf2, 0xdf, 0xc9, 0xf3, 0x53, 0xa4, 0xd0, 0xef, 0x5f, 0x2d, 0x40, 0x2b, 0x70, + 0x7d, 0xb5, 0x00, 0xad, 0xc1, 0x03, 0x68, 0x78, 0xbe, 0x98, 0x04, 0x6c, 0xa6, 0xe3, 0xeb, 0x06, + 0xba, 0xbe, 0x6e, 0x70, 0x2a, 0xc6, 0xec, 0x57, 0x17, 0xf3, 0x3d, 0x19, 0x4f, 0x96, 0xe7, 0xfb, + 0x85, 0xa0, 0x2e, 0x2c, 0x09, 0xea, 0xc5, 0xc8, 0x2d, 0x5e, 0x88, 0x5c, 0xfb, 0x09, 0x6c, 0x2e, + 0xbe, 0xf8, 0x70, 0x7a, 0x12, 0xf8, 0x6e, 0x77, 0xc4, 0xae, 0x58, 0x6b, 0xec, 0x6f, 0x8b, 0xb0, + 0x9e, 0x1b, 0xd3, 0xff, 0x23, 0x5f, 0x03, 0x13, 0xf3, 0x3e, 0xd4, 0x27, 0xb1, 0x7f, 0xce, 0x24, + 0x77, 0xce, 0xf8, 0xcc, 0x74, 0x6f, 0x30, 0x28, 0xd5, 0x8d, 0xb6, 0x54, 0x55, 0x15, 0x6e, 0xec, + 0x4f, 0x94, 0x5e, 0x98, 0x97, 0x0d, 0x9a, 0x45, 0xa9, 0x66, 0xfe, 0xb3, 0xc8, 0x0f, 0x4d, 0x56, + 0x56, 0xa9, 0x81, 0x54, 0xab, 0xd3, 0xb1, 0xca, 0x3d, 0x6c, 0xe6, 0x55, 0x9a, 0xc2, 0xf3, 0xa4, + 0xa9, 0x64, 0x93, 0xe6, 0x00, 0x5a, 0xc6, 0xbb, 0xc2, 0x91, 0x91, 0xa3, 0xe4, 0x98, 0x09, 0xe9, + 0x9d, 0x55, 0xcb, 0x88, 0x21, 0x3f, 0x8e, 0x9e, 0x45, 0x7e, 0x48, 0x9b, 0x71, 0x0e, 0x26, 0x1f, + 0x43, 0x35, 0x19, 0x81, 0xcd, 0xc8, 0x7d, 0x7f, 0x85, 0x20, 0x33, 0x7b, 0x0b, 0x9a, 0x32, 0xa8, + 0x0e, 0xc6, 0x43, 0x37, 0x9e, 0x4d, 0x64, 0x9a, 0xf4, 0x73, 0x04, 0xf6, 0xb7, 0x09, 0x77, 0x25, + 0x9b, 0xa7, 0xfe, 0x1c, 0xa1, 0x9a, 0x96, 0x21, 0x55, 0x09, 0x8c, 0x43, 0x46, 0x03, 0x2d, 0xd7, + 0x9c, 0xa3, 0xf7, 0xf8, 0x4c, 0xd8, 0xbf, 0x2a, 0xc2, 0xdd, 0x4b, 0x6e, 0x64, 0xfc, 0x65, 0xa5, + 0xfe, 0x7a, 0x13, 0x60, 0x82, 0xb1, 0x81, 0xee, 0xd2, 0xfe, 0xaf, 0x69, 0x8c, 0xf2, 0x56, 0xea, + 0xf4, 0x62, 0xd6, 0xe9, 0x97, 0x14, 0xd6, 0xdb, 0x50, 0x71, 0x47, 0x4c, 0x26, 0x63, 0x6e, 0x8d, + 0x96, 0x15, 0xb8, 0xeb, 0xa9, 0xb8, 0x4d, 0xd6, 0xa8, 0x99, 0x7a, 0x5a, 0xd6, 0x8e, 0x4f, 0x71, + 0xbb, 0xe8, 0x44, 0x9d, 0xbe, 0x15, 0xfd, 0x32, 0x04, 0xc8, 0x19, 0x90, 0x98, 0x9f, 0x73, 0x16, + 0x70, 0x4f, 0x15, 0xb9, 0x98, 0x0b, 0x91, 0x0e, 0xba, 0x9f, 0x5c, 0xc9, 0x8d, 0xdb, 0xd4, 0xf0, + 0x77, 0x12, 0xf6, 0x7e, 0x28, 0xe3, 0x19, 0xbd, 0x16, 0x2f, 0xe2, 0x37, 0x7b, 0x70, 0x6b, 0x39, + 0x31, 0x69, 0x41, 0x51, 0x59, 0x48, 0x0f, 0x51, 0xea, 0xa8, 0xd4, 0x3d, 0x67, 0xc1, 0x94, 0x9b, + 0xe8, 0xd7, 0xc0, 0xe3, 0xc2, 0x47, 0x96, 0xfd, 0xeb, 0x02, 0xb4, 0x16, 0x33, 0x90, 0x7c, 0x9a, + 0xd9, 0xaa, 0x2f, 0x0c, 0x88, 0x2b, 0x7a, 0x65, 0x66, 0xa7, 0xfe, 0x1c, 0x1a, 0xc6, 0x51, 0xca, + 0xa0, 0xa2, 0x5d, 0x58, 0x9c, 0xf4, 0x57, 0xa7, 0x3c, 0xad, 0x4f, 0xd2, 0xb3, 0x20, 0x1f, 0x43, + 0x25, 0x19, 0x34, 0x8b, 0x18, 0xc2, 0x97, 0xa8, 0x91, 0xcc, 0x9c, 0x09, 0xc7, 0x7f, 0xb1, 0xd9, + 0xdb, 0x1f, 0xc2, 0x06, 0x3e, 0x55, 0x0a, 0x99, 0xd6, 0x75, 0xb5, 0x52, 0xf4, 0x09, 0xdc, 0x48, + 0x18, 0xf7, 0xf5, 0xb7, 0x13, 0x41, 0x39, 0xbb, 0x2a, 0xf7, 0x8f, 0xe0, 0x16, 0x2e, 0xa2, 0xae, + 0xf4, 0xcf, 0x7d, 0x39, 0xeb, 0xf2, 0x50, 0xf2, 0xf8, 0x12, 0xfe, 0x16, 0x14, 0x7d, 0x4f, 0x9b, + 0xb7, 0x41, 0xd5, 0xd1, 0xee, 0xe9, 0x72, 0x9a, 0x97, 0xd0, 0x71, 0x5d, 0x8e, 0x79, 0x7b, 0x55, + 0x29, 0x7d, 0x9d, 0x97, 0x79, 0x29, 0x3d, 0x5f, 0x8c, 0x7d, 0x21, 0x5e, 0x43, 0xcc, 0x37, 0x16, + 0x34, 0x94, 0x9c, 0x27, 0x51, 0x74, 0x36, 0x66, 0xf1, 0xd9, 0x6a, 0xc6, 0x69, 0x1c, 0x18, 0x33, + 0xa8, 0x63, 0x3a, 0xac, 0x16, 0x33, 0xc3, 0xea, 0x5d, 0xa8, 0x61, 0xa3, 0x71, 0x14, 0xad, 0x4e, + 0xe4, 0x2a, 0x22, 0x86, 0x71, 0x90, 0x9d, 0x38, 0xd6, 0xf2, 0x13, 0xc7, 0x9b, 0x00, 0x1e, 0x0f, + 0xb8, 0x9a, 0xdc, 0x98, 0xc4, 0x44, 0x2e, 0xd1, 0x9a, 0xc1, 0x74, 0xa4, 0xfd, 0x4c, 0x07, 0x7f, + 0x37, 0xe0, 0x2c, 0x7e, 0xea, 0x0b, 0x19, 0xc5, 0xb3, 0x6c, 0x59, 0xb0, 0x72, 0x65, 0xe1, 0x4d, + 0x00, 0x57, 0x11, 0x6a, 0x59, 0x05, 0x2d, 0xcb, 0x60, 0x3a, 0xd2, 0xfe, 0xb3, 0x05, 0x44, 0x09, + 0x33, 0x9f, 0x52, 0x0e, 0x7d, 0x57, 0x8d, 0xfb, 0x4b, 0x57, 0x9a, 0xcc, 0xce, 0x58, 0x58, 0xb1, + 0x33, 0x16, 0x71, 0x22, 0xbf, 0xb0, 0x33, 0x96, 0x10, 0x9d, 0xec, 0x8c, 0x77, 0xa1, 0x86, 0x2d, + 0x18, 0x97, 0x46, 0x3d, 0xc3, 0xe3, 0xd2, 0x78, 0xb4, 0x74, 0x69, 0x2c, 0x23, 0xc1, 0x8a, 0xa5, + 0xb1, 0x92, 0x5d, 0x1a, 0x47, 0x70, 0xfd, 0xe2, 0x4d, 0xc4, 0xea, 0xbd, 0xf8, 0x23, 0xa8, 0x4e, + 0x0c, 0x91, 0x49, 0xf6, 0x7b, 0xf9, 0x3c, 0xcb, 0x4b, 0xa2, 0x29, 0xb5, 0xfd, 0xfb, 0x02, 0x5c, + 0x53, 0x04, 0x5f, 0xb0, 0x20, 0xe0, 0xf2, 0xf2, 0x99, 0xa3, 0x0d, 0x15, 0x53, 0x54, 0x13, 0xab, + 0x19, 0x50, 0xd9, 0xe7, 0x15, 0x0a, 0x40, 0xb3, 0x55, 0xa9, 0x81, 0x94, 0xed, 0x95, 0xef, 0xd0, + 0x6a, 0x55, 0x8a, 0x67, 0x85, 0xc3, 0x1d, 0x49, 0x97, 0x7c, 0x3c, 0x2b, 0xc9, 0xca, 0xf7, 0x6a, + 0x8e, 0xd1, 0x9f, 0x33, 0x12, 0x50, 0x51, 0x4f, 0x98, 0x1c, 0x99, 0x71, 0x19, 0xcf, 0xaa, 0xfd, + 0xa5, 0x5d, 0x07, 0x97, 0xed, 0x46, 0xb6, 0x0d, 0x25, 0xfe, 0xae, 0x65, 0xfc, 0xad, 0xee, 0x83, + 0x1f, 0x2a, 0x00, 0x91, 0x1a, 0x40, 0xaf, 0xfa, 0x9e, 0xc7, 0x43, 0xd3, 0x43, 0x0d, 0xb4, 0x7a, + 0x7e, 0xb6, 0xf7, 0x75, 0x84, 0xe5, 0x8c, 0x25, 0xc8, 0x87, 0x50, 0x35, 0x35, 0x2f, 0xa9, 0xd6, + 0x77, 0xf3, 0xd6, 0xcf, 0xd1, 0xd3, 0x94, 0xd8, 0xfe, 0x97, 0xa5, 0xc3, 0xff, 0x88, 0x9d, 0xa7, + 0x3d, 0x24, 0x6b, 0x65, 0x2b, 0x6f, 0xe5, 0x65, 0x5f, 0x3f, 0xee, 0x41, 0xed, 0x25, 0x3b, 0x8f, + 0xa6, 0xb1, 0x2f, 0xb9, 0x31, 0xfe, 0x1c, 0x71, 0x49, 0x5e, 0x3e, 0x80, 0x86, 0x9e, 0x0a, 0x9d, + 0x6c, 0xf8, 0xd5, 0x35, 0x4e, 0x8f, 0xad, 0xff, 0x0f, 0xd7, 0xdc, 0x11, 0xf3, 0x43, 0x47, 0x8c, + 0xa2, 0x58, 0x62, 0x07, 0xd7, 0x1f, 0x21, 0x6b, 0x74, 0x03, 0x1f, 0x1c, 0x29, 0xbc, 0xea, 0xe4, + 0x42, 0xd5, 0x10, 0x1e, 0x0a, 0x63, 0x73, 0x75, 0x54, 0xb1, 0xea, 0x0b, 0x47, 0x72, 0x21, 0xcd, + 0xfc, 0x52, 0xf6, 0xc5, 0x31, 0x17, 0xf2, 0x59, 0xa9, 0x5a, 0x6a, 0xad, 0xd9, 0xbf, 0xb1, 0xe0, + 0xe6, 0xd2, 0x21, 0x68, 0x45, 0xec, 0x2d, 0x8e, 0x04, 0xda, 0x06, 0xb9, 0x91, 0xa0, 0x0f, 0xf7, + 0x47, 0xba, 0x84, 0x38, 0x2c, 0x76, 0x47, 0xfe, 0x39, 0x77, 0xc4, 0x74, 0x32, 0x51, 0xba, 0xf3, + 0x90, 0x9d, 0x04, 0x66, 0x00, 0xae, 0xd2, 0x7b, 0x86, 0xac, 0xa3, 0xa9, 0x8e, 0x34, 0x51, 0x5f, + 0xd3, 0xd8, 0x7f, 0xb0, 0x74, 0xf3, 0x39, 0x56, 0x1b, 0x8c, 0xda, 0x89, 0x78, 0x7c, 0xc5, 0x9d, + 0xfb, 0x53, 0x28, 0x9b, 0x25, 0x48, 0xbd, 0xa7, 0xb9, 0x38, 0x38, 0x66, 0x04, 0x6e, 0x1f, 0xcf, + 0xd7, 0x23, 0x6a, 0x98, 0xec, 0xc7, 0x50, 0xcf, 0xa0, 0x49, 0x1d, 0x2a, 0xc3, 0xc1, 0xde, 0xe0, + 0xe0, 0x8b, 0x41, 0xeb, 0x0d, 0x05, 0x1c, 0xd3, 0xe1, 0xd1, 0x71, 0xbf, 0xd7, 0xb2, 0xc8, 0x35, + 0x58, 0x1f, 0x0e, 0x10, 0xfc, 0xe2, 0x80, 0x1e, 0x3f, 0xfd, 0xb2, 0x55, 0xb0, 0xbf, 0x29, 0xea, + 0x05, 0xe2, 0x45, 0x66, 0x41, 0x33, 0x83, 0xcd, 0x0a, 0xe5, 0x09, 0x94, 0x5e, 0xc6, 0xd1, 0x38, + 0x09, 0x26, 0x75, 0x56, 0x17, 0x92, 0x91, 0xa9, 0xfa, 0x05, 0x19, 0xa9, 0xe0, 0x72, 0x47, 0x2a, + 0x76, 0xc3, 0xd3, 0x64, 0x78, 0x9b, 0x23, 0x94, 0x4b, 0xcc, 0xc8, 0xab, 0x0b, 0xb2, 0xd9, 0x8b, + 0x53, 0x5c, 0x07, 0xbf, 0x38, 0xc5, 0x5c, 0x4c, 0xa2, 0x50, 0x24, 0x89, 0x9d, 0xc2, 0xaa, 0x9a, + 0xc7, 0x7c, 0x12, 0xf8, 0x9a, 0x59, 0xc7, 0x5f, 0xcd, 0x60, 0x3a, 0x92, 0xf0, 0xe5, 0x8b, 0x68, + 0x15, 0x2d, 0xfb, 0xfd, 0xbc, 0x65, 0x97, 0xdc, 0x7a, 0xfb, 0xc5, 0x85, 0x55, 0x75, 0xe9, 0xfa, + 0xaa, 0x7d, 0x58, 0x4b, 0x47, 0x80, 0x9f, 0x00, 0xb9, 0xc8, 0x79, 0xc1, 0x17, 0x87, 0xfd, 0x41, + 0x6f, 0x77, 0xf0, 0x79, 0xcb, 0x22, 0x0d, 0xa8, 0x76, 0xba, 0xdd, 0xfe, 0xa1, 0xf2, 0x4c, 0x41, + 0x41, 0xbd, 0x7e, 0xf7, 0xf9, 0xee, 0xa0, 0xdf, 0x6b, 0x15, 0x15, 0xd4, 0xed, 0x0c, 0xba, 0xfd, + 0xe7, 0xfd, 0x5e, 0xab, 0x64, 0xff, 0xcd, 0xd2, 0xb3, 0x41, 0x37, 0xb7, 0x27, 0xf6, 0xb8, 0xeb, + 0x8b, 0xd5, 0x1f, 0xa0, 0xee, 0x41, 0xcd, 0xd8, 0x73, 0x37, 0x89, 0xb4, 0x39, 0x82, 0xfc, 0x14, + 0x36, 0x3c, 0xc3, 0xef, 0xe4, 0x22, 0xef, 0xfd, 0xc5, 0x29, 0x6b, 0xd9, 0x2b, 0xb7, 0x93, 0x83, + 0x31, 0x4f, 0xd3, 0xcb, 0xc1, 0xf6, 0x7b, 0xd0, 0xcc, 0x53, 0xe4, 0x2e, 0xfb, 0x46, 0xee, 0xb2, + 0x96, 0xfd, 0xad, 0x05, 0x1b, 0x0b, 0x7f, 0x66, 0xac, 0xee, 0x57, 0x8b, 0x1b, 0x71, 0xe1, 0xc2, + 0x46, 0x4c, 0xde, 0x03, 0x92, 0x25, 0x71, 0xb2, 0xab, 0x45, 0x2b, 0x43, 0xa8, 0x6b, 0x55, 0xb6, + 0x01, 0x96, 0x5e, 0xab, 0x01, 0x0a, 0x00, 0xca, 0x5e, 0x99, 0x61, 0x31, 0x3b, 0x18, 0x58, 0xf9, + 0xc1, 0x60, 0x0f, 0xea, 0xe6, 0xdf, 0xb8, 0x63, 0xd5, 0xbd, 0x0a, 0x68, 0xe7, 0xff, 0x9b, 0xbf, + 0xa4, 0x33, 0xff, 0xff, 0x6e, 0xdf, 0xfc, 0x7d, 0x67, 0x84, 0x6e, 0x2b, 0x06, 0x9a, 0xe5, 0xb6, + 0x7f, 0x67, 0x41, 0x53, 0x69, 0x95, 0x79, 0xf3, 0x0f, 0xa0, 0x1e, 0xa7, 0x50, 0xd2, 0x47, 0x6e, + 0xcc, 0xe5, 0xcf, 0x49, 0x69, 0x96, 0x90, 0xec, 0xc0, 0x0d, 0x31, 0x3d, 0x49, 0x7a, 0xd1, 0x33, + 0x11, 0x85, 0x4f, 0x66, 0x92, 0x27, 0x1d, 0x7a, 0xe9, 0x33, 0xf2, 0x1e, 0x5c, 0x4b, 0x36, 0xcd, + 0x39, 0x83, 0x5e, 0xbf, 0x2f, 0x3e, 0xb0, 0x7f, 0x6b, 0x41, 0x5d, 0x29, 0x6b, 0xfe, 0x9c, 0xc1, + 0x79, 0x31, 0xf5, 0xa8, 0x3a, 0x2e, 0x6d, 0x4c, 0xb7, 0xa0, 0x6c, 0xbe, 0x59, 0x99, 0x91, 0xc0, + 0x7c, 0xb2, 0xca, 0xc4, 0x44, 0x29, 0x17, 0x13, 0xf7, 0xa0, 0x36, 0x5f, 0xd9, 0xd6, 0x70, 0x8a, + 0x9d, 0x23, 0xe6, 0xe9, 0x51, 0xce, 0xce, 0x49, 0x7f, 0x32, 0xd3, 0x8b, 0x51, 0x4d, 0x0d, 0xcc, + 0x51, 0x48, 0x1e, 0x43, 0x99, 0xe1, 0x09, 0x75, 0x6c, 0xee, 0xd8, 0xf9, 0x50, 0xc8, 0x11, 0x6f, + 0xeb, 0x1f, 0x6a, 0x38, 0xc8, 0xdb, 0xb0, 0x1e, 0x05, 0x9e, 0x21, 0x19, 0xa6, 0xe5, 0x3d, 0x8f, + 0x24, 0x8f, 0xf0, 0x12, 0x0a, 0x32, 0x7b, 0xd1, 0xcd, 0xa5, 0xaf, 0xa0, 0x09, 0x95, 0x6a, 0x77, + 0x65, 0xa3, 0xdd, 0x35, 0x58, 0xdf, 0xeb, 0x7f, 0xd9, 0xed, 0xd0, 0x9e, 0xd3, 0xe9, 0xf5, 0x30, + 0x93, 0x08, 0x34, 0x3b, 0xdd, 0xee, 0xc1, 0x70, 0x70, 0x7c, 0x64, 0x70, 0x16, 0xb9, 0x0e, 0x1b, + 0x09, 0x59, 0xaf, 0xff, 0xbc, 0xaf, 0xeb, 0xcb, 0x0d, 0x68, 0xa5, 0x84, 0xb4, 0xbf, 0x7f, 0xf0, + 0x02, 0xeb, 0x0c, 0x40, 0xf9, 0xf9, 0x41, 0x77, 0x4f, 0x55, 0x19, 0x95, 0x94, 0xc3, 0x81, 0x81, + 0xd6, 0xc8, 0x06, 0xd4, 0x87, 0xbb, 0x3d, 0x67, 0x78, 0xd8, 0xeb, 0x28, 0x01, 0x65, 0xd2, 0x82, + 0xc6, 0xa0, 0xb3, 0xdf, 0x77, 0xba, 0x4f, 0x3b, 0x83, 0xcf, 0xfb, 0xbd, 0x56, 0xc5, 0xfe, 0x4a, + 0x77, 0xbb, 0xcc, 0x9f, 0x6f, 0xe4, 0x7b, 0x99, 0x7f, 0xea, 0x74, 0x1c, 0xae, 0xb8, 0xde, 0xfc, + 0x5f, 0xba, 0xd4, 0x3d, 0x85, 0x8c, 0x7b, 0x9e, 0xac, 0x7f, 0x55, 0xdf, 0x7e, 0xf4, 0x71, 0xc2, + 0x7a, 0x52, 0xc6, 0xd3, 0xfb, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x11, 0xc1, 0xff, 0x1a, + 0x1f, 0x00, 0x00, } diff --git a/protocol/protobuf/pairing.proto b/protocol/protobuf/pairing.proto index d73538717..d21f734a2 100644 --- a/protocol/protobuf/pairing.proto +++ b/protocol/protobuf/pairing.proto @@ -69,10 +69,11 @@ message LocalPairingPayload { } message LocalPairingPeerHello { - bytes peer_id = 1; - string device_name = 2; - string device_type = 3; - bytes signature = 4; + int32 pairing_version = 1; + bytes peer_id = 2; + string device_name = 3; + string device_type = 4; + bytes signature = 5; } message PairInstallation { diff --git a/server/pairing/connection.go b/server/pairing/connection.go index 765b099d3..40fc3d370 100644 --- a/server/pairing/connection.go +++ b/server/pairing/connection.go @@ -10,12 +10,8 @@ import ( "strings" "github.com/btcsuite/btcutil/base58" -) -type ConnectionParamVersion int - -const ( - Version1 ConnectionParamVersion = iota + 1 + "github.com/status-im/status-go/server/pairing/versioning" ) const ( @@ -23,7 +19,7 @@ const ( ) type ConnectionParams struct { - version ConnectionParamVersion + version versioning.ConnectionParamVersion netIP net.IP port int publicKey *ecdsa.PublicKey @@ -32,7 +28,7 @@ type ConnectionParams struct { func NewConnectionParams(netIP net.IP, port int, publicKey *ecdsa.PublicKey, aesKey []byte) *ConnectionParams { cp := new(ConnectionParams) - cp.version = Version1 + cp.version = versioning.LatestConnectionParamVer cp.netIP = netIP cp.port = port cp.publicKey = publicKey @@ -81,7 +77,7 @@ func (cp *ConnectionParams) FromString(s string) error { return fmt.Errorf("expected data '%s' to have length of '%d', received '%d'", s, requiredParams, len(sData)) } - cp.version = ConnectionParamVersion(new(big.Int).SetBytes(base58.Decode(sData[0])).Int64()) + cp.version = versioning.ConnectionParamVersion(new(big.Int).SetBytes(base58.Decode(sData[0])).Int64()) cp.netIP = base58.Decode(sData[1]) cp.port = int(new(big.Int).SetBytes(base58.Decode(sData[2])).Int64()) cp.publicKey = new(ecdsa.PublicKey) @@ -117,12 +113,10 @@ func (cp *ConnectionParams) validate() error { } func (cp *ConnectionParams) validateVersion() error { - switch cp.version { - case Version1: + if cp.version <= versioning.LatestConnectionParamVer { return nil - default: - return fmt.Errorf("unsupported version '%d'", cp.version) } + return fmt.Errorf("unsupported version '%d'", cp.version) } func (cp *ConnectionParams) validateNetIP() error { diff --git a/server/pairing/peers/payload.go b/server/pairing/peers/payload.go index 81dece652..4adcfc030 100644 --- a/server/pairing/peers/payload.go +++ b/server/pairing/peers/payload.go @@ -9,6 +9,7 @@ import ( udpp2p "github.com/schollz/peerdiscovery" "github.com/status-im/status-go/protocol/protobuf" + "github.com/status-im/status-go/server/pairing/versioning" ) type LocalPairingPeerHello struct { @@ -19,6 +20,7 @@ type LocalPairingPeerHello struct { func NewLocalPairingPeerHello(id []byte, name, deviceType string, k *ecdsa.PrivateKey) (*LocalPairingPeerHello, error) { h := new(LocalPairingPeerHello) + h.PairingVersion = int32(versioning.LatestLocalPairingVer) h.PeerId = id h.DeviceName = name h.DeviceType = deviceType @@ -33,15 +35,17 @@ func NewLocalPairingPeerHello(id []byte, name, deviceType string, k *ecdsa.Priva func (h *LocalPairingPeerHello) MarshalJSON() ([]byte, error) { alias := struct { - PeerID []byte - DeviceName string - DeviceType string - Address string + PairingVersion int32 + PeerID []byte + DeviceName string + DeviceType string + Address string }{ - PeerID: h.PeerId, - DeviceName: h.DeviceName, - DeviceType: h.DeviceType, - Address: h.Discovered.Address, + PairingVersion: h.PairingVersion, + PeerID: h.PeerId, + DeviceName: h.DeviceName, + DeviceType: h.DeviceType, + Address: h.Discovered.Address, } return json.Marshal(alias) diff --git a/server/pairing/peers/udp_notifier.go b/server/pairing/peers/udp_notifier.go index 7de2c1f30..92596ffc8 100644 --- a/server/pairing/peers/udp_notifier.go +++ b/server/pairing/peers/udp_notifier.go @@ -10,6 +10,11 @@ import ( "go.uber.org/zap" ) +const ( + pingInterval = 500 * time.Millisecond + searchLimit = 2 * time.Minute +) + type NotifyHandler func(*LocalPairingPeerHello) type UDPNotifier struct { @@ -86,8 +91,8 @@ func Search(deviceName, deviceType string, notify NotifyHandler, stop chan struc return err } - settings.Delay = 500 * time.Millisecond - settings.TimeLimit = 2 * time.Minute + settings.Delay = pingInterval + settings.TimeLimit = searchLimit settings.StopChan = stop go func() { diff --git a/server/pairing/versioning/version.go b/server/pairing/versioning/version.go new file mode 100644 index 000000000..9a46b75d1 --- /dev/null +++ b/server/pairing/versioning/version.go @@ -0,0 +1,18 @@ +package versioning + +type ConnectionParamVersion int + +const ( + ConnectionParamsV1 ConnectionParamVersion = iota + 1 +) + +type LocalPairingVersion int + +const ( + LocalPairingV1 LocalPairingVersion = iota + 1 +) + +const ( + LatestConnectionParamVer = ConnectionParamsV1 + LatestLocalPairingVer = LocalPairingV1 +)