diff --git a/VERSION b/VERSION index 3af64c5cc..4ca21a9d6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.159.7 +0.159.8 \ No newline at end of file diff --git a/protocol/protobuf/pairing.pb.go b/protocol/protobuf/pairing.pb.go index e34a36f1c..c6d64a831 100644 --- a/protocol/protobuf/pairing.pb.go +++ b/protocol/protobuf/pairing.pb.go @@ -707,6 +707,7 @@ type LocalPairingPayload struct { Keys []*LocalPairingPayload_Key `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"` Multiaccount *MultiAccount `protobuf:"bytes,2,opt,name=multiaccount,proto3" json:"multiaccount,omitempty"` Password string `protobuf:"bytes,3,opt,name=password,proto3" json:"password,omitempty"` + ChatKey string `protobuf:"bytes,4,opt,name=chatKey,proto3" json:"chatKey,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -758,6 +759,13 @@ func (m *LocalPairingPayload) GetPassword() string { return "" } +func (m *LocalPairingPayload) GetChatKey() string { + if m != nil { + return m.ChatKey + } + return "" +} + type LocalPairingPayload_Key struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` @@ -3454,225 +3462,225 @@ func init() { } var fileDescriptor_d61ab7221f0b5518 = []byte{ - // 3506 bytes of a gzipped FileDescriptorProto + // 3519 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x3a, 0x4d, 0x73, 0x23, 0x49, 0x56, 0x53, 0x92, 0xac, 0x8f, 0x27, 0x59, 0x2e, 0x67, 0x7b, 0xa6, 0xd5, 0xee, 0x9e, 0xed, 0xee, 0x9a, 0x9d, 0xd8, 0x86, 0x18, 0x3c, 0xd0, 0x03, 0x2c, 0x3b, 0x1f, 0x31, 0xa8, 0x25, 0xcd, 0xb4, 0xdb, 0x6d, 0xd9, 0xa4, 0xed, 0x19, 0x96, 0x20, 0xa2, 0x48, 0x57, 0xa5, 0xad, 0x5a, 0x97, 0xaa, 0x44, 0x65, 0xca, 0x46, 0x7b, 0x20, 0x80, 0x08, 0xce, 0x10, 0x5c, 0x76, 0x8e, 0x73, 0x26, 0x38, - 0x11, 0xc1, 0x81, 0x08, 0x0e, 0x9c, 0x08, 0xee, 0x1c, 0xe1, 0x17, 0x10, 0x5c, 0xb8, 0x71, 0x24, - 0xf2, 0x65, 0x56, 0xa9, 0x4a, 0x1f, 0xc6, 0x0e, 0x4e, 0x7b, 0x72, 0xbe, 0x97, 0x2f, 0x5f, 0xbe, - 0xca, 0xf7, 0xfd, 0x64, 0xd8, 0x9c, 0xb0, 0x20, 0x09, 0xa2, 0xcb, 0xbd, 0x49, 0x12, 0xcb, 0x98, - 0xd4, 0xf1, 0xcf, 0xf9, 0xf4, 0x62, 0xf7, 0x81, 0x37, 0x62, 0xd2, 0x0d, 0x7c, 0x1e, 0xc9, 0x40, - 0xce, 0xf4, 0xf6, 0xee, 0x03, 0x31, 0x8b, 0x3c, 0x57, 0x70, 0x29, 0x83, 0xe8, 0x52, 0x18, 0xa4, + 0x11, 0xc1, 0x81, 0x08, 0x0e, 0x9c, 0x08, 0xfe, 0x03, 0xfc, 0x02, 0x02, 0x0e, 0xdc, 0x38, 0x12, + 0x2f, 0x33, 0xab, 0x54, 0xa5, 0x0f, 0x63, 0x07, 0xa7, 0x3d, 0xb9, 0xde, 0xcb, 0x97, 0x2f, 0x5f, + 0xe6, 0xfb, 0x7e, 0x32, 0x6c, 0x4e, 0x58, 0x90, 0x04, 0xd1, 0xe5, 0xde, 0x24, 0x89, 0x65, 0x4c, + 0xea, 0xea, 0xcf, 0xf9, 0xf4, 0x62, 0xf7, 0x81, 0x37, 0x62, 0xd2, 0x0d, 0x7c, 0x1e, 0xc9, 0x40, + 0xce, 0xf4, 0xf2, 0xee, 0x03, 0x31, 0x8b, 0x3c, 0x57, 0x70, 0x29, 0x83, 0xe8, 0x52, 0x18, 0xa4, 0xc3, 0x26, 0x93, 0x30, 0xf0, 0x98, 0x0c, 0xe2, 0xc8, 0x1d, 0x73, 0xc9, 0x7c, 0x26, 0x99, 0x3b, - 0xe6, 0x42, 0xb0, 0x4b, 0x6e, 0x68, 0xb6, 0xbd, 0x78, 0x3c, 0x9e, 0x46, 0x81, 0x0c, 0xb8, 0x39, + 0xe6, 0x42, 0xb0, 0x4b, 0x6e, 0x68, 0xb6, 0xbd, 0x78, 0x3c, 0x9e, 0x46, 0x81, 0x0c, 0xb8, 0xd9, 0xe6, 0x30, 0x78, 0xfc, 0x15, 0x97, 0xde, 0x28, 0x88, 0x2e, 0x5f, 0x31, 0xef, 0x8a, 0xfb, 0x67, - 0x93, 0x3e, 0x93, 0xac, 0xcf, 0x25, 0x0b, 0x42, 0x41, 0x9e, 0x42, 0x13, 0xf9, 0x44, 0xd3, 0xf1, - 0x39, 0x4f, 0x3a, 0xd6, 0x33, 0xeb, 0xc5, 0x26, 0x05, 0x85, 0x1a, 0x22, 0x86, 0x3c, 0x87, 0x96, - 0x8c, 0x25, 0x0b, 0x53, 0x8a, 0x12, 0x52, 0x34, 0x11, 0xa7, 0x49, 0x9c, 0xbf, 0xae, 0x41, 0x55, - 0xf1, 0x9e, 0x4e, 0xc8, 0x0e, 0x6c, 0x78, 0x61, 0xec, 0x5d, 0x21, 0xa3, 0x0a, 0xd5, 0x00, 0x69, - 0x43, 0x29, 0xf0, 0xf1, 0x64, 0x83, 0x96, 0x02, 0x9f, 0x7c, 0x09, 0x75, 0x2f, 0x8e, 0x24, 0xf3, - 0xa4, 0xe8, 0x94, 0x9f, 0x95, 0x5f, 0x34, 0x5f, 0x7e, 0xb0, 0x97, 0xbe, 0xc8, 0xde, 0xc9, 0x2c, - 0xf2, 0xf6, 0x23, 0x21, 0x59, 0x18, 0xe2, 0xb7, 0xf6, 0x34, 0xe5, 0x37, 0x2f, 0x69, 0x76, 0x88, - 0xfc, 0x04, 0x9a, 0xb9, 0x2f, 0xed, 0x54, 0x90, 0xc7, 0xc3, 0x22, 0x8f, 0x9e, 0x21, 0x98, 0xd1, - 0x3c, 0x2d, 0x39, 0x82, 0xad, 0x94, 0x8d, 0x79, 0x83, 0xce, 0xc6, 0x33, 0xeb, 0x45, 0xf3, 0xe5, - 0x87, 0xf3, 0xe3, 0xb7, 0x3c, 0x18, 0x5d, 0x3c, 0x4d, 0xce, 0x80, 0xe4, 0xf8, 0xa7, 0x3c, 0xab, - 0xf7, 0xe1, 0xb9, 0x82, 0x01, 0xf9, 0x04, 0x6a, 0x93, 0x24, 0xbe, 0x08, 0x42, 0xde, 0xa9, 0x21, - 0xaf, 0x47, 0x73, 0x5e, 0x29, 0x8f, 0x63, 0x4d, 0x40, 0x53, 0x4a, 0x72, 0x08, 0x6d, 0xb3, 0x4c, - 0xe5, 0xa8, 0xdf, 0x47, 0x8e, 0x85, 0xc3, 0xe4, 0x63, 0xa8, 0x19, 0x23, 0xec, 0x34, 0x90, 0xcf, - 0xbb, 0xc5, 0x27, 0x3e, 0xd1, 0x9b, 0x34, 0xa5, 0x52, 0x8f, 0x9b, 0x5a, 0x6d, 0x2a, 0x00, 0xdc, - 0xeb, 0x71, 0x17, 0x4e, 0x93, 0xcf, 0xa0, 0x79, 0x31, 0x0d, 0xc3, 0x03, 0x3e, 0x53, 0x0e, 0xd4, - 0x69, 0x2e, 0xbe, 0x84, 0x92, 0xc2, 0x6c, 0x7e, 0x35, 0x0d, 0x43, 0x9a, 0xa7, 0x56, 0x9a, 0xc9, - 0x81, 0xa9, 0x40, 0xad, 0x7b, 0x69, 0x66, 0x99, 0x01, 0xe9, 0x82, 0x7d, 0xc3, 0xa4, 0x37, 0x3a, - 0x8a, 0xc2, 0x59, 0xd7, 0xf3, 0xe2, 0x69, 0x24, 0x3b, 0x9b, 0xab, 0x9e, 0xc7, 0x6c, 0xd2, 0x25, - 0x72, 0xe2, 0xc2, 0xc3, 0x45, 0x5c, 0x2a, 0x5e, 0xfb, 0x3e, 0xe2, 0xad, 0xe3, 0xe2, 0xfc, 0x57, - 0x05, 0x5a, 0x87, 0xd3, 0x50, 0x06, 0xe9, 0x8d, 0x04, 0x2a, 0x11, 0x1b, 0x73, 0xf4, 0xcb, 0x06, - 0xc5, 0x35, 0x79, 0x02, 0x0d, 0x19, 0x8c, 0xb9, 0x90, 0x6c, 0x3c, 0x41, 0xef, 0x2c, 0xd3, 0x39, - 0x42, 0xed, 0xea, 0xb0, 0xe4, 0xc5, 0x51, 0xa7, 0x8c, 0xc7, 0xe6, 0x08, 0xf2, 0x25, 0x80, 0x17, - 0x87, 0x71, 0xe2, 0x8e, 0x98, 0x18, 0x19, 0x07, 0x7c, 0x36, 0x17, 0x3a, 0x7f, 0xf7, 0x5e, 0x4f, - 0x11, 0xbe, 0x66, 0x62, 0x44, 0x1b, 0x5e, 0xba, 0x24, 0x8f, 0x54, 0x0c, 0x50, 0x0c, 0x02, 0x1f, - 0x1d, 0xb0, 0x4c, 0x6b, 0x08, 0xef, 0xfb, 0xe4, 0x47, 0xb0, 0x75, 0xc5, 0x67, 0x1e, 0x4b, 0x7c, - 0xd7, 0x84, 0x4d, 0x74, 0xa7, 0x06, 0x6d, 0x1b, 0xf4, 0xb1, 0xc6, 0x92, 0x87, 0x50, 0xbb, 0xe2, - 0x33, 0x77, 0x1a, 0xf8, 0xe8, 0x23, 0x0d, 0x5a, 0xbd, 0xe2, 0xb3, 0xb3, 0xc0, 0x27, 0x9f, 0x43, - 0x35, 0x18, 0xb3, 0x4b, 0xae, 0xec, 0x5f, 0x49, 0xf6, 0xc3, 0x35, 0x92, 0xed, 0x9b, 0xb8, 0xbb, - 0xaf, 0x88, 0xa9, 0x39, 0x43, 0x3e, 0x86, 0x07, 0xde, 0x54, 0xc8, 0x78, 0x1c, 0xfc, 0x5c, 0x47, - 0x5b, 0x14, 0x0c, 0x5d, 0xa0, 0x41, 0x49, 0x61, 0x0b, 0x3f, 0x6d, 0xf7, 0x39, 0x34, 0xb2, 0x6f, - 0x54, 0x21, 0x30, 0x88, 0x7c, 0xfe, 0x27, 0x1d, 0xeb, 0x59, 0xf9, 0x45, 0x99, 0x6a, 0x60, 0xf7, - 0xdf, 0x2d, 0xd8, 0x2c, 0xdc, 0x96, 0x17, 0xde, 0x2a, 0x08, 0x9f, 0xaa, 0xaa, 0x94, 0x53, 0x55, - 0x07, 0x6a, 0x13, 0x36, 0x0b, 0x63, 0xe6, 0xa3, 0x2a, 0x5a, 0x34, 0x05, 0xd5, 0x75, 0x37, 0x81, - 0x2f, 0x95, 0x0e, 0xd4, 0x23, 0x6a, 0x80, 0xbc, 0x07, 0xd5, 0x11, 0x0f, 0x2e, 0x47, 0xd2, 0xbc, - 0xad, 0x81, 0xc8, 0x2e, 0xd4, 0x95, 0x83, 0x8b, 0xe0, 0xe7, 0x1c, 0xdf, 0xb4, 0x4c, 0x33, 0x98, - 0x7c, 0x00, 0x9b, 0x09, 0xae, 0x5c, 0xc9, 0x92, 0x4b, 0x2e, 0xf1, 0x4d, 0xcb, 0xb4, 0xa5, 0x91, - 0xa7, 0x88, 0x9b, 0x07, 0xf8, 0x7a, 0x2e, 0xc0, 0x3b, 0xff, 0x66, 0xc1, 0x83, 0xb7, 0xb1, 0xc7, - 0x42, 0xa3, 0x99, 0x63, 0x23, 0xdc, 0x6f, 0x41, 0xe5, 0x8a, 0xcf, 0x04, 0x3e, 0x45, 0xf3, 0xe5, - 0xf3, 0xb9, 0x16, 0x56, 0x10, 0xef, 0x1d, 0xf0, 0x19, 0x45, 0x72, 0xf2, 0x29, 0xb4, 0xc6, 0x4a, - 0x4d, 0xcc, 0x78, 0x57, 0x09, 0x7d, 0xe2, 0xbd, 0xd5, 0x4a, 0xa4, 0x05, 0x5a, 0xf5, 0x85, 0x13, - 0x26, 0xc4, 0x4d, 0x9c, 0xf8, 0xc6, 0x6a, 0x33, 0x78, 0xf7, 0xd7, 0xa0, 0x7c, 0xc0, 0x67, 0x2b, - 0x7d, 0x81, 0x40, 0x45, 0x25, 0x3d, 0xbc, 0xaa, 0x45, 0x71, 0xed, 0xfc, 0xa3, 0x05, 0xef, 0x16, - 0x04, 0xe5, 0x3c, 0x79, 0xcd, 0xc3, 0x30, 0x56, 0x16, 0x6a, 0x2c, 0xd3, 0xbd, 0xe6, 0x89, 0x08, - 0xe2, 0x08, 0x99, 0x6d, 0xd0, 0xb6, 0x41, 0x7f, 0xa3, 0xb1, 0x4a, 0xc9, 0x13, 0xce, 0xd1, 0xc8, - 0x35, 0xe7, 0xaa, 0x02, 0xf7, 0x7d, 0xcc, 0xbb, 0xfc, 0x3a, 0xf0, 0xb8, 0x8b, 0xa2, 0x68, 0x49, - 0x41, 0xa3, 0x86, 0x4a, 0xa0, 0x39, 0x81, 0x9c, 0x4d, 0x38, 0x6a, 0x37, 0x23, 0x38, 0x9d, 0x4d, - 0xd0, 0x7b, 0x45, 0x70, 0x19, 0x31, 0x39, 0x4d, 0x38, 0x6a, 0xb9, 0x45, 0xe7, 0x08, 0xe7, 0x7b, - 0x0b, 0x6c, 0x25, 0x76, 0x3e, 0x93, 0xae, 0xc9, 0xce, 0x3f, 0x82, 0xad, 0x20, 0x47, 0xe5, 0x66, - 0xa9, 0xba, 0x9d, 0x47, 0x17, 0x64, 0x46, 0x91, 0xca, 0x4b, 0x22, 0xa5, 0x0f, 0x5b, 0x29, 0x5a, - 0x6e, 0xfa, 0x44, 0x1b, 0x58, 0x3a, 0xa4, 0xa0, 0xf3, 0x9f, 0x16, 0x3c, 0x5c, 0x93, 0xec, 0xef, - 0x58, 0x47, 0x7c, 0x00, 0x9b, 0x26, 0x63, 0xb9, 0xe8, 0xba, 0x46, 0xa4, 0x96, 0x41, 0x6a, 0x3f, - 0x7b, 0x04, 0x75, 0x1e, 0x09, 0x37, 0x27, 0x58, 0x8d, 0x47, 0x02, 0xdf, 0xf8, 0x39, 0xb4, 0x42, - 0x26, 0xa4, 0x3b, 0x9d, 0xf8, 0x4c, 0x72, 0x1d, 0x87, 0x2a, 0xb4, 0xa9, 0x70, 0x67, 0x1a, 0xa5, - 0xbe, 0x59, 0xcc, 0x84, 0xe4, 0x63, 0x57, 0xb2, 0x4b, 0x95, 0xd6, 0xcb, 0xea, 0x9b, 0x35, 0xea, - 0x94, 0x5d, 0x0a, 0xf2, 0x21, 0xb4, 0x43, 0x65, 0x23, 0x6e, 0x14, 0x78, 0x57, 0x78, 0x89, 0x0e, - 0x45, 0x9b, 0x88, 0x1d, 0x1a, 0xa4, 0xf3, 0xe7, 0x55, 0x78, 0xb4, 0xb6, 0xb2, 0x21, 0xbf, 0x0e, - 0x3b, 0x79, 0x41, 0x5c, 0x3c, 0x1b, 0xce, 0xcc, 0xd7, 0x93, 0x9c, 0x40, 0x6f, 0xf5, 0xce, 0x2f, - 0xf1, 0x53, 0x28, 0xdd, 0x32, 0xdf, 0xe7, 0x3e, 0x06, 0xd4, 0x3a, 0xd5, 0x80, 0xb2, 0x93, 0x73, - 0xa5, 0x64, 0xee, 0x63, 0xc9, 0x50, 0xa7, 0x29, 0xa8, 0xe8, 0xc7, 0x53, 0x25, 0x53, 0x53, 0xd3, - 0x23, 0xa0, 0xe8, 0x13, 0x3e, 0x8e, 0xaf, 0xb9, 0x8f, 0x19, 0xbd, 0x4e, 0x53, 0x90, 0x3c, 0x83, - 0xd6, 0x88, 0x09, 0x17, 0xd9, 0xba, 0x53, 0x81, 0xb9, 0xb9, 0x4e, 0x61, 0xc4, 0x44, 0x57, 0xa1, - 0xce, 0x30, 0xc0, 0x5f, 0xf3, 0x24, 0xb8, 0x48, 0xab, 0x69, 0x21, 0x99, 0x9c, 0xea, 0xd4, 0x5b, - 0xa6, 0x24, 0xbf, 0x75, 0x82, 0x3b, 0x58, 0x04, 0x27, 0x53, 0x21, 0x53, 0xca, 0x2d, 0xa4, 0x6c, - 0x22, 0xce, 0x90, 0x7c, 0x01, 0x8f, 0x4d, 0x65, 0xe8, 0x26, 0xfc, 0x8f, 0xa7, 0x5c, 0x48, 0xad, - 0x45, 0x3c, 0xc2, 0x3b, 0x36, 0x9e, 0xe8, 0x18, 0x12, 0xaa, 0x29, 0x50, 0x99, 0xea, 0x3c, 0x5f, - 0x7f, 0x5c, 0xbb, 0xc1, 0xf6, 0xda, 0xe3, 0x3d, 0xf4, 0x8c, 0x2f, 0xe1, 0xc9, 0xe2, 0x71, 0xf5, - 0x1c, 0x92, 0x9b, 0xeb, 0x09, 0x9e, 0x7f, 0x54, 0x3c, 0x4f, 0x91, 0x42, 0xdf, 0xbf, 0x9e, 0x81, - 0x16, 0xe0, 0xc1, 0x7a, 0x06, 0x5a, 0x82, 0xe7, 0xd0, 0xf2, 0x03, 0x31, 0x09, 0xd9, 0x4c, 0xdb, - 0xd7, 0x0e, 0xaa, 0xbe, 0x69, 0x70, 0xca, 0xc6, 0x9c, 0x9b, 0x65, 0x7f, 0x4f, 0xcb, 0x93, 0xd5, - 0xfe, 0xbe, 0x64, 0xd4, 0xa5, 0x15, 0x46, 0xbd, 0x68, 0xb9, 0xe5, 0x25, 0xcb, 0x75, 0x5e, 0xc1, - 0xee, 0xe2, 0xc5, 0xc7, 0xd3, 0xf3, 0x30, 0xf0, 0x7a, 0x23, 0x76, 0xc7, 0x58, 0xe3, 0xfc, 0x43, - 0x19, 0x36, 0x0b, 0x6d, 0xc5, 0xff, 0x79, 0xae, 0x85, 0x8e, 0xf9, 0x14, 0x9a, 0x93, 0x24, 0xb8, - 0x66, 0x92, 0xbb, 0x57, 0x7c, 0x66, 0xb2, 0x37, 0x18, 0x94, 0xca, 0x46, 0xcf, 0x54, 0x54, 0x15, - 0x5e, 0x12, 0x4c, 0x94, 0x5c, 0xe8, 0x97, 0x2d, 0x9a, 0x47, 0xa9, 0x64, 0xfe, 0xb3, 0x38, 0x88, - 0x8c, 0x57, 0xd6, 0xa9, 0x81, 0x54, 0xaa, 0xd3, 0xb6, 0xca, 0x7d, 0x4c, 0xe6, 0x75, 0x9a, 0xc1, - 0x73, 0xa7, 0xa9, 0xe5, 0x9d, 0xe6, 0x08, 0x6c, 0xa3, 0x5d, 0xe1, 0xca, 0xd8, 0x55, 0x7c, 0x4c, - 0x85, 0xf4, 0xe1, 0xba, 0xe6, 0xc9, 0x90, 0x9f, 0xc6, 0x6f, 0xe2, 0x20, 0xa2, 0xed, 0xa4, 0x00, - 0x93, 0xcf, 0xa0, 0x9e, 0x96, 0xec, 0xa6, 0x45, 0x78, 0xba, 0x86, 0x91, 0xe9, 0x15, 0x04, 0xcd, - 0x0e, 0xa8, 0x0c, 0xc6, 0x23, 0x2f, 0x99, 0x4d, 0x64, 0xe6, 0xf4, 0x73, 0x04, 0xe6, 0xb7, 0x09, - 0xf7, 0x24, 0x9b, 0xbb, 0xfe, 0x1c, 0xa1, 0x92, 0x96, 0x21, 0x55, 0x0e, 0x8c, 0x45, 0x46, 0x0b, - 0x5f, 0xae, 0x3d, 0x47, 0x1f, 0xf0, 0x99, 0x70, 0x7e, 0x51, 0x82, 0xc7, 0xb7, 0x7c, 0x91, 0xd1, - 0x97, 0x95, 0xe9, 0xeb, 0x7d, 0x80, 0x09, 0xda, 0x06, 0xaa, 0x4b, 0xeb, 0xbf, 0xa1, 0x31, 0x4a, - 0x5b, 0x99, 0xd2, 0xcb, 0x79, 0xa5, 0xdf, 0x12, 0x58, 0x1f, 0x42, 0xcd, 0xb4, 0xf8, 0xa8, 0xbd, - 0x06, 0xad, 0x2a, 0x70, 0xdf, 0x57, 0x76, 0x9b, 0xb6, 0x7d, 0x33, 0xb5, 0x5b, 0xd5, 0x8a, 0xcf, - 0x70, 0xfb, 0xa8, 0x44, 0xed, 0xbe, 0x35, 0x7d, 0x19, 0x02, 0xe4, 0x2b, 0xd8, 0x4e, 0xf8, 0x35, - 0x67, 0x21, 0xf7, 0x5d, 0x53, 0xf5, 0xa4, 0x75, 0x6e, 0xae, 0x33, 0xa2, 0x86, 0x24, 0x6b, 0x42, - 0x92, 0x22, 0x42, 0x38, 0x7f, 0x53, 0x02, 0x7b, 0xd1, 0x2d, 0xc8, 0x17, 0xb9, 0xd6, 0x7c, 0xa9, - 0x6a, 0x5b, 0x93, 0xc0, 0x72, 0x8d, 0xf9, 0xd7, 0xd0, 0x32, 0xaf, 0xa7, 0xbe, 0x52, 0x74, 0x4a, - 0x8b, 0xe5, 0xf7, 0x7a, 0x3f, 0xa4, 0xcd, 0x49, 0xb6, 0x56, 0x8d, 0x5f, 0x2d, 0xad, 0xfe, 0xca, - 0x68, 0x57, 0xb7, 0x88, 0x91, 0x7e, 0x62, 0x7a, 0xe2, 0xff, 0x31, 0x1e, 0x70, 0x7e, 0x0c, 0x5b, - 0xb8, 0xab, 0x04, 0x32, 0xf9, 0xe4, 0x6e, 0xf1, 0xe1, 0x73, 0xd8, 0x49, 0x0f, 0x1e, 0xea, 0x99, - 0x8c, 0xa0, 0x9c, 0xdd, 0xf5, 0xf4, 0xef, 0xc2, 0x7b, 0xba, 0x63, 0x94, 0xc1, 0x75, 0x20, 0x67, - 0x3d, 0x1e, 0x49, 0x9e, 0xdc, 0x72, 0xde, 0x86, 0x72, 0xe0, 0xeb, 0xe7, 0x6d, 0x51, 0xb5, 0x74, - 0xfa, 0x3a, 0xc6, 0x15, 0x39, 0x74, 0x3d, 0x8f, 0xa3, 0x33, 0xdd, 0x95, 0xcb, 0x40, 0x3b, 0x4b, - 0x91, 0x4b, 0x3f, 0x10, 0xe3, 0x40, 0x88, 0x7b, 0xb0, 0x71, 0xe1, 0x83, 0x65, 0x36, 0xc3, 0x58, - 0x16, 0xf2, 0x2a, 0x57, 0xbe, 0x96, 0x56, 0x3c, 0x4c, 0x1a, 0x9e, 0x0d, 0x83, 0xe9, 0x4a, 0xe5, - 0x55, 0x2a, 0x91, 0x0b, 0xce, 0x23, 0x7c, 0xaa, 0x3a, 0xad, 0x8d, 0x98, 0x38, 0xe1, 0x3c, 0x72, - 0xfe, 0xca, 0x82, 0xa7, 0xb7, 0xdf, 0x20, 0x48, 0x08, 0xef, 0x33, 0xb3, 0xed, 0x7a, 0xb8, 0xef, - 0x46, 0x79, 0x02, 0x63, 0xdf, 0x2f, 0x16, 0x9b, 0xf6, 0x75, 0x1c, 0xe9, 0x63, 0xb6, 0xfe, 0x36, - 0xe7, 0x9f, 0x1a, 0xf0, 0x83, 0xdb, 0xcf, 0x2f, 0x85, 0x9a, 0xa5, 0xfe, 0xbb, 0x92, 0xef, 0xbf, - 0x2f, 0x60, 0x3b, 0x2f, 0xee, 0xbc, 0xe6, 0x6e, 0xbf, 0xfc, 0xc9, 0x5d, 0x45, 0xde, 0xcb, 0x03, - 0xaa, 0x44, 0xa7, 0x76, 0xb4, 0x80, 0xc9, 0x07, 0xa8, 0x4a, 0x21, 0x40, 0x11, 0xa8, 0x24, 0x9c, - 0xa5, 0x49, 0x07, 0xd7, 0x4a, 0x64, 0x3f, 0xb5, 0x06, 0x93, 0x73, 0xe6, 0x08, 0x95, 0x90, 0x98, - 0xb1, 0x38, 0x93, 0x77, 0x32, 0x58, 0xd5, 0x6b, 0x66, 0x56, 0x89, 0xad, 0x63, 0x8b, 0xa6, 0xa0, - 0x4a, 0x6f, 0x6c, 0x2a, 0x47, 0x59, 0x87, 0x6d, 0x20, 0xdd, 0x8f, 0x4e, 0xc2, 0x59, 0x3a, 0xe3, - 0xc4, 0x14, 0xd1, 0x52, 0xfd, 0xe8, 0x24, 0x9c, 0x19, 0x1f, 0x5b, 0x8a, 0xa2, 0x4d, 0x5d, 0x76, - 0xe4, 0xa3, 0xe8, 0x05, 0x6c, 0x8f, 0xf9, 0xf8, 0x9c, 0x27, 0x62, 0x14, 0x4c, 0xd2, 0x0a, 0xae, - 0x75, 0xcf, 0x87, 0x3c, 0xcc, 0x38, 0xe8, 0x7a, 0x8f, 0xda, 0xe3, 0x05, 0x0c, 0xf9, 0x0b, 0x6b, - 0x5e, 0xc3, 0xad, 0x2a, 0x2f, 0x37, 0xf1, 0xca, 0x57, 0x77, 0xbe, 0x32, 0x6d, 0x0f, 0x96, 0xca, - 0xd1, 0xac, 0x0c, 0x5b, 0xde, 0x52, 0xcf, 0xec, 0xf3, 0x90, 0x2b, 0x0d, 0xb4, 0xb5, 0xcb, 0x18, - 0x70, 0xc1, 0xd9, 0xb6, 0x16, 0x9c, 0xcd, 0xf9, 0x6f, 0x0b, 0xec, 0x45, 0x6b, 0x21, 0x00, 0xd5, - 0x61, 0xac, 0x56, 0xf6, 0x3b, 0x64, 0x0b, 0x9a, 0x43, 0x7e, 0x73, 0x14, 0xf1, 0xd3, 0xf8, 0x28, - 0xe2, 0xb6, 0x45, 0x1e, 0xc2, 0x83, 0x21, 0xbf, 0x39, 0xd6, 0x95, 0xcc, 0xd7, 0x49, 0x3c, 0x9d, - 0xa8, 0xe0, 0x67, 0x97, 0x48, 0x13, 0x6a, 0x87, 0x3c, 0x52, 0x4c, 0xec, 0x32, 0x69, 0xc0, 0x06, - 0x55, 0x0a, 0xb3, 0x2b, 0x84, 0x40, 0xbb, 0x57, 0xa8, 0x1f, 0xed, 0x0d, 0xc5, 0x24, 0x8b, 0xc4, - 0xfb, 0xd1, 0x75, 0x20, 0xf1, 0x72, 0xbb, 0x4a, 0x76, 0xc0, 0x5e, 0x4c, 0xd9, 0x76, 0x8d, 0xfc, - 0x00, 0x76, 0x33, 0xec, 0x5c, 0x25, 0xe9, 0x7e, 0x9d, 0x3c, 0x80, 0xad, 0x6c, 0xff, 0x20, 0x50, - 0xed, 0x83, 0xdd, 0xd0, 0x77, 0x2c, 0x3d, 0x98, 0x0d, 0xce, 0x5f, 0x5a, 0x60, 0x2f, 0x2a, 0x96, - 0x74, 0x60, 0x67, 0x11, 0xb7, 0xef, 0x87, 0xea, 0x05, 0x1e, 0xc3, 0xc3, 0xc5, 0x9d, 0x63, 0x1e, - 0xf9, 0x41, 0x74, 0x69, 0x5b, 0xe4, 0x09, 0x74, 0x16, 0x37, 0xd3, 0xe8, 0x6b, 0x97, 0x56, 0xed, - 0xf6, 0xb9, 0x17, 0xaa, 0x32, 0xce, 0x2e, 0x3b, 0x7f, 0x66, 0xc1, 0xa3, 0xb5, 0xda, 0x56, 0xcf, - 0x79, 0x16, 0x5d, 0x45, 0xf1, 0x4d, 0x64, 0xbf, 0xa3, 0x80, 0xf9, 0x9d, 0x2d, 0xa8, 0xe7, 0xee, - 0x68, 0x41, 0x7d, 0xce, 0x93, 0x6c, 0x42, 0xa3, 0xc7, 0x22, 0x8f, 0x87, 0x21, 0xf7, 0xed, 0x8a, - 0x3a, 0x77, 0xaa, 0xba, 0x15, 0xee, 0xdb, 0x1b, 0x64, 0x1b, 0x36, 0xcf, 0x22, 0x04, 0xbf, 0x8d, - 0x13, 0x39, 0x9a, 0xd9, 0x55, 0xe7, 0x7b, 0x0b, 0x5a, 0xca, 0x1e, 0x5f, 0xc5, 0xf1, 0xd5, 0x98, - 0x25, 0x57, 0xeb, 0x43, 0xfd, 0x34, 0x09, 0x4d, 0xe2, 0x52, 0xcb, 0xac, 0xe7, 0x2f, 0xe7, 0x7a, - 0xfe, 0xc7, 0xd0, 0xc0, 0x7a, 0xdd, 0x55, 0xb4, 0x3a, 0xa8, 0xd4, 0x11, 0x71, 0x96, 0x84, 0xf9, - 0xc6, 0x6d, 0xa3, 0xd8, 0xb8, 0xbd, 0x0f, 0x60, 0x8c, 0x55, 0x59, 0x68, 0x55, 0x5b, 0xa8, 0xc1, - 0x74, 0xa5, 0xf3, 0xa7, 0xf0, 0xae, 0x92, 0x70, 0x10, 0x89, 0x33, 0xc1, 0x13, 0x75, 0x91, 0x9e, - 0x76, 0xae, 0x11, 0x75, 0x17, 0xea, 0x53, 0x43, 0x67, 0xe4, 0xcd, 0x60, 0x1c, 0x3e, 0x8e, 0x58, - 0x80, 0xb3, 0x0e, 0x5d, 0xc8, 0xd5, 0x10, 0xde, 0x2f, 0xf4, 0x95, 0x95, 0x82, 0x78, 0xce, 0x1b, - 0x5d, 0x2e, 0xf5, 0x42, 0xce, 0x92, 0xd7, 0x81, 0x90, 0x71, 0x32, 0xcb, 0x07, 0x4f, 0xab, 0x10, - 0x3c, 0xdf, 0x07, 0xf0, 0x14, 0xa1, 0xfe, 0x16, 0x13, 0xdc, 0x0d, 0xa6, 0x2b, 0x9d, 0x7f, 0xb5, - 0x80, 0x28, 0x66, 0x66, 0x82, 0x7f, 0x1c, 0x78, 0x72, 0x9a, 0xf0, 0x95, 0x93, 0xa9, 0xdc, 0xe8, - 0xaf, 0xb4, 0x66, 0xf4, 0x57, 0xc6, 0xc1, 0xca, 0xd2, 0xe8, 0xaf, 0x82, 0xe8, 0x74, 0xf4, 0xf7, - 0x18, 0x1a, 0xd8, 0x49, 0xe1, 0xec, 0x4f, 0x8f, 0x62, 0x70, 0xf6, 0x77, 0xb2, 0x72, 0xf6, 0x57, - 0x45, 0x82, 0x35, 0xb3, 0xbf, 0x5a, 0x7e, 0xf6, 0x37, 0x82, 0x07, 0xcb, 0x5f, 0x22, 0xd6, 0x8f, - 0x37, 0x7f, 0x07, 0xea, 0x13, 0x43, 0x64, 0xca, 0xc3, 0x27, 0xc5, 0x90, 0x58, 0xe4, 0x44, 0x33, - 0x6a, 0xe7, 0xef, 0x4a, 0xd0, 0xcc, 0xcd, 0xd5, 0xd7, 0xe8, 0xbd, 0x03, 0x35, 0xe6, 0xfb, 0x09, - 0x17, 0x22, 0x7d, 0x2f, 0x03, 0xe6, 0x45, 0x2a, 0x17, 0x44, 0x2a, 0xd6, 0xfc, 0xba, 0x03, 0xcb, - 0xd5, 0xfc, 0x04, 0x2a, 0x13, 0x26, 0x47, 0xa6, 0x7e, 0xc7, 0x75, 0xa6, 0xa9, 0x6a, 0x4e, 0x53, - 0xf9, 0x91, 0xb6, 0x9e, 0x7c, 0x64, 0x23, 0xed, 0x1d, 0xd8, 0xe0, 0xe3, 0xf8, 0x67, 0x01, 0xe6, - 0xbe, 0x06, 0xd5, 0x80, 0x52, 0xd5, 0x0d, 0x0b, 0x43, 0x2e, 0xcd, 0x28, 0xc4, 0x40, 0x8a, 0xb9, - 0x32, 0x23, 0xd3, 0x13, 0xe1, 0x1a, 0xd5, 0x1a, 0xf8, 0x3e, 0x8f, 0x4c, 0x2f, 0x64, 0xa0, 0xf5, - 0x73, 0x10, 0xe7, 0x3b, 0xf3, 0x5c, 0xe9, 0xcf, 0x21, 0xab, 0x9f, 0x2b, 0xf7, 0x28, 0xa5, 0x95, - 0x63, 0xe8, 0x72, 0x71, 0x4a, 0x9a, 0x9b, 0x46, 0xe2, 0x1a, 0x1b, 0x7f, 0x9e, 0x04, 0xd7, 0xdc, - 0x77, 0x2f, 0x92, 0x78, 0x6c, 0x5e, 0xa9, 0x69, 0x70, 0x5f, 0x25, 0xf1, 0x98, 0x7c, 0x06, 0xbb, - 0xba, 0x45, 0x17, 0xdc, 0x77, 0x71, 0xc3, 0x4c, 0x1a, 0x71, 0x4e, 0xae, 0x1d, 0xfd, 0x21, 0x36, - 0xec, 0x82, 0xfb, 0xfd, 0x6c, 0x7f, 0x5f, 0x6d, 0xeb, 0xb1, 0x53, 0xe4, 0xa5, 0xec, 0xf5, 0xc3, - 0x82, 0x46, 0x21, 0xf7, 0xdf, 0xc0, 0xaa, 0x23, 0xdf, 0x06, 0xad, 0xf9, 0x1d, 0x26, 0x23, 0x73, - 0xa6, 0xba, 0xca, 0xcf, 0xfd, 0x72, 0x44, 0x3e, 0xc6, 0x77, 0xc0, 0x5f, 0x99, 0xac, 0x55, 0x3f, - 0xe6, 0x18, 0x5a, 0x9a, 0x52, 0xa9, 0x6b, 0xcd, 0xcf, 0x11, 0xa9, 0x1d, 0x2f, 0x9f, 0x50, 0xbb, - 0x34, 0x23, 0x73, 0xfe, 0xc7, 0xd2, 0x21, 0xe4, 0x84, 0x5d, 0x73, 0xbf, 0x6b, 0xac, 0x32, 0x67, - 0xaf, 0x56, 0xd1, 0x5e, 0x57, 0xfd, 0x10, 0xf0, 0x04, 0x1a, 0x17, 0xec, 0x3a, 0x9e, 0x26, 0x81, - 0xd4, 0xaa, 0xa9, 0xd3, 0x39, 0xe2, 0x96, 0xd8, 0xfa, 0x1c, 0x5a, 0x3a, 0xd7, 0xbb, 0x79, 0x17, - 0x6e, 0x6a, 0x9c, 0x9e, 0xe0, 0xfc, 0x2a, 0x6c, 0xeb, 0xa0, 0x28, 0x46, 0x71, 0x22, 0xb1, 0x99, - 0x15, 0xc6, 0x5e, 0xb7, 0x70, 0xe3, 0x44, 0xe1, 0x55, 0x53, 0x2b, 0x54, 0x1e, 0xe0, 0x91, 0x30, - 0x05, 0x9b, 0x5a, 0x2a, 0x3b, 0x0a, 0x84, 0x2b, 0xb9, 0x48, 0xcd, 0xb6, 0x1a, 0x88, 0x53, 0x2e, - 0xe4, 0x9b, 0x4a, 0xbd, 0x62, 0x6f, 0x38, 0xbf, 0xb0, 0x74, 0xf4, 0x5e, 0x9a, 0x07, 0xac, 0x31, - 0xcb, 0xc5, 0xba, 0xae, 0xb4, 0x5c, 0xd7, 0x0d, 0xe0, 0xe9, 0x48, 0x87, 0x61, 0x97, 0x25, 0xde, - 0x28, 0xb8, 0xe6, 0xae, 0x98, 0x4e, 0x26, 0x4a, 0x76, 0x1e, 0xb1, 0xf3, 0xd0, 0xcc, 0x82, 0xea, - 0xf4, 0x89, 0x21, 0xeb, 0x6a, 0xaa, 0x13, 0x4d, 0x34, 0xd0, 0x34, 0xce, 0xdf, 0x5b, 0xda, 0x18, - 0x4c, 0x7a, 0x54, 0xb9, 0xe5, 0x8e, 0xe3, 0xe7, 0x2f, 0xa0, 0x6a, 0x4a, 0x3b, 0x5d, 0x96, 0x2f, - 0xcc, 0x50, 0x72, 0x0c, 0xf7, 0x4e, 0xe7, 0x93, 0x42, 0x6a, 0x0e, 0x39, 0x9f, 0x42, 0x33, 0x87, - 0xc6, 0x34, 0x3f, 0x3c, 0x18, 0x1e, 0x7d, 0x3b, 0xd4, 0x69, 0xfe, 0x94, 0x9e, 0x9d, 0x9c, 0x0e, - 0xfa, 0xb6, 0x85, 0xe9, 0x7a, 0x88, 0xe0, 0xb7, 0x47, 0xf4, 0xf4, 0xf5, 0x4f, 0xed, 0x92, 0xf3, - 0x7d, 0x59, 0xcf, 0xd2, 0xf2, 0xe5, 0x82, 0xa9, 0x82, 0xd6, 0x08, 0x4f, 0xa0, 0x82, 0xfe, 0x63, - 0x8c, 0x49, 0xad, 0xd5, 0x07, 0xc9, 0xd8, 0x38, 0x78, 0x49, 0xc6, 0xca, 0xb8, 0xbc, 0x91, 0x0a, - 0x41, 0xd1, 0x65, 0xea, 0xe3, 0x73, 0x84, 0x52, 0x89, 0x99, 0xfe, 0xe8, 0xa4, 0x66, 0x46, 0xc4, - 0x19, 0xae, 0x8b, 0x3f, 0xbe, 0x24, 0x5c, 0x4c, 0xe2, 0x48, 0xa4, 0x91, 0x31, 0x83, 0x55, 0x90, - 0x55, 0x95, 0x7b, 0xa0, 0x0f, 0x6b, 0xfb, 0x6b, 0x18, 0x4c, 0x57, 0x12, 0xbe, 0x7a, 0x26, 0x5b, - 0xc7, 0x97, 0xfd, 0xcd, 0xe2, 0xcb, 0xae, 0xf8, 0xea, 0xbd, 0x15, 0x65, 0xf2, 0xaa, 0x49, 0xae, - 0xd6, 0x61, 0x23, 0x6b, 0xbc, 0x7f, 0x1f, 0xc8, 0x9a, 0x92, 0x2b, 0xaf, 0x8b, 0xe3, 0xc1, 0xb0, - 0xbf, 0x3f, 0xfc, 0xda, 0x94, 0x5c, 0xbd, 0xde, 0xe0, 0x58, 0x69, 0x46, 0x97, 0x5c, 0x83, 0xde, - 0xdb, 0xfd, 0xe1, 0xa0, 0x6f, 0x97, 0x15, 0xd4, 0xeb, 0x0e, 0x7b, 0x83, 0xb7, 0x83, 0xbe, 0x5d, - 0x71, 0xfe, 0xc3, 0xd2, 0x1d, 0x79, 0xb1, 0xe4, 0xed, 0x73, 0x2f, 0x10, 0xeb, 0x7f, 0x8b, 0x79, - 0x02, 0x0d, 0xf3, 0x9e, 0xfb, 0xa9, 0xa5, 0xcd, 0x11, 0xe4, 0x0f, 0x61, 0xcb, 0x37, 0xe7, 0xdd, - 0x82, 0xe5, 0x7d, 0xb2, 0x38, 0xdb, 0x58, 0x75, 0xe5, 0x5e, 0xba, 0x30, 0xcf, 0xd3, 0xf6, 0x0b, - 0xb0, 0xf3, 0x11, 0xb4, 0x8b, 0x14, 0x85, 0x8f, 0x7d, 0xa7, 0xf0, 0xb1, 0x96, 0xf3, 0x2f, 0x25, - 0xd8, 0x5a, 0xf8, 0x3f, 0x84, 0xf5, 0x39, 0x7f, 0x71, 0x38, 0x5c, 0x5a, 0x1a, 0x0e, 0x93, 0x8f, - 0x80, 0xe4, 0x49, 0xdc, 0xfc, 0x94, 0xcd, 0xce, 0x11, 0xea, 0x58, 0x95, 0x2f, 0x22, 0x2a, 0xf7, - 0x29, 0x22, 0xc8, 0xe7, 0xd0, 0x12, 0xb1, 0x17, 0xb0, 0xd0, 0x0d, 0x83, 0xe8, 0x2a, 0xfd, 0xe7, - 0x8f, 0x85, 0x7f, 0x29, 0x38, 0x41, 0x8a, 0xb7, 0x8a, 0x80, 0x36, 0xc5, 0x1c, 0x20, 0xbf, 0x07, - 0x3b, 0x3c, 0x12, 0x6e, 0x5a, 0x48, 0xba, 0x7e, 0xf6, 0xef, 0x1e, 0xe5, 0xe5, 0xd9, 0xe7, 0x52, - 0xa5, 0x4a, 0x09, 0x5f, 0x44, 0x09, 0x47, 0x00, 0x50, 0x76, 0x93, 0xf6, 0xb3, 0xb9, 0x6a, 0xcf, - 0x2a, 0x56, 0x7b, 0x07, 0xd0, 0x34, 0x8d, 0xb0, 0x6a, 0xc8, 0xf0, 0x09, 0xdb, 0x2f, 0x7f, 0x65, - 0x7e, 0x63, 0x77, 0xfe, 0xef, 0x41, 0x87, 0xe6, 0xbf, 0x83, 0x0c, 0xd3, 0x3d, 0xec, 0xfc, 0xf3, - 0xa7, 0x9d, 0xbf, 0xb5, 0xa0, 0xad, 0x44, 0xcc, 0xdd, 0xfc, 0xdb, 0xd0, 0x4c, 0x32, 0x28, 0x1d, - 0x8e, 0xec, 0xe4, 0x06, 0x8a, 0xd9, 0x26, 0xcd, 0x13, 0x92, 0x97, 0xb0, 0x23, 0xa6, 0xe7, 0xe9, - 0x54, 0xf1, 0x8d, 0x88, 0xa3, 0x57, 0x33, 0xc9, 0xd3, 0xe2, 0x6b, 0xe5, 0x1e, 0xf9, 0x08, 0xb6, - 0xd3, 0x29, 0xf0, 0xfc, 0x80, 0x1e, 0x8d, 0x2f, 0x6f, 0x38, 0xdf, 0x59, 0x59, 0x21, 0xa3, 0xf2, - 0x28, 0x36, 0x21, 0x99, 0x89, 0xa9, 0xe5, 0xca, 0x4c, 0xf9, 0x1e, 0x54, 0xcd, 0xef, 0x49, 0x3a, - 0x0b, 0x18, 0x28, 0x6f, 0xa4, 0x95, 0x82, 0x91, 0x3e, 0x81, 0x86, 0xc9, 0xbc, 0x5c, 0x99, 0x45, - 0x59, 0x15, 0x81, 0x19, 0x62, 0xee, 0xaf, 0xd5, 0x7c, 0xf1, 0xfb, 0xcf, 0x25, 0xd8, 0xce, 0x89, - 0xa6, 0xba, 0xf9, 0x38, 0x22, 0x9f, 0x42, 0x95, 0xe1, 0x0a, 0x65, 0x6c, 0xbf, 0x74, 0x56, 0x16, - 0x06, 0x9a, 0x78, 0x4f, 0xff, 0xa1, 0xe6, 0x04, 0xf9, 0x21, 0x6c, 0xc6, 0xa1, 0x6f, 0x48, 0xce, - 0xb2, 0x7c, 0x53, 0x44, 0x9a, 0x6a, 0x45, 0x41, 0x66, 0x3c, 0xba, 0xa6, 0xf6, 0x48, 0xa9, 0x54, - 0xfe, 0xad, 0x1a, 0xe9, 0xb6, 0x61, 0xf3, 0x60, 0xf0, 0xd3, 0x5e, 0x97, 0xf6, 0xdd, 0x6e, 0xbf, - 0x8f, 0xae, 0x4d, 0xa0, 0xdd, 0xed, 0xf5, 0x8e, 0xce, 0x86, 0xa7, 0x27, 0x06, 0x67, 0xa9, 0x56, - 0x3a, 0x25, 0xeb, 0x0f, 0xde, 0x0e, 0x74, 0xc0, 0xdb, 0x01, 0x3b, 0x23, 0xa4, 0x83, 0xc3, 0xa3, - 0x6f, 0x30, 0xf0, 0x01, 0x54, 0xdf, 0x1e, 0xf5, 0x0e, 0x54, 0xd8, 0x53, 0x51, 0xe2, 0x6c, 0x68, - 0xa0, 0x0d, 0xb2, 0x05, 0xcd, 0xb3, 0xfd, 0xbe, 0x7b, 0x76, 0xdc, 0xef, 0x2a, 0x06, 0x55, 0x62, - 0x43, 0x6b, 0xd8, 0x3d, 0x1c, 0xb8, 0xbd, 0xd7, 0xdd, 0xe1, 0xd7, 0x83, 0xbe, 0x5d, 0x73, 0xfe, - 0x48, 0xa7, 0xdf, 0x9c, 0xcb, 0x91, 0x1f, 0x2f, 0xf8, 0xe8, 0x92, 0x2d, 0xce, 0x89, 0x8b, 0xee, - 0x99, 0x29, 0xa9, 0x94, 0x53, 0xd2, 0xab, 0xcd, 0x3f, 0x68, 0xee, 0x7d, 0xfc, 0x59, 0x7a, 0xf8, - 0xbc, 0x8a, 0xab, 0x4f, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0x21, 0x27, 0xe9, 0x7c, 0x94, 0x27, - 0x00, 0x00, + 0x93, 0x3e, 0x93, 0xac, 0xcf, 0x25, 0x0b, 0x42, 0x41, 0x9e, 0x42, 0x53, 0xf1, 0x89, 0xa6, 0xe3, + 0x73, 0x9e, 0x74, 0xac, 0x67, 0xd6, 0x8b, 0x4d, 0x0a, 0x88, 0x1a, 0x2a, 0x0c, 0x79, 0x0e, 0x2d, + 0x19, 0x4b, 0x16, 0xa6, 0x14, 0x25, 0x45, 0xd1, 0x54, 0x38, 0x4d, 0xe2, 0xfc, 0x75, 0x0d, 0xaa, + 0xc8, 0x7b, 0x3a, 0x21, 0x3b, 0xb0, 0xe1, 0x85, 0xb1, 0x77, 0xa5, 0x18, 0x55, 0xa8, 0x06, 0x48, + 0x1b, 0x4a, 0x81, 0xaf, 0x76, 0x36, 0x68, 0x29, 0xf0, 0xc9, 0x97, 0x50, 0xf7, 0xe2, 0x48, 0x32, + 0x4f, 0x8a, 0x4e, 0xf9, 0x59, 0xf9, 0x45, 0xf3, 0xe5, 0x07, 0x7b, 0xe9, 0x8b, 0xec, 0x9d, 0xcc, + 0x22, 0x6f, 0x3f, 0x12, 0x92, 0x85, 0xa1, 0xba, 0x6b, 0x4f, 0x53, 0x7e, 0xf3, 0x92, 0x66, 0x9b, + 0xc8, 0x4f, 0xa0, 0x99, 0xbb, 0x69, 0xa7, 0xa2, 0x78, 0x3c, 0x2c, 0xf2, 0xe8, 0x19, 0x82, 0x19, + 0xcd, 0xd3, 0x92, 0x23, 0xd8, 0x4a, 0xd9, 0x98, 0x37, 0xe8, 0x6c, 0x3c, 0xb3, 0x5e, 0x34, 0x5f, + 0x7e, 0x38, 0xdf, 0x7e, 0xcb, 0x83, 0xd1, 0xc5, 0xdd, 0xe4, 0x0c, 0x48, 0x8e, 0x7f, 0xca, 0xb3, + 0x7a, 0x1f, 0x9e, 0x2b, 0x18, 0x90, 0x4f, 0xa0, 0x36, 0x49, 0xe2, 0x8b, 0x20, 0xe4, 0x9d, 0x9a, + 0xe2, 0xf5, 0x68, 0xce, 0x2b, 0xe5, 0x71, 0xac, 0x09, 0x68, 0x4a, 0x49, 0x0e, 0xa1, 0x6d, 0x3e, + 0x53, 0x39, 0xea, 0xf7, 0x91, 0x63, 0x61, 0x33, 0xf9, 0x18, 0x6a, 0xc6, 0x08, 0x3b, 0x0d, 0xc5, + 0xe7, 0xdd, 0xe2, 0x13, 0x9f, 0xe8, 0x45, 0x9a, 0x52, 0xe1, 0xe3, 0xa6, 0x56, 0x9b, 0x0a, 0x00, + 0xf7, 0x7a, 0xdc, 0x85, 0xdd, 0xe4, 0x33, 0x68, 0x5e, 0x4c, 0xc3, 0xf0, 0x80, 0xcf, 0xd0, 0x81, + 0x3a, 0xcd, 0xc5, 0x97, 0x40, 0x29, 0xcc, 0xe2, 0x57, 0xd3, 0x30, 0xa4, 0x79, 0x6a, 0xd4, 0x4c, + 0x0e, 0x4c, 0x05, 0x6a, 0xdd, 0x4b, 0x33, 0xcb, 0x0c, 0x48, 0x17, 0xec, 0x1b, 0x26, 0xbd, 0xd1, + 0x51, 0x14, 0xce, 0xba, 0x9e, 0x17, 0x4f, 0x23, 0xd9, 0xd9, 0x5c, 0xf5, 0x3c, 0x66, 0x91, 0x2e, + 0x91, 0x13, 0x17, 0x1e, 0x2e, 0xe2, 0x52, 0xf1, 0xda, 0xf7, 0x11, 0x6f, 0x1d, 0x17, 0xe7, 0x3f, + 0x2b, 0xd0, 0x3a, 0x9c, 0x86, 0x32, 0x48, 0x4f, 0x24, 0x50, 0x89, 0xd8, 0x98, 0x2b, 0xbf, 0x6c, + 0x50, 0xf5, 0x4d, 0x9e, 0x40, 0x43, 0x06, 0x63, 0x2e, 0x24, 0x1b, 0x4f, 0x94, 0x77, 0x96, 0xe9, + 0x1c, 0x81, 0xab, 0x3a, 0x2c, 0x79, 0x71, 0xd4, 0x29, 0xab, 0x6d, 0x73, 0x04, 0xf9, 0x12, 0xc0, + 0x8b, 0xc3, 0x38, 0x71, 0x47, 0x4c, 0x8c, 0x8c, 0x03, 0x3e, 0x9b, 0x0b, 0x9d, 0x3f, 0x7b, 0xaf, + 0x87, 0x84, 0xaf, 0x99, 0x18, 0xd1, 0x86, 0x97, 0x7e, 0x92, 0x47, 0x18, 0x03, 0x90, 0x41, 0xe0, + 0x2b, 0x07, 0x2c, 0xd3, 0x9a, 0x82, 0xf7, 0x7d, 0xf2, 0x23, 0xd8, 0xba, 0xe2, 0x33, 0x8f, 0x25, + 0xbe, 0x6b, 0xc2, 0xa6, 0x72, 0xa7, 0x06, 0x6d, 0x1b, 0xf4, 0xb1, 0xc6, 0x92, 0x87, 0x50, 0xbb, + 0xe2, 0x33, 0x77, 0x1a, 0xf8, 0xca, 0x47, 0x1a, 0xb4, 0x7a, 0xc5, 0x67, 0x67, 0x81, 0x4f, 0x3e, + 0x87, 0x6a, 0x30, 0x66, 0x97, 0x1c, 0xed, 0x1f, 0x25, 0xfb, 0xe1, 0x1a, 0xc9, 0xf6, 0x4d, 0xdc, + 0xdd, 0x47, 0x62, 0x6a, 0xf6, 0x90, 0x8f, 0xe1, 0x81, 0x37, 0x15, 0x32, 0x1e, 0x07, 0x3f, 0xd7, + 0xd1, 0x56, 0x09, 0xa6, 0x5c, 0xa0, 0x41, 0x49, 0x61, 0x49, 0x5d, 0x6d, 0xf7, 0x39, 0x34, 0xb2, + 0x3b, 0x62, 0x08, 0x0c, 0x22, 0x9f, 0xff, 0x49, 0xc7, 0x7a, 0x56, 0x7e, 0x51, 0xa6, 0x1a, 0xd8, + 0xfd, 0x37, 0x0b, 0x36, 0x0b, 0xa7, 0xe5, 0x85, 0xb7, 0x0a, 0xc2, 0xa7, 0xaa, 0x2a, 0xe5, 0x54, + 0xd5, 0x81, 0xda, 0x84, 0xcd, 0xc2, 0x98, 0xf9, 0x4a, 0x15, 0x2d, 0x9a, 0x82, 0x78, 0xdc, 0x4d, + 0xe0, 0x4b, 0xd4, 0x01, 0x3e, 0xa2, 0x06, 0xc8, 0x7b, 0x50, 0x1d, 0xf1, 0xe0, 0x72, 0x24, 0xcd, + 0xdb, 0x1a, 0x88, 0xec, 0x42, 0x1d, 0x1d, 0x5c, 0x04, 0x3f, 0xe7, 0xea, 0x4d, 0xcb, 0x34, 0x83, + 0xc9, 0x07, 0xb0, 0x99, 0xa8, 0x2f, 0x57, 0xb2, 0xe4, 0x92, 0x4b, 0xf5, 0xa6, 0x65, 0xda, 0xd2, + 0xc8, 0x53, 0x85, 0x9b, 0x07, 0xf8, 0x7a, 0x2e, 0xc0, 0x3b, 0xff, 0x65, 0xc1, 0x83, 0xb7, 0xb1, + 0xc7, 0x42, 0xa3, 0x99, 0x63, 0x23, 0xdc, 0x6f, 0x41, 0xe5, 0x8a, 0xcf, 0x84, 0x7a, 0x8a, 0xe6, + 0xcb, 0xe7, 0x73, 0x2d, 0xac, 0x20, 0xde, 0x3b, 0xe0, 0x33, 0xaa, 0xc8, 0xc9, 0xa7, 0xd0, 0x1a, + 0xa3, 0x9a, 0x98, 0xf1, 0xae, 0x92, 0xf2, 0x89, 0xf7, 0x56, 0x2b, 0x91, 0x16, 0x68, 0xf1, 0x86, + 0x13, 0x26, 0xc4, 0x4d, 0x9c, 0xf8, 0xc6, 0x6a, 0x33, 0x18, 0x5f, 0x11, 0xd3, 0xed, 0x01, 0x9f, + 0xa9, 0xd7, 0x6a, 0xd0, 0x14, 0xdc, 0xfd, 0x35, 0x28, 0x1f, 0xf0, 0xd9, 0x4a, 0x2f, 0x21, 0x50, + 0xc1, 0x74, 0xa8, 0x84, 0x68, 0x51, 0xf5, 0xed, 0xfc, 0xa3, 0x05, 0xef, 0x16, 0xae, 0xc0, 0x79, + 0xf2, 0x9a, 0x87, 0x61, 0x8c, 0xb6, 0x6b, 0x6c, 0xd6, 0xbd, 0xe6, 0x89, 0x08, 0xe2, 0x48, 0x31, + 0xdb, 0xa0, 0x6d, 0x83, 0xfe, 0x46, 0x63, 0x51, 0xfd, 0x13, 0xce, 0x95, 0xf9, 0x6b, 0xce, 0x55, + 0x04, 0xf7, 0x7d, 0x95, 0x91, 0xf9, 0x75, 0xe0, 0x71, 0x57, 0x89, 0xa2, 0xef, 0x00, 0x1a, 0x35, + 0x44, 0x81, 0xe6, 0x04, 0x72, 0x36, 0xe1, 0xe6, 0x26, 0x86, 0xe0, 0x74, 0x36, 0x51, 0x7e, 0x2d, + 0x82, 0xcb, 0x88, 0xc9, 0x69, 0xc2, 0x95, 0xfe, 0x5b, 0x74, 0x8e, 0x70, 0xbe, 0xb7, 0xc0, 0x46, + 0xb1, 0xf3, 0x39, 0x76, 0x4d, 0xde, 0xfe, 0x11, 0x6c, 0x05, 0x39, 0x2a, 0x37, 0x4b, 0xe2, 0xed, + 0x3c, 0xba, 0x20, 0xb3, 0x12, 0xa9, 0xbc, 0x24, 0x52, 0xfa, 0xb0, 0x95, 0xa2, 0x4d, 0xa7, 0x4f, + 0xb4, 0xa1, 0x8a, 0x8a, 0x14, 0x74, 0xfe, 0xc3, 0x82, 0x87, 0x6b, 0xca, 0x80, 0x3b, 0x56, 0x18, + 0x1f, 0xc0, 0xa6, 0xc9, 0x65, 0xae, 0x72, 0x6a, 0x23, 0x52, 0xcb, 0x20, 0xb5, 0x07, 0x3e, 0x82, + 0x3a, 0x8f, 0x84, 0x9b, 0x13, 0xac, 0xc6, 0x23, 0xa1, 0xde, 0xf8, 0x39, 0xb4, 0x42, 0x26, 0xa4, + 0x3b, 0x9d, 0xf8, 0x4c, 0x72, 0x1d, 0xa1, 0x2a, 0xb4, 0x89, 0xb8, 0x33, 0x8d, 0xc2, 0x3b, 0x8b, + 0x99, 0x90, 0x7c, 0xec, 0x4a, 0x76, 0x89, 0x09, 0xbf, 0x8c, 0x77, 0xd6, 0xa8, 0x53, 0x76, 0x29, + 0xc8, 0x87, 0xd0, 0x0e, 0xd1, 0x46, 0xdc, 0x28, 0xf0, 0xae, 0xd4, 0x21, 0x3a, 0x48, 0x6d, 0x2a, + 0xec, 0xd0, 0x20, 0x9d, 0x3f, 0xaf, 0xc2, 0xa3, 0xb5, 0x35, 0x0f, 0xf9, 0x75, 0xd8, 0xc9, 0x0b, + 0xe2, 0xaa, 0xbd, 0xe1, 0xcc, 0xdc, 0x9e, 0xe4, 0x04, 0x7a, 0xab, 0x57, 0x7e, 0x89, 0x9f, 0x02, + 0x75, 0xcb, 0x7c, 0x9f, 0xfb, 0x2a, 0xd4, 0xd6, 0xa9, 0x06, 0xd0, 0x4e, 0xce, 0x51, 0xc9, 0xdc, + 0x57, 0xc5, 0x44, 0x9d, 0xa6, 0x20, 0xd2, 0x8f, 0xa7, 0x28, 0x53, 0x53, 0xd3, 0x2b, 0x00, 0xe9, + 0x13, 0x3e, 0x8e, 0xaf, 0xb9, 0xaf, 0x72, 0x7d, 0x9d, 0xa6, 0x20, 0x79, 0x06, 0xad, 0x11, 0x13, + 0xae, 0x62, 0xeb, 0x4e, 0x85, 0xca, 0xda, 0x75, 0x0a, 0x23, 0x26, 0xba, 0x88, 0x3a, 0x53, 0xa1, + 0xff, 0x9a, 0x27, 0xc1, 0x45, 0x5a, 0x67, 0x0b, 0xc9, 0xe4, 0x54, 0x27, 0xe5, 0x32, 0x25, 0xf9, + 0xa5, 0x13, 0xb5, 0xa2, 0xca, 0xe3, 0x64, 0x2a, 0x64, 0x4a, 0xb9, 0xa5, 0x28, 0x9b, 0x0a, 0x67, + 0x48, 0xbe, 0x80, 0xc7, 0xa6, 0x66, 0x74, 0x13, 0xfe, 0xc7, 0x53, 0x2e, 0xa4, 0xd6, 0xa2, 0xda, + 0xc2, 0x3b, 0xb6, 0xda, 0xd1, 0x31, 0x24, 0x54, 0x53, 0x28, 0x65, 0xe2, 0x7e, 0xbe, 0x7e, 0xbb, + 0x76, 0x83, 0xed, 0xb5, 0xdb, 0x7b, 0xca, 0x33, 0xbe, 0x84, 0x27, 0x8b, 0xdb, 0xf1, 0x39, 0x24, + 0x37, 0xc7, 0x13, 0xb5, 0xff, 0x51, 0x71, 0x3f, 0x55, 0x14, 0xfa, 0xfc, 0xf5, 0x0c, 0xb4, 0x00, + 0x0f, 0xd6, 0x33, 0xd0, 0x12, 0x3c, 0x87, 0x96, 0x1f, 0x88, 0x49, 0xc8, 0x66, 0xda, 0xbe, 0x76, + 0x94, 0xea, 0x9b, 0x06, 0x87, 0x36, 0xe6, 0xdc, 0x2c, 0xfb, 0x7b, 0x5a, 0xb8, 0xac, 0xf6, 0xf7, + 0x25, 0xa3, 0x2e, 0xad, 0x30, 0xea, 0x45, 0xcb, 0x2d, 0x2f, 0x59, 0xae, 0xf3, 0x0a, 0x76, 0x17, + 0x0f, 0x3e, 0x9e, 0x9e, 0x87, 0x81, 0xd7, 0x1b, 0xb1, 0x3b, 0xc6, 0x1a, 0xe7, 0x1f, 0xca, 0xb0, + 0x59, 0x68, 0x38, 0xfe, 0xcf, 0x7d, 0x2d, 0xe5, 0x98, 0x4f, 0xa1, 0x39, 0x49, 0x82, 0x6b, 0x26, + 0xb9, 0x7b, 0xc5, 0x67, 0x26, 0xaf, 0x83, 0x41, 0x61, 0x36, 0x7a, 0x86, 0x51, 0x55, 0x78, 0x49, + 0x30, 0x41, 0xb9, 0x94, 0x5f, 0xb6, 0x68, 0x1e, 0x85, 0x69, 0xfe, 0x67, 0x71, 0x10, 0x19, 0xaf, + 0xac, 0x53, 0x03, 0x61, 0x12, 0xd4, 0xb6, 0xca, 0x7d, 0x95, 0xe6, 0xeb, 0x34, 0x83, 0xe7, 0x4e, + 0x53, 0xcb, 0x3b, 0xcd, 0x11, 0xd8, 0x46, 0xbb, 0xc2, 0x95, 0xb1, 0x8b, 0x7c, 0x4c, 0xed, 0xf4, + 0xe1, 0xba, 0xb6, 0xca, 0x90, 0x9f, 0xc6, 0x6f, 0xe2, 0x20, 0xa2, 0xed, 0xa4, 0x00, 0x93, 0xcf, + 0xa0, 0x9e, 0x16, 0xf3, 0xa6, 0x79, 0x78, 0xba, 0x86, 0x91, 0xe9, 0x22, 0x04, 0xcd, 0x36, 0x60, + 0x06, 0xe3, 0x91, 0x97, 0xcc, 0x26, 0x32, 0x73, 0xfa, 0x39, 0x42, 0xe5, 0xb7, 0x09, 0xf7, 0x24, + 0x9b, 0xbb, 0xfe, 0x1c, 0x81, 0x49, 0xcb, 0x90, 0xa2, 0x03, 0xab, 0xf2, 0xa3, 0xa5, 0x5e, 0xae, + 0x3d, 0x47, 0x1f, 0xf0, 0x99, 0x70, 0x7e, 0x51, 0x82, 0xc7, 0xb7, 0xdc, 0xc8, 0xe8, 0xcb, 0xca, + 0xf4, 0xf5, 0x3e, 0xc0, 0x44, 0xd9, 0x86, 0x52, 0x97, 0xd6, 0x7f, 0x43, 0x63, 0x50, 0x5b, 0x99, + 0xd2, 0xcb, 0x79, 0xa5, 0xdf, 0x12, 0x58, 0x1f, 0xea, 0x6a, 0x24, 0x2d, 0x80, 0x1b, 0xb4, 0x8a, + 0xe0, 0xbe, 0x8f, 0x76, 0x9b, 0x36, 0x84, 0x33, 0x5c, 0xad, 0x6a, 0xc5, 0x67, 0xb8, 0x7d, 0xa5, + 0x44, 0xed, 0xbe, 0x35, 0x7d, 0x98, 0x02, 0xc8, 0x57, 0xb0, 0x9d, 0xf0, 0x6b, 0xce, 0x42, 0xee, + 0xbb, 0xa6, 0x1e, 0x4a, 0x2b, 0xe0, 0x5c, 0xcf, 0x44, 0x0d, 0x49, 0xd6, 0x9e, 0x24, 0x45, 0x84, + 0x70, 0xfe, 0xa6, 0x04, 0xf6, 0xa2, 0x5b, 0x90, 0x2f, 0x72, 0x4d, 0xfb, 0x52, 0x3d, 0xb7, 0x26, + 0x81, 0xe5, 0x5a, 0xf6, 0xaf, 0xa1, 0x65, 0x5e, 0x0f, 0x6f, 0x29, 0x3a, 0xa5, 0xc5, 0xc2, 0x7c, + 0xbd, 0x1f, 0xd2, 0xe6, 0x24, 0xfb, 0xc6, 0x96, 0xb0, 0x96, 0xd6, 0x85, 0x65, 0x65, 0x57, 0xb7, + 0x88, 0x91, 0x5e, 0x31, 0xdd, 0xf1, 0xff, 0x18, 0x1c, 0x38, 0x3f, 0x86, 0x2d, 0xb5, 0x8a, 0x02, + 0x99, 0x7c, 0x72, 0xb7, 0xf8, 0xf0, 0x39, 0xec, 0xa4, 0x1b, 0x0f, 0xf5, 0xb4, 0x46, 0x50, 0xce, + 0xee, 0xba, 0xfb, 0x77, 0xe1, 0x3d, 0xdd, 0x4b, 0xca, 0xe0, 0x3a, 0x90, 0xb3, 0x1e, 0x8f, 0x24, + 0x4f, 0x6e, 0xd9, 0x6f, 0x43, 0x39, 0xf0, 0xf5, 0xf3, 0xb6, 0x28, 0x7e, 0x3a, 0x7d, 0x1d, 0xe3, + 0x8a, 0x1c, 0xba, 0x9e, 0xc7, 0x95, 0x33, 0xdd, 0x95, 0xcb, 0x40, 0x3b, 0x4b, 0x91, 0x4b, 0x3f, + 0x10, 0xe3, 0x40, 0x88, 0x7b, 0xb0, 0x71, 0xe1, 0x83, 0x65, 0x36, 0xc3, 0x58, 0x16, 0xf2, 0x2a, + 0x47, 0x5f, 0x4b, 0x2b, 0x1e, 0x26, 0x0d, 0xcf, 0x86, 0xc1, 0x74, 0x25, 0x7a, 0x15, 0x26, 0x72, + 0xc1, 0x79, 0xa4, 0x9e, 0xaa, 0x4e, 0x6b, 0x23, 0x26, 0x4e, 0x38, 0x8f, 0x9c, 0xbf, 0xb2, 0xe0, + 0xe9, 0xed, 0x27, 0x08, 0x12, 0xc2, 0xfb, 0xcc, 0x2c, 0xbb, 0x9e, 0x5a, 0x77, 0xa3, 0x3c, 0x81, + 0xb1, 0xef, 0x17, 0x8b, 0xed, 0xfc, 0x3a, 0x8e, 0xf4, 0x31, 0x5b, 0x7f, 0x9a, 0xf3, 0x4f, 0x0d, + 0xf8, 0xc1, 0xed, 0xfb, 0x97, 0x42, 0xcd, 0x52, 0x67, 0x5e, 0xc9, 0x77, 0xe6, 0x17, 0xb0, 0x9d, + 0x17, 0x77, 0x5e, 0x73, 0xb7, 0x5f, 0xfe, 0xe4, 0xae, 0x22, 0xef, 0xe5, 0x01, 0x2c, 0xd1, 0xa9, + 0x1d, 0x2d, 0x60, 0xf2, 0x01, 0xaa, 0x52, 0x08, 0x50, 0x04, 0x2a, 0x09, 0x67, 0x69, 0xd2, 0x51, + 0xdf, 0x28, 0xb2, 0x9f, 0x5a, 0x83, 0xc9, 0x39, 0x73, 0x04, 0x26, 0x24, 0x66, 0x2c, 0xce, 0xe4, + 0x9d, 0x0c, 0xc6, 0x7a, 0xcd, 0x4c, 0x31, 0x55, 0x53, 0xd9, 0xa2, 0x29, 0x88, 0xe9, 0x8d, 0x4d, + 0xe5, 0x28, 0xeb, 0xbd, 0x0d, 0xa4, 0x3b, 0xd5, 0x49, 0x38, 0x4b, 0xa7, 0x9f, 0x2a, 0x45, 0xb4, + 0xb0, 0x53, 0x9d, 0x84, 0x33, 0xe3, 0x63, 0x4b, 0x51, 0xb4, 0xa9, 0xcb, 0x8e, 0x7c, 0x14, 0xbd, + 0x80, 0xed, 0x31, 0x1f, 0x9f, 0xf3, 0x44, 0x8c, 0x82, 0x49, 0x5a, 0xc1, 0xb5, 0xee, 0xf9, 0x90, + 0x87, 0x19, 0x07, 0x5d, 0xef, 0x51, 0x7b, 0xbc, 0x80, 0x21, 0x7f, 0x61, 0xcd, 0x6b, 0xb8, 0x55, + 0xe5, 0xe5, 0xa6, 0x3a, 0xf2, 0xd5, 0x9d, 0x8f, 0x4c, 0xdb, 0x83, 0xa5, 0x72, 0x34, 0x2b, 0xc3, + 0x96, 0x97, 0xf0, 0x99, 0x7d, 0x1e, 0x72, 0xd4, 0x40, 0x5b, 0xbb, 0x8c, 0x01, 0x17, 0x9c, 0x6d, + 0x6b, 0xc1, 0xd9, 0x9c, 0xff, 0xb6, 0xc0, 0x5e, 0xb4, 0x16, 0x02, 0x50, 0x1d, 0xc6, 0xf8, 0x65, + 0xbf, 0x43, 0xb6, 0xa0, 0x39, 0xe4, 0x37, 0x47, 0x11, 0x3f, 0x8d, 0x8f, 0x22, 0x6e, 0x5b, 0xe4, + 0x21, 0x3c, 0x18, 0xf2, 0x9b, 0x63, 0x5d, 0xc9, 0x7c, 0x9d, 0xc4, 0xd3, 0x09, 0x06, 0x3f, 0xbb, + 0x44, 0x9a, 0x50, 0x3b, 0xe4, 0x11, 0x32, 0xb1, 0xcb, 0xa4, 0x01, 0x1b, 0x14, 0x15, 0x66, 0x57, + 0x08, 0x81, 0x76, 0xaf, 0x50, 0x3f, 0xda, 0x1b, 0xc8, 0x24, 0x8b, 0xc4, 0xfb, 0xd1, 0x75, 0x20, + 0xd5, 0xe1, 0x76, 0x95, 0xec, 0x80, 0xbd, 0x98, 0xb2, 0xed, 0x1a, 0xf9, 0x01, 0xec, 0x66, 0xd8, + 0xb9, 0x4a, 0xd2, 0xf5, 0x3a, 0x79, 0x00, 0x5b, 0xd9, 0xfa, 0x41, 0x80, 0xed, 0x83, 0xdd, 0xd0, + 0x67, 0x2c, 0x3d, 0x98, 0x0d, 0xce, 0x5f, 0x5a, 0x60, 0x2f, 0x2a, 0x96, 0x74, 0x60, 0x67, 0x11, + 0xb7, 0xef, 0x87, 0xf8, 0x02, 0x8f, 0xe1, 0xe1, 0xe2, 0xca, 0x31, 0x8f, 0xfc, 0x20, 0xba, 0xb4, + 0x2d, 0xf2, 0x04, 0x3a, 0x8b, 0x8b, 0x69, 0xf4, 0xb5, 0x4b, 0xab, 0x56, 0xfb, 0xdc, 0x0b, 0xb1, + 0x8c, 0xb3, 0xcb, 0xce, 0x9f, 0x59, 0xf0, 0x68, 0xad, 0xb6, 0xf1, 0x39, 0xcf, 0xa2, 0xab, 0x28, + 0xbe, 0x89, 0xec, 0x77, 0x10, 0x98, 0x9f, 0xd9, 0x82, 0x7a, 0xee, 0x8c, 0x16, 0xd4, 0xe7, 0x3c, + 0xc9, 0x26, 0x34, 0x7a, 0x2c, 0xf2, 0x78, 0x18, 0x72, 0xdf, 0xae, 0xe0, 0xbe, 0x53, 0xec, 0x56, + 0xb8, 0x6f, 0x6f, 0x90, 0x6d, 0xd8, 0x3c, 0x8b, 0x14, 0xf8, 0x6d, 0x9c, 0xc8, 0xd1, 0xcc, 0xae, + 0x3a, 0xdf, 0x5b, 0xd0, 0x42, 0x7b, 0x7c, 0x15, 0xc7, 0x57, 0x63, 0x96, 0x5c, 0xad, 0x0f, 0xf5, + 0xd3, 0x24, 0x34, 0x89, 0x0b, 0x3f, 0xb3, 0x9e, 0xbf, 0x9c, 0xeb, 0xf9, 0x1f, 0x43, 0x43, 0xd5, + 0xeb, 0x2e, 0xd2, 0xea, 0xa0, 0x52, 0x57, 0x88, 0xb3, 0x24, 0xcc, 0x37, 0x6e, 0x1b, 0xc5, 0xc6, + 0xed, 0x7d, 0x00, 0x63, 0xac, 0x68, 0xa1, 0x55, 0x6d, 0xa1, 0x06, 0xd3, 0x95, 0xce, 0x9f, 0xc2, + 0xbb, 0x28, 0xe1, 0x20, 0x12, 0x67, 0x82, 0x27, 0x78, 0x90, 0x9e, 0x83, 0xae, 0x11, 0x75, 0x17, + 0xea, 0x53, 0x43, 0x67, 0xe4, 0xcd, 0x60, 0x35, 0x96, 0x1c, 0xb1, 0x40, 0xcd, 0x3a, 0x74, 0x21, + 0x57, 0x53, 0xf0, 0x7e, 0xa1, 0xaf, 0xac, 0x14, 0xc4, 0x73, 0xde, 0xe8, 0x72, 0xa9, 0x17, 0x72, + 0x96, 0xbc, 0x0e, 0x84, 0x8c, 0x93, 0x59, 0x3e, 0x78, 0x5a, 0x85, 0xe0, 0xf9, 0x3e, 0x80, 0x87, + 0x84, 0xfa, 0x2e, 0x26, 0xb8, 0x1b, 0x4c, 0x57, 0x3a, 0xff, 0x6a, 0x01, 0x41, 0x66, 0x66, 0xb6, + 0x7f, 0x1c, 0x78, 0x72, 0x9a, 0xf0, 0x95, 0x93, 0xa9, 0xdc, 0x50, 0xb0, 0xb4, 0x66, 0x28, 0x58, + 0x56, 0x83, 0x95, 0xa5, 0xa1, 0x60, 0x45, 0xa1, 0xd3, 0xa1, 0xe0, 0x63, 0x68, 0xa8, 0x4e, 0x4a, + 0x4d, 0x05, 0xf5, 0x28, 0x46, 0x4d, 0x05, 0x4f, 0x56, 0x4e, 0x05, 0xab, 0x8a, 0x60, 0xcd, 0x54, + 0xb0, 0x96, 0x9f, 0x0a, 0x8e, 0xe0, 0xc1, 0xf2, 0x4d, 0xc4, 0xfa, 0xc1, 0xe7, 0xef, 0x40, 0x7d, + 0x62, 0x88, 0x4c, 0x79, 0xf8, 0xa4, 0x18, 0x12, 0x8b, 0x9c, 0x68, 0x46, 0xed, 0xfc, 0x5d, 0x09, + 0x9a, 0xb9, 0x89, 0xfb, 0x1a, 0xbd, 0x77, 0xa0, 0xc6, 0x7c, 0x3f, 0xe1, 0x42, 0xa4, 0xef, 0x65, + 0xc0, 0xbc, 0x48, 0xe5, 0x82, 0x48, 0xc5, 0x9a, 0x5f, 0x77, 0x60, 0xb9, 0x9a, 0x9f, 0x40, 0x65, + 0xc2, 0xe4, 0xc8, 0xd4, 0xef, 0xea, 0x3b, 0xd3, 0x54, 0x35, 0xa7, 0xa9, 0xfc, 0xb0, 0xbb, 0x66, + 0x26, 0x8f, 0x66, 0xd8, 0xbd, 0x03, 0x1b, 0x7c, 0x1c, 0xff, 0x2c, 0x50, 0xb9, 0xaf, 0x41, 0x35, + 0x80, 0xaa, 0xba, 0x61, 0x61, 0xc8, 0xa5, 0x19, 0x85, 0x18, 0x08, 0x99, 0xa3, 0x19, 0x99, 0x9e, + 0x48, 0x7d, 0x2b, 0xb5, 0x06, 0xbe, 0xcf, 0x23, 0xd3, 0x0b, 0x19, 0x68, 0xfd, 0x1c, 0xc4, 0xf9, + 0xce, 0x3c, 0x57, 0xfa, 0x43, 0xc9, 0xea, 0xe7, 0xca, 0x3d, 0x4a, 0x69, 0xe5, 0x80, 0xba, 0x5c, + 0x9c, 0x92, 0xe6, 0xa6, 0x91, 0xea, 0x5b, 0x35, 0xfe, 0x3c, 0x09, 0xae, 0xb9, 0xef, 0x5e, 0x24, + 0xf1, 0xd8, 0xbc, 0x52, 0xd3, 0xe0, 0xbe, 0x4a, 0xe2, 0x31, 0xf9, 0x0c, 0x76, 0x75, 0x8b, 0x2e, + 0xb8, 0xef, 0xaa, 0x05, 0x33, 0x69, 0x54, 0x13, 0x74, 0xed, 0xe8, 0x0f, 0x55, 0xc3, 0x2e, 0xb8, + 0xdf, 0xcf, 0xd6, 0xf7, 0x71, 0x59, 0x8f, 0x9d, 0x22, 0x2f, 0x65, 0xaf, 0x1f, 0x16, 0x34, 0x4a, + 0x71, 0xff, 0x0d, 0x55, 0x75, 0xe4, 0xdb, 0xa0, 0x35, 0xbf, 0xd0, 0x64, 0x64, 0xce, 0x54, 0x57, + 0xf9, 0xb9, 0xdf, 0x94, 0xc8, 0xc7, 0xea, 0x1d, 0xd4, 0xef, 0x4f, 0xd6, 0xaa, 0x9f, 0x79, 0x0c, + 0x2d, 0x4d, 0xa9, 0xf0, 0x58, 0xf3, 0x43, 0x45, 0x6a, 0xc7, 0xcb, 0x3b, 0x70, 0x95, 0x66, 0x64, + 0xce, 0xff, 0x58, 0x3a, 0x84, 0x9c, 0xb0, 0x6b, 0xee, 0x77, 0x8d, 0x55, 0xe6, 0xec, 0xd5, 0x2a, + 0xda, 0xeb, 0xaa, 0x9f, 0x08, 0x9e, 0x40, 0xe3, 0x82, 0x5d, 0xc7, 0xd3, 0x24, 0x90, 0x5a, 0x35, + 0x75, 0x3a, 0x47, 0xdc, 0x12, 0x5b, 0x9f, 0x43, 0x4b, 0xe7, 0x7a, 0x37, 0xef, 0xc2, 0x4d, 0x8d, + 0xd3, 0x13, 0x9c, 0x5f, 0x85, 0x6d, 0x1d, 0x14, 0xc5, 0x28, 0x4e, 0xa4, 0x6a, 0x66, 0x85, 0xb1, + 0xd7, 0x2d, 0xb5, 0x70, 0x82, 0x78, 0x6c, 0x6a, 0x05, 0xe6, 0x01, 0x1e, 0x09, 0x53, 0xb0, 0xe1, + 0x27, 0xda, 0x51, 0x20, 0x5c, 0xc9, 0x45, 0x6a, 0xb6, 0xd5, 0x40, 0x9c, 0x72, 0x21, 0xdf, 0x54, + 0xea, 0x15, 0x7b, 0xc3, 0xf9, 0x85, 0xa5, 0xa3, 0xf7, 0xd2, 0x3c, 0x60, 0x8d, 0x59, 0x2e, 0xd6, + 0x75, 0xa5, 0xe5, 0xba, 0x6e, 0x00, 0x4f, 0x47, 0x3a, 0x0c, 0xbb, 0x2c, 0xf1, 0x46, 0xc1, 0x35, + 0x77, 0xc5, 0x74, 0x32, 0x41, 0xd9, 0x79, 0xc4, 0xce, 0x43, 0x33, 0x0b, 0xaa, 0xd3, 0x27, 0x86, + 0xac, 0xab, 0xa9, 0x4e, 0x34, 0xd1, 0x40, 0xd3, 0x38, 0x7f, 0x6f, 0x69, 0x63, 0x30, 0xe9, 0x11, + 0x73, 0xcb, 0x1d, 0xc7, 0xcf, 0x5f, 0x40, 0xd5, 0x94, 0x76, 0xba, 0x2c, 0x5f, 0x98, 0xa1, 0xe4, + 0x18, 0xee, 0x9d, 0xce, 0x27, 0x85, 0xd4, 0x6c, 0x72, 0x3e, 0x85, 0x66, 0x0e, 0xad, 0xd2, 0xfc, + 0xf0, 0x60, 0x78, 0xf4, 0xed, 0x50, 0xa7, 0xf9, 0x53, 0x7a, 0x76, 0x72, 0x3a, 0xe8, 0xdb, 0x96, + 0x4a, 0xd7, 0x43, 0x05, 0x7e, 0x7b, 0x44, 0x4f, 0x5f, 0xff, 0xd4, 0x2e, 0x39, 0xdf, 0x97, 0xf5, + 0x2c, 0x2d, 0x5f, 0x2e, 0x98, 0x2a, 0x68, 0x8d, 0xf0, 0x04, 0x2a, 0xca, 0x7f, 0x8c, 0x31, 0xe1, + 0x37, 0x5e, 0x48, 0xc6, 0xc6, 0xc1, 0x4b, 0x32, 0x46, 0xe3, 0xf2, 0x46, 0x18, 0x82, 0xa2, 0xcb, + 0xd4, 0xc7, 0xe7, 0x08, 0x54, 0x89, 0x99, 0xfe, 0xe8, 0xa4, 0x66, 0x46, 0xc4, 0x19, 0xae, 0xab, + 0x7e, 0x96, 0x49, 0xb8, 0x98, 0xc4, 0x91, 0x48, 0x23, 0x63, 0x06, 0x63, 0x90, 0xc5, 0xca, 0x3d, + 0xd0, 0x9b, 0xb5, 0xfd, 0x35, 0x0c, 0xa6, 0x2b, 0x09, 0x5f, 0x3d, 0x93, 0xad, 0xab, 0x97, 0xfd, + 0xcd, 0xe2, 0xcb, 0xae, 0xb8, 0xf5, 0xde, 0x8a, 0x32, 0x79, 0xd5, 0x24, 0x57, 0xeb, 0xb0, 0x91, + 0x35, 0xde, 0xbf, 0x0f, 0x64, 0x4d, 0xc9, 0x95, 0xd7, 0xc5, 0xf1, 0x60, 0xd8, 0xdf, 0x1f, 0x7e, + 0x6d, 0x4a, 0xae, 0x5e, 0x6f, 0x70, 0x8c, 0x9a, 0xd1, 0x25, 0xd7, 0xa0, 0xf7, 0x76, 0x7f, 0x38, + 0xe8, 0xdb, 0x65, 0x84, 0x7a, 0xdd, 0x61, 0x6f, 0xf0, 0x76, 0xd0, 0xb7, 0x2b, 0xce, 0xbf, 0x5b, + 0xba, 0x23, 0x2f, 0x96, 0xbc, 0x7d, 0xee, 0x05, 0x62, 0xfd, 0x6f, 0x31, 0x4f, 0xa0, 0x61, 0xde, + 0x73, 0x3f, 0xb5, 0xb4, 0x39, 0x82, 0xfc, 0x21, 0x6c, 0xf9, 0x66, 0xbf, 0x5b, 0xb0, 0xbc, 0x4f, + 0x16, 0x67, 0x1b, 0xab, 0x8e, 0xdc, 0x4b, 0x3f, 0xcc, 0xf3, 0xb4, 0xfd, 0x02, 0xec, 0x7c, 0x04, + 0xed, 0x22, 0x45, 0xe1, 0xb2, 0xef, 0x14, 0x2e, 0x6b, 0x39, 0xff, 0x52, 0x82, 0xad, 0x85, 0xff, + 0x50, 0x58, 0x9f, 0xf3, 0x17, 0x87, 0xc3, 0xa5, 0xa5, 0xe1, 0x30, 0xf9, 0x08, 0x48, 0x9e, 0xc4, + 0xcd, 0x4f, 0xd9, 0xec, 0x1c, 0xa1, 0x8e, 0x55, 0xf9, 0x22, 0xa2, 0x72, 0x9f, 0x22, 0x82, 0x7c, + 0x0e, 0x2d, 0x11, 0x7b, 0x01, 0x0b, 0xdd, 0x30, 0x88, 0xae, 0xd2, 0x7f, 0x0b, 0x59, 0xf8, 0x67, + 0x83, 0x13, 0x45, 0xf1, 0x16, 0x09, 0x68, 0x53, 0xcc, 0x01, 0xf2, 0x7b, 0xb0, 0xc3, 0x23, 0xe1, + 0xa6, 0x85, 0xa4, 0xeb, 0x67, 0xff, 0x08, 0x52, 0x5e, 0x9e, 0x7d, 0x2e, 0x55, 0xaa, 0x94, 0xf0, + 0x45, 0x94, 0x70, 0x04, 0x00, 0x65, 0x37, 0x69, 0x3f, 0x9b, 0xab, 0xf6, 0xac, 0x62, 0xb5, 0x77, + 0x00, 0x4d, 0xd3, 0x08, 0x63, 0x43, 0xa6, 0x9e, 0xb0, 0xfd, 0xf2, 0x57, 0xe6, 0x27, 0x76, 0xe7, + 0xff, 0x38, 0x74, 0x68, 0xfe, 0x6f, 0xc8, 0x30, 0xdd, 0x53, 0x9d, 0x7f, 0x7e, 0xb7, 0xf3, 0xb7, + 0x16, 0xb4, 0x51, 0xc4, 0xdc, 0xc9, 0xbf, 0x0d, 0xcd, 0x24, 0x83, 0xd2, 0xe1, 0xc8, 0x4e, 0x6e, + 0xa0, 0x98, 0x2d, 0xd2, 0x3c, 0x21, 0x79, 0x09, 0x3b, 0x62, 0x7a, 0x9e, 0x4e, 0x15, 0xdf, 0x88, + 0x38, 0x7a, 0x35, 0x93, 0x3c, 0x2d, 0xbe, 0x56, 0xae, 0x91, 0x8f, 0x60, 0x3b, 0x9d, 0x02, 0xcf, + 0x37, 0xe8, 0xd1, 0xf8, 0xf2, 0x82, 0xf3, 0x9d, 0x95, 0x15, 0x32, 0x98, 0x47, 0x55, 0x13, 0x92, + 0x99, 0x18, 0x7e, 0xae, 0xcc, 0x94, 0xef, 0x41, 0xd5, 0xfc, 0x9e, 0xa4, 0xb3, 0x80, 0x81, 0xf2, + 0x46, 0x5a, 0x29, 0x18, 0xe9, 0x13, 0x68, 0x98, 0xcc, 0xcb, 0xd1, 0x2c, 0xca, 0x58, 0x04, 0x66, + 0x88, 0xb9, 0xbf, 0x56, 0xf3, 0xc5, 0xef, 0x3f, 0x97, 0x60, 0x3b, 0x27, 0x1a, 0x76, 0xf3, 0x71, + 0x44, 0x3e, 0x85, 0x2a, 0x53, 0x5f, 0x4a, 0xc6, 0xf6, 0x4b, 0x67, 0x65, 0x61, 0xa0, 0x89, 0xf7, + 0xf4, 0x1f, 0x6a, 0x76, 0x90, 0x1f, 0xc2, 0x66, 0x1c, 0xfa, 0x86, 0xe4, 0x2c, 0xcb, 0x37, 0x45, + 0xa4, 0xa9, 0x56, 0x10, 0x32, 0xe3, 0xd1, 0x35, 0xb5, 0x47, 0x4a, 0x85, 0xf9, 0xb7, 0x6a, 0xa4, + 0xdb, 0x86, 0xcd, 0x83, 0xc1, 0x4f, 0x7b, 0x5d, 0xda, 0x77, 0xbb, 0xfd, 0xbe, 0x72, 0x6d, 0x02, + 0xed, 0x6e, 0xaf, 0x77, 0x74, 0x36, 0x3c, 0x3d, 0x31, 0x38, 0x0b, 0x5b, 0xe9, 0x94, 0xac, 0x3f, + 0x78, 0x3b, 0xd0, 0x01, 0x6f, 0x07, 0xec, 0x8c, 0x90, 0x0e, 0x0e, 0x8f, 0xbe, 0x51, 0x81, 0x0f, + 0xa0, 0xfa, 0xf6, 0xa8, 0x77, 0x80, 0x61, 0x0f, 0xa3, 0xc4, 0xd9, 0xd0, 0x40, 0x1b, 0x64, 0x0b, + 0x9a, 0x67, 0xfb, 0x7d, 0xf7, 0xec, 0xb8, 0xdf, 0x45, 0x06, 0x55, 0x62, 0x43, 0x6b, 0xd8, 0x3d, + 0x1c, 0xb8, 0xbd, 0xd7, 0xdd, 0xe1, 0xd7, 0x83, 0xbe, 0x5d, 0x73, 0xfe, 0x48, 0xa7, 0xdf, 0x9c, + 0xcb, 0x91, 0x1f, 0x2f, 0xf8, 0xe8, 0x92, 0x2d, 0xce, 0x89, 0x8b, 0xee, 0x99, 0x29, 0xa9, 0x94, + 0x53, 0xd2, 0xab, 0xcd, 0x3f, 0x68, 0xee, 0x7d, 0xfc, 0x59, 0xba, 0xf9, 0xbc, 0xaa, 0xbe, 0x3e, + 0xf9, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1a, 0x4e, 0x87, 0x0c, 0xae, 0x27, 0x00, 0x00, } diff --git a/protocol/protobuf/pairing.proto b/protocol/protobuf/pairing.proto index 415021e5a..9d84630f5 100644 --- a/protocol/protobuf/pairing.proto +++ b/protocol/protobuf/pairing.proto @@ -65,6 +65,7 @@ message LocalPairingPayload { repeated Key keys = 1; MultiAccount multiaccount = 2; string password = 3; + string chatKey = 4; message Key { string name = 1; diff --git a/server/pairing/config.go b/server/pairing/config.go index a1824b000..ab84554bc 100644 --- a/server/pairing/config.go +++ b/server/pairing/config.go @@ -16,6 +16,7 @@ type SenderConfig struct { KeyUID string `json:"keyUID" validate:"required,keyuid"` Password string `json:"password" validate:"required"` + ChatKey string `json:"chatKey"` // set only in case of a Keycard user, otherwise empty DB *multiaccounts.Database `json:"-"` } diff --git a/server/pairing/events.go b/server/pairing/events.go index 9f8efe655..154314c1e 100644 --- a/server/pairing/events.go +++ b/server/pairing/events.go @@ -43,4 +43,5 @@ const ( type AccountData struct { Account *multiaccounts.Account `json:"account,omitempty"` Password string `json:"password,omitempty"` + ChatKey string `json:"chatKey,omitempty"` } diff --git a/server/pairing/payload_management.go b/server/pairing/payload_management.go index 0a1b2019e..a11c49b12 100644 --- a/server/pairing/payload_management.go +++ b/server/pairing/payload_management.go @@ -28,6 +28,7 @@ type AccountPayload struct { keys map[string][]byte multiaccount *multiaccounts.Account password string + chatKey string //flag if account already exist before sync account exist bool } @@ -47,6 +48,7 @@ func (ppm *AccountPayloadMarshaller) MarshalProtobuf() ([]byte, error) { Keys: ppm.accountKeysToProtobuf(), Multiaccount: ppm.multiaccount.ToProtobuf(), Password: ppm.password, + ChatKey: ppm.chatKey, }) } @@ -77,6 +79,7 @@ func (ppm *AccountPayloadMarshaller) UnmarshalProtobuf(data []byte) error { ppm.accountKeysFromProtobuf(pb.Keys) ppm.multiaccountFromProtobuf(pb.Multiaccount) ppm.password = pb.Password + ppm.chatKey = pb.ChatKey return nil } diff --git a/server/pairing/payload_mounter.go b/server/pairing/payload_mounter.go index 4fc2c9451..fe89984fc 100644 --- a/server/pairing/payload_mounter.go +++ b/server/pairing/payload_mounter.go @@ -107,6 +107,7 @@ func NewAccountPayloadLoader(p *AccountPayload, config *SenderConfig) (*AccountP ppr.multiaccountsDB = config.DB ppr.keyUID = config.KeyUID ppr.password = config.Password + ppr.chatKey = config.ChatKey ppr.keystorePath = config.KeystorePath return ppr, nil } diff --git a/server/pairing/payload_receiver.go b/server/pairing/payload_receiver.go index 5d9e64f45..da1442d28 100644 --- a/server/pairing/payload_receiver.go +++ b/server/pairing/payload_receiver.go @@ -99,7 +99,7 @@ func NewAccountPayloadReceiver(e *PayloadEncryptor, p *AccountPayload, config *R return NewBasePayloadReceiver(e, NewPairingPayloadMarshaller(p, l), aps, func() { - data := AccountData{Account: p.multiaccount, Password: p.password} + data := AccountData{Account: p.multiaccount, Password: p.password, ChatKey: p.chatKey} signal.SendLocalPairingEvent(Event{Type: EventReceivedAccount, Action: ActionPairingAccount, Data: data}) }, ), nil diff --git a/server/pairing/raw_message_handler.go b/server/pairing/raw_message_handler.go index 2acffa5ab..804bda97c 100644 --- a/server/pairing/raw_message_handler.go +++ b/server/pairing/raw_message_handler.go @@ -94,7 +94,11 @@ func (s *SyncRawMessageHandler) HandleRawMessage(accountPayload *AccountPayload, keystoreDir := filepath.Join(nodeConfig.KeyStoreDir, account.KeyUID) nodeConfig.KeyStoreDir = keystoreDir if accountPayload.exist { - err = s.backend.StartNodeWithAccount(*account, accountPayload.password, nodeConfig) + if len(accountPayload.chatKey) == 0 { + err = s.backend.StartNodeWithAccount(*account, accountPayload.password, nodeConfig) + } else { + err = s.backend.StartNodeWithKey(*account, accountPayload.password, accountPayload.chatKey) + } } else { accountManager := s.backend.AccountManager() err = accountManager.InitKeystore(filepath.Join(nodeConfig.RootDataDir, keystoreDir)) @@ -104,7 +108,11 @@ func (s *SyncRawMessageHandler) HandleRawMessage(accountPayload *AccountPayload, rmp.setting.InstallationID = nodeConfig.ShhextConfig.InstallationID rmp.setting.CurrentNetwork = settingCurrentNetwork - err = s.backend.StartNodeWithAccountAndInitialConfig(*account, accountPayload.password, *rmp.setting, nodeConfig, rmp.profileKeypair.Accounts) + if len(accountPayload.chatKey) == 0 { + err = s.backend.StartNodeWithAccountAndInitialConfig(*account, accountPayload.password, *rmp.setting, nodeConfig, rmp.profileKeypair.Accounts) + } else { + err = s.backend.SaveAccountAndStartNodeWithKey(*account, accountPayload.password, *rmp.setting, nodeConfig, rmp.profileKeypair.Accounts, accountPayload.chatKey) + } } if err != nil { return err diff --git a/server/pairing/server.go b/server/pairing/server.go index 672c110cb..fb1c031cb 100644 --- a/server/pairing/server.go +++ b/server/pairing/server.go @@ -172,9 +172,11 @@ func StartUpSenderServer(backend *api.GethStatusBackend, configJSON string) (str if err != nil { return "", err } - err = validateAndVerifyPassword(conf, conf.SenderConfig) - if err != nil { - return "", err + if len(conf.SenderConfig.ChatKey) == 0 { + err = validateAndVerifyPassword(conf, conf.SenderConfig) + if err != nil { + return "", err + } } ps, err := MakeFullSenderServer(backend, conf)