diff --git a/core/src/main/java/org/bitcoinj/core/Transaction.java b/core/src/main/java/org/bitcoinj/core/Transaction.java index 6fcb1dfa88e..fb0685614a0 100644 --- a/core/src/main/java/org/bitcoinj/core/Transaction.java +++ b/core/src/main/java/org/bitcoinj/core/Transaction.java @@ -700,7 +700,7 @@ public String toString(@Nullable AbstractBlockChain chain) { String scriptSigStr = in.getScriptSig().toString(); s.append(!Strings.isNullOrEmpty(scriptSigStr) ? scriptSigStr : ""); if (in.getValue() != null) - s.append(" ").append(in.getValue().toFriendlyString()); + s.append(" ").append(in.getValue().toFriendlyString()).append(" (").append(in.getValue()).append(")"); s.append("\n "); s.append("outpoint:"); final TransactionOutPoint outpoint = in.getOutpoint(); @@ -737,6 +737,13 @@ public String toString(@Nullable AbstractBlockChain chain) { s.append(!Strings.isNullOrEmpty(scriptPubKeyStr) ? scriptPubKeyStr : ""); s.append(" "); s.append(out.getValue().toFriendlyString()); + s.append(" ("); + s.append(out.getValue()); + s.append(") ScriptPubKey: "); + s.append(HEX.encode(out.getScriptPubKey().getProgram())); + s.append(" Address:"); + s.append(out.getScriptPubKey().getToAddress(params)); + s.append(" "); if (!out.isAvailableForSpending()) { s.append(" Spent"); } @@ -752,8 +759,8 @@ public String toString(@Nullable AbstractBlockChain chain) { final Coin fee = getFee(); if (fee != null) { final int size = unsafeBitcoinSerialize().length; - s.append(" fee ").append(fee.multiply(1000).divide(size).toFriendlyString()).append("/kB, ") - .append(fee.toFriendlyString()).append(" for ").append(size).append(" bytes\n"); + s.append(" fee ").append(fee.toFriendlyString()).append(" for ").append(size).append(" bytes (") + .append(fee.divide(size).value).append(" Satoshi/Byte)\n"); } if (purpose != null) s.append(" prps ").append(purpose).append('\n');