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
bisq-network · Nov 2, 2021 · d5dfdb4 · d5dfdb4
2 parents ebfd1b5 + 56759be
commit d5dfdb4
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 79 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -33,7 +33,6 @@
 
 @FxmlView
 public class CreateOfferView extends MutableOfferView<CreateOfferViewModel> {
-
     @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
diff --git a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET
diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt
@@ -1 +1 @@
-1.7.5
+1.7.5-SNAPSHOT