Merge branch 'firmware'

Author: benma

backend/devices/bitbox/assets.go

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

backend/devices/bitbox/assets/firmware.deterministic.6.0.1.signed.bin renamed to backend/devices/bitbox/assets/firmware.deterministic.6.0.2.signed.bin

@@ -28,18 +28,13 @@ import (
 	"github.com/digitalbitbox/bitbox-wallet-app/backend/devices/device"
 	"github.com/digitalbitbox/bitbox-wallet-app/util/jsonp"
 	"github.com/digitalbitbox/bitbox-wallet-app/util/logging"
-	"github.com/digitalbitbox/bitbox-wallet-app/util/semver"
 	"github.com/digitalbitbox/bitbox-wallet-app/util/test"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
-var (
-	firmVer400 = semver.NewSemVer(6, 0, 1)
-)
-
 const (
 	deviceID         = "device id"
 	pin              = "4321"
@@ -68,7 +63,8 @@ func (s *dbbTestSuite) SetupTest() {
 		s.mockCommClosed = true
 	})
 	s.mockCommClosed = false
-	dbb, err := NewDevice(deviceID, false /* bootloader */, firmVer400, s.configDir, s.mockCommunication)
+	dbb, err := NewDevice(deviceID, false, /* bootloader */
+		lowestSupportedFirmwareVersion, s.configDir, s.mockCommunication)
 	dbb.Init(true)
 	require.NoError(s.T(), err)
 	s.dbb = dbb
@@ -397,7 +393,8 @@ func TestNewDeviceReadsChannel(t *testing.T) {
 	comm.On("SendPlain", jsonArgumentMatcher(map[string]interface{}{"ping": ""})).
 		Return(map[string]interface{}{"ping": ""}, nil)
 	comm.On("Close")
-	dbb, err := NewDevice("test-device-id", false /* bootloader */, firmVer400, configDir, comm)
+	dbb, err := NewDevice("test-device-id", false, /* bootloader */
+		lowestSupportedFirmwareVersion, configDir, comm)
 	if err != nil {
 		t.Fatal(err)
 	}

backend/devices/bitbox/device.go

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