diff --git a/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java index 6ef128f6..e71c018f 100644 --- a/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java +++ b/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java @@ -18,6 +18,7 @@ package org.bitcoinj.wallet; import org.bitcoinj.core.BloomFilter; import org.bitcoinj.core.ECKey; +import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.crypto.*; import org.bitcoinj.utils.ListenerRegistration; import org.bitcoinj.utils.Threading; @@ -618,4 +619,13 @@ public class BasicKeyChain implements EncryptableKeyChain { lock.unlock(); } } + + public String toString(boolean includePrivateKeys, @Nullable KeyParameter aesKey, NetworkParameters params) { + final StringBuilder builder = new StringBuilder(); + List keys = getKeys(); + Collections.sort(keys, ECKey.AGE_COMPARATOR); + for (ECKey key : keys) + key.formatKeyWithAddress(includePrivateKeys, aesKey, builder, params); + return builder.toString(); + } } diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java index d439d483..5aae7af6 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java +++ b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java @@ -814,12 +814,8 @@ public class KeyChainGroup implements KeyBag { public String toString(boolean includePrivateKeys, @Nullable KeyParameter aesKey) { final StringBuilder builder = new StringBuilder(); - if (basic != null) { - List keys = basic.getKeys(); - Collections.sort(keys, ECKey.AGE_COMPARATOR); - for (ECKey key : keys) - key.formatKeyWithAddress(includePrivateKeys, aesKey, builder, params); - } + if (basic != null) + builder.append(basic.toString(includePrivateKeys, aesKey, params)); for (DeterministicKeyChain chain : chains) builder.append(chain.toString(includePrivateKeys, aesKey, params)).append('\n'); return builder.toString();