Merge branch 'psbtSoftware'

Author: bznein

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)
@@ -185,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/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"
@@ -204,7 +204,6 @@ func (keystore *Keystore) BTCXPubs(
 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]
@@ -242,11 +241,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()
@@ -267,16 +262,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
 }