walletkit+sweeper: add forgotten P2TR address type

[guggero]

Change Description

Fixed three more occurrences of address type enums that didn't yet support P2TR inputs.

NOTE: I didn't add anything to the release notes since this should've been added by any of the previous P2TR pull requests.

[bhandras]

LGTM 🌴

[Roasbeef]

Let's also make the default addresses for the sweeper P2TR as well?

So we'd change this argument here: https://github.com/lightningnetwork/lnd/blob/master/server.go#L4422-L4424

That'll also indirectly cause all on chain sweeps (force closes, etc) to go into P2TR addresses.

[Roasbeef]

We should also be able to change this as well:

lnd/peer/brontide.go

Lines 2162 to 2175 in de6fcf1

	// genDeliveryScript returns a new script to be used to send our funds to in
	// the case of a cooperative channel close negotiation.
	func (p *Brontide) genDeliveryScript() ([]byte, error) {
	deliveryAddr, err := p.cfg.Wallet.NewAddress(
	lnwallet.WitnessPubKey, false, lnwallet.DefaultAccountName,
	)
	if err != nil {
	return nil, err
	}
	peerLog.Infof("Delivery addr for channel close: %v",
	deliveryAddr)
	return txscript.PayToAddrScript(deliveryAddr)
	}

.

In practice we should always be using the upfront shutdown addr, but this should be safe.

[Roasbeef]

We'll also need to update this, so older nodes will accept a P2TR addr as an upfront shutdown script:

lnd/lnwallet/wallet.go

Lines 2247 to 2268 in dceb101

	// validateUpfrontShutdown checks whether the provided upfront_shutdown_script
	// is of a valid type that we accept.
	func validateUpfrontShutdown(shutdown lnwire.DeliveryAddress,
	params *chaincfg.Params) bool {
	// We don't need to worry about a large UpfrontShutdownScript since it
	// was already checked in lnwire when decoding from the wire.
	scriptClass, _, _, _ := txscript.ExtractPkScriptAddrs(shutdown, params)
	switch scriptClass {
	case txscript.PubKeyHashTy,
	txscript.WitnessV0PubKeyHashTy,
	txscript.ScriptHashTy,
	txscript.WitnessV0ScriptHashTy:
	// The above four types are permitted according to BOLT#02.
	// Everything else is disallowed.
	return true
	default:
	return false
	}
	}

I think this means that we shouldn't yet switch over the default co-op close addr due to this stricter validation.

[Roasbeef]

Re the above, here's where we generate our upfront shutdown addr:

lnd/funding/manager.go

Lines 1363 to 1375 in 262591c

	shutdown, err := getUpfrontShutdownScript(
	f.cfg.EnableUpfrontShutdown, peer, acceptorResp.UpfrontShutdown,
	func() (lnwire.DeliveryAddress, error) {
	addr, err := f.cfg.Wallet.NewAddress(
	lnwallet.WitnessPubKey, false,
	lnwallet.DefaultAccountName,
	)
	if err != nil {
	return nil, err
	}
	return txscript.PayToAddrScript(addr)
	},
	)

[Roasbeef]

Some other areas that are safe to change:

• lnd/lnd.go

  Lines 460 to 461 in bd5e29e

  	return activeChainControl.Wallet.NewAddress(
  	lnwallet.WitnessPubKey, false,

• lnd/rpcserver.go

  Lines 1328 to 1330 in c647d32

  	lnwallet.WitnessPubKey, true,
  	lnwallet.DefaultAccountName,
  	)

• lnd/lnwallet/wallet.go

  Lines 765 to 766 in dceb101

  	return l.NewAddress(
  	WitnessPubKey, true, DefaultAccountName,

[Roasbeef]

LGTM 🐡