Merge branch 'update'

Author: benma

backend/devices/bitbox/assets.go

@@ -46,7 +46,7 @@ import (
 )
 
 var (
-	lowestSupportedFirmwareVersion    = semver.NewSemVer(6, 0, 3)
+	lowestSupportedFirmwareVersion    = semver.NewSemVer(6, 1, 1)
 	lowestNonSupportedFirmwareVersion = semver.NewSemVer(7, 0, 0)
 
 	pinPolicyProd              = NewPasswordPolicy("^[[:print:]]{4,}$")

backend/devices/bitbox/assets/firmware.deterministic.6.1.0.signed.bin renamed to backend/devices/bitbox/assets/firmware.deterministic.6.1.1.signed.bin

@@ -22,7 +22,7 @@ import (
 
 //go:generate go-bindata -pkg $GOPACKAGE -o assets.go assets
 
-var bundledFirmwareVersion = semver.NewSemVer(6, 1, 0)
+var bundledFirmwareVersion = semver.NewSemVer(6, 1, 1)
 
 // BundledFirmwareVersion returns the version of the bundled firmware.
 func BundledFirmwareVersion() *semver.SemVer {

backend/devices/bitbox/device.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, 8, 0)
+	Version = semver.NewSemVer(4, 9, 0)
 )
 
 // UpdateFile is retrieved from the server.

backend/devices/bitbox/firmware.go

@@ -33,8 +33,8 @@ linux:
 	cp -aR resources/linux build/tmp-deb
 	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.8.0 -C ../tmp-deb/
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.8.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.9.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.9.0 -C ../tmp-deb/
 	# create AppImage
 	sed 's+/usr/share/pixmaps/bitbox.svg+default+' resources/linux/usr/share/applications/bitbox.desktop > build/linux-tmp/bitbox.desktop
 	cd build/linux-tmp && /opt/linuxdeployqt-5-x86_64.AppImage BitBox -appimage

backend/update.go

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

frontends/qt/Makefile

@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 4.3.0.0
+!define VERSION 4.9.0.0
 !define COMPANY "Shiftcrypto"
 !define URL https://https://github.com/digitalbitbox/bitbox-wallet-app/releases/download
 !define BINDIR "build\windows"