Merge branch 'chimp-bsq-swap-1' into bsq-swap-low-risk-refactorings-2

# Conflicts:
#	core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
#	core/src/main/java/bisq/core/api/CoreOffersService.java
#	core/src/main/java/bisq/core/btc/listeners/TxConfidenceListener.java
#	core/src/main/java/bisq/core/notifications/alerts/market/MarketAlerts.java
#	core/src/main/java/bisq/core/offer/OpenOfferManager.java
#	core/src/main/java/bisq/core/offer/bisq_v1/CreateOfferService.java
#	core/src/main/java/bisq/core/offer/bisq_v1/OfferPayload.java
#	core/src/main/java/bisq/core/offer/bisq_v1/TakeOfferModel.java
#	core/src/main/java/bisq/core/offer/bisq_v1/TriggerPriceService.java
#	core/src/main/java/bisq/core/proto/ProtoDevUtil.java
#	core/src/main/java/bisq/core/trade/TradeManager.java
#	core/src/main/java/bisq/core/trade/bisq_v1/TradeResultHandler.java
#	core/src/main/java/bisq/core/trade/bisq_v1/TradeUtil.java
#	core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
#	core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java
#	core/src/main/java/bisq/core/trade/protocol/Provider.java
#	core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java
#	core/src/main/java/bisq/core/trade/protocol/TradeProtocolFactory.java
#	core/src/main/java/bisq/core/trade/protocol/TradeTaskRunner.java
#	core/src/main/java/bisq/core/trade/protocol/bisq_v1/DisputeProtocol.java
#	core/src/main/java/bisq/core/trade/protocol/bisq_v1/model/ProcessModel.java
#	core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/ApplyFilter.java
#	core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/TradeTask.java
#	core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerCreateAndSignContract.java
#	core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerVerifyAndSignContract.java
#	core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java
#	core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
#	core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
#	desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java
#	desktop/src/main/java/bisq/desktop/main/PriceUtil.java
#	desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactory.java
#	desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTrade.java
#	desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java
#	desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java
#	desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.java
#	desktop/src/main/java/bisq/desktop/main/offer/OfferView.java
#	desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.java
#	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferDataModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java
#	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferViewModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferDataModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java
#	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferViewModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java
#	desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
#	desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
#	desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersDataModel.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
#	desktop/src/main/java/bisq/desktop/util/DisplayUtils.java
#	desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferDataModelTest.java
#	desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferViewModelTest.java
#	desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java
#	desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java
#	desktop/src/test/java/bisq/desktop/maker/OfferMaker.java
#	monitor/src/main/java/bisq/monitor/metric/P2PMarketStats.java

build.gradle

@@ -414,7 +414,7 @@ configure(project(':desktop')) {
         modules =  ['javafx.controls', 'javafx.fxml']
     }
 
