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

use abbreviated derivation paths

Browse source
This commit is contained in:
Craig Raw 2020-10-20 12:18:23 +02:00
parent 4a030e9b6e
commit 3aeba79268
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/sparrowwallet/sparrow/control/AddressCell.java
View file

@ -58,7 +58,7 @@ public class AddressCell extends TreeTableCell<Entry, Entry> {
} }
private String getTooltipText(UtxoEntry utxoEntry) { private String getTooltipText(UtxoEntry utxoEntry) {
return utxoEntry.getNode().getDerivationPath() + (utxoEntry.isDuplicateAddress() ? " (Duplicate address)" : ""); return utxoEntry.getNode().getDerivationPath().replace("m", "..") + (utxoEntry.isDuplicateAddress() ? " (Duplicate address)" : "");
} }
public static Glyph getDuplicateGlyph() { public static Glyph getDuplicateGlyph() {

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

@ -74,7 +74,7 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
setText(address.toString()); setText(address.toString());
setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), null)); setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), null));
Tooltip tooltip = new Tooltip(); Tooltip tooltip = new Tooltip();
tooltip.setText(nodeEntry.getNode().getDerivationPath()); tooltip.setText(nodeEntry.getNode().getDerivationPath().replace("m", ".."));
setTooltip(tooltip); setTooltip(tooltip);
getStyleClass().add("address-cell"); getStyleClass().add("address-cell");

6
src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java
View file

@ -171,8 +171,7 @@ public class TransactionDiagram extends GridPane {
Tooltip tooltip = new Tooltip(); Tooltip tooltip = new Tooltip();
if(walletNode != null) { if(walletNode != null) {
KeyDerivation fullDerivation = walletTx.getWallet().getKeystores().get(0).getKeyDerivation().extend(walletNode.getDerivation()); tooltip.setText("Spending " + getSatsValue(input.getValue()) + " sats from " + walletNode.getDerivationPath().replace("m", "..") + "\n" + input.getHashAsString() + ":" + input.getIndex() + "\n" + walletTx.getWallet().getAddress(walletNode));
tooltip.setText("Spending " + getSatsValue(input.getValue()) + " sats from " + fullDerivation.getDerivationPath() + "\n" + input.getHashAsString() + ":" + input.getIndex() + "\n" + walletTx.getWallet().getAddress(walletNode));
tooltip.getStyleClass().add("input-label"); tooltip.getStyleClass().add("input-label");
if(input.getLabel() == null || input.getLabel().isEmpty()) { if(input.getLabel() == null || input.getLabel().isEmpty()) {
@ -333,8 +332,7 @@ public class TransactionDiagram extends GridPane {
String changeDesc = walletTx.getChangeAddress().toString().substring(0, 8) + "..."; String changeDesc = walletTx.getChangeAddress().toString().substring(0, 8) + "...";
Label changeLabel = new Label(changeDesc, getChangeGlyph()); Label changeLabel = new Label(changeDesc, getChangeGlyph());
changeLabel.getStyleClass().addAll("output-label", "change-label"); changeLabel.getStyleClass().addAll("output-label", "change-label");
KeyDerivation fullDerivation = walletTx.getWallet().getKeystores().get(0).getKeyDerivation().extend(walletTx.getChangeNode().getDerivation()); Tooltip changeTooltip = new Tooltip("Change of " + getSatsValue(walletTx.getChangeAmount()) + " sats to " + walletTx.getChangeNode().getDerivationPath().replace("m", "..") + "\n" + walletTx.getChangeAddress().toString());
Tooltip changeTooltip = new Tooltip("Change of " + getSatsValue(walletTx.getChangeAmount()) + " sats to " + fullDerivation.getDerivationPath() + "\n" + walletTx.getChangeAddress().toString());
changeTooltip.getStyleClass().add("change-label"); changeTooltip.getStyleClass().add("change-label");
changeTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY)); changeTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
changeLabel.setTooltip(changeTooltip); changeLabel.setTooltip(changeTooltip);