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

preserve payment labels when using rbf on multiple payment transactions

Browse source
This commit is contained in:
Craig Raw 2023-06-26 12:15:58 +02:00
parent b8fc2fd59e
commit 9156ea1114
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java
View file

@ -36,7 +36,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
private static final Logger log = LoggerFactory.getLogger(EntryCell.class); private static final Logger log = LoggerFactory.getLogger(EntryCell.class);
public static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm"); public static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm");
private static final Pattern REPLACED_BY_FEE_SUFFIX = Pattern.compile("(.*)\\(Replaced By Fee( #)?(\\d+)?\\).*"); public static final Pattern REPLACED_BY_FEE_SUFFIX = Pattern.compile("(.*?)( \\(Replaced By Fee( #)?(\\d+)?\\)).*?");
private static EntryCell lastCell; private static EntryCell lastCell;
@ -263,17 +263,21 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
List<Payment> payments = externalOutputs.stream().map(txOutput -> { List<Payment> payments = externalOutputs.stream().map(txOutput -> {
try { try {
String label = transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel(); String label = transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel();
Matcher matcher = REPLACED_BY_FEE_SUFFIX.matcher(label); label = REPLACED_BY_FEE_SUFFIX.matcher(label).replaceAll("$1");
String[] paymentLabels = label.split(", ");
if(externalOutputs.size() > 1 && externalOutputs.size() == paymentLabels.length) {
label = paymentLabels[externalOutputs.indexOf(txOutput)];
}
Matcher matcher = REPLACED_BY_FEE_SUFFIX.matcher(transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel());
if(matcher.matches()) { if(matcher.matches()) {
String base = matcher.group(1);
if(matcher.groupCount() > 2 && matcher.group(3) != null) { if(matcher.groupCount() > 2 && matcher.group(3) != null) {
int count = Integer.parseInt(matcher.group(3)) + 1; int count = Integer.parseInt(matcher.group(3)) + 1;
label = base + "(Replaced By Fee #" + count + ")"; label += " (Replaced By Fee #" + count + ")";
} else { } else {
label = base + "(Replaced By Fee #2)"; label += " (Replaced By Fee #2)";
} }
} else { } else {
label += (label.isEmpty() ? "" : " ") + "(Replaced By Fee)"; label += " (Replaced By Fee)";
} }
if(txOutput.getScript().getToAddress() != null) { if(txOutput.getScript().getToAddress() != null) {

7
src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java
View file

@ -1507,6 +1507,13 @@ public class HeadersController extends TransactionFormController implements Init
StringJoiner joiner = new StringJoiner(", "); StringJoiner joiner = new StringJoiner(", ");
outputIndexLabels.values().forEach(joiner::add); outputIndexLabels.values().forEach(joiner::add);
name = joiner.toString(); name = joiner.toString();
Matcher matcher = EntryCell.REPLACED_BY_FEE_SUFFIX.matcher(name);
name = matcher.replaceAll("$1");
matcher.reset();
if(matcher.find()) {
name += matcher.group(2);
}
} }
blockTransaction.setLabel(name != null && name.length() > 255 ? name.substring(0, 255) : name); blockTransaction.setLabel(name != null && name.length() > 255 ? name.substring(0, 255) : name);
changedLabelEntries.add(new TransactionEntry(event.getWallet(), blockTransaction, Collections.emptyMap(), Collections.emptyMap())); changedLabelEntries.add(new TransactionEntry(event.getWallet(), blockTransaction, Collections.emptyMap(), Collections.emptyMap()));