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

Fix race between mempool notify / P2P notify causing failed trade

Browse source
This commit is contained in:
jmacxx 2021-08-30 10:00:38 -05:00
parent fc329f6f15
commit 74f7061061
No known key found for this signature in database
GPG key ID: 155297BABFE94A1B
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/src/main/java/bisq/core/trade/protocol/BuyerProtocol.java
View file

@ -93,21 +93,22 @@ public abstract class BuyerProtocol extends DisputeProtocol {
protected abstract void handle(DelayedPayoutTxSignatureRequest message, NodeAddress peer); protected abstract void handle(DelayedPayoutTxSignatureRequest message, NodeAddress peer);
// The DepositTxAndDelayedPayoutTxMessage is a mailbox message as earlier we use only the deposit tx which can // The DepositTxAndDelayedPayoutTxMessage is a mailbox message. Earlier we used only the deposit tx which can
// be also with from the network once published. // be set also when received by the network once published by the peer so that message was not mandatory and could
// have arrived as mailbox message.
// Now we send the delayed payout tx as well and with that this message is mandatory for continuing the protocol. // Now we send the delayed payout tx as well and with that this message is mandatory for continuing the protocol.
// We do not support mailbox message handling during the take offer process as it is expected that both peers // We do not support mailbox message handling during the take offer process as it is expected that both peers
// are online. // are online.
// For backward compatibility and extra resilience we still keep DepositTxAndDelayedPayoutTxMessage as a // For backward compatibility and extra resilience we still keep DepositTxAndDelayedPayoutTxMessage as a
// mailbox message but the stored in mailbox case is not expected and the seller would try to send the message again // mailbox message but the stored in mailbox case is not expected and the seller would try to send the message again
// in the hope to reach the buyer directly. // in the hope to reach the buyer directly in case of network issues.
protected void handle(DepositTxAndDelayedPayoutTxMessage message, NodeAddress peer) { protected void handle(DepositTxAndDelayedPayoutTxMessage message, NodeAddress peer) {
expect(anyPhase(Trade.Phase.TAKER_FEE_PUBLISHED, Trade.Phase.DEPOSIT_PUBLISHED) expect(anyPhase(Trade.Phase.TAKER_FEE_PUBLISHED, Trade.Phase.DEPOSIT_PUBLISHED)
.with(message) .with(message)
.from(peer) .from(peer)
.preCondition(trade.getDepositTx() == null || trade.getDelayedPayoutTx() == null, .preCondition(trade.getDepositTx() == null || processModel.getTradingPeer().getPaymentAccountPayload() == null,
() -> { () -> {
log.warn("We with a DepositTxAndDelayedPayoutTxMessage but we have already processed the deposit and " + log.warn("We received a DepositTxAndDelayedPayoutTxMessage but we have already processed the deposit and " +
"delayed payout tx so we ignore the message. This can happen if the ACK message to the peer did not " + "delayed payout tx so we ignore the message. This can happen if the ACK message to the peer did not " +
"arrive and the peer repeats sending us the message. We send another ACK msg."); "arrive and the peer repeats sending us the message. We send another ACK msg.");
stopTimeout(); stopTimeout();