Refactor channel state in lightningd

.msggen.json

@@ -188,6 +188,7 @@
             "CLOSINGD_COMPLETE": 5,
             "CLOSINGD_SIGEXCHANGE": 4,
             "DUALOPEND_AWAITING_LOCKIN": 10,
+            "DUALOPEND_OPEN_COMMITTED": 12,
             "DUALOPEND_OPEN_INIT": 9,
             "FUNDING_SPEND_SEEN": 7,
             "ONCHAIN": 8,
@@ -251,6 +252,7 @@
             "CLOSINGD_COMPLETE": 5,
             "CLOSINGD_SIGEXCHANGE": 4,
             "DUALOPEND_AWAITING_LOCKIN": 10,
+            "DUALOPEND_OPEN_COMMITTED": 11,
             "DUALOPEND_OPEN_INIT": 9,
             "FUNDING_SPEND_SEEN": 7,
             "ONCHAIN": 8,

common/json_stream.c

@@ -387,15 +387,15 @@ void json_add_timestr(struct json_stream *result, const char *fieldname,
 
 void json_add_timeiso(struct json_stream *result,
 		      const char *fieldname,
-		      struct timeabs *time)
+		      struct timeabs time)
 {
 	char iso8601_msec_fmt[sizeof("YYYY-mm-ddTHH:MM:SS.%03dZ")];
 	char iso8601_s[sizeof("YYYY-mm-ddTHH:MM:SS.nnnZ")];
 
 	strftime(iso8601_msec_fmt, sizeof(iso8601_msec_fmt),
-		 "%FT%T.%%03dZ", gmtime(&time->ts.tv_sec));
+		 "%FT%T.%%03dZ", gmtime(&time.ts.tv_sec));
 	snprintf(iso8601_s, sizeof(iso8601_s),
-		 iso8601_msec_fmt, (int) time->ts.tv_nsec / 1000000);
+		 iso8601_msec_fmt, (int) time.ts.tv_nsec / 1000000);
 
 	json_add_string(result, fieldname, iso8601_s);
 }

common/json_stream.h

