sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-04 21:36:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

keep any existing seeds with matching fingerprints when changing a wallets output descriptor, rederiving the xpub if necessary

Browse source
This commit is contained in:
Craig Raw 2024-04-05 12:11:46 +02:00
parent 8ac642b09c
commit 10a796098b
1 changed files with 72 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java
View file

@ -344,12 +344,12 @@ public class SettingsController extends WalletFormController implements Initiali
if(optionalResult.isPresent()) { if(optionalResult.isPresent()) {
QRScanDialog.Result result = optionalResult.get(); QRScanDialog.Result result = optionalResult.get();
if(result.outputDescriptor != null) { if(result.outputDescriptor != null) {
replaceWallet(result.outputDescriptor.toWallet()); rederiveAndReplaceWallet(result.outputDescriptor.toWallet());
} else if(result.wallets != null) { } else if(result.wallets != null) {
for(Wallet wallet : result.wallets) { for(Wallet wallet : result.wallets) {
if(scriptType.getValue().equals(wallet.getScriptType()) && !wallet.getKeystores().isEmpty()) { if(scriptType.getValue().equals(wallet.getScriptType()) && !wallet.getKeystores().isEmpty()) {
OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(wallet); OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(wallet);
replaceWallet(outputDescriptor.toWallet()); rederiveAndReplaceWallet(outputDescriptor.toWallet());
break; break;
} }
} }
@ -455,12 +455,81 @@ public class SettingsController extends WalletFormController implements Initiali
try { try {
OutputDescriptor editedOutputDescriptor = OutputDescriptor.getOutputDescriptor(text.trim().replace("\\", "")); OutputDescriptor editedOutputDescriptor = OutputDescriptor.getOutputDescriptor(text.trim().replace("\\", ""));
Wallet editedWallet = editedOutputDescriptor.toWallet(); Wallet editedWallet = editedOutputDescriptor.toWallet();
replaceWallet(editedWallet); rederiveAndReplaceWallet(editedWallet);
} catch(Exception e) { } catch(Exception e) {
AppServices.showErrorDialog("Invalid output descriptor", e.getMessage()); AppServices.showErrorDialog("Invalid output descriptor", e.getMessage());
} }
} }
private void rederiveAndReplaceWallet(Wallet editedWallet) {
boolean rederive = false;
for(Keystore keystore : editedWallet.getKeystores()) {
Optional<Keystore> optExisting = walletForm.getWallet().getKeystores().stream()
.filter(k -> k.hasMasterPrivateKey() && k.getKeyDerivation() != null && k.getKeyDerivation().getMasterFingerprint() != null && keystore.getKeyDerivation() != null
&& k.getKeyDerivation().getMasterFingerprint().equals(keystore.getKeyDerivation().getMasterFingerprint())).findFirst();
if(optExisting.isPresent() && !keystore.hasMasterPrivateKey()) {
Keystore existing = optExisting.get();
keystore.setLabel(existing.getLabel());
keystore.setSource(existing.getSource());
keystore.setWalletModel(existing.getWalletModel());
if(existing.getKeyDerivation().getDerivation().equals(keystore.getKeyDerivation().getDerivation())) {
keystore.setExtendedPublicKey(existing.getExtendedPublicKey());
} else {
rederive = true;
}
if(existing.hasSeed()) {
keystore.setSeed(existing.getSeed());
} else if(existing.hasMasterPrivateExtendedKey()) {
keystore.setMasterPrivateExtendedKey(existing.getMasterPrivateExtendedKey());
}
}
}
if(rederive && editedWallet.isEncrypted()) {
rederiveAndReplaceEncryptedWallet(editedWallet);
} else {
replaceWallet(editedWallet);
}
}
private void rederiveAndReplaceEncryptedWallet(Wallet editedWallet) {
WalletPasswordDialog dlg = new WalletPasswordDialog(walletForm.getWallet().getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
dlg.initOwner(apply.getScene().getWindow());
Optional<SecureString> password = dlg.showAndWait();
if(password.isPresent()) {
Storage storage = walletForm.getStorage();
Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get(), true);
keyDerivationService.setOnSucceeded(workerStateEvent -> {
EventManager.get().post(new StorageEvent(getWalletForm().getWalletId(), TimedEvent.Action.END, "Done"));
ECKey encryptionFullKey = keyDerivationService.getValue();
Key key = new Key(encryptionFullKey.getPrivKeyBytes(), storage.getKeyDeriver().getSalt(), EncryptionType.Deriver.ARGON2);
try {
storage.restorePublicKeysFromSeed(editedWallet, key);
replaceWallet(editedWallet);
} catch(Exception e) {
log.error("Error restoring public keys from seed", e);
} finally {
key.clear();
encryptionFullKey.clear();
password.get().clear();
}
});
keyDerivationService.setOnFailed(workerStateEvent -> {
EventManager.get().post(new StorageEvent(getWalletForm().getWalletId(), TimedEvent.Action.END, "Failed"));
if(keyDerivationService.getException() instanceof InvalidPasswordException) {
Optional<ButtonType> optResponse = showErrorDialog("Invalid Password", "The wallet password was invalid. Try again?", ButtonType.CANCEL, ButtonType.OK);
if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
Platform.runLater(() -> rederiveAndReplaceEncryptedWallet(editedWallet));
}
} else {
log.error("Error deriving wallet key", keyDerivationService.getException());
}
});
EventManager.get().post(new StorageEvent(getWalletForm().getWalletId(), TimedEvent.Action.START, "Decrypting wallet..."));
keyDerivationService.start();
}
}
private void replaceWallet(Wallet editedWallet) { private void replaceWallet(Wallet editedWallet) {
editedWallet.setName(getWalletForm().getWallet().getName()); editedWallet.setName(getWalletForm().getWallet().getName());
editedWallet.setBirthDate(getWalletForm().getWallet().getBirthDate()); editedWallet.setBirthDate(getWalletForm().getWallet().getBirthDate());