Merge branch 'master' into bolt12_offer_issuer_id

Author: 21M4TW

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,11 @@
 > [!IMPORTANT]
-> 25.02 FREEZE JANUARY 31ST: Non-bugfix PRs not ready by this date will wait for 25.05.
+>
+> 25.05 FREEZE MAY 12TH: Non-bugfix PRs not ready by this date will wait for 25.08.
+>
+> RC1 is scheduled on _May 23rd_, RC2 on _May 26th_, ...
+>
+> The final release is on MAY 29TH.
+
 
 ## Checklist
 Before submitting the PR, ensure the following tasks are completed. If an item is not applicable to your PR, please mark it as checked:

.github/workflows/readme-rpc-sync.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'doc/schemas/lightning-*.json'
+      - 'doc/schemas/*.json'
       - 'doc/*.1.md'
       - 'doc/*.5.md'
       - 'doc/*.8.md'

.github/workflows/release.yml

@@ -30,6 +30,8 @@ jobs:
       - name: Git checkout
         uses: actions/checkout@v4
         with:
+          ref: ${{ github.ref }}
+          fetch-depth: 0
           fetch-tags: true
 
       - name: Determine version

.gitignore

@@ -57,9 +57,9 @@ tests/plugins/test_selfdisable_after_getmanifest
 
 # Ignore generated files
 devtools/features
-doc/schemas/lightning-sql.json
-doc/lightning-*.7.md
-doc/lightning*.[1578]
+doc/schemas/sql.json
+doc/*.7.md
+doc/*.[1578]
 doc/reckless*.[1578]
 *_sqlgen.[ch]
 *_wiregen.[ch]

.pre-commit-config.yaml

@@ -0,0 +1,13 @@
+repos:
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: v0.8.0
+  hooks:
+    # Run the linter.
+    - id: ruff
+      args: [ --diff ]
+      exclude: "contrib/pyln-grpc-proto/pyln/grpc/(primitives|node)_pb2(|_grpc).py"
+    # Run the formatter.
+    - id: ruff-format
+      args: [ --diff ]
+      exclude: "contrib/pyln-grpc-proto/pyln/grpc/(primitives|node)_pb2(|_grpc).py"

Makefile

@@ -816,6 +816,7 @@ install-program: installdirs $(BIN_PROGRAMS) $(PKGLIBEXEC_PROGRAMS) $(PLUGINS) $
 	@$(NORMAL_INSTALL)
 	$(INSTALL_PROGRAM) $(BIN_PROGRAMS) $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) $(PKGLIBEXEC_PROGRAMS) $(DESTDIR)$(pkglibexecdir)
+	@if [ -d "$(DESTDIR)$(plugindir)/clnrest" ]; then rm -rf $(DESTDIR)$(plugindir)/clnrest; fi
 	[ -z "$(PLUGINS)" ] || $(INSTALL_PROGRAM) $(PLUGINS) $(DESTDIR)$(plugindir)
 	for PY in $(PY_PLUGINS); do DIR=`dirname $$PY`; DST=$(DESTDIR)$(plugindir)/`basename $$DIR`; if [ -d $$DST ]; then rm -rf $$DST; fi; $(INSTALL_PROGRAM) -d $$DIR; cp -a $$DIR $$DST ; done
 

common/bolt11.c

@@ -420,7 +420,7 @@ static const char *decode_f(struct bolt11 *b11,
 				       "f: witness v1 bad length %zu",
 				       tal_count(f));
 		}
-		if (tal_count(f) > 40) {
+		if (tal_count(f) > 40 || tal_count(f) < 2) {
 			return tal_fmt(b11,
 				       "f: witness v%"PRIu64" bad length %zu",
 				       version,

common/gossmap.c

@@ -551,10 +551,11 @@ static void fill_from_update(struct gossmap *map,
 	    || hc->delay != delay) {
 		hc->htlc_max = 0;
 		hc->enabled = false;
-		logcb(cbarg, LOG_DBG,
-		      "Bad cupdate for %s, ignoring (delta=%u, fee=%u/%u)",
-		      fmt_short_channel_id_dir(tmpctx, scidd),
-		      delay, base_fee, proportional_fee);
+		if (logcb)
+			logcb(cbarg, LOG_DBG,
+			      "Bad cupdate for %s, ignoring (delta=%u, fee=%u/%u)",
+			      fmt_short_channel_id_dir(tmpctx, scidd),
+			      delay, base_fee, proportional_fee);
 	}
 }
 

common/trace.c

@@ -10,9 +10,10 @@
 #include <common/trace.h>
 #include <sodium/randombytes.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #if HAVE_USDT
-#include <sys/sdt.h>
+  #include <sys/sdt.h>
 
 #define MAX_ACTIVE_SPANS 128
 
@@ -40,6 +41,7 @@
 #endif
 
 const char *trace_service_name = "lightningd";
+static bool disable_trace = false;
 
 struct span_tag {
 	char *name, *value;
@@ -176,6 +178,9 @@ static struct span *trace_span_find(size_t key)
 	return NULL;
 }
 
+/* FIXME: Forward declaration for minimal patch size */
+static void trace_span_clear(struct span *s);
+
 /**
  * Find an empty slot for a new span.
  */
