From 088fb33718c51a91632a86becd658163a44db9c8 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Wed, 19 Dec 2018 21:50:45 -0800
Subject: [PATCH] contractcourt: nil keyring curves on breach info

---
 contractcourt/chain_watcher.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/contractcourt/chain_watcher.go b/contractcourt/chain_watcher.go
index 1bc1ee187..7503c591d 100644
--- a/contractcourt/chain_watcher.go
+++ b/contractcourt/chain_watcher.go
@@ -747,13 +747,27 @@ func (c *chainWatcher) dispatchContractBreach(spendEvent *chainntnfs.SpendDetail
 		retribution.RemoteOutputSignDesc.DoubleTweak != nil {
 		retribution.RemoteOutputSignDesc.DoubleTweak.Curve = nil
 	}
+	if retribution.RemoteOutputSignDesc != nil &&
+		retribution.RemoteOutputSignDesc.KeyDesc.PubKey != nil {
+		retribution.RemoteOutputSignDesc.KeyDesc.PubKey.Curve = nil
+	}
 	if retribution.LocalOutputSignDesc != nil &&
 		retribution.LocalOutputSignDesc.DoubleTweak != nil {
 		retribution.LocalOutputSignDesc.DoubleTweak.Curve = nil
 	}
+	if retribution.LocalOutputSignDesc != nil &&
+		retribution.LocalOutputSignDesc.KeyDesc.PubKey != nil {
+		retribution.LocalOutputSignDesc.KeyDesc.PubKey.Curve = nil
+	}
 
 	log.Debugf("Punishment breach retribution created: %v",
 		newLogClosure(func() string {
+			retribution.KeyRing.CommitPoint.Curve = nil
+			retribution.KeyRing.LocalHtlcKey = nil
+			retribution.KeyRing.RemoteHtlcKey = nil
+			retribution.KeyRing.DelayKey = nil
+			retribution.KeyRing.NoDelayKey = nil
+			retribution.KeyRing.RevocationKey = nil
 			return spew.Sdump(retribution)
 		}))