global: remove deprecated non-msat-named msat fields.

Signed-off-by: Rusty Russell <[email protected]>
Changelog-Removed: JSON-RPC: all the non-msat-named millisatoshi fields deprecated in v0.12.0.

Author: rustyrussell

cln-grpc/proto/node.proto

@@ -244,7 +244,6 @@ fn test_getinfo() {
 	    "version": "v0.10.2-509-ged26651-modded",
 	    "blockheight": 103,
 	    "network": "regtest",
-	    "msatoshi_fees_collected": 0,
 	    "fees_collected_msat": "0msat", "lightning-dir": "/tmp/ltests-20irp76f/test_pay_variants_1/lightning-1/regtest",
 	    "our_features": {"init": "8808226aa2", "node": "80008808226aa2", "channel": "", "invoice": "024200"}});
     let u: cln_rpc::model::GetinfoResponse = serde_json::from_value(j.clone()).unwrap();

cln-grpc/src/convert.rs

@@ -51,8 +51,7 @@ void json_add_bolt11(struct json_stream *response,
 	json_add_u64(response, "expiry", b11->expiry);
 	json_add_node_id(response, "payee", &b11->receiver_id);
         if (b11->msat)
-                json_add_amount_msat_compat(response, *b11->msat,
-					    "msatoshi", "amount_msat");
+                json_add_amount_msat(response, "amount_msat", *b11->msat);
         if (b11->description)
                 json_add_string(response, "description", b11->description);
         if (b11->description_hash)

cln-grpc/src/test.rs

@@ -589,16 +589,6 @@ void json_add_psbt(struct json_stream *stream,
 		tal_free(psbt);
 }
 
-void json_add_amount_msat_compat(struct json_stream *result,
-				 struct amount_msat msat,
-				 const char *rawfieldname,
-				 const char *msatfieldname)
-{
-	if (deprecated_apis)
-		json_add_u64(result, rawfieldname, msat.millisatoshis); /* Raw: low-level helper */
-	json_add_amount_msat_only(result, msatfieldname, msat);
-}
-
 void json_add_amount_msat_only(struct json_stream *result,
 			  const char *msatfieldname,
 			  struct amount_msat msat)
@@ -612,16 +602,6 @@ void json_add_amount_msat_only(struct json_stream *result,
 		json_add_u64(result, msatfieldname, msat.millisatoshis); /* Raw: low-level helper */
 }
 
-void json_add_amount_sat_compat(struct json_stream *result,
-				struct amount_sat sat,
-				const char *rawfieldname,
-				const char *msatfieldname)
-{
-	if (deprecated_apis)
-		json_add_u64(result, rawfieldname, sat.satoshis); /* Raw: low-level helper */
-	json_add_amount_sat_msat(result, msatfieldname, sat);
-}
-
 void json_add_amount_sat_msat(struct json_stream *result,
 			      const char *msatfieldname,
 			      struct amount_sat sat)
@@ -632,22 +612,6 @@ void json_add_amount_sat_msat(struct json_stream *result,
 		json_add_amount_msat_only(result, msatfieldname, msat);
 }
 
-/* When I noticed that we were adding "XXXmsat" fields *not* ending in _msat */
-void json_add_amount_sats_deprecated(struct json_stream *result,
-				     const char *fieldname,
-				     const char *msatfieldname,
-				     struct amount_sat sat)
-{
-	if (deprecated_apis) {
-		struct amount_msat msat;
-		assert(!strends(fieldname, "_msat"));
-		if (amount_sat_to_msat(&msat, sat))
-			json_add_string(result, fieldname,
-					take(fmt_amount_msat(NULL, msat)));
-	}
-	json_add_amount_sat_msat(result, msatfieldname, sat);
-}
-
 void json_add_sats(struct json_stream *result,
 		   const char *fieldname,
 		   struct amount_sat sat)

cln-rpc/src/model.rs

@@ -324,45 +324,21 @@ void json_add_address_internal(struct json_stream *response,
 			       const char *fieldname,
 			       const struct wireaddr_internal *addr);
 
-/* Adds both a 'raw' number field and an 'amount_msat' field */
-void json_add_amount_msat_compat(struct json_stream *result,
-				 struct amount_msat msat,
-				 const char *rawfieldname,
-				 const char *msatfieldname)
-	NO_NULL_ARGS;
-
-/* Adds both a 'raw' number field and an 'amount_msat' field */
-void json_add_amount_sat_compat(struct json_stream *result,
-				struct amount_sat sat,
-				const char *rawfieldname,
-				const char *msatfieldname)
-	NO_NULL_ARGS;
-
 /* Adds an 'msat' field */
 void json_add_amount_msat_only(struct json_stream *result,
 			  const char *msatfieldname,
 			  struct amount_msat msat)
 	NO_NULL_ARGS;
 
-/* Adds an 'msat' field */
-void json_add_amount_sat_only(struct json_stream *result,
-			 const char *msatfieldname,
-			 struct amount_sat sat)
-	NO_NULL_ARGS;
+/* Compat shim */
+#define json_add_amount_msat json_add_amount_msat_only
 
 /* Adds an 'msat' field */
 void json_add_amount_sat_msat(struct json_stream *result,
 			      const char *msatfieldname,
 			      struct amount_sat sat)
 	NO_NULL_ARGS;
 
-/* Adds an 'msat' field, and an older deprecated field. */
-void json_add_amount_sats_deprecated(struct json_stream *result,
-				     const char *fieldname,
-				     const char *msatfieldname,
-				     struct amount_sat sat)
-	NO_NULL_ARGS;
-
 /* This is used to create requests, *never* for output (output is always
  * msat!) */
 void json_add_sats(struct json_stream *result,

common/bolt11_json.c

@@ -57,9 +57,6 @@ struct json_filter **command_filter_ptr(struct command *cmd UNNEEDED)
 { fprintf(stderr, "command_filter_ptr called!\n"); abort(); }
 /* Generated stub for deprecated_apis */
 bool deprecated_apis;
-/* Generated stub for fmt_amount_msat */
-const char *fmt_amount_msat(const tal_t *ctx UNNEEDED, struct amount_msat msat UNNEEDED)
-{ fprintf(stderr, "fmt_amount_msat called!\n"); abort(); }
 /* Generated stub for fmt_amount_sat */
 const char *fmt_amount_sat(const tal_t *ctx UNNEEDED, struct amount_sat sat UNNEEDED)
 { fprintf(stderr, "fmt_amount_sat called!\n"); abort(); }

common/json_stream.c

@@ -59,7 +59,6 @@ def getinfo2py(m):
         "lightning_dir": m.lightning_dir,  # PrimitiveField in generate_composite
         "blockheight": m.blockheight,  # PrimitiveField in generate_composite
         "network": m.network,  # PrimitiveField in generate_composite
-        "msatoshi_fees_collected": m.msatoshi_fees_collected,  # PrimitiveField in generate_composite
         "fees_collected_msat": amount2msat(m.fees_collected_msat),  # PrimitiveField in generate_composite
         "address": [getinfo_address2py(i) for i in m.address],  # ArrayField[composite] in generate_composite
         "binding": [getinfo_binding2py(i) for i in m.binding],  # ArrayField[composite] in generate_composite
@@ -787,7 +786,6 @@ def getroute_route2py(m):
         "id": hexlify(m.id),  # PrimitiveField in generate_composite
         "channel": m.channel,  # PrimitiveField in generate_composite
         "direction": m.direction,  # PrimitiveField in generate_composite
-        "msatoshi": m.msatoshi,  # PrimitiveField in generate_composite
         "amount_msat": amount2msat(m.amount_msat),  # PrimitiveField in generate_composite
         "delay": m.delay,  # PrimitiveField in generate_composite
         "style": str(m.style),  # EnumField in generate_composite

common/json_stream.h

@@ -52,7 +52,6 @@ On success, an object is returned, containing:
   - **node** (hex): features in our node\_announcement message
   - **channel** (hex): negotiated channel features we (as channel initiator) publish in the channel\_announcement message
   - **invoice** (hex): features in our BOLT11 invoices
-- **msatoshi\_fees\_collected** (u64, optional) **deprecated, removal in v23.05**
 - **binding** (array of objects, optional): The addresses we are listening on:
   - **type** (string): Type of connection (one of "local socket", "ipv4", "ipv6", "torv2", "torv3")
   - **address** (string, optional): address in expected format for **type**
@@ -133,4 +132,4 @@ RESOURCES
 
 Main web site: <https://github.com/ElementsProject/lightning>
 
-[comment]: # ( SHA256STAMP:5c7c4d6279279b6c92cd3b039dcb24429214b2460a6ad82bed384796389a9b5c)
+[comment]: # ( SHA256STAMP:ac7ea19a5294ebb8d8e0acaa3e813849ce1b1f7f8ef2f3e52a9ca22e5e5d82fc)

common/test/run-json_stream-filter.c

@@ -286,7 +286,6 @@ On success, an object containing **route** is returned.  It is an array of objec
 - **amount\_msat** (msat): The amount expected by the node at the end of this hop
 - **delay** (u32): The total CLTV expected by the node at the end of this hop
 - **style** (string): The features understood by the destination node (always "tlv")
-- **msatoshi** (u64, optional) **deprecated, removal in v23.05**
 
 [comment]: # (GENERATE-FROM-SCHEMA-END)
 
@@ -311,4 +310,4 @@ RESOURCES
 
 Main web site: <https://github.com/ElementsProject/lightning>
 
-[comment]: # ( SHA256STAMP:336fb7d687a26e733ca0cc5f0ca49fb00edfaf311edc43773375201b1180f716)
+[comment]: # ( SHA256STAMP:9ef1e1107c9b649e3e1c17593e3b1855852e60060c70ed6b13ff73b5575cffad)

contrib/pyln-testing/pyln/testing/grpc2py.py

@@ -94,10 +94,6 @@
       "type": "string",
       "description": "represents the type of network on the node are working (e.g: `bitcoin`, `testnet`, or `regtest`)"
     },
-    "msatoshi_fees_collected": {
-      "type": "u64",
-      "deprecated": "v0.12.0"
-    },
     "fees_collected_msat": {
       "type": "msat",
       "description": "Total routing fees collected by this node"

doc/lightning-getinfo.7.md

@@ -32,10 +32,6 @@
             "type": "u32",
             "description": "0 if this channel is traversed from lesser to greater **id**, otherwise 1"
           },
-          "msatoshi": {
-            "type": "u64",
-            "deprecated": "v0.12.0"
-          },
           "amount_msat": {
             "type": "msat",
             "description": "The amount expected by the node at the end of this hop"

doc/lightning-getroute.7.md

@@ -150,13 +150,9 @@ void json_add_unsaved_channel(struct json_stream *response,
 	/* funding + our_upfront_shutdown only available if we're initiator */
 	if (oa->role == TX_INITIATOR) {
 		if (amount_sat_to_msat(&total, oa->funding)) {
-			json_add_amount_msat_compat(response, total,
-						    "msatoshi_to_us",
-						    "to_us_msat");
+			json_add_amount_msat(response, "to_us_msat", total);
 			/* This will change if peer adds funds */
-			json_add_amount_msat_compat(response, total,
-						    "msatoshi_total",
-						    "total_msat");
+			json_add_amount_msat(response, "total_msat", total);
 		}
 	}
 
@@ -289,11 +285,11 @@ static void openchannel2_hook_serialize(struct openchannel2_payload *payload,
 	json_object_start(stream, "openchannel2");
 	json_add_node_id(stream, "id", &payload->peer_id);
 	json_add_channel_id(stream, "channel_id", &payload->channel_id);
-	json_add_amount_sats_deprecated(stream, "their_funding", "their_funding_msat",
-					payload->their_funding);
-	json_add_amount_sats_deprecated(stream, "dust_limit_satoshis",
-					"dust_limit_msat",
-					payload->dust_limit_satoshis);
+	json_add_amount_sat_msat(stream,
+				 "their_funding_msat", payload->their_funding);
+	json_add_amount_sat_msat(stream,
+				 "dust_limit_msat", payload->dust_limit_satoshis);
+
 	json_add_amount_msat_only(stream, "max_htlc_value_in_flight_msat",
 				  payload->max_htlc_value_in_flight_msat);
 	json_add_amount_msat_only(stream, "htlc_minimum_msat",

doc/schemas/getinfo.schema.json

@@ -44,14 +44,12 @@ static void json_add_invoice_fields(struct json_stream *response,
 		json_add_invstring(response, inv->invstring);
 	json_add_sha256(response, "payment_hash", &inv->rhash);
 	if (inv->msat)
-		json_add_amount_msat_compat(response, *inv->msat,
-					    "msatoshi", "amount_msat");
+		json_add_amount_msat(response, "amount_msat", *inv->msat);
 	json_add_string(response, "status", invoice_status_str(inv));
 	if (inv->state == PAID) {
 		json_add_u64(response, "pay_index", inv->pay_index);
-		json_add_amount_msat_compat(response, inv->received,
-					    "msatoshi_received",
-					    "amount_received_msat");
+		json_add_amount_msat(response,
+				     "amount_received_msat", inv->received);
 		json_add_u64(response, "paid_at", inv->paid_timestamp);
 		json_add_preimage(response, "payment_preimage", &inv->r);
 	}

doc/schemas/getroute.schema.json

@@ -205,7 +205,7 @@ static void channel_opened_notification_serialize(struct json_stream *stream,
 {
 	json_object_start(stream, "channel_opened");
 	json_add_node_id(stream, "id", node_id);
-	json_add_amount_sats_deprecated(stream, "amount", "funding_msat", *funding_sat);
+	json_add_amount_sat_msat(stream, "funding_msat", *funding_sat);
 	json_add_txid(stream, "funding_txid", funding_txid);
 	if (deprecated_apis)
 		json_add_bool(stream, "funding_locked", channel_ready);
@@ -490,26 +490,18 @@ static void coin_movement_notification_serialize(struct json_stream *stream,
 		json_add_string(stream, "originating_account",
 				mvt->originating_acct);
 	json_mvt_id(stream, mvt->type, &mvt->id);
-	if (deprecated_apis) {
-		json_add_amount_msat_only(stream, "credit", mvt->credit);
-		json_add_amount_msat_only(stream, "debit", mvt->debit);
-	}
 	json_add_amount_msat_only(stream, "credit_msat", mvt->credit);
 	json_add_amount_msat_only(stream, "debit_msat", mvt->debit);
 
 	/* Only chain movements */
 	if (mvt->output_val)
-		json_add_amount_sats_deprecated(stream, "output_value",
-						"output_msat",
-						*mvt->output_val);
+		json_add_amount_sat_msat(stream,
+					 "output_msat", *mvt->output_val);
 	if (mvt->output_count > 0)
 		json_add_num(stream, "output_count",
 			     mvt->output_count);
 
 	if (mvt->fees) {
-		if (deprecated_apis)
-			json_add_amount_msat_only(stream, "fees",
-						  *mvt->fees);
 		json_add_amount_msat_only(stream, "fees_msat",
 					  *mvt->fees);
 	}
@@ -556,9 +548,6 @@ static void balance_snapshot_notification_serialize(struct json_stream *stream,
 		json_object_start(stream, NULL);
 		json_add_string(stream, "account_id",
 				snap->accts[i]->acct_id);
-		if (deprecated_apis)
-			json_add_amount_msat_only(stream, "balance",
-						  snap->accts[i]->balance);
 		json_add_amount_msat_only(stream, "balance_msat",
 					  snap->accts[i]->balance);
 		json_add_string(stream, "coin_type", snap->accts[i]->bip173_name);