backend/keystore: use accountConfig&derivation in VerifyAddressBTC

A BTC address is derived from an account using
change/addressIndex. There is no "address-level" signing
configuration. `signingConfig.Derive()` assumes there is one base
level keypath and xpub, which is not true for a descriptor in general. For
example, a multisig descriptor has multiple xpubs, each with their own keypath.

Author: benma

backend/coins/btc/account.go

@@ -781,7 +781,10 @@ func (account *Account) VerifyAddress(addressID string) (bool, error) {
 		return false, err
 	}
 	if canVerifyAddress {
-		return true, keystore.VerifyAddressBTC(address.Configuration, account.Coin())
+		return true, keystore.VerifyAddressBTC(
+			address.AccountConfiguration,
+			address.Derivation,
+			account.Coin())
 	}
 	return false, nil
 }

backend/coins/btc/addresses/address.go

@@ -39,6 +39,7 @@ type AccountAddress struct {
 	AccountConfiguration *signing.Configuration
 	// Configuration contains the absolute keypath and the extended public keys of the address.
 	Configuration *signing.Configuration
+	Derivation    types.Derivation
 
 	// redeemScript stores the redeem script of a BIP16 P2SH output or nil if address type is P2PKH.
 	redeemScript []byte
@@ -111,6 +112,7 @@ func NewAccountAddress(
 		Address:              address,
 		AccountConfiguration: accountConfiguration,
 		Configuration:        configuration,
+		Derivation:           derivation,
 		redeemScript:         redeemScript,
 		log:                  log,
 	}

backend/devices/bitbox02/keystore.go

@@ -145,21 +145,25 @@ func (keystore *keystore) CanVerifyAddress(coin coinpkg.Coin) (bool, bool, error
 
 // VerifyAddressBTC implements keystore.Keystore.
 func (keystore *keystore) VerifyAddressBTC(
-	configuration *signing.Configuration, coin coinpkg.Coin) error {
+	accountConfiguration *signing.Configuration,
+	derivation types.Derivation, coin coinpkg.Coin) error {
 	canVerifyAddress, _, err := keystore.CanVerifyAddress(coin)
 	if err != nil {
 		return err
 	}
 	if !canVerifyAddress {
 		panic("CanVerifyAddress must be true")
 	}
-	msgScriptType, ok := btcMsgScriptTypeMap[configuration.ScriptType()]
+	msgScriptType, ok := btcMsgScriptTypeMap[accountConfiguration.ScriptType()]
 	if !ok {
 		panic("unsupported scripttype")
 	}
+	keypath := accountConfiguration.AbsoluteKeypath().
+		Child(derivation.SimpleChainIndex(), false).
+		Child(derivation.AddressIndex, false)
 	_, err = keystore.device.BTCAddress(
 		btcMsgCoinMap[coin.Code()],
-		configuration.AbsoluteKeypath().ToUInt32(),
+		keypath.ToUInt32(),
 		firmware.NewBTCScriptConfigSimple(msgScriptType),
 		true,
 	)

backend/devices/bitbox02/keystore_simulator_test.go

@@ -614,14 +614,10 @@ func TestSimulatorVerifyAddressBTC(t *testing.T) {
 
 		for _, test := range tests {
 			stdOut.Truncate(0)
-
-			addressConfiguration, err := test.accountConfiguration.Derive(
-				signing.NewEmptyRelativeKeypath().
-					Child(test.derivation.SimpleChainIndex(), signing.NonHardened).
-					Child(test.derivation.AddressIndex, signing.NonHardened),
-			)
-			require.NoError(t, err)
-			require.NoError(t, device.Keystore().VerifyAddressBTC(addressConfiguration, test.coin))
+			require.NoError(t, device.Keystore().VerifyAddressBTC(
+				test.accountConfiguration,
+				test.derivation,
+				test.coin))
 			require.Eventually(t,
 				func() bool {
 					return strings.Contains(

backend/keystore/keystore.go

@@ -18,6 +18,7 @@ package keystore
 import (
 	"errors"
 
+	btctypes "github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/types"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/signing"
 	"github.com/btcsuite/btcd/btcutil/hdkeychain"
@@ -94,7 +95,10 @@ type Keystore interface {
 
 	// VerifyAddressBTC displays a Bitcoin address for verification.
 	// Please note that this is only supported if the keystore has a secure output channel.
-	VerifyAddressBTC(*signing.Configuration, coin.Coin) error
+	VerifyAddressBTC(
+		accountConfiguration *signing.Configuration,
+		derivation btctypes.Derivation,
+		coin coin.Coin) error
 
 	// VerifyAddressBTC displays an Ethereum address for verification.
 	// Please note that this is only supported if the keystore has a secure output channel.

backend/keystore/mocks/keystore.go

@@ -157,7 +157,7 @@ func (keystore *Keystore) CanVerifyAddress(coin.Coin) (bool, bool, error) {
 }
 
 // VerifyAddressBTC implements keystore.Keystore.
-func (keystore *Keystore) VerifyAddressBTC(*signing.Configuration, coin.Coin) error {
+func (keystore *Keystore) VerifyAddressBTC(*signing.Configuration, types.Derivation, coin.Coin) error {
 	return errp.New("The software-based keystore has no secure output to display the address.")
 }