Add check at offerer for trade price

core/src/main/java/io/bitsquare/trade/protocol/trade/ProcessModel.java

@@ -68,7 +68,6 @@ public class ProcessModel implements Model, Serializable {
     transient private KeyRing keyRing;
     transient private P2PService p2PService;
 
-
     // Mutable
     public final TradingPeer tradingPeer;
     transient private TradeMessage tradeMessage;

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/ProcessPayDepositRequest.java

@@ -26,6 +26,7 @@ import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.messages.PayDepositRequest;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
 import org.bitcoinj.core.Coin;
+import org.bitcoinj.utils.Fiat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,8 +77,27 @@ public class ProcessPayDepositRequest extends TradeTask {
             if (payDepositRequest.acceptedArbitratorNodeAddresses.size() < 1)
                 failed("acceptedArbitratorNames size must be at least 1");
             trade.setArbitratorNodeAddress(checkNotNull(payDepositRequest.arbitratorNodeAddress));
+
+            long takersTradePrice = payDepositRequest.tradePrice;
+            checkArgument(takersTradePrice > 0);
+            Fiat tradePriceAsFiat = Fiat.valueOf(trade.getOffer().getCurrencyCode(), takersTradePrice);
+            Fiat offerPriceAsFiat = trade.getOffer().getPrice();
+            double factor = (double) takersTradePrice / (double) offerPriceAsFiat.value;
+            // We allow max. 2 % difference between own offer price calculation and takers calculation.
+            // Market price might be different at offerers and takers side so we need a bit of tolerance.
+            // The tolerance will get smaller once we have multiple price feeds avoiding fast price fluctuations 
+            // from one provider.
+            if (Math.abs(1 - factor) > 0.02) {
+                String msg = "Takers tradePrice is outside our market price tolerance.\n" +
+                        "tradePriceAsFiat=" + tradePriceAsFiat.toFriendlyString() + "\n" +
+                        "offerPriceAsFiat=" + offerPriceAsFiat.toFriendlyString();
+                log.warn(msg);
+                failed(msg);
+            }
+            trade.setTradePrice(takersTradePrice);
+            
+            
             checkArgument(payDepositRequest.tradeAmount > 0);
-            trade.setTradePrice(payDepositRequest.tradePrice);
             trade.setTradeAmount(Coin.valueOf(payDepositRequest.tradeAmount));
 
             // update to the latest peer address of our peer if the payDepositRequest is correct

core/src/main/java/io/bitsquare/user/Preferences.java

@@ -110,6 +110,7 @@ public final class Preferences implements Persistable {
     private double maxPriceDistanceInPercent;
     private boolean useInvertedMarketPrice;
     private boolean useStickyMarketPrice = false;
+    private boolean usePercentageBasedPrice = false;
 
     // Observable wrappers
     transient private final StringProperty btcDenominationProperty = new SimpleStringProperty(btcDenomination);
@@ -162,6 +163,7 @@ public final class Preferences implements Persistable {
             // useTorForBitcoinJ = persisted.getUseTorForBitcoinJ();
             useTorForBitcoinJ = false;
             useStickyMarketPrice = persisted.getUseStickyMarketPrice();
+            usePercentageBasedPrice = persisted.getUsePercentageBasedPrice();
             showOwnOffersInOfferBook = persisted.getShowOwnOffersInOfferBook();
             maxPriceDistanceInPercent = persisted.getMaxPriceDistanceInPercent();
             // Backward compatible to version 0.3.6. Can be removed after a while
@@ -368,6 +370,12 @@ public final class Preferences implements Persistable {
         storage.queueUpForSave();
     }
 
+    public void setUsePercentageBasedPrice(boolean usePercentageBasedPrice) {
+        this.usePercentageBasedPrice = usePercentageBasedPrice;
+        storage.queueUpForSave();
+    }
+
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Getter
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -488,6 +496,10 @@ public final class Preferences implements Persistable {
         return useStickyMarketPrice;
     }
 
+    public boolean getUsePercentageBasedPrice() {
+        return usePercentageBasedPrice;
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Private

gui/src/main/java/io/bitsquare/app/BitsquareApp.java

@@ -76,7 +76,7 @@ import static io.bitsquare.app.BitsquareEnvironment.APP_NAME_KEY;
 public class BitsquareApp extends Application {
     private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BitsquareApp.class);
 
-    public static final boolean DEV_MODE = false;
+    public static final boolean DEV_MODE = true;
     public static final boolean IS_RELEASE_VERSION = !DEV_MODE && true;
 
     private static Environment env;

gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java

@@ -497,7 +497,11 @@ public class MainViewModel implements ViewModel {
         setupBtcNumPeersWatcher();
         setupP2PNumPeersWatcher();
         updateBalance();
+        if (BitsquareApp.DEV_MODE) {
+            preferences.setShowOwnOffersInOfferBook(true);
+            if (user.getPaymentAccounts().isEmpty())
                 setupDevDummyPaymentAccount();
+        }
         setupMarketPriceFeed();
         swapPendingOfferFundingEntries();
         fillPriceFeedComboBoxItems();
@@ -896,7 +900,6 @@ public class MainViewModel implements ViewModel {
     }
 
     private void setupDevDummyPaymentAccount() {
-        if (BitsquareApp.DEV_MODE && user.getPaymentAccounts().isEmpty()) {
         OKPayAccount okPayAccount = new OKPayAccount();
         okPayAccount.setAccountNr("dummy");
         okPayAccount.setAccountName("OKPay dummy");
@@ -904,4 +907,3 @@ public class MainViewModel implements ViewModel {
         user.addPaymentAccount(okPayAccount);
     }
 }
-}

gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java

@@ -140,6 +140,8 @@ class CreateOfferDataModel extends ActivatableDataModel {
         networkFeeAsCoin = FeePolicy.getFixedTxFeeForTrades();
         securityDepositAsCoin = FeePolicy.getSecurityDeposit();
 
+        usePercentageBasedPrice.set(preferences.getUsePercentageBasedPrice());
+
         balanceListener = new BalanceListener(getAddressEntry().getAddress()) {
             @Override
             public void onBalanceChanged(Coin balance, Transaction tx) {
@@ -282,9 +284,6 @@ class CreateOfferDataModel extends ActivatableDataModel {
         String countryCode = paymentAccount instanceof CountryBasedPaymentAccount ? ((CountryBasedPaymentAccount) paymentAccount).getCountry().code : null;
 
         checkNotNull(p2PService.getAddress(), "Address must not be null");
-        log.error("fiatPrice " + fiatPrice);
-        log.error("percentageBasedPrice " + percentageBasedPrice);
-        log.error("usePercentageBasedPrice " + usePercentageBasedPrice.get());
         return new Offer(offerId,
                 p2PService.getAddress(),
                 keyRing.getPubKeyRing(),
@@ -389,6 +388,7 @@ class CreateOfferDataModel extends ActivatableDataModel {
 
     public void setUsePercentageBasedPrice(boolean usePercentageBasedPrice) {
         this.usePercentageBasedPrice.set(usePercentageBasedPrice);
+        preferences.setUsePercentageBasedPrice(usePercentageBasedPrice);
     }
 
     /*boolean isFeeFromFundingTxSufficient() {

gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java

@@ -989,7 +989,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
         VBox priceAsPercentageInputBox = priceAsPercentageInputBoxTuple.second;
 
         priceAsPercentageTextField.setPromptText("Enter % value");
-        priceAsPercentageLabel.setText("% dist.");
+        priceAsPercentageLabel.setText("%");
         priceAsPercentageLabel.setStyle("-fx-alignment: center;");
 
         Tuple3<HBox, InputTextField, Label> amountValueCurrencyBoxTuple = getValueCurrencyBox(BSResources.get("createOffer.amount.prompt"));

gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java

@@ -855,7 +855,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
         priceAsPercentageInputBox = priceAsPercentageInputBoxTuple.second;
 
         priceAsPercentageTextField.setPromptText("Enter % value");
-        priceAsPercentageLabel.setText("% dist.");
+        priceAsPercentageLabel.setText("%");
         priceAsPercentageLabel.setStyle("-fx-alignment: center;");