3
0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-12 10:15:52 +00:00

DeterministicSeed: Don't print private data in toString() by default.

This commit is contained in:
Andreas Schildbach 2019-02-13 13:56:19 +01:00
parent bfe2a195b6
commit 02b0907535

View File

@ -20,6 +20,7 @@ package org.bitcoinj.wallet;
import org.bitcoinj.core.Utils; import org.bitcoinj.core.Utils;
import org.bitcoinj.crypto.*; import org.bitcoinj.crypto.*;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import org.bouncycastle.crypto.params.KeyParameter; import org.bouncycastle.crypto.params.KeyParameter;
@ -132,9 +133,18 @@ public class DeterministicSeed implements EncryptableItem {
@Override @Override
public String toString() { public String toString() {
return isEncrypted() return toString(false);
? "DeterministicSeed [encrypted]" }
: "DeterministicSeed " + toHexString() + " " + Utils.SPACE_JOINER.join(mnemonicCode);
public String toString(boolean includePrivate) {
MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(this);
if (isEncrypted())
helper.addValue("encrypted");
else if (includePrivate)
helper.addValue(toHexString()).add("mnemonicCode", Utils.SPACE_JOINER.join(mnemonicCode));
else
helper.addValue("unencrypted");
return helper.toString();
} }
/** Returns the seed as hex or null if encrypted. */ /** Returns the seed as hex or null if encrypted. */