Merge branch 'branch-v4.33.0'

benma · benma · commit 1c221c39017d · 2022-05-13T14:01:08.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## 4.33.0
+- Bundle BitBox02 firmware version v9.11.0
+- Improve visual loading of the portfolio view
+
 ## 4.32.1
 - Fix Moonpay not loading on Android
 
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-btc.sha256 b/backend/devices/bitbox02bootloader/assets/firmware-btc.sha256
@@ -1 +1 @@
-03b4f1c845fbb221109684163d1bd6d3b558b446e283d3217867f76074ef8745
+dc43221f5ee14e1d8a4139fdf690e0162ace770c679b02d88e149d19533c97c6
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-btc.v9.10.0.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware-btc.v9.10.0.signed.bin.gz
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-btc.v9.11.0.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware-btc.v9.11.0.signed.bin.gz
diff --git a/backend/devices/bitbox02bootloader/assets/firmware.sha256 b/backend/devices/bitbox02bootloader/assets/firmware.sha256
@@ -1 +1 @@
-584a1321d355bc804b7cbdaa65d3ee757800d3d4ffc0d5a86df3f45ae2914634
+ce5cd0addf571b0c5d745fb8127c27f82f78c1dffb6db0c8f035957c3dae2c48
diff --git a/backend/devices/bitbox02bootloader/assets/firmware.v9.10.0.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware.v9.10.0.signed.bin.gz
diff --git a/backend/devices/bitbox02bootloader/assets/firmware.v9.11.0.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware.v9.11.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.10.0.signed.bin.gz
+//go:embed assets/firmware-btc.v9.11.0.signed.bin.gz
 var firmwareBinaryBTCOnly []byte
-var firmwareVersionBTCOnly = semver.NewSemVer(9, 10, 0)
+var firmwareVersionBTCOnly = semver.NewSemVer(9, 11, 0)
 
-//go:embed assets/firmware.v9.10.0.signed.bin.gz
+//go:embed assets/firmware.v9.11.0.signed.bin.gz
 var firmwareBinaryMulti []byte
-var firmwareVersionMulti = semver.NewSemVer(9, 10, 0)
+var firmwareVersionMulti = semver.NewSemVer(9, 11, 0)
 
 type firmwareInfo struct {
 	version *semver.SemVer
diff --git a/backend/update.go b/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, 32, 1)
+	Version = semver.NewSemVer(4, 33, 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 30
-        versionCode 36
-        versionName "android-4.32.1"
+        versionCode 37
+        versionName "android-4.33.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.32.1 -C ../tmp-deb/
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.32.1 -C ../tmp-deb/
+	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/
 	# 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.32.1</string>
+	<string>4.33.0</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>4.32.1</string>
+	<string>4.33.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.32.1.0
+!define VERSION 4.33.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`		`-03b4f1c845fbb221109684163d1bd6d3b558b446e283d3217867f76074ef8745`
	`1`	`+dc43221f5ee14e1d8a4139fdf690e0162ace770c679b02d88e149d19533c97c6`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-584a1321d355bc804b7cbdaa65d3ee757800d3d4ffc0d5a86df3f45ae2914634`
	`1`	`+ce5cd0addf571b0c5d745fb8127c27f82f78c1dffb6db0c8f035957c3dae2c48`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ const updateFileURL = "https://shiftcrypto.ch/updates/desktop.json"`
`27`	`27`
`28`	`28`	`var (`
`29`	`29`	`// Version of the backend as displayed to the user.`
`30`		`- Version = semver.NewSemVer(4, 32, 1)`
	`30`	`+ Version = semver.NewSemVer(4, 33, 0)`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`// UpdateFile is retrieved from the server.`