Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-12-17 00:34:20 -05:00
Code Issues Projects Releases Packages Wiki Activity

recreate unsigned payout tx on payment received nack even if published

Browse source
This commit is contained in:
woodser 2025-11-19 09:22:36 -05:00
parent c1e8c4fd33
commit e7d39f9bdf
No known key found for this signature in database
GPG key ID: 55A10DD48ADEE5EF
1 changed files with 30 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/src/main/java/haveno/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java
View file

@ -40,10 +40,8 @@ public class SellerPreparePaymentReceivedMessage extends TradeTask {
// check connection // check connection
trade.verifyDaemonConnection(); trade.verifyDaemonConnection();
if (!trade.isPayoutPublished()) { // prepare payout info for payment received message
if (!trade.isPayoutPublished() || (!trade.isPayoutFinalized() && trade.getPayoutTxHex() == null)) {
// process or create payout tx
if (trade.getPayoutTxHex() == null) {
// synchronize on lock for wallet operations // synchronize on lock for wallet operations
synchronized (trade.getWalletLock()) { synchronized (trade.getWalletLock()) {
@ -79,12 +77,11 @@ public class SellerPreparePaymentReceivedMessage extends TradeTask {
} }
} }
} }
} else { } else if (!trade.isPayoutPublished() && trade.getPayoutTxHex() != null) {
// republish payout tx from previous message // republish payout tx from previous message
log.info("Seller re-verifying and publishing signed payout tx for trade {}", trade.getId()); log.info("Seller re-verifying and publishing signed payout tx for trade {}", trade.getId());
trade.processPayoutTx(trade.getPayoutTxHex(), false, true); trade.processPayoutTx(trade.getPayoutTxHex(), false, true);
}
} else if (!trade.isPayoutFinalized() && (trade.getArbitrator().getPaymentReceivedMessage() == null || trade.getBuyer().getPaymentReceivedMessage() == null)) { } else if (!trade.isPayoutFinalized() && (trade.getArbitrator().getPaymentReceivedMessage() == null || trade.getBuyer().getPaymentReceivedMessage() == null)) {
// update multisig info if payout not finalized and recreating messages // update multisig info if payout not finalized and recreating messages