haveno-network/haveno-core
haveno-network/haveno-core
1
0
Fork 1
Code Issues 4 Pull requests Projects 5 Releases 1 Packages Wiki Activity Actions

place offer runs off main thread

Browse source
This commit is contained in:
woodser 2025-04-10 11:42:56 -04:00 committed by woodser
parent f19ed19325
commit 295c91760c
2 changed files with 51 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/haveno/core/offer/OpenOfferManager.java
View file

@ -517,6 +517,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
String sourceOfferId, String sourceOfferId,
TransactionResultHandler resultHandler, TransactionResultHandler resultHandler,
ErrorMessageHandler errorMessageHandler) { ErrorMessageHandler errorMessageHandler) {
ThreadUtils.execute(() -> {
// check source offer and clone limit // check source offer and clone limit
OpenOffer sourceOffer = null; OpenOffer sourceOffer = null;
@ -564,7 +565,6 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
} }
// schedule or post offer // schedule or post offer
ThreadUtils.execute(() -> {
synchronized (processOffersLock) { synchronized (processOffersLock) {
CountDownLatch latch = new CountDownLatch(1); CountDownLatch latch = new CountDownLatch(1);
processOffer(getOpenOffers(), openOffer, (transaction) -> { processOffer(getOpenOffers(), openOffer, (transaction) -> {

5
core/src/main/java/haveno/core/trade/Trade.java
View file

@ -2728,7 +2728,10 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
} }
} }
} catch (Exception e) { } catch (Exception e) {
if (HavenoUtils.isUnresponsive(e)) forceRestartTradeWallet(); if (HavenoUtils.isUnresponsive(e)) {
if (isShutDownStarted) forceCloseWallet();
else forceRestartTradeWallet();
}
else { else {
boolean isWalletConnected = isWalletConnectedToDaemon(); boolean isWalletConnected = isWalletConnectedToDaemon();
if (wallet != null && !isShutDownStarted && isWalletConnected) { if (wallet != null && !isShutDownStarted && isWalletConnected) {