watchtower/multi: switch over to wtpolicy

migrate to using wtpolicy.Policy in wtwire messages and wtserver

watchtower/lookout/justice_descriptor_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/lightningnetwork/lnd/watchtower/blob"
 	"github.com/lightningnetwork/lnd/watchtower/lookout"
 	"github.com/lightningnetwork/lnd/watchtower/wtdb"
+	"github.com/lightningnetwork/lnd/watchtower/wtpolicy"
 )
 
 const csvDelay uint32 = 144
@@ -170,8 +171,10 @@ func TestJusticeDescriptor(t *testing.T) {
 	// parameters that should be used in constructing the justice
 	// transaction.
 	sessionInfo := &wtdb.SessionInfo{
-		SweepFeeRate:  2000,
-		RewardRate:    900000,
+		Policy: wtpolicy.Policy{
+			SweepFeeRate: 2000,
+			RewardRate:   900000,
+		},
 		RewardAddress: makeAddrSlice(22),
 	}
 

watchtower/lookout/lookout.go

@@ -210,7 +210,7 @@ func (l *Lookout) processEpoch(epoch *chainntnfs.BlockEpoch,
 		// sweep the breached commitment outputs.
 		justiceKit, err := blob.Decrypt(
 			commitTxID[:], match.EncryptedBlob,
-			match.SessionInfo.Version,
+			match.SessionInfo.Policy.BlobType,
 		)
 		if err != nil {
 			// If the decryption fails, this implies either that the

watchtower/lookout/lookout_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/lightningnetwork/lnd/watchtower/blob"
 	"github.com/lightningnetwork/lnd/watchtower/lookout"
 	"github.com/lightningnetwork/lnd/watchtower/wtdb"
+	"github.com/lightningnetwork/lnd/watchtower/wtpolicy"
 )
 
 type mockPunisher struct {
@@ -86,15 +87,25 @@ func TestLookoutBreachMatching(t *testing.T) {
 		t.Fatalf("unable to start watcher: %v", err)
 	}
 
+	rewardAndCommitType := blob.TypeFromFlags(
+		blob.FlagReward, blob.FlagCommitOutputs,
+	)
+
 	// Create two sessions, representing two distinct clients.
 	sessionInfo1 := &wtdb.SessionInfo{
-		ID:            makeArray33(1),
-		MaxUpdates:    10,
+		ID: makeArray33(1),
+		Policy: wtpolicy.Policy{
+			BlobType:   rewardAndCommitType,
+			MaxUpdates: 10,
+		},
 		RewardAddress: makeAddrSlice(22),
 	}
 	sessionInfo2 := &wtdb.SessionInfo{
-		ID:            makeArray33(2),
-		MaxUpdates:    10,
+		ID: makeArray33(2),
+		Policy: wtpolicy.Policy{
+			BlobType:   rewardAndCommitType,
+			MaxUpdates: 10,
+		},
 		RewardAddress: makeAddrSlice(22),
 	}
 
@@ -137,13 +148,13 @@ func TestLookoutBreachMatching(t *testing.T) {
 	}
 
 	// Encrypt the first justice kit under the txid of the first txn.
-	encBlob1, err := blob1.Encrypt(hash1[:], 0)
+	encBlob1, err := blob1.Encrypt(hash1[:], blob.FlagCommitOutputs.Type())
 	if err != nil {
 		t.Fatalf("unable to encrypt sweep detail 1: %v", err)
 	}
 
 	// Encrypt the second justice kit under the txid of the second txn.
-	encBlob2, err := blob2.Encrypt(hash2[:], 0)
+	encBlob2, err := blob2.Encrypt(hash2[:], blob.FlagCommitOutputs.Type())
 	if err != nil {
 		t.Fatalf("unable to encrypt sweep detail 2: %v", err)
 	}