Revert "lightningd: don't allow enableoffer on single-use offer."

This reverts commit d76e4e7 (except .github dir)

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Author: rustyrussell

.msggen.json

@@ -3045,7 +3045,6 @@
             "ListPeerChannels.channels[].updates.remote.htlc_minimum_msat": 1
         },
         "ListpeerchannelsRequest": {
-            "ListPeerChannels.channel_id": 3,
             "ListPeerChannels.id": 1,
             "ListPeerChannels.short_channel_id": 2
         },
@@ -3338,7 +3337,6 @@
             "Offer.absolute_expiry": 6,
             "Offer.amount": 1,
             "Offer.description": 2,
-            "Offer.fronting_nodes[]": 15,
             "Offer.issuer": 3,
             "Offer.label": 4,
             "Offer.optional_recurrence": 14,
@@ -10758,10 +10756,6 @@
             "added": "v23.02",
             "deprecated": null
         },
-        "ListPeerChannels.channel_id": {
-            "added": "v26.03",
-            "deprecated": null
-        },
         "ListPeerChannels.channels[]": {
             "added": "v23.02",
             "deprecated": null
@@ -11994,10 +11988,6 @@
             "added": "pre-v0.10.1",
             "deprecated": null
         },
-        "Offer.fronting_nodes[]": {
-            "added": "v26.04",
-            "deprecated": null
-        },
         "Offer.issuer": {
             "added": "pre-v0.10.1",
             "deprecated": null

Cargo.toml

@@ -1,12 +1,6 @@
 [profile.release]
 strip = "debuginfo"
 
-[profile.small]
-inherits = "dev"
-opt-level = 0
-debug = 0
-codegen-units = 32
-
 [workspace]
 resolver = "2"
 members = [

Dockerfile

@@ -91,7 +91,8 @@ ARG target_arch=arm-linux-gnueabihf
 ARG target_arch_gcc=arm-linux-gnueabihf
 ARG target_arch_dpkg=armhf
 ARG target_arch_rust=armv7-unknown-linux-gnueabihf
-ARG COPTFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
+#TODO: bug with -O2 in armv7, see https://github.com/ElementsProject/lightning/issues/8501
+ARG COPTFLAGS="-O1 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
 
 FROM base-builder-${TARGETOS}-${TARGETARCH} AS builder
 

Makefile

@@ -21,7 +21,6 @@ ECHO := echo
 SUPPRESS_OUTPUT :=
 endif
 
-CARGO := cargo
 DISTRO=$(shell lsb_release -is 2>/dev/null || echo unknown)-$(shell lsb_release -rs 2>/dev/null || echo unknown)
 OS=$(shell uname -s)
 ARCH=$(shell uname -m)
@@ -105,7 +104,6 @@ CCAN_OBJS :=					\
 	ccan-bitmap.o				\
 	ccan-bitops.o				\
 	ccan-breakpoint.o			\
-	ccan-cdump.o				\
 	ccan-closefrom.o			\
 	ccan-crc32c.o				\
 	ccan-crypto-hmac.o			\
@@ -231,6 +229,8 @@ CCAN_HEADERS :=						\
 	$(CCANDIR)/ccan/typesafe_cb/typesafe_cb.h	\
 	$(CCANDIR)/ccan/utf8/utf8.h
 
+CDUMP_OBJS := ccan-cdump.o ccan-strmap.o
+
 BOLT_GEN := tools/generate-wire.py
 WIRE_GEN := $(BOLT_GEN)
 
@@ -468,7 +468,6 @@ PKGLIBEXEC_PROGRAMS = \
 	       lightningd/lightning_connectd \
 	       lightningd/lightning_dualopend \
 	       lightningd/lightning_gossipd \
-	       lightningd/lightning_gossip_compactd \
 	       lightningd/lightning_hsmd \
 	       lightningd/lightning_onchaind \
 	       lightningd/lightning_openingd \
@@ -483,17 +482,16 @@ mkdocs.yml: $(MANPAGES:=.md)
 	)
 
 
-# Every single object file.
-ALL_OBJS := $(ALL_C_SOURCES:.c=.o)
 
-WIREGEN_FILES := $(filter %printgen.h %printgen.c %wiregen.h %wiregen.c, $(ALL_C_HEADERS) $(ALL_C_SOURCES))
+# Don't delete these intermediaries.
+.PRECIOUS: $(ALL_GEN_HEADERS) $(ALL_GEN_SOURCES) $(PYTHON_GENERATED)
 
-# Always make wiregen files before any object file
-$(ALL_OBJS): $(WIREGEN_FILES)
+# Every single object file.
+ALL_OBJS := $(ALL_C_SOURCES:.c=.o)
 
 # We always regen wiregen and printgen files, since SHA256STAMP protects against
 # spurious rebuilds.
-$(WIREGEN_FILES): $(FORCE)
+$(filter %printgen.h %printgen.c %wiregen.h %wiregen.c, $(ALL_C_HEADERS) $(ALL_C_SOURCES)): $(FORCE)
 
 ifneq ($(TEST_GROUP_COUNT),)
 PYTEST_OPTS += --test-group=$(TEST_GROUP) --test-group-count=$(TEST_GROUP_COUNT)
@@ -645,8 +643,10 @@ update-doc-examples:
 check-doc-examples: update-doc-examples
 	git diff --exit-code HEAD
 
-# This should NOT compile things!
-check-source: check-makefile check-whitespace check-spelling check-python-flake8 check-includes check-shellcheck check-setup_locale check-tmpctx check-discouraged-functions check-amount-access check-bad-sprintf
+# For those without working cppcheck
+check-source-no-cppcheck: check-makefile check-source-bolt check-whitespace check-spelling check-python check-includes check-shellcheck check-setup_locale check-tmpctx check-discouraged-functions check-amount-access check-bad-sprintf
+
+check-source: check-source-no-cppcheck
 
 full-check: check check-source
 
@@ -719,7 +719,7 @@ TAGS:
 tags:
 	$(RM) tags; find * -name test -type d -prune -o \( -name '*.[ch]' -o -name '*.py' \) -print0 | xargs -0 ctags --append
 
-ccan/ccan/cdump/tools/cdump-enumstr: ccan/ccan/cdump/tools/cdump-enumstr.o libccan.a
+ccan/ccan/cdump/tools/cdump-enumstr: ccan/ccan/cdump/tools/cdump-enumstr.o $(CDUMP_OBJS) $(CCAN_OBJS)
 
 ALL_PROGRAMS += ccan/ccan/cdump/tools/cdump-enumstr
 # Can't add to ALL_OBJS, as that makes a circular dep.
@@ -741,9 +741,6 @@ endif
 header_versions_gen.h: tools/headerversions $(FORCE)
 	@tools/headerversions $@
 
-# Once you have libccan.a, you don't need these.
-.INTERMEDIATE: $(CCAN_OBJS)
-
 # We make a static library, this way linker can discard unused parts.
 libccan.a: $(CCAN_OBJS)
 	@$(call VERBOSE, "ar $@", $(AR) r $@ $(CCAN_OBJS))
@@ -965,21 +962,25 @@ install-data: installdirs $(MAN1PAGES) $(MAN5PAGES) $(MAN7PAGES) $(MAN8PAGES) $(
 
 install: install-program install-data
 
-# We exclude most of target/ and external, but we need:
-# 1. config files (we only tar up files *newer* than these)
-# 2. $(DEFAULT_TARGETS) for rust stuff.
-# 3. $(EXTERNAL_LIBS) for prebuild external libraries.
-TESTPACK_EXTRAS :=			\
-	config.vars ccan/config.h	\
-	header_versions_gen.h		\
-	$(DEFAULT_TARGETS)		\
-	$(EXTERNAL_LIBS)
+# Non-artifacts that are needed for testing. These are added to the
+# testpack.tar, used to transfer things between builder and tester
+# phase. If you get a missing file/executable while testing on CI it
+# is likely missing from this variable.
+TESTBINS = \
+	$(CLN_PLUGIN_EXAMPLES) \
+	tests/plugins/test_libplugin \
+	tests/plugins/channeld_fakenet \
+	tests/plugins/test_selfdisable_after_getmanifest
 
 # The testpack is used in CI to transfer built artefacts between the
-# build and the test phase.  Only useful on a freshly build tree!
-# We use Posix format for timestamps with subsecond accuracy.
-testpack.tar.gz: all-programs all-fuzz-programs all-test-programs default-targets
-	(find * -path external -prune -o -path target -prune -o -newer config.vars -type f -print; ls $(TESTPACK_EXTRAS)) | tar --verbatim-files-from -T- -c --format=posix -f - | gzip -5 > $@
+# build and the test phase. This is necessary because the fixtures in
+# `tests/` explicitly use the binaries built in the current directory
+# rather than using `$PATH`, as that may pick up some other installed
+# version of `lightningd` leading to bogus results. We bundle up all
+# built artefacts here, and will unpack them on the tester (overlaying
+# on top of the checked out repo as if we had just built it in place).
+testpack.tar.bz2: $(BIN_PROGRAMS) $(PKGLIBEXEC_PROGRAMS) $(PLUGINS) $(PY_PLUGINS) $(MAN1PAGES) $(MAN5PAGES) $(MAN7PAGES) $(MAN8PAGES) $(DOC_DATA) config.vars $(TESTBINS) $(DEVTOOLS) $(TOOLS)
+	tar -caf $@ $^
 
 uninstall:
 	@$(NORMAL_UNINSTALL)
@@ -1155,9 +1156,6 @@ ccan-rune-rune.o: $(CCANDIR)/ccan/rune/rune.c
 ccan-rune-coding.o: $(CCANDIR)/ccan/rune/coding.c
 	@$(call VERBOSE, "cc $<", $(CC) $(CFLAGS) -c -o $@ $<)
 
-canned-gossmap: devtools/gossmap-compress
-	DATE=`date +%Y-%m-%d` && devtools/gossmap-compress compress --output-node-map /tmp/gossip_store tests/data/gossip-store-$$DATE.compressed > tests/data/gossip-store-$$DATE-node-map && xz -9 tests/data/gossip-store-$$DATE-node-map && ls -l tests/data/gossip-store-$$DATE*
-
 print-binary-sizes: $(ALL_PROGRAMS) $(ALL_TEST_PROGRAMS) $(BIN_PROGRAMS)
 	@echo User programs:
 	@size -t $(PKGLIBEXEC_PROGRAMS) $(filter-out tools/reckless,$(BIN_PROGRAMS)) $(PLUGINS)

bitcoin/short_channel_id.h

@@ -17,7 +17,7 @@ static inline bool short_channel_id_eq(struct short_channel_id a,
 	return a.u64 == b.u64;
 }
 
-static inline size_t hash_scid(struct short_channel_id scid)
+static inline size_t short_channel_id_hash(struct short_channel_id scid)
 {
 	/* scids cost money to generate, so simple hash works here */
 	return (scid.u64 >> 32) ^ (scid.u64 >> 16) ^ scid.u64;
@@ -46,12 +46,6 @@ static inline bool short_channel_id_dir_eq(const struct short_channel_id_dir *a,
 	return short_channel_id_eq(a->scid, b->scid) && a->dir == b->dir;
 }
 
-static inline size_t hash_scidd(const struct short_channel_id_dir *scidd)
-{
-	/* Bottom bit is common, so use bit 4 for direction */
-	return hash_scid(scidd->scid) | (scidd->dir << 4);
-}
-
 static inline u32 short_channel_id_blocknum(struct short_channel_id scid)
 {
 	return scid.u64 >> 40;

ccan/README

@@ -1,3 +1,3 @@
 CCAN imported from http://ccodearchive.net.
 
-CCAN version: init-2608-gb35fabb6
+CCAN version: init-2606-g5f219f03

ccan/ccan/json_out/json_out.c

@@ -9,7 +9,7 @@ struct json_out {
 	/* Callback if we reallocate. */
 	void (*move_cb)(struct json_out *jout, ptrdiff_t delta, void *arg);
 	void *cb_arg;
-
+	
 #ifdef CCAN_JSON_OUT_DEBUG
 	/* tal_arr of types ( or [ we're enclosed in.  NULL if oom. */
 	char *wrapping;
@@ -246,7 +246,7 @@ bool json_out_addv(struct json_out *jout,
 		dst = mkroom(jout, fmtlen + 1 + (int)quote*2);
 		if (!dst)
 			goto out;
-		vsnprintf(dst + quote, fmtlen + 1, fmt, ap2);
+		vsprintf(dst + quote, fmt, ap2);
 	}
 
 #ifdef CCAN_JSON_OUT_DEBUG
@@ -294,14 +294,7 @@ bool json_out_addstr(struct json_out *jout,
 		     const char *fieldname,
 		     const char *str)
 {
-	return json_out_addstrn(jout, fieldname, str, strlen(str));
-}
-
-bool json_out_addstrn(struct json_out *jout,
-		      const char *fieldname,
-		      const char *str,
-		      size_t len)
-{
+	size_t len = strlen(str);
 	char *p;
 	struct json_escape *e;
 

ccan/ccan/json_out/json_out.h

@@ -121,20 +121,6 @@ bool json_out_addstr(struct json_out *jout,
 		     const char *fieldname,
 		     const char *str);
 
-/**
- * json_out_addstrn - convenience helper to add a string field (with length).
- * @jout: the json_out object to write into.
- * @fieldname: optional fieldname to prepend.
- * @str: the string to add (must not be NULL).
- * @len: the length of @str
- *
- * Equivalent to json_out_add(@jout, @fieldname, true, "%.*s", @len, @str);
- */
-bool json_out_addstrn(struct json_out *jout,
-		      const char *fieldname,
-		      const char *str,
-		      size_t len);
-
 /**
  * json_out_member_direct - add a field, with direct access.
  * @jout: the json_out object to write into.

ccan/ccan/json_out/test/run.c

@@ -69,7 +69,7 @@ static void test_json_out_add(const tal_t *ctx,
 	}
 }
 
-static void json_eq(struct json_out *jout, const char *expect)
+static void json_eq(const struct json_out *jout, const char *expect)
 {
 	size_t len;
 	const char *p;