sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 13:16:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow editing of the output descriptor of a new account on a watch only wallet

Browse source
This commit is contained in:
Craig Raw 2024-04-22 13:29:41 +02:00
parent 3e870f362d
commit 1887e1c7b0
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -464,6 +464,11 @@ public class SettingsController extends WalletFormController implements Initiali
} }
private void rederiveAndReplaceWallet(Wallet editedWallet) { private void rederiveAndReplaceWallet(Wallet editedWallet) {
if(!walletForm.getWallet().isMasterWallet() && (editedWallet.getPolicyType() != walletForm.getMasterWallet().getPolicyType() || editedWallet.getScriptType() != walletForm.getMasterWallet().getScriptType())) {
AppServices.showErrorDialog("Policy or Script Type Mismatch", "The provided output descriptor does not match the policy or script type of this wallet.");
return;
}
boolean rederive = false; boolean rederive = false;
for(Keystore keystore : editedWallet.getKeystores()) { for(Keystore keystore : editedWallet.getKeystores()) {
Optional<Keystore> optExisting = walletForm.getWallet().getKeystores().stream() Optional<Keystore> optExisting = walletForm.getWallet().getKeystores().stream()
@ -769,7 +774,7 @@ public class SettingsController extends WalletFormController implements Initiali
policyType.setDisable(disabled); policyType.setDisable(disabled);
scriptType.setDisable(disabled); scriptType.setDisable(disabled);
multisigControl.setDisable(disabled); multisigControl.setDisable(disabled);
editDescriptor.setVisible(!disabled); editDescriptor.setVisible(!disabled || (!walletForm.getWallet().isValid() && walletForm.getMasterWallet().getKeystores().stream().allMatch(k -> k.getSource() == KeystoreSource.SW_WATCH)));
} }
@Override @Override