Skip to content

Commit c4abfa7

Browse files
benmabenma
committed
backend: update to v4.37.1 (hotfix)
Some users reported the app crashing when Litecoin is enabled with the the following error: > panic: readScript: script witness item is larger than the max allowed size [count 65973, max 11000] The limit in question was fixed by btcd a while ago, so we simply update btcd. It is unusual to have such large witness sizes, so there is a chance something else is going wrong that casuses the transaction to not deserialize correctly.
1 parent 4e5763c commit c4abfa7

File tree

14 files changed

+57
-33
lines changed

14 files changed

+57
-33
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## 4.37.1
4+
- Fix BitBoxApp crash when processing BTC/LTC transactions containing too large witness items
5+
36
## 4.37.0
47
- Bundle BitBox02 firmware version v9.14.0
58
- Enable auto HiDPI scaling to correctly manage scale factor on high density screens

‎backend/keystore/software/software.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func (keystore *Keystore) SignTransaction(
198198
}
199199

200200
if address.Configuration.ScriptType() == signing.ScriptTypeP2TR {
201-
prv = txscript.TweakTaprootPrivKey(prv, nil)
201+
prv = txscript.TweakTaprootPrivKey(*prv, nil)
202202
signatureHash, err := txscript.CalcTaprootSignatureHash(
203203
btcProposedTx.SigHashes, txscript.SigHashDefault, transaction,
204204
index, btcProposedTx.PreviousOutputs)

‎backend/update.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const updateFileURL = "https://shiftcrypto.ch/updates/desktop.json"
2727

2828
var (
2929
// Version of the backend as displayed to the user.
30-
Version = semver.NewSemVer(4, 37, 0)
30+
Version = semver.NewSemVer(4, 37, 1)
3131
)
3232

3333
// UpdateFile is retrieved from the server.

‎frontends/android/BitBoxApp/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "ch.shiftcrypto.bitboxapp"
88
minSdkVersion 21
99
targetSdkVersion 31
10-
versionCode 42
11-
versionName "android-4.37.0"
10+
versionCode 43
11+
versionName "android-4.37.1"
1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313
}
1414
buildTypes {

‎frontends/qt/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ linux:
3838
cp resources/linux/usr/share/icons/hicolor/128x128/apps/bitbox.png build/linux-tmp
3939
mkdir build/tmp-deb/opt/
4040
cp -aR build/linux-tmp build/tmp-deb/opt/bitbox
41-
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.37.0 -C ../tmp-deb/
42-
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.37.0 -C ../tmp-deb/
41+
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.37.1 -C ../tmp-deb/
42+
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.37.1 -C ../tmp-deb/
4343
# create AppImage
4444
cd build/linux-tmp && /opt/linuxdeployqt-7-x86_64.AppImage BitBox -appimage -unsupported-allow-new-glibc
4545
mv build/linux-tmp/BitBoxApp-*-x86_64.AppImage build/linux/

‎frontends/qt/resources/MacOS/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<string>APPL</string>
2222

2323
<key>CFBundleVersion</key>
24-
<string>4.37.0</string>
24+
<string>4.37.1</string>
2525

2626
<key>CFBundleShortVersionString</key>
27-
<string>4.37.0</string>
27+
<string>4.37.1</string>
2828

2929
<key>CFBundleSignature</key>
3030
<string>????</string>

‎frontends/qt/setup.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SetCompressor /SOLID lzma
2222

2323
# General Symbol Definitions
2424
!define REGKEY "SOFTWARE\$(^Name)"
25-
!define VERSION 4.37.0.0
25+
!define VERSION 4.37.1.0
2626
!define COMPANY "Shift Crypto AG"
2727
!define URL https://github.com/digitalbitbox/bitbox-wallet-app/releases/
2828
!define BINDIR "build\windows"

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/digitalbitbox/bitbox-wallet-app
33
go 1.19
44

55
require (
6-
github.com/btcsuite/btcd v0.23.1
6+
github.com/btcsuite/btcd v0.23.4
77
github.com/btcsuite/btcd/btcec/v2 v2.2.1
88
github.com/btcsuite/btcd/btcutil v1.1.2
99
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1

‎go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
1111
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
1212
github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
1313
github.com/btcsuite/btcd v0.23.0/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
14-
github.com/btcsuite/btcd v0.23.1 h1:IB8cVQcC2X5mHbnfirLG5IZnkWYNTPlLZVrxUYSotbE=
1514
github.com/btcsuite/btcd v0.23.1/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
15+
github.com/btcsuite/btcd v0.23.4 h1:IzV6qqkfwbItOS/sg/aDfPDsjPP8twrCOE2R93hxMlQ=
16+
github.com/btcsuite/btcd v0.23.4/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
1617
github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
1718
github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
1819
github.com/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E=

‎vendor/github.com/btcsuite/btcd/blockchain/weight.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/btcsuite/btcd/txscript/sign.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/btcsuite/btcd/txscript/taproot.go

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

‎vendor/github.com/btcsuite/btcd/wire/msgtx.go

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

‎vendor/modules.txt

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ github.com/StackExchange/wmi
44
# github.com/aead/siphash v1.0.1
55
## explicit
66
github.com/aead/siphash
7-
# github.com/btcsuite/btcd v0.23.1
7+
# github.com/btcsuite/btcd v0.23.4
88
## explicit; go 1.17
99
github.com/btcsuite/btcd/blockchain
1010
github.com/btcsuite/btcd/blockchain/indexers
@@ -35,6 +35,12 @@ github.com/btcsuite/btcd/chaincfg/chainhash
3535
# github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
3636
## explicit
3737
github.com/btcsuite/btclog
38+
# github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd
39+
## explicit
40+
# github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792
41+
## explicit
42+
# github.com/btcsuite/winsvc v1.0.0
43+
## explicit
3844
# github.com/cespare/cp v1.1.1
3945
## explicit
4046
# github.com/davecgh/go-spew v1.1.1
@@ -51,6 +57,8 @@ github.com/decred/dcrd/crypto/blake256
5157
github.com/decred/dcrd/dcrec/secp256k1/v4
5258
github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa
5359
github.com/decred/dcrd/dcrec/secp256k1/v4/schnorr
60+
# github.com/decred/dcrd/lru v1.0.0
61+
## explicit; go 1.11
5462
# github.com/digitalbitbox/bitbox02-api-go v0.0.0-20230403145434-d71ecec2b7ad
5563
## explicit; go 1.13
5664
github.com/digitalbitbox/bitbox02-api-go/api/bootloader
@@ -115,6 +123,8 @@ github.com/go-ole/go-ole/oleutil
115123
# github.com/go-stack/stack v1.8.0
116124
## explicit
117125
github.com/go-stack/stack
126+
# github.com/golang/snappy v0.0.4
127+
## explicit
118128
# github.com/google/uuid v1.2.0
119129
## explicit
120130
github.com/google/uuid
@@ -124,6 +134,10 @@ github.com/gorilla/mux
124134
# github.com/gorilla/websocket v1.4.2
125135
## explicit; go 1.12
126136
github.com/gorilla/websocket
137+
# github.com/jessevdk/go-flags v1.4.0
138+
## explicit
139+
# github.com/jrick/logrotate v1.0.0
140+
## explicit
127141
# github.com/kkdai/bstream v1.0.0
128142
## explicit; go 1.6
129143
github.com/kkdai/bstream
@@ -162,6 +176,8 @@ github.com/stretchr/testify/assert
162176
github.com/stretchr/testify/mock
163177
github.com/stretchr/testify/require
164178
github.com/stretchr/testify/suite
179+
# github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
180+
## explicit; go 1.14
165181
# github.com/tklauser/go-sysconf v0.3.5
166182
## explicit; go 1.13
167183
github.com/tklauser/go-sysconf

0 commit comments

Comments
 (0)