cln: handle missing htlc_accepted fields

breez · Nov 18, 2024 · ff1ce12 · ff1ce12
1 parent 74f12b9
commit ff1ce12
Show file tree

Hide file tree

Showing 5 changed files with 122 additions and 107 deletions.
diff --git a/cln/cln_interceptor.go b/cln/cln_interceptor.go
@@ -140,27 +140,33 @@ func (i *ClnHtlcInterceptor) intercept() error {
 					return
 				}
 
-				if request.Onion == nil || request.Onion.ShortChannelId == "" {
+				if request.Onion == nil ||
+					request.Onion.ShortChannelId == nil ||
+					*request.Onion.ShortChannelId == "" ||
+					request.Onion.SharedSecret == nil ||
+					request.Onion.ForwardMsat == nil ||
+					request.Onion.OutgoingCltvValue == nil {
+
 					interceptorClient.Send(i.defaultResolution(request))
 					i.doneWg.Done()
 					return
 				}
 
-				scid, err := lightning.NewShortChannelIDFromString(request.Onion.ShortChannelId)
+				scid, err := lightning.NewShortChannelIDFromString(*request.Onion.ShortChannelId)
 				if err != nil {
 					interceptorClient.Send(i.defaultResolution(request))
 					i.doneWg.Done()
 					return
 				}
 
 				interceptResult := i.interceptor.Intercept(common.InterceptRequest{
-					Identifier:         request.Onion.SharedSecret,
+					Identifier:         *request.Onion.SharedSecret,
 					Scid:               *scid,
 					PaymentHash:        paymentHash,
 					IncomingAmountMsat: request.Htlc.AmountMsat,
-					OutgoingAmountMsat: request.Onion.ForwardMsat,
+					OutgoingAmountMsat: *request.Onion.ForwardMsat,
 					IncomingExpiry:     request.Htlc.CltvExpiry,
-					OutgoingExpiry:     request.Onion.OutgoingCltvValue,
+					OutgoingExpiry:     *request.Onion.OutgoingCltvValue,
 				})
 				switch interceptResult.Action {
 				case common.INTERCEPT_RESUME_WITH_ONION:

diff --git a/cln_plugin/cln_messages.go b/cln_plugin/cln_messages.go
@@ -94,12 +94,12 @@ type HtlcAccepted struct {
 }
 
 type Onion struct {
-	Payload           string `json:"payload"`
-	ShortChannelId    string `json:"short_channel_id"`
-	ForwardMsat       uint64 `json:"forward_msat"`
-	OutgoingCltvValue uint32 `json:"outgoing_cltv_value"`
-	SharedSecret      string `json:"shared_secret"`
-	NextOnion         string `json:"next_onion"`
+	Payload           string  `json:"payload"`
+	ShortChannelId    *string `json:"short_channel_id,omitempty"`
+	ForwardMsat       *uint64 `json:"forward_msat,omitempty"`
+	OutgoingCltvValue *uint32 `json:"outgoing_cltv_value,omitempty"`
+	SharedSecret      *string `json:"shared_secret,omitempty"`
+	NextOnion         *string `json:"next_onion,omitempty"`
 }
 
 type Htlc struct {