check if trade state needs reset after wallet synced on startup

Author: woodser

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

@@ -639,21 +639,24 @@ public void initialize(ProcessModelServiceProvider serviceProvider) {
             ThreadUtils.execute(() -> onConnectionChanged(connection), getId());
         });
 
-        // reset states if no ack receive
-        if (!isPayoutPublished()) {
-
-            // reset buyer's payment sent state if no ack receive
-            if (this instanceof BuyerTrade && getState().ordinal() >= Trade.State.BUYER_CONFIRMED_PAYMENT_SENT.ordinal() && (getState().ordinal() < Trade.State.BUYER_STORED_IN_MAILBOX_PAYMENT_SENT_MSG.ordinal() || getState() == Trade.State.BUYER_SAW_ARRIVED_PAYMENT_SENT_MSG)) {
-                log.warn("Resetting state of {} {} from {} to {} because no ack was received", getClass().getSimpleName(), getId(), getState(), Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN);
-                setState(Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN);
-            }
-    
-            // reset seller's payment received state if no ack receive
-            if (this instanceof SellerTrade && getState().ordinal() >= Trade.State.SELLER_CONFIRMED_PAYMENT_RECEIPT.ordinal() && (getState().ordinal() < Trade.State.SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG.ordinal() || getState() == Trade.State.SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG)) {
-                log.warn("Resetting state of {} {} from {} to {} because no ack was received", getClass().getSimpleName(), getId(), getState(), Trade.State.BUYER_SENT_PAYMENT_SENT_MSG);
-                resetToPaymentSentState();
+        // when done with first sync, check if state needs reset
+        wasWalletSynced.addListener((observable, oldValue, newValue) -> {
+            if (!newValue) return;
+            if (!isPayoutPublished()) {
+
+                // reset buyer's payment sent state if no ack receive
+                if (this instanceof BuyerTrade && getState().ordinal() >= Trade.State.BUYER_CONFIRMED_PAYMENT_SENT.ordinal() && getState().ordinal() != Trade.State.BUYER_STORED_IN_MAILBOX_PAYMENT_SENT_MSG.ordinal()) {
+                    log.warn("Resetting state of {} {} from {} to {} because payout is not published", getClass().getSimpleName(), getId(), getState(), Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN);
+                    setState(Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN);
+                }
+        
+                // reset seller's payment received state if no ack receive
+                if (this instanceof SellerTrade && getState().ordinal() >= Trade.State.SELLER_CONFIRMED_PAYMENT_RECEIPT.ordinal() && getState().ordinal() != Trade.State.SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG.ordinal()) {
+                    log.warn("Resetting state of {} {} from {} to {} because payout is not published", getClass().getSimpleName(), getId(), getState(), Trade.State.BUYER_SENT_PAYMENT_SENT_MSG);
+                    resetToPaymentSentState();
+                }
             }
-        }
+        });
 
         // handle trade state events
         tradeStateSubscription = EasyBind.subscribe(stateProperty, newValue -> {
@@ -866,7 +869,7 @@ public MoneroWallet getWallet() {
             if (wallet != null) return wallet;
             if (!walletExists()) return null;
             if (isShutDownStarted) throw new RuntimeException("Cannot open wallet for " + getClass().getSimpleName() + " " + getId() + " because shut down is started");
-            else wallet = xmrWalletService.openWallet(getWalletName(), xmrWalletService.isProxyApplied(wasWalletSynced));
+            else wallet = xmrWalletService.openWallet(getWalletName(), xmrWalletService.isProxyApplied(wasWalletSynced.get()));
             return wallet;
         }
     }
@@ -2544,7 +2547,7 @@ protected void onConnectionChanged(MoneroRpcConnection connection) {
             String oldProxyUri = wallet.getDaemonConnection() == null ? null : wallet.getDaemonConnection().getProxyUri();
             String newProxyUri = connection == null ? null : connection.getProxyUri();
             log.info("Setting daemon connection for trade wallet {}: uri={}, proxyUri={}", getId() , connection == null ? null : connection.getUri(), newProxyUri);
-            if (xmrWalletService.isProxyApplied(wasWalletSynced) && wallet instanceof MoneroWalletRpc && !StringUtils.equals(oldProxyUri, newProxyUri)) {
+            if (xmrWalletService.isProxyApplied(wasWalletSynced.get()) && wallet instanceof MoneroWalletRpc && !StringUtils.equals(oldProxyUri, newProxyUri)) {
                 log.info("Restarting trade wallet {} because proxy URI has changed, old={}, new={}", getId(), oldProxyUri, newProxyUri);
                 closeWallet();
                 wallet = getWallet();
@@ -2578,7 +2581,7 @@ private void tryInitSyncing() {
     }
 
     private void doTryInitSyncing() {
-        if (!wasWalletSynced) trySyncWallet(true);
+        if (!wasWalletSynced.get()) trySyncWallet(true);
         updatePollPeriod();
         startPolling();
     }
@@ -2608,9 +2611,9 @@ private void syncWallet(boolean pollWallet) {
             }
 
             // apply tor after wallet synced depending on configuration
-            if (!wasWalletSynced) {
-                wasWalletSynced = true;
-                if (xmrWalletService.isProxyApplied(wasWalletSynced)) {
+            if (!wasWalletSynced.get()) {
+                wasWalletSynced.set(true);
+                if (xmrWalletService.isProxyApplied(true)) {
                     onConnectionChanged(xmrConnectionService.getConnection());
                 }
             }

core/src/main/java/haveno/core/xmr/wallet/XmrWalletBase.java

@@ -13,7 +13,9 @@
 import haveno.core.api.XmrConnectionService;
 import haveno.core.trade.HavenoUtils;
 import haveno.core.xmr.setup.DownloadListener;
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.LongProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleLongProperty;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -39,7 +41,7 @@ public abstract class XmrWalletBase {
     protected Timer saveWalletDelayTimer;
     @Getter
     protected XmrConnectionService xmrConnectionService;
-    protected boolean wasWalletSynced;
+    protected BooleanProperty wasWalletSynced = new SimpleBooleanProperty(false);
     protected final Map<String, Optional<MoneroTx>> txCache = new HashMap<String, Optional<MoneroTx>>();
     protected boolean isClosingWallet;
     protected boolean isSyncingWithProgress;
@@ -200,7 +202,7 @@ private synchronized void resetSyncProgressTimeout() {
     }
 
     private void setWalletSyncedWithProgress() {
-        wasWalletSynced = true;
+        wasWalletSynced.set(true);
         isSyncingWithProgress = false;
         syncProgressTimeout.stop();
     }