mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 14:42:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove the maybeCommitTx call at timeout

Browse source
This commit is contained in:
Manfred Karrer 2018-10-07 17:40:01 -05:00
parent 7d9a53adc9
commit 85c80bcd5c
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/src/main/java/bisq/core/btc/wallet/TxBroadcaster.java
View file

@ -48,8 +48,7 @@ public class TxBroadcaster {
default void onTimeout(TxBroadcastTimeoutException exception) {
Transaction tx = exception.getLocalTx();
if (tx != null) {
String txId = tx.getHashAsString();
log.warn("TxBroadcaster.onTimeout called: {}\n" +
log.warn("TxBroadcaster.onTimeout called: {} \n" +
"We optimistically assume that the tx broadcast succeeds later and call onSuccess on the " +
"callback handler. This behaviour carries less potential problems than if we would trigger " +
"a failure (e.g. which would cause a failed create offer attempt of failed take offer attempt).\n" +
@ -72,7 +71,11 @@ public class TxBroadcaster {
// inconsistency if the tx was committed twice. It should be prevented by the maybeCommitTx methods but
// not 100% if that is always the case. Just added that comment to make clear that this might be a risky
// strategy and might need improvement if we get problems.
exception.getWallet().maybeCommitTx(tx);
// UPDATE: We got reported an wallet problem that a tx was added twice and wallet could not be loaded anymore even after a SPV resync.
// So it seems that this trategy is too risky to cause more problems as it tries to solve.
// Need more work from a BitcoinJ expert! For now we comment the call out here but leave it as reference
// for future improvements.
// exception.getWallet().maybeCommitTx(tx);
onSuccess(tx);
} else {