Merge branch 'update'

BitBoxSwiss · Oct 1, 2019 · 8a0ef51 · 8a0ef51
2 parents d663ef5 + 069aafc
commit 8a0ef51
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 21 deletions.
diff --git a/backend/devices/bitbox02/device.go b/backend/devices/bitbox02/device.go
@@ -46,8 +46,9 @@ import (
 //go:generate protoc --go_out=import_path=messages:. messages/hww.proto
 
 var (
-	lowestSupportedFirmwareVersion    = semver.NewSemVer(4, 1, 0)
-	lowestNonSupportedFirmwareVersion = semver.NewSemVer(5, 0, 0)
+	lowestSupportedFirmwareVersion        = semver.NewSemVer(4, 1, 0)
+	lowestSupportedFirmwareVersionBTCOnly = semver.NewSemVer(4, 1, 1)
+	lowestNonSupportedFirmwareVersion     = semver.NewSemVer(5, 0, 0)
 )
 
 // ProductName is the name of the BitBox02 product.
@@ -625,7 +626,16 @@ func (device *Device) ChannelHashVerify(ok bool) {
 	if ok {
 		// No critical error, we will just need to re-confirm the pairing next time.
 		_ = device.configAddDeviceStaticPubkey(device.deviceNoiseStaticPubkey)
-		if !device.version.AtLeast(lowestSupportedFirmwareVersion) {
+		requireUpgrade := false
+		switch device.edition {
+		case bitbox02common.EditionStandard:
+			requireUpgrade = !device.version.AtLeast(lowestSupportedFirmwareVersion)
+		case bitbox02common.EditionBTCOnly:
+			requireUpgrade = !device.version.AtLeast(lowestSupportedFirmwareVersionBTCOnly)
+		default:
+			device.log.Errorf("unrecognized edition: %s", device.edition)
+		}
+		if requireUpgrade {
 			device.changeStatus(StatusRequireFirmwareUpgrade)
 			return
 		}

diff --git a/backend/devices/bitbox02bootloader/assets.go b/backend/devices/bitbox02bootloader/assets.go
diff --git a/...der/assets/firmware-btc.v4.1.0.signed.bin → ...der/assets/firmware-btc.v4.1.1.signed.bin b/...der/assets/firmware-btc.v4.1.0.signed.bin → ...der/assets/firmware-btc.v4.1.1.signed.bin
diff --git a/backend/devices/bitbox02bootloader/firmware.go b/backend/devices/bitbox02bootloader/firmware.go
@@ -34,7 +34,7 @@ var bundledFirmwares = map[bitbox02common.Edition]firmwareInfo{
 		filename: "assets/firmware.v%s.signed.bin",
 	},
 	bitbox02common.EditionBTCOnly: {
-		version:  semver.NewSemVer(4, 1, 0),
+		version:  semver.NewSemVer(4, 1, 1),
 		filename: "assets/firmware-btc.v%s.signed.bin",
 	},
 }

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, 13, 0)
+	Version = semver.NewSemVer(4, 13, 1)
 )
 
 // UpdateFile is retrieved from the server.

diff --git a/frontends/qt/Makefile b/frontends/qt/Makefile
@@ -35,8 +35,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.13.0 -C ../tmp-deb/
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.13.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.13.1 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.13.1 -C ../tmp-deb/
 	# create AppImage
 	cd build/linux-tmp && /opt/linuxdeployqt-6-x86_64.AppImage BitBox -appimage
 	mv build/linux-tmp/BitBox_App-*-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.13.0</string>
+	<string>4.13.1</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>4.13.0</string>
+	<string>4.13.1</string>
 
 	<key>CFBundleSignature</key>
 	<string>????</string>

diff --git a/frontends/qt/setup.nsi b/frontends/qt/setup.nsi
@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 4.13.0.0
+!define VERSION 4.13.1.0
 !define COMPANY "Shift Cryptosecurity AG"
 !define URL https://github.com/digitalbitbox/bitbox-wallet-app/releases/
 !define BINDIR "build\windows"