Merge branch 'update'

benma · benma · commit 64bd33be50b4 · 2023-08-21T11:19:28.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
 ## Unreleased
+-
+
+## 4.39.0
+- Bundle BitBox02 firmware version v9.15.0
 - Display the wallet root fingerprint in the account info and device settings
 
 ## 4.38.0
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-btc.sha256 b/backend/devices/bitbox02bootloader/assets/firmware-btc.sha256
@@ -1 +1 @@
-e1dd653924f3201e112d66a41349fc873c4d7495b0ac46f71c21ccba6d54cb4b
+b2dfdc5413678f663639a34a5082f93ec253fd405313baca93291cab0a91233c
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-btc.v9.14.1.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware-btc.v9.14.1.signed.bin.gz
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-btc.v9.15.0.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware-btc.v9.15.0.signed.bin.gz
diff --git a/backend/devices/bitbox02bootloader/assets/firmware.sha256 b/backend/devices/bitbox02bootloader/assets/firmware.sha256
@@ -1 +1 @@
-a3fc15835419956ef7da7a6c9b3bec9e4430885acb40f97b4c7e140110d41f05
+b1f75a7d5f92c522d5241ddc029ef6589baffc9d1212e1e3d2b037285760ecf1
diff --git a/backend/devices/bitbox02bootloader/assets/firmware.v9.14.1.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware.v9.14.1.signed.bin.gz
diff --git a/backend/devices/bitbox02bootloader/assets/firmware.v9.15.0.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware.v9.15.0.signed.bin.gz
diff --git a/backend/devices/bitbox02bootloader/firmware.go b/backend/devices/bitbox02bootloader/firmware.go
@@ -25,13 +25,13 @@ import (
 	"github.com/digitalbitbox/bitbox02-api-go/util/semver"
 )
 
-//go:embed assets/firmware-btc.v9.14.1.signed.bin.gz
+//go:embed assets/firmware-btc.v9.15.0.signed.bin.gz
 var firmwareBinaryBTCOnly []byte
-var firmwareVersionBTCOnly = semver.NewSemVer(9, 14, 1)
+var firmwareVersionBTCOnly = semver.NewSemVer(9, 15, 0)
 
-//go:embed assets/firmware.v9.14.1.signed.bin.gz
+//go:embed assets/firmware.v9.15.0.signed.bin.gz
 var firmwareBinaryMulti []byte
-var firmwareVersionMulti = semver.NewSemVer(9, 14, 1)
+var firmwareVersionMulti = semver.NewSemVer(9, 15, 0)
 
 type firmwareInfo struct {
 	version *semver.SemVer
diff --git a/backend/update.go b/backend/update.go
@@ -27,7 +27,7 @@ const updateFileURL = "https://bitbox.swiss/updates/desktop.json"
 
 var (
 	// Version of the backend as displayed to the user.
-	Version = semver.NewSemVer(4, 38, 0)
+	Version = semver.NewSemVer(4, 39, 0)
 )
 
 // UpdateFile is retrieved from the server.
diff --git a/frontends/android/BitBoxApp/app/build.gradle b/frontends/android/BitBoxApp/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "ch.shiftcrypto.bitboxapp"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 44
-        versionName "android-4.38.0"
+        versionCode 45
+        versionName "android-4.39.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/frontends/qt/Makefile b/frontends/qt/Makefile
@@ -38,8 +38,8 @@ linux:
 	cp resources/linux/usr/share/icons/hicolor/128x128/apps/bitbox.png build/linux-tmp
 	mkdir build/tmp-deb/opt/
 	cp -aR build/linux-tmp build/tmp-deb/opt/bitbox
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.38.0 -C ../tmp-deb/
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.38.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.39.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.39.0 -C ../tmp-deb/
 	# create AppImage
 	cd build/linux-tmp && /opt/linuxdeployqt-7-x86_64.AppImage BitBox -appimage -unsupported-allow-new-glibc
 	mv build/linux-tmp/BitBoxApp-*-x86_64.AppImage build/linux/
diff --git a/frontends/qt/resources/MacOS/Info.plist b/frontends/qt/resources/MacOS/Info.plist
@@ -21,10 +21,10 @@
 	<string>APPL</string>
 
 	<key>CFBundleVersion</key>
-	<string>4.38.0</string>
+	<string>4.39.0</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>4.38.0</string>
+	<string>4.39.0</string>
 
 	<key>CFBundleSignature</key>
 	<string>????</string>
diff --git a/frontends/qt/setup.nsi b/frontends/qt/setup.nsi
@@ -22,7 +22,7 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 4.38.0.0
+!define VERSION 4.39.0.0
 !define COMPANY "Shift Crypto AG"
 !define URL https://github.com/digitalbitbox/bitbox-wallet-app/releases/
 !define BINDIR "build\windows"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-e1dd653924f3201e112d66a41349fc873c4d7495b0ac46f71c21ccba6d54cb4b`
	`1`	`+b2dfdc5413678f663639a34a5082f93ec253fd405313baca93291cab0a91233c`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-a3fc15835419956ef7da7a6c9b3bec9e4430885acb40f97b4c7e140110d41f05`
	`1`	`+b1f75a7d5f92c522d5241ddc029ef6589baffc9d1212e1e3d2b037285760ecf1`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ const updateFileURL = "https://bitbox.swiss/updates/desktop.json"`
`27`	`27`
`28`	`28`	`var (`
`29`	`29`	`// Version of the backend as displayed to the user.`
`30`		`- Version = semver.NewSemVer(4, 38, 0)`
	`30`	`+ Version = semver.NewSemVer(4, 39, 0)`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`// UpdateFile is retrieved from the server.`