boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2025-01-05 07:39:22 +00:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

support invalid offer state

Browse source
This commit is contained in:
woodser 2024-05-07 15:56:51 -04:00
parent 7887c450c7
commit 0ea056104c
6 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/haveno/core/offer/Offer.java
View file

@ -81,7 +81,8 @@ public class Offer implements NetworkPayload, PersistablePayload {
AVAILABLE, AVAILABLE,
NOT_AVAILABLE, NOT_AVAILABLE,
REMOVED, REMOVED,
MAKER_OFFLINE MAKER_OFFLINE,
INVALID
} }
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////

2
core/src/main/java/haveno/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java
View file

@ -54,7 +54,7 @@ public class ProcessOfferAvailabilityResponse extends Task<OfferAvailabilityMode
// verify maker signature for trade request // verify maker signature for trade request
if (!HavenoUtils.isMakerSignatureValid(model.getTradeRequest(), offerAvailabilityResponse.getMakerSignature(), offer.getPubKeyRing())) { if (!HavenoUtils.isMakerSignatureValid(model.getTradeRequest(), offerAvailabilityResponse.getMakerSignature(), offer.getPubKeyRing())) {
offer.setState(Offer.State.UNKNOWN); // TODO: using as invalid state offer.setState(Offer.State.INVALID);
failed("Take offer attempt failed because maker signature is invalid"); failed("Take offer attempt failed because maker signature is invalid");
return; return;
} }

1
core/src/main/resources/i18n/displayStrings.properties
View file

@ -563,6 +563,7 @@ takeOffer.setAmountPrice=Set amount
takeOffer.alreadyFunded.askCancel=You have already funded that offer.\nIf you cancel now, your funds will remain in your local Haveno wallet and are available for withdrawal in the \"Funds/Send funds\" screen.\nAre you sure you want to cancel? takeOffer.alreadyFunded.askCancel=You have already funded that offer.\nIf you cancel now, your funds will remain in your local Haveno wallet and are available for withdrawal in the \"Funds/Send funds\" screen.\nAre you sure you want to cancel?
takeOffer.failed.offerNotAvailable=Take offer request failed because the offer is not available anymore. Maybe another trader has taken the offer in the meantime. takeOffer.failed.offerNotAvailable=Take offer request failed because the offer is not available anymore. Maybe another trader has taken the offer in the meantime.
takeOffer.failed.offerTaken=You cannot take that offer because the offer was already taken by another trader. takeOffer.failed.offerTaken=You cannot take that offer because the offer was already taken by another trader.
takeOffer.failed.offerInvalid=You cannot take that offer because the maker's signature is invalid.
takeOffer.failed.offerRemoved=You cannot take that offer because the offer has been removed in the meantime. takeOffer.failed.offerRemoved=You cannot take that offer because the offer has been removed in the meantime.
takeOffer.failed.offererNotOnline=Take offer request failed because maker is not online anymore. takeOffer.failed.offererNotOnline=Take offer request failed because maker is not online anymore.
takeOffer.failed.offererOffline=You cannot take that offer because the maker is offline. takeOffer.failed.offererOffline=You cannot take that offer because the maker is offline.

4
desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferDataModel.java
View file

@ -149,7 +149,9 @@ class TakeOfferDataModel extends OfferDataModel {
}, },
errorMessage -> { errorMessage -> {
log.warn(errorMessage); log.warn(errorMessage);
if (offer.getState() != Offer.State.NOT_AVAILABLE) new Popup().warning(errorMessage).show(); // expected and handled elsewhere in UI if (offer.getState() != Offer.State.NOT_AVAILABLE && offer.getState() != Offer.State.INVALID) { // handled elsewhere in UI
new Popup().warning(errorMessage).show();
}
}); });
} }
} }

4
desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferViewModel.java
View file

@ -373,6 +373,10 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
offerWarning.set(Res.get("takeOffer.failed.offerTaken")); offerWarning.set(Res.get("takeOffer.failed.offerTaken"));
takeOfferRequested = false; takeOfferRequested = false;
break; break;
case INVALID:
offerWarning.set(Res.get("takeOffer.failed.offerInvalid"));
takeOfferRequested = false;
break;
case REMOVED: case REMOVED:
// if (takeOfferRequested) // TODO: show any warning or removed is expected? // if (takeOfferRequested) // TODO: show any warning or removed is expected?
// offerWarning.set(Res.get("takeOffer.failed.offerRemoved")); // offerWarning.set(Res.get("takeOffer.failed.offerRemoved"));

1
proto/src/main/proto/pb.proto
View file

@ -1358,6 +1358,7 @@ message Offer {
NOT_AVAILABLE = 4; NOT_AVAILABLE = 4;
REMOVED = 5; REMOVED = 5;
MAKER_OFFLINE = 6; MAKER_OFFLINE = 6;
INVALID = 7;
} }
OfferPayload offer_payload = 1; OfferPayload offer_payload = 1;