From acc45934f89d4c0de863f6a7590a98be55eb33e4 Mon Sep 17 00:00:00 2001
From: "Johan T. Halseth" <johanth@gmail.com>
Date: Wed, 18 Nov 2020 22:45:35 +0100
Subject: [PATCH] contraccourt/chain_watcher: define handleKnownLocalState

We can only rely on the commit set and height being correct for the
current commit, so check that first.
---
 contractcourt/chain_watcher.go | 45 ++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/contractcourt/chain_watcher.go b/contractcourt/chain_watcher.go
index ee62c0ceb..aacac7d54 100644
--- a/contractcourt/chain_watcher.go
+++ b/contractcourt/chain_watcher.go
@@ -533,6 +533,19 @@ func (c *chainWatcher) closeObserver(spendNtfn *chainntnfs.SpendEvent) {
 			commitTxBroadcast, obfuscator,
 		)
 
+		// We'll go on to check whether it could be our own commitment
+		// that was published and know is confirmed.
+		ok, err = c.handleKnownLocalState(commitSpend, chainSet)
+		if err != nil {
+			log.Errorf("Unable to handle known local state: %v",
+				err)
+			return
+		}
+
+		if ok {
+			return
+		}
+
 		// Based on the output scripts within this commitment, we'll
 		// determine if this is our commitment transaction or not (a
 		// self force close).
@@ -724,6 +737,38 @@ func (c *chainWatcher) closeObserver(spendNtfn *chainntnfs.SpendEvent) {
 	}
 }
 
+// handleKnownLocalState checks whether the passed spend is a local state that
+// is known to us (the current state). If so we will act on this state using
+// the passed chainSet. If this is not a known local state, false is returned.
+func (c *chainWatcher) handleKnownLocalState(
+	commitSpend *chainntnfs.SpendDetail, chainSet *chainSet) (bool, error) {
+
+	// If the channel is recovered, we won't have a local commit to check
+	// against, so immediately return.
+	if c.cfg.chanState.HasChanStatus(channeldb.ChanStatusRestored) {
+		return false, nil
+	}
+
+	commitTxBroadcast := commitSpend.SpendingTx
+	commitHash := commitTxBroadcast.TxHash()
+
+	// Check whether our latest local state hit the chain.
+	if chainSet.localCommit.CommitTx.TxHash() != commitHash {
+		return false, nil
+	}
+
+	chainSet.commitSet.ConfCommitKey = &LocalHtlcSet
+	if err := c.dispatchLocalForceClose(
+		commitSpend, chainSet.localCommit, chainSet.commitSet,
+	); err != nil {
+		return false, fmt.Errorf("unable to handle local"+
+			"close for chan_point=%v: %v",
+			c.cfg.chanState.FundingOutpoint, err)
+	}
+
+	return true, nil
+}
+
 // toSelfAmount takes a transaction and returns the sum of all outputs that pay
 // to a script that the wallet controls. If no outputs pay to us, then we
 // return zero. This is possible as our output may have been trimmed due to