BOLTs: Update to version with peer storage merged.

Unfortunately a spec typo means the data fields are missing (PR pending),
so we still patch those in.

The message "your_peer_storage" got renamed to "peer_storage_retrieval",
and the option "want_peer_backup_storage" was removed.

Signed-off-by: Rusty Russell <[email protected]>
Changelog-EXPERIMENTAL: `experimental-peer-storage` now only advertizes feature 43, not 41.

Author: rustyrussell

Makefile

@@ -26,7 +26,7 @@ CCANDIR := ccan
 
 # Where we keep the BOLT RFCs
 BOLTDIR := ../bolts/
-DEFAULT_BOLTVERSION := ecf792d87367fb6ff132a0cc7a53193dfb77d001
+DEFAULT_BOLTVERSION := acd383145dd8c3fecd69ce94e4a789767b984ac0
 # Can be overridden on cmdline.
 BOLTVERSION := $(DEFAULT_BOLTVERSION)
 

channeld/channeld.c

@@ -4587,7 +4587,7 @@ static void peer_in(struct peer *peer, const u8 *msg)
 	case WIRE_ERROR:
 	case WIRE_ONION_MESSAGE:
 	case WIRE_PEER_STORAGE:
-	case WIRE_YOUR_PEER_STORAGE:
+	case WIRE_PEER_STORAGE_RETRIEVAL:
 		abort();
 	}
 

common/features.c

@@ -132,10 +132,7 @@ static const struct feature_style feature_styles[] = {
 			  [NODE_ANNOUNCE_FEATURE] = FEATURE_REPRESENT,
 			  [BOLT11_FEATURE] = FEATURE_DONT_REPRESENT,
 			  [CHANNEL_FEATURE] = FEATURE_DONT_REPRESENT } },
