offers: make it a runtime option.

The fetchinvoice and offers plugins disable themselves if the option
isn't enabled (it's enabled by default on EXPERIMENTAL_FEATURES).

Signed-off-by: Rusty Russell <[email protected]>
Changelog-Added: `experimental-offers` enables fetch, payment and creation of (early draft) offers.

Author: rustyrussell

common/Makefile

@@ -9,6 +9,7 @@ COMMON_SRC_NOGEN :=				\
 	common/billboard.c			\
 	common/bip32.c				\
 	common/blinding.c			\
+	common/blindedpath.c			\
 	common/bolt11.c				\
 	common/bolt11_json.c			\
 	common/bolt12.c				\
@@ -87,7 +88,6 @@ COMMON_SRC_NOGEN :=				\
 
 ifeq ($(EXPERIMENTAL_FEATURES),1)
 COMMON_SRC_NOGEN += common/psbt_internal.c
-COMMON_SRC_NOGEN += common/blindedpath.c
 endif
 
 COMMON_SRC_GEN := common/status_wiregen.c common/peer_status_wiregen.c

common/blindedpath.h

@@ -3,7 +3,6 @@
 #include "config.h"
 #include <ccan/tal/tal.h>
 
-#if EXPERIMENTAL_FEATURES
 struct route_info;
 struct pubkey;
 
@@ -13,5 +12,4 @@ struct onionmsg_path **make_blindedpath(const tal_t *ctx,
 					const struct pubkey *route,
 					struct pubkey *initial_blinding,
 					struct pubkey *final_blinding);
-#endif /* EXPERIMENTAL_FEATURES */
 #endif /* LIGHTNING_COMMON_BLINDEDPATH_H */

common/json.c

@@ -1198,10 +1198,8 @@ void json_add_errcode(struct json_stream *result, const char *fieldname,
 
 void json_add_invstring(struct json_stream *result, const char *invstring)
 {
-#if EXPERIMENTAL_FEATURES
 	if (strstarts(invstring, "lni"))
 		json_add_string(result, "bolt12", invstring);
 	else
-#endif
 		json_add_string(result, "bolt11", invstring);
 }

common/utils.h

@@ -118,6 +118,13 @@ STRUCTEQ_DEF(ripemd160, 0, u);
 #define IFDEV(dev, nondev) (nondev)
 #endif
 
+#if EXPERIMENTAL_FEATURES
+/* Make sure that nondev is evaluated, and valid, but is a constant */
+#define IFEXPERIMENTAL(exp, nonexp) (0 ? (nonexp) : (exp))
+#else
+#define IFEXPERIMENTAL(exp, nonexp) (nonexp)
+#endif
+
 /* Context which all wally allocations use (see common/setup.c) */
 extern const tal_t *wally_tal_ctx;
 

devtools/Makefile

@@ -1,10 +1,7 @@
-DEVTOOLS := devtools/bolt11-cli devtools/decodemsg devtools/onion devtools/dump-gossipstore devtools/gossipwith devtools/create-gossipstore devtools/mkcommit devtools/mkfunding devtools/mkclose devtools/mkgossip devtools/mkencoded devtools/mkquery devtools/lightning-checkmessage devtools/topology devtools/route
+DEVTOOLS := devtools/bolt11-cli devtools/decodemsg devtools/onion devtools/dump-gossipstore devtools/gossipwith devtools/create-gossipstore devtools/mkcommit devtools/mkfunding devtools/mkclose devtools/mkgossip devtools/mkencoded devtools/mkquery devtools/lightning-checkmessage devtools/topology devtools/route devtools/blindedpath devtools/bolt12-cli
 ifeq ($(HAVE_SQLITE3),1)
 DEVTOOLS += devtools/checkchannels
 endif
-ifeq ($(EXPERIMENTAL_FEATURES),1)
-DEVTOOLS += devtools/blindedpath devtools/bolt12-cli
-endif
 
 DEVTOOLS_TOOL_SRC := $(DEVTOOLS:=.c) devtools/print_wire.c devtools/clean_topo.c
 DEVTOOLS_TOOL_OBJS := $(DEVTOOLS_TOOL_SRC:.c=.o)

hsmd/Makefile

@@ -20,6 +20,7 @@ HSMD_COMMON_OBJS :=				\
 	common/amount.o				\
 	common/bigsize.o			\
 	common/bip32.o				\
+	common/bolt12_merkle.o			\
 	common/channel_id.o			\
 	common/daemon.o				\
 	common/daemon_conn.o			\
@@ -43,10 +44,6 @@ HSMD_COMMON_OBJS :=				\
 	common/utxo.o				\
 	common/version.o
 
-ifeq ($(EXPERIMENTAL_FEATURES),1)
-HSMD_COMMON_OBJS += common/bolt12_merkle.o
-endif
-
 lightningd/lightning_hsmd: $(HSMD_OBJS) $(HSMD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS)
 
 -include hsmd/test/Makefile

hsmd/hsmd.c

@@ -25,9 +25,7 @@
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/take/take.h>
 #include <ccan/tal/str/str.h>
-#if EXPERIMENTAL_FEATURES
 #include <common/bolt12_merkle.h>
-#endif
 #include <common/daemon_conn.h>
 #include <common/derive_basepoints.h>
 #include <common/hash_u5.h>
@@ -349,7 +347,6 @@ static void node_key(struct privkey *node_privkey, struct pubkey *node_id)
 #endif
 }
 
