lnd: properly initialize entities of new contractcourt package

server.go

@@ -17,8 +17,10 @@ import (
 	"github.com/lightningnetwork/lnd/autopilot"
 	"github.com/lightningnetwork/lnd/brontide"
 	"github.com/lightningnetwork/lnd/channeldb"
+	"github.com/lightningnetwork/lnd/contractcourt"
 	"github.com/lightningnetwork/lnd/discovery"
 	"github.com/lightningnetwork/lnd/lnrpc"
+	"github.com/lightningnetwork/lnd/lnwallet"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/routing"
 	"github.com/roasbeef/btcd/blockchain"
@@ -86,8 +88,12 @@ type server struct {
 
 	chanDB *channeldb.DB
 
-	htlcSwitch    *htlcswitch.Switch
-	invoices      *invoiceRegistry
+	htlcSwitch *htlcswitch.Switch
+
+	invoices *invoiceRegistry
+
+	witnessBeacon contractcourt.WitnessBeacon
+
 	breachArbiter *breachArbiter
 
 	chanRouter *routing.ChannelRouter
@@ -96,6 +102,8 @@ type server struct {
 
 	utxoNursery *utxoNursery
 
+	chainArb *contractcourt.ChainArbitrator
+
 	sphinx *htlcswitch.OnionProcessor
 
 	connMgr *connmgr.ConnManager
@@ -162,6 +170,8 @@ func newServer(listenAddrs []string, chanDB *channeldb.DB, cc *chainControl,
 		quit: make(chan struct{}),
 	}
 
+	s.witnessBeacon = NewPreimageBeacon(s.invoices, chanDB.NewWitnessCache())
+
 	// If the debug HTLC flag is on, then we invoice a "master debug"
 	// invoice which all outgoing payments will be sent and all incoming
 	// HTLCs with the debug R-Hash immediately settled.
@@ -343,6 +353,55 @@ func newServer(listenAddrs []string, chanDB *channeldb.DB, cc *chainControl,
 		s.htlcSwitch.CloseLink(chanPoint, closureType, 0)
 	}
 
+	s.chainArb = contractcourt.NewChainArbitrator(contractcourt.ChainArbitratorConfig{
+		ChainHash: *activeNetParams.GenesisHash,
+		// TODO(roasbeef): properly configure
+		//  * needs to be << or specified final hop time delta
+		BroadcastDelta: defaultBroadcastDelta,
+		NewSweepAddr: func() ([]byte, error) {
+			return newSweepPkScript(cc.wallet)
+		},
+		PublishTx: cc.wallet.PublishTransaction,
+		DeliverResolutionMsg: func(msgs ...contractcourt.ResolutionMsg) error {
+			for _, msg := range msgs {
+				err := s.htlcSwitch.ProcessContractResolution(msg)
+				if err != nil {
+					return err
+				}
+			}
+			return nil
+		},
+		IncubateOutputs: func(chanPoint wire.OutPoint,
+			commitRes *lnwallet.CommitOutputResolution,
+			outHtlcRes *lnwallet.OutgoingHtlcResolution,
+			inHtlcRes *lnwallet.IncomingHtlcResolution) error {
+
+			var (
+				inRes  []lnwallet.IncomingHtlcResolution
+				outRes []lnwallet.OutgoingHtlcResolution
+			)
+			if inHtlcRes != nil {
+				inRes = append(inRes, *inHtlcRes)
+			}
+			if outHtlcRes != nil {
+				outRes = append(outRes, *outHtlcRes)
+			}
+
+			return s.utxoNursery.IncubateOutputs(
+				chanPoint, commitRes, outRes, inRes,
+			)
+		},
+		PreimageDB:   s.witnessBeacon,
+		Notifier:     cc.chainNotifier,
+		Signer:       cc.wallet.Cfg.Signer,
+		FeeEstimator: cc.feeEstimator,
+		ChainIO:      cc.chainIO,
+		MarkLinkInactive: func(chanPoint wire.OutPoint) error {
+			chanID := lnwire.NewChanIDFromOutPoint(&chanPoint)
+			return s.htlcSwitch.RemoveLink(chanID)
+		},
+	}, chanDB)
+
 	s.breachArbiter = newBreachArbiter(&BreachConfig{
 		CloseLink: closeLink,
 		DB:        chanDB,
@@ -354,6 +413,16 @@ func newServer(listenAddrs []string, chanDB *channeldb.DB, cc *chainControl,
 		PublishTransaction: cc.wallet.PublishTransaction,
 		Signer:             cc.wallet.Cfg.Signer,
 		Store:              newRetributionStore(chanDB),
+		UpdateCloseSignal: func(op *wire.OutPoint,
+			ucs chan *lnwallet.UnilateralCloseSummary) error {
+
+			signals := &contractcourt.ContractSignals{
+				HtlcUpdates:    make(chan []channeldb.HTLC),
+				UniCloseSignal: ucs,
+			}
+
+			return s.chainArb.UpdateContractSignals(*op, signals)
+		},
 	})
 
 	// Create the connection manager which will be responsible for
@@ -405,6 +474,9 @@ func (s *server) Start() error {
 	if err := s.utxoNursery.Start(); err != nil {
 		return err
 	}
+	if err := s.chainArb.Start(); err != nil {
+		return err
+	}
 	if err := s.breachArbiter.Start(); err != nil {
 		return err
 	}
@@ -461,6 +533,7 @@ func (s *server) Stop() error {
 	s.utxoNursery.Stop()
 	s.breachArbiter.Stop()
 	s.authGossiper.Stop()
+	s.chainArb.Stop()
 	s.cc.wallet.Shutdown()
 	s.cc.chainView.Stop()
 	s.connMgr.Stop()