refactor(signals): remove waku from signals and remove unused signals

jrainville · jrainville · commit b85cac12c092 · 2025-10-02T14:10:18.000-04:00
diff --git a/protocol/backupsync/profile_response.go b/protocol/backupsync/profile_response.go
@@ -1,4 +1,4 @@
-package wakusync
+package backupsync
 
 import (
 	"github.com/status-im/status-go/images"
@@ -13,18 +13,18 @@ type BackedUpProfile struct {
 	ProfileShowcasePreferences identity.ProfileShowcasePreferences `json:"profile_showcase_preferences,omitempty"`
 }
 
-func (sfwr *WakuBackedUpDataResponse) SetDisplayName(displayName string) {
+func (sfwr *BackedUpDataResponse) SetDisplayName(displayName string) {
 	sfwr.Profile.DisplayName = displayName
 }
 
-func (sfwr *WakuBackedUpDataResponse) SetImages(images []images.IdentityImage) {
+func (sfwr *BackedUpDataResponse) SetImages(images []images.IdentityImage) {
 	sfwr.Profile.Images = images
 }
 
-func (sfwr *WakuBackedUpDataResponse) SetEnsUsernameDetails(ensUsernameDetails []*ens.UsernameDetail) {
+func (sfwr *BackedUpDataResponse) SetEnsUsernameDetails(ensUsernameDetails []*ens.UsernameDetail) {
 	sfwr.Profile.EnsUsernameDetails = ensUsernameDetails
 }
 
-func (sfwr *WakuBackedUpDataResponse) SetProfileShowcasePreferences(profileShowcasePreferences *identity.ProfileShowcasePreferences) {
+func (sfwr *BackedUpDataResponse) SetProfileShowcasePreferences(profileShowcasePreferences *identity.ProfileShowcasePreferences) {
 	sfwr.Profile.ProfileShowcasePreferences = *profileShowcasePreferences
 }
diff --git a/protocol/backupsync/response.go b/protocol/backupsync/response.go
@@ -0,0 +1,34 @@
+package backupsync
+
+import (
+	"encoding/json"
+
+	accsmanagementtypes "github.com/status-im/status-go/accounts-management/types"
+	"github.com/status-im/status-go/multiaccounts/settings"
+)
+
+type BackedUpDataResponse struct {
+	Clock            uint64
+	Profile          *BackedUpProfile
+	Setting          *settings.SyncSettingField
+	Keypair          *accsmanagementtypes.Keypair
+	WatchOnlyAccount *accsmanagementtypes.Account
+}
+
+func (sfwr *BackedUpDataResponse) MarshalJSON() ([]byte, error) {
+	responseItem := struct {
+		Clock            uint64                       `json:"clock,omitempty"`
+		Profile          *BackedUpProfile             `json:"backedUpProfile,omitempty"`
+		Setting          *settings.SyncSettingField   `json:"backedUpSettings,omitempty"`
+		Keypair          *accsmanagementtypes.Keypair `json:"backedUpKeypair,omitempty"`
+		WatchOnlyAccount *accsmanagementtypes.Account `json:"backedUpWatchOnlyAccount,omitempty"`
+	}{
+		Clock:            sfwr.Clock,
+		Profile:          sfwr.Profile,
+		Setting:          sfwr.Setting,
+		Keypair:          sfwr.Keypair,
+		WatchOnlyAccount: sfwr.WatchOnlyAccount,
+	}
+
+	return json.Marshal(responseItem)
+}
diff --git a/protocol/messenger_backup_handler.go b/protocol/messenger_backup_handler.go
@@ -12,9 +12,9 @@ import (
 	messagingtypes "github.com/status-im/status-go/messaging/types"
 	"github.com/status-im/status-go/multiaccounts/errors"
 	"github.com/status-im/status-go/multiaccounts/settings"
+	"github.com/status-im/status-go/protocol/backupsync"
 	"github.com/status-im/status-go/protocol/communities"
 	"github.com/status-im/status-go/protocol/protobuf"
-	"github.com/status-im/status-go/protocol/wakusync"
 	ensservice "github.com/status-im/status-go/services/ens"
 	"github.com/status-im/status-go/signal"
 )
@@ -70,8 +70,8 @@ func (m *Messenger) handleBackedUpProfile(message *protobuf.BackedUpProfile, bac
 		return nil
 	}
 
-	response := wakusync.WakuBackedUpDataResponse{
-		Profile: &wakusync.BackedUpProfile{},
+	response := backupsync.BackedUpDataResponse{
+		Profile: &backupsync.BackedUpProfile{},
 	}
 
 	err := utils.ValidateDisplayName(&message.DisplayName)
@@ -168,7 +168,7 @@ func (m *Messenger) handleBackedUpProfile(message *protobuf.BackedUpProfile, bac
 	response.SetEnsUsernameDetails(ensUsernameDetails)
 
 	if m.config.messengerSignalsHandler != nil {
-		m.config.messengerSignalsHandler.SendWakuBackedUpProfile(&response)
+		m.config.messengerSignalsHandler.SendBackedUpProfile(&response)
 	}
 
 	return err
@@ -205,10 +205,10 @@ func (m *Messenger) handleLocalBackupCommunities(state *ReceivedMessageState, co
 
 func (m *Messenger) PublishSettingEvent(settingField *settings.SyncSettingField) {
 	if m.config.messengerSignalsHandler != nil {
-		response := wakusync.WakuBackedUpDataResponse{
+		response := backupsync.BackedUpDataResponse{
 			Setting: settingField,
 		}
-		m.config.messengerSignalsHandler.SendWakuBackedUpSettings(&response)
+		m.config.messengerSignalsHandler.SendBackedUpSettings(&response)
 	}
 }
 
diff --git a/protocol/messenger_config.go b/protocol/messenger_config.go
@@ -14,13 +14,13 @@ import (
 
 	"github.com/status-im/status-go/multiaccounts"
 	"github.com/status-im/status-go/params"
+	"github.com/status-im/status-go/protocol/backupsync"
 	"github.com/status-im/status-go/protocol/common"
 	"github.com/status-im/status-go/protocol/communities"
 	"github.com/status-im/status-go/protocol/discord"
 	"github.com/status-im/status-go/protocol/ens"
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/pushnotificationclient"
-	"github.com/status-im/status-go/protocol/wakusync"
 	"github.com/status-im/status-go/services/mailservers"
 	"github.com/status-im/status-go/services/wallet"
 )
@@ -54,10 +54,8 @@ type MessengerSignalsHandler interface {
 	DiscordChannelImportProgress(importProgress *discord.ImportProgress)
 	DiscordChannelImportFinished(communityID string, channelID string)
 	DiscordChannelImportCancelled(channelID string)
-	SendWakuBackedUpProfile(response *wakusync.WakuBackedUpDataResponse)
-	SendWakuBackedUpSettings(response *wakusync.WakuBackedUpDataResponse)
-	SendWakuBackedUpKeypair(response *wakusync.WakuBackedUpDataResponse)
-	SendWakuBackedUpWatchOnlyAccount(response *wakusync.WakuBackedUpDataResponse)
+	SendBackedUpProfile(response *backupsync.BackedUpDataResponse)
+	SendBackedUpSettings(response *backupsync.BackedUpDataResponse)
 	SendCuratedCommunitiesUpdate(response *communities.KnownCommunitiesResponse)
 }
 
diff --git a/protocol/messenger_testing_utils.go b/protocol/messenger_testing_utils.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	gocommon "github.com/status-im/status-go/common"
-	"github.com/status-im/status-go/protocol/wakusync"
+	"github.com/status-im/status-go/protocol/backupsync"
 
 	"github.com/status-im/status-go/protocol/identity"
 
@@ -54,11 +54,8 @@ type MessengerSignalsHandlerMock struct {
 	communityFoundChan chan *communities.Community
 }
 
-func (m *MessengerSignalsHandlerMock) SendWakuBackedUpProfile(*wakusync.WakuBackedUpDataResponse)  {}
-func (m *MessengerSignalsHandlerMock) SendWakuBackedUpSettings(*wakusync.WakuBackedUpDataResponse) {}
-func (m *MessengerSignalsHandlerMock) SendWakuBackedUpKeypair(*wakusync.WakuBackedUpDataResponse)  {}
-func (m *MessengerSignalsHandlerMock) SendWakuBackedUpWatchOnlyAccount(*wakusync.WakuBackedUpDataResponse) {
-}
+func (m *MessengerSignalsHandlerMock) SendBackedUpProfile(*backupsync.BackedUpDataResponse)  {}
+func (m *MessengerSignalsHandlerMock) SendBackedUpSettings(*backupsync.BackedUpDataResponse) {}
 
 func (m *MessengerSignalsHandlerMock) HistoryArchivesProtocolEnabled()           {}
 func (m *MessengerSignalsHandlerMock) HistoryArchivesProtocolDisabled()          {}
diff --git a/protocol/wakusync/progress_response.go b/protocol/wakusync/progress_response.go
diff --git a/protocol/wakusync/response.go b/protocol/wakusync/response.go
diff --git a/services/ext/signal.go b/services/ext/signal.go
@@ -4,9 +4,9 @@ import (
 	"github.com/status-im/status-go/crypto/types"
 	messagingtypes "github.com/status-im/status-go/messaging/types"
 	"github.com/status-im/status-go/protocol"
+	"github.com/status-im/status-go/protocol/backupsync"
 	"github.com/status-im/status-go/protocol/communities"
 	"github.com/status-im/status-go/protocol/discord"
-	"github.com/status-im/status-go/protocol/wakusync"
 	"github.com/status-im/status-go/signal"
 )
 
@@ -157,20 +157,12 @@ func (m *MessengerSignalsHandler) DiscordChannelImportCancelled(id string) {
 	signal.SendDiscordChannelImportCancelled(id)
 }
 
-func (m *MessengerSignalsHandler) SendWakuBackedUpProfile(response *wakusync.WakuBackedUpDataResponse) {
-	signal.SendWakuBackedUpProfile(response)
+func (m *MessengerSignalsHandler) SendBackedUpProfile(response *backupsync.BackedUpDataResponse) {
+	signal.SendBackedUpProfile(response)
 }
 
-func (m *MessengerSignalsHandler) SendWakuBackedUpSettings(response *wakusync.WakuBackedUpDataResponse) {
-	signal.SendWakuBackedUpSettings(response)
-}
-
-func (m *MessengerSignalsHandler) SendWakuBackedUpKeypair(response *wakusync.WakuBackedUpDataResponse) {
-	signal.SendWakuBackedUpKeypair(response)
-}
-
-func (m *MessengerSignalsHandler) SendWakuBackedUpWatchOnlyAccount(response *wakusync.WakuBackedUpDataResponse) {
-	signal.SendWakuBackedUpWatchOnlyAccount(response)
+func (m *MessengerSignalsHandler) SendBackedUpSettings(response *backupsync.BackedUpDataResponse) {
+	signal.SendBackedUpSettings(response)
 }
 
 func (m *MessengerSignalsHandler) SendCuratedCommunitiesUpdate(response *communities.KnownCommunitiesResponse) {
diff --git a/services/wallet/service.go b/services/wallet/service.go
@@ -21,10 +21,10 @@ import (
 	"github.com/status-im/status-go/multiaccounts/accounts"
 	"github.com/status-im/status-go/params"
 	"github.com/status-im/status-go/pkg/pubsub"
+	"github.com/status-im/status-go/protocol/backupsync"
 	protocolCommon "github.com/status-im/status-go/protocol/common"
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/syncing"
-	"github.com/status-im/status-go/protocol/wakusync"
 	"github.com/status-im/status-go/rpc"
 	"github.com/status-im/status-go/server"
 	"github.com/status-im/status-go/services/ens/ensresolver"
@@ -510,7 +510,7 @@ func (s *Service) handleWatchOnlyAccount(message *protobuf.SyncAccount) error {
 	if err != nil && !errors.Is(err, syncing.ErrTryingToStoreOldWalletAccount) {
 		return err
 	}
-	response := wakusync.WakuBackedUpDataResponse{
+	response := backupsync.BackedUpDataResponse{
 		WatchOnlyAccount: acc,
 	}
 	encodedmessage, err := json.Marshal(response)
diff --git a/signal/events_backup_sync.go b/signal/events_backup_sync.go
@@ -0,0 +1,19 @@
+package signal
+
+import "encoding/json"
+
+const (
+	// EventSyncFromWakuProfile is emitted while applying backed up profile data
+	EventBackedUpProfile = "backedup.profile"
+
+	// EventBackedUpSettings is emitted while applying backed up settings
+	EventBackedUpSettings = "backedup.settings"
+)
+
+func SendBackedUpProfile(obj json.Marshaler) {
+	send(EventBackedUpProfile, obj)
+}
+
+func SendBackedUpSettings(obj json.Marshaler) {
+	send(EventBackedUpSettings, obj)
+}
diff --git a/signal/events_sync_from_waku.go b/signal/events_sync_from_waku.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package wakusync`
	`1`	`+package backupsync`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/status-im/status-go/images"`
`@@ -13,18 +13,18 @@ type BackedUpProfile struct {`
`13`	`13`	ProfileShowcasePreferences identity.ProfileShowcasePreferences `json:"profile_showcase_preferences,omitempty"`
`14`	`14`	`}`
`15`	`15`
`16`		`-func (sfwr *WakuBackedUpDataResponse) SetDisplayName(displayName string) {`
	`16`	`+func (sfwr *BackedUpDataResponse) SetDisplayName(displayName string) {`
`17`	`17`	`sfwr.Profile.DisplayName = displayName`
`18`	`18`	`}`
`19`	`19`
`20`		`-func (sfwr *WakuBackedUpDataResponse) SetImages(images []images.IdentityImage) {`
	`20`	`+func (sfwr *BackedUpDataResponse) SetImages(images []images.IdentityImage) {`
`21`	`21`	`sfwr.Profile.Images = images`
`22`	`22`	`}`
`23`	`23`
`24`		`-func (sfwr WakuBackedUpDataResponse) SetEnsUsernameDetails(ensUsernameDetails []ens.UsernameDetail) {`
	`24`	`+func (sfwr BackedUpDataResponse) SetEnsUsernameDetails(ensUsernameDetails []ens.UsernameDetail) {`
`25`	`25`	`sfwr.Profile.EnsUsernameDetails = ensUsernameDetails`
`26`	`26`	`}`
`27`	`27`
`28`		`-func (sfwr WakuBackedUpDataResponse) SetProfileShowcasePreferences(profileShowcasePreferences identity.ProfileShowcasePreferences) {`
	`28`	`+func (sfwr BackedUpDataResponse) SetProfileShowcasePreferences(profileShowcasePreferences identity.ProfileShowcasePreferences) {`
`29`	`29`	`sfwr.Profile.ProfileShowcasePreferences = *profileShowcasePreferences`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ import (`
`12`	`12`	`messagingtypes "github.com/status-im/status-go/messaging/types"`
`13`	`13`	`"github.com/status-im/status-go/multiaccounts/errors"`
`14`	`14`	`"github.com/status-im/status-go/multiaccounts/settings"`
	`15`	`+ "github.com/status-im/status-go/protocol/backupsync"`
`15`	`16`	`"github.com/status-im/status-go/protocol/communities"`
`16`	`17`	`"github.com/status-im/status-go/protocol/protobuf"`
`17`		`- "github.com/status-im/status-go/protocol/wakusync"`
`18`	`18`	`ensservice "github.com/status-im/status-go/services/ens"`
`19`	`19`	`"github.com/status-im/status-go/signal"`
`20`	`20`	`)`
`@@ -70,8 +70,8 @@ func (m Messenger) handleBackedUpProfile(message protobuf.BackedUpProfile, bac`
`70`	`70`	`return nil`
`71`	`71`	`}`
`72`	`72`
`73`		`- response := wakusync.WakuBackedUpDataResponse{`
`74`		`- Profile: &wakusync.BackedUpProfile{},`
	`73`	`+ response := backupsync.BackedUpDataResponse{`
	`74`	`+ Profile: &backupsync.BackedUpProfile{},`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`err := utils.ValidateDisplayName(&message.DisplayName)`
`@@ -168,7 +168,7 @@ func (m Messenger) handleBackedUpProfile(message protobuf.BackedUpProfile, bac`
`168`	`168`	`response.SetEnsUsernameDetails(ensUsernameDetails)`
`169`	`169`
`170`	`170`	`if m.config.messengerSignalsHandler != nil {`
`171`		`- m.config.messengerSignalsHandler.SendWakuBackedUpProfile(&response)`
	`171`	`+ m.config.messengerSignalsHandler.SendBackedUpProfile(&response)`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`return err`
`@@ -205,10 +205,10 @@ func (m Messenger) handleLocalBackupCommunities(state ReceivedMessageState, co`
`205`	`205`
`206`	`206`	`func (m Messenger) PublishSettingEvent(settingField settings.SyncSettingField) {`
`207`	`207`	`if m.config.messengerSignalsHandler != nil {`
`208`		`- response := wakusync.WakuBackedUpDataResponse{`
	`208`	`+ response := backupsync.BackedUpDataResponse{`
`209`	`209`	`Setting: settingField,`
`210`	`210`	`}`
`211`		`- m.config.messengerSignalsHandler.SendWakuBackedUpSettings(&response)`
	`211`	`+ m.config.messengerSignalsHandler.SendBackedUpSettings(&response)`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`