Merge branch 'update'

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
 ## [Unreleased]
+
+## 4.34.0
+- Bundle BitBox02 firmware version v9.12.0
 - The Windows installer now asks the user to close a running instance of the BitBoxApp instead of forcefully stopping it
 - Ethereum: reduce Etherscan polling interval from one minute to five minutes
 

backend/devices/bitbox02bootloader/assets/firmware-btc.sha256

@@ -1 +1 @@
-dc43221f5ee14e1d8a4139fdf690e0162ace770c679b02d88e149d19533c97c6
+1d3cf66e1b2f91e369a434ee81700323896c7e8c51a79a20de13a3c90099cebd

backend/devices/bitbox02bootloader/assets/firmware.sha256

@@ -1 +1 @@
-ce5cd0addf571b0c5d745fb8127c27f82f78c1dffb6db0c8f035957c3dae2c48
+8076ea93b43ef0b879aa268b7a7baf65025da453ddcdd0b92abf77376b2ee08b

backend/devices/bitbox02bootloader/firmware.go

@@ -25,13 +25,13 @@ import (
 	"github.com/digitalbitbox/bitbox02-api-go/util/semver"
 )
 
-//go:embed assets/firmware-btc.v9.11.0.signed.bin.gz
+//go:embed assets/firmware-btc.v9.12.0.signed.bin.gz
 var firmwareBinaryBTCOnly []byte
-var firmwareVersionBTCOnly = semver.NewSemVer(9, 11, 0)
+var firmwareVersionBTCOnly = semver.NewSemVer(9, 12, 0)
 
-//go:embed assets/firmware.v9.11.0.signed.bin.gz
+//go:embed assets/firmware.v9.12.0.signed.bin.gz
 var firmwareBinaryMulti []byte
-var firmwareVersionMulti = semver.NewSemVer(9, 11, 0)
+var firmwareVersionMulti = semver.NewSemVer(9, 12, 0)
 
 type firmwareInfo struct {
 	version *semver.SemVer

backend/update.go

@@ -27,7 +27,7 @@ const updateFileURL = "https://shiftcrypto.ch/updates/desktop.json"
 
 var (
 	// Version of the backend as displayed to the user.
-	Version = semver.NewSemVer(4, 33, 0)
+	Version = semver.NewSemVer(4, 34, 0)
 )
 
 // UpdateFile is retrieved from the server.

frontends/android/BitBoxApp/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "ch.shiftcrypto.bitboxapp"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 37
-        versionName "android-4.33.0"
+        versionCode 38
+        versionName "android-4.34.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

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.33.0 -C ../tmp-deb/
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.33.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.34.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.34.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/

frontends/qt/resources/MacOS/Info.plist

@@ -21,10 +21,10 @@
 	<string>APPL</string>
 
 	<key>CFBundleVersion</key>
-	<string>4.33.0</string>
+	<string>4.34.0</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>4.33.0</string>
+	<string>4.34.0</string>
 
 	<key>CFBundleSignature</key>
 	<string>????</string>

frontends/qt/setup.nsi

@@ -22,7 +22,7 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 4.33.0.0
+!define VERSION 4.34.0.0
 !define COMPANY "Shift Crypto AG"
 !define URL https://github.com/digitalbitbox/bitbox-wallet-app/releases/
 !define BINDIR "build\windows"