Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-14 19:25:51 +00:00
Code Issues Projects Releases Wiki Activity

Wallet: Fix precondition for transaction confidence of transactions in the pending pool. They can now also be IN_CONFLICT.

Browse Source
This commit is contained in:
Andreas Schildbach 2016-06-08 14:23:27 +02:00
parent 736fd7dbde
commit f416dec2ea
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/bitcoinj/wallet/Wallet.java
View File

@ -5069,7 +5069,8 @@ public class Wallet extends BaseTaggableObject
// is no inversion.
for (Transaction tx : toBroadcast) {
ConfidenceType confidenceType = tx.getConfidence().getConfidenceType();
checkState(confidenceType == ConfidenceType.PENDING, "Expected PENDING, was %s.", confidenceType);
checkState(confidenceType == ConfidenceType.PENDING || confidenceType == ConfidenceType.IN_CONFLICT,
"Expected PENDING or IN_CONFLICT, was %s.", confidenceType);
// Re-broadcast even if it's marked as already seen for two reasons
// 1) Old wallets may have transactions marked as broadcast by 1 peer when in reality the network
// never saw it, due to bugs.