Merge branch 'ElementsProject:master' into bolt12_offer_issuer_id

Author: 21M4TW

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,10 @@
 > [!IMPORTANT]
 >
-> 25.05 FREEZE MAY 05TH: Non-bugfix PRs not ready by this date will wait for 25.08.
+> 25.09 FREEZE July 28TH: Non-bugfix PRs not ready by this date will wait for 25.12.
 >
-> RC1 is scheduled on _May 12th_, RC2 on _May 16th_, ...
+> RC1 is scheduled on _August 11th_
 >
-> The final release is on MAY 20TH.
+> The final release is scheduled for September 1st.
 
 
 ## Checklist

.github/scripts/sync-rpc-cmds.py

@@ -7,7 +7,7 @@
 # readme url
 URL = "https://dash.readme.com/api/v1"
 # category id for API reference
-CATEGORY_ID = "63e4e160c60b2e001dd1cc4e"
+CATEGORY_ID = "685ce4df1df887006ff221c5"
 CATEGORY_SLUG = "json-rpc-apis"
 
 

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

@@ -23,7 +23,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: 3.9
 
     - name: Install python modules
       run: |

.version

@@ -1 +1 @@
-25.05rc1
+25.05

CHANGELOG.md

@@ -4,9 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [25.05rc1] - 2025-05-16: "CODENAME"
+## [25.05] - 2025-06-16: "Satoshi's OP_RETURN Opinion"
 
-This release named by @USERNAME.
+This release named by Peter Neuroth (@nepet).
+
+**WARNING**: `--experimental-splicing` is incompatible with previous CLN versions!  You will not
+              be able to reestablish channels with older nodes at all, if this is enabled!
 
 ### Added
 
@@ -30,7 +33,7 @@ This release named by @USERNAME.
 
 ### Changed
 
