From 9d8bb0b64a91891176986e633364e8feb57c3bc7 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 17 Mar 2019 18:48:07 +0100 Subject: [PATCH] Transaction: In toString(), if a script type is unknown just say so. --- .../src/main/java/org/bitcoinj/core/Transaction.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/core/Transaction.java b/core/src/main/java/org/bitcoinj/core/Transaction.java index 94fc4cbd..a412aaa3 100644 --- a/core/src/main/java/org/bitcoinj/core/Transaction.java +++ b/core/src/main/java/org/bitcoinj/core/Transaction.java @@ -808,9 +808,10 @@ public class Transaction extends ChildMessage { ScriptType scriptType = scriptPubKey.getScriptType(); s.append(indent).append(" "); if (scriptType != null) - s.append(scriptType).append(" addr:").append(scriptPubKey.getToAddress(params)) - .append(" "); - s.append("outpoint:").append(outpoint).append('\n'); + s.append(scriptType).append(" addr:").append(scriptPubKey.getToAddress(params)); + else + s.append("unknown script type"); + s.append(" outpoint:").append(outpoint).append('\n'); } if (in.hasSequence()) { s.append(indent).append(" sequence:").append(Long.toHexString(in.getSequenceNumber())); @@ -838,9 +839,12 @@ public class Transaction extends ChildMessage { s.append(" "); s.append(out.getValue().toFriendlyString()); s.append('\n'); + s.append(indent).append(" "); ScriptType scriptType = scriptPubKey.getScriptType(); if (scriptType != null) - s.append(indent).append(" " + scriptType + " addr:" + scriptPubKey.getToAddress(params)); + s.append(scriptType).append(" addr:").append(scriptPubKey.getToAddress(params)); + else + s.append("unknown script type"); if (!out.isAvailableForSpending()) { s.append(" spent"); final TransactionInput spentBy = out.getSpentBy();