-	{ OPT_WANT_PEER_BACKUP_STORAGE,
-	  .copy_style = { [INIT_FEATURE] = FEATURE_REPRESENT,
-			  [NODE_ANNOUNCE_FEATURE] = FEATURE_REPRESENT } },
-	{ OPT_PROVIDE_PEER_BACKUP_STORAGE,
+	{ OPT_PROVIDE_STORAGE,
 	  .copy_style = { [INIT_FEATURE] = FEATURE_REPRESENT,
 			  [NODE_ANNOUNCE_FEATURE] = FEATURE_REPRESENT } },
 	{ OPT_SPLICE,
@@ -430,8 +427,8 @@ const char *feature_name(const tal_t *ctx, size_t f)
 		"option_quiesce", /* https://github.com/lightning/bolts/pull/869 */
 		NULL,
 		"option_onion_messages",  /* https://github.com/lightning/bolts/pull/759 */
-		"option_want_peer_backup_storage", /* 40/41 */ /* https://github.com/lightning/bolts/pull/881/files */
-		"option_provide_peer_backup_storage", /* https://github.com/lightning/bolts/pull/881/files */
+		NULL,
+		"option_provide_storage",
 		"option_channel_type",
 		"option_scid_alias", /* https://github.com/lightning/bolts/pull/910 */
 		"option_payment_metadata",

common/features.h

@@ -115,8 +115,9 @@ struct feature_set *feature_set_dup(const tal_t *ctx,
  * | 24/25 | `option_route_blinding`           |...IN9 ...
  * | 26/27 | `option_shutdown_anysegwit`       |... IN ...
  * | 28/29 | `option_dual_fund`                |... IN ...
- * | 34/35 | `option_quiesce`                  | ... IN ...
+ * | 34/35 | `option_quiesce`                  |... IN ...
  * | 38/39 | `option_onion_messages`           |... IN ...
+ * | 42/43 | `option_provide_storage`          |... IN ...
  * | 44/45 | `option_channel_type`             |... IN ...
  * | 46/47 | `option_scid_alias`               | ... IN ...
  * | 48/49 | `option_payment_metadata`         |...  9 ...
@@ -138,6 +139,7 @@ struct feature_set *feature_set_dup(const tal_t *ctx,
 #define OPT_DUAL_FUND 				28
 #define OPT_QUIESCE 				34
 #define OPT_ONION_MESSAGES			38
+#define OPT_PROVIDE_STORAGE			42
 #define OPT_CHANNEL_TYPE			44
 #define OPT_SCID_ALIAS				46
 #define OPT_PAYMENT_METADATA			48
@@ -155,12 +157,4 @@ struct feature_set *feature_set_dup(const tal_t *ctx,
 
 #define OPT_SHUTDOWN_WRONG_FUNDING		104
 
-/* BOLT-peer-storage #9:
- *
- * | 40/41 | `want_peer_backup_storage`        | Want to use other nodes to store encrypted backup data    | IN ...
- * | 42/43 | `provide_peer_backup_storage`     | Can store other nodes' encrypted backup data              | IN ...
- */
-#define OPT_WANT_PEER_BACKUP_STORAGE		40
-#define OPT_PROVIDE_PEER_BACKUP_STORAGE		42
-
 #endif /* LIGHTNING_COMMON_FEATURES_H */

common/gossmap.c

@@ -1802,7 +1802,7 @@ const void *gossmap_stream_next(const tal_t *ctx,
 		case WIRE_UPDATE_BLOCKHEIGHT:
 		case WIRE_CHANNEL_REESTABLISH:
 		case WIRE_PEER_STORAGE:
-		case WIRE_YOUR_PEER_STORAGE:
+		case WIRE_PEER_STORAGE_RETRIEVAL:
 		case WIRE_ANNOUNCEMENT_SIGNATURES:
 		case WIRE_QUERY_SHORT_CHANNEL_IDS:
 		case WIRE_REPLY_SHORT_CHANNEL_IDS_END:

common/interactivetx.c

@@ -184,7 +184,7 @@ static u8 *read_next_msg(const tal_t *ctx,
 		case WIRE_SHUTDOWN:
 		case WIRE_STFU:
 		case WIRE_PEER_STORAGE:
-		case WIRE_YOUR_PEER_STORAGE:
+		case WIRE_PEER_STORAGE_RETRIEVAL:
 		case WIRE_SPLICE:
 		case WIRE_SPLICE_ACK:
 		case WIRE_SPLICE_LOCKED:
@@ -774,7 +774,7 @@ char *process_interactivetx_updates(const tal_t *ctx,
 		case WIRE_PING:
 		case WIRE_PONG:
 		case WIRE_PEER_STORAGE:
-		case WIRE_YOUR_PEER_STORAGE:
+		case WIRE_PEER_STORAGE_RETRIEVAL:
 		case WIRE_SPLICE:
 		case WIRE_SPLICE_ACK:
 		case WIRE_STFU:

connectd/gossip_rcvd_filter.c

@@ -88,7 +88,7 @@ static bool is_msg_gossip_broadcast(const u8 *cursor)
 	case WIRE_TX_ACK_RBF:
 	case WIRE_TX_ABORT:
 	case WIRE_PEER_STORAGE:
-	case WIRE_YOUR_PEER_STORAGE:
+	case WIRE_PEER_STORAGE_RETRIEVAL:
 	case WIRE_OPEN_CHANNEL2:
 	case WIRE_ACCEPT_CHANNEL2:
 	case WIRE_STFU:

connectd/gossip_store.c

@@ -93,7 +93,7 @@ static bool public_msg_type(enum peer_wire type)
 	case WIRE_GOSSIP_TIMESTAMP_FILTER:
 	case WIRE_ONION_MESSAGE:
 	case WIRE_PEER_STORAGE:
-	case WIRE_YOUR_PEER_STORAGE:
+	case WIRE_PEER_STORAGE_RETRIEVAL:
 	case WIRE_STFU:
 	case WIRE_SPLICE:
 	case WIRE_SPLICE_ACK:

connectd/multiplex.c

@@ -382,7 +382,7 @@ static bool is_urgent(enum peer_wire type)
 	case WIRE_GOSSIP_TIMESTAMP_FILTER:
 	case WIRE_ONION_MESSAGE:
 	case WIRE_PEER_STORAGE:
-	case WIRE_YOUR_PEER_STORAGE:
+	case WIRE_PEER_STORAGE_RETRIEVAL:
 	case WIRE_STFU:
 	case WIRE_SPLICE:
 	case WIRE_SPLICE_ACK:

gossipd/gossipd.c

@@ -262,7 +262,7 @@ static void handle_recv_gossip(struct daemon *daemon, const u8 *outermsg)
 	case WIRE_ACCEPT_CHANNEL2:
 	case WIRE_ONION_MESSAGE:
 	case WIRE_PEER_STORAGE:
-	case WIRE_YOUR_PEER_STORAGE:
+	case WIRE_PEER_STORAGE_RETRIEVAL:
 	case WIRE_STFU:
 	case WIRE_SPLICE:
 	case WIRE_SPLICE_ACK:

lightningd/options.c

@@ -1258,10 +1258,7 @@ static char *opt_set_peer_storage(struct lightningd *ld)
 {
 	feature_set_or(ld->our_features,
 		       take(feature_set_for_feature(NULL,
-						    OPTIONAL_FEATURE(OPT_PROVIDE_PEER_BACKUP_STORAGE))));
-	feature_set_or(ld->our_features,
-		       take(feature_set_for_feature(NULL,
-						    OPTIONAL_FEATURE(OPT_WANT_PEER_BACKUP_STORAGE))));
+						    OPTIONAL_FEATURE(OPT_PROVIDE_STORAGE))));
 	return NULL;
 }
 

openingd/dualopend.c

@@ -1698,7 +1698,7 @@ static u8 *opening_negotiate_msg(const tal_t *ctx, struct state *state)
 		case WIRE_PING:
 		case WIRE_PONG:
 		case WIRE_PEER_STORAGE:
-		case WIRE_YOUR_PEER_STORAGE:
+		case WIRE_PEER_STORAGE_RETRIEVAL:
 		case WIRE_STFU:
 		case WIRE_SPLICE:
 		case WIRE_SPLICE_ACK:
@@ -2077,7 +2077,7 @@ static bool run_tx_interactive(struct state *state,
 		case WIRE_PING:
 		case WIRE_PONG:
 		case WIRE_PEER_STORAGE:
-		case WIRE_YOUR_PEER_STORAGE:
+		case WIRE_PEER_STORAGE_RETRIEVAL:
 		case WIRE_STFU:
 		case WIRE_SPLICE:
 		case WIRE_SPLICE_ACK:
@@ -4260,7 +4260,7 @@ static u8 *handle_peer_in(struct state *state)
 	case WIRE_PING:
 	case WIRE_PONG:
 	case WIRE_PEER_STORAGE:
-	case WIRE_YOUR_PEER_STORAGE:
+	case WIRE_PEER_STORAGE_RETRIEVAL:
 	case WIRE_STFU:
 	case WIRE_SPLICE:
 	case WIRE_SPLICE_ACK:

plugins/chanbackup.c

@@ -386,7 +386,7 @@ static struct command_result *peer_after_listdatastore(struct command *cmd,
 	if (!peer_backup)
 		return command_hook_success(cmd);
 
-        u8 *payload = towire_your_peer_storage(cmd, hexdata);
+        u8 *payload = towire_peer_storage_retrieval(cmd, hexdata);
 
         plugin_log(cmd->plugin, LOG_DBG,
                    "sending their backup from our datastore");
@@ -508,7 +508,7 @@ static struct command_result *after_listpeers(struct command *cmd,
 			continue;
 
 		/* We shouldn't have to check, but LND hangs up? */
-		if (feature_offered(features, OPT_PROVIDE_PEER_BACKUP_STORAGE)) {
+		if (feature_offered(features, OPT_PROVIDE_STORAGE)) {
 			const jsmntok_t *nodeid;
 			struct node_id node_id;
 
@@ -612,8 +612,7 @@ static struct command_result *peer_connected(struct command *cmd,
 	}
 
 	/* We shouldn't have to check, but LND hangs up? */
-	if (!feature_offered(features, OPT_WANT_PEER_BACKUP_STORAGE)
-	    && !feature_offered(features, OPT_PROVIDE_PEER_BACKUP_STORAGE)) {
+	if (!feature_offered(features, OPT_PROVIDE_STORAGE)) {
 		return command_hook_success(cmd);
 	}
 
@@ -693,7 +692,7 @@ static struct command_result *handle_your_peer_storage(struct command *cmd,
 					     	    datastore_success,
 					     	    datastore_failed,
 						    "Saving chanbackup/peers/");
-	} else if (fromwire_your_peer_storage(cmd, payload, &payload_deserialise)) {
+	} else if (fromwire_peer_storage_retrieval(cmd, payload, &payload_deserialise)) {
 		plugin_log(cmd->plugin, LOG_DBG,
                            "Received peer_storage from peer.");
 
@@ -877,7 +876,7 @@ static const char *init(struct command *init_cmd,
 		 take(json_out_obj(NULL, NULL, NULL)),
 		 "{our_features:{init:%}}",
 		 JSON_SCAN_TAL(tmpctx, json_tok_bin_from_hex, &features));
-	peer_backup = feature_offered(features, OPT_WANT_PEER_BACKUP_STORAGE);
+	peer_backup = feature_offered(features, OPT_PROVIDE_STORAGE);
 
 	rpc_scan(init_cmd, "staticbackup",
 		 take(json_out_obj(NULL, NULL, NULL)),

tests/fuzz/corpora/fuzz-wire-your_peer_storage/007dd9b9b6f1fe30c650ee7988643e98436c23da renamed to tests/fuzz/corpora/fuzz-wire-peer_storage_retrieval/007dd9b9b6f1fe30c650ee7988643e98436c23da

@@ -0,0 +1,35 @@
+#include "config.h"
+#include <ccan/mem/mem.h>
+#include <tests/fuzz/libfuzz.h>
+#include <tests/fuzz/wire.h>
+#include <wire/peer_wire.h>
+
+struct peer_storage_retrieval {
+	u8 *blob;
+};
+
+static void *encode(const tal_t *ctx, const struct peer_storage_retrieval *s)
+{
+	return towire_peer_storage_retrieval(ctx, s->blob);
+}
+
+static struct peer_storage_retrieval *decode(const tal_t *ctx, const void *p)
+{
+	struct peer_storage_retrieval *s = tal(ctx, struct peer_storage_retrieval);
+
+	if (fromwire_peer_storage_retrieval(s, p, &s->blob))
+		return s;
+	return tal_free(s);
+}
+
+static bool equal(const struct peer_storage_retrieval *x,
+		  const struct peer_storage_retrieval *y)
+{
+	return tal_arr_eq(x->blob, y->blob);
+}
+
+void run(const u8 *data, size_t size)
+{
+	test_decode_encode(data, size, WIRE_PEER_STORAGE_RETRIEVAL,
+			   struct peer_storage_retrieval);
+}

tests/fuzz/corpora/fuzz-wire-your_peer_storage/05baf0e50c8261fe3ddb1cf4833f7b7130e5a5ab renamed to tests/fuzz/corpora/fuzz-wire-peer_storage_retrieval/05baf0e50c8261fe3ddb1cf4833f7b7130e5a5ab

@@ -3136,7 +3136,7 @@ def test_restorefrompeer(node_factory, bitcoind):
     except RpcError as err:
         assert "disconnected during connection" in err.error['message']
 
-    l1.daemon.wait_for_log('peer_in WIRE_YOUR_PEER_STORAGE')
+    l1.daemon.wait_for_log('peer_in WIRE_PEER_STORAGE_RETRIEVAL')
 
     assert l1.rpc.restorefrompeer()['stubs'][0] == _['channel_id']
 

tests/fuzz/corpora/fuzz-wire-your_peer_storage/107627445c97183226ad962e403df8817f557b03 renamed to tests/fuzz/corpora/fuzz-wire-peer_storage_retrieval/107627445c97183226ad962e403df8817f557b03

@@ -1,15 +1,14 @@
 --- wire/peer_wire.csv	2022-07-18 13:49:29.079542016 +0530
 +++ -	2022-07-18 13:58:17.706696582 +0530
-@@ -249,6 +249,12 @@
- msgdata,channel_reestablish,my_current_per_commitment_point,point,
- tlvtype,channel_reestablish_tlvs,next_funding,0
- tlvdata,channel_reestablish_tlvs,next_funding,next_funding_txid,sha256,
-+msgtype,peer_storage,7
+@@ -249,7 +249,11 @@
+ msgdata,pong,byteslen,u16,
+ msgdata,pong,ignored,byte,byteslen
+ msgtype,peer_storage,7
 +msgdata,peer_storage,len,u16,
 +msgdata,peer_storage,blob,byte,len
-+msgtype,your_peer_storage,9
-+msgdata,your_peer_storage,len,u16,
-+msgdata,your_peer_storage,blob,byte,len
- msgtype,announcement_signatures,259
- msgdata,announcement_signatures,channel_id,channel_id,
- msgdata,announcement_signatures,short_channel_id,short_channel_id,
+ msgtype,peer_storage_retrieval,9
++msgdata,peer_storage_retrieval,len,u16,
++msgdata,peer_storage_retrieval,blob,byte,len
+ tlvtype,n1,tlv1,1
+ tlvdata,n1,tlv1,amount_msat,tu64,
+ tlvtype,n1,tlv2,2

tests/fuzz/corpora/fuzz-wire-your_peer_storage/11d7d7ce0b68973d37325a5b3f1fdcf7d2e88954 renamed to tests/fuzz/corpora/fuzz-wire-peer_storage_retrieval/11d7d7ce0b68973d37325a5b3f1fdcf7d2e88954

@@ -16,6 +16,6 @@
 +tlvdata,channel_reestablish_tlvs,current_channel_type,type,byte,...
 +tlvtype,channel_reestablish_tlvs,upgradable_channel_type,7
 +tlvdata,channel_reestablish_tlvs,upgradable_channel_type,type,byte,...
- msgtype,peer_storage,7
- msgdata,peer_storage,len,u16,
- msgdata,peer_storage,blob,byte,len
+ msgtype,announcement_signatures,259
+ msgdata,announcement_signatures,channel_id,channel_id,
+ msgdata,announcement_signatures,short_channel_id,short_channel_id,

tests/fuzz/corpora/fuzz-wire-your_peer_storage/1489f923c4dca729178b3e3233458550d8dddf29 renamed to tests/fuzz/corpora/fuzz-wire-peer_storage_retrieval/1489f923c4dca729178b3e3233458550d8dddf29

@@ -46,7 +46,7 @@ static bool unknown_type(enum peer_wire t)
 	case WIRE_TX_ACK_RBF:
 	case WIRE_TX_ABORT:
 	case WIRE_PEER_STORAGE:
-	case WIRE_YOUR_PEER_STORAGE:
+	case WIRE_PEER_STORAGE_RETRIEVAL:
 	case WIRE_OPEN_CHANNEL2:
 	case WIRE_ACCEPT_CHANNEL2:
 	case WIRE_STFU:
@@ -105,7 +105,7 @@ bool is_msg_for_gossipd(const u8 *cursor)
 	case WIRE_ACCEPT_CHANNEL2:
 	case WIRE_ONION_MESSAGE:
 	case WIRE_PEER_STORAGE:
-	case WIRE_YOUR_PEER_STORAGE:
+	case WIRE_PEER_STORAGE_RETRIEVAL:
 	case WIRE_STFU:
 	case WIRE_SPLICE:
 	case WIRE_SPLICE_ACK:
@@ -130,7 +130,7 @@ bool peer_wire_is_internal(enum peer_wire type)
 		return false;
 
 	/* handled by pluigns */
-	if (type == WIRE_PEER_STORAGE || type == WIRE_YOUR_PEER_STORAGE)
+	if (type == WIRE_PEER_STORAGE || type == WIRE_PEER_STORAGE_RETRIEVAL)
 		return false;
 
 	return true;
@@ -161,7 +161,7 @@ bool extract_channel_id(const u8 *in_pkt, struct channel_id *channel_id)
 	case WIRE_GOSSIP_TIMESTAMP_FILTER:
 	case WIRE_ONION_MESSAGE:
 	case WIRE_PEER_STORAGE:
-	case WIRE_YOUR_PEER_STORAGE:
+	case WIRE_PEER_STORAGE_RETRIEVAL:
 		return false;
 
 	/* Special cases: */

tests/fuzz/corpora/fuzz-wire-your_peer_storage/1599e9fa41ec68c80230491902786bee889f5bcb renamed to tests/fuzz/corpora/fuzz-wire-peer_storage_retrieval/1599e9fa41ec68c80230491902786bee889f5bcb

@@ -23,6 +23,12 @@ msgdata,ping,ignored,byte,byteslen
 msgtype,pong,19
 msgdata,pong,byteslen,u16,
 msgdata,pong,ignored,byte,byteslen
+msgtype,peer_storage,7
+msgdata,peer_storage,len,u16,
+msgdata,peer_storage,blob,byte,len
+msgtype,peer_storage_retrieval,9
+msgdata,peer_storage_retrieval,len,u16,
+msgdata,peer_storage_retrieval,blob,byte,len
 tlvtype,n1,tlv1,1
 tlvdata,n1,tlv1,amount_msat,tu64,
 tlvtype,n1,tlv2,2
@@ -299,12 +305,6 @@ tlvtype,channel_reestablish_tlvs,current_channel_type,5
 tlvdata,channel_reestablish_tlvs,current_channel_type,type,byte,...
 tlvtype,channel_reestablish_tlvs,upgradable_channel_type,7
 tlvdata,channel_reestablish_tlvs,upgradable_channel_type,type,byte,...
-msgtype,peer_storage,7
-msgdata,peer_storage,len,u16,
-msgdata,peer_storage,blob,byte,len
-msgtype,your_peer_storage,9
-msgdata,your_peer_storage,len,u16,
-msgdata,your_peer_storage,blob,byte,len
 msgtype,announcement_signatures,259
 msgdata,announcement_signatures,channel_id,channel_id,
 msgdata,announcement_signatures,short_channel_id,short_channel_id,