- - Splicing: The splicing protocol is now compatible with Eclair. ([#8021])
+ - Splicing: The splicing protocol is now compatible with Eclair, incompatible with previous CLN versions ([#8021])
  - Protocol: We now exchange `announcement_signatures` as soon as we're ready, rather than waiting for 6 blocks (as per recent BOLT update.) ([#8136])
  - Protocol: We won't forget still-opening channels after 2016 blocks, unless there are more than 100. ([#8162])
  - Reckless: Accepts a source url or local directory as an argument to `reckless install`. ([#8266])

Makefile

@@ -4,7 +4,7 @@
 VERSION=$(shell git describe --tags --always --dirty=-modded --abbrev=7 2>/dev/null || pwd | sed -n 's|.*/c\{0,1\}lightning-v\{0,1\}\([0-9a-f.rc\-]*\)$$|v\1|gp')
 
 # Next release.
-CLN_NEXT_VERSION := v25.05
+CLN_NEXT_VERSION := v25.09
 
 # --quiet / -s means quiet, dammit!
 ifeq ($(findstring s,$(word 1, $(MAKEFLAGS))),s)
@@ -26,7 +26,7 @@ CCANDIR := ccan
 
 # Where we keep the BOLT RFCs
 BOLTDIR := ../bolts/
-DEFAULT_BOLTVERSION := ccfa38ed4f592c3711156bb4ded77f44ec01101d
+DEFAULT_BOLTVERSION := 68881992b97f20aca29edf7a4d673b8e6a70379a
 # Can be overridden on cmdline.
 BOLTVERSION := $(DEFAULT_BOLTVERSION)
 

ccan/README

@@ -1,3 +1,3 @@
 CCAN imported from http://ccodearchive.net.
 
-CCAN version: init-2590-gaf04734d
+CCAN version: init-2593-gca094039

ccan/ccan/fdpass/fdpass.c

@@ -3,6 +3,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 #include <string.h>
+#include <sys/types.h>
 
 bool fdpass_send(int sockout, int fd)
 {

ccan/ccan/time/test/run-monotonic.c

@@ -7,13 +7,13 @@ int main(void)
 	struct timemono t1, t2;
 	struct timerel t3;
 
-	plan_tests(5);
+	plan_tests(10);
 
 	/* Test time_mono */
 	t1 = time_mono();
 	t2 = time_mono();
 
-	ok1(!time_less_(t2.ts, t1.ts));
+	ok1(!timemono_before(t2, t1));
 
 	t3.ts.tv_sec = 1;
 	t3.ts.tv_nsec = 0;
@@ -24,5 +24,11 @@ int main(void)
 	ok1(timemono_add(t1, t3).ts.tv_sec == t1.ts.tv_sec + 1);
 	ok1(timemono_add(t2, t3).ts.tv_nsec == t2.ts.tv_nsec);
 
+	ok1(timemono_sub(timemono_add(t1, t3), t3).ts.tv_sec == t1.ts.tv_sec);
+	ok1(timemono_sub(timemono_add(t1, t3), t3).ts.tv_nsec == t1.ts.tv_nsec);
+
+	ok1(timemono_after(timemono_add(t1, t3), t1));
+	ok1(!timemono_after(t1, timemono_add(t1, t3)));
+	ok1(!timemono_after(t1, t1));
 	return exit_status();
 }

ccan/ccan/time/time.h

@@ -193,6 +193,23 @@ static inline bool time_greater(struct timerel a, struct timerel b)
 	return time_greater_(a.ts, b.ts);
 }
 
+/**
+ * timemono_after - is a after b?
+ * @a: one monotonic time.
+ * @b: another monotonic time.
+ *
+ * Example:
+ *	static bool timed_out(const struct timemono *start)
+ *	{
+ *	#define TIMEOUT time_from_msec(1000)
+ *		return timemono_after(time_mono(), timemono_add(*start, TIMEOUT));
+ *	}
+ */
+static inline bool timemono_after(struct timemono a, struct timemono b)
+{
+	return time_greater_(a.ts, b.ts);
+}
+
 static inline bool time_less_(struct timespec a, struct timespec b)
 {
 	if (TIME_CHECK(a).tv_sec < TIME_CHECK(b).tv_sec)
@@ -220,6 +237,23 @@ static inline bool time_before(struct timeabs a, struct timeabs b)
 	return time_less_(a.ts, b.ts);
 }
 
+/**
+ * timemono_before - is a before b?
+ * @a: one monotonic time.
+ * @b: another monotonic time.
+ *
+ * Example:
+ *	static bool still_valid(const struct timemono *start)
+ *	{
+ *	#define TIMEOUT time_from_msec(1000)
+ *		return timemono_before(time_mono(), timemono_add(*start, TIMEOUT));
+ *	}
+ */
+static inline bool timemono_before(struct timemono a, struct timemono b)
+{
+	return time_less_(a.ts, b.ts);
+}
+
 /**
  * time_less - is a before b?
  * @a: one relative time.
@@ -404,6 +438,29 @@ static inline struct timeabs timeabs_sub(struct timeabs abs, struct timerel rel)
 	return t;
 }
 
+/**
+ * timemono_sub - subtract a relative time from a monotonic time
+ * @mono: the monotonic time.
+ * @rel: the relative time.
+ *
+ * This returns a well formed struct timemono of @mono - @rel.
+ *
+ * Example:
+ *	// We do one every second.
+ *	static struct timemono previous_time(void)
+ *	{
+ *		return timemono_sub(time_mono(), time_from_msec(1000));
+ *	}
+ */
+static inline struct timemono timemono_sub(struct timemono mono, struct timerel rel)
+{
+	struct timemono t;
+
+	t.ts = time_sub_(mono.ts, rel.ts);
+	return t;
+}
+
+
 static inline struct timespec time_add_(struct timespec a, struct timespec b)
 {
 	struct timespec sum;
@@ -488,6 +545,8 @@ static inline struct timerel timerel_add(struct timerel a, struct timerel b)
  * @div: number to divide it by.
  *
  * Example:
+ *	#include <sys/wait.h>
+ *
  *	// How long does it take to do a fork?
  *	static struct timerel forking_time(void)
  *	{