Merge 1.9.16

Signed-off-by: HenrikJannsen <[email protected]>
HenrikJannsen · Jun 17, 2024 · eac53cd · eac53cd
1 parent f5a14ae
commit eac53cd
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 15 deletions.
diff --git a/build-logic/packaging/src/main/kotlin/bisq/gradle/packaging/PackagingPlugin.kt b/build-logic/packaging/src/main/kotlin/bisq/gradle/packaging/PackagingPlugin.kt
@@ -22,7 +22,7 @@ import javax.inject.Inject
 class PackagingPlugin @Inject constructor(private val javaToolchainService: JavaToolchainService) : Plugin<Project> {
 
     companion object {
-        const val APP_VERSION = "1.9.15"
+        const val APP_VERSION = "1.9.16"
         const val OUTPUT_DIR_PATH = "packaging/jpackage/packages"
     }
 

diff --git 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.15";
+    public static final String VERSION = "1.9.16";
 
     /**
      * Holds a list of the tagged resource files for optimizing the getData requests.
@@ -45,7 +45,7 @@ public class Version {
      */
     public static final List<String> HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2",
             "1.5.5", "1.5.7", "1.6.0", "1.6.3", "1.6.5", "1.7.2", "1.7.4", "1.8.0", "1.8.1", "1.8.3", "1.9.0", "1.9.3",
-            "1.9.5", "1.9.6", "1.9.7", "1.9.10", "1.9.11", "1.9.13", "1.9.15");
+            "1.9.5", "1.9.6", "1.9.7", "1.9.10", "1.9.11", "1.9.13", "1.9.15", "1.9.16");
 
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);

diff --git a/core/src/main/java/bisq/core/provider/ProvidersRepository.java b/core/src/main/java/bisq/core/provider/ProvidersRepository.java
@@ -36,7 +36,6 @@
 @Slf4j
 public class ProvidersRepository {
     public static final List<String> DEFAULT_NODES = Arrays.asList(
-            "http://emzypricpidesmyqg2hc6dkwitqzaxrqnpkdg3ae2wef5znncu2ambqd.onion/", // @emzy
             "http://devinpndvdwll4wiqcyq5e7itezmarg7rzicrvf6brzkwxdm374kmmyd.onion/", // @devinbileck
             "http://ro7nv73awqs3ga2qtqeqawrjpbxwarsazznszvr6whv7tes5ehffopid.onion/", // @alexej996
             "http://runbtcpn7gmbj5rgqeyfyvepqokrijem6rbw7o5wgqbguimuoxrmcdyd.onion"   // @runbtc

diff --git a/core/src/main/java/bisq/core/user/Preferences.java b/core/src/main/java/bisq/core/user/Preferences.java
@@ -125,7 +125,6 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid
             "xmrblocks.bisq.services" // @devinbileck
     ));
     private static final ArrayList<String> XMR_TX_PROOF_SERVICES = new ArrayList<>(Arrays.asList(
-            "monero3bec7m26vx6si6qo7q7imlaoz45ot5m2b5z2ppgoooo6jx2rqd.onion", // @emzy
             "devinxmrwu4jrfq2zmq5kqjpxb44hx7i7didebkwrtvmvygj4uuop2ad.onion", // @devinbileck
             "xmrexplrthytnunr4jasr3vnjc6jo5idsyxzv74a7ep7dy7lwcv2eoyd.onion"  // @runbtc
     ));

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
-411
+418
 AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv
 AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5
 AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G
@@ -412,3 +412,10 @@ YkxaPIduPm//2cgAAAyNAADg/z+C96rPYPrDhzsL6t5h0HAWOQkK5fR4AAAAAAAAAAAAAKy8GzOBxnGy
 ZFAXlFh+9HJeUEH5AAyU4ADgVC/JTquIfmwNfcyMd6yJfZn4mJeYFltZAQAAAAAAAAAAABqlNemkv33MMX8UZcZ6udcypBFdBDJoiX/CsblUTLbfvKGYZWnYAxcBxkrB
 ZlxZ6xatwMsF2360AAycwAAAsyj/DrTg1HcYUAtyxj3s8gwy+UXktbFqAgAAAAAAAAAAAOFJunHQU756ONKM0KqDjJ4F4R3Njk6+j8GGvjDrBPwJg9mrZVoABBcOKDhd
 aFQyVBb0KxU3lxNgAAykoAAgeS/AdPjCCyHuGA0lB99vR9plhVYhhzVoAgAAAAAAAAAAAHER9quKvINhreHBJEeRIHoDcWUI4r97bXHz5wMiLM9yTg29ZV26AxdsyO/i
