laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-09-14 00:45:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

hide the gap limit and request a birth date for a silent payments wallet in the terminal

Browse Source
This commit is contained in:
Craig Raw
2026-09-11 12:22:18 +02:00
parent 4ee9a4a702
commit b43f24f961
2 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sparrowwallet/sparrow/terminal/wallet/AdvancedDialog.java
+25 -15
View File
@@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.terminal.wallet;
import com.googlecode.lanterna.TerminalSize;
import com.googlecode.lanterna.gui2.*;
import com.sparrowwallet.drongo.policy.PolicyType;
import com.sparrowwallet.drongo.wallet.Wallet;
import com.sparrowwallet.sparrow.io.Storage;
import com.sparrowwallet.sparrow.wallet.WalletForm;
@@ -39,9 +40,14 @@ public class AdvancedDialog extends WalletDialog {
birthDate = new TextBox().setValidationPattern(Pattern.compile("[0-9\\-/]*"));
mainPanel.addComponent(birthDate);
mainPanel.addComponent(new Label("Gap limit"));
gapLimit = new TextBox().setValidationPattern(Pattern.compile("[0-9]*"));
mainPanel.addComponent(gapLimit);
//A silent payments wallet derives no addresses to look ahead over, and getGapLimit() returns zero whatever is stored
if(wallet.getPolicyType() == PolicyType.SINGLE_SP) {
gapLimit = null;
} else {
mainPanel.addComponent(new Label("Gap limit"));
gapLimit = new TextBox().setValidationPattern(Pattern.compile("[0-9]*"));
mainPanel.addComponent(gapLimit);
}
Panel buttonPanel = new Panel();
buttonPanel.setLayoutManager(new GridLayout(2).setHorizontalSpacing(1));
@@ -60,7 +66,9 @@ public class AdvancedDialog extends WalletDialog {
birthDate.setText(DATE_FORMAT.format(wallet.getBirthDate()));
}
gapLimit.setText(Integer.toString(wallet.getGapLimit()));
if(gapLimit != null) {
gapLimit.setText(Integer.toString(wallet.getGapLimit()));
}
birthDate.setTextChangeListener((newText, changedByUserInteraction) -> {
try {
@@ -73,19 +81,21 @@ public class AdvancedDialog extends WalletDialog {
}
});
gapLimit.setTextChangeListener((newText, changedByUserInteraction) -> {
try {
int newValue = Integer.parseInt(newText);
if(newValue < 0 || newValue > 1000000) {
if(gapLimit != null) {
gapLimit.setTextChangeListener((newText, changedByUserInteraction) -> {
try {
int newValue = Integer.parseInt(newText);
if(newValue < 0 || newValue > 1000000) {
return;
}
wallet.setGapLimit(newValue);
apply.setEnabled(true);
} catch(NumberFormatException e) {
return;
}
wallet.setGapLimit(newValue);
apply.setEnabled(true);
} catch(NumberFormatException e) {
return;
}
});
});
}
}
private void onChangePassword() {
src/main/java/com/sparrowwallet/sparrow/terminal/wallet/WatchOnlyDialog.java
+27
View File
@@ -3,6 +3,7 @@ package com.sparrowwallet.sparrow.terminal.wallet;
import com.googlecode.lanterna.TerminalPosition;
import com.googlecode.lanterna.TerminalSize;
import com.googlecode.lanterna.gui2.*;
import com.googlecode.lanterna.gui2.dialogs.TextInputDialogBuilder;
import com.sparrowwallet.drongo.ExtendedKey;
import com.sparrowwallet.drongo.KeyDerivation;
import com.sparrowwallet.drongo.OutputDescriptor;
@@ -18,11 +19,15 @@ import com.sparrowwallet.sparrow.terminal.SparrowTerminal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
public class WatchOnlyDialog extends NewWalletDialog {
private static final Logger log = LoggerFactory.getLogger(WatchOnlyDialog.class);
private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
private final TextBox descriptor;
private final Button importWallet;
@@ -143,9 +148,31 @@ public class WatchOnlyDialog extends NewWalletDialog {
OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(text);
Wallet wallet = outputDescriptor.toWallet();
wallet.setName(walletName);
if(wallet.getPolicyType() == PolicyType.SINGLE_SP && wallet.getBirthDate() == null && wallet.getBirthHeight() == null) {
wallet.setBirthDate(requestBirthDate());
}
return List.of(wallet);
}
private Date requestBirthDate() {
TextInputDialogBuilder builder = new TextInputDialogBuilder().setTitle("Wallet Birth Date");
builder.setDescription("Silent payments are scanned for from this date onwards." + System.lineSeparator() + "Enter the date this wallet was created as " + DATE_FORMAT.toPattern() + ".");
builder.setInitialContent(DATE_FORMAT.format(new Date()));
String enteredDate = builder.build().showDialog(SparrowTerminal.get().getGui());
if(enteredDate == null || enteredDate.isBlank()) {
return null;
}
try {
return DATE_FORMAT.parse(enteredDate.trim());
} catch(ParseException e) {
log.warn("Could not parse the birth date entered for " + walletName);
return null;
}
}
private List<String> splitString(String stringToSplit, int maxLength) {
String text = stringToSplit.replaceAll("\\s+", "");
if(stringToSplit.endsWith("\n")) {