Merge branch 'update'

BitBoxSwiss · Jun 28, 2019 · f28c19d · f28c19d
2 parents 674e833 + ddf4571
commit f28c19d
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 30 deletions.
diff --git a/backend/devices/bitbox/assets.go b/backend/devices/bitbox/assets.go
diff --git a/...s/firmware.deterministic.6.1.1.signed.bin → ...s/firmware.deterministic.7.0.0.signed.bin b/...s/firmware.deterministic.6.1.1.signed.bin → ...s/firmware.deterministic.7.0.0.signed.bin
diff --git a/backend/devices/bitbox/device.go b/backend/devices/bitbox/device.go
@@ -47,7 +47,7 @@ import (
 
 var (
 	lowestSupportedFirmwareVersion    = semver.NewSemVer(6, 1, 1)
-	lowestNonSupportedFirmwareVersion = semver.NewSemVer(7, 0, 0)
+	lowestNonSupportedFirmwareVersion = semver.NewSemVer(8, 0, 0)
 
 	pinPolicyProd              = NewPasswordPolicy("^[[:print:]]{4,}$")
 	pinPolicyTest              = NewPasswordPolicy("^[[:print:]]{4,}$")

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

diff --git a/backend/devices/bitbox02/device.go b/backend/devices/bitbox02/device.go
@@ -149,6 +149,8 @@ func (device *Device) Init(testing bool) {
 			panic(err)
 		}
 		device.attestation = attestation
+		device.log.Infof("attestation check result: %v", attestation)
+
 		go func() {
 			_, err := device.queryRaw([]byte(opUnlock))
 			if err != nil {
@@ -157,6 +159,8 @@ func (device *Device) Init(testing bool) {
 			device.pair()
 		}()
 	} else {
+		// skip warning for v1.0.0, where attestation was not supported.
+		device.attestation = true
 		device.pair()
 	}
 }

diff --git a/backend/devices/bitbox02bootloader/assets.go b/backend/devices/bitbox02bootloader/assets.go
diff --git a/...tloader/assets/firmware.v1.0.0.signed.bin → ...tloader/assets/firmware.v2.0.0.signed.bin b/...tloader/assets/firmware.v1.0.0.signed.bin → ...tloader/assets/firmware.v2.0.0.signed.bin
diff --git a/backend/devices/bitbox02bootloader/firmware.go b/backend/devices/bitbox02bootloader/firmware.go
@@ -22,7 +22,7 @@ import (
 
 //go:generate go-bindata -pkg $GOPACKAGE -o assets.go assets
 
-var bundledFirmwareVersion = semver.NewSemVer(1, 0, 0)
+var bundledFirmwareVersion = semver.NewSemVer(2, 0, 0)
 
 // BundledFirmwareVersion returns the version of the bundled firmware.
 func BundledFirmwareVersion() *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, 9, 0)
+	Version = semver.NewSemVer(4, 10, 0)
 )
 
 // UpdateFile is retrieved from the server.

diff --git a/frontends/qt/Makefile b/frontends/qt/Makefile
@@ -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.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/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.10.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.10.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

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.9.0</string>
+	<string>4.10.0</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>4.9.0</string>
+	<string>4.10.0</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.9.0.0
+!define VERSION 4.10.0.0
 !define COMPANY "Shiftcrypto"
 !define URL https://https://github.com/digitalbitbox/bitbox-wallet-app/releases/download
 !define BINDIR "build\windows"

diff --git a/frontends/web/src/locales/en/app.json b/frontends/web/src/locales/en/app.json
@@ -166,7 +166,7 @@
       "confirmButton": "Confirm & Continue",
       "failed": "Unconfirmed pairing. Please replug your BitBox02.",
       "paired": "You have confirmed on your device that the code matches. If this is correct, you can continue by clicking the button below.",
-      "title": "Verify your BitBox",
+      "title": "Verify Pairing Code",
       "unpaired": "A new BitBox02 has been detected. Please verify that the following code matches what is shown on your device. If the code matches, touch underneath the check mark on your BitBox02 and then click the button below to continue."
     },
     "success": {