Merge pull request #141 from lightninglabs/zombierecovery-p2tr

zombierecovery: support MuSig2 to rescue Simple Taproot channels
lightninglabs · Aug 7, 2024 · a25853f · a25853f
2 parents 3a0bb3a + b499b37
commit a25853f
Show file tree

Hide file tree

Showing 10 changed files with 722 additions and 145 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -54,6 +54,7 @@ linters:
     - protogetter
     - depguard
     - mnd
+    - gomoddirectives
 
 issues:
   exclude-rules:

diff --git a/cmd/chantools/zombierecovery_findmatches.go b/cmd/chantools/zombierecovery_findmatches.go
@@ -95,16 +95,19 @@ type nodeInfo struct {
 }
 
 type channel struct {
-	ChannelID     string `json:"short_channel_id"`
-	ChanPoint     string `json:"chan_point"`
-	Address       string `json:"address"`
-	Capacity      int64  `json:"capacity"`
-	txid          string
-	vout          uint32
-	ourKeyIndex   uint32
-	ourKey        *btcec.PublicKey
-	theirKey      *btcec.PublicKey
-	witnessScript []byte
+	ChannelID             string `json:"short_channel_id"`
+	ChanPoint             string `json:"chan_point"`
+	Address               string `json:"address"`
+	Capacity              int64  `json:"capacity"`
+	MuSig2NonceRandomness string `json:"musig2_nonce_randomness,omitempty"`
+	MuSig2Nonces          string `json:"musig2_nonces,omitempty"`
+	txid                  string
+	vout                  uint32
+	ourKeyIndex           uint32
+	ourKey                *btcec.PublicKey
+	theirKey              *btcec.PublicKey
+	pkScript              []byte
+	witnessScript         []byte
 }
 
 type match struct {