recover if offer funding, deposit, or payout txs are invalidated (#1962)

woodser · web-flow · commit f711bd5084e8 · 2025-09-18T05:32:37.000-04:00
diff --git a/core/src/main/java/haveno/core/support/dispute/DisputeManager.java b/core/src/main/java/haveno/core/support/dispute/DisputeManager.java
@@ -598,8 +598,8 @@ protected void handle(DisputeOpenedMessage message) {
                     // TODO: DisputeOpenedMessage should include arbitrator's updated multisig hex too
                     // TODO: arbitrator needs to import multisig info then scan for updated state?
 
-                    // arbitrator syncs and polls wallet unless finalized
-                    if (trade.isArbitrator() && !trade.isPayoutFinalized()) {
+                    // sync and poll wallet unless finalized
+                    if (!trade.isPayoutFinalized()) {
                         trade.syncAndPollWallet();
                         trade.recoverIfMissingWalletData();
                     }
@@ -1007,7 +1007,7 @@ public MoneroTxWallet createDisputePayoutTx(Trade trade, Contract contract, Disp
             // update trade state
             if (updateState) {
                 trade.getProcessModel().setUnsignedPayoutTx(payoutTx);
-                trade.updatePayout(payoutTx);
+                trade.setPayoutTx(payoutTx);
                 if (trade.getBuyer().getUpdatedMultisigHex() != null) trade.getBuyer().setUnsignedPayoutTxHex(payoutTx.getTxSet().getMultisigTxHex());
                 if (trade.getSeller().getUpdatedMultisigHex() != null) trade.getSeller().setUnsignedPayoutTxHex(payoutTx.getTxSet().getMultisigTxHex());
             }
diff --git a/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationManager.java b/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationManager.java
@@ -520,7 +520,7 @@ private MoneroTxSet processDisputePayoutTx(Trade trade) {
         }
 
         // update state
-        trade.updatePayout(disputeTxSet.getTxs().get(0));
+        trade.setPayoutTx(disputeTxSet.getTxs().get(0));
         trade.setPayoutState(Trade.PayoutState.PAYOUT_PUBLISHED);
         dispute.setDisputePayoutTxId(disputeTxSet.getTxs().get(0).getHash());
         requestPersistence(trade);
diff --git a/core/src/main/java/haveno/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java
diff --git a/core/src/main/java/haveno/core/trade/TradeManager.java b/core/src/main/java/haveno/core/trade/TradeManager.java
@@ -172,7 +172,7 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
     private final PersistenceManager<TradableList<Trade>> persistenceManager;
     private final TradableList<Trade> tradableList = new TradableList<>();
     @Getter
-    private final BooleanProperty persistedTradesInitialized = new SimpleBooleanProperty();
+    private final BooleanProperty tradesInitialized = new SimpleBooleanProperty();
     @Getter
     private final LongProperty numPendingTrades = new SimpleLongProperty();
     private final ReferralIdService referralIdService;
@@ -454,18 +454,21 @@ private void initTrades() {
             // remove skipped trades
             trades.removeAll(tradesToSkip);
 
-            // sync idle trades once in background after active trades
+            // arbitrator syncs idle trades once in background after active trades
             for (Trade trade : trades) {
-                if (trade.isIdling()) ThreadUtils.submitToPool(() -> {
+                if (!trade.isArbitrator()) continue;
+                if (trade.isIdling()) {
+                    ThreadUtils.submitToPool(() -> {
                     
-                    // add random delay to avoid syncing at exactly the same time
-                    if (trades.size() > 1 && trade.walletExists()) {
-                        int delay = (int) (Math.random() * INIT_TRADE_RANDOM_DELAY_MS);
-                        HavenoUtils.waitFor(delay);
-                    }
-                    
-                    trade.syncAndPollWallet();
-                });
+                        // add random delay to avoid syncing at exactly the same time
+                        if (trades.size() > 1 && trade.walletExists()) {
+                            int delay = (int) (Math.random() * INIT_TRADE_RANDOM_DELAY_MS);
+                            HavenoUtils.waitFor(delay);
+                        }
+                        
+                        trade.syncAndPollWallet();
+                    });
+                }
             }
 
             // process after all wallets initialized
@@ -494,7 +497,7 @@ private void initTrades() {
 
             // notify that persisted trades initialized
             if (isShutDownStarted) return;
-            persistedTradesInitialized.set(true);
+            tradesInitialized.set(true);
             getObservableList().addListener((ListChangeListener<Trade>) change -> onTradesChanged());
             onTradesChanged();
 
@@ -1306,8 +1309,8 @@ public ObservableList<Trade> getObservableList() {
         }
     }
 
-    public BooleanProperty persistedTradesInitializedProperty() {
-        return persistedTradesInitialized;
+    public BooleanProperty tradesInitializedProperty() {
+        return tradesInitialized;
     }
 
     public boolean isMyOffer(Offer offer) {
diff --git a/core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java b/core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java
@@ -711,7 +711,7 @@ private void handle(PaymentReceivedMessage message, NodeAddress peer, boolean re
 
                                         // handle payout error
                                         lastAckedPaymentReceivedMessage = message;
-                                        trade.onPayoutError(false, null);
+                                        trade.onPayoutError(false, false, null);
                                         handleTaskRunnerFault(peer, message, null, errorMessage, trade.getSelf().getUpdatedMultisigHex()); // send nack
                                     }
                                 })))
@@ -812,10 +812,12 @@ private void onAckMessageAux(AckMessage ackMessage, NodeAddress sender) {
             peer.setNodeAddress(sender);
         }
 
-        // TODO: arbitrator may nack maker's InitTradeRequest if reserve tx has become invalid (e.g. check_tx_key shows 0 funds received). recreate reserve tx in this case
+        // handle nack of InitTradeRequest from arbitrator to maker
         if (!ackMessage.isSuccess() && trade.isMaker() && peer == trade.getArbitrator() && ackMessage.getSourceMsgClassName().equals(InitTradeRequest.class.getSimpleName())) {
-            if (ackMessage.getErrorMessage() != null && ackMessage.getErrorMessage().contains(SEND_INIT_TRADE_REQUEST_FAILED)) {
+            if (ignoreInitTradeRequestNackFromArbitrator(ackMessage)) {
+                log.warn("Ignoring InitTradeRequest NACK from arbitrator, offerId={}, errorMessage={}", processModel.getOfferId(), ackMessage.getErrorMessage());
                 // use default postprocessing
+            } else {
                 if (makerInitTradeRequestHasBeenNacked) {
                     handleSecondMakerInitTradeRequestNack(ackMessage);
                     // use default postprocessing
@@ -892,7 +894,7 @@ private void onAckMessageAux(AckMessage ackMessage, NodeAddress sender) {
                     if (ackMessage.getUpdatedMultisigHex() != null) {
                         trade.getBuyer().setUpdatedMultisigHex(ackMessage.getUpdatedMultisigHex());
                         processModel.getTradeManager().persistNow(null);
-                        boolean autoResent = onPayoutError(true, peer);
+                        boolean autoResent = onPaymentReceivedNack(true, peer);
                         if (autoResent) return; // skip remaining processing if auto resent
                     }
                 }
@@ -911,7 +913,7 @@ else if (peer == trade.getArbitrator()) {
                     if (ackMessage.getUpdatedMultisigHex() != null) {
                         trade.getArbitrator().setUpdatedMultisigHex(ackMessage.getUpdatedMultisigHex());
                         processModel.getTradeManager().persistNow(null);
-                        boolean autoResent = onPayoutError(true, peer);
+                        boolean autoResent = onPaymentReceivedNack(true, peer);
                         if (autoResent) return; // skip remaining processing if auto resent
                     }
                 }
@@ -939,17 +941,23 @@ else if (peer == trade.getArbitrator()) {
         trade.onAckMessage(ackMessage, sender);
     }
 
-    private boolean onPayoutError(boolean syncAndPoll, TradePeer peer) {
+    private static boolean ignoreInitTradeRequestNackFromArbitrator(AckMessage ackMessage) {
+        return ackMessage.getErrorMessage() != null && ackMessage.getErrorMessage().contains(SEND_INIT_TRADE_REQUEST_FAILED); // ignore if arbitrator's request failed to taker
+    }
+
+    private boolean onPaymentReceivedNack(boolean syncAndPoll, TradePeer peer) {
 
         // prevent infinite nack loop with max attempts
         numPaymentReceivedNacks++;
         if (numPaymentReceivedNacks > MAX_PAYMENT_RECEIVED_NACKS) {
-            log.warn("Maximum number of PaymentReceivedMessage NACKs reached for {} {}, not retrying", trade.getClass().getSimpleName(), trade.getId());
+            String errorMsg = "The maximum number of attempts to process the payment confirmation has been reached for " + trade.getClass().getSimpleName() + " " + trade.getId() + ". Restart the application to try again.";
+            log.warn(errorMsg);
+            trade.setErrorMessage(errorMsg);
             return false;
         }
 
         // handle payout error
-        return trade.onPayoutError(syncAndPoll, peer);
+        return trade.onPayoutError(syncAndPoll, true, peer);
     }
 
     private void handleFirstMakerInitTradeRequestNack(AckMessage ackMessage) {
diff --git a/core/src/main/java/haveno/core/trade/protocol/tasks/BuyerPreparePaymentSentMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/BuyerPreparePaymentSentMessage.java
@@ -90,7 +90,7 @@ protected void run() {
                         // create payout tx
                         log.info("Buyer creating unsigned payout tx for {} {} ", trade.getClass().getSimpleName(), trade.getShortId());
                         MoneroTxWallet payoutTx = trade.createPayoutTx();
-                        trade.updatePayout(payoutTx);
+                        trade.setPayoutTx(payoutTx);
                         trade.getSelf().setUnsignedPayoutTxHex(payoutTx.getTxSet().getMultisigTxHex());
                         trade.requestPersistence();
                     }
diff --git a/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessPaymentReceivedMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessPaymentReceivedMessage.java
@@ -41,6 +41,7 @@
 import haveno.core.trade.BuyerTrade;
 import haveno.core.trade.HavenoUtils;
 import haveno.core.trade.Trade;
+import haveno.core.trade.Trade.State;
 import haveno.core.trade.messages.PaymentReceivedMessage;
 import haveno.core.trade.messages.PaymentSentMessage;
 import haveno.core.util.Validator;
@@ -82,6 +83,9 @@ protected void run() {
                 return;
             }
 
+            // set state to confirmed payment receipt before processing
+            trade.advanceState(State.SELLER_CONFIRMED_PAYMENT_RECEIPT);
+
             // cannot process until wallet sees deposits unlocked
             if (!trade.isDepositsUnlocked()) {
                 trade.syncAndPollWallet();
@@ -179,9 +183,6 @@ private void processPayoutTx(PaymentReceivedMessage message) {
                     else throw e;
                 }
             }
-        } else {
-            log.info("Payout tx already published for {} {}", trade.getClass().getSimpleName(), trade.getId());
-            if (message.getSignedPayoutTxHex() != null && !trade.isPayoutConfirmed()) trade.processPayoutTx(message.getSignedPayoutTxHex(), false, true);
         }
     }
 }
diff --git a/core/src/main/java/haveno/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java
@@ -112,9 +112,14 @@ else if (trade.getSelf().getUnsignedPayoutTxHex() == null) {
 
     private void createUnsignedPayoutTx() {
         log.info("Seller creating unsigned payout tx for trade {}", trade.getId());
-        trade.getProcessModel().setPaymentSentPayoutTxStale(true);
-        MoneroTxWallet payoutTx = trade.createPayoutTx();
-        trade.updatePayout(payoutTx);
-        trade.getSelf().setUnsignedPayoutTxHex(payoutTx.getTxSet().getMultisigTxHex());
+        try {
+            trade.getProcessModel().setPaymentSentPayoutTxStale(true);
+            MoneroTxWallet payoutTx = trade.createPayoutTx();
+            trade.setPayoutTx(payoutTx);
+            trade.getSelf().setUnsignedPayoutTxHex(payoutTx.getTxSet().getMultisigTxHex());
+        } catch (Exception e) {
+            if (trade.isPayoutPublished()) log.info("Payout tx already published for {} {}", trade.getClass().getName(), trade.getId());
+            else throw e;
+        }
     }
 }
diff --git a/core/src/main/java/haveno/core/trade/protocol/tasks/SellerSendPaymentReceivedMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerSendPaymentReceivedMessage.java
@@ -255,6 +255,8 @@ protected boolean stopSending() {
         if (isMessageReceived()) return true; // stop if message received
         if (!trade.isPaymentReceived()) return true; // stop if trade state reset
         if (trade.isPayoutPublished() && !((SellerTrade) trade).resendPaymentReceivedMessagesWithinDuration()) return true; // stop if payout is published and we are not in the resend period
+
+        // check if message state is outdated
         if (unsignedPayoutTxHex != null && !StringUtils.equals(unsignedPayoutTxHex, trade.getSelf().getUnsignedPayoutTxHex())) return true;
         if (signedPayoutTxHex != null && !StringUtils.equals(signedPayoutTxHex, trade.getPayoutTxHex())) return true;
         if (updatedMultisigHex != null && !StringUtils.equals(updatedMultisigHex, trade.getSelf().getUpdatedMultisigHex())) return true;
diff --git a/desktop/src/main/java/haveno/desktop/main/MainViewModel.java b/desktop/src/main/java/haveno/desktop/main/MainViewModel.java
@@ -217,7 +217,7 @@ public MainViewModel(HavenoSetup havenoSetup,
     @Override
     public void onSetupComplete() {
         // We handle the trade period here as we display a global popup if we reached dispute time
-        tradesAndUIReady = EasyBind.combine(isSplashScreenRemoved, tradeManager.persistedTradesInitializedProperty(),
+        tradesAndUIReady = EasyBind.combine(isSplashScreenRemoved, tradeManager.tradesInitializedProperty(),
                 (a, b) -> a && b);
         tradesAndUIReady.subscribe((observable, oldValue, newValue) -> {
             if (newValue) {
diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
@@ -27,11 +27,8 @@
 import haveno.core.network.MessageState;
 import haveno.core.offer.Offer;
 import haveno.core.offer.OfferUtil;
-import haveno.core.trade.ArbitratorTrade;
-import haveno.core.trade.BuyerTrade;
 import haveno.core.trade.ClosedTradableManager;
 import haveno.core.trade.HavenoUtils;
-import haveno.core.trade.SellerTrade;
 import haveno.core.trade.Trade;
 import haveno.core.trade.TradeUtil;
 import haveno.core.user.User;
@@ -363,7 +360,7 @@ private void onTradeStateChanged(Trade.State tradeState) {
                 trade != null ? trade.getShortId() : "trade is null");
 
         // arbitrator trade view only shows tx status
-        if (trade instanceof ArbitratorTrade) {
+        if (trade.isArbitrator()) {
             buyerState.set(BuyerState.STEP1);
             sellerState.set(SellerState.STEP1);
             return;
@@ -424,18 +421,26 @@ private void onTradeStateChanged(Trade.State tradeState) {
                 buyerState.set(BuyerState.STEP2);
                 break;
 
+            // payment marked as received
+            case SELLER_CONFIRMED_PAYMENT_RECEIPT:
+                if (trade.isBuyer()) {
+                    buyerState.set(BuyerState.STEP3);
+                } else if (trade.isSeller()) {
+                    sellerState.set(trade.isPayoutPublished() ? SellerState.STEP4 : SellerState.STEP3);
+                }
+                break;
+
             // payment received
             case SELLER_SENT_PAYMENT_RECEIVED_MSG:
-                if (trade instanceof BuyerTrade) {
+                if (trade.isBuyer()) {
                     buyerState.set(BuyerState.UNDEFINED); // TODO: resetting screen to populate summary information which can be missing before payout message processed
                     buyerState.set(BuyerState.STEP4);
-                } else if (trade instanceof SellerTrade) {
+                } else if (trade.isSeller()) {
                     sellerState.set(trade.isPayoutPublished() ? SellerState.STEP4 : SellerState.STEP3);
                 }
                 break;
 
             // seller step 3 or 4 if published
-            case SELLER_CONFIRMED_PAYMENT_RECEIPT:
             case SELLER_SEND_FAILED_PAYMENT_RECEIVED_MSG:
             case SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG:
             case SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG:
@@ -457,7 +462,7 @@ private void onPayoutStateChanged(Trade.PayoutState payoutState) {
                 payoutState,
                 trade != null ? trade.getShortId() : "trade is null");
 
-        if (trade instanceof ArbitratorTrade) return;
+        if (trade.isArbitrator()) return;
 
         switch (payoutState) {
             case PAYOUT_PUBLISHED:
diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java
@@ -225,7 +225,7 @@ public void onDataReceived() {
             infoLabel.setText(getInfoText());
         }
 
-        BooleanProperty initialized = model.dataModel.tradeManager.getPersistedTradesInitialized();
+        BooleanProperty initialized = model.dataModel.tradeManager.getTradesInitialized();
         if (initialized.get()) {
             onPendingTradesInitialized();
         } else {

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ private MoneroTxSet processDisputePayoutTx(Trade trade) {`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`// update state`
`523`		`- trade.updatePayout(disputeTxSet.getTxs().get(0));`
	`523`	`+ trade.setPayoutTx(disputeTxSet.getTxs().get(0));`
`524`	`524`	`trade.setPayoutState(Trade.PayoutState.PAYOUT_PUBLISHED);`
`525`	`525`	`dispute.setDisputePayoutTxId(disputeTxSet.getTxs().get(0).getHash());`
`526`	`526`	`requestPersistence(trade);`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ protected void run() {`
`90`	`90`	`// create payout tx`
`91`	`91`	`log.info("Buyer creating unsigned payout tx for {} {} ", trade.getClass().getSimpleName(), trade.getShortId());`
`92`	`92`	`MoneroTxWallet payoutTx = trade.createPayoutTx();`
`93`		`- trade.updatePayout(payoutTx);`
	`93`	`+ trade.setPayoutTx(payoutTx);`
`94`	`94`	`trade.getSelf().setUnsignedPayoutTxHex(payoutTx.getTxSet().getMultisigTxHex());`
`95`	`95`	`trade.requestPersistence();`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@`
`41`	`41`	`import haveno.core.trade.BuyerTrade;`
`42`	`42`	`import haveno.core.trade.HavenoUtils;`
`43`	`43`	`import haveno.core.trade.Trade;`
	`44`	`+import haveno.core.trade.Trade.State;`
`44`	`45`	`import haveno.core.trade.messages.PaymentReceivedMessage;`
`45`	`46`	`import haveno.core.trade.messages.PaymentSentMessage;`
`46`	`47`	`import haveno.core.util.Validator;`
`@@ -82,6 +83,9 @@ protected void run() {`
`82`	`83`	`return;`
`83`	`84`	`}`
`84`	`85`
	`86`	`+ // set state to confirmed payment receipt before processing`
	`87`	`+ trade.advanceState(State.SELLER_CONFIRMED_PAYMENT_RECEIPT);`
	`88`	`+`
`85`	`89`	`// cannot process until wallet sees deposits unlocked`
`86`	`90`	`if (!trade.isDepositsUnlocked()) {`
`87`	`91`	`trade.syncAndPollWallet();`
`@@ -179,9 +183,6 @@ private void processPayoutTx(PaymentReceivedMessage message) {`
`179`	`183`	`else throw e;`
`180`	`184`	`}`
`181`	`185`	`}`
`182`		`- } else {`
`183`		`- log.info("Payout tx already published for {} {}", trade.getClass().getSimpleName(), trade.getId());`
`184`		`- if (message.getSignedPayoutTxHex() != null && !trade.isPayoutConfirmed()) trade.processPayoutTx(message.getSignedPayoutTxHex(), false, true);`
`185`	`186`	`}`
`186`	`187`	`}`
`187`	`188`	`}`