From 526de33bddb0e803cda0edfde00b35c182605ce1 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Wed, 26 Jan 2022 10:04:45 +0100 Subject: [PATCH] (re)allow full addresses in whirlpool child wallet address csv exports --- .../com/sparrowwallet/sparrow/wallet/AddressesController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/AddressesController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/AddressesController.java index 3534a518..a81a5f49 100644 --- a/src/main/java/com/sparrowwallet/sparrow/wallet/AddressesController.java +++ b/src/main/java/com/sparrowwallet/sparrow/wallet/AddressesController.java @@ -115,7 +115,6 @@ public class AddressesController extends WalletFormController implements Initial fileChooser.setTitle("Export Addresses to CSV"); fileChooser.setInitialFileName(getWalletForm().getWallet().getFullName() + "-" + keyPurpose.name().toLowerCase() + "-addresses.csv"); - boolean whirlpoolChildWallet = getWalletForm().getWallet().isWhirlpoolChildWallet(); Wallet copy = getWalletForm().getWallet().copy(); WalletNode purposeNode = copy.getNode(keyPurpose); purposeNode.fillToIndex(Math.max(purposeNode.getChildren().size(), DEFAULT_EXPORT_ADDRESSES_LENGTH)); @@ -128,7 +127,7 @@ public class AddressesController extends WalletFormController implements Initial writer.writeRecord(new String[] {"Index", "Payment Address", "Derivation", "Label"}); for(WalletNode indexNode : purposeNode.getChildren()) { writer.write(Integer.toString(indexNode.getIndex())); - writer.write(whirlpoolChildWallet ? copy.getAddress(indexNode).toString().substring(0, 20) + "..." : copy.getAddress(indexNode).toString()); + writer.write(copy.getAddress(indexNode).toString()); writer.write(getDerivationPath(indexNode)); Optional optLabelEntry = getWalletForm().getNodeEntry(keyPurpose).getChildren().stream() .filter(entry -> ((NodeEntry)entry).getNode().getIndex() == indexNode.getIndex()).findFirst();