@@ -187,7 +192,13 @@ static struct span *trace_span_slot(void)
 
 	/* Might end up here if we have more than MAX_ACTIVE_SPANS
 	 * concurrent spans. */
-	assert(s);
+	if (!s) {
+		fprintf(stderr, "%u: out of spans, disabling tracing\n", getpid());
+		for (size_t i = 0; i < MAX_ACTIVE_SPANS; i++)
+			trace_span_clear(&active_spans[i]);
+		disable_trace = true;
+		return NULL;
+	}
 	assert(s->parent == NULL);
 
 	/* Be extra careful not to create cycles. If we return the
@@ -260,11 +271,15 @@ void trace_span_start(const char *name, const void *key)
 	size_t numkey = trace_key(key);
 	struct timeabs now = time_now();
 
+	if (disable_trace)
+		return;
 	trace_init();
 	trace_check_tree();
 
 	assert(trace_span_find(numkey) == NULL);
 	struct span *s = trace_span_slot();
+	if (!s)
+		return;
 	s->key = numkey;
 	randombytes_buf(s->id, SPAN_ID_SIZE);
 	s->start_time = (now.ts.tv_sec * 1000000) + now.ts.tv_nsec / 1000;
@@ -293,6 +308,9 @@ void trace_span_remote(u8 trace_id[TRACE_ID_SIZE], u8 span_id[SPAN_ID_SIZE])
 
 void trace_span_end(const void *key)
 {
+	if (disable_trace)
+		return;
+
 	size_t numkey = trace_key(key);
 	struct span *s = trace_span_find(numkey);
 	assert(s && "Span to end not found");
@@ -323,6 +341,9 @@ void trace_span_end(const void *key)
 
 void trace_span_tag(const void *key, const char *name, const char *value)
 {
+	if (disable_trace)
+		return;
+
 	size_t numkey = trace_key(key);
 	struct span *span = trace_span_find(numkey);
 	assert(span);
@@ -341,6 +362,9 @@ void trace_span_tag(const void *key, const char *name, const char *value)
 
 void trace_span_suspend_(const void *key, const char *lbl)
 {
+	if (disable_trace)
+		return;
+
 	size_t numkey = trace_key(key);
 	struct span *span = trace_span_find(numkey);
 	TRACE_DBG("Suspending span %s (%zu)\n", current->name, current->key);
@@ -349,8 +373,33 @@ void trace_span_suspend_(const void *key, const char *lbl)
 	DTRACE_PROBE1(lightningd, span_suspend, span->id);
 }
 
+static void destroy_trace_span(const void *key)
+{
+	size_t numkey = trace_key(key);
+	struct span *span = trace_span_find(numkey);
+
+	/* It's usually ended normally. */
+	if (!span)
+		return;
+
+	/* Otherwise resume so we can terminate it */
+	trace_span_resume(key);
+	trace_span_end(key);
+}
+
+void trace_span_suspend_may_free_(const void *key, const char *lbl)
+{
+	if (disable_trace)
+		return;
+	trace_span_suspend_(key, lbl);
+	tal_add_destructor(key, destroy_trace_span);
+}
+
 void trace_span_resume_(const void *key, const char *lbl)
 {
+	if (disable_trace)
+		return;
+
 	size_t numkey = trace_key(key);
 	current = trace_span_find(numkey);
 	TRACE_DBG("Resuming span %s (%zu)\n", current->name, current->key);
@@ -368,6 +417,7 @@ void trace_cleanup(void)
 void trace_span_start(const char *name, const void *key) {}
 void trace_span_end(const void *key) {}
 void trace_span_suspend_(const void *key, const char *lbl) {}
+void trace_span_suspend_may_free_(const void *key, const char *lbl) {}
 void trace_span_resume_(const void *key, const char *lbl) {}
 void trace_span_tag(const void *key, const char *name, const char *value) {}
 void trace_cleanup(void) {}

common/trace.h

@@ -15,8 +15,10 @@ void trace_span_remote(u8 trace_id[TRACE_ID_SIZE], u8 span_id[SPAN_ID_SIZE]);
 
 #define TRACE_LBL __FILE__ ":" stringify(__LINE__)
 void trace_span_suspend_(const void *key, const char *lbl);
+void trace_span_suspend_may_free_(const void *key, const char *lbl);
 void trace_span_resume_(const void *key, const char *lbl);
 #define trace_span_suspend(key) trace_span_suspend_(key, TRACE_LBL)
+#define trace_span_suspend_may_free(key) trace_span_suspend_may_free_(key, TRACE_LBL)
 #define trace_span_resume(key) trace_span_resume_(key, TRACE_LBL)
 
 #endif /* LIGHTNING_COMMON_TRACE_H */