-    version = '1.7.5'
+    version = '1.7.5-SNAPSHOT'
 
     jar.manifest.attributes(
         "Implementation-Title": project.name,

core/src/main/java/bisq/core/offer/OfferBookService.java

@@ -19,6 +19,7 @@ package bisq.core.offer;
 
 import bisq.core.filter.FilterManager;
 import bisq.core.locale.Res;
+import bisq.core.offer.bisq_v1.OfferPayload;
 import bisq.core.provider.price.PriceFeedService;
 
 import bisq.network.p2p.BootstrapListener;

core/src/main/java/bisq/core/offer/OfferForJson.java

@@ -21,6 +21,7 @@ import bisq.core.locale.CurrencyUtil;
 import bisq.core.locale.Res;
 import bisq.core.monetary.Price;
 import bisq.core.monetary.Volume;
+import bisq.core.offer.bisq_v1.OfferPayload;
 import bisq.core.payment.payload.PaymentMethod;
 
 import bisq.common.util.MathUtils;

core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsMakerTrade.java

@@ -102,7 +102,7 @@ public final class BuyerAsMakerTrade extends BuyerTrade implements MakerTrade {
         trade.setTradePrice(proto.getTradePrice());
         trade.setTradingPeerNodeAddress(proto.hasTradingPeerNodeAddress() ? NodeAddress.fromProto(proto.getTradingPeerNodeAddress()) : null);
 
-        return fromProto(trade,
+        return Trade.fromProto(trade,
                 proto,
                 coreProtoResolver);
     }

core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsTakerTrade.java

@@ -93,7 +93,7 @@ public final class BuyerAsTakerTrade extends BuyerTrade implements TakerTrade {
         if (uid == null) {
             uid = UUID.randomUUID().toString();
         }
-        return fromProto(new BuyerAsTakerTrade(
+        return Trade.fromProto(new BuyerAsTakerTrade(
                         Offer.fromProto(proto.getOffer()),
                         Coin.valueOf(proto.getTradeAmountAsLong()),
                         Coin.valueOf(proto.getTxFeeAsLong()),

core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsMakerTrade.java

@@ -103,7 +103,7 @@ public final class SellerAsMakerTrade extends SellerTrade implements MakerTrade
         trade.setTradePrice(proto.getTradePrice());
         trade.setTradingPeerNodeAddress(proto.hasTradingPeerNodeAddress() ? NodeAddress.fromProto(proto.getTradingPeerNodeAddress()) : null);
 
-        return fromProto(trade,
+        return Trade.fromProto(trade,
                 proto,
                 coreProtoResolver);
     }

core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsTakerTrade.java

@@ -93,7 +93,7 @@ public final class SellerAsTakerTrade extends SellerTrade implements TakerTrade
         if (uid == null) {
             uid = UUID.randomUUID().toString();
         }
-        return fromProto(new SellerAsTakerTrade(
+        return Trade.fromProto(new SellerAsTakerTrade(
                         Offer.fromProto(proto.getOffer()),
                         Coin.valueOf(proto.getTradeAmountAsLong()),
                         Coin.valueOf(proto.getTxFeeAsLong()),

core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/ApplyFilter.java

@@ -1,63 +0,0 @@
-/*
- * This file is part of Bisq.
- *
- * Bisq is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at
- * your option) any later version.
- *
- * Bisq is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package bisq.core.trade.protocol.bisq_v1.tasks;
-
-import bisq.core.filter.FilterManager;
-import bisq.core.payment.payload.PaymentAccountPayload;
-import bisq.core.trade.bisq_v1.TradeUtil;
-import bisq.core.trade.model.bisq_v1.Trade;
-
-import bisq.network.p2p.NodeAddress;
-
-import bisq.common.taskrunner.TaskRunner;
-
-import lombok.extern.slf4j.Slf4j;
-
-import javax.annotation.Nullable;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-@Slf4j
-public class ApplyFilter extends TradeTask {
-    public ApplyFilter(TaskRunner<Trade> taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-
-            NodeAddress nodeAddress = checkNotNull(processModel.getTempTradingPeerNodeAddress());
-            @Nullable
-            PaymentAccountPayload paymentAccountPayload = processModel.getTradePeer().getPaymentAccountPayload();
-
-            FilterManager filterManager = processModel.getFilterManager();
-
-            TradeUtil.applyFilter(trade,
-                    filterManager,
-                    nodeAddress,
-                    paymentAccountPayload,
-                    this::complete,
-                    this::failed);
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
-

core/src/main/resources/wallet/checkpoints.txt

@@ -1,6 +1,6 @@
 TXT CHECKPOINTS 1
 0
-347
+349
 AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv
 AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5
 AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G
@@ -348,3 +348,5 @@ H/scEVeqoHwiR4XCAAqVAAQAACAp7Oq3+Dyk8n8irC8NurbgW+TyqKfBAwAAAAAAAAAAAMpdMLs3r3kB
 IGLxQ5ggT209mY8YAAqc4AQA/z+UNYXSpcMbQedgEG83G6j+JomAmZkBAAAAAAAAAAAAALF2cIhIGcY/Y5hk97vS8iowfcasg8RKMU+1GnC8peaJ6wgWYQsYEhc3Dc2x
 INJeT/7WHqcUv/ASAAqkwAQAACAW1bP3ULCb7l1WrnZh1Fhdtr5iEoiNCQAAAAAAAAAAAL+GJQD++FLt8be0h0yd/f7oJ6+wHbrc9Wrx4d4UmM48jFYmYaD6DxfK6HL9
 IVCJbIepFmtNRMOrAAqsoATg/z9jvkqOCEjsMXZ5NSTR70jjJY6jcMsZAAAAAAAAAAAAAJ3FfWBYz4SZErDMatFIMKICRh05en60mvmWrgW1GboLNQQ4YeRIDxfArM0V
+IdRva310VAL/1T6KAAq0gAQAACDYRNhykSZE0FCNDbMD3ep37sppeREVBQAAAAAAAAAAACQVT8noR4EQStMyf0BwxU7X1oXPSv4XXntyzNI2Pw9nfO1JYevQDhdFHdB6
+IlyBuc55IaovtRgZAAq8YAQAACAFDOUuzSPi2Pb5kdp+wxKBfvspFnUcDgAAAAAAAAAAADcc9lDs5JP/E+v1DrUxBRV/PfB8Sbd7hC7mhLrwNS5Rt49bYTImDheC4ukE

desktop/package/linux/Dockerfile

@@ -8,7 +8,7 @@
 
 # pull base image
 FROM openjdk:8-jdk
-ENV version 1.7.5
+ENV version 1.7.5-SNAPSHOT
 
 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
 apt-get install -y vim fakeroot

desktop/package/macosx/finalize.sh

@@ -2,7 +2,7 @@
 
 cd ../../
 
-version="1.7.5"
+version="1.7.5-SNAPSHOT"
 
 target_dir="releases/$version"
 

desktop/package/macosx/insert_snapshot_version.sh

@@ -2,7 +2,7 @@
 
 cd $(dirname $0)/../../../
 
-version=1.7.4
+version=1.7.5
 
 find . -type f \( -name "finalize.sh" \
 -o -name "create_app.sh" \

desktop/src/main/java/bisq/desktop/main/MainViewModel.java

@@ -77,11 +77,15 @@ import bisq.common.UserThread;
 import bisq.common.app.DevEnv;
 import bisq.common.app.Version;
 import bisq.common.config.Config;
+import bisq.common.crypto.Hash;
 import bisq.common.file.CorruptedStorageFileHandler;
+import bisq.common.util.Hex;
 import bisq.common.util.Tuple2;
 
 import com.google.inject.Inject;
 
+import com.google.common.base.Charsets;
+
 import org.fxmisc.easybind.EasyBind;
 import org.fxmisc.easybind.monadic.MonadicBinding;
 
@@ -341,7 +345,15 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener {
         bisqSetup.setChainFileLockedExceptionHandler(msg -> new Popup().warning(msg)
                 .useShutDownButton()
                 .show());
-        bisqSetup.setLockedUpFundsHandler(msg -> new Popup().width(850).warning(msg).show());
+        bisqSetup.setLockedUpFundsHandler(msg -> {
+            // repeated popups of the same message text can be stopped by selecting the "Dont show again" checkbox
+            String key = Hex.encode(Hash.getSha256Ripemd160hash(msg.getBytes(Charsets.UTF_8)));
+            if (preferences.showAgain(key)) {
+                new Popup().width(850).warning(msg)
+                        .dontShowAgainId(key)
+                        .show();
+            }
+        });
         bisqSetup.setShowFirstPopupIfResyncSPVRequestedHandler(this::showFirstPopupIfResyncSPVRequested);
         bisqSetup.setRequestWalletPasswordHandler(aesKeyHandler -> walletPasswordWindow
                 .onAesKey(aesKeyHandler::accept)

desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferView.java

@@ -33,7 +33,6 @@ import javax.inject.Named;
 
 @FxmlView
 public class CreateOfferView extends MutableOfferView<CreateOfferViewModel> {
-
     @Inject
     private CreateOfferView(CreateOfferViewModel model,
                             Navigation navigation,

relay/src/main/resources/version.txt

@@ -1 +1 @@
-1.7.5
+1.7.5-SNAPSHOT