+anD+cPKHMzDHUp2wAAysgAAAwCCyy2nMEVAIdYqI7LO1AIz9y5qviDNbAAAAAAAAAAAAAGPi1kuFqNmbCw1/+I7As8QdXQJn3wlCatfsV1SQWcDPriLOZbFxAxdYTyWU
+bLpVSFE4iaADC9e0AAy0YABg2C/1Xm3RJPXfMwBNHjSIm0e50Tg4yCsOAQAAAAAAAAAAANvQ+3JvgS9fg7D9elqPzpk3+fBfFy9Yzfag+TF8zgkYMSXhZRKMAxd0UcBC
+bvKxcFPlO9LfFGJ8AAy8QAAAGCKNJj/0Bw4v2zG2VHBOmfhQpPMXYhVQAwAAAAAAAAAAAPeczRFECp04OxQ47mBpL8e3ikuIAPr27GHsX8N6B4OH+ZjyZVlaAxdXmUhL
+cUv1Ah9n1D9sQjjAAAzEIADgACALa5JleFtHAXpjg5ApolORZacJR9HBAAAAAAAAAAAAAKVvKwUS9GTsuMZhooDBTe8ViQY+ZNqJ9G7wRAp/0a36hz0FZtNiAxePFesU
+c59bFbN1fBOvWxprAAzMAAAAgS4o4K496hMYDVglnl4IDM+FA0OJueo6AgAAAAAAAAAAABrZXYHpu27r4maMCCauFM3isZ7J1dypvDQ2nx21Zq0l7QEXZhlCAxdfTDiw
+dgocDey9X2lTZXieAAzT4ATgACBL6AGEzATXd9qtEYlyS8MqlJ4EYB6/AgAAAAAAAAAAAHjOihGV0AtYxTAEbsNphoqkzIVr8TnvJjYZLO2IbtQSiBwpZtsxAxcrHR8G
+eIEgr9B8v2kX1UCMAAzbwADg/ydMEgOlsLcfV+y5Uxo0he0DOch8t0ITAgAAAAAAAAAAAGKxciADvDFZY59g5UDXn7YqOTmm3w85j+eXZgj3h3DZvqw8ZppiAxejboLM
diff --git a/desktop/package/macosx/Info.plist b/desktop/package/macosx/Info.plist
@@ -5,10 +5,10 @@
         <!-- See: https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -->
 
         <key>CFBundleVersion</key>
-        <string>1.9.15</string>
+        <string>1.9.16</string>
 
         <key>CFBundleShortVersionString</key>
-        <string>1.9.15</string>
+        <string>1.9.16</string>
 
         <key>CFBundleExecutable</key>
         <string>Bisq</string>

diff --git a/desktop/package/macosx/copy_dbs.sh b/desktop/package/macosx/copy_dbs.sh
@@ -2,7 +2,7 @@
 
 cd $(dirname $0)/../../../
 
-version="1.9.15"
+version="1.9.16"
 
 # 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
@@ -2,7 +2,7 @@
 
 cd ../../
 
-version="1.9.15-SNAPSHOT"
+version="1.9.16-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.9.15
+version=1.9.16
 
 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
@@ -2,8 +2,8 @@
 
 cd $(dirname $0)/../../../.
 
-oldVersion=1.9.14
-newVersion=1.9.15
+oldVersion=1.9.15
+newVersion=1.9.16
 
 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
@@ -1 +1 @@
-1.9.15-SNAPSHOT
+1.9.16-SNAPSHOT
diff --git 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.15";
+    private static final String VERSION = "1.9.16";
     private SeedNode seedNode;
     private Timer checkConnectionLossTime;