@@ -261,7 +261,7 @@ void json_add_timestr(struct json_stream *result, const char *fieldname,
 /* Add ISO_8601 timestamp string, i.e. "2019-09-07T15:50+01:00" */
 void json_add_timeiso(struct json_stream *result,
 		      const char *fieldname,
-		      struct timeabs *time);
+		      struct timeabs time);
 
 /* Add any json token */
 void json_add_tok(struct json_stream *result, const char *fieldname,

doc/lightning-listfunds.7.md

@@ -46,7 +46,7 @@ On success, an object is returned, containing:
   - **funding\_txid** (txid): funding transaction id
   - **funding\_output** (u32): the 0-based index of the output in the funding transaction
   - **connected** (boolean): whether the channel peer is connected
-  - **state** (string): the channel state, in particular "CHANNELD\_NORMAL" means the channel can be used normally (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN")
+  - **state** (string): the channel state, in particular "CHANNELD\_NORMAL" means the channel can be used normally (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN", "DUALOPEND\_OPEN\_COMMITTED")
   - **channel\_id** (hash): The full channel\_id (funding txid Xored with output number) *(added v23.05)*
 
   If **state** is "CHANNELD\_NORMAL":
@@ -74,4 +74,4 @@ RESOURCES
 
 Main web site: <https://github.com/ElementsProject/lightning>
 
-[comment]: # ( SHA256STAMP:02deef0c91e587aafe3a4b75fa45075c7246566b4baf1e73e00564d36d5a38f4)
+[comment]: # ( SHA256STAMP:f4b639bb4e7a4544e7015a67225c1ead6a2e0b9817eca5b328908576f1d17dd2)

doc/lightning-listpeerchannels.7.md

@@ -26,7 +26,7 @@ On success, an object containing **channels** is returned.  It is an array of ob
 
 - **peer\_id** (pubkey): Node Public key
 - **peer\_connected** (boolean): A boolean flag that is set to true if the peer is online
-- **state** (string): the channel state, in particular "CHANNELD\_NORMAL" means the channel can be used normally (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN", "CHANNELD\_AWAITING\_SPLICE")
+- **state** (string): the channel state, in particular "CHANNELD\_NORMAL" means the channel can be used normally (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN", "CHANNELD\_AWAITING\_SPLICE", "DUALOPEND\_OPEN\_COMMITTED")
 - **opener** (string): Who initiated the channel (one of "local", "remote")
 - **features** (array of strings):
   - BOLT #9 features which apply to this channel (one of "option\_static\_remotekey", "option\_anchor\_outputs", "option\_anchors\_zero\_fee\_htlc\_tx", "option\_scid\_alias", "option\_zeroconf")
@@ -89,8 +89,8 @@ On success, an object containing **channels** is returned.  It is an array of ob
   - **remote** (short\_channel\_id, optional): An alias assigned by the remote node to this channel, usable in routehints and invoices
 - **state\_changes** (array of objects, optional): Prior state changes:
   - **timestamp** (string): UTC timestamp of form YYYY-mm-ddTHH:MM:SS.%03dZ
-  - **old\_state** (string): Previous state (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN")
-  - **new\_state** (string): New state (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN")
+  - **old\_state** (string): Previous state (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN", "DUALOPEND\_OPEN\_COMMITTED", "CHANNELD\_AWAITING\_SPLICE")
+  - **new\_state** (string): New state (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN", "DUALOPEND\_OPEN\_COMMITTED", "CHANNELD\_AWAITING\_SPLICE")
   - **cause** (string): What caused the change (one of "unknown", "local", "user", "remote", "protocol", "onchain")
   - **message** (string): Human-readable explanation
 - **status** (array of strings, optional):
@@ -196,4 +196,4 @@ Main web site: <https://github.com/ElementsProject/lightning> Lightning
 RFC site (BOLT \#9):
 <https://github.com/lightningnetwork/lightning-rfc/blob/master/09-features.md>
 
-[comment]: # ( SHA256STAMP:359d0035f98350d2de5f539ce8d2c3d82ccf633d3cbee4ed992a71687a25770a)
+[comment]: # ( SHA256STAMP:c69bd45ebbfc508c0b3998d6b875993d321f26dc4e8ba88830999851623e5206)

doc/lightning-listpeers.7.md

@@ -66,7 +66,7 @@ On success, an object containing **peers** is returned.  It is an array of objec
     - **node\_id** (pubkey): The peer this is associated with
     - **data** (hex): The IO which occurred
 - **channels** (array of objects, optional) **deprecated, removal in v23.11**:
-  - **state** (string): the channel state, in particular "CHANNELD\_NORMAL" means the channel can be used normally (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN")
+  - **state** (string): the channel state, in particular "CHANNELD\_NORMAL" means the channel can be used normally (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN", "DUALOPEND\_OPEN\_COMMITTED")
   - **opener** (string): Who initiated the channel (one of "local", "remote")
   - **features** (array of strings):
     - BOLT #9 features which apply to this channel (one of "option\_static\_remotekey", "option\_anchor\_outputs", "option\_scid\_alias", "option\_zeroconf")
@@ -123,8 +123,8 @@ On success, an object containing **peers** is returned.  It is an array of objec
     - **remote** (short\_channel\_id, optional): An alias assigned by the remote node to this channel, usable in routehints and invoices
   - **state\_changes** (array of objects, optional): Prior state changes:
     - **timestamp** (string): UTC timestamp of form YYYY-mm-ddTHH:MM:SS.%03dZ
-    - **old\_state** (string): Previous state (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN")
-    - **new\_state** (string): New state (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN")
+    - **old\_state** (string): Previous state (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN", "DUALOPEND\_OPEN\_COMMITTED")
+    - **new\_state** (string): New state (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN", "DUALOPEND\_OPEN\_COMMITTED")
     - **cause** (string): What caused the change (one of "unknown", "local", "user", "remote", "protocol", "onchain")
     - **message** (string): Human-readable explanation
   - **status** (array of strings, optional):
@@ -399,4 +399,4 @@ Main web site: <https://github.com/ElementsProject/lightning> Lightning
 RFC site (BOLT \#9):
 <https://github.com/lightning/bolts/blob/master/09-features.md>
 
-[comment]: # ( SHA256STAMP:7402bcd43be7c031c1e8e1ec7a4d58e94beb44ca48ba2f8f06e4ea908ab8940b)
+[comment]: # ( SHA256STAMP:32075bc65e686b04617f4c1fa068b5fd0ac84afec057f06f19df6f56328d2dd9)

doc/schemas/listfunds.schema.json

@@ -184,7 +184,8 @@
               "FUNDING_SPEND_SEEN",
               "ONCHAIN",
               "DUALOPEND_OPEN_INIT",
-              "DUALOPEND_AWAITING_LOCKIN"
+              "DUALOPEND_AWAITING_LOCKIN",
+              "DUALOPEND_OPEN_COMMITTED"
             ],
             "description": "the channel state, in particular \"CHANNELD_NORMAL\" means the channel can be used normally"
           },

doc/schemas/listpeerchannels.schema.json

@@ -42,7 +42,8 @@
               "ONCHAIN",
               "DUALOPEND_OPEN_INIT",
               "DUALOPEND_AWAITING_LOCKIN",
-              "CHANNELD_AWAITING_SPLICE"
+              "CHANNELD_AWAITING_SPLICE",
+              "DUALOPEND_OPEN_COMMITTED"
             ],
             "description": "the channel state, in particular \"CHANNELD_NORMAL\" means the channel can be used normally"
           },
@@ -378,7 +379,9 @@
                     "FUNDING_SPEND_SEEN",
                     "ONCHAIN",
                     "DUALOPEND_OPEN_INIT",
-                    "DUALOPEND_AWAITING_LOCKIN"
+                    "DUALOPEND_AWAITING_LOCKIN",
+                    "DUALOPEND_OPEN_COMMITTED",
+                    "CHANNELD_AWAITING_SPLICE"
                   ],
                   "description": "Previous state"
                 },
@@ -395,7 +398,9 @@
                     "FUNDING_SPEND_SEEN",
                     "ONCHAIN",
                     "DUALOPEND_OPEN_INIT",
-                    "DUALOPEND_AWAITING_LOCKIN"
+                    "DUALOPEND_AWAITING_LOCKIN",
+                    "DUALOPEND_OPEN_COMMITTED",
+                    "CHANNELD_AWAITING_SPLICE"
                   ],
                   "description": "New state"
                 },

doc/schemas/listpeers.schema.json

@@ -196,7 +196,8 @@
                     "FUNDING_SPEND_SEEN",
                     "ONCHAIN",
                     "DUALOPEND_OPEN_INIT",
-                    "DUALOPEND_AWAITING_LOCKIN"
+                    "DUALOPEND_AWAITING_LOCKIN",
+                    "DUALOPEND_OPEN_COMMITTED"
                   ],
                   "description": "the channel state, in particular \"CHANNELD_NORMAL\" means the channel can be used normally"
                 },
@@ -493,7 +494,8 @@
                           "FUNDING_SPEND_SEEN",
                           "ONCHAIN",
                           "DUALOPEND_OPEN_INIT",
-                          "DUALOPEND_AWAITING_LOCKIN"
+                          "DUALOPEND_AWAITING_LOCKIN",
+                          "DUALOPEND_OPEN_COMMITTED"
                         ],
                         "description": "Previous state"
                       },
@@ -510,7 +512,8 @@
                           "FUNDING_SPEND_SEEN",
                           "ONCHAIN",
                           "DUALOPEND_OPEN_INIT",
-                          "DUALOPEND_AWAITING_LOCKIN"
+                          "DUALOPEND_AWAITING_LOCKIN",
+                          "DUALOPEND_OPEN_COMMITTED"
                         ],
                         "description": "New state"
                       },

lightningd/chaintopology.c

@@ -306,25 +306,24 @@ void broadcast_tx_(struct chain_topology *topo,
 }
 
 static enum watch_result closeinfo_txid_confirmed(struct lightningd *ld,
-						  struct channel *channel,
 						  const struct bitcoin_txid *txid,
 						  const struct bitcoin_tx *tx,
-						  unsigned int depth)
+						  unsigned int depth,
+						  void *unused)
 {
 	/* Sanity check. */
 	if (tx != NULL) {
 		struct bitcoin_txid txid2;
 
 		bitcoin_txid(tx, &txid2);
 		if (!bitcoin_txid_eq(txid, &txid2)) {
-			channel_internal_error(channel, "Txid for %s is not %s",
-					       type_to_string(tmpctx,
-							      struct bitcoin_tx,
-							      tx),
-					       type_to_string(tmpctx,
-							      struct bitcoin_txid,
-							      txid));
-			return DELETE_WATCH;
+			fatal("Txid for %s is not %s",
+			      type_to_string(tmpctx,
+					     struct bitcoin_tx,
+					     tx),
+			      type_to_string(tmpctx,
+					     struct bitcoin_txid,
+					     txid));
 		}
 	}
 
@@ -358,12 +357,13 @@ static void watch_for_utxo_reconfirmation(struct chain_topology *topo,
 		assert(unconfirmed[i]->close_info != NULL);
 		assert(unconfirmed[i]->blockheight == NULL);
 
-		if (find_txwatch(topo, &unconfirmed[i]->outpoint.txid, NULL))
+		if (find_txwatch(topo, &unconfirmed[i]->outpoint.txid,
+				 closeinfo_txid_confirmed, NULL))
 			continue;
 
-		watch_txid(topo, topo, NULL,
+		watch_txid(topo, topo,
 			   &unconfirmed[i]->outpoint.txid,
-			   closeinfo_txid_confirmed);
+			   closeinfo_txid_confirmed, NULL);
 	}
 }