router: add resume modified response and fields

Author: guggero

router_client.go

@@ -344,6 +344,10 @@ type InterceptedHtlc struct {
 
 	// OnionBlob is the onion blob for the next hop.
 	OnionBlob []byte
+
+	// InWireCustomRecords are custom records sent by the sender that were
+	// only present in the wire message and not the onion itself.
+	InWireCustomRecords map[uint64][]byte
 }
 
 // HtlcInterceptHandler is a function signature for handling code for htlc
@@ -367,6 +371,10 @@ const (
 	// InterceptorActionResume indicates that an intercepted hltc should be
 	// resumed as normal.
 	InterceptorActionResume
+
+	// InterceptorActionResumeModified indicates that an intercepted hltc
+	// should be resumed as normal, but with modifications.
+	InterceptorActionResumeModified
 )
 
 // InterceptedHtlcResponse contains the actions that must be taken for an
@@ -379,6 +387,19 @@ type InterceptedHtlcResponse struct {
 	// Action is the action that should be taken for the htlc that is
 	// intercepted.
 	Action InterceptorAction
+
+	// IncomingAmount is the amount that should be used to validate the
+	// incoming htlc. This might be different from the actual HTLC amount
+	// for custom channels.
+	IncomingAmount lnwire.MilliSatoshi
+
+	// OutgoingAmount is the amount that should be set on the HTLC that is
+	// forwarded.
+	OutgoingAmount lnwire.MilliSatoshi
+
+	// CustomRecords are the custom records that should be added to the
+	// outgoing/forwarded HTLC.
+	CustomRecords map[uint64][]byte
 }
 
 // routerClient is a wrapper around the generated routerrpc proxy.
@@ -798,6 +819,7 @@ func (r *routerClient) InterceptHtlcs(ctx context.Context,
 			chanOut := lnwire.NewShortChanIDFromInt(
 				request.OutgoingRequestedChanId,
 			)
+			inWireCustomRecords := request.InWireCustomRecords
 
 			req := InterceptedHtlc{
 				IncomingCircuitKey: invpkg.CircuitKey{
@@ -816,6 +838,7 @@ func (r *routerClient) InterceptHtlcs(ctx context.Context,
 				OutgoingChannelID:    chanOut,
 				CustomRecords:        request.CustomRecords,
 				OnionBlob:            request.OnionBlob,
+				InWireCustomRecords:  inWireCustomRecords,
 			}
 
 			// Try to send our interception request, failing on
@@ -915,6 +938,14 @@ func rpcInterceptorResponse(request InterceptedHtlc,
 	case InterceptorActionResume:
 		rpcResp.Action = routerrpc.ResolveHoldForwardAction_RESUME
 
+	case InterceptorActionResumeModified:
+		//nolint:lll
+		rpcResp.Action = routerrpc.ResolveHoldForwardAction_RESUME_MODIFIED
+
+		rpcResp.InAmountMsat = uint64(response.IncomingAmount)
+		rpcResp.OutAmountMsat = uint64(response.OutgoingAmount)
+		rpcResp.OutWireCustomRecords = response.CustomRecords
+
 	default:
 		return nil, fmt.Errorf("unknown action: %v", response.Action)
 	}