Merge staging-merged-with-master into staging-send-to-self

.github/workflows/playwright.yml

@@ -95,7 +95,7 @@ jobs:
         run: make webe2etest
 
       - name: Upload Playwright artifacts
-        if: always()
+        if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: playwright-artifacts

CHANGELOG.md

@@ -2,8 +2,10 @@
 
 ## Unreleased
 - Add a dropdown on the "Receiver address" input in the send screen to select an account
+- Add feedback link to guide and about settings
 
 ## v4.49.0
+- Bundle BitBox02 Nova firmware version v9.24.0
 - macOS: fix potential USB communication issue with BitBox02 bootloaders <v1.1.2 and firmwares <v9.23.1
 - Added BTC Direct sell option
 - Added a banner to remind user to backup their seed phrase when an account reaches a certain threshold.

backend/backend.go

@@ -77,6 +77,7 @@ var fixedURLWhitelist = []string{
 	"https://bitbox.swiss/",
 	"https://shop.bitbox.swiss/",
 	"https://shiftcrypto.support/",
+	"https://support.bitbox.swiss",
 	// Exchange rates.
 	"https://www.coingecko.com/",
 	// Block explorers.

backend/coins/btc/sign.go

@@ -20,7 +20,6 @@ import (
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/addresses"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/blockchain"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/maketx"
-	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/types"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
 	coinpkg "github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/signing"
@@ -38,9 +37,7 @@ type ProposedTransaction struct {
 	// List of signing configurations that might be used in the tx inputs.
 	AccountSigningConfigurations signing.Configurations
 	GetPrevTx                    func(chainhash.Hash) (*wire.MsgTx, error)
-	// Signatures collects the signatures, one per transaction input.
-	Signatures []*types.Signature
-	FormatUnit coin.BtcUnit
+	FormatUnit                   coin.BtcUnit
 	// GetKeystoreAddress returns the address from the same keystore given the script hash,
 	// or nil if not found.
 	GetKeystoreAddress func(coinpkg.Code, blockchain.ScriptHashHex) (*addresses.AccountAddress, error)
@@ -87,7 +84,9 @@ func (p *ProposedTransaction) Update() error {
 				rootFingerprintUint32,
 				inputAddress.AbsoluteKeypath().ToUInt32(),
 				inputAddress.PublicKey.SerializeCompressed(),
-				index); err != nil {
+				index); err != nil && err != psbt.ErrDuplicateKey {
+				// If we update the same PSBT multiple times, the key info is already present,
+				// so we can ignore the duplicate key error.
 				return err
 			}
 		case signing.ScriptTypeP2TR:
@@ -123,7 +122,9 @@ func (p *ProposedTransaction) Update() error {
 					rootFingerprintUint32,
 					outputAddress.AbsoluteKeypath().ToUInt32(),
 					outputAddress.PublicKey.SerializeCompressed(),
-					index); err != nil {
+					index); err != nil && err != psbt.ErrDuplicateKey {
+					// If we update the same PSBT multiple times, the key info is already present,
+					// so we can ignore the duplicate key error.
 					return err
 				}
 			case signing.ScriptTypeP2TR:
@@ -181,7 +182,6 @@ func (account *Account) signTransaction(
 		AccountSigningConfigurations: signingConfigs,
 		GetKeystoreAddress:           account.getAddressFromSameKeystore,
 		GetPrevTx:                    getPrevTx,
-		Signatures:                   make([]*types.Signature, len(txProposal.Psbt.UnsignedTx.TxIn)),
 		FormatUnit:                   account.coin.formatUnit,
 	}
 	if err := proposedTransaction.Update(); err != nil {

backend/devices/bitbox02/keystore_simulator_test.go

@@ -489,7 +489,6 @@ func makeTx(t *testing.T, device *Device, recipient *maketx.OutputInfo) *btc.Pro
 			}
 			return nil, nil
 		},
-		Signatures: make([]*types.Signature, len(txProposal.Psbt.UnsignedTx.TxIn)),
 		FormatUnit: coinpkg.BtcUnitDefault,
 	}
 	require.NoError(t, proposedTransaction.Update())

backend/devices/bitbox02bootloader/device.go

@@ -27,7 +27,6 @@ import (
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/observable"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/observable/action"
 	"github.com/BitBoxSwiss/bitbox02-api-go/api/bootloader"
-	"github.com/BitBoxSwiss/bitbox02-api-go/api/common"
 	bitbox02common "github.com/BitBoxSwiss/bitbox02-api-go/api/common"
 	"github.com/BitBoxSwiss/bitbox02-api-go/util/semver"
 	"github.com/sirupsen/logrus"
@@ -203,10 +202,6 @@ func (device *Device) UpgradeFirmware() error {
 		return err
 	}
 	if err := device.Device.UpgradeFirmware(signedBinary); err != nil {
-		// Ignore sig errors for the Plus firmware while we are testing with unsigned firmwares.
-		if plusIsPlaceholder && product == common.ProductBitBox02PlusMulti {
-			return device.Reboot()
-		}
 		return err
 	}
 	return nil

backend/devices/bitbox02bootloader/firmware.go

@@ -51,9 +51,6 @@ var firmwareBB02PlusBinaryBTCOnly []byte
 var firmwareBB02PlusVersionBTCOnly = semver.NewSemVer(9, 24, 0)
 var firmwareBB02PlusMonotonicVersionBtcOnly uint32 = 47
 
-// TODO: set to false / remove before production. This is only to allow upgrading unsigned firmware.
-const plusIsPlaceholder = false
-
 //go:embed assets/firmware-bitbox02nova-multi.v9.24.0.signed.bin.gz
 var firmwareBB02PlusBinaryMulti []byte
 var firmwareBB02PlusVersionMulti = semver.NewSemVer(9, 24, 0)

backend/keystore/software/software.go

@@ -20,7 +20,6 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
-	"math/big"
 
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/types"
@@ -33,6 +32,7 @@ import (
 	"github.com/btcsuite/btcd/btcec/v2/ecdsa"
 	"github.com/btcsuite/btcd/btcec/v2/schnorr"
 	"github.com/btcsuite/btcd/btcutil/hdkeychain"
+	"github.com/btcsuite/btcd/btcutil/psbt"
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/btcsuite/btcd/txscript"
 	ethTypes "github.com/ethereum/go-ethereum/core/types"
@@ -211,7 +211,6 @@ func (keystore *Keystore) Features() *keystorePkg.Features {
 func (keystore *Keystore) signBTCTransaction(btcProposedTx *btc.ProposedTransaction) error {
 	keystore.log.Info("Sign transaction.")
 	transaction := btcProposedTx.TXProposal.Psbt.UnsignedTx
-	signatures := make([]*types.Signature, len(transaction.TxIn))
 	sigHashes := btcProposedTx.TXProposal.SigHashes()
 	for index, txIn := range transaction.TxIn {
 		spentOutput, ok := btcProposedTx.TXProposal.PreviousOutputs[txIn.PreviousOutPoint]
@@ -249,11 +248,7 @@ func (keystore *Keystore) signBTCTransaction(btcProposedTx *btc.ProposedTransact
 			if err != nil {
 				return err
 			}
-			signatureSer := signature.Serialize()
-			signatures[index] = &types.Signature{
-				R: new(big.Int).SetBytes(signatureSer[:32]),
-				S: new(big.Int).SetBytes(signatureSer[32:]),
-			}
+			btcProposedTx.TXProposal.Psbt.Inputs[index].TaprootKeySpendSig = signature.Serialize()
 		} else {
 			var signatureHash []byte
 			isSegwit, subScript := address.ScriptForHashToSign()
@@ -274,16 +269,16 @@ func (keystore *Keystore) signBTCTransaction(btcProposedTx *btc.ProposedTransact
 				}
 				keystore.log.Debug("Calculated legacy signature hash")
 			}
-			signature := ecdsa.SignCompact(prv, signatureHash, true)
-
-			signatures[index] = &types.Signature{
-				R: new(big.Int).SetBytes(signature[1:33]),
-				S: new(big.Int).SetBytes(signature[33:]),
+			signature := ecdsa.Sign(prv, signatureHash).Serialize()
+			btcProposedTx.TXProposal.Psbt.Inputs[index].PartialSigs = []*psbt.PartialSig{
+				{
+					PubKey:    prv.PubKey().SerializeCompressed(),
+					Signature: append(signature, byte(txscript.SigHashAll)),
+				},
 			}
 		}
 	}
 
-	btcProposedTx.Signatures = signatures
 	return nil
 }