Merge remote-tracking branch 'benma/update'

BitBoxSwiss · Dec 16, 2019 · b809d0c · b809d0c
2 parents 84d3fb8 + c547e9a
commit b809d0c
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 33 deletions.
diff --git a/backend/devices/bitbox02bootloader/assets.go b/backend/devices/bitbox02bootloader/assets.go
diff --git a/...der/assets/firmware-btc.v4.2.2.signed.bin → ...der/assets/firmware-btc.v5.0.0.signed.bin b/...der/assets/firmware-btc.v4.2.2.signed.bin → ...der/assets/firmware-btc.v5.0.0.signed.bin
diff --git a/...tloader/assets/firmware.v4.2.1.signed.bin → ...tloader/assets/firmware.v5.0.0.signed.bin b/...tloader/assets/firmware.v4.2.1.signed.bin → ...tloader/assets/firmware.v5.0.0.signed.bin
diff --git a/backend/devices/bitbox02bootloader/firmware.go b/backend/devices/bitbox02bootloader/firmware.go
@@ -30,11 +30,11 @@ type firmwareInfo struct {
 
 var bundledFirmwares = map[bitbox02common.Product]firmwareInfo{
 	bitbox02common.ProductBitBox02Multi: {
-		version:  semver.NewSemVer(4, 2, 1),
+		version:  semver.NewSemVer(5, 0, 0),
 		filename: "assets/firmware.v%s.signed.bin",
 	},
 	bitbox02common.ProductBitBox02BTCOnly: {
-		version:  semver.NewSemVer(4, 2, 2),
+		version:  semver.NewSemVer(5, 0, 0),
 		filename: "assets/firmware-btc.v%s.signed.bin",
 	},
 }

diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/coreos/bbolt v1.3.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/deckarep/golang-set v1.7.1 // indirect
-	github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191213100502-57e596d7e659
+	github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191216115012-99ad594c335a
 	github.com/edsrzf/mmap-go v1.0.0 // indirect
 	github.com/elastic/gosigar v0.10.5 // indirect
 	github.com/ethereum/go-ethereum v1.9.5

diff --git a/go.sum b/go.sum
@@ -47,8 +47,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/deckarep/golang-set v1.7.1 h1:SCQV0S6gTtp6itiFrTqI+pfmJ4LN85S1YzhDf9rTHJQ=
 github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191213100502-57e596d7e659 h1:HvOZA54JlH+ZKar+ttxJv24ft8rhudWi/VHHNLWNLBY=
-github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191213100502-57e596d7e659/go.mod h1:yMwrh5lnSF+UDy+PLdCySxWHZubd2Tk/t2EQ1++4mgA=
+github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191216115012-99ad594c335a h1:GFQ0PNAqZVK3VQ/+PWgQmNaSeWKVkLUOKYcNvzq1d+I=
+github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191216115012-99ad594c335a/go.mod h1:yMwrh5lnSF+UDy+PLdCySxWHZubd2Tk/t2EQ1++4mgA=
 github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/elastic/gosigar v0.10.5 h1:GzPQ+78RaAb4J63unidA/JavQRKrB6s8IOzN6Ib59jo=

diff --git a/vendor/github.com/digitalbitbox/bitbox02-api-go/api/firmware/device.go b/vendor/github.com/digitalbitbox/bitbox02-api-go/api/firmware/device.go
diff --git a/vendor/github.com/digitalbitbox/bitbox02-api-go/api/firmware/system.go b/vendor/github.com/digitalbitbox/bitbox02-api-go/api/firmware/system.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -35,7 +35,7 @@ github.com/coreos/bbolt
 github.com/davecgh/go-spew/spew
 # github.com/deckarep/golang-set v1.7.1
 github.com/deckarep/golang-set
-# github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191213100502-57e596d7e659
+# github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191216115012-99ad594c335a
 github.com/digitalbitbox/bitbox02-api-go/api/bootloader
 github.com/digitalbitbox/bitbox02-api-go/api/common
 github.com/digitalbitbox/bitbox02-api-go/api/firmware