From 8623b7b546c6784504cc01d4183083c257b1f6ba Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 1 Apr 2021 09:41:07 +0200 Subject: [PATCH 1/4] Bump version number for v1.6.2 --- build.gradle | 2 +- common/src/main/java/bisq/common/app/Version.java | 2 +- desktop/package/linux/Dockerfile | 2 +- desktop/package/linux/package.sh | 2 +- desktop/package/linux/release.sh | 2 +- desktop/package/macosx/Info.plist | 4 ++-- desktop/package/macosx/copy_dbs.sh | 2 +- desktop/package/macosx/create_app.sh | 2 +- desktop/package/macosx/finalize.sh | 2 +- desktop/package/macosx/insert_snapshot_version.sh | 2 +- desktop/package/macosx/replace_version_number.sh | 4 ++-- desktop/package/windows/package.bat | 2 +- desktop/package/windows/release.bat | 2 +- relay/src/main/resources/version.txt | 2 +- seednode/src/main/java/bisq/seednode/SeedNodeMain.java | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 504fc4b5289..b2d6a1a4994 100644 --- a/build.gradle +++ b/build.gradle @@ -383,7 +383,7 @@ configure(project(':desktop')) { apply plugin: 'witness' apply from: '../gradle/witness/gradle-witness.gradle' - version = '1.6.1' + version = '1.6.2' mainClassName = 'bisq.desktop.app.BisqAppMain' diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java index 1b8bf7e6c95..9d3bc83a94d 100644 --- a/common/src/main/java/bisq/common/app/Version.java +++ b/common/src/main/java/bisq/common/app/Version.java @@ -30,7 +30,7 @@ public class Version { // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update // Therefore all sub versions start again with 1 // We use semantic versioning with major, minor and patch - public static final String VERSION = "1.6.1"; + public static final String VERSION = "1.6.2"; /** * Holds a list of the tagged resource files for optimizing the getData requests. diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile index 6d9d31e2076..7ced8cd927f 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.6.1 +ENV version 1.6.2 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/linux/package.sh b/desktop/package/linux/package.sh index c2137f46c80..508fae06ae5 100755 --- a/desktop/package/linux/package.sh +++ b/desktop/package/linux/package.sh @@ -6,7 +6,7 @@ # - Update version below # - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory -version=1.6.1 +version=1.6.2 version_base=$(echo $version | awk -F'[_-]' '{print $1}') if [ ! -f "$JAVA_HOME/bin/javapackager" ]; then if [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then diff --git a/desktop/package/linux/release.sh b/desktop/package/linux/release.sh index bd9b3616340..0f0cd7cfa9f 100755 --- a/desktop/package/linux/release.sh +++ b/desktop/package/linux/release.sh @@ -4,7 +4,7 @@ # Prior to running this script: # - Update version below -version=1.6.1 +version=1.6.2 base_dir=$( cd "$(dirname "$0")" ; pwd -P )/../../.. package_dir=$base_dir/desktop/package release_dir=$base_dir/desktop/release/$version diff --git a/desktop/package/macosx/Info.plist b/desktop/package/macosx/Info.plist index ccee170b6e9..e7ac7c34c90 100644 --- a/desktop/package/macosx/Info.plist +++ b/desktop/package/macosx/Info.plist @@ -5,10 +5,10 @@ CFBundleVersion - 1.6.1 + 1.6.2 CFBundleShortVersionString - 1.6.1 + 1.6.2 CFBundleExecutable Bisq diff --git a/desktop/package/macosx/copy_dbs.sh b/desktop/package/macosx/copy_dbs.sh index e0476c1a20b..f1e49afb02e 100755 --- a/desktop/package/macosx/copy_dbs.sh +++ b/desktop/package/macosx/copy_dbs.sh @@ -2,7 +2,7 @@ cd $(dirname $0)/../../../ -version="1.6.1" +version="1.6.2" # Set BISQ_DIR as environment var to the path of your locally synced Bisq data directory e.g. BISQ_DIR=~/Library/Application\ Support/Bisq diff --git a/desktop/package/macosx/create_app.sh b/desktop/package/macosx/create_app.sh index 41893237708..d4408e5cf79 100755 --- a/desktop/package/macosx/create_app.sh +++ b/desktop/package/macosx/create_app.sh @@ -6,7 +6,7 @@ mkdir -p deploy set -e -version="1.6.1" +version="1.6.2" cd .. ./gradlew :desktop:build -x test shadowJar diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh index b848e9a6902..55b441b6f0b 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -2,7 +2,7 @@ cd ../../ -version="1.6.1" +version="1.6.2" target_dir="releases/$version" diff --git a/desktop/package/macosx/insert_snapshot_version.sh b/desktop/package/macosx/insert_snapshot_version.sh index e03d8877b09..b57a36465cf 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.6.0 +version=1.6.1 find . -type f \( -name "finalize.sh" \ -o -name "create_app.sh" \ diff --git a/desktop/package/macosx/replace_version_number.sh b/desktop/package/macosx/replace_version_number.sh index 6c09cc91ca0..1ba86fa4509 100755 --- a/desktop/package/macosx/replace_version_number.sh +++ b/desktop/package/macosx/replace_version_number.sh @@ -2,8 +2,8 @@ cd $(dirname $0)/../../../. -oldVersion=1.6.0 -newVersion=1.6.1 +oldVersion=1.6.1 +newVersion=1.6.2 find . -type f \( -name "finalize.sh" \ -o -name "create_app.sh" \ diff --git a/desktop/package/windows/package.bat b/desktop/package/windows/package.bat index 0e54fbf5b07..4131336de60 100644 --- a/desktop/package/windows/package.bat +++ b/desktop/package/windows/package.bat @@ -11,7 +11,7 @@ @echo off -set version=1.6.1 +set version=1.6.2 if not exist "%JAVA_HOME%\bin\javapackager.exe" ( if not exist "%ProgramFiles%\Java\jdk-10.0.2" ( echo Javapackager not found. Update JAVA_HOME variable to point to OracleJDK. diff --git a/desktop/package/windows/release.bat b/desktop/package/windows/release.bat index ed2b98a04ff..6a27f58813d 100644 --- a/desktop/package/windows/release.bat +++ b/desktop/package/windows/release.bat @@ -6,7 +6,7 @@ @echo off -set version=1.6.1 +set version=1.6.2 set release_dir=%~dp0..\..\..\releases\%version% set package_dir=%~dp0.. diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt index 9c6d6293b1a..fdd3be6df54 100644 --- a/relay/src/main/resources/version.txt +++ b/relay/src/main/resources/version.txt @@ -1 +1 @@ -1.6.1 +1.6.2 diff --git a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java index 5bb447b1651..e6e1172ac77 100644 --- a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java +++ b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java @@ -47,7 +47,7 @@ @Slf4j public class SeedNodeMain extends ExecutableForAppWithP2p { private static final long CHECK_CONNECTION_LOSS_SEC = 30; - private static final String VERSION = "1.6.1"; + private static final String VERSION = "1.6.2"; private SeedNode seedNode; private Timer checkConnectionLossTime; From d567170bdbbd70b1b33440f13e8ff6d479d31d34 Mon Sep 17 00:00:00 2001 From: jmacxx <47253594+jmacxx@users.noreply.github.com> Date: Tue, 30 Mar 2021 22:42:48 -0500 Subject: [PATCH 2/4] use semaphore for SPV resync --- .../main/java/bisq/core/app/BisqSetup.java | 33 +++++++++++++++++-- .../java/bisq/core/app/WalletAppSetup.java | 3 +- .../java/bisq/desktop/main/MainViewModel.java | 2 +- .../main/java/bisq/desktop/util/GUIUtil.java | 3 +- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/bisq/core/app/BisqSetup.java b/core/src/main/java/bisq/core/app/BisqSetup.java index ab82d9efc0d..de6db2c2ba9 100644 --- a/core/src/main/java/bisq/core/app/BisqSetup.java +++ b/core/src/main/java/bisq/core/app/BisqSetup.java @@ -103,6 +103,7 @@ @Singleton public class BisqSetup { private static final String VERSION_FILE_NAME = "version"; + private static final String RESYNC_SPV_FILE_NAME = "resyncSpv"; public interface BisqSetupListener { default void onInitP2pNetwork() { @@ -325,7 +326,7 @@ private void step4() { private void maybeReSyncSPVChain() { // We do the delete of the spv file at startup before BitcoinJ is initialized to avoid issues with locked files under Windows. - if (preferences.isResyncSpvRequested()) { + if (getResyncSpvSemaphore()) { try { walletsSetup.reSyncSPVChain(); @@ -424,7 +425,7 @@ private void initWallet() { walletsManager.setAesKey(aesKey); walletsSetup.getWalletConfig().maybeAddSegwitKeychain(walletsSetup.getWalletConfig().btcWallet(), aesKey); - if (preferences.isResyncSpvRequested()) { + if (getResyncSpvSemaphore()) { if (showFirstPopupIfResyncSPVRequestedHandler != null) showFirstPopupIfResyncSPVRequestedHandler.run(); } else { @@ -438,6 +439,7 @@ private void initWallet() { }; walletAppSetup.init(chainFileLockedExceptionHandler, spvFileCorruptedHandler, + getResyncSpvSemaphore(), showFirstPopupIfResyncSPVRequestedHandler, showPopupIfInvalidBtcConfigHandler, walletPasswordHandler, @@ -542,6 +544,33 @@ public static String getLastBisqVersion() { return null; } + @Nullable + public static boolean getResyncSpvSemaphore() { + File resyncSpvSemaphore = new File(Config.appDataDir(), RESYNC_SPV_FILE_NAME); + return resyncSpvSemaphore.exists(); + } + + public static void setResyncSpvSemaphore(boolean isResyncSpvRequested) { + File resyncSpvSemaphore = new File(Config.appDataDir(), RESYNC_SPV_FILE_NAME); + if (isResyncSpvRequested) { + if (!resyncSpvSemaphore.exists()) { + try { + if (!resyncSpvSemaphore.createNewFile()) { + log.error("ResyncSpv file could not be created"); + } + } catch (IOException e) { + e.printStackTrace(); + log.error("ResyncSpv file could not be created. {}", e.toString()); + } + } + } else { + resyncSpvSemaphore.delete(); + } + } + + + + private static File getVersionFile() { return new File(Config.appDataDir(), VERSION_FILE_NAME); } diff --git a/core/src/main/java/bisq/core/app/WalletAppSetup.java b/core/src/main/java/bisq/core/app/WalletAppSetup.java index 8f0fd15f1d7..b54e6706ada 100644 --- a/core/src/main/java/bisq/core/app/WalletAppSetup.java +++ b/core/src/main/java/bisq/core/app/WalletAppSetup.java @@ -105,6 +105,7 @@ public WalletAppSetup(CoreContext coreContext, void init(@Nullable Consumer chainFileLockedExceptionHandler, @Nullable Consumer spvFileCorruptedHandler, + boolean isSpvResyncRequested, @Nullable Runnable showFirstPopupIfResyncSPVRequestedHandler, @Nullable Runnable showPopupIfInvalidBtcConfigHandler, Runnable walletPasswordHandler, @@ -179,7 +180,7 @@ void init(@Nullable Consumer chainFileLockedExceptionHandler, if (walletsManager.areWalletsEncrypted() && !coreContext.isApiUser()) { walletPasswordHandler.run(); } else { - if (preferences.isResyncSpvRequested() && !coreContext.isApiUser()) { + if (isSpvResyncRequested && !coreContext.isApiUser()) { if (showFirstPopupIfResyncSPVRequestedHandler != null) showFirstPopupIfResyncSPVRequestedHandler.run(); } else { diff --git a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java index 1a97544c14d..e787e6ad227 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java @@ -575,7 +575,7 @@ private void showFirstPopupIfResyncSPVRequested() { private void showSecondPopupIfResyncSPVRequested(Popup firstPopup) { firstPopup.hide(); - preferences.setResyncSpvRequested(false); + BisqSetup.setResyncSpvSemaphore(false); new Popup().information(Res.get("settings.net.reSyncSPVAfterRestartCompleted")) .hideCloseButton() .useShutDownButton() diff --git a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java index 1cd240f5a94..8f4beb8c122 100644 --- a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java +++ b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java @@ -30,6 +30,7 @@ import bisq.core.account.witness.AccountAgeWitness; import bisq.core.account.witness.AccountAgeWitnessService; +import bisq.core.app.BisqSetup; import bisq.core.btc.setup.WalletsSetup; import bisq.core.locale.Country; import bisq.core.locale.CountryUtil; @@ -823,7 +824,7 @@ public static void reSyncSPVChain(Preferences preferences) { .useShutDownButton() .actionButtonText(Res.get("shared.shutDown")) .onAction(() -> { - preferences.setResyncSpvRequested(true); + BisqSetup.setResyncSpvSemaphore(true); UserThread.runAfter(BisqApp.getShutDownHandler(), 100, TimeUnit.MILLISECONDS); }) .closeButtonText(Res.get("shared.cancel")) From 089e4769013169261521f8fa09613da2ab04788f Mon Sep 17 00:00:00 2001 From: jmacxx <47253594+jmacxx@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:13:10 -0500 Subject: [PATCH 3/4] fix NPE in portfolio view when market price n/a --- core/src/main/java/bisq/core/offer/TriggerPriceService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/bisq/core/offer/TriggerPriceService.java b/core/src/main/java/bisq/core/offer/TriggerPriceService.java index 3329843a384..99defe325b9 100644 --- a/core/src/main/java/bisq/core/offer/TriggerPriceService.java +++ b/core/src/main/java/bisq/core/offer/TriggerPriceService.java @@ -111,7 +111,7 @@ private void onPriceFeedChanged() { public static boolean wasTriggered(MarketPrice marketPrice, OpenOffer openOffer) { Price price = openOffer.getOffer().getPrice(); - if (price == null) { + if (price == null || marketPrice == null) { return false; } From c2834cebd6ae116fb03ffb6a9050ea6bdb97ec74 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 1 Apr 2021 15:45:10 +0200 Subject: [PATCH 4/4] Revert to SNAPSHOT version --- build.gradle | 2 +- desktop/package/linux/Dockerfile | 2 +- desktop/package/linux/package.sh | 2 +- desktop/package/linux/release.sh | 2 +- desktop/package/macosx/create_app.sh | 2 +- desktop/package/macosx/finalize.sh | 2 +- desktop/package/macosx/insert_snapshot_version.sh | 2 +- desktop/package/windows/package.bat | 2 +- desktop/package/windows/release.bat | 2 +- relay/src/main/resources/version.txt | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index b2d6a1a4994..c253424bb64 100644 --- a/build.gradle +++ b/build.gradle @@ -383,7 +383,7 @@ configure(project(':desktop')) { apply plugin: 'witness' apply from: '../gradle/witness/gradle-witness.gradle' - version = '1.6.2' + version = '1.6.2-SNAPSHOT' mainClassName = 'bisq.desktop.app.BisqAppMain' diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile index 7ced8cd927f..14e02228fba 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.6.2 +ENV version 1.6.2-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/linux/package.sh b/desktop/package/linux/package.sh index 508fae06ae5..16160408161 100755 --- a/desktop/package/linux/package.sh +++ b/desktop/package/linux/package.sh @@ -6,7 +6,7 @@ # - Update version below # - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory -version=1.6.2 +version=1.6.2-SNAPSHOT version_base=$(echo $version | awk -F'[_-]' '{print $1}') if [ ! -f "$JAVA_HOME/bin/javapackager" ]; then if [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then diff --git a/desktop/package/linux/release.sh b/desktop/package/linux/release.sh index 0f0cd7cfa9f..5e88a684050 100755 --- a/desktop/package/linux/release.sh +++ b/desktop/package/linux/release.sh @@ -4,7 +4,7 @@ # Prior to running this script: # - Update version below -version=1.6.2 +version=1.6.2-SNAPSHOT base_dir=$( cd "$(dirname "$0")" ; pwd -P )/../../.. package_dir=$base_dir/desktop/package release_dir=$base_dir/desktop/release/$version diff --git a/desktop/package/macosx/create_app.sh b/desktop/package/macosx/create_app.sh index d4408e5cf79..2c7cd74f7b3 100755 --- a/desktop/package/macosx/create_app.sh +++ b/desktop/package/macosx/create_app.sh @@ -6,7 +6,7 @@ mkdir -p deploy set -e -version="1.6.2" +version="1.6.2-SNAPSHOT" cd .. ./gradlew :desktop:build -x test shadowJar diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh index 55b441b6f0b..822b2ea71e2 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -2,7 +2,7 @@ cd ../../ -version="1.6.2" +version="1.6.2-SNAPSHOT" target_dir="releases/$version" diff --git a/desktop/package/macosx/insert_snapshot_version.sh b/desktop/package/macosx/insert_snapshot_version.sh index b57a36465cf..1147e7c997e 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.6.1 +version=1.6.2 find . -type f \( -name "finalize.sh" \ -o -name "create_app.sh" \ diff --git a/desktop/package/windows/package.bat b/desktop/package/windows/package.bat index 4131336de60..f445114cf46 100644 --- a/desktop/package/windows/package.bat +++ b/desktop/package/windows/package.bat @@ -11,7 +11,7 @@ @echo off -set version=1.6.2 +set version=1.6.2-SNAPSHOT if not exist "%JAVA_HOME%\bin\javapackager.exe" ( if not exist "%ProgramFiles%\Java\jdk-10.0.2" ( echo Javapackager not found. Update JAVA_HOME variable to point to OracleJDK. diff --git a/desktop/package/windows/release.bat b/desktop/package/windows/release.bat index 6a27f58813d..1d8d8808420 100644 --- a/desktop/package/windows/release.bat +++ b/desktop/package/windows/release.bat @@ -6,7 +6,7 @@ @echo off -set version=1.6.2 +set version=1.6.2-SNAPSHOT set release_dir=%~dp0..\..\..\releases\%version% set package_dir=%~dp0.. diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt index fdd3be6df54..fd1280b97c7 100644 --- a/relay/src/main/resources/version.txt +++ b/relay/src/main/resources/version.txt @@ -1 +1 @@ -1.6.2 +1.6.2-SNAPSHOT