reset state to deposit txs failed if unseen after published

Author: woodser

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

@@ -2302,6 +2302,10 @@ public boolean isInPreparation() {
         return getState().getPhase().ordinal() == Phase.INIT.ordinal();
     }
 
+    public boolean isFundsLockedIn() {
+        return isDepositsPublished() && !isPayoutPublished();
+    }
+
     public boolean isDepositRequested() {
         return getState().getPhase().ordinal() >= Phase.DEPOSIT_REQUESTED.ordinal();
     }
@@ -2315,8 +2319,8 @@ public boolean isDepositsPublished() {
         return getState().getPhase().ordinal() >= Phase.DEPOSITS_PUBLISHED.ordinal() && getMaker().getDepositTxHash() != null && (getTaker().getDepositTxHash() != null || hasBuyerAsTakerWithoutDeposit());
     }
 
-    public boolean isFundsLockedIn() {
-        return isDepositsPublished() && !isPayoutPublished();
+    public boolean isDepositsSeen() {
+        return isDepositsPublished() && getState().ordinal() >= State.DEPOSIT_TXS_SEEN_IN_NETWORK.ordinal();
     }
 
     public boolean isDepositsConfirmed() {
@@ -2836,6 +2840,9 @@ private void doPollWallet() {
                     if (getMaker().getDepositTx().getNumConfirmations() >= NUM_BLOCKS_DEPOSITS_FINALIZED && (hasBuyerAsTakerWithoutDeposit() || getTaker().getDepositTx().getNumConfirmations() >= NUM_BLOCKS_DEPOSITS_FINALIZED)) {
                         setStateDepositsFinalized();
                     }
+                } else if (isDepositsSeen()) {
+                    log.warn("Resetting state to deposit txs failed for {} {} because one or both deposit txs no longer seen as valid", getClass().getSimpleName(), getShortId());
+                    setState(Trade.State.PUBLISH_DEPOSIT_TX_REQUEST_FAILED);
                 }
             }