akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chainntnfs/tx_notifier: consume reorg notification for transactions on block inclusion

Browse Source 
In this commit, we'll attempt to consume a reorg notification for a
transaction that was previously reorged out of the chain upon block
inclusion to ensure that it is not lingering due to a client not
handling it the first time.
This commit is contained in:
Wilmer Paulino 2018-10-03 13:43:44 -07:00 committed by Conner Fromknecht
parent a4dee14b20
commit b28145b69e
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
chainntnfs/txconfnotifier.go
View File

@ -494,6 +494,9 @@ func (tcn *TxConfNotifier) ConnectTip(blockHash *chainhash.Hash,
Log.Debugf("Block contains txid=%v, constructing details", Log.Debugf("Block contains txid=%v, constructing details",
txHash) txHash)
// If we have any, we'll record its confirmed height so that
// notifications get dispatched when the transaction reaches the
// clients' desired number of confirmations.
details := &TxConfirmation{ details := &TxConfirmation{
BlockHash: blockHash, BlockHash: blockHash,
BlockHeight: blockHeight, BlockHeight: blockHeight,
@ -505,6 +508,18 @@ func (tcn *TxConfNotifier) ConnectTip(blockHash *chainhash.Hash,
for _, ntfn := range confSet.ntfns { for _, ntfn := range confSet.ntfns {
ntfn.details = details ntfn.details = details
// In the event that this notification was aware that
// the transaction was reorged out of the chain, we'll
// consume the reorg notification if it hasn't been done
// yet already.
select {
case <-ntfn.Event.NegativeConf:
default:
}
// We'll note this client's required number of
// confirmations so that we can notify them when
// expected.
confHeight := blockHeight + ntfn.NumConfirmations - 1 confHeight := blockHeight + ntfn.NumConfirmations - 1
ntfnSet, exists := tcn.ntfnsByConfirmHeight[confHeight] ntfnSet, exists := tcn.ntfnsByConfirmHeight[confHeight]
if !exists { if !exists {
@ -513,6 +528,9 @@ func (tcn *TxConfNotifier) ConnectTip(blockHash *chainhash.Hash,
} }
ntfnSet[ntfn] = struct{}{} ntfnSet[ntfn] = struct{}{}
// We'll also note the initial confirmation height in
// order to correctly handle dispatching notifications
// when the transaction gets reorged out of the chain.
txSet, exists := tcn.txsByInitialHeight[blockHeight] txSet, exists := tcn.txsByInitialHeight[blockHeight]
if !exists { if !exists {
txSet = make(map[chainhash.Hash]struct{}) txSet = make(map[chainhash.Hash]struct{})
@ -602,7 +620,7 @@ out:
// Then, we'll dispatch notifications for all the transactions that have // Then, we'll dispatch notifications for all the transactions that have
// become confirmed at this new block height. // become confirmed at this new block height.
for ntfn := range tcn.ntfnsByConfirmHeight[tcn.currentHeight] { for ntfn := range tcn.ntfnsByConfirmHeight[blockHeight] {
Log.Infof("Dispatching %v conf notification for %v", Log.Infof("Dispatching %v conf notification for %v",
ntfn.NumConfirmations, ntfn.TxID) ntfn.NumConfirmations, ntfn.TxID)