Merge branch 'update-bb02go'

Author: benma

backend/devices/bitbox02/keystore.go

@@ -519,7 +519,7 @@ func (keystore *keystore) signBTCTransaction(btcProposedTx *btc.ProposedTransact
 		outputs[btcProposedTx.TXProposal.OutIndex].PaymentRequestIndex = &prIndex
 	}
 
-	signatures, generatedOutputs, err := keystore.device.BTCSign(
+	signResult, err := keystore.device.BTCSign(
 		msgCoin,
 		scriptConfigs,
 		outputScriptConfigs,
@@ -538,14 +538,14 @@ func (keystore *keystore) signBTCTransaction(btcProposedTx *btc.ProposedTransact
 	if err != nil {
 		return err
 	}
-	for index, generatedOutput := range generatedOutputs {
+	for index, generatedOutput := range signResult.GeneratedOutputs {
 		isSilentPaymentOutput := index == btcProposedTx.TXProposal.OutIndex && btcProposedTx.TXProposal.SilentPaymentAddress != ""
 		if !isSilentPaymentOutput {
 			return errp.New("expected silent payment output")
 		}
 		btcProposedTx.TXProposal.Transaction.TxOut[index].PkScript = generatedOutput
 	}
-	for index, signature := range signatures {
+	for index, signature := range signResult.Signatures {
 		btcProposedTx.Signatures[index] = &types.Signature{
 			R: big.NewInt(0).SetBytes(signature[:32]),
 			S: big.NewInt(0).SetBytes(signature[32:]),
@@ -629,15 +629,15 @@ func (keystore *keystore) SignBTCMessage(message []byte, keypath signing.Absolut
 	if !ok {
 		return nil, errp.Newf("scriptType not supported: %s", scriptType)
 	}
-	_, _, electrum65, err := keystore.device.BTCSignMessage(
+	signResult, err := keystore.device.BTCSignMessage(
 		messages.BTCCoin_BTC,
 		&messages.BTCScriptConfigWithKeypath{
 			ScriptConfig: firmware.NewBTCScriptConfigSimple(sc),
 			Keypath:      keypath.ToUInt32(),
 		},
 		message,
 	)
-	return electrum65, err
+	return signResult.ElectrumSig65, err
 }
 
 // SignETHMessage implements keystore.Keystore.

go.mod

@@ -3,7 +3,7 @@ module github.com/BitBoxSwiss/bitbox-wallet-app
 go 1.23
 
 require (
-	github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250226124111-4f738f405310
+	github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250508091842-e5b786c4a88d
 	github.com/BitBoxSwiss/block-client-go v0.0.0-20241009081439-924dde98b9c1
 	github.com/btcsuite/btcd v0.24.2
 	github.com/btcsuite/btcd/btcec/v2 v2.3.4

go.sum

@@ -1,7 +1,5 @@
-github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250212204931-2b90fadfc774 h1:lMa0mZs7llEvMZd/hce7G+wypZekmeuXN0HpPmbFc10=
-github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250212204931-2b90fadfc774/go.mod h1:lyYwD22hA6TQ8XNXx37VE75Exp6qYdgZgUAO4+lyhSU=
-github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250226124111-4f738f405310 h1:QAnQ3FrH4J2OcyEh03Fsi378pk1B070p7B+R0VB/I4g=
-github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250226124111-4f738f405310/go.mod h1:lyYwD22hA6TQ8XNXx37VE75Exp6qYdgZgUAO4+lyhSU=
+github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250508091842-e5b786c4a88d h1:Zd6ISD5tzAFEsy+Td0XwmENqssuL+9aKHHBFyMpPUCg=
+github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250508091842-e5b786c4a88d/go.mod h1:lyYwD22hA6TQ8XNXx37VE75Exp6qYdgZgUAO4+lyhSU=
 github.com/BitBoxSwiss/block-client-go v0.0.0-20241009081439-924dde98b9c1 h1:5hjP8mYSVKFibesrz8L6U0Vp5zSJt0LwXB3DSZGhnSo=
 github.com/BitBoxSwiss/block-client-go v0.0.0-20241009081439-924dde98b9c1/go.mod h1:SJTiQZU9ggBzVKMni97rpNS9GddPKErndFXNSDrfEGc=
 github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=