Merge branch 'ElementsProject:master' into 2817-bitcoin-rpcclienttime…

…out-parameter
ElementsProject · Feb 20, 2024 · 56affbf · 56affbf
2 parents cae2cd6 + 052542e
commit 56affbf
Show file tree

Hide file tree

Showing 122 changed files with 2,131 additions and 967 deletions.
diff --git a/.msggen.json b/.msggen.json
@@ -1184,6 +1184,7 @@
             "ListPeerChannels.channels[].initial_feerate": 12,
             "ListPeerChannels.channels[].last_feerate": 13,
             "ListPeerChannels.channels[].last_stable_connection": 56,
+            "ListPeerChannels.channels[].lost_state": 57,
             "ListPeerChannels.channels[].max_accepted_htlcs": 40,
             "ListPeerChannels.channels[].max_to_us_msat": 25,
             "ListPeerChannels.channels[].max_total_htlc_in_msat": 30,
@@ -4589,6 +4590,10 @@
             "added": "v24.02",
             "deprecated": false
         },
+        "ListPeerChannels.channels[].lost_state": {
+            "added": "v24.02",
+            "deprecated": false
+        },
         "ListPeerChannels.channels[].max_accepted_htlcs": {
             "added": "v23.02",
             "deprecated": false

diff --git a/bitcoin/chainparams.h b/bitcoin/chainparams.h
@@ -29,7 +29,7 @@ struct chainparams {
 	 *
 	 * - Bitcoin mainet with port number 9735 or the corresponding hexadecimal `0x2607`;
 	 * - Bitcoin testnet with port number 19735 (`0x4D17`);
-	 * - Bitcoin signet with port number 39735 (`0xF87`).
+	 * - Bitcoin signet with port number 39735 (`0x9B37`).
 	 */
 	const int ln_port;
 	const char *cli;