BOLTs: more catchup ("BOLT 4: More clarifying changes.")

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

Makefile

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

common/blindedpath.c

@@ -243,7 +243,7 @@ void blindedpath_next_path_key(const struct tlv_encrypted_data_tlv *enc,
 	/* BOLT #4:
 	 *   - $`E_{i+1} = SHA256(E_i || ss_i) * E_i`$
 	 * ...
-	 * - If `encrypted_data` contains a `next_path_key_override`:
+	 * - If the `encrypted_data_tlv` contains a `next_path_key_override`:
 	 *   - MUST use it as the next `path_key`.
 	 * - Otherwise:
 	 *  - MUST use $`E_{i+1} = SHA256(E_i || ss_i) * E_i`$ as the next `path_key`

wire/onion_wire.csv

@@ -9,7 +9,7 @@ tlvtype,payload,payment_data,8
 tlvdata,payload,payment_data,payment_secret,byte,32
 tlvdata,payload,payment_data,total_msat,tu64,
 tlvtype,payload,encrypted_recipient_data,10
-tlvdata,payload,encrypted_recipient_data,encrypted_data,byte,...
+tlvdata,payload,encrypted_recipient_data,encrypted_recipient_data,byte,...
 tlvtype,payload,current_path_key,12
 tlvdata,payload,current_path_key,path_key,point,
 tlvtype,payload,payment_metadata,16