diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java index 396c4aa2dd3..24f61ed2b83 100644 --- a/common/src/main/java/bisq/common/app/Version.java +++ b/common/src/main/java/bisq/common/app/Version.java @@ -36,7 +36,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.9.11"; + public static final String VERSION = "1.9.12"; /** * Holds a list of the tagged resource files for optimizing the getData requests. diff --git a/core/src/main/java/bisq/core/dao/burningman/accounting/storage/BurningManAccountingStoreService.java b/core/src/main/java/bisq/core/dao/burningman/accounting/storage/BurningManAccountingStoreService.java index d35f816c595..4923ddd9160 100644 --- a/core/src/main/java/bisq/core/dao/burningman/accounting/storage/BurningManAccountingStoreService.java +++ b/core/src/main/java/bisq/core/dao/burningman/accounting/storage/BurningManAccountingStoreService.java @@ -48,7 +48,7 @@ @Slf4j @Singleton public class BurningManAccountingStoreService extends StoreService { - private static final String FILE_NAME = "BurningManAccountingStore_v2"; + private static final String FILE_NAME = "BurningManAccountingStore_v3"; private volatile boolean removeAllBlocksCalled; @Inject @@ -67,6 +67,7 @@ protected void readFromResources(String postFix, Runnable completeHandler) { try { // Delete old BurningManAccountingStore file which was missing some data. FileUtil.deleteFileIfExists(Path.of(absolutePathOfStorageDir, "BurningManAccountingStore").toFile()); + FileUtil.deleteFileIfExists(Path.of(absolutePathOfStorageDir, "BurningManAccountingStore_v2").toFile()); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile index 1ab4a333292..1470ac32b4a 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.9.11 +ENV version 1.9.12-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/Info.plist b/desktop/package/macosx/Info.plist index 90d926732f4..b741deade05 100644 --- a/desktop/package/macosx/Info.plist +++ b/desktop/package/macosx/Info.plist @@ -5,10 +5,10 @@ CFBundleVersion - 1.9.11 + 1.9.12 CFBundleShortVersionString - 1.9.11 + 1.9.12 CFBundleExecutable Bisq diff --git a/desktop/package/macosx/copy_dbs.sh b/desktop/package/macosx/copy_dbs.sh index f1f8b6dfb1a..5bdee18e5fd 100755 --- a/desktop/package/macosx/copy_dbs.sh +++ b/desktop/package/macosx/copy_dbs.sh @@ -2,7 +2,7 @@ cd $(dirname $0)/../../../ -version="1.9.11" +version="1.9.12" # 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/finalize.sh b/desktop/package/macosx/finalize.sh index ca782f0e0c7..152852ddc03 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -2,7 +2,7 @@ cd ../../ -version="1.9.11" +version="1.9.12-SNAPSHOT" target_dir="releases/$version" diff --git a/desktop/package/macosx/insert_snapshot_version.sh b/desktop/package/macosx/insert_snapshot_version.sh index 2efe0c8441d..2f5417d1806 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.9.10 +version=1.9.12 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 4ea022eb039..f72686f009c 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.9.10 -newVersion=1.9.11 +oldVersion=1.9.11 +newVersion=1.9.12 find . -type f \( -name "finalize.sh" \ -o -name "create_app.sh" \ diff --git a/desktop/src/main/resources/version.txt b/desktop/src/main/resources/version.txt index 5e9287b8607..8b305228670 100644 --- a/desktop/src/main/resources/version.txt +++ b/desktop/src/main/resources/version.txt @@ -1 +1 @@ -1.9.11 +1.9.12-SNAPSHOT diff --git a/p2p/src/main/resources/BurningManAccountingStore_v2_BTC_MAINNET b/p2p/src/main/resources/BurningManAccountingStore_v3_BTC_MAINNET similarity index 98% rename from p2p/src/main/resources/BurningManAccountingStore_v2_BTC_MAINNET rename to p2p/src/main/resources/BurningManAccountingStore_v3_BTC_MAINNET index 201105ddc20..197381819e5 100644 Binary files a/p2p/src/main/resources/BurningManAccountingStore_v2_BTC_MAINNET and b/p2p/src/main/resources/BurningManAccountingStore_v3_BTC_MAINNET differ diff --git a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java index b31edbc495c..7762c0db740 100644 --- a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java +++ b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java @@ -50,7 +50,7 @@ @Slf4j public class SeedNodeMain extends ExecutableForAppWithP2p { private static final long CHECK_CONNECTION_LOSS_SEC = 30; - private static final String VERSION = "1.9.11"; + private static final String VERSION = "1.9.12"; private SeedNode seedNode; private Timer checkConnectionLossTime;