Merge pull request #6347 from yyforyongyu/5388-rm-revc-log

lnwallet+channeldb: store minimal info in revocation log bucket

watchtower/wtclient/backup_task.go

@@ -346,7 +346,7 @@ func (t *backupTask) craftSessionPayload(
 		}
 	}
 
-	breachTxID := t.breachInfo.BreachTransaction.TxHash()
+	breachTxID := t.breachInfo.BreachTxHash
 
 	// Compute the breach key as SHA256(txid).
 	hint, key := blob.NewBreachHintAndKeyFromHash(&breachTxID)

watchtower/wtclient/backup_task_internal_test.go

@@ -124,8 +124,8 @@ func genTaskTest(
 	// the breach transaction, which we will continue to modify.
 	breachTxn := wire.NewMsgTx(2)
 	breachInfo := &lnwallet.BreachRetribution{
-		RevokedStateNum:   stateNum,
-		BreachTransaction: breachTxn,
+		RevokedStateNum: stateNum,
+		BreachTxHash:    breachTxn.TxHash(),
 		KeyRing: &lnwallet.CommitmentKeyRing{
 			RevocationKey: revPK,
 			ToLocalKey:    toLocalPK,
@@ -607,7 +607,7 @@ func testBackupTask(t *testing.T, test backupTaskTest) {
 	}
 
 	// Verify that the breach hint matches the breach txid's prefix.
-	breachTxID := test.breachInfo.BreachTransaction.TxHash()
+	breachTxID := test.breachInfo.BreachTxHash
 	expHint := blob.NewBreachHintFromHash(&breachTxID)
 	if hint != expHint {
 		t.Fatalf("breach hint mismatch, want: %x, got: %v",

watchtower/wtclient/client_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightningnetwork/lnd/channeldb"
@@ -300,7 +301,7 @@ func (c *mockChannel) createRemoteCommitTx(t *testing.T) {
 	}
 
 	retribution := &lnwallet.BreachRetribution{
-		BreachTransaction:    commitTxn,
+		BreachTxHash:         commitTxn.TxHash(),
 		RevokedStateNum:      c.commitHeight,
 		KeyRing:              commitKeyRing,
 		RemoteDelay:          c.csvDelay,
@@ -360,13 +361,15 @@ func (c *mockChannel) receivePayment(t *testing.T, amt lnwire.MilliSatoshi) {
 }
 
 // getState retrieves the channel's commitment and retribution at state i.
-func (c *mockChannel) getState(i uint64) (*wire.MsgTx, *lnwallet.BreachRetribution) {
+func (c *mockChannel) getState(
+	i uint64) (chainhash.Hash, *lnwallet.BreachRetribution) {
+
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
 	retribution := c.retributions[i]
 
-	return retribution.BreachTransaction, retribution
+	return retribution.BreachTxHash, retribution
 }
 
 type testHarness struct {
@@ -608,8 +611,7 @@ func (h *testHarness) advanceChannelN(id uint64, n int) []blob.BreachHint {
 	var hints []blob.BreachHint
 	for i := uint64(0); i < uint64(n); i++ {
 		channel.advanceState(h.t)
-		commitTx, _ := h.channel(id).getState(i)
-		breachTxID := commitTx.TxHash()
+		breachTxID, _ := h.channel(id).getState(i)
 		hints = append(hints, blob.NewBreachHintFromHash(&breachTxID))
 	}
 
@@ -654,8 +656,7 @@ func (h *testHarness) sendPayments(id, from, to uint64,
 	var hints []blob.BreachHint
 	for i := from; i < to; i++ {
 		h.channel(id).sendPayment(h.t, amt)
-		commitTx, _ := channel.getState(i)
-		breachTxID := commitTx.TxHash()
+		breachTxID, _ := channel.getState(i)
 		hints = append(hints, blob.NewBreachHintFromHash(&breachTxID))
 	}
 
@@ -675,8 +676,7 @@ func (h *testHarness) recvPayments(id, from, to uint64,
 	var hints []blob.BreachHint
 	for i := from; i < to; i++ {
 		channel.receivePayment(h.t, amt)
-		commitTx, _ := channel.getState(i)
-		breachTxID := commitTx.TxHash()
+		breachTxID, _ := channel.getState(i)
 		hints = append(hints, blob.NewBreachHintFromHash(&breachTxID))
 	}