Merge branch 'v0-16-2-branch-7637' into v0-16-2-branch

This commit is contained in:
Olaoluwa Osuntokun 2023-04-27 16:35:23 -05:00
commit f7129c1d62

View file

@ -21,5 +21,9 @@ func newSweeperWallet(w *lnwallet.LightningWallet) *sweeperWallet {
// CancelRebroadcast cancels the rebroadcast of the given transaction.
func (s *sweeperWallet) CancelRebroadcast(txid chainhash.Hash) {
s.Cfg.Rebroadcaster.MarkAsConfirmed(txid)
// For neutrino, we don't config the rebroadcaster for the wallet as it
// manages the rebroadcasting logic in neutrino itself.
if s.Cfg.Rebroadcaster != nil {
s.Cfg.Rebroadcaster.MarkAsConfirmed(txid)
}
}