Merge branch 'master' into cln-plugin-set-featurebits

.msggen.json

@@ -736,9 +736,14 @@
             "FetchInvoice.invoice": 1,
             "FetchInvoice.next_period": 3
         },
+        "FundchannelChannel_type": {
+            "FundChannel.channel_type.bits[]": 1,
+            "FundChannel.channel_type.names[]": 2
+        },
         "FundchannelRequest": {
             "FundChannel.amount": 1,
             "FundChannel.announce": 3,
+            "FundChannel.channel_type[]": 14,
             "FundChannel.close_to": 6,
             "FundChannel.compact_lease": 8,
             "FundChannel.feerate": 2,
@@ -753,6 +758,7 @@
         },
         "FundchannelResponse": {
             "FundChannel.channel_id": 4,
+            "FundChannel.channel_type": 7,
             "FundChannel.close_to": 5,
             "FundChannel.mindepth": 6,
             "FundChannel.outnum": 3,
@@ -3026,6 +3032,22 @@
             "added": "pre-v0.10.1",
             "deprecated": false
         },
+        "FundChannel.channel_type": {
+            "added": "v24.02",
+            "deprecated": false
+        },
+        "FundChannel.channel_type.bits[]": {
+            "added": "v24.02",
+            "deprecated": false
+        },
+        "FundChannel.channel_type.names[]": {
+            "added": "v24.02",
+            "deprecated": false
+        },
+        "FundChannel.channel_type[]": {
+            "added": "v24.02",
+            "deprecated": false
+        },
         "FundChannel.close_to": {
             "added": "pre-v0.10.1",
             "deprecated": false

Makefile

@@ -3,6 +3,9 @@
 # Extract version from git, or if we're from a zipfile, use dirname
 VERSION=$(shell git describe --always --dirty=-modded --abbrev=7 2>/dev/null || pwd | sed -n 's|.*/c\{0,1\}lightning-v\{0,1\}\([0-9a-f.rc\-]*\)$$|\1|gp')
 
+# Next release.
+CLN_NEXT_VERSION := v24.02
+
 # --quiet / -s means quiet, dammit!
 ifeq ($(findstring s,$(word 1, $(MAKEFLAGS))),s)
 ECHO := :
@@ -249,8 +252,8 @@ CPATH := /usr/local/include
 LIBRARY_PATH := /usr/local/lib
 endif
 
-CPPFLAGS += -DBINTOPKGLIBEXECDIR="\"$(shell sh tools/rel.sh $(bindir) $(pkglibexecdir))\""
-CFLAGS = $(CPPFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(COPTFLAGS) -I $(CCANDIR) $(EXTERNAL_INCLUDE_FLAGS) -I . -I$(CPATH) $(SQLITE3_CFLAGS) $(POSTGRES_INCLUDE) $(FEATURES) $(COVFLAGS) $(DEV_CFLAGS) -DSHACHAIN_BITS=48 -DJSMN_PARENT_LINKS $(PIE_CFLAGS) $(COMPAT_CFLAGS) $(CSANFLAGS) -DBUILD_ELEMENTS=1
+CPPFLAGS += -DCLN_NEXT_VERSION="\"$(CLN_NEXT_VERSION)\"" -DBINTOPKGLIBEXECDIR="\"$(shell sh tools/rel.sh $(bindir) $(pkglibexecdir))\""
+CFLAGS = $(CPPFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(COPTFLAGS) -I $(CCANDIR) $(EXTERNAL_INCLUDE_FLAGS) -I . -I$(CPATH) $(SQLITE3_CFLAGS) $(POSTGRES_INCLUDE) $(FEATURES) $(COVFLAGS) $(DEV_CFLAGS) -DSHACHAIN_BITS=48 -DJSMN_PARENT_LINKS $(PIE_CFLAGS) $(COMPAT_CFLAGS) $(CSANFLAGS)
 
 # If CFLAGS is already set in the environment of make (to whatever value, it
 # does not matter) then it would export it to subprocesses with the above value

bitcoin/base58.c

@@ -47,16 +47,14 @@ static bool from_base58(u8 *version,
 			struct ripemd160 *rmd,
 			const char *base58, size_t base58_len)
 {
-	u8 buf[1 + sizeof(*rmd) + 4];
-	/* Avoid memcheck complaining if decoding resulted in a short value */
-	size_t buflen = sizeof(buf);
-	memset(buf, 0, buflen);
-	char *terminated_base58 = tal_dup_arr(NULL, char, base58, base58_len, 1);
-	terminated_base58[base58_len] = '\0';
+	/* Initialize to avoid memcheck complaining if decoding a short value */
+	u8 buf[1 + sizeof(*rmd) + 4] = { 0 };
+	const size_t buflen = sizeof(buf);
+	const uint32_t flags = BASE58_FLAG_CHECKSUM;
 
 	size_t written = 0;
-	int r = wally_base58_to_bytes(terminated_base58, BASE58_FLAG_CHECKSUM, buf, buflen, &written);
-	tal_free(terminated_base58);
+	int r = wally_base58_n_to_bytes(base58, base58_len, flags,
+					buf, buflen, &written);
 	if (r != WALLY_OK || written > buflen) {
 		return false;
 	}

bitcoin/block.c

@@ -210,7 +210,7 @@ bitcoin_block_from_hex(const tal_t *ctx, const struct chainparams *chainparams,
 	b->tx = tal_arr(b, struct bitcoin_tx *, num);
 	b->txids = tal_arr(b, struct bitcoin_txid, num);
 	for (i = 0; i < num; i++) {
-		b->tx[i] = pull_bitcoin_tx(b->tx, &p, &len);
+		b->tx[i] = pull_bitcoin_tx_only(b->tx, &p, &len);
 		b->tx[i]->chainparams = chainparams;
 		bitcoin_txid(b->tx[i], &b->txids[i]);
 	}