htlcswitch: expose additional fields for intercepted packets

lnrpc/routerrpc/router.swagger.json

@@ -907,11 +907,26 @@
           "$ref": "#/definitions/routerrpcCircuitKey",
           "description": "The key of this forwarded htlc. It defines the incoming channel id and\nthe index in this channel."
         },
+        "incoming_amount_msat": {
+          "type": "string",
+          "format": "uint64",
+          "description": "The incoming htlc amount."
+        },
+        "incoming_expiry": {
+          "type": "integer",
+          "format": "int64",
+          "description": "The incoming htlc expiry."
+        },
         "payment_hash": {
           "type": "string",
           "format": "byte",
           "description": "The htlc payment hash. This value is not guaranteed to be unique per\nrequest."
         },
+        "outgoing_requested_chan_id": {
+          "type": "string",
+          "format": "uint64",
+          "description": "The requested outgoing channel id for this forwarded htlc. Because of\nnon-strict forwarding, this isn't necessarily the channel over which the\npacket will be forwarded eventually. A different channel to the same peer\nmay be selected as well."
+        },
         "outgoing_amount_msat": {
           "type": "string",
           "format": "uint64",