Merge remote-tracking branch 'benma/update'

Author: benma

backend/coins/btc/transactions/transactions.go

@@ -295,10 +295,10 @@ func (transactions *Transactions) removeTxForAddress(
 func (transactions *Transactions) UpdateAddressHistory(scriptHashHex blockchain.ScriptHashHex, txs []*blockchain.TxInfo) {
 	defer transactions.Lock()()
 	dbTx, err := transactions.db.Begin()
-	defer dbTx.Rollback()
 	if err != nil {
 		transactions.log.WithError(err).Panic("Failed to begin transaction")
 	}
+	defer dbTx.Rollback()
 	txsSet := map[chainhash.Hash]struct{}{}
 	for _, txInfo := range txs {
 		txsSet[txInfo.TXHash.Hash()] = struct{}{}

backend/devices/bitbox02bootloader/assets.go

@@ -30,11 +30,11 @@ type firmwareInfo struct {
 
 var bundledFirmwares = map[bitbox02common.Product]firmwareInfo{
 	bitbox02common.ProductBitBox02Multi: {
-		version:  semver.NewSemVer(5, 0, 0),
+		version:  semver.NewSemVer(6, 0, 0),
 		filename: "assets/firmware.v%s.signed.bin",
 	},
 	bitbox02common.ProductBitBox02BTCOnly: {
-		version:  semver.NewSemVer(5, 0, 0),
+		version:  semver.NewSemVer(6, 0, 0),
 		filename: "assets/firmware-btc.v%s.signed.bin",
 	},
 }

backend/devices/bitbox02bootloader/assets/firmware-btc.v5.0.0.signed.bin renamed to backend/devices/bitbox02bootloader/assets/firmware-btc.v6.0.0.signed.bin

@@ -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, 16, 1)
+	Version = semver.NewSemVer(4, 17, 0)
 )
 
 // UpdateFile is retrieved from the server.

backend/devices/bitbox02bootloader/assets/firmware.v5.0.0.signed.bin renamed to backend/devices/bitbox02bootloader/assets/firmware.v6.0.0.signed.bin

@@ -7,8 +7,8 @@ android {
         applicationId "ch.shiftcrypto.bitboxapp"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 5
-        versionName "android-4.16.0"
+        versionCode 6
+        versionName "android-4.17.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

backend/devices/bitbox02bootloader/firmware.go

@@ -35,8 +35,8 @@ linux:
 	cp resources/linux/usr/share/icons/hicolor/128x128/apps/bitbox.png build/linux-tmp
 	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.16.1 -C ../tmp-deb/
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.16.1 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.17.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.17.0 -C ../tmp-deb/
 	# create AppImage
 	cd build/linux-tmp && /opt/linuxdeployqt-6-x86_64.AppImage BitBox -appimage
 	mv build/linux-tmp/BitBoxApp-*-x86_64.AppImage build/linux/

backend/update.go

@@ -21,10 +21,10 @@
 	<string>APPL</string>
 
 	<key>CFBundleVersion</key>
-	<string>4.16.1</string>
+	<string>4.17.0</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>4.16.1</string>
+	<string>4.17.0</string>
 
 	<key>CFBundleSignature</key>
 	<string>????</string>

frontends/android/BitBoxApp/app/build.gradle

@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 4.16.1.0
+!define VERSION 4.17.0.0
 !define COMPANY "Shift Cryptosecurity AG"
 !define URL https://github.com/digitalbitbox/bitbox-wallet-app/releases/
 !define BINDIR "build\windows"