@@ -41,6 +41,7 @@ import (
41
41
"github.com/status-im/status-go/services/status"
42
42
"github.com/status-im/status-go/services/stickers"
43
43
"github.com/status-im/status-go/services/updates"
44
+ "github.com/status-im/status-go/services/utils"
44
45
"github.com/status-im/status-go/services/wakuv2ext"
45
46
"github.com/status-im/status-go/services/wallet"
46
47
"github.com/status-im/status-go/timesource"
@@ -214,32 +215,35 @@ func (n *StatusNode) StartLocalBackup() error {
214
215
}
215
216
}
216
217
218
+ chatAccount , err := n .gethAccountsManager .SelectedChatAccount ()
219
+ if err != nil {
220
+ return err
221
+ }
222
+
223
+ privateKey := chatAccount .PrivateKey ()
224
+
217
225
filenameGetter := func () (string , error ) {
218
- profileKeypair , err := n .accountsSrvc .GetProfileKeypair ()
226
+ backupPath , err := n .accountsSrvc .GetBackupPath ()
219
227
if err != nil {
220
228
return "" , err
221
229
}
222
230
223
- backupPath , err := n . accountsSrvc . GetBackupPath ( )
231
+ compressedPubKey , err := utils . SerializePublicKey ( crypto . CompressPubkey ( & privateKey . PublicKey ) )
224
232
if err != nil {
225
233
return "" , err
226
234
}
235
+
227
236
var backupDir string
228
237
if backupPath != "" {
229
238
backupDir = backupPath
230
239
} else {
231
240
backupDir = filepath .Join (n .config .RootDataDir , "backups" )
232
241
}
233
- fullPath := filepath .Join (backupDir , fmt .Sprintf ("%x_user_data.bkp" , profileKeypair .KeyUID [len (profileKeypair .KeyUID )- 4 :]))
234
- return fullPath , nil
235
- }
236
242
237
- chatAccount , err := n .gethAccountsManager .SelectedChatAccount ()
238
- if err != nil {
239
- return err
240
- }
243
+ fullPath := filepath .Join (backupDir , fmt .Sprintf ("%s_user_data.bkp" , compressedPubKey [len (compressedPubKey )- 6 :]))
241
244
242
- privateKey := chatAccount .PrivateKey ()
245
+ return fullPath , nil
246
+ }
243
247
244
248
n .localBackup , err = backup .NewController (backup.BackupConfig {
245
249
PrivateKey : crypto .Keccak256 (crypto .FromECDSA (privateKey )),
0 commit comments