mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid NPE due to null fee while wrapping tx in TxInfo

Browse Source 
Add debugging convenience to core.api.model.TxInfo.
This commit is contained in:
ghubstan 2021-03-14 12:08:13 -03:00
parent 4a68773cfc
commit 64d4c311fb
No known key found for this signature in database
GPG Key ID: E35592D6800A861E
1 changed files with 61 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
core/src/main/java/bisq/core/api/model/TxInfo.java
View File

@ -19,11 +19,16 @@ package bisq.core.api.model;
import bisq.common.Payload; import bisq.common.Payload;
import org.bitcoinj.core.Sha256Hash;
import org.bitcoinj.core.Transaction; import org.bitcoinj.core.Transaction;
import java.util.Map;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import static java.util.Objects.requireNonNull;
@EqualsAndHashCode @EqualsAndHashCode
@Getter @Getter
public class TxInfo implements Payload { public class TxInfo implements Payload {
@ -55,15 +60,26 @@ public class TxInfo implements Payload {
if (transaction == null) if (transaction == null)
throw new IllegalStateException("server created a null transaction"); throw new IllegalStateException("server created a null transaction");
return new TxInfo.TxInfoBuilder() if (transaction.getFee() != null)
.withTxId(transaction.getTxId().toString()) return new TxInfo.TxInfoBuilder()
.withInputSum(transaction.getInputSum().value) .withTxId(transaction.getTxId().toString())
.withOutputSum(transaction.getOutputSum().value) .withInputSum(transaction.getInputSum().value)
.withFee(transaction.getFee().value) .withOutputSum(transaction.getOutputSum().value)
.withSize(transaction.getMessageSize()) .withFee(transaction.getFee().value)
.withIsPending(transaction.isPending()) .withSize(transaction.getMessageSize())
.withMemo(transaction.getMemo()) .withIsPending(transaction.isPending())
.build(); .withMemo(transaction.getMemo())
.build();
else
return new TxInfo.TxInfoBuilder()
.withTxId(transaction.getTxId().toString())
.withInputSum(transaction.getInputSum().value)
.withOutputSum(transaction.getOutputSum().value)
// Do not set fee == null.
.withSize(transaction.getMessageSize())
.withIsPending(transaction.isPending())
.withMemo(transaction.getMemo())
.build();
} }
////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////
@ -157,4 +173,40 @@ public class TxInfo implements Payload {
", memo='" + memo + '\'' + "\n" + ", memo='" + memo + '\'' + "\n" +
'}'; '}';
} }
public static String getTransactionDetailString(Transaction tx) {
if (tx == null)
throw new IllegalArgumentException("Cannot print details for null transaction");
StringBuilder builder = new StringBuilder("Transaction " + requireNonNull(tx).getTxId() + ":").append("\n");
builder.append("\tisPending: ").append(tx.isPending()).append("\n");
builder.append("\tfee: ").append(tx.getFee()).append("\n");
builder.append("\tweight: ").append(tx.getWeight()).append("\n");
builder.append("\tVsize: ").append(tx.getVsize()).append("\n");
builder.append("\tinputSum: ").append(tx.getInputSum()).append("\n");
builder.append("\toutputSum: ").append(tx.getOutputSum()).append("\n");
Map<Sha256Hash, Integer> appearsInHashes = tx.getAppearsInHashes();
if (appearsInHashes != null)
builder.append("\tappearsInHashes: yes, count: ").append(appearsInHashes.size()).append("\n");
else
builder.append("\tappearsInHashes: ").append("no").append("\n");
builder.append("\tanyOutputSpent: ").append(tx.isAnyOutputSpent()).append("\n");
builder.append("\tupdateTime: ").append(tx.getUpdateTime()).append("\n");
builder.append("\tincludedInBestChainAt: ").append(tx.getIncludedInBestChainAt()).append("\n");
builder.append("\thasWitnesses: ").append(tx.hasWitnesses()).append("\n");
builder.append("\tlockTime: ").append(tx.getLockTime()).append("\n");
builder.append("\tversion: ").append(tx.getVersion()).append("\n");
builder.append("\thasConfidence: ").append(tx.hasConfidence()).append("\n");
builder.append("\tsigOpCount: ").append(tx.getSigOpCount()).append("\n");
builder.append("\tisTimeLocked: ").append(tx.isTimeLocked()).append("\n");
builder.append("\thasRelativeLockTime: ").append(tx.hasRelativeLockTime()).append("\n");
builder.append("\tisOptInFullRBF: ").append(tx.isOptInFullRBF()).append("\n");
builder.append("\tpurpose: ").append(tx.getPurpose()).append("\n");
builder.append("\texchangeRate: ").append(tx.getExchangeRate()).append("\n");
builder.append("\tmemo: ").append(tx.getMemo()).append("\n");
return builder.toString();
}
} }