diff --git a/build.gradle b/build.gradle
index 6af9a3f29d3..cf41f0124c8 100644
--- a/build.gradle
+++ b/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,
diff --git a/core/src/main/java/bisq/core/offer/OfferBookService.java b/core/src/main/java/bisq/core/offer/OfferBookService.java
index 8580d3947f0..c736ea75d9f 100644
--- a/core/src/main/java/bisq/core/offer/OfferBookService.java
+++ b/core/src/main/java/bisq/core/offer/OfferBookService.java
@@ -19,6 +19,7 @@
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;
diff --git a/core/src/main/java/bisq/core/offer/OfferForJson.java b/core/src/main/java/bisq/core/offer/OfferForJson.java
index 1ac2b658b17..32ce0876661 100644
--- a/core/src/main/java/bisq/core/offer/OfferForJson.java
+++ b/core/src/main/java/bisq/core/offer/OfferForJson.java
@@ -21,6 +21,7 @@
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;
diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsMakerTrade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsMakerTrade.java
index 8ab3777d3e6..05e5369940b 100644
--- a/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsMakerTrade.java
+++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsMakerTrade.java
@@ -102,7 +102,7 @@ public static Tradable fromProto(protobuf.BuyerAsMakerTrade buyerAsMakerTradePro
trade.setTradePrice(proto.getTradePrice());
trade.setTradingPeerNodeAddress(proto.hasTradingPeerNodeAddress() ? NodeAddress.fromProto(proto.getTradingPeerNodeAddress()) : null);
- return fromProto(trade,
+ return Trade.fromProto(trade,
proto,
coreProtoResolver);
}
diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsTakerTrade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsTakerTrade.java
index 165f3d67c13..b8125c168f8 100644
--- a/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsTakerTrade.java
+++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsTakerTrade.java
@@ -93,7 +93,7 @@ public static Tradable fromProto(protobuf.BuyerAsTakerTrade buyerAsTakerTradePro
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()),
diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsMakerTrade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsMakerTrade.java
index 47f672cb402..372e2d20d53 100644
--- a/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsMakerTrade.java
+++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsMakerTrade.java
@@ -103,7 +103,7 @@ public static Tradable fromProto(protobuf.SellerAsMakerTrade sellerAsMakerTradeP
trade.setTradePrice(proto.getTradePrice());
trade.setTradingPeerNodeAddress(proto.hasTradingPeerNodeAddress() ? NodeAddress.fromProto(proto.getTradingPeerNodeAddress()) : null);
- return fromProto(trade,
+ return Trade.fromProto(trade,
proto,
coreProtoResolver);
}
diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsTakerTrade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsTakerTrade.java
index 470354f2d10..563c1f4cd1b 100644
--- a/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsTakerTrade.java
+++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsTakerTrade.java
@@ -93,7 +93,7 @@ public static Tradable fromProto(protobuf.SellerAsTakerTrade sellerAsTakerTradeP
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()),
diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/ApplyFilter.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/ApplyFilter.java
deleted file mode 100644
index 00574843118..00000000000
--- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/ApplyFilter.java
+++ /dev/null
@@ -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 .
- */
-
-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 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);
- }
- }
-}
-
diff --git a/core/src/main/resources/wallet/checkpoints.txt b/core/src/main/resources/wallet/checkpoints.txt
index 7ca378ee03b..953f052eeed 100644
--- a/core/src/main/resources/wallet/checkpoints.txt
+++ b/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
diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile
index ed17887ad91..5c2d8694a7e 100644
--- a/desktop/package/linux/Dockerfile
+++ b/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
diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh
index b1a73d3a5d2..0e3335050f4 100755
--- a/desktop/package/macosx/finalize.sh
+++ b/desktop/package/macosx/finalize.sh
@@ -2,7 +2,7 @@
cd ../../
-version="1.7.5"
+version="1.7.5-SNAPSHOT"
target_dir="releases/$version"
diff --git a/desktop/package/macosx/insert_snapshot_version.sh b/desktop/package/macosx/insert_snapshot_version.sh
index 08bea95102a..14166fb6a69 100755
--- a/desktop/package/macosx/insert_snapshot_version.sh
+++ b/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" \
diff --git a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java
index c01fcba601b..d1f3f1aeaf3 100644
--- a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java
+++ b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java
@@ -77,11 +77,15 @@
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 @@ private void setupHandlers() {
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)
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferView.java
index 2ea28030cb3..0ad84c2c006 100644
--- a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferView.java
+++ b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferView.java
@@ -33,7 +33,6 @@
@FxmlView
public class CreateOfferView extends MutableOfferView {
-
@Inject
private CreateOfferView(CreateOfferViewModel model,
Navigation navigation,
diff --git a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET
index 20b7f5416ed..07aef2b21e8 100644
--- a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET
+++ b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6c819c6721633b24500bafd111cf5929af9104605807daeb30ea65ae0707e998
-size 146063059
+oid sha256:a055d0c2d253f9df60faafe8284b6f9666b1849719a29d3593089b86c385076b
+size 152414573
diff --git a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET
index aece195f907..d7cb3117416 100644
--- a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET
+++ b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d0f09b90cb3df9b7464055415c803d72eda6083ab551a33f9219e9c2354dafec
-size 8829191
+oid sha256:02e4d12b1d9e5d3d94bdb250b3e9b683ccccf51119e4dd6181f08b73ed4ff09c
+size 9245383
diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt
index 6a126f402d5..0fb39f57310 100644
--- a/relay/src/main/resources/version.txt
+++ b/relay/src/main/resources/version.txt
@@ -1 +1 @@
-1.7.5
+1.7.5-SNAPSHOT