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: