sparrowwallet/sparrow
sparrowwallet/sparrow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

fix possible db corruption on password removal by reordering database file and row updates

Browse Source
This commit is contained in:
Craig Raw 2026-03-06 11:30:41 +02:00
parent 3766585474
commit e9108b85cd
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/sparrowwallet/sparrow/io/db/DbPersistence.java
View File

@ -162,11 +162,20 @@ public class DbPersistence implements Persistence {
@Override
public void updateWallet(Storage storage, Wallet wallet, ECKey encryptionPubKey) throws StorageException {
updatePassword(storage, encryptionPubKey);
String newPassword = getFilePassword(encryptionPubKey);
String currentPassword = getDatasourcePassword();
updateExecutor.execute(() -> {
try {
update(storage, wallet, getFilePassword(encryptionPubKey));
if(dataSource != null && currentPassword != null && newPassword == null) {
//Removing encryption: write data first
update(storage, wallet, currentPassword);
updatePassword(storage, encryptionPubKey);
} else {
//Adding encryption or no change: change file first
updatePassword(storage, encryptionPubKey);
update(storage, wallet, newPassword);
}
} catch(Exception e) {
log.error("Error updating wallet db", e);
}