Makefile: update BOLTVERSION to flatten features.

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

Makefile

@@ -15,7 +15,7 @@ CCANDIR := ccan
 
 # Where we keep the BOLT RFCs
 BOLTDIR := ../lightning-rfc/
-BOLTVERSION := 35f6376f2050191081b148fb540f604092be59e1
+BOLTVERSION := 0fb66ca6ccd935d60a48c80544d4b80d5583422c
 
 -include config.vars
 

common/features.h

@@ -40,20 +40,20 @@ void set_feature_bit(u8 **ptr, u32 bit);
 
 /* BOLT #9:
  *
- * ## Assigned `localfeatures` flags
- *...
- * | Bits | Name                             |...
- * | 0/1  | `option_data_loss_protect`       |...
- * | 3    | `initial_routing_sync`           |...
- * | 4/5  | `option_upfront_shutdown_script` |...
- * | 6/7  | `gossip_queries`                 |...
- * | 10/11 | `gossip_queries_ex`             |...
+ * | Bits  | Name                             |...
+ * | 0/1   | `option_data_loss_protect`       |...
+ * | 3     | `initial_routing_sync`           |...
+ * | 4/5   | `option_upfront_shutdown_script` |...
+ * | 6/7   | `gossip_queries`                 |...
+ * | 8/9   | `var_onion_optin`                |...
+ * | 10/11 | `gossip_queries_ex`              |...
  * | 12/13| `option_static_remotekey`        |...
  */
 #define OPT_DATA_LOSS_PROTECT			0
 #define OPT_INITIAL_ROUTING_SYNC		2
 #define OPT_UPFRONT_SHUTDOWN_SCRIPT		4
 #define OPT_GOSSIP_QUERIES			6
+#define OPT_VAR_ONION				8
 #define OPT_GOSSIP_QUERIES_EX			10
 #define OPT_STATIC_REMOTEKEY			12
 
@@ -65,13 +65,4 @@ void set_feature_bit(u8 **ptr, u32 bit);
 #define OPT_PAYMENT_SECRET			14
 #define OPT_BASIC_MPP				16
 
-/* BOLT #9:
- *
- * ## Assigned `globalfeatures` flags
- *...
- * | Bits | Name              | ...
- * | 8/9  | `var_onion_optin` | ...
- */
-#define OPT_VAR_ONION				8
-
 #endif /* LIGHTNING_COMMON_FEATURES_H */