fixes when a deposit transaction does not confirm

Author: woodser

core/src/main/java/haveno/core/support/dispute/DisputeValidation.java

@@ -42,10 +42,15 @@
 public class DisputeValidation {
 
     public static void validatePaymentAccountPayloads(Dispute dispute) throws ValidationException {
-        if (dispute.getSellerPaymentAccountPayload() == null) throw new ValidationException(dispute, "Seller's payment account payload is null in dispute opened for trade " + dispute.getTradeId());
-        if (!Arrays.equals(dispute.getSellerPaymentAccountPayload().getHash(), dispute.getContract().getSellerPaymentAccountPayloadHash())) throw new ValidationException(dispute, "Hash of seller's payment account payload does not match contract");
+        if (dispute.getSellerPaymentAccountPayload() != null) {
+            if (!Arrays.equals(dispute.getSellerPaymentAccountPayload().getHash(), dispute.getContract().getSellerPaymentAccountPayloadHash())) {
+                throw new ValidationException(dispute, "Hash of seller's payment account payload does not match contract");
+            }
+        }
         if (dispute.getBuyerPaymentAccountPayload() != null) {
-            if (!Arrays.equals(dispute.getBuyerPaymentAccountPayload().getHash(), dispute.getContract().getBuyerPaymentAccountPayloadHash())) throw new ValidationException(dispute, "Hash of buyer's payment account payload does not match contract");
+            if (!Arrays.equals(dispute.getBuyerPaymentAccountPayload().getHash(), dispute.getContract().getBuyerPaymentAccountPayloadHash())) {
+                throw new ValidationException(dispute, "Hash of buyer's payment account payload does not match contract");
+            }
         }
     }
 

core/src/main/java/haveno/core/trade/Trade.java

@@ -2710,8 +2710,6 @@ private void doPollWallet() {
                     }
                 }
                 setDepositTxs(txs);
-                if (!isPublished(getMaker().getDepositTx()) || (!hasBuyerAsTakerWithoutDeposit() && !isPublished(getTaker().getDepositTx()))) return; // skip if deposit txs not published successfully
-                setStateDepositsSeen();
 
                 // set actual security deposits
                 if (getBuyer().getDepositTx() != null) {
@@ -2729,17 +2727,23 @@ private void doPollWallet() {
                     getSeller().setSecurityDeposit(sellerSecurityDeposit);
                 }
 
-                // check for deposit txs confirmation
-                if (getMaker().getDepositTx().isConfirmed() && (hasBuyerAsTakerWithoutDeposit() || getTaker().getDepositTx().isConfirmed())) setStateDepositsConfirmed();
+                // handle deposits seen
+                if (isPublished(getMaker().getDepositTx()) && (hasBuyerAsTakerWithoutDeposit() || isPublished(getTaker().getDepositTx()))) {
+                    setStateDepositsSeen();
 
-                // check for deposit txs unlocked
-                if (getMaker().getDepositTx().getNumConfirmations() >= XmrWalletService.NUM_BLOCKS_UNLOCK && (hasBuyerAsTakerWithoutDeposit() || getTaker().getDepositTx().getNumConfirmations() >= XmrWalletService.NUM_BLOCKS_UNLOCK)) {
-                    setStateDepositsUnlocked();
+                    // check for deposit txs confirmed
+                    if (getMaker().getDepositTx().isConfirmed() && (hasBuyerAsTakerWithoutDeposit() || getTaker().getDepositTx().isConfirmed())) setStateDepositsConfirmed();
+
+                    // check for deposit txs unlocked
+                    if (getMaker().getDepositTx().getNumConfirmations() >= XmrWalletService.NUM_BLOCKS_UNLOCK && (hasBuyerAsTakerWithoutDeposit() || getTaker().getDepositTx().getNumConfirmations() >= XmrWalletService.NUM_BLOCKS_UNLOCK)) {
+                        setStateDepositsUnlocked();
+                    }
                 }
             }
 
             // check for payout tx
-            if (isDepositsUnlocked()) {
+            boolean hasUnlockedDeposit = isUnlocked(getMaker().getDepositTx()) || isUnlocked(getTaker().getDepositTx());
+            if (hasUnlockedDeposit) {
 
                 // determine if payout tx expected
                 boolean isPayoutExpected = isPaymentReceived() || hasPaymentReceivedMessage() || hasDisputeClosedMessage() || disputeState.ordinal() >= DisputeState.ARBITRATOR_SENT_DISPUTE_CLOSED_MSG.ordinal();
@@ -2827,6 +2831,12 @@ private static boolean isPublished(MoneroTx tx) {
         return true;
     }
 
+    private static boolean isUnlocked(MoneroTx tx) {
+        if (tx == null) return false;
+        if (tx.getNumConfirmations() == null || tx.getNumConfirmations() < XmrWalletService.NUM_BLOCKS_UNLOCK) return false;
+        return true;
+    }
+
     private void syncWalletIfBehind() {
         synchronized (walletLock) {
             if (isWalletBehind()) {