Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-13 19:07:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transaction.toString(): Print incomplete transactions, too.

Browse Source
This commit is contained in:
Andreas Schildbach
2017-06-02 16:15:08 +02:00
parent 6841fceabc
commit 3fb4d6a1a3
1 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
core/src/main/java/org/bitcoinj/core/Transaction.java
View File

@@ -658,10 +658,6 @@ public class Transaction extends ChildMessage {
if (isOptInFullRBF()) { if (isOptInFullRBF()) {
s.append(" opts into full replace-by-fee\n"); s.append(" opts into full replace-by-fee\n");
} }
if (inputs.size() == 0) {
s.append(" INCOMPLETE: No inputs!\n");
return s.toString();
}
if (isCoinBase()) { if (isCoinBase()) {
String script; String script;
String script2; String script2;
@@ -676,36 +672,41 @@ public class Transaction extends ChildMessage {
.append(") (scriptPubKey ").append(script2).append(")\n"); .append(") (scriptPubKey ").append(script2).append(")\n");
return s.toString(); return s.toString();
} }
for (TransactionInput in : inputs) { if (!inputs.isEmpty()) {
s.append(" "); for (TransactionInput in : inputs) {
s.append("in "); s.append(" ");
s.append("in ");
try { try {
Script scriptSig = in.getScriptSig(); Script scriptSig = in.getScriptSig();
s.append(scriptSig); s.append(scriptSig);
if (in.getValue() != null) if (in.getValue() != null)
s.append(" ").append(in.getValue().toFriendlyString()); s.append(" ").append(in.getValue().toFriendlyString());
s.append("\n "); s.append("\n ");
s.append("outpoint:"); s.append("outpoint:");
final TransactionOutPoint outpoint = in.getOutpoint(); final TransactionOutPoint outpoint = in.getOutpoint();
s.append(outpoint.toString()); s.append(outpoint.toString());
final TransactionOutput connectedOutput = outpoint.getConnectedOutput(); final TransactionOutput connectedOutput = outpoint.getConnectedOutput();
if (connectedOutput != null) { if (connectedOutput != null) {
Script scriptPubKey = connectedOutput.getScriptPubKey(); Script scriptPubKey = connectedOutput.getScriptPubKey();
if (scriptPubKey.isSentToAddress() || scriptPubKey.isPayToScriptHash()) { if (scriptPubKey.isSentToAddress() || scriptPubKey.isPayToScriptHash()) {
s.append(" hash160:"); s.append(" hash160:");
s.append(Utils.HEX.encode(scriptPubKey.getPubKeyHash())); s.append(Utils.HEX.encode(scriptPubKey.getPubKeyHash()));
}
} }
if (in.hasSequence()) {
s.append("\n sequence:").append(Long.toHexString(in.getSequenceNumber()));
if (in.isOptInFullRBF())
s.append(", opts into full RBF");
}
} catch (Exception e) {
s.append("[exception: ").append(e.getMessage()).append("]");
} }
if (in.hasSequence()) { s.append('\n');
s.append("\n sequence:").append(Long.toHexString(in.getSequenceNumber()));
if (in.isOptInFullRBF())
s.append(", opts into full RBF");
}
} catch (Exception e) {
s.append("[exception: ").append(e.getMessage()).append("]");
} }
s.append('\n'); } else {
s.append(" ");
s.append("INCOMPLETE: No inputs!\n");
} }
for (TransactionOutput out : outputs) { for (TransactionOutput out : outputs) {
s.append(" "); s.append(" ");