Merge branch 'master' into fix-feerate-tolerance

Author: Andezion

.msggen.json

@@ -4073,6 +4073,7 @@
             "Xpay.maxdelay": 7,
             "Xpay.maxfee": 3,
             "Xpay.partial_msat": 6,
+            "Xpay.payer_note": 8,
             "Xpay.retry_for": 5
         },
         "XpayResponse": {
@@ -14044,6 +14045,10 @@
             "added": "v24.11",
             "deprecated": null
         },
+        "Xpay.payer_note": {
+            "added": "v26.04",
+            "deprecated": null
+        },
         "Xpay.payment_preimage": {
             "added": "v24.11",
             "deprecated": null

README.md

@@ -88,13 +88,13 @@ will offer specific information on that command.
 
 Useful commands:
 
-* [newaddr](doc/lightning-newaddr.7.md): get a bitcoin address to deposit funds into your lightning node.
-* [listfunds](doc/lightning-listfunds.7.md): see where your funds are.
-* [connect](doc/lightning-connect.7.md): connect to another lightning node.
-* [fundchannel](doc/lightning-fundchannel.7.md): create a channel to another connected node.
-* [invoice](doc/lightning-invoice.7.md): create an invoice to get paid by another node.
-* [pay](doc/lightning-pay.7.md): pay someone else's invoice.
-* [plugin](doc/lightning-plugin.7.md): commands to control extensions.
+* [newaddr](https://docs.corelightning.org/reference/newaddr): get a bitcoin address to deposit funds into your lightning node.
+* [listfunds](https://docs.corelightning.org/reference/listfunds): see where your funds are.
+* [connect](https://docs.corelightning.org/reference/connect): connect to another lightning node.
+* [fundchannel](https://docs.corelightning.org/reference/fundchannel): create a channel to another connected node.
+* [invoice](https://docs.corelightning.org/reference/invoice): create an invoice to get paid by another node.
+* [pay](https://docs.corelightning.org/reference/pay): pay someone else's invoice.
+* [plugin](https://docs.corelightning.org/reference/plugin): commands to control extensions.
 
 ### Care And Feeding Of Your New Lightning Node
 

cln-grpc/proto/node.proto

@@ -37313,6 +37313,13 @@
               "A payment may be delayed for up to `maxdelay` blocks by another node; clients should be prepared for this worst case."
             ],
             "default": "2016"
+          },
+          "payer_note": {
+            "type": "string",
+            "added": "v26.04",
+            "description": [
+              "A message that a payer is willing to send to a payee within an invoice request."
+            ]
           }
         }
       },
@@ -37399,7 +37406,8 @@
             "id": "example:xpay#2",
             "method": "xpay",
             "params": {
-              "invstring": "lni1qqg0qe03030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303"
+              "invstring": "lni1qqg0qe03030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303",
+              "payer_note": "Coffee payment"
             }
           },
           "response": {

cln-grpc/src/convert.rs

@@ -65,6 +65,13 @@
           "A payment may be delayed for up to `maxdelay` blocks by another node; clients should be prepared for this worst case."
         ],
         "default": "2016"
+      },
+      "payer_note": {
+        "type": "string",
+        "added": "v26.04",
+        "description": [
+          "A message that a payer is willing to send to a payee within an invoice request."
+        ]
       }
     }
   },
@@ -151,7 +158,8 @@
         "id": "example:xpay#2",
         "method": "xpay",
         "params": {
-          "invstring": "lni1qqg0qe03030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303"
+          "invstring": "lni1qqg0qe03030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303",
+          "payer_note": "Coffee payment"
         }
       },
       "response": {

cln-rpc/src/model.rs

@@ -1,11 +1,12 @@
 /*~ Welcome to the gossip daemon: keeper of maps!
  *
- * This is the last "global" daemon; it has three purposes.
+ * This is the last "global" daemon; it has one main purpose: to
+ * maintain the append-only gossip_store file for other daemons and
+ * plugins to read the global network map.
  *
- * 1. To determine routes for payments when lightningd asks.
- * 2. The second purpose is to receive gossip from peers (via their
- *    per-peer daemons) and send it out to them.
- * 3. Talk to `connectd` to to answer address queries for nodes.
+ * To do this, it gets gossip messages forwarded from connectd, makes
+ * gossip queries to peers, and can ask connect out to random peers to
+ * get more gossip.
  *
  * The gossip protocol itself is fairly simple, but has some twists which
  * add complexity to this daemon.
@@ -14,7 +15,6 @@
 #include <ccan/tal/str/str.h>
 #include <common/clock_time.h>
 #include <common/daemon_conn.h>
-#include <common/ecdh_hsmd.h>
 #include <common/memleak.h>
 #include <common/status.h>
 #include <common/subdaemon.h>
@@ -368,21 +368,6 @@ static void master_or_connectd_gone(struct daemon_conn *dc UNUSED)
 	exit(2);
 }
 
-/* We don't check this when loading from the gossip_store: that would break
- * our canned tests, and usually old gossip is better than no gossip */
-bool timestamp_reasonable(const struct daemon *daemon, u32 timestamp)
-{
-	u64 now = clock_time().ts.tv_sec;
-
-	/* More than one day ahead? */
-	if (timestamp > now + 24*60*60)
-		return false;
-	/* More than 2 weeks behind? */
-	if (timestamp < now - GOSSIP_PRUNE_INTERVAL(daemon->dev_fast_gossip_prune))
-		return false;
-	return true;
-}
-
 /*~ Parse init message from lightningd: starts the daemon properly. */
 static void gossip_init(struct daemon *daemon, const u8 *msg)
 {
@@ -591,9 +576,6 @@ int main(int argc, char *argv[])
 	daemon->deferred_txouts = tal_arr(daemon, struct short_channel_id, 0);
 	daemon->current_blockheight = 0; /* i.e. unknown */
 
-	/* Tell the ecdh() function how to talk to hsmd */
-	ecdh_hsmd_setup(HSM_FD, status_failed);
-
 	/* Note the use of time_mono() here.  That's a monotonic clock, which
 	 * is really useful: it can only be used to measure relative events
 	 * (there's no correspondence to time-since-Ken-grew-a-beard or
@@ -620,8 +602,9 @@ int main(int argc, char *argv[])
 	}
 }
 
-/*~ Note that the actual routing stuff is in routing.c; you might want to
- * check that out later.
+/*~ Note that the production of the gossip_store file is in gossmap_manage.c
+ * and gossip_store.c, and the (highly optimized!)  read side is in
+ * common/gossmap.c; you might want to check those out later.
  *
  * But that's the last of the global daemons.  We now move on to the first of
  * the per-peer daemons: openingd/openingd.c.

contrib/msggen/msggen/schema.json

@@ -8,11 +8,8 @@
 #include <lightningd/options.h>
 #include <wire/peer_wire.h>
 
-/* We talk to `hsmd` to sign our gossip messages with the node key */
-#define HSM_FD 3
-/* connectd asks us for help finding nodes, and gossip fds for new peers */
-#define CONNECTD_FD 4
-#define CONNECTD2_FD 5
+/* connectd forwards gossip messages to us. */
+#define CONNECTD_FD 3
 
 struct chan;
 struct peer;
@@ -161,9 +158,4 @@ void tell_lightningd_peer_update(struct daemon *daemon,
 				 struct amount_msat htlc_minimum,
 				 struct amount_msat htlc_maximum);
 
-/**
- * Is this gossip timestamp reasonable?
- */
-bool timestamp_reasonable(const struct daemon *daemon, u32 timestamp);
-
 #endif /* LIGHTNING_GOSSIPD_GOSSIPD_H */