Merge pull request #6632 from lightningnetwork/addr-type-taproot

walletkit+sweeper: add forgotten P2TR address type

Author: Roasbeef

lnrpc/walletrpc/walletkit_server.go

@@ -542,6 +542,9 @@ func (w *WalletKit) NextAddr(ctx context.Context,
 	case AddressType_HYBRID_NESTED_WITNESS_PUBKEY_HASH:
 		return nil, fmt.Errorf("invalid address type for next "+
 			"address: %v", req.Type)
+
+	case AddressType_TAPROOT_PUBKEY:
+		addrType = lnwallet.TaprootPubkey
 	}
 
 	addr, err := w.cfg.Wallet.NewAddress(addrType, req.Change, account)
@@ -858,24 +861,27 @@ func (w *WalletKit) BumpFee(ctx context.Context,
 			"transaction")
 	}
 
+	signDesc := &input.SignDescriptor{
+		Output: &wire.TxOut{
+			PkScript: utxo.PkScript,
+			Value:    int64(utxo.Value),
+		},
+		HashType: txscript.SigHashAll,
+	}
+
 	var witnessType input.WitnessType
 	switch utxo.AddressType {
 	case lnwallet.WitnessPubKey:
 		witnessType = input.WitnessKeyHash
 	case lnwallet.NestedWitnessPubKey:
 		witnessType = input.NestedWitnessKeyHash
+	case lnwallet.TaprootPubkey:
+		witnessType = input.TaprootPubKeySpend
+		signDesc.HashType = txscript.SigHashDefault
 	default:
 		return nil, fmt.Errorf("unknown input witness %v", op)
 	}
 
-	signDesc := &input.SignDescriptor{
-		Output: &wire.TxOut{
-			PkScript: utxo.PkScript,
-			Value:    int64(utxo.Value),
-		},
-		HashType: txscript.SigHashAll,
-	}
-
 	// We'll use the current height as the height hint since we're dealing
 	// with an unconfirmed transaction.
 	_, currentHeight, err := w.cfg.Chain.GetBestBlock()
@@ -884,8 +890,9 @@ func (w *WalletKit) BumpFee(ctx context.Context,
 			err)
 	}
 
-	input := input.NewBaseInput(op, witnessType, signDesc, uint32(currentHeight))
-	if _, err = w.cfg.Sweeper.SweepInput(input, sweep.Params{Fee: feePreference}); err != nil {
+	inp := input.NewBaseInput(op, witnessType, signDesc, uint32(currentHeight))
+	sweepParams := sweep.Params{Fee: feePreference}
+	if _, err = w.cfg.Sweeper.SweepInput(inp, sweepParams); err != nil {
 		return nil, err
 	}
 

lnwallet/rpcwallet/rpcwallet.go

@@ -259,7 +259,8 @@ func (r *RPCKeyRing) FinalizePsbt(packet *psbt.Packet, _ string) error {
 	// ones to sign. If there is any input without witness data that we
 	// cannot sign because it's not our UTXO, this will be a hard failure.
 	tx := packet.UnsignedTx
-	sigHashes := input.NewTxSigHashesV0Only(tx)
+	prevOutFetcher := basewallet.PsbtPrevOutputFetcher(packet)
+	sigHashes := txscript.NewTxSigHashes(tx, prevOutFetcher)
 	for idx, txIn := range tx.TxIn {
 		in := packet.Inputs[idx]
 

sweep/tx_input_set.go

@@ -355,25 +355,28 @@ func (t *txInputSet) tryAddWalletInputsIfNeeded() error {
 // createWalletTxInput converts a wallet utxo into an object that can be added
 // to the other inputs to sweep.
 func createWalletTxInput(utxo *lnwallet.Utxo) (input.Input, error) {
+	signDesc := &input.SignDescriptor{
+		Output: &wire.TxOut{
+			PkScript: utxo.PkScript,
+			Value:    int64(utxo.Value),
+		},
+		HashType: txscript.SigHashAll,
+	}
+
 	var witnessType input.WitnessType
 	switch utxo.AddressType {
 	case lnwallet.WitnessPubKey:
 		witnessType = input.WitnessKeyHash
 	case lnwallet.NestedWitnessPubKey:
 		witnessType = input.NestedWitnessKeyHash
+	case lnwallet.TaprootPubkey:
+		witnessType = input.TaprootPubKeySpend
+		signDesc.HashType = txscript.SigHashDefault
 	default:
 		return nil, fmt.Errorf("unknown address type %v",
 			utxo.AddressType)
 	}
 
-	signDesc := &input.SignDescriptor{
-		Output: &wire.TxOut{
-			PkScript: utxo.PkScript,
-			Value:    int64(utxo.Value),
-		},
-		HashType: txscript.SigHashAll,
-	}
-
 	// A height hint doesn't need to be set, because we don't monitor these
 	// inputs for spend.
 	heightHint := uint32(0)