Merge pull request #9986 from lightningnetwork/0-19-2-branch-rc1

release: create v0.19.2-rc1 branch

Author: guggero

accessman.go

@@ -47,11 +47,11 @@ const (
 	AppMinor uint = 19
 
 	// AppPatch defines the application patch for this binary.
-	AppPatch uint = 1
+	AppPatch uint = 2
 
 	// AppPreRelease MUST only contain characters from semanticAlphabet per
 	// the semantic versioning spec.
-	AppPreRelease = "beta"
+	AppPreRelease = "beta.rc1"
 )
 
 func init() {

accessman_test.go

@@ -135,6 +135,14 @@ func (b *BlockbeatDispatcher) Stop() {
 }
 
 func (b *BlockbeatDispatcher) log() btclog.Logger {
+	// There's no guarantee that the `b.beat` is initialized when the
+	// dispatcher shuts down, especially in the case where the node is
+	// running as a remote signer, which doesn't have a chainbackend. In
+	// that case we will use the package logger.
+	if b.beat == nil {
+		return clog
+	}
+
 	return b.beat.logger()
 }
 

build/version.go

@@ -833,8 +833,16 @@ func (b *BitcoindNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint,
 			return nil, err
 		}
 
-		if uint32(blockHeight) > ntfn.HistoricalDispatch.StartHeight {
-			ntfn.HistoricalDispatch.StartHeight = uint32(blockHeight)
+		spentHeight := uint32(blockHeight)
+		chainntnfs.Log.Debugf("Outpoint(%v) has spent at height %v",
+			outpoint, spentHeight)
+
+		// Since the tx has already been spent at spentHeight, the
+		// heightHint specified by the caller is no longer relevant. We
+		// now update the starting height to be the spent height to make
+		// sure we won't miss it in the rescan.
+		if spentHeight != ntfn.HistoricalDispatch.StartHeight {
+			ntfn.HistoricalDispatch.StartHeight = spentHeight
 		}
 	}
 

chainio/dispatcher.go

@@ -933,15 +933,25 @@ func (b *BtcdNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint,
 				"block %v: %v", blockHash, err)
 		}
 
-		if uint32(blockHeader.Height) > ntfn.HistoricalDispatch.StartHeight {
+		spentHeight := uint32(blockHeader.Height)
+		chainntnfs.Log.Debugf("Outpoint(%v) has spent at height %v",
+			outpoint, spentHeight)
+
+		// Since the tx has already been spent at spentHeight, the
+		// heightHint specified by the caller is no longer relevant. We
+		// now update the starting height to be the spent height to make
+		// sure we won't miss it in the rescan.
+		if spentHeight != ntfn.HistoricalDispatch.StartHeight {
 			startHash, err = b.chainConn.GetBlockHash(
-				int64(blockHeader.Height),
+				int64(spentHeight),
 			)
 			if err != nil {
 				return nil, fmt.Errorf("unable to get block "+
 					"hash for height %d: %v",
 					blockHeader.Height, err)
 			}
+
+			ntfn.HistoricalDispatch.StartHeight = spentHeight
 		}
 	}
 

chainntnfs/bitcoindnotify/bitcoind.go

@@ -70,28 +70,28 @@ func (t TxConfStatus) String() string {
 	}
 }
 
-// notifierOptions is a set of functional options that allow callers to further
+// NotifierOptions is a set of functional options that allow callers to further
 // modify the type of chain event notifications they receive.
-type notifierOptions struct {
-	// includeBlock if true, then the dispatched confirmation notification
+type NotifierOptions struct {
+	// IncludeBlock if true, then the dispatched confirmation notification
 	// will include the block that mined the transaction.
-	includeBlock bool
+	IncludeBlock bool
 }
 
-// defaultNotifierOptions returns the set of default options for the notifier.
-func defaultNotifierOptions() *notifierOptions {
-	return &notifierOptions{}
+// DefaultNotifierOptions returns the set of default options for the notifier.
+func DefaultNotifierOptions() *NotifierOptions {
+	return &NotifierOptions{}
 }
 
 // NotifierOption is a functional option that allows a caller to modify the
 // events received from the notifier.
-type NotifierOption func(*notifierOptions)
+type NotifierOption func(*NotifierOptions)
 
-// WithIncludeBlock is an optional argument that allows the calelr to specify
+// WithIncludeBlock is an optional argument that allows the caller to specify
 // that the block that mined a transaction should be included in the response.
 func WithIncludeBlock() NotifierOption {
-	return func(o *notifierOptions) {
-		o.includeBlock = true
+	return func(o *NotifierOptions) {
+		o.IncludeBlock = true
 	}
 }
 

chainntnfs/btcdnotify/btcd.go

@@ -559,7 +559,7 @@ func NewTxNotifier(startHeight uint32, reorgSafetyLimit uint32,
 // and register a confirmation notification.
 func (n *TxNotifier) newConfNtfn(txid *chainhash.Hash,
 	pkScript []byte, numConfs, heightHint uint32,
-	opts *notifierOptions) (*ConfNtfn, error) {
+	opts *NotifierOptions) (*ConfNtfn, error) {
 
 	// An accompanying output script must always be provided.
 	if len(pkScript) == 0 {
@@ -593,7 +593,7 @@ func (n *TxNotifier) newConfNtfn(txid *chainhash.Hash,
 			n.CancelConf(confRequest, confID)
 		}),
 		HeightHint:   heightHint,
-		includeBlock: opts.includeBlock,
+		includeBlock: opts.IncludeBlock,
 		numConfsLeft: numConfs,
 	}, nil
 }
@@ -616,7 +616,7 @@ func (n *TxNotifier) RegisterConf(txid *chainhash.Hash, pkScript []byte,
 	default:
 	}
 
-	opts := defaultNotifierOptions()
+	opts := DefaultNotifierOptions()
 	for _, optFunc := range optFuncs {
 		optFunc(opts)
 	}

chainntnfs/interface.go

@@ -878,8 +878,8 @@ var (
 	ChainDNSSeeds = map[chainhash.Hash][][2]string{
 		BitcoinMainnetGenesis: {
 			{
-				"nodes.lightning.directory",
-				"soa.nodes.lightning.directory",
+				"nodes.lightning.wiki",
+				"soa.nodes.lightning.wiki",
 			},
 			{
 				"lseed.bitcoinstats.com",
@@ -888,14 +888,22 @@ var (
 
 		BitcoinTestnetGenesis: {
 			{
-				"test.nodes.lightning.directory",
-				"soa.nodes.lightning.directory",
+				"test.nodes.lightning.wiki",
+				"soa.nodes.lightning.wiki",
+			},
+		},
+
+		BitcoinTestnet4Genesis: {
+			{
+				"test4.nodes.lightning.wiki",
+				"soa.nodes.lightning.wiki",
 			},
 		},
 
 		BitcoinSignetGenesis: {
 			{
-				"ln.signet.secp.tech",
+				"signet.nodes.lightning.wiki",
+				"soa.nodes.lightning.wiki",
 			},
 		},
 	}