diff --git a/protocol/messenger_backup.go b/protocol/messenger_backup.go index 678e9daa2..e84b8a622 100644 --- a/protocol/messenger_backup.go +++ b/protocol/messenger_backup.go @@ -95,6 +95,11 @@ func (m *Messenger) BackupData(ctx context.Context) (uint64, error) { return 0, errors[0] } + keycardsToBackup, err := m.prepareSyncAllKeycardsMessage(clock) + if err != nil { + return 0, err + } + backupDetailsOnly := func() *protobuf.Backup { return &protobuf.Backup{ Clock: clock, @@ -114,6 +119,10 @@ func (m *Messenger) BackupData(ctx context.Context) (uint64, error) { DataNumber: uint32(0), TotalNumber: uint32(len(settings)), }, + KeycardsDetails: &protobuf.FetchingBackedUpDataDetails{ + DataNumber: uint32(0), + TotalNumber: uint32(1), + }, } } @@ -161,6 +170,15 @@ func (m *Messenger) BackupData(ctx context.Context) (uint64, error) { } } + // Update keycards message encode and dispatch + pb := backupDetailsOnly() + pb.KeycardsDetails.DataNumber = 1 + pb.Keycards = &keycardsToBackup + err = m.encodeAndDispatchBackupMessage(ctx, pb, chat.ID) + if err != nil { + return 0, err + } + chat.LastClockValue = clock err = m.saveChat(chat) if err != nil { diff --git a/protocol/messenger_backup_handler.go b/protocol/messenger_backup_handler.go index 94f718339..b16b42223 100644 --- a/protocol/messenger_backup_handler.go +++ b/protocol/messenger_backup_handler.go @@ -16,6 +16,7 @@ const ( SyncWakuSectionKeyContacts = "contacts" SyncWakuSectionKeyCommunities = "communities" SyncWakuSectionKeySettings = "settings" + SyncWakuSectionKeyKeycards = "keycards" ) func (m *Messenger) HandleBackup(state *ReceivedMessageState, message protobuf.Backup) []error { @@ -44,6 +45,12 @@ func (m *Messenger) HandleBackup(state *ReceivedMessageState, message protobuf.B errors = append(errors, err) } + err = m.handleBackedUpKeycards(message.Keycards) + if err != nil { + errors = append(errors, err) + } + + // Send signal about applied backup progress if m.config.messengerSignalsHandler != nil { response := wakusync.WakuBackedUpDataResponse{} @@ -51,10 +58,13 @@ func (m *Messenger) HandleBackup(state *ReceivedMessageState, message protobuf.B response.AddFetchingBackedUpDataDetails(SyncWakuSectionKeyContacts, message.ContactsDetails) response.AddFetchingBackedUpDataDetails(SyncWakuSectionKeyCommunities, message.CommunitiesDetails) response.AddFetchingBackedUpDataDetails(SyncWakuSectionKeySettings, message.SettingsDetails) + response.AddFetchingBackedUpDataDetails(SyncWakuSectionKeyKeycards, message.KeycardsDetails) m.config.messengerSignalsHandler.SendWakuFetchingBackupProgress(&response) } + state.Response.BackupHandled = true + return errors } @@ -151,14 +161,33 @@ func (m *Messenger) handleBackedUpSettings(message *protobuf.SyncSetting) error return nil } - if settingField != nil { + if settingField != nil && m.config.messengerSignalsHandler != nil { response := wakusync.WakuBackedUpDataResponse{ Setting: settingField, } - if m.config.messengerSignalsHandler != nil { - m.config.messengerSignalsHandler.SendWakuBackedUpSettings(&response) - } + m.config.messengerSignalsHandler.SendWakuBackedUpSettings(&response) + } + + return nil +} + +func (m *Messenger) handleBackedUpKeycards(message *protobuf.SyncAllKeycards) error { + if message == nil { + return nil + } + + allKeycards, err := m.syncReceivedKeycards(*message) + if err != nil { + return err + } + + if m.config.messengerSignalsHandler != nil { + response := wakusync.WakuBackedUpDataResponse{ + Keycards: allKeycards, + } + + m.config.messengerSignalsHandler.SendWakuBackedUpSettings(&response) } return nil diff --git a/protocol/messenger_backup_test.go b/protocol/messenger_backup_test.go index 9b6a3f42c..2c63da158 100644 --- a/protocol/messenger_backup_test.go +++ b/protocol/messenger_backup_test.go @@ -115,16 +115,9 @@ func (s *MessengerBackupSuite) TestBackupContacts() { _, err = WaitOnMessengerResponse( bob2, func(r *MessengerResponse) bool { - _, err := bob2.RetrieveAll() - if err != nil { - bob2.logger.Info("Failed") - return false - } - - return true - + return r.BackupHandled }, - "contacts not backed up", + "no messages", ) s.Require().NoError(err) s.Require().Len(bob2.AddedContacts(), 2) @@ -194,15 +187,9 @@ func (s *MessengerBackupSuite) TestBackupProfile() { _, err = WaitOnMessengerResponse( bob2, func(r *MessengerResponse) bool { - _, err := bob2.RetrieveAll() - if err != nil { - bob2.logger.Info("Failed") - return false - } - - return true + return r.BackupHandled }, - "profile data not backed up", + "no messages", ) s.Require().NoError(err) @@ -293,15 +280,9 @@ func (s *MessengerBackupSuite) TestBackupSettings() { _, err = WaitOnMessengerResponse( bob2, func(r *MessengerResponse) bool { - _, err := bob2.RetrieveAll() - if err != nil { - bob2.logger.Info("Failed") - return false - } - - return true + return r.BackupHandled }, - "profile data not backed up", + "no messages", ) s.Require().NoError(err) @@ -360,15 +341,9 @@ func (s *MessengerBackupSuite) TestBackupContactsGreaterThanBatch() { _, err = WaitOnMessengerResponse( bob2, func(r *MessengerResponse) bool { - _, err := bob2.RetrieveAll() - if err != nil { - s.logger.Info("Failed") - return false - } - - return true + return r.BackupHandled }, - "contacts not backed up", + "no messages", ) s.Require().NoError(err) @@ -433,15 +408,9 @@ func (s *MessengerBackupSuite) TestBackupRemovedContact() { _, err = WaitOnMessengerResponse( bob2, func(r *MessengerResponse) bool { - _, err := bob2.RetrieveAll() - if err != nil { - bob2.logger.Info("Failed") - return false - } - - return true + return r.BackupHandled }, - "contacts not backed up", + "no messages", ) // Bob 2 should remove the contact s.Require().NoError(err) @@ -486,15 +455,9 @@ func (s *MessengerBackupSuite) TestBackupLocalNickname() { _, err = WaitOnMessengerResponse( bob2, func(r *MessengerResponse) bool { - _, err := bob2.RetrieveAll() - if err != nil { - bob2.logger.Info("Failed") - return false - } - - return true + return r.BackupHandled }, - "contacts not backed up", + "no messages", ) s.Require().NoError(err) @@ -539,15 +502,9 @@ func (s *MessengerBackupSuite) TestBackupBlockedContacts() { _, err = WaitOnMessengerResponse( bob2, func(r *MessengerResponse) bool { - _, err := bob2.RetrieveAll() - if err != nil { - bob2.logger.Info("Failed") - return false - } - - return true + return r.BackupHandled }, - "contacts not backed up", + "no messages", ) s.Require().NoError(err) @@ -563,14 +520,12 @@ func (s *MessengerBackupSuite) TestBackupBlockedContacts() { _, err = bob1.BackupData(context.Background()) s.Require().NoError(err) - // Wait for the message to reach its destination _, err = WaitOnMessengerResponse( bob2, func(r *MessengerResponse) bool { - return len(bob2.BlockedContacts()) == 1 - + return r.BackupHandled }, - "blocked contact not received", + "no messages", ) s.Require().NoError(err) s.Require().Len(bob2.BlockedContacts(), 1) @@ -612,15 +567,9 @@ func (s *MessengerBackupSuite) TestBackupCommunities() { _, err = WaitOnMessengerResponse( bob2, func(r *MessengerResponse) bool { - _, err := bob2.RetrieveAll() - if err != nil { - bob2.logger.Info("Failed") - return false - } - - return true + return r.BackupHandled }, - "communities not backed up", + "no messages", ) s.Require().NoError(err) @@ -634,3 +583,40 @@ func (s *MessengerBackupSuite) TestBackupCommunities() { s.Require().NotEmpty(lastBackup) s.Require().Equal(clock, lastBackup) } + +func (s *MessengerBackupSuite) TestBackupKeycards() { + // Create bob1 + bob1 := s.m + allKeycardsToSync := getKeycardsForTest() + for _, kp := range allKeycardsToSync { + addedKc, addedAccs, err := bob1.settings.AddMigratedKeyPairOrAddAccountsIfKeyPairIsAdded(*kp) + s.Require().NoError(err) + s.Require().Equal(true, addedKc) + s.Require().Equal(false, addedAccs) + } + + // Create bob2 + bob2, err := newMessengerWithKey(s.shh, bob1.identity, s.logger, nil) + s.Require().NoError(err) + _, err = bob2.Start() + s.Require().NoError(err) + + // Backup + _, err = bob1.BackupData(context.Background()) + s.Require().NoError(err) + + // Wait for the message to reach its destination + _, err = WaitOnMessengerResponse( + bob2, + func(r *MessengerResponse) bool { + return r.BackupHandled + }, + "no messages", + ) + s.Require().NoError(err) + + syncedKeycards, err := bob2.settings.GetAllKnownKeycards() + s.Require().NoError(err) + s.Require().Equal(len(allKeycardsToSync), len(syncedKeycards)) + s.Require().True(haveSameElements(syncedKeycards, allKeycardsToSync, sameKeycards)) +} diff --git a/protocol/messenger_config.go b/protocol/messenger_config.go index 24d32bf37..0e3af2fd1 100644 --- a/protocol/messenger_config.go +++ b/protocol/messenger_config.go @@ -56,6 +56,7 @@ type MessengerSignalsHandler interface { SendWakuFetchingBackupProgress(response *wakusync.WakuBackedUpDataResponse) SendWakuBackedUpProfile(response *wakusync.WakuBackedUpDataResponse) SendWakuBackedUpSettings(response *wakusync.WakuBackedUpDataResponse) + SendWakuBackedUpKeycards(response *wakusync.WakuBackedUpDataResponse) } type config struct { diff --git a/protocol/messenger_keycard.go b/protocol/messenger_keycard.go index 10a8f2379..c45946898 100644 --- a/protocol/messenger_keycard.go +++ b/protocol/messenger_keycard.go @@ -33,15 +33,12 @@ func (m *Messenger) dispatchSyncKeycard(ctx context.Context, chatID string, sync return err } -func (m *Messenger) syncAllKeycards(ctx context.Context, rawMessageHandler RawMessageHandler) (err error) { +func (m *Messenger) prepareSyncAllKeycardsMessage(clock uint64) (message protobuf.SyncAllKeycards, err error) { allKeycards, err := m.settings.GetAllKnownKeycards() if err != nil { - return err + return message, err } - clock, chat := m.getLastClockWithRelatedChat() - - message := protobuf.SyncAllKeycards{} message.Clock = clock for _, kc := range allKeycards { @@ -52,6 +49,17 @@ func (m *Messenger) syncAllKeycards(ctx context.Context, rawMessageHandler RawMe message.Keycards = append(message.Keycards, syncKeycard) } + return +} + +func (m *Messenger) syncAllKeycards(ctx context.Context, rawMessageHandler RawMessageHandler) (err error) { + clock, chat := m.getLastClockWithRelatedChat() + + message, err := m.prepareSyncAllKeycardsMessage(clock) + if err != nil { + return err + } + err = m.dispatchSyncKeycard(ctx, chat.ID, message, rawMessageHandler) if err != nil { return err @@ -61,7 +69,7 @@ func (m *Messenger) syncAllKeycards(ctx context.Context, rawMessageHandler RawMe return m.saveChat(chat) } -func (m *Messenger) handleSyncKeycards(state *ReceivedMessageState, syncMessage protobuf.SyncAllKeycards) (err error) { +func (m *Messenger) syncReceivedKeycards(syncMessage protobuf.SyncAllKeycards) ([]*keypairs.KeyPair, error) { var keypairsToSync []*keypairs.KeyPair for _, syncKc := range syncMessage.Keycards { var kp = &keypairs.KeyPair{} @@ -69,12 +77,21 @@ func (m *Messenger) handleSyncKeycards(state *ReceivedMessageState, syncMessage keypairsToSync = append(keypairsToSync, kp) } - err = m.settings.SyncKeycards(syncMessage.Clock, keypairsToSync) + err := m.settings.SyncKeycards(syncMessage.Clock, keypairsToSync) if err != nil { - return err + return nil, err } allKeycards, err := m.settings.GetAllKnownKeycards() + if err != nil { + return nil, err + } + + return allKeycards, nil +} + +func (m *Messenger) handleSyncKeycards(state *ReceivedMessageState, syncMessage protobuf.SyncAllKeycards) (err error) { + allKeycards, err := m.syncReceivedKeycards(syncMessage) if err != nil { return err } diff --git a/protocol/messenger_response.go b/protocol/messenger_response.go index f14e30851..e176baaa5 100644 --- a/protocol/messenger_response.go +++ b/protocol/messenger_response.go @@ -47,6 +47,7 @@ type MessengerResponse struct { DiscordCategories []*discord.Category DiscordChannels []*discord.Channel DiscordOldestMessageTimestamp int + BackupHandled bool // notifications a list of notifications derived from messenger events // that are useful to notify the user about @@ -305,6 +306,7 @@ func (r *MessengerResponse) Merge(response *MessengerResponse) error { r.AddAllKnownKeycards(response.AllKnownKeycards()) r.AddKeycardActions(response.KeycardActions()) r.CommunityChanges = append(r.CommunityChanges, response.CommunityChanges...) + r.BackupHandled = response.BackupHandled return nil } diff --git a/protocol/protobuf/pairing.pb.go b/protocol/protobuf/pairing.pb.go index 10badea0e..38dddcadc 100644 --- a/protocol/protobuf/pairing.pb.go +++ b/protocol/protobuf/pairing.pb.go @@ -211,6 +211,8 @@ type Backup struct { ProfileDetails *FetchingBackedUpDataDetails `protobuf:"bytes,8,opt,name=profileDetails,proto3" json:"profileDetails,omitempty"` Setting *SyncSetting `protobuf:"bytes,9,opt,name=setting,proto3" json:"setting,omitempty"` SettingsDetails *FetchingBackedUpDataDetails `protobuf:"bytes,10,opt,name=settingsDetails,proto3" json:"settingsDetails,omitempty"` + Keycards *SyncAllKeycards `protobuf:"bytes,11,opt,name=keycards,proto3" json:"keycards,omitempty"` + KeycardsDetails *FetchingBackedUpDataDetails `protobuf:"bytes,12,opt,name=keycardsDetails,proto3" json:"keycardsDetails,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -311,6 +313,20 @@ func (m *Backup) GetSettingsDetails() *FetchingBackedUpDataDetails { return nil } +func (m *Backup) GetKeycards() *SyncAllKeycards { + if m != nil { + return m.Keycards + } + return nil +} + +func (m *Backup) GetKeycardsDetails() *FetchingBackedUpDataDetails { + if m != nil { + return m.KeycardsDetails + } + return nil +} + type MultiAccount struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Timestamp int64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` @@ -2768,168 +2784,170 @@ func init() { } var fileDescriptor_d61ab7221f0b5518 = []byte{ - // 2602 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x39, 0x4b, 0x73, 0x1b, 0xc7, - 0xd1, 0x5e, 0x00, 0xc2, 0xa3, 0xf1, 0x20, 0x34, 0xa2, 0x25, 0x88, 0xa2, 0x4b, 0xd2, 0xda, 0x2e, - 0xeb, 0xab, 0xf2, 0x47, 0x27, 0x72, 0x12, 0x27, 0x7e, 0x94, 0x0d, 0x01, 0x88, 0x05, 0x53, 0x04, - 0x59, 0x43, 0x42, 0x8e, 0x5d, 0xa9, 0xda, 0x1a, 0xee, 0x8e, 0x88, 0x0d, 0x17, 0xbb, 0x9b, 0x9d, - 0x01, 0x15, 0xe4, 0x96, 0xbf, 0x90, 0x4b, 0x72, 0xf4, 0x39, 0xb9, 0xa5, 0xca, 0x39, 0xe5, 0x90, - 0x63, 0x6e, 0x39, 0xe4, 0x92, 0xaa, 0xe4, 0x17, 0xe4, 0x57, 0xa4, 0xa6, 0x67, 0x16, 0xd8, 0x05, - 0x01, 0x86, 0xaa, 0x9c, 0x72, 0xe2, 0x74, 0x6f, 0x77, 0x4f, 0x4f, 0xbf, 0x1b, 0x84, 0x66, 0xcc, - 0xfc, 0xc4, 0x0f, 0xcf, 0xf6, 0xe2, 0x24, 0x92, 0x11, 0xa9, 0xe2, 0x9f, 0xd3, 0xd9, 0x8b, 0x9d, - 0x5b, 0x62, 0x1e, 0xba, 0x8e, 0xe0, 0x52, 0xfa, 0xe1, 0x99, 0xd0, 0x9f, 0x77, 0x6c, 0x16, 0xc7, - 0x81, 0xef, 0x32, 0xe9, 0x47, 0xa1, 0x33, 0xe5, 0x92, 0x79, 0x4c, 0x32, 0x67, 0xca, 0x85, 0x60, - 0x67, 0x5c, 0xd3, 0xd8, 0x0c, 0xee, 0xfd, 0x98, 0x4b, 0x77, 0xe2, 0x87, 0x67, 0x4f, 0x98, 0x7b, - 0xce, 0xbd, 0x71, 0xdc, 0x67, 0x92, 0xf5, 0xb9, 0x64, 0x7e, 0x20, 0xc8, 0x7d, 0xa8, 0x23, 0x53, - 0x38, 0x9b, 0x9e, 0xf2, 0xa4, 0x63, 0x3d, 0xb0, 0x1e, 0x35, 0x29, 0x28, 0xd4, 0x08, 0x31, 0xe4, - 0x21, 0x34, 0x64, 0x24, 0x59, 0x90, 0x52, 0x14, 0x90, 0xa2, 0x8e, 0x38, 0x4d, 0x62, 0xff, 0xbd, - 0x04, 0x65, 0x25, 0x7b, 0x16, 0x93, 0x6d, 0xb8, 0xe1, 0x06, 0x91, 0x7b, 0x8e, 0x82, 0x4a, 0x54, - 0x03, 0xa4, 0x05, 0x05, 0xdf, 0x43, 0xce, 0x1a, 0x2d, 0xf8, 0x1e, 0xf9, 0x14, 0xaa, 0x6e, 0x14, - 0x4a, 0xe6, 0x4a, 0xd1, 0x29, 0x3e, 0x28, 0x3e, 0xaa, 0x3f, 0x7e, 0x73, 0x2f, 0x7d, 0xe9, 0xde, - 0xf1, 0x3c, 0x74, 0x87, 0xa1, 0x90, 0x2c, 0x08, 0xf0, 0x61, 0x3d, 0x4d, 0xf9, 0xfc, 0x31, 0x5d, - 0x30, 0x91, 0x1f, 0x41, 0xdd, 0x8d, 0xa6, 0xd3, 0x59, 0xe8, 0x4b, 0x9f, 0x8b, 0x4e, 0x09, 0x65, - 0xdc, 0xc9, 0xcb, 0xe8, 0x19, 0x82, 0x39, 0xcd, 0xd2, 0x92, 0x43, 0xd8, 0x4a, 0xc5, 0x18, 0x1b, - 0x74, 0x6e, 0x3c, 0xb0, 0x1e, 0xd5, 0x1f, 0xbf, 0xbd, 0x64, 0xbf, 0xc2, 0x60, 0x74, 0x95, 0x9b, - 0x8c, 0x81, 0x64, 0xe4, 0xa7, 0x32, 0xcb, 0xaf, 0x22, 0x73, 0x8d, 0x00, 0xf2, 0x3e, 0x54, 0xe2, - 0x24, 0x7a, 0xe1, 0x07, 0xbc, 0x53, 0x41, 0x59, 0x77, 0x97, 0xb2, 0x52, 0x19, 0x47, 0x9a, 0x80, - 0xa6, 0x94, 0xe4, 0x00, 0x5a, 0xe6, 0x98, 0xea, 0x51, 0x7d, 0x15, 0x3d, 0x56, 0x98, 0xc9, 0x7b, - 0x50, 0x31, 0x11, 0xd7, 0xa9, 0xa1, 0x9c, 0xd7, 0xf3, 0x26, 0x3e, 0xd6, 0x1f, 0x69, 0x4a, 0xa5, - 0x8c, 0x9b, 0x86, 0x68, 0xaa, 0x00, 0xbc, 0x92, 0x71, 0x57, 0xb8, 0xed, 0x3f, 0x95, 0xa0, 0x71, - 0x30, 0x0b, 0xa4, 0xdf, 0x75, 0xdd, 0x68, 0x16, 0x4a, 0x42, 0xa0, 0x14, 0xb2, 0x29, 0xc7, 0xf8, - 0xaa, 0x51, 0x3c, 0x93, 0x5d, 0xa8, 0x49, 0x7f, 0xca, 0x85, 0x64, 0xd3, 0x18, 0xa3, 0xac, 0x48, - 0x97, 0x08, 0xf5, 0xd5, 0xf7, 0x78, 0x28, 0x7d, 0x37, 0x0a, 0x3b, 0x45, 0x64, 0x5b, 0x22, 0xc8, - 0x67, 0x00, 0x6e, 0x14, 0x44, 0x89, 0x33, 0x61, 0x62, 0x62, 0x02, 0xe9, 0xe1, 0x52, 0xd9, 0xec, - 0xdd, 0x7b, 0xbd, 0x28, 0x88, 0x66, 0xc9, 0x53, 0x26, 0x26, 0xb4, 0x86, 0x4c, 0xea, 0x48, 0x3a, - 0x50, 0x41, 0x60, 0xe8, 0x61, 0x20, 0x15, 0x69, 0x0a, 0x92, 0x77, 0x60, 0xeb, 0x9c, 0xcf, 0x5d, - 0x96, 0x78, 0x8e, 0x49, 0x6b, 0x0c, 0x8b, 0x1a, 0x6d, 0x19, 0xf4, 0x91, 0xc6, 0x92, 0x3b, 0x50, - 0x39, 0xe7, 0x73, 0x67, 0xe6, 0x7b, 0xe8, 0xeb, 0x1a, 0x2d, 0x9f, 0xf3, 0xf9, 0xd8, 0xf7, 0xc8, - 0xc7, 0x50, 0xf6, 0xa7, 0xec, 0x8c, 0x2b, 0x3f, 0x2a, 0xcd, 0xde, 0xda, 0xa0, 0xd9, 0x10, 0xdf, - 0x23, 0xe7, 0x43, 0x45, 0x4c, 0x0d, 0xcf, 0x8e, 0x0d, 0xb0, 0x54, 0x59, 0xa5, 0xa6, 0x1f, 0x7a, - 0xfc, 0x17, 0x1d, 0xeb, 0x41, 0xf1, 0x51, 0x91, 0x6a, 0x60, 0xe7, 0x1f, 0x16, 0x34, 0x73, 0xdc, - 0x59, 0x65, 0xac, 0x9c, 0x32, 0xa9, 0xe9, 0x0b, 0x19, 0xd3, 0x77, 0xa0, 0x12, 0xb3, 0x79, 0x10, - 0x31, 0x0f, 0x4d, 0xdb, 0xa0, 0x29, 0xa8, 0xae, 0x7b, 0xe9, 0x7b, 0x52, 0xd9, 0x54, 0x19, 0x45, - 0x03, 0xe4, 0x36, 0x94, 0x27, 0xdc, 0x3f, 0x9b, 0x48, 0x63, 0x2b, 0x03, 0x91, 0x1d, 0xa8, 0xaa, - 0xc0, 0x13, 0xfe, 0x2f, 0x39, 0xda, 0xa8, 0x48, 0x17, 0x30, 0x79, 0x13, 0x9a, 0x09, 0x9e, 0x1c, - 0xc9, 0x92, 0x33, 0x2e, 0xd1, 0x46, 0x45, 0xda, 0xd0, 0xc8, 0x13, 0xc4, 0x2d, 0x0b, 0x4f, 0x35, - 0x53, 0x78, 0xec, 0xbf, 0x59, 0x70, 0xeb, 0x59, 0xe4, 0xb2, 0xc0, 0x58, 0xfa, 0xc8, 0x28, 0xf7, - 0x7d, 0x28, 0x9d, 0xf3, 0xb9, 0x40, 0x53, 0xe4, 0xfc, 0xbd, 0x86, 0x78, 0x6f, 0x9f, 0xcf, 0x29, - 0x92, 0x93, 0x0f, 0xa1, 0x31, 0x55, 0x66, 0x67, 0xda, 0xec, 0x68, 0x89, 0xfa, 0xe3, 0xdb, 0xeb, - 0x9d, 0x42, 0x73, 0xb4, 0xea, 0x85, 0x31, 0x13, 0xe2, 0x65, 0x94, 0x78, 0x26, 0x0a, 0x17, 0xf0, - 0xce, 0xff, 0x43, 0x71, 0x9f, 0xcf, 0xd7, 0xc6, 0x36, 0x81, 0x92, 0x2a, 0xc6, 0x78, 0x55, 0x83, - 0xe2, 0xd9, 0xfe, 0xc6, 0x82, 0xb6, 0xd2, 0x31, 0x5b, 0x25, 0x37, 0x54, 0xde, 0x77, 0x60, 0xcb, - 0xcf, 0x50, 0x39, 0x8b, 0x32, 0xdc, 0xca, 0xa2, 0x87, 0x1e, 0xf6, 0x01, 0x7e, 0xe1, 0xbb, 0xdc, - 0x91, 0xf3, 0x98, 0x1b, 0x0d, 0x41, 0xa3, 0x4e, 0xe6, 0x31, 0x5f, 0x28, 0x57, 0xca, 0x7b, 0xff, - 0x82, 0x27, 0xc2, 0x8f, 0x42, 0x74, 0x67, 0x93, 0xa6, 0xa0, 0xfd, 0x2f, 0x0b, 0xee, 0x6c, 0x28, - 0xe4, 0xd7, 0xec, 0x11, 0x6f, 0x42, 0xd3, 0x54, 0x23, 0x07, 0xc3, 0xd9, 0xa8, 0xd4, 0x30, 0x48, - 0x1d, 0xab, 0x77, 0xa1, 0xca, 0x43, 0xe1, 0x64, 0x14, 0xab, 0xf0, 0x50, 0x8c, 0x94, 0x6e, 0x0f, - 0xa1, 0x11, 0x30, 0x21, 0x9d, 0x59, 0xec, 0x31, 0xc9, 0x75, 0x6e, 0x96, 0x68, 0x5d, 0xe1, 0xc6, - 0x1a, 0xa5, 0xde, 0x2c, 0xe6, 0x42, 0xf2, 0xa9, 0x23, 0xd9, 0x99, 0x2a, 0xd9, 0x45, 0xf5, 0x66, - 0x8d, 0x3a, 0x61, 0x67, 0x82, 0xbc, 0x0d, 0xad, 0x40, 0x05, 0x84, 0x13, 0xfa, 0xee, 0x39, 0x5e, - 0xa2, 0xd3, 0xb3, 0x89, 0xd8, 0x91, 0x41, 0xda, 0xbf, 0x2a, 0xc3, 0xdd, 0x8d, 0x5d, 0x8b, 0x7c, - 0x07, 0xb6, 0xb3, 0x8a, 0x38, 0xc8, 0x1b, 0xcc, 0xcd, 0xeb, 0x49, 0x46, 0xa1, 0x67, 0xfa, 0xcb, - 0xff, 0xb0, 0x29, 0x94, 0x6f, 0x99, 0xe7, 0x71, 0x0f, 0xfb, 0x45, 0x95, 0x6a, 0x40, 0xc5, 0xc9, - 0xa9, 0x72, 0x32, 0xf7, 0xb0, 0x1d, 0x54, 0x69, 0x0a, 0x2a, 0xfa, 0xe9, 0x4c, 0xe9, 0x54, 0xd7, - 0xf4, 0x08, 0x28, 0xfa, 0x84, 0x4f, 0xa3, 0x0b, 0xee, 0x75, 0x1a, 0x9a, 0xde, 0x80, 0xe4, 0x01, - 0x34, 0x26, 0x4c, 0x38, 0x28, 0xd6, 0x99, 0x89, 0x4e, 0x13, 0x3f, 0xc3, 0x84, 0x89, 0xae, 0x42, - 0x8d, 0x55, 0xcf, 0xba, 0x75, 0xc1, 0x13, 0xff, 0x45, 0x3a, 0x16, 0x09, 0xc9, 0xe4, 0x4c, 0x74, - 0x5a, 0x58, 0x33, 0x48, 0xf6, 0xd3, 0x31, 0x7e, 0xc1, 0x01, 0x27, 0x99, 0x09, 0x99, 0x52, 0x6e, - 0x21, 0x65, 0x1d, 0x71, 0x86, 0xe4, 0x13, 0xb8, 0x67, 0xba, 0xbe, 0x93, 0xf0, 0x9f, 0xcf, 0xb8, - 0x90, 0xda, 0x8b, 0xc8, 0xc2, 0x3b, 0x6d, 0xe4, 0xe8, 0x18, 0x12, 0xaa, 0x29, 0xd0, 0x99, 0x8a, - 0x9f, 0x6f, 0x66, 0xd7, 0x69, 0x70, 0x73, 0x23, 0x7b, 0x0f, 0x33, 0xe3, 0x53, 0xd8, 0x5d, 0x65, - 0x57, 0xe6, 0x90, 0xdc, 0x5c, 0x4f, 0x90, 0xff, 0x6e, 0x9e, 0x9f, 0x22, 0x85, 0xbe, 0x7f, 0xb3, - 0x00, 0xad, 0xc0, 0xad, 0xcd, 0x02, 0xb4, 0x06, 0x0f, 0xa1, 0xe1, 0xf9, 0x22, 0x0e, 0xd8, 0x5c, - 0xc7, 0xd7, 0x36, 0xba, 0xbe, 0x6e, 0x70, 0x2a, 0xc6, 0xec, 0x97, 0x97, 0xf3, 0x3d, 0x6d, 0xd9, - 0xeb, 0xf3, 0xfd, 0x52, 0x50, 0x17, 0xd6, 0x04, 0xf5, 0x6a, 0xe4, 0x16, 0x2f, 0x45, 0xae, 0xfd, - 0x04, 0x76, 0x56, 0x2f, 0x3e, 0x9a, 0x9d, 0x06, 0xbe, 0xdb, 0x9b, 0xb0, 0x6b, 0xd6, 0x1a, 0xfb, - 0xdb, 0x22, 0x34, 0x73, 0x23, 0xe3, 0x7f, 0xe4, 0x6b, 0x60, 0x62, 0xde, 0x87, 0x7a, 0x9c, 0xf8, - 0x17, 0x4c, 0x72, 0xe7, 0x9c, 0xcf, 0x4d, 0x07, 0x04, 0x83, 0x52, 0x15, 0xfd, 0x81, 0xaa, 0xaa, - 0xc2, 0x4d, 0xfc, 0x58, 0xe9, 0x85, 0x79, 0xd9, 0xa0, 0x59, 0x94, 0x6a, 0x88, 0x3f, 0x8b, 0xfc, - 0xd0, 0x64, 0x65, 0x95, 0x1a, 0x48, 0xb5, 0x0b, 0x1d, 0xab, 0xdc, 0xc3, 0x86, 0x58, 0xa5, 0x0b, - 0x78, 0x99, 0x34, 0x95, 0x6c, 0xd2, 0x1c, 0x42, 0xdb, 0x78, 0x57, 0x38, 0x32, 0x72, 0x94, 0x1c, - 0x33, 0x35, 0xbc, 0xbd, 0x69, 0x30, 0x36, 0xe4, 0x27, 0xd1, 0x17, 0x91, 0x1f, 0xd2, 0x56, 0x92, - 0x83, 0xc9, 0x47, 0x50, 0x4d, 0xc7, 0x31, 0x33, 0xfe, 0xdd, 0xdf, 0x20, 0xc8, 0xcc, 0x81, 0x82, - 0x2e, 0x18, 0xd4, 0xd4, 0xc5, 0x43, 0x37, 0x99, 0xc7, 0x72, 0x91, 0xf4, 0x4b, 0x84, 0xfa, 0x2a, - 0x62, 0xee, 0x4a, 0xb6, 0x4c, 0xfd, 0x25, 0x42, 0x35, 0x2d, 0x43, 0xaa, 0x12, 0x18, 0x1b, 0x75, - 0x03, 0x2d, 0xd7, 0x5a, 0xa2, 0xf7, 0xf9, 0x5c, 0xd8, 0x7f, 0xb5, 0xe0, 0xde, 0x15, 0x2f, 0x32, - 0xfe, 0xb2, 0x16, 0xfe, 0x7a, 0x03, 0x20, 0xc6, 0xd8, 0x40, 0x77, 0x69, 0xff, 0xd7, 0x34, 0x46, - 0x79, 0x6b, 0xe1, 0xf4, 0x62, 0xd6, 0xe9, 0x57, 0x14, 0xd6, 0x3b, 0x50, 0x71, 0x27, 0x4c, 0xaa, - 0xae, 0x7a, 0x43, 0x8f, 0x4a, 0x0a, 0x1c, 0x7a, 0x2a, 0x6e, 0xd3, 0x91, 0x7e, 0xae, 0xbe, 0x96, - 0xb5, 0xe3, 0x17, 0xb8, 0x21, 0x3a, 0x51, 0xa7, 0x6f, 0x45, 0x5f, 0x86, 0x80, 0xfd, 0xeb, 0x02, - 0xb4, 0x57, 0xc3, 0x99, 0x7c, 0x92, 0x59, 0x97, 0x2e, 0x4d, 0x2c, 0x1b, 0x1a, 0x4f, 0x66, 0x59, - 0xfa, 0x1c, 0x1a, 0xe6, 0xd5, 0x4a, 0x3b, 0xd1, 0x29, 0xac, 0x8e, 0x92, 0x9b, 0xf3, 0x87, 0xd6, - 0xe3, 0xc5, 0x59, 0x90, 0x8f, 0xa0, 0x92, 0x4e, 0x3e, 0x45, 0x8c, 0x87, 0x2b, 0xd4, 0x48, 0x87, - 0xa0, 0x94, 0xe3, 0xbf, 0x58, 0xd9, 0xec, 0x0f, 0x60, 0x0b, 0xbf, 0x2a, 0x85, 0x4c, 0x1f, 0xb8, - 0x5e, 0x5e, 0x7f, 0x0c, 0xdb, 0x29, 0xe3, 0x81, 0x5e, 0x8a, 0x05, 0xe5, 0xec, 0xba, 0xdc, 0x9f, - 0xc1, 0x6d, 0xc5, 0xdd, 0x75, 0xa5, 0x7f, 0xe1, 0xcb, 0x79, 0x8f, 0x87, 0x92, 0x27, 0x57, 0xf0, - 0xb7, 0xa1, 0xe8, 0x7b, 0xda, 0xbc, 0x0d, 0xaa, 0x8e, 0x76, 0x5f, 0xd7, 0xa6, 0xbc, 0x84, 0xae, - 0xeb, 0x72, 0x4c, 0x82, 0xeb, 0x4a, 0x19, 0xe8, 0x20, 0xcf, 0x4b, 0xe9, 0xfb, 0x62, 0xea, 0x0b, - 0xf1, 0x0a, 0x62, 0xbe, 0xb1, 0xa0, 0xa1, 0xe4, 0x3c, 0x89, 0xa2, 0xf3, 0x29, 0x4b, 0xce, 0x37, - 0x33, 0xce, 0x92, 0xc0, 0x98, 0x41, 0x1d, 0x17, 0x93, 0x5f, 0x31, 0x33, 0xf9, 0xdd, 0x83, 0x1a, - 0x56, 0x6d, 0x47, 0xd1, 0xea, 0xac, 0xa8, 0x22, 0x62, 0x9c, 0x04, 0xd9, 0xf6, 0x7d, 0x23, 0xdf, - 0xbe, 0xdf, 0x00, 0xf0, 0x78, 0xc0, 0xd5, 0x18, 0xc4, 0x24, 0x66, 0x45, 0x89, 0xd6, 0x0c, 0xa6, - 0x2b, 0xed, 0x2f, 0x74, 0xf0, 0xf7, 0x02, 0xce, 0x92, 0xa7, 0xbe, 0x90, 0x51, 0x32, 0xcf, 0xe6, - 0x98, 0x95, 0xcb, 0xb1, 0x37, 0x00, 0x5c, 0x45, 0xa8, 0x65, 0x15, 0xb4, 0x2c, 0x83, 0xe9, 0x4a, - 0xfb, 0x2f, 0x16, 0x10, 0x25, 0xcc, 0xec, 0xc8, 0x47, 0xbe, 0x2b, 0x67, 0x09, 0x5f, 0x3b, 0x63, - 0x67, 0x96, 0x98, 0xc2, 0x86, 0x25, 0xa6, 0x88, 0xe3, 0xed, 0xa5, 0x25, 0xa6, 0x84, 0xe8, 0x74, - 0x89, 0xb9, 0x07, 0x35, 0xec, 0x67, 0xb8, 0xc5, 0xe8, 0x81, 0x18, 0xb7, 0x98, 0xe3, 0xb5, 0x5b, - 0x4c, 0x19, 0x09, 0x36, 0x6c, 0x31, 0x95, 0xec, 0x16, 0x33, 0x81, 0x5b, 0x97, 0x5f, 0x22, 0x36, - 0x2f, 0x6a, 0x3f, 0x84, 0x6a, 0x6c, 0x88, 0x4c, 0xb2, 0xef, 0xe6, 0xf3, 0x2c, 0x2f, 0x89, 0x2e, - 0xa8, 0xed, 0xdf, 0x17, 0xe0, 0xa6, 0x22, 0xf8, 0x92, 0x05, 0x01, 0x97, 0x57, 0x37, 0xf0, 0x0e, - 0x54, 0x98, 0xe7, 0x25, 0x5c, 0x88, 0xd4, 0x6a, 0x06, 0x54, 0xf6, 0x79, 0x89, 0x02, 0xd0, 0x6c, - 0x55, 0x6a, 0x20, 0x65, 0x7b, 0xe5, 0x3b, 0xb4, 0x5a, 0x95, 0xe2, 0x59, 0xe1, 0x70, 0xe1, 0xd0, - 0xf5, 0x13, 0xcf, 0x4a, 0xb2, 0xf2, 0xbd, 0x1a, 0x0a, 0xf4, 0xbe, 0x9c, 0x82, 0x8a, 0x3a, 0x66, - 0x72, 0x62, 0x66, 0x4f, 0x3c, 0xab, 0x5e, 0xb2, 0x28, 0xe1, 0xb8, 0xfd, 0x35, 0xb2, 0x35, 0x3d, - 0xf5, 0x77, 0x2d, 0xe3, 0x6f, 0xf5, 0x1e, 0xb5, 0xa2, 0x63, 0x5f, 0xaa, 0x51, 0x0d, 0xa0, 0x57, - 0x7d, 0xcf, 0xe3, 0xa1, 0x69, 0x48, 0x06, 0xda, 0x3c, 0x8c, 0xda, 0x07, 0x3a, 0xc2, 0x72, 0xc6, - 0x12, 0xe4, 0x03, 0xa8, 0x9a, 0x9a, 0x97, 0x56, 0xeb, 0x7b, 0x79, 0xeb, 0xe7, 0xe8, 0xe9, 0x82, - 0xd8, 0xfe, 0xa3, 0xa5, 0xc3, 0xff, 0x98, 0x5d, 0x70, 0xaf, 0x6b, 0x6c, 0x99, 0xb1, 0xb2, 0x95, - 0xb7, 0xf2, 0xba, 0x75, 0x7c, 0x17, 0x6a, 0x2f, 0xd8, 0x45, 0x34, 0x4b, 0x7c, 0xc9, 0x8d, 0xf1, - 0x97, 0x08, 0xd5, 0xc9, 0xdc, 0x09, 0xf3, 0x71, 0x0b, 0x2c, 0xa1, 0x2b, 0x2b, 0x08, 0x0f, 0xbd, - 0x2b, 0x52, 0xf6, 0x21, 0x34, 0xf4, 0xf4, 0xe5, 0x64, 0x23, 0xb3, 0xae, 0x71, 0x38, 0x1e, 0xda, - 0xbf, 0xb1, 0xe0, 0xf5, 0xb5, 0xf3, 0xc0, 0x86, 0xc8, 0x59, 0xed, 0x8e, 0xfa, 0x05, 0xb9, 0xee, - 0x38, 0x80, 0xfb, 0x13, 0x5d, 0x00, 0x1c, 0x96, 0xb8, 0x13, 0xff, 0x82, 0x3b, 0x62, 0x16, 0xc7, - 0x51, 0x22, 0x1d, 0x1e, 0xb2, 0xd3, 0xc0, 0xcc, 0x82, 0x55, 0xba, 0x6b, 0xc8, 0xba, 0x9a, 0xea, - 0x58, 0x13, 0x0d, 0x34, 0x8d, 0xfd, 0x07, 0x4b, 0xb7, 0x8e, 0x13, 0x35, 0xcc, 0xab, 0xf5, 0x80, - 0x27, 0xd7, 0x5c, 0x3f, 0x3f, 0x81, 0xb2, 0xd9, 0x07, 0xd4, 0x3d, 0xad, 0xd5, 0x19, 0x2a, 0x23, - 0x70, 0xef, 0x64, 0xb9, 0x29, 0x50, 0xc3, 0x64, 0x7f, 0x08, 0xf5, 0x0c, 0x9a, 0xd4, 0xa1, 0x32, - 0x1e, 0xed, 0x8f, 0x0e, 0xbf, 0x1c, 0xb5, 0x5f, 0x53, 0xc0, 0x09, 0x1d, 0x1f, 0x9f, 0x0c, 0xfa, - 0x6d, 0x8b, 0xdc, 0x84, 0xe6, 0x78, 0x84, 0xe0, 0x97, 0x87, 0xf4, 0xe4, 0xe9, 0x57, 0xed, 0x82, - 0xfd, 0x4d, 0x51, 0xcf, 0xd2, 0xcf, 0x33, 0xbb, 0x8a, 0x19, 0x6c, 0x36, 0x28, 0x4f, 0xa0, 0xf4, - 0x22, 0x89, 0xa6, 0x69, 0x28, 0xa8, 0xb3, 0x7a, 0x90, 0x8c, 0x4c, 0xcd, 0x2e, 0xc8, 0x48, 0x85, - 0x86, 0x3b, 0x51, 0x91, 0x17, 0x9e, 0xa5, 0x73, 0xcc, 0x12, 0xa1, 0x5c, 0x62, 0xa6, 0x3f, 0x5d, - 0x4e, 0xcd, 0x8a, 0xb8, 0xc0, 0x75, 0xf1, 0x07, 0x8c, 0x84, 0x8b, 0x38, 0x0a, 0x45, 0x9a, 0x96, - 0x0b, 0x58, 0xd5, 0xe2, 0x84, 0xc7, 0x81, 0xaf, 0x99, 0x75, 0x88, 0xd4, 0x0c, 0xa6, 0x2b, 0x09, - 0x5f, 0xbf, 0x93, 0x55, 0xd1, 0xb2, 0xdf, 0xcb, 0x5b, 0x76, 0xcd, 0xab, 0xf7, 0x9e, 0x5f, 0xda, - 0xda, 0xd6, 0x6e, 0x72, 0xda, 0x87, 0xb5, 0x45, 0x03, 0xff, 0x09, 0x90, 0xcb, 0x9c, 0x97, 0x7c, - 0x71, 0x34, 0x18, 0xf5, 0x87, 0xa3, 0xcf, 0xdb, 0x16, 0x69, 0x40, 0xb5, 0xdb, 0xeb, 0x0d, 0x8e, - 0x94, 0x67, 0x0a, 0x0a, 0xea, 0x0f, 0x7a, 0xcf, 0x86, 0xa3, 0x41, 0xbf, 0x5d, 0x54, 0x50, 0xaf, - 0x3b, 0xea, 0x0d, 0x9e, 0x0d, 0xfa, 0xed, 0x92, 0xfd, 0x4f, 0x4b, 0x77, 0xf6, 0x5e, 0x6e, 0x65, - 0xea, 0x73, 0xd7, 0x17, 0x9b, 0x7f, 0x8b, 0xd9, 0x85, 0x9a, 0xb1, 0xe7, 0x30, 0x8d, 0xb4, 0x25, - 0x82, 0xfc, 0x14, 0xb6, 0x3c, 0xc3, 0xef, 0xe4, 0x22, 0xef, 0xfd, 0xd5, 0x19, 0x69, 0xdd, 0x95, - 0x7b, 0xe9, 0xc1, 0x98, 0xa7, 0xe5, 0xe5, 0x60, 0xfb, 0x5d, 0x68, 0xe5, 0x29, 0x72, 0x8f, 0x7d, - 0x2d, 0xf7, 0x58, 0xcb, 0xfe, 0xd6, 0x82, 0xad, 0x95, 0xdf, 0x98, 0x37, 0x77, 0x9b, 0xd5, 0xe5, - 0xb0, 0x70, 0x69, 0x39, 0x24, 0xef, 0x02, 0xc9, 0x92, 0x38, 0xd9, 0x29, 0xbb, 0x9d, 0x21, 0xd4, - 0xdb, 0x66, 0xb6, 0x7d, 0x95, 0x5e, 0xa9, 0x7d, 0x09, 0x00, 0xca, 0x5e, 0x9a, 0x51, 0x2f, 0xdb, - 0xd6, 0xad, 0x7c, 0x5b, 0xdf, 0x87, 0xba, 0xf9, 0x27, 0xc9, 0x89, 0xea, 0x3d, 0x05, 0xb4, 0xf3, - 0xff, 0x2d, 0x2f, 0xe9, 0x2e, 0xff, 0xad, 0x72, 0x60, 0xfe, 0xab, 0x62, 0x84, 0xee, 0x29, 0x06, - 0x9a, 0xe5, 0xb6, 0x7f, 0x67, 0x41, 0x4b, 0x69, 0x95, 0xb9, 0xf9, 0x07, 0x50, 0x4f, 0x16, 0x50, - 0xda, 0x05, 0xb6, 0x97, 0xf2, 0x97, 0xa4, 0x34, 0x4b, 0x48, 0x1e, 0xc3, 0xb6, 0x98, 0x9d, 0xa6, - 0x9d, 0xe4, 0x0b, 0x11, 0x85, 0x4f, 0xe6, 0x92, 0xa7, 0xfd, 0x75, 0xed, 0x37, 0xf2, 0x2e, 0xdc, - 0x4c, 0x97, 0xae, 0x25, 0x83, 0xde, 0x44, 0x2f, 0x7f, 0xb0, 0x7f, 0x6b, 0x41, 0x5d, 0x29, 0xbb, - 0xaf, 0x7f, 0x80, 0xc6, 0x69, 0x6f, 0xe1, 0x51, 0x75, 0x5c, 0xdb, 0x56, 0x6e, 0x43, 0xd9, 0xfc, - 0x7c, 0x63, 0x1a, 0xba, 0xf9, 0xf5, 0x26, 0x13, 0x13, 0xa5, 0x5c, 0x4c, 0xec, 0x42, 0xcd, 0xb4, - 0x29, 0x2e, 0x3a, 0x37, 0x70, 0x06, 0x5d, 0x22, 0x96, 0xe9, 0x51, 0xce, 0x4e, 0x39, 0x7f, 0x36, - 0xb3, 0x87, 0x51, 0x4d, 0x8d, 0xbb, 0x51, 0x48, 0x3e, 0x84, 0x32, 0xc3, 0x13, 0xea, 0xd8, 0x7a, - 0x6c, 0xe7, 0x43, 0x21, 0x47, 0xbc, 0xa7, 0xff, 0x50, 0xc3, 0x41, 0xde, 0x82, 0x66, 0x14, 0x78, - 0x86, 0x64, 0xbc, 0x28, 0xef, 0x79, 0x24, 0x79, 0x0f, 0x1f, 0xa1, 0x20, 0xb3, 0xd5, 0xbc, 0xbe, - 0xf6, 0x0a, 0x9a, 0x52, 0xa9, 0x76, 0x57, 0x36, 0xda, 0xdd, 0x84, 0xe6, 0xfe, 0xe0, 0xab, 0x5e, - 0x97, 0xf6, 0x9d, 0x6e, 0xbf, 0x8f, 0x99, 0x44, 0xa0, 0xd5, 0xed, 0xf5, 0x0e, 0xc7, 0xa3, 0x93, - 0x63, 0x83, 0xb3, 0xc8, 0x2d, 0xd8, 0x4a, 0xc9, 0xfa, 0x83, 0x67, 0x03, 0x5d, 0x5f, 0xb6, 0xa1, - 0xbd, 0x20, 0xa4, 0x83, 0x83, 0xc3, 0xe7, 0x58, 0x67, 0x00, 0xca, 0xcf, 0x0e, 0x7b, 0xfb, 0xaa, - 0xca, 0xa8, 0xa4, 0x1c, 0x8f, 0x0c, 0x74, 0x83, 0x6c, 0x41, 0x7d, 0x3c, 0xec, 0x3b, 0xe3, 0xa3, - 0x7e, 0x57, 0x09, 0x28, 0x93, 0x36, 0x34, 0x46, 0xdd, 0x83, 0x81, 0xd3, 0x7b, 0xda, 0x1d, 0x7d, - 0x3e, 0xe8, 0xb7, 0x2b, 0xf6, 0xd7, 0xba, 0xdb, 0x75, 0x83, 0xc0, 0x28, 0x2d, 0xc8, 0x77, 0xa1, - 0x6a, 0xf4, 0x4e, 0xe3, 0x70, 0xc3, 0xf3, 0x16, 0x64, 0x4b, 0xf7, 0x14, 0x32, 0xee, 0x79, 0xd2, - 0xfc, 0xba, 0xbe, 0xf7, 0xde, 0x47, 0x29, 0xeb, 0x69, 0x19, 0x4f, 0xef, 0xff, 0x3b, 0x00, 0x00, - 0xff, 0xff, 0x48, 0xc1, 0x44, 0x9e, 0xb1, 0x1c, 0x00, 0x00, + // 2631 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x39, 0x4d, 0x73, 0x1b, 0xc7, + 0xb1, 0x5e, 0x00, 0xc4, 0x47, 0x03, 0x04, 0xa1, 0x11, 0x2d, 0x41, 0x14, 0x5d, 0x92, 0xd6, 0x76, + 0x59, 0xaf, 0xca, 0x8f, 0x7e, 0x4f, 0x8e, 0xe3, 0xc4, 0x1f, 0x65, 0x43, 0x00, 0x62, 0xd1, 0x14, + 0x41, 0xd6, 0x90, 0x90, 0x63, 0x57, 0xaa, 0xb6, 0x86, 0xbb, 0x23, 0x62, 0xc3, 0xc5, 0xee, 0x66, + 0x67, 0x40, 0x05, 0xb9, 0xe5, 0x2f, 0xe4, 0x92, 0x1c, 0x7d, 0x4e, 0x6e, 0xa9, 0x72, 0x4e, 0x39, + 0xe4, 0x98, 0x5b, 0x0e, 0x39, 0x26, 0x87, 0x9c, 0xf3, 0x2b, 0x52, 0xd3, 0x33, 0xbb, 0xd8, 0x05, + 0x01, 0x46, 0xaa, 0x9c, 0x72, 0xc2, 0x74, 0x6f, 0x77, 0x6f, 0x4f, 0x7f, 0x37, 0x16, 0x36, 0x63, + 0xe6, 0x27, 0x7e, 0x78, 0xbe, 0x17, 0x27, 0x91, 0x8c, 0x48, 0x1d, 0x7f, 0xce, 0x66, 0xcf, 0x77, + 0x6e, 0x8a, 0x79, 0xe8, 0x3a, 0x82, 0x4b, 0xe9, 0x87, 0xe7, 0x42, 0x3f, 0xde, 0xb1, 0x59, 0x1c, + 0x07, 0xbe, 0xcb, 0xa4, 0x1f, 0x85, 0xce, 0x94, 0x4b, 0xe6, 0x31, 0xc9, 0x9c, 0x29, 0x17, 0x82, + 0x9d, 0x73, 0x4d, 0x63, 0x33, 0xb8, 0xfb, 0x23, 0x2e, 0xdd, 0x89, 0x1f, 0x9e, 0x3f, 0x66, 0xee, + 0x05, 0xf7, 0xc6, 0xf1, 0x80, 0x49, 0x36, 0xe0, 0x92, 0xf9, 0x81, 0x20, 0xf7, 0xa0, 0x89, 0x4c, + 0xe1, 0x6c, 0x7a, 0xc6, 0x93, 0xae, 0x75, 0xdf, 0x7a, 0xb8, 0x49, 0x41, 0xa1, 0x46, 0x88, 0x21, + 0x0f, 0xa0, 0x25, 0x23, 0xc9, 0x82, 0x94, 0xa2, 0x84, 0x14, 0x4d, 0xc4, 0x69, 0x12, 0xfb, 0x1f, + 0x1b, 0x50, 0x55, 0xb2, 0x67, 0x31, 0xd9, 0x86, 0x0d, 0x37, 0x88, 0xdc, 0x0b, 0x14, 0x54, 0xa1, + 0x1a, 0x20, 0x6d, 0x28, 0xf9, 0x1e, 0x72, 0x36, 0x68, 0xc9, 0xf7, 0xc8, 0x67, 0x50, 0x77, 0xa3, + 0x50, 0x32, 0x57, 0x8a, 0x6e, 0xf9, 0x7e, 0xf9, 0x61, 0xf3, 0xd1, 0x9b, 0x7b, 0xe9, 0x4d, 0xf7, + 0x4e, 0xe6, 0xa1, 0xbb, 0x1f, 0x0a, 0xc9, 0x82, 0x00, 0x2f, 0xd6, 0xd7, 0x94, 0xcf, 0x1e, 0xd1, + 0x8c, 0x89, 0xfc, 0x10, 0x9a, 0x6e, 0x34, 0x9d, 0xce, 0x42, 0x5f, 0xfa, 0x5c, 0x74, 0x2b, 0x28, + 0xe3, 0x76, 0x51, 0x46, 0xdf, 0x10, 0xcc, 0x69, 0x9e, 0x96, 0x1c, 0xc1, 0x56, 0x2a, 0xc6, 0xd8, + 0xa0, 0xbb, 0x71, 0xdf, 0x7a, 0xd8, 0x7c, 0xf4, 0xf6, 0x82, 0xfd, 0x1a, 0x83, 0xd1, 0x65, 0x6e, + 0x32, 0x06, 0x92, 0x93, 0x9f, 0xca, 0xac, 0xbe, 0x8a, 0xcc, 0x15, 0x02, 0xc8, 0xfb, 0x50, 0x8b, + 0x93, 0xe8, 0xb9, 0x1f, 0xf0, 0x6e, 0x0d, 0x65, 0xdd, 0x59, 0xc8, 0x4a, 0x65, 0x1c, 0x6b, 0x02, + 0x9a, 0x52, 0x92, 0x43, 0x68, 0x9b, 0x63, 0xaa, 0x47, 0xfd, 0x55, 0xf4, 0x58, 0x62, 0x26, 0xef, + 0x41, 0xcd, 0x44, 0x5c, 0xb7, 0x81, 0x72, 0x5e, 0x2f, 0x9a, 0xf8, 0x44, 0x3f, 0xa4, 0x29, 0x95, + 0x32, 0x6e, 0x1a, 0xa2, 0xa9, 0x02, 0xf0, 0x4a, 0xc6, 0x5d, 0xe2, 0x26, 0x1f, 0x40, 0xfd, 0x82, + 0xcf, 0x5d, 0x96, 0x78, 0xa2, 0xdb, 0x5c, 0x36, 0x83, 0x52, 0xa1, 0x17, 0x04, 0x07, 0x86, 0x80, + 0x66, 0xa4, 0x4a, 0x8f, 0xf4, 0x9c, 0xea, 0xd1, 0x7a, 0x25, 0x3d, 0x96, 0xb8, 0xed, 0x3f, 0x56, + 0xa0, 0x75, 0x38, 0x0b, 0xa4, 0xdf, 0x73, 0xdd, 0x68, 0x16, 0x4a, 0x42, 0xa0, 0x12, 0xb2, 0x29, + 0xc7, 0x38, 0x6f, 0x50, 0x3c, 0x93, 0x5d, 0x68, 0x48, 0x7f, 0xca, 0x85, 0x64, 0xd3, 0x18, 0xa3, + 0xbd, 0x4c, 0x17, 0x08, 0xf5, 0xd4, 0xf7, 0x78, 0x28, 0x7d, 0x37, 0x0a, 0xbb, 0x65, 0x64, 0x5b, + 0x20, 0xc8, 0xe7, 0x00, 0x6e, 0x14, 0x44, 0x89, 0x33, 0x61, 0x62, 0x62, 0x02, 0xfa, 0xc1, 0x42, + 0xd9, 0xfc, 0xbb, 0xf7, 0xfa, 0x51, 0x10, 0xcd, 0x92, 0x27, 0x4c, 0x4c, 0x68, 0x03, 0x99, 0xd4, + 0x91, 0x74, 0xa1, 0x86, 0xc0, 0xbe, 0x87, 0x01, 0x5d, 0xa6, 0x29, 0x48, 0xde, 0xc9, 0xac, 0xe1, + 0x98, 0xf2, 0x82, 0xe1, 0xd9, 0xa0, 0x6d, 0x83, 0x3e, 0xd6, 0x58, 0x72, 0x1b, 0x6a, 0x17, 0x7c, + 0xee, 0xcc, 0x7c, 0x0f, 0x63, 0xae, 0x41, 0xab, 0x17, 0x7c, 0x3e, 0xf6, 0x3d, 0xf2, 0x09, 0x54, + 0xfd, 0x29, 0x3b, 0xe7, 0x2a, 0x9e, 0x94, 0x66, 0x6f, 0xad, 0xd1, 0x6c, 0x1f, 0xef, 0x23, 0xe7, + 0xfb, 0x8a, 0x98, 0x1a, 0x9e, 0x1d, 0x1b, 0x60, 0xa1, 0xb2, 0x2a, 0x11, 0x7e, 0xe8, 0xf1, 0x9f, + 0x77, 0xad, 0xfb, 0xe5, 0x87, 0x65, 0xaa, 0x81, 0x9d, 0xbf, 0x59, 0xb0, 0x59, 0xe0, 0xce, 0x2b, + 0x63, 0x15, 0x94, 0x49, 0x4d, 0x5f, 0xca, 0x99, 0xbe, 0x0b, 0xb5, 0x98, 0xcd, 0x83, 0x88, 0x79, + 0x68, 0xda, 0x16, 0x4d, 0x41, 0xf5, 0xba, 0x17, 0xbe, 0x27, 0x95, 0x4d, 0x95, 0x51, 0x34, 0x40, + 0x6e, 0x41, 0x75, 0xc2, 0xfd, 0xf3, 0x89, 0x34, 0xb6, 0x32, 0x10, 0xd9, 0x81, 0xba, 0x4a, 0x00, + 0xe1, 0xff, 0x82, 0xa3, 0x8d, 0xca, 0x34, 0x83, 0xc9, 0x9b, 0xb0, 0x99, 0xe0, 0xc9, 0x91, 0x2c, + 0x39, 0xe7, 0x12, 0x6d, 0x54, 0xa6, 0x2d, 0x8d, 0x3c, 0x45, 0xdc, 0xa2, 0x00, 0xd6, 0x73, 0x05, + 0xd0, 0xfe, 0xab, 0x05, 0x37, 0x9f, 0x46, 0x2e, 0x0b, 0x8c, 0xa5, 0x8f, 0x8d, 0x72, 0x1f, 0x40, + 0xe5, 0x82, 0xcf, 0x05, 0x9a, 0xa2, 0xe0, 0xef, 0x15, 0xc4, 0x7b, 0x07, 0x7c, 0x4e, 0x91, 0x9c, + 0x7c, 0x04, 0xad, 0xa9, 0x32, 0x3b, 0xd3, 0x66, 0x47, 0x4b, 0x34, 0x1f, 0xdd, 0x5a, 0xed, 0x14, + 0x5a, 0xa0, 0x55, 0x37, 0x8c, 0x99, 0x10, 0x2f, 0xa2, 0xc4, 0x33, 0x51, 0x98, 0xc1, 0x3b, 0xff, + 0x0b, 0xe5, 0x03, 0x3e, 0x5f, 0x19, 0xdb, 0x04, 0x2a, 0xaa, 0x29, 0xe0, 0xab, 0x5a, 0x14, 0xcf, + 0xf6, 0xb7, 0x16, 0x74, 0x94, 0x8e, 0xf9, 0x6a, 0xbd, 0xa6, 0x03, 0xbc, 0x03, 0x5b, 0x7e, 0x8e, + 0xca, 0xc9, 0xda, 0x41, 0x3b, 0x8f, 0xde, 0xf7, 0xb0, 0x1f, 0xf1, 0x4b, 0xdf, 0xe5, 0x8e, 0x9c, + 0xc7, 0xdc, 0x68, 0x08, 0x1a, 0x75, 0x3a, 0x8f, 0x79, 0xa6, 0x5c, 0xa5, 0xe8, 0xfd, 0x4b, 0x9e, + 0x08, 0x3f, 0x0a, 0xd1, 0x9d, 0x9b, 0x34, 0x05, 0xed, 0x7f, 0x5a, 0x70, 0x7b, 0x4d, 0x43, 0x79, + 0xc9, 0x5e, 0xf5, 0x26, 0x6c, 0x9a, 0xaa, 0xe8, 0x60, 0x38, 0x1b, 0x95, 0x5a, 0x06, 0xa9, 0x63, + 0xf5, 0x0e, 0xd4, 0x79, 0x28, 0x9c, 0x9c, 0x62, 0x35, 0x1e, 0x8a, 0x91, 0xd2, 0xed, 0x01, 0xb4, + 0x02, 0x26, 0xa4, 0x33, 0x8b, 0x3d, 0x26, 0xb9, 0xce, 0xcd, 0x0a, 0x6d, 0x2a, 0xdc, 0x58, 0xa3, + 0xd4, 0x9d, 0xc5, 0x5c, 0x48, 0x3e, 0x75, 0x24, 0x3b, 0x57, 0xad, 0xa3, 0xac, 0xee, 0xac, 0x51, + 0xa7, 0xec, 0x5c, 0x90, 0xb7, 0xa1, 0x1d, 0xa8, 0x80, 0x70, 0x42, 0xdf, 0xbd, 0xc0, 0x97, 0xe8, + 0xf4, 0xdc, 0x44, 0xec, 0xc8, 0x20, 0xed, 0x5f, 0x56, 0xe1, 0xce, 0xda, 0xee, 0x49, 0xfe, 0x0f, + 0xb6, 0xf3, 0x8a, 0x38, 0xc8, 0x1b, 0xcc, 0xcd, 0xed, 0x49, 0x4e, 0xa1, 0xa7, 0xfa, 0xc9, 0x7f, + 0xb1, 0x29, 0x94, 0x6f, 0x99, 0xe7, 0x71, 0x0f, 0xfb, 0x56, 0x9d, 0x6a, 0x40, 0xc5, 0xc9, 0x99, + 0x72, 0x32, 0xf7, 0xb0, 0x2d, 0xd5, 0x69, 0x0a, 0x2a, 0xfa, 0xe9, 0x4c, 0xe9, 0xd4, 0xd4, 0xf4, + 0x08, 0x28, 0xfa, 0x84, 0x4f, 0xa3, 0x4b, 0xee, 0x61, 0xfb, 0xa8, 0xd3, 0x14, 0x24, 0xf7, 0xa1, + 0x35, 0x61, 0xc2, 0x41, 0xb1, 0xce, 0x4c, 0x74, 0x37, 0xf1, 0x31, 0x4c, 0x98, 0xe8, 0x29, 0xd4, + 0x58, 0xf5, 0xce, 0x9b, 0x97, 0x3c, 0xf1, 0x9f, 0xa7, 0xe3, 0x99, 0x90, 0x4c, 0xce, 0x44, 0xb7, + 0x8d, 0x35, 0x83, 0xe4, 0x1f, 0x9d, 0xe0, 0x13, 0x1c, 0xb4, 0x92, 0x99, 0x90, 0x29, 0xe5, 0x16, + 0x52, 0x36, 0x11, 0x67, 0x48, 0x3e, 0x85, 0xbb, 0x66, 0xfa, 0x70, 0x12, 0xfe, 0xb3, 0x19, 0x17, + 0x52, 0x7b, 0x11, 0x59, 0x78, 0xb7, 0x83, 0x1c, 0x5d, 0x43, 0x42, 0x35, 0x05, 0x3a, 0x53, 0xf1, + 0xf3, 0xf5, 0xec, 0x3a, 0x0d, 0x6e, 0xac, 0x65, 0xef, 0x63, 0x66, 0x7c, 0x06, 0xbb, 0xcb, 0xec, + 0xca, 0x1c, 0x92, 0x9b, 0xd7, 0x13, 0xe4, 0xbf, 0x53, 0xe4, 0xa7, 0x48, 0xa1, 0xdf, 0xbf, 0x5e, + 0x80, 0x56, 0xe0, 0xe6, 0x7a, 0x01, 0x5a, 0x83, 0x07, 0xd0, 0xf2, 0x7c, 0x11, 0x07, 0x6c, 0xae, + 0xe3, 0x6b, 0x1b, 0x5d, 0xdf, 0x34, 0x38, 0x15, 0x63, 0xf6, 0x8b, 0xab, 0xf9, 0x9e, 0xb6, 0xec, + 0xd5, 0xf9, 0x7e, 0x25, 0xa8, 0x4b, 0x2b, 0x82, 0x7a, 0x39, 0x72, 0xcb, 0x57, 0x22, 0xd7, 0x7e, + 0x0c, 0x3b, 0xcb, 0x2f, 0x3e, 0x9e, 0x9d, 0x05, 0xbe, 0xdb, 0x9f, 0xb0, 0x97, 0xac, 0x35, 0xf6, + 0x77, 0x65, 0xd8, 0x2c, 0x8c, 0xae, 0xff, 0x96, 0xaf, 0x85, 0x89, 0x79, 0x0f, 0x9a, 0x71, 0xe2, + 0x5f, 0x32, 0xc9, 0x9d, 0x0b, 0x3e, 0x37, 0x1d, 0x10, 0x0c, 0x4a, 0x55, 0xf4, 0xfb, 0xaa, 0xaa, + 0x0a, 0x37, 0xf1, 0x63, 0xa5, 0x17, 0xe6, 0x65, 0x8b, 0xe6, 0x51, 0xaa, 0x21, 0xfe, 0x34, 0xf2, + 0x43, 0x93, 0x95, 0x75, 0x6a, 0x20, 0xd5, 0x2e, 0x74, 0xac, 0x72, 0x0f, 0x1b, 0x62, 0x9d, 0x66, + 0xf0, 0x22, 0x69, 0x6a, 0xf9, 0xa4, 0x39, 0x82, 0x8e, 0xf1, 0xae, 0x70, 0x64, 0xe4, 0x28, 0x39, + 0x66, 0x6a, 0x78, 0x7b, 0xdd, 0x80, 0x6e, 0xc8, 0x4f, 0xa3, 0x2f, 0x23, 0x3f, 0xa4, 0xed, 0xa4, + 0x00, 0x93, 0x8f, 0xa1, 0x9e, 0x8e, 0x85, 0x66, 0x0c, 0xbd, 0xb7, 0x46, 0x90, 0x99, 0x47, 0x05, + 0xcd, 0x18, 0xd4, 0xd4, 0xc5, 0x43, 0x37, 0x99, 0xc7, 0x32, 0x4b, 0xfa, 0x05, 0x42, 0x3d, 0x15, + 0x31, 0x77, 0x25, 0x5b, 0xa4, 0xfe, 0x02, 0xa1, 0x9a, 0x96, 0x21, 0x55, 0x09, 0x8c, 0x8d, 0xba, + 0x85, 0x96, 0x6b, 0x2f, 0xd0, 0x07, 0x7c, 0x2e, 0xec, 0xbf, 0x58, 0x70, 0xf7, 0x9a, 0x1b, 0x19, + 0x7f, 0x59, 0x99, 0xbf, 0xde, 0x00, 0x88, 0x31, 0x36, 0xd0, 0x5d, 0xda, 0xff, 0x0d, 0x8d, 0x51, + 0xde, 0xca, 0x9c, 0x5e, 0xce, 0x3b, 0xfd, 0x9a, 0xc2, 0x7a, 0x1b, 0x6a, 0xee, 0x84, 0x49, 0xd5, + 0x55, 0x37, 0xf4, 0xa8, 0xa4, 0xc0, 0x7d, 0x4f, 0xc5, 0x6d, 0xba, 0x5a, 0xcc, 0xd5, 0xd3, 0xaa, + 0x76, 0x7c, 0x86, 0xdb, 0x47, 0x27, 0xea, 0xf4, 0xad, 0xe9, 0x97, 0x21, 0x60, 0xff, 0xaa, 0x04, + 0x9d, 0xe5, 0x70, 0x26, 0x9f, 0xe6, 0xd6, 0xb6, 0x2b, 0x13, 0xcb, 0x9a, 0xc6, 0x93, 0x5b, 0xda, + 0xbe, 0x80, 0x96, 0xb9, 0xb5, 0xd2, 0x4e, 0x74, 0x4b, 0xcb, 0xa3, 0xe4, 0xfa, 0xfc, 0xa1, 0xcd, + 0x38, 0x3b, 0x0b, 0xf2, 0x31, 0xd4, 0xd2, 0xc9, 0xa7, 0x8c, 0xf1, 0x70, 0x8d, 0x1a, 0xe9, 0x10, + 0x94, 0x72, 0xfc, 0x07, 0xab, 0xa3, 0xfd, 0x21, 0x6c, 0xe1, 0x53, 0xa5, 0x90, 0xe9, 0x03, 0x2f, + 0x97, 0xd7, 0x9f, 0xc0, 0x76, 0xca, 0x78, 0xa8, 0x97, 0x73, 0x41, 0x39, 0x7b, 0x59, 0xee, 0xcf, + 0xe1, 0x16, 0x6e, 0x3a, 0xae, 0xf4, 0x2f, 0x7d, 0x39, 0xef, 0xf3, 0x50, 0xf2, 0xe4, 0x1a, 0xfe, + 0x0e, 0x94, 0x7d, 0x4f, 0x9b, 0xb7, 0x45, 0xd5, 0xd1, 0x1e, 0xe8, 0xda, 0x54, 0x94, 0xd0, 0x73, + 0x5d, 0x8e, 0x49, 0xf0, 0xb2, 0x52, 0x86, 0x3a, 0xc8, 0x8b, 0x52, 0x06, 0xbe, 0x98, 0xfa, 0x42, + 0xbc, 0x82, 0x98, 0x6f, 0x2d, 0x68, 0x29, 0x39, 0x8f, 0xa3, 0xe8, 0x62, 0xca, 0x92, 0x8b, 0xf5, + 0x8c, 0xb3, 0x24, 0x30, 0x66, 0x50, 0xc7, 0x6c, 0xf2, 0x2b, 0xe7, 0x26, 0xbf, 0xbb, 0xd0, 0xc0, + 0xaa, 0xed, 0x28, 0x5a, 0x9d, 0x15, 0x75, 0x44, 0x8c, 0x93, 0x20, 0xdf, 0xbe, 0x37, 0x8a, 0xed, + 0xfb, 0x0d, 0x00, 0x8f, 0x07, 0x5c, 0x8d, 0x41, 0x4c, 0x62, 0x56, 0x54, 0x68, 0xc3, 0x60, 0x7a, + 0xd2, 0xfe, 0x52, 0x07, 0x7f, 0x3f, 0xe0, 0x2c, 0x79, 0xe2, 0x0b, 0x19, 0x25, 0xf3, 0x7c, 0x8e, + 0x59, 0x85, 0x1c, 0x7b, 0x03, 0xc0, 0x55, 0x84, 0x5a, 0x56, 0x49, 0xcb, 0x32, 0x98, 0x9e, 0xb4, + 0xff, 0x6c, 0x01, 0x51, 0xc2, 0xcc, 0xae, 0x7e, 0xec, 0xbb, 0x72, 0x96, 0xf0, 0x95, 0x33, 0x76, + 0x6e, 0x89, 0x29, 0xad, 0x59, 0x62, 0xca, 0x38, 0xde, 0x5e, 0x59, 0x62, 0x2a, 0x88, 0x4e, 0x97, + 0x98, 0xbb, 0xd0, 0xc0, 0x7e, 0x86, 0x5b, 0x8c, 0x1e, 0x88, 0x71, 0x8b, 0x39, 0x59, 0xb9, 0xc5, + 0x54, 0x91, 0x60, 0xcd, 0x16, 0x53, 0xcb, 0x6f, 0x31, 0x13, 0xb8, 0x79, 0xf5, 0x26, 0x62, 0xfd, + 0xa2, 0xf6, 0x03, 0xa8, 0xc7, 0x86, 0xc8, 0x24, 0xfb, 0x6e, 0x31, 0xcf, 0x8a, 0x92, 0x68, 0x46, + 0x6d, 0xff, 0xae, 0x04, 0x37, 0x14, 0xc1, 0x57, 0x2c, 0x08, 0xb8, 0xbc, 0xbe, 0x81, 0x77, 0xa1, + 0xc6, 0x3c, 0x2f, 0xe1, 0x42, 0xa4, 0x56, 0x33, 0xa0, 0xb2, 0xcf, 0x0b, 0x14, 0x80, 0x66, 0xab, + 0x53, 0x03, 0x29, 0xdb, 0x2b, 0xdf, 0xa1, 0xd5, 0xea, 0x14, 0xcf, 0x0a, 0x87, 0x0b, 0x87, 0xae, + 0x9f, 0x78, 0x56, 0x92, 0x95, 0xef, 0xd5, 0x50, 0xa0, 0xf7, 0xe5, 0x14, 0x54, 0xd4, 0x31, 0x93, + 0x13, 0x33, 0x7b, 0xe2, 0x59, 0xf5, 0x92, 0xac, 0x84, 0xe3, 0xf6, 0xd7, 0xca, 0xd7, 0xf4, 0xd4, + 0xdf, 0x8d, 0x9c, 0xbf, 0xd5, 0x7d, 0xd4, 0x8a, 0x8e, 0x7d, 0xa9, 0x41, 0x35, 0x80, 0x5e, 0xf5, + 0x3d, 0x8f, 0x87, 0xa6, 0x21, 0x19, 0x68, 0xfd, 0x30, 0x6a, 0x1f, 0xea, 0x08, 0x2b, 0x18, 0x4b, + 0x90, 0x0f, 0xa1, 0x6e, 0x6a, 0x5e, 0x5a, 0xad, 0xef, 0x16, 0xad, 0x5f, 0xa0, 0xa7, 0x19, 0xb1, + 0xfd, 0x07, 0x4b, 0x87, 0xff, 0x09, 0xbb, 0xe4, 0x5e, 0xcf, 0xd8, 0x32, 0x67, 0x65, 0xab, 0x68, + 0xe5, 0x55, 0xeb, 0xf8, 0x2e, 0x34, 0x9e, 0xb3, 0xcb, 0x68, 0x96, 0xf8, 0x92, 0x1b, 0xe3, 0x2f, + 0x10, 0xaa, 0x93, 0xb9, 0x13, 0xe6, 0xe3, 0x16, 0x58, 0x41, 0x57, 0xd6, 0x10, 0xde, 0xf7, 0xae, + 0x49, 0xd9, 0x07, 0xd0, 0xd2, 0xd3, 0x97, 0x93, 0x8f, 0xcc, 0xa6, 0xc6, 0xe1, 0x78, 0x68, 0xff, + 0xda, 0x82, 0xd7, 0x57, 0xce, 0x03, 0x6b, 0x22, 0x67, 0xb9, 0x3b, 0xea, 0x1b, 0x14, 0xba, 0xe3, + 0x10, 0xee, 0x4d, 0x74, 0x01, 0x70, 0x58, 0xe2, 0x4e, 0xfc, 0x4b, 0xee, 0x88, 0x59, 0x1c, 0x47, + 0x89, 0x74, 0x78, 0xc8, 0xce, 0x02, 0x33, 0x0b, 0xd6, 0xe9, 0xae, 0x21, 0xeb, 0x69, 0xaa, 0x13, + 0x4d, 0x34, 0xd4, 0x34, 0xf6, 0xef, 0x2d, 0xdd, 0x3a, 0x4e, 0xd5, 0x30, 0xaf, 0xd6, 0x03, 0x9e, + 0xbc, 0xe4, 0xfa, 0xf9, 0x29, 0x54, 0xcd, 0x3e, 0xa0, 0xde, 0xd3, 0x5e, 0x9e, 0xa1, 0x72, 0x02, + 0xf7, 0x4e, 0x17, 0x9b, 0x02, 0x35, 0x4c, 0xf6, 0x47, 0xd0, 0xcc, 0xa1, 0x49, 0x13, 0x6a, 0xe3, + 0xd1, 0xc1, 0xe8, 0xe8, 0xab, 0x51, 0xe7, 0x35, 0x05, 0x9c, 0xd2, 0xf1, 0xc9, 0xe9, 0x70, 0xd0, + 0xb1, 0xc8, 0x0d, 0xd8, 0x1c, 0x8f, 0x10, 0xfc, 0xea, 0x88, 0x9e, 0x3e, 0xf9, 0xba, 0x53, 0xb2, + 0xbf, 0x2d, 0xeb, 0x59, 0xfa, 0x59, 0x6e, 0x57, 0x31, 0x83, 0xcd, 0x1a, 0xe5, 0x09, 0x54, 0x9e, + 0x27, 0xd1, 0x34, 0x0d, 0x05, 0x75, 0x56, 0x17, 0x92, 0x91, 0xa9, 0xd9, 0x25, 0x19, 0xa9, 0xd0, + 0x70, 0x27, 0x2a, 0xf2, 0xc2, 0xf3, 0x74, 0x8e, 0x59, 0x20, 0x94, 0x4b, 0xcc, 0xf4, 0xa7, 0xcb, + 0xa9, 0x59, 0x11, 0x33, 0x5c, 0x0f, 0xff, 0xc0, 0x48, 0xb8, 0x88, 0xa3, 0x50, 0xa4, 0x69, 0x99, + 0xc1, 0xaa, 0x16, 0x27, 0x3c, 0x0e, 0x7c, 0xcd, 0xac, 0x43, 0xa4, 0x61, 0x30, 0x3d, 0x49, 0xf8, + 0xea, 0x9d, 0xac, 0x8e, 0x96, 0xfd, 0x5e, 0xd1, 0xb2, 0x2b, 0x6e, 0xbd, 0xf7, 0xec, 0xca, 0xd6, + 0xb6, 0x72, 0x93, 0xd3, 0x3e, 0x6c, 0x64, 0x0d, 0xfc, 0xc7, 0x40, 0xae, 0x72, 0x5e, 0xf1, 0xc5, + 0xf1, 0x70, 0x34, 0xd8, 0x1f, 0x7d, 0xd1, 0xb1, 0x48, 0x0b, 0xea, 0xbd, 0x7e, 0x7f, 0x78, 0xac, + 0x3c, 0x53, 0x52, 0xd0, 0x60, 0xd8, 0x7f, 0xba, 0x3f, 0x1a, 0x0e, 0x3a, 0x65, 0x05, 0xf5, 0x7b, + 0xa3, 0xfe, 0xf0, 0xe9, 0x70, 0xd0, 0xa9, 0xd8, 0x7f, 0xb7, 0x74, 0x67, 0xef, 0x17, 0x56, 0xa6, + 0x01, 0x77, 0x7d, 0xb1, 0xfe, 0xbf, 0x98, 0x5d, 0x68, 0x18, 0x7b, 0xee, 0xa7, 0x91, 0xb6, 0x40, + 0x90, 0x9f, 0xc0, 0x96, 0x67, 0xf8, 0x9d, 0x42, 0xe4, 0xbd, 0xbf, 0x3c, 0x23, 0xad, 0x7a, 0xe5, + 0x5e, 0x7a, 0x30, 0xe6, 0x69, 0x7b, 0x05, 0xd8, 0x7e, 0x17, 0xda, 0x45, 0x8a, 0xc2, 0x65, 0x5f, + 0x2b, 0x5c, 0xd6, 0xb2, 0xbf, 0xb3, 0x60, 0x6b, 0xe9, 0xbf, 0xee, 0xf5, 0xdd, 0x66, 0x79, 0x39, + 0x2c, 0x5d, 0x59, 0x0e, 0xc9, 0xbb, 0x40, 0xf2, 0x24, 0x4e, 0x7e, 0xca, 0xee, 0xe4, 0x08, 0xf5, + 0xb6, 0x99, 0x6f, 0x5f, 0x95, 0x57, 0x6a, 0x5f, 0x02, 0x80, 0xb2, 0x17, 0x66, 0xd4, 0xcb, 0xb7, + 0x75, 0xab, 0xd8, 0xd6, 0x0f, 0xa0, 0x69, 0x3e, 0xd6, 0x9c, 0xaa, 0xde, 0x53, 0x42, 0x3b, 0xff, + 0xcf, 0xe2, 0x25, 0xbd, 0xc5, 0xe7, 0x9d, 0x43, 0xf3, 0x75, 0xc7, 0x08, 0xdd, 0x53, 0x0c, 0x34, + 0xcf, 0x6d, 0xff, 0xd6, 0x82, 0xb6, 0xd2, 0x2a, 0xf7, 0xe6, 0xef, 0x43, 0x33, 0xc9, 0xa0, 0xb4, + 0x0b, 0x6c, 0x2f, 0xe4, 0x2f, 0x48, 0x69, 0x9e, 0x90, 0x3c, 0x82, 0x6d, 0x31, 0x3b, 0x4b, 0x3b, + 0xc9, 0x97, 0x22, 0x0a, 0x1f, 0xcf, 0x25, 0x4f, 0xfb, 0xeb, 0xca, 0x67, 0xe4, 0x5d, 0xb8, 0x91, + 0x2e, 0x5d, 0x0b, 0x06, 0xbd, 0x89, 0x5e, 0x7d, 0x60, 0xff, 0xc6, 0x82, 0xa6, 0x52, 0xd6, 0xfc, + 0x77, 0x8f, 0xd3, 0x5e, 0xe6, 0x51, 0x75, 0x5c, 0xd9, 0x56, 0x6e, 0x41, 0xd5, 0xfc, 0x7d, 0x63, + 0x1a, 0xba, 0xf9, 0xf7, 0x26, 0x17, 0x13, 0x95, 0x42, 0x4c, 0xec, 0x42, 0xc3, 0xb4, 0x29, 0x2e, + 0xba, 0x1b, 0x38, 0x83, 0x2e, 0x10, 0x8b, 0xf4, 0xa8, 0xe6, 0xa7, 0x9c, 0x3f, 0x99, 0xd9, 0xc3, + 0xa8, 0xa6, 0xc6, 0xdd, 0x28, 0x24, 0x1f, 0x41, 0x95, 0xe1, 0x09, 0x75, 0x6c, 0x3f, 0xb2, 0x8b, + 0xa1, 0x50, 0x20, 0xde, 0xd3, 0x3f, 0xd4, 0x70, 0x90, 0xb7, 0x60, 0x33, 0x0a, 0x3c, 0x43, 0x32, + 0xce, 0xca, 0x7b, 0x11, 0x49, 0xde, 0xc3, 0x4b, 0x28, 0xc8, 0x6c, 0x35, 0xaf, 0xaf, 0x7c, 0x05, + 0x4d, 0xa9, 0x54, 0xbb, 0xab, 0x1a, 0xed, 0x6e, 0xc0, 0xe6, 0xc1, 0xf0, 0xeb, 0x7e, 0x8f, 0x0e, + 0x9c, 0xde, 0x60, 0x80, 0x99, 0x44, 0xa0, 0xdd, 0xeb, 0xf7, 0x8f, 0xc6, 0xa3, 0xd3, 0x13, 0x83, + 0xb3, 0xc8, 0x4d, 0xd8, 0x4a, 0xc9, 0x06, 0xc3, 0xa7, 0x43, 0x5d, 0x5f, 0xb6, 0xa1, 0x93, 0x11, + 0xd2, 0xe1, 0xe1, 0xd1, 0x33, 0xac, 0x33, 0x00, 0xd5, 0xa7, 0x47, 0xfd, 0x03, 0x55, 0x65, 0x54, + 0x52, 0x8e, 0x47, 0x06, 0xda, 0x20, 0x5b, 0xd0, 0x1c, 0xef, 0x0f, 0x9c, 0xf1, 0xf1, 0xa0, 0xa7, + 0x04, 0x54, 0x49, 0x07, 0x5a, 0xa3, 0xde, 0xe1, 0xd0, 0xe9, 0x3f, 0xe9, 0x8d, 0xbe, 0x18, 0x0e, + 0x3a, 0x35, 0xfb, 0x1b, 0xdd, 0xed, 0x72, 0xdf, 0x66, 0xc8, 0xff, 0xe7, 0x3e, 0xe4, 0xe8, 0x38, + 0x5c, 0x73, 0xbd, 0xc5, 0x47, 0x9c, 0xcc, 0x3d, 0xa5, 0x9c, 0x7b, 0x1e, 0x6f, 0x7e, 0xd3, 0xdc, + 0x7b, 0xef, 0xe3, 0x94, 0xf5, 0xac, 0x8a, 0xa7, 0xf7, 0xff, 0x15, 0x00, 0x00, 0xff, 0xff, 0x0a, + 0x4f, 0x5b, 0xfc, 0x39, 0x1d, 0x00, 0x00, } diff --git a/protocol/protobuf/pairing.proto b/protocol/protobuf/pairing.proto index c59871de3..8cf7691dd 100644 --- a/protocol/protobuf/pairing.proto +++ b/protocol/protobuf/pairing.proto @@ -26,6 +26,8 @@ message Backup { FetchingBackedUpDataDetails profileDetails = 8; SyncSetting setting = 9; FetchingBackedUpDataDetails settingsDetails = 10; + SyncAllKeycards keycards = 11; + FetchingBackedUpDataDetails keycardsDetails = 12; } message MultiAccount { diff --git a/protocol/wakusync/response.go b/protocol/wakusync/response.go index af0cb5b67..ab5b7b45c 100644 --- a/protocol/wakusync/response.go +++ b/protocol/wakusync/response.go @@ -3,6 +3,7 @@ package wakusync import ( "encoding/json" + "github.com/status-im/status-go/multiaccounts/keypairs" "github.com/status-im/status-go/multiaccounts/settings" "github.com/status-im/status-go/protocol/protobuf" ) @@ -11,6 +12,7 @@ type WakuBackedUpDataResponse struct { FetchingDataProgress map[string]protobuf.FetchingBackedUpDataDetails // key represents the data/section backup details refer to Profile *BackedUpProfile Setting *settings.SyncSettingField + Keycards []*keypairs.KeyPair } func (sfwr *WakuBackedUpDataResponse) MarshalJSON() ([]byte, error) { @@ -18,9 +20,11 @@ func (sfwr *WakuBackedUpDataResponse) MarshalJSON() ([]byte, error) { FetchingDataProgress map[string]FetchingBackupedDataDetails `json:"fetchingBackedUpDataProgress,omitempty"` Profile *BackedUpProfile `json:"backedUpProfile,omitempty"` Setting *settings.SyncSettingField `json:"backedUpSettings,omitempty"` + Keycards []*keypairs.KeyPair `json:"backedUpKeycards,omitempty"` }{ - Profile: sfwr.Profile, - Setting: sfwr.Setting, + Profile: sfwr.Profile, + Setting: sfwr.Setting, + Keycards: sfwr.Keycards, } responseItem.FetchingDataProgress = sfwr.FetchingBackedUpDataDetails() diff --git a/services/ext/signal.go b/services/ext/signal.go index dc586b3e2..5b8e71fdf 100644 --- a/services/ext/signal.go +++ b/services/ext/signal.go @@ -156,3 +156,7 @@ func (m *MessengerSignalsHandler) SendWakuBackedUpProfile(response *wakusync.Wak func (m *MessengerSignalsHandler) SendWakuBackedUpSettings(response *wakusync.WakuBackedUpDataResponse) { signal.SendWakuBackedUpSettings(response) } + +func (m *MessengerSignalsHandler) SendWakuBackedUpKeycards(response *wakusync.WakuBackedUpDataResponse) { + signal.SendWakuBackedUpKeycards(response) +} diff --git a/signal/events_sync_from_waku.go b/signal/events_sync_from_waku.go index 8f7372e60..f26b55784 100644 --- a/signal/events_sync_from_waku.go +++ b/signal/events_sync_from_waku.go @@ -3,14 +3,17 @@ package signal import "encoding/json" const ( - // EventWakuFetchingBackupProgress is triggered during the syncing from waku + // EventWakuFetchingBackupProgress is emitted while applying fetched data is ongoing EventWakuFetchingBackupProgress = "waku.fetching.backup.progress" - // EventSyncFromWakuProfile is triggered during the syncing user profile from waku + // EventSyncFromWakuProfile is emitted while applying fetched profile data from waku EventWakuBackedUpProfile = "waku.backedup.profile" - // EventWakuBackedUpSettings is triggered during the syncing user settings from waku + // EventWakuBackedUpSettings is emitted while applying fetched settings from waku EventWakuBackedUpSettings = "waku.backedup.settings" + + // EventWakuBackedUpKeycards is emitted while applying fetched keycard data from waku + EventWakuBackedUpKeycards = "waku.backedup.keycards" ) func SendWakuFetchingBackupProgress(obj json.Marshaler) { @@ -24,3 +27,7 @@ func SendWakuBackedUpProfile(obj json.Marshaler) { func SendWakuBackedUpSettings(obj json.Marshaler) { send(EventWakuBackedUpSettings, obj) } + +func SendWakuBackedUpKeycards(obj json.Marshaler) { + send(EventWakuBackedUpKeycards, obj) +}