mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5825 from chimp1984/improve-offer-validation

Browse source 
Improve offer validation
This commit is contained in:
Christoph Atteneder 2021-11-15 12:03:29 +01:00 • committed by GitHub
commit 83c9355931
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/src/main/java/bisq/core/offer/Offer.java
View file

@ -225,8 +225,15 @@ public class Offer implements NetworkPayload, PersistablePayload {
return offerPayloadBase.getPrice(); return offerPayloadBase.getPrice();
} }
public void checkTradePriceTolerance(long takersTradePrice) throws TradePriceOutOfToleranceException, public void verifyTakersTradePrice(long takersTradePrice) throws TradePriceOutOfToleranceException,
MarketPriceNotAvailableException, IllegalArgumentException { MarketPriceNotAvailableException, IllegalArgumentException {
if (!isUseMarketBasedPrice()) {
checkArgument(takersTradePrice == getFixedPrice(),
"Takers price does not match offer price. " +
"Takers price=" + takersTradePrice + "; offer price=" + getFixedPrice());
return;
}
Price tradePrice = Price.valueOf(getCurrencyCode(), takersTradePrice); Price tradePrice = Price.valueOf(getCurrencyCode(), takersTradePrice);
Price offerPrice = getPrice(); Price offerPrice = getPrice();
if (offerPrice == null) if (offerPrice == null)

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

@ -685,7 +685,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
// Check also tradePrice to avoid failures after taker fee is paid caused by a too big difference // Check also tradePrice to avoid failures after taker fee is paid caused by a too big difference
// in trade price between the peers. Also here poor connectivity might cause market price API connection // in trade price between the peers. Also here poor connectivity might cause market price API connection
// losses and therefore an outdated market price. // losses and therefore an outdated market price.
offer.checkTradePriceTolerance(request.getTakersTradePrice()); offer.verifyTakersTradePrice(request.getTakersTradePrice());
availabilityResult = AvailabilityResult.AVAILABLE; availabilityResult = AvailabilityResult.AVAILABLE;
} catch (TradePriceOutOfToleranceException e) { } catch (TradePriceOutOfToleranceException e) {
log.warn("Trade price check failed because takers price is outside out tolerance."); log.warn("Trade price check failed because takers price is outside out tolerance.");

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerProcessesInputsForDepositTxRequest.java
View file

@ -104,7 +104,7 @@ public class MakerProcessesInputsForDepositTxRequest extends TradeTask {
Offer offer = checkNotNull(trade.getOffer(), "Offer must not be null"); Offer offer = checkNotNull(trade.getOffer(), "Offer must not be null");
try { try {
long takersTradePrice = request.getTradePrice(); long takersTradePrice = request.getTradePrice();
offer.checkTradePriceTolerance(takersTradePrice); offer.verifyTakersTradePrice(takersTradePrice);
trade.setPriceAsLong(takersTradePrice); trade.setPriceAsLong(takersTradePrice);
} catch (TradePriceOutOfToleranceException e) { } catch (TradePriceOutOfToleranceException e) {
failed(e.getMessage()); failed(e.getMessage());