From 8b02064c7b4d860c664dee3bbafe9f1a7b008f96 Mon Sep 17 00:00:00 2001
From: "Johan T. Halseth" <johanth@gmail.com>
Date: Thu, 29 Mar 2018 15:31:09 +0200
Subject: [PATCH] multi: provide mempool=true to RegisterSpendNtfn

---
 breacharbiter.go                    | 2 +-
 contractcourt/chain_arbitrator.go   | 2 +-
 contractcourt/chain_watcher.go      | 2 +-
 contractcourt/contract_resolvers.go | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/breacharbiter.go b/breacharbiter.go
index c5478056..7663a9bd 100644
--- a/breacharbiter.go
+++ b/breacharbiter.go
@@ -519,7 +519,7 @@ secondLevelCheck:
 			if !ok {
 				spendNtfn, err = b.cfg.Notifier.RegisterSpendNtfn(
 					&breachedOutput.outpoint,
-					breachInfo.breachHeight,
+					breachInfo.breachHeight, true,
 				)
 				if err != nil {
 					brarLog.Errorf("unable to check for "+
diff --git a/contractcourt/chain_arbitrator.go b/contractcourt/chain_arbitrator.go
index 8c8ab1ec..03be99c0 100644
--- a/contractcourt/chain_arbitrator.go
+++ b/contractcourt/chain_arbitrator.go
@@ -477,7 +477,7 @@ func (c *ChainArbitrator) Stop() error {
 // NOTE: This must be launched as a goroutine.
 func (c *ChainArbitrator) watchForChannelClose(closeInfo *channeldb.ChannelCloseSummary) {
 	spendNtfn, err := c.cfg.Notifier.RegisterSpendNtfn(
-		&closeInfo.ChanPoint, closeInfo.CloseHeight,
+		&closeInfo.ChanPoint, closeInfo.CloseHeight, true,
 	)
 	if err != nil {
 		log.Errorf("unable to register for spend: %v", err)
diff --git a/contractcourt/chain_watcher.go b/contractcourt/chain_watcher.go
index 8a893e82..7daf5668 100644
--- a/contractcourt/chain_watcher.go
+++ b/contractcourt/chain_watcher.go
@@ -180,7 +180,7 @@ func (c *chainWatcher) Start() error {
 	}
 
 	spendNtfn, err := c.notifier.RegisterSpendNtfn(
-		fundingOut, heightHint,
+		fundingOut, heightHint, true,
 	)
 	if err != nil {
 		return err
diff --git a/contractcourt/contract_resolvers.go b/contractcourt/contract_resolvers.go
index 6cb8063c..ac5ed923 100644
--- a/contractcourt/contract_resolvers.go
+++ b/contractcourt/contract_resolvers.go
@@ -173,7 +173,7 @@ func (h *htlcTimeoutResolver) Resolve() (ContractResolver, error) {
 		// to confirm.
 		spendNtfn, err := h.Notifier.RegisterSpendNtfn(
 			&h.htlcResolution.ClaimOutpoint,
-			h.broadcastHeight,
+			h.broadcastHeight, true,
 		)
 		if err != nil {
 			return err
@@ -608,7 +608,7 @@ func (h *htlcSuccessResolver) Resolve() (ContractResolver, error) {
 	// To wrap this up, we'll wait until the second-level transaction has
 	// been spent, then fully resolve the contract.
 	spendNtfn, err := h.Notifier.RegisterSpendNtfn(
-		&h.htlcResolution.ClaimOutpoint, h.broadcastHeight,
+		&h.htlcResolution.ClaimOutpoint, h.broadcastHeight, true,
 	)
 	if err != nil {
 		return nil, err
@@ -820,7 +820,7 @@ func (h *htlcOutgoingContestResolver) Resolve() (ContractResolver, error) {
 	// the remote party sweeps with the pre-image, we'll  be notified.
 	spendNtfn, err := h.Notifier.RegisterSpendNtfn(
 		&outPointToWatch,
-		h.broadcastHeight,
+		h.broadcastHeight, true,
 	)
 	if err != nil {
 		return nil, err
@@ -1316,7 +1316,7 @@ func (c *commitSweepResolver) Resolve() (ContractResolver, error) {
 		// until the commitment output has been spent.
 		spendNtfn, err := c.Notifier.RegisterSpendNtfn(
 			&c.commitResolution.SelfOutPoint,
-			c.broadcastHeight,
+			c.broadcastHeight, true,
 		)
 		if err != nil {
 			return nil, err