fix: also include funding txo vout in channel backup info

getAlby · Jun 12, 2024 · 9a8bb49 · 9a8bb49
1 parent b41eeb2
commit 9a8bb49
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/events/models.go b/events/models.go
@@ -29,9 +29,10 @@ type ChannelBackupEvent struct {
 }
 
 type ChannelBackupInfo struct {
-	ChannelID   string `json:"channel_id"`
-	NodeID      string `json:"node_id"`
-	PeerID      string `json:"peer_id"`
-	ChannelSize uint64 `json:"channel_size"`
-	FundingTxID string `json:"funding_tx_id"`
+	ChannelID     string `json:"channel_id"`
+	NodeID        string `json:"node_id"`
+	PeerID        string `json:"peer_id"`
+	ChannelSize   uint64 `json:"channel_size"`
+	FundingTxID   string `json:"funding_tx_id"`
+	FundingTxVout uint32 `json:"funding_tx_vout"`
 }
diff --git a/lnclient/ldk/ldk.go b/lnclient/ldk/ldk.go
@@ -1184,17 +1184,20 @@ func (ls *LDKService) publishChannelsBackupEvent() {
 	ldkChannels := ls.node.ListChannels()
 	channels := make([]events.ChannelBackupInfo, 0, len(ldkChannels))
 	for _, ldkChannel := range ldkChannels {
-		var fundingTx string
+		var fundingTxId string
+		var fundingTxVout uint32
 		if ldkChannel.FundingTxo != nil {
-			fundingTx = ldkChannel.FundingTxo.Txid
+			fundingTxId = ldkChannel.FundingTxo.Txid
+			fundingTxVout = ldkChannel.FundingTxo.Vout
 		}
 
 		channels = append(channels, events.ChannelBackupInfo{
-			ChannelID:   ldkChannel.ChannelId,
-			NodeID:      ls.node.NodeId(),
-			PeerID:      ldkChannel.CounterpartyNodeId,
-			ChannelSize: ldkChannel.ChannelValueSats,
-			FundingTxID: fundingTx,
+			ChannelID:     ldkChannel.ChannelId,
+			NodeID:        ls.node.NodeId(),
+			PeerID:        ldkChannel.CounterpartyNodeId,
+			ChannelSize:   ldkChannel.ChannelValueSats,
+			FundingTxID:   fundingTxId,
+			FundingTxVout: fundingTxVout,
 		})
 	}