Merge remote-tracking branch 'benma/selfsend'

Author: benma

backend/coins/btc/transaction.go

@@ -213,7 +213,7 @@ func (account *Account) newTx(args *accounts.TxProposalArgs) (
 	return utxo, txProposal, nil
 }
 
-// getAddress returns the address in the account with the given `scriptHashHex`. Panics if the
+// getAddress returns the address in the account with the given `scriptHashHex`. Returns nil if the
 // address does not exist in the account.
 func (account *Account) getAddress(scriptHashHex blockchain.ScriptHashHex) *addresses.AccountAddress {
 	for _, subacc := range account.subaccounts {
@@ -224,7 +224,7 @@ func (account *Account) getAddress(scriptHashHex blockchain.ScriptHashHex) *addr
 			return address
 		}
 	}
-	panic("address must be present")
+	return nil
 }
 
 // SendTx implements accounts.Interface.

backend/devices/bitbox02/keystore.go

@@ -24,6 +24,7 @@ import (
 	"github.com/btcsuite/btcd/btcutil/hdkeychain"
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc"
+	"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc/blockchain"
 	"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc/types"
 	"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc/util"
 	coinpkg "github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
@@ -343,38 +344,6 @@ func (keystore *keystore) signBTCTransaction(btcProposedTx *btc.ProposedTransact
 		}
 	}
 
-	// Provide the previous transaction for each input if needed.
-	if firmware.BTCSignNeedsPrevTxs(scriptConfigs) {
-		for inputIndex, txIn := range tx.TxIn {
-			prevTx, err := btcProposedTx.GetPrevTx(txIn.PreviousOutPoint.Hash)
-			if err != nil {
-				return err
-			}
-
-			prevTxInputs := make([]*messages.BTCPrevTxInputRequest, len(prevTx.TxIn))
-			for prevInputIndex, prevTxIn := range prevTx.TxIn {
-				prevTxInputs[prevInputIndex] = &messages.BTCPrevTxInputRequest{
-					PrevOutHash:     prevTxIn.PreviousOutPoint.Hash[:],
-					PrevOutIndex:    prevTxIn.PreviousOutPoint.Index,
-					SignatureScript: prevTxIn.SignatureScript,
-					Sequence:        prevTxIn.Sequence,
-				}
-			}
-			prevTxOuputs := make([]*messages.BTCPrevTxOutputRequest, len(prevTx.TxOut))
-			for prevOutputIndex, prevTxOut := range prevTx.TxOut {
-				prevTxOuputs[prevOutputIndex] = &messages.BTCPrevTxOutputRequest{
-					Value:        uint64(prevTxOut.Value),
-					PubkeyScript: prevTxOut.PkScript,
-				}
-			}
-			inputs[inputIndex].PrevTx = &firmware.BTCPrevTx{
-				Version:  uint32(prevTx.Version),
-				Inputs:   prevTxInputs,
-				Outputs:  prevTxOuputs,
-				Locktime: prevTx.LockTime,
-			}
-		}
-	}
 	outputs := make([]*messages.BTCSignOutputRequest, len(tx.TxOut))
 	for index, txOut := range tx.TxOut {
 		address, err := util.AddressFromPkScript(txOut.PkScript, coin.Net())
@@ -396,16 +365,26 @@ func (keystore *keystore) signBTCTransaction(btcProposedTx *btc.ProposedTransact
 		default:
 			return errp.Newf("unsupported output type: %v", address)
 		}
+		outputAddress := btcProposedTx.GetAddress(blockchain.NewScriptHashHex(txOut.PkScript))
+
 		changeAddress := btcProposedTx.TXProposal.ChangeAddress
+		// Could also determine change using `outputAddress != nil AND second-to-last keypath element of outputAddress is 1`.
 		isChange := changeAddress != nil && bytes.Equal(
 			changeAddress.PubkeyScript(),
 			txOut.PkScript,
 		)
+
+		isOurs := outputAddress != nil
+		if !isChange && !keystore.device.Version().AtLeast(semver.NewSemVer(9, 15, 0)) {
+			// For firmware older than 9.15.0, non-change outputs cannot be marked internal.
+			isOurs = false
+		}
+
 		var keypath []uint32
 		var scriptConfigIndex int
-		if isChange {
-			keypath = changeAddress.Configuration.AbsoluteKeypath().ToUInt32()
-			accountConfiguration := changeAddress.AccountConfiguration
+		if isOurs {
+			keypath = outputAddress.Configuration.AbsoluteKeypath().ToUInt32()
+			accountConfiguration := outputAddress.AccountConfiguration
 			msgScriptType, ok := btcMsgScriptTypeMap[accountConfiguration.ScriptType()]
 			if !ok {
 				return errp.Newf("Unsupported script type %s", accountConfiguration.ScriptType())
@@ -417,7 +396,7 @@ func (keystore *keystore) signBTCTransaction(btcProposedTx *btc.ProposedTransact
 
 		}
 		outputs[index] = &messages.BTCSignOutputRequest{
-			Ours:              isChange,
+			Ours:              isOurs,
 			Type:              msgOutputType,
 			Value:             uint64(txOut.Value),
 			Payload:           address.ScriptAddress(),
@@ -426,6 +405,39 @@ func (keystore *keystore) signBTCTransaction(btcProposedTx *btc.ProposedTransact
 		}
 	}
 
+	// Provide the previous transaction for each input if needed.
+	if firmware.BTCSignNeedsPrevTxs(scriptConfigs) {
+		for inputIndex, txIn := range tx.TxIn {
+			prevTx, err := btcProposedTx.GetPrevTx(txIn.PreviousOutPoint.Hash)
+			if err != nil {
+				return err
+			}
+
+			prevTxInputs := make([]*messages.BTCPrevTxInputRequest, len(prevTx.TxIn))
+			for prevInputIndex, prevTxIn := range prevTx.TxIn {
+				prevTxInputs[prevInputIndex] = &messages.BTCPrevTxInputRequest{
+					PrevOutHash:     prevTxIn.PreviousOutPoint.Hash[:],
+					PrevOutIndex:    prevTxIn.PreviousOutPoint.Index,
+					SignatureScript: prevTxIn.SignatureScript,
+					Sequence:        prevTxIn.Sequence,
+				}
+			}
+			prevTxOuputs := make([]*messages.BTCPrevTxOutputRequest, len(prevTx.TxOut))
+			for prevOutputIndex, prevTxOut := range prevTx.TxOut {
+				prevTxOuputs[prevOutputIndex] = &messages.BTCPrevTxOutputRequest{
+					Value:        uint64(prevTxOut.Value),
+					PubkeyScript: prevTxOut.PkScript,
+				}
+			}
+			inputs[inputIndex].PrevTx = &firmware.BTCPrevTx{
+				Version:  uint32(prevTx.Version),
+				Inputs:   prevTxInputs,
+				Outputs:  prevTxOuputs,
+				Locktime: prevTx.LockTime,
+			}
+		}
+	}
+
 	formatUnit := messages.BTCSignInitRequest_DEFAULT
 	if btcProposedTx.FormatUnit == coinpkg.BtcUnitSats {
 		formatUnit = messages.BTCSignInitRequest_SAT