Skip to content

Commit b809d0c

Browse files
committed
Merge remote-tracking branch 'benma/update'
2 parents 84d3fb8 + c547e9a commit b809d0c

File tree

9 files changed

+35
-33
lines changed

9 files changed

+35
-33
lines changed

backend/devices/bitbox02bootloader/assets.go

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/devices/bitbox02bootloader/firmware.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ type firmwareInfo struct {
3030

3131
var bundledFirmwares = map[bitbox02common.Product]firmwareInfo{
3232
bitbox02common.ProductBitBox02Multi: {
33-
version: semver.NewSemVer(4, 2, 1),
33+
version: semver.NewSemVer(5, 0, 0),
3434
filename: "assets/firmware.v%s.signed.bin",
3535
},
3636
bitbox02common.ProductBitBox02BTCOnly: {
37-
version: semver.NewSemVer(4, 2, 2),
37+
version: semver.NewSemVer(5, 0, 0),
3838
filename: "assets/firmware-btc.v%s.signed.bin",
3939
},
4040
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/coreos/bbolt v1.3.0
1616
github.com/davecgh/go-spew v1.1.1
1717
github.com/deckarep/golang-set v1.7.1 // indirect
18-
github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191213100502-57e596d7e659
18+
github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191216115012-99ad594c335a
1919
github.com/edsrzf/mmap-go v1.0.0 // indirect
2020
github.com/elastic/gosigar v0.10.5 // indirect
2121
github.com/ethereum/go-ethereum v1.9.5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
4747
github.com/deckarep/golang-set v1.7.1 h1:SCQV0S6gTtp6itiFrTqI+pfmJ4LN85S1YzhDf9rTHJQ=
4848
github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ=
4949
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
50-
github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191213100502-57e596d7e659 h1:HvOZA54JlH+ZKar+ttxJv24ft8rhudWi/VHHNLWNLBY=
51-
github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191213100502-57e596d7e659/go.mod h1:yMwrh5lnSF+UDy+PLdCySxWHZubd2Tk/t2EQ1++4mgA=
50+
github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191216115012-99ad594c335a h1:GFQ0PNAqZVK3VQ/+PWgQmNaSeWKVkLUOKYcNvzq1d+I=
51+
github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191216115012-99ad594c335a/go.mod h1:yMwrh5lnSF+UDy+PLdCySxWHZubd2Tk/t2EQ1++4mgA=
5252
github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
5353
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
5454
github.com/elastic/gosigar v0.10.5 h1:GzPQ+78RaAb4J63unidA/JavQRKrB6s8IOzN6Ib59jo=

vendor/github.com/digitalbitbox/bitbox02-api-go/api/firmware/device.go

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/digitalbitbox/bitbox02-api-go/api/firmware/system.go

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ github.com/coreos/bbolt
3535
github.com/davecgh/go-spew/spew
3636
# github.com/deckarep/golang-set v1.7.1
3737
github.com/deckarep/golang-set
38-
# github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191213100502-57e596d7e659
38+
# github.com/digitalbitbox/bitbox02-api-go v0.0.0-20191216115012-99ad594c335a
3939
github.com/digitalbitbox/bitbox02-api-go/api/bootloader
4040
github.com/digitalbitbox/bitbox02-api-go/api/common
4141
github.com/digitalbitbox/bitbox02-api-go/api/firmware

0 commit comments

Comments
 (0)