Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-10 07:30:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

progress notifications during take offer are more frequent and reliable

Browse source
This commit is contained in:
woodser 2023-04-17 19:15:38 -04:00
parent cffbfa8aaa
commit 427c762620
12 changed files with 59 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -333,7 +333,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
stopped = true;
p2PService.getPeerManager().removeListener(this);
p2PService.removeDecryptedDirectMessageListener(this);
signedOfferKeyImagePoller.clearKeyImages();
if (signedOfferKeyImagePoller != null) signedOfferKeyImagePoller.clearKeyImages();
stopPeriodicRefreshOffersTimer();
stopPeriodicRepublishOffersTimer();

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

@ -54,10 +54,13 @@ import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.AckMessage;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;
import javafx.beans.property.DoubleProperty;
import javafx.beans.property.IntegerProperty;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.ReadOnlyDoubleProperty;
import javafx.beans.property.ReadOnlyObjectProperty;
import javafx.beans.property.ReadOnlyStringProperty;
import javafx.beans.property.SimpleDoubleProperty;
import javafx.beans.property.SimpleIntegerProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
@ -333,6 +336,10 @@ public abstract class Trade implements Tradable, Model {
private long amount;
@Setter
private long price;
private int initStep = 0;
private static final int TOTAL_INIT_STEPS = 15; // total estimated steps
@Getter
private double initProgress = 0;
@Nullable
@Getter
private State state = State.PREPARATION;
@ -368,6 +375,7 @@ public abstract class Trade implements Tradable, Model {
@Getter
transient final private XmrWalletService xmrWalletService;
transient final private DoubleProperty initProgressProperty = new SimpleDoubleProperty(0.0);
transient final private ObjectProperty<State> stateProperty = new SimpleObjectProperty<>(state);
transient final private ObjectProperty<Phase> phaseProperty = new SimpleObjectProperty<>(state.phase);
transient final private ObjectProperty<PayoutState> payoutStateProperty = new SimpleObjectProperty<>(payoutState);
@ -1167,7 +1175,10 @@ public abstract class Trade implements Tradable, Model {
isInitialized = false;
isShutDown = true;
synchronized (walletLock) {
if (wallet != null) closeWallet();
if (wallet != null) {
saveWallet();
stopWallet();
}
}
if (tradePhaseSubscription != null) tradePhaseSubscription.unsubscribe();
if (payoutStateSubscription != null) payoutStateSubscription.unsubscribe();
@ -1206,6 +1217,11 @@ public abstract class Trade implements Tradable, Model {
}
}
public void addInitProgressStep() {
initProgress = Math.min(1.0, (double) ++initStep / TOTAL_INIT_STEPS);
UserThread.execute(() -> initProgressProperty.set(initProgress));
}
public void setState(State state) {
if (isInitialized) {
// We don't want to log at startup the setState calls from all persisted trades
@ -1551,6 +1567,10 @@ public abstract class Trade implements Tradable, Model {
return getPayoutState().ordinal() >= PayoutState.PAYOUT_UNLOCKED.ordinal();
}
public ReadOnlyDoubleProperty initProgressProperty() {
return initProgressProperty;
}
public ReadOnlyObjectProperty<State> stateProperty() {
return stateProperty;
}

1
core/src/main/java/haveno/core/trade/TradeManager.java
View file

@ -834,6 +834,7 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
trade.getMaker().setPubKeyRing(trade.getOffer().getPubKeyRing());
trade.getSelf().setPubKeyRing(model.getPubKeyRing());
trade.getSelf().setPaymentAccountId(paymentAccountId);
trade.addInitProgressStep();
// ensure trade is not already open
Optional<Trade> tradeOptional = getOpenTrade(offer.getId());

2
core/src/main/java/haveno/core/trade/protocol/tasks/MaybeSendSignContractRequest.java
View file

@ -72,6 +72,7 @@ public class MaybeSendSignContractRequest extends TradeTask {
}
// create deposit tx and freeze inputs
trade.addInitProgressStep();
MoneroTxWallet depositTx = trade.getXmrWalletService().createDepositTx(trade);
// collect reserved key images
@ -142,6 +143,7 @@ public class MaybeSendSignContractRequest extends TradeTask {
private void completeAux() {
trade.setState(State.CONTRACT_SIGNATURE_REQUESTED);
trade.addInitProgressStep();
processModel.getTradeManager().requestPersistence();
complete();
}

1
core/src/main/java/haveno/core/trade/protocol/tasks/ProcessDepositResponse.java
View file

@ -44,6 +44,7 @@ public class ProcessDepositResponse extends TradeTask {
// set success state
trade.setStateIfValidTransitionTo(Trade.State.ARBITRATOR_PUBLISHED_DEPOSIT_TXS);
trade.addInitProgressStep();
processModel.getTradeManager().requestPersistence();
complete();
} catch (Throwable t) {

2
core/src/main/java/haveno/core/trade/protocol/tasks/ProcessInitMultisigRequest.java
View file

@ -76,6 +76,7 @@ public class ProcessInitMultisigRequest extends TradeTask {
// prepare multisig if applicable
boolean updateParticipants = false;
if (trade.getSelf().getPreparedMultisigHex() == null) {
trade.addInitProgressStep();
log.info("Preparing multisig wallet for {} {}", trade.getClass().getSimpleName(), trade.getId());
multisigWallet = trade.createWallet();
trade.getSelf().setPreparedMultisigHex(multisigWallet.prepareMultisig());
@ -217,6 +218,7 @@ public class ProcessInitMultisigRequest extends TradeTask {
}
private void completeAux() {
trade.addInitProgressStep();
complete();
}
}

1
core/src/main/java/haveno/core/trade/protocol/tasks/ProcessInitTradeRequest.java
View file

@ -133,6 +133,7 @@ public class ProcessInitTradeRequest extends TradeTask {
checkArgument(request.getTradeAmount() == trade.getAmount().longValueExact(), "Trade amount does not match request's trade amount");
// persist trade
trade.addInitProgressStep();
processModel.getTradeManager().requestPersistence();
complete();
} catch (Throwable t) {

1
core/src/main/java/haveno/core/trade/protocol/tasks/ProcessSignContractRequest.java
View file

@ -162,6 +162,7 @@ public class ProcessSignContractRequest extends TradeTask {
}
private void completeAux() {
trade.addInitProgressStep();
trade.setState(State.CONTRACT_SIGNED);
processModel.getTradeManager().requestPersistence();
complete();

1
core/src/main/java/haveno/core/trade/protocol/tasks/ProcessSignContractResponse.java
View file

@ -104,6 +104,7 @@ public class ProcessSignContractResponse extends TradeTask {
// deposit is requested
trade.setState(Trade.State.SENT_PUBLISH_DEPOSIT_TX_REQUEST);
trade.addInitProgressStep();
processModel.getTradeManager().requestPersistence();
} else {
log.info("Waiting for another contract signatures to send deposit request");

1
core/src/main/java/haveno/core/trade/protocol/tasks/TakerReserveTradeFunds.java
View file

@ -54,6 +54,7 @@ public class TakerReserveTradeFunds extends TradeTask {
processModel.setReserveTx(reserveTx);
processModel.getTaker().setReserveTxKeyImages(reservedKeyImages);
processModel.getTradeManager().requestPersistence();
trade.addInitProgressStep();
complete();
} catch (Throwable t) {
trade.setErrorMessage("An error occurred.\n" +

1
core/src/main/java/haveno/core/trade/protocol/tasks/TakerSendInitTradeRequestToArbitrator.java
View file

@ -47,6 +47,7 @@ public class TakerSendInitTradeRequestToArbitrator extends TradeTask {
// send request to signing arbitrator then least used arbitrators until success
sendInitTradeRequests(trade.getOffer().getOfferPayload().getArbitratorSigner(), new HashSet<NodeAddress>(), () -> {
trade.addInitProgressStep();
complete();
}, (errorMessage) -> {
log.warn("Cannot initialize trade with arbitrators: " + errorMessage);