Merge pull request #9367 from lightningnetwork/0-18-4-branch-rc3

guggero · web-flow · commit ddeb8351684a · 2024-12-17T21:17:09.000+01:00
release: create branch for v0.18.4-beta
diff --git a/build/version.go b/build/version.go
@@ -47,7 +47,7 @@ const (
 
 	// AppPreRelease MUST only contain characters from semanticAlphabet per
 	// the semantic versioning spec.
-	AppPreRelease = "beta.rc2"
+	AppPreRelease = "beta"
 )
 
 func init() {
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
`@@ -47,7 +47,7 @@ const (`
`47`	`47`
`48`	`48`	`// AppPreRelease MUST only contain characters from semanticAlphabet per`
`49`	`49`	`// the semantic versioning spec.`
`50`		`- AppPreRelease = "beta.rc2"`
	`50`	`+ AppPreRelease = "beta"`
`51`	`51`	`)`
`52`	`52`
`53`	`53`	`func init() {`
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`