-#if EXPERIMENTAL_FEATURES
 /*~ This returns the secret and/or public x-only key for this node. */
 static void node_schnorrkey(secp256k1_keypair *node_keypair,
 			    struct pubkey32 *node_id32)
@@ -374,7 +371,6 @@ static void node_schnorrkey(secp256k1_keypair *node_keypair,
 				      "Failed to derive xonly pub");
 	}
 }
-#endif
 
 /*~ This secret is the basis for all per-channel secrets: the per-channel seeds
  * will be generated by mixing in the dbid and the peer node_id. */
@@ -1842,7 +1838,6 @@ static struct io_plan *handle_sign_message(struct io_conn *conn,
 			 take(towire_hsmd_sign_message_reply(NULL, &rsig)));
 }
 
-#if EXPERIMENTAL_FEATURES
 /*~ lightningd asks us to sign a bolt12 (e.g. offer). */
 static struct io_plan *handle_sign_bolt12(struct io_conn *conn,
 					   struct client *c,
@@ -1896,7 +1891,6 @@ static struct io_plan *handle_sign_bolt12(struct io_conn *conn,
 	return req_reply(conn, c,
 			 take(towire_hsmd_sign_bolt12_reply(NULL, &sig)));
 }
-#endif
 
 #if DEVELOPER
 static struct io_plan *handle_memleak(struct io_conn *conn,
@@ -2087,11 +2081,7 @@ static struct io_plan *handle_client(struct io_conn *conn, struct client *c)
 		return handle_sign_message(conn, c, c->msg_in);
 
 	case WIRE_HSMD_SIGN_BOLT12:
-#if EXPERIMENTAL_FEATURES
 		return handle_sign_bolt12(conn, c, c->msg_in);
-#else
-		break;
-#endif
 #if DEVELOPER
 	case WIRE_HSMD_DEV_MEMLEAK:
 		return handle_memleak(conn, c, c->msg_in);

lightningd/Makefile

@@ -45,12 +45,9 @@ LIGHTNINGD_SRC += lightningd/dual_open_control.c
 endif
 
 LIGHTNINGD_SRC_NOHDR :=				\
+	lightningd/offer.c			\
 	lightningd/signmessage.c
 
-ifeq ($(EXPERIMENTAL_FEATURES),1)
-LIGHTNINGD_SRC_NOHDR += lightningd/offer.c
-endif
-
 LIGHTNINGD_HEADERS :=				\
 	$(LIGHTNINGD_SRC:.c=.h)			\
 	lightningd/channel_state.h		\
@@ -81,6 +78,8 @@ LIGHTNINGD_COMMON_OBJS :=			\
 	common/blinding.o			\
 	common/bolt11.o				\
 	common/bolt11_json.o			\
+	common/bolt12.o				\
+	common/bolt12_merkle.o			\
 	common/channel_id.o			\
 	common/channel_config.o			\
 	common/coin_mvt.o			\
@@ -132,10 +131,6 @@ LIGHTNINGD_COMMON_OBJS :=			\
 	common/wire_error.o			\
 	common/wireaddr.o			\
 
-ifeq ($(EXPERIMENTAL_FEATURES),1)
-LIGHTNINGD_COMMON_OBJS += common/bolt12.o common/bolt12_merkle.o
-endif
-
 include wallet/Makefile
 
 # All together in one convenient var

lightningd/invoice.c

@@ -8,10 +8,8 @@
 #include <common/bech32.h>
 #include <common/bolt11.h>
 #include <common/bolt11_json.h>
-#if EXPERIMENTAL_FEATURES
 #include <common/bolt12.h>
 #include <common/bolt12_merkle.h>
-#endif
 #include <common/configdir.h>
 #include <common/features.h>
 #include <common/json_command.h>
@@ -133,7 +131,6 @@ static void invoice_secret(const struct preimage *payment_preimage,
 	memcpy(payment_secret->data, secret.u.u8, sizeof(secret.u.u8));
 }
 
-#if EXPERIMENTAL_FEATURES
 /* FIXME: This is a hack.  The real secret should be a signature of some
  * onion key, using the payer_id */
 static void invoice_secret_bolt12(struct lightningd *ld,
@@ -156,7 +153,6 @@ static void invoice_secret_bolt12(struct lightningd *ld,
 	BUILD_ASSERT(sizeof(*payment_secret) == sizeof(merkle));
 	memcpy(payment_secret, &merkle, sizeof(merkle));
 }
-#endif /* EXPERIMENTAL_FEATURES */
 
 struct invoice_payment_hook_payload {
 	struct lightningd *ld;
@@ -371,12 +367,10 @@ invoice_check_payment(const tal_t *ctx,
 	if (payment_secret) {
 		struct secret expected;
 
-#if EXPERIMENTAL_FEATURES
 		if (details->invstring && strstarts(details->invstring, "lni1"))
 			invoice_secret_bolt12(ld, details->invstring, &expected);
 		else
-#endif /* EXPERIMENTAL_FEATURES */
-		invoice_secret(&details->r, &expected);
+			invoice_secret(&details->r, &expected);
 		if (!secret_eq_consttime(payment_secret, &expected)) {
 			log_debug(ld->log, "Attept to pay %s with wrong secret",
 				  type_to_string(tmpctx, struct sha256,
@@ -460,7 +454,6 @@ static bool hsm_sign_b11(const u5 *u5bytes,
 	return true;
 }
 
-#if EXPERIMENTAL_FEATURES
 static void hsm_sign_b12_invoice(struct lightningd *ld,
 				 struct tlv_invoice *invoice)
 {
@@ -481,7 +474,6 @@ static void hsm_sign_b12_invoice(struct lightningd *ld,
 		fatal("HSM gave bad sign_invoice_reply %s",
 		      tal_hex(msg, msg));
 }
-#endif /* EXPERIMENTAL_FEATURES */
 
 static struct command_result *parse_fallback(struct command *cmd,
 					     const char *buffer,
@@ -1505,7 +1497,6 @@ static struct command_result *json_createinvoice(struct command *cmd,
 
 		notify_invoice_creation(cmd->ld, b11->msat, *preimage, label);
 	} else {
-#if EXPERIMENTAL_FEATURES
 		struct tlv_invoice *inv;
 		struct sha256 *local_offer_id;
 
@@ -1574,7 +1565,6 @@ static struct command_result *json_createinvoice(struct command *cmd,
 						inv->amount ? &msat : NULL,
 						*preimage, label);
 		} else
-#endif /* EXPERIMENTAL_FEATURES */
 			return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
 					    "Unparsable invoice '%s': %s",
 					    invstring, fail);

lightningd/lightningd.h

@@ -66,6 +66,9 @@ struct config {
 
 	/* How long before we give up waiting for INIT msg */
 	u32 connection_timeout_secs;
+
+	/* EXPERIMENTAL: offers support */
+	bool exp_offers;
 };
 
 typedef STRMAP(const char *) alt_subdaemon_map;