diff --git a/doc/schemas/fundchannel_cancel.request.json b/doc/schemas/fundchannel_cancel.request.json
new file mode 100644
index 000000000000..5f0c8f7345c2
--- /dev/null
+++ b/doc/schemas/fundchannel_cancel.request.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "id"
+  ],
+  "properties": {
+    "id": {
+      "type": "pubkey",
+      "description": "the node id of the remote peer with which to cancel"
+    }
+  }
+}
diff --git a/doc/schemas/fundchannel_complete.request.json b/doc/schemas/fundchannel_complete.request.json
new file mode 100644
index 000000000000..2939acc10524
--- /dev/null
+++ b/doc/schemas/fundchannel_complete.request.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "id",
+    "psbt"
+  ],
+  "properties": {
+    "id": {
+      "type": "pubkey",
+      "description": "id is the node id of the remote peer."
+    },
+    "psbt": {
+      "type": "string",
+      "description": "the transaction to use for funding (does not need to be signed but must be otherwise complete)"
+    }
+  }
+}
diff --git a/doc/schemas/fundchannel_start.request.json b/doc/schemas/fundchannel_start.request.json
index 41f381809abc..e71b8ea01dab 100644
--- a/doc/schemas/fundchannel_start.request.json
+++ b/doc/schemas/fundchannel_start.request.json
@@ -8,28 +8,36 @@
   ],
   "properties": {
     "id": {
-      "type": "pubkey"
+      "type": "pubkey",
+      "description": "id is the peer id obtained from connect."
     },
     "amount": {
-      "type": "msat"
+      "type": "msat_or_all",
+      "description": "The amount that the channel will be funded."
     },
     "feerate": {
-      "type": "feerate"
+      "type": "feerate",
+      "description": "Sets the feerate for the subsequent commitment transaction."
     },
     "announce": {
-      "type": "boolean"
+      "type": "boolean",
+      "description": "Whether or not to announce the channel."
     },
     "close_to": {
-      "type": "hex"
+      "type": "string",
+      "description": "A bitcoin address to which the channel funds should be sent to on close."
     },
     "push_msat": {
-      "type": "msat"
+      "type": "msat",
+      "description": "The amount of millisatoshis to push to the channel at open. This is a gift to the peer."
     },
     "mindepth": {
-      "type": "u32"
+      "type": "u32",
+      "description": "Number of confirmations required before we consider the channel active"
     },
     "reserve": {
-      "type": "msat"
+      "type": "msat",
+      "description": "The amount we want the peer to maintain on its side"
     },
     "channel_type": {
       "type": "array",
diff --git a/external/lnprototest b/external/lnprototest
index 3898f53b6681..a8d4dcf6b859 160000
--- a/external/lnprototest
+++ b/external/lnprototest
@@ -1 +1 @@
-Subproject commit 3898f53b6681cbd9bc8883920f6ada2ce2b8422f
+Subproject commit a8d4dcf6b859f3c11c92a917f7c48b2051dbb4c4