backend/btc: move unused SignatureScript()

Since we use PSBT's and btcd/psbt's extract function, our own function
to create witnesses is redundant. We still need it in the test, so we
just move it there for now.

Author: benma

backend/coins/btc/addresses/address.go

@@ -26,7 +26,6 @@ import (
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/btcsuite/btcd/txscript"
-	"github.com/btcsuite/btcd/wire"
 	"github.com/sirupsen/logrus"
 )
 
@@ -171,51 +170,3 @@ func (address *AccountAddress) ScriptForHashToSign() (bool, []byte) {
 	}
 	panic("The end of the function cannot be reached.")
 }
-
-// SignatureScript returns the signature script (and witness) needed to spend from this address.
-// The signatures have to be provided in the order of the configuration (and some can be nil).
-func (address *AccountAddress) SignatureScript(
-	signature types.Signature,
-) ([]byte, wire.TxWitness) {
-	publicKey := address.PublicKey
-	switch address.AccountConfiguration.ScriptType() {
-	case signing.ScriptTypeP2PKH:
-		signatureScript, err := txscript.NewScriptBuilder().
-			AddData(append(signature.SerializeDER(), byte(txscript.SigHashAll))).
-			AddData(publicKey.SerializeCompressed()).
-			Script()
-		if err != nil {
-			address.log.WithError(err).Panic("Failed to build signature script for P2PKH.")
-		}
-		return signatureScript, nil
-	case signing.ScriptTypeP2WPKHP2SH:
-		signatureScript, err := txscript.NewScriptBuilder().
-			AddData(address.RedeemScript).
-			Script()
-		if err != nil {
-			address.log.WithError(err).Panic("Failed to build segwit signature script.")
-		}
-		txWitness := wire.TxWitness{
-			append(signature.SerializeDER(), byte(txscript.SigHashAll)),
-			publicKey.SerializeCompressed(),
-		}
-		return signatureScript, txWitness
-	case signing.ScriptTypeP2WPKH:
-		txWitness := wire.TxWitness{
-			append(signature.SerializeDER(), byte(txscript.SigHashAll)),
-			publicKey.SerializeCompressed(),
-		}
-		return []byte{}, txWitness
-	case signing.ScriptTypeP2TR:
-		// We assume SIGHASH_DEFAULT, which defaults to SIGHASH_ALL without needing to explicitly
-		// append it to the signature. See:
-		// https://github.com/bitcoin/bips/blob/97e02b2223b21753acefa813a4e59dbb6e849e77/bip-0341.mediawiki#taproot-key-path-spending-signature-validation
-		txWitness := wire.TxWitness{
-			signature.SerializeCompact(),
-		}
-		return []byte{}, txWitness
-	default:
-		address.log.Panic("Unrecognized address type.")
-	}
-	panic("The end of the function cannot be reached.")
-}

backend/coins/btc/maketx/txsize_internal_test.go

@@ -20,11 +20,13 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/addresses"
 	addressesTest "github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/addresses/test"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/types"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/signing"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/mempool"
+	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/stretchr/testify/require"
 )
@@ -57,6 +59,51 @@ func makeSig() types.Signature {
 	return sig
 }
 
+// signatureScript returns the signature script (and witness) needed to spend from this address.
+func signatureScript(
+	t *testing.T,
+	address *addresses.AccountAddress,
+	signature types.Signature,
+) ([]byte, wire.TxWitness) {
+	t.Helper()
+	publicKey := address.PublicKey
+	switch address.AccountConfiguration.ScriptType() {
+	case signing.ScriptTypeP2PKH:
+		signatureScript, err := txscript.NewScriptBuilder().
+			AddData(append(signature.SerializeDER(), byte(txscript.SigHashAll))).
+			AddData(publicKey.SerializeCompressed()).
+			Script()
+		require.NoError(t, err)
+		return signatureScript, nil
+	case signing.ScriptTypeP2WPKHP2SH:
+		signatureScript, err := txscript.NewScriptBuilder().
+			AddData(address.RedeemScript).
+			Script()
+		require.NoError(t, err)
+		txWitness := wire.TxWitness{
+			append(signature.SerializeDER(), byte(txscript.SigHashAll)),
+			publicKey.SerializeCompressed(),
+		}
+		return signatureScript, txWitness
+	case signing.ScriptTypeP2WPKH:
+		txWitness := wire.TxWitness{
+			append(signature.SerializeDER(), byte(txscript.SigHashAll)),
+			publicKey.SerializeCompressed(),
+		}
+		return []byte{}, txWitness
+	case signing.ScriptTypeP2TR:
+		// We assume SIGHASH_DEFAULT, which defaults to SIGHASH_ALL without needing to explicitly
+		// append it to the signature. See:
+		// https://github.com/bitcoin/bips/blob/97e02b2223b21753acefa813a4e59dbb6e849e77/bip-0341.mediawiki#taproot-key-path-spending-signature-validation
+		txWitness := wire.TxWitness{
+			signature.SerializeCompact(),
+		}
+		return []byte{}, txWitness
+	default:
+		panic("Unrecognized address type.")
+	}
+}
+
 func testEstimateTxSize(
 	t *testing.T, useSegwit bool, outputScriptType, changeScriptType signing.ScriptType) {
 	t.Helper()
@@ -86,7 +133,7 @@ func testEstimateTxSize(
 	for counter := 0; counter < 10; counter++ {
 		for _, inputScriptType := range inputScriptTypes {
 			inputAddress := addressesTest.GetAddress(inputScriptType)
-			sigScript, witness := inputAddress.SignatureScript(sig)
+			sigScript, witness := signatureScript(t, inputAddress, sig)
 			tx.TxIn = append(tx.TxIn, &wire.TxIn{
 				SignatureScript: sigScript,
 				Witness:         witness,
@@ -121,7 +168,7 @@ func TestSigScriptWitnessSize(t *testing.T) {
 		address := addressesTest.GetAddress(scriptType)
 		t.Run(address.AccountConfiguration.String(), func(t *testing.T) {
 			sigScriptSize, witnessSize := sigScriptWitnessSize(address.AccountConfiguration)
-			sigScript, witness := address.SignatureScript(sig)
+			sigScript, witness := signatureScript(t, address, sig)
 			require.Equal(t, len(sigScript), sigScriptSize)
 			if witness != nil {
 				require.Equal(t, witness.SerializeSize(), witnessSize)