Merge branch '0-18-4-branch-rc3-9357' into 0-18-4-branch-rc3

guggero · guggero · commit 88cbec291c5d · 2024-12-16T12:51:50.000+01:00
diff --git a/contractcourt/htlc_incoming_contest_resolver.go b/contractcourt/htlc_incoming_contest_resolver.go
@@ -308,7 +308,8 @@ func (h *htlcIncomingContestResolver) Resolve(
 
 		resolution, err := h.Registry.NotifyExitHopHtlc(
 			h.htlc.RHash, h.htlc.Amt, h.htlcExpiry, currentHeight,
-			circuitKey, hodlQueue.ChanIn(), nil, payload,
+			circuitKey, hodlQueue.ChanIn(), h.htlc.CustomRecords,
+			payload,
 		)
 		if err != nil {
 			return nil, err

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,8 @@ func (h *htlcIncomingContestResolver) Resolve(`
`308`	`308`
`309`	`309`	`resolution, err := h.Registry.NotifyExitHopHtlc(`
`310`	`310`	`h.htlc.RHash, h.htlc.Amt, h.htlcExpiry, currentHeight,`
`311`		`- circuitKey, hodlQueue.ChanIn(), nil, payload,`
	`311`	`+ circuitKey, hodlQueue.ChanIn(), h.htlc.CustomRecords,`
	`312`	`+ payload,`
`312`	`313`	`)`
`313`	`314`	`if err != nil {`
`314`	`315`	`return nil, err`