Set payment_secret to required in features flags

Author: TheBlueMatt

lightning/src/ln/features.rs

@@ -92,7 +92,7 @@ mod sealed {
 			// Byte 0
 			,
 			// Byte 1
-			StaticRemoteKey,
+			StaticRemoteKey | PaymentSecret,
 			// Byte 2
 			,
 			// Byte 3
@@ -102,7 +102,7 @@ mod sealed {
 			// Byte 0
 			DataLossProtect | InitialRoutingSync | UpfrontShutdownScript | GossipQueries,
 			// Byte 1
-			VariableLengthOnion | PaymentSecret,
+			VariableLengthOnion,
 			// Byte 2
 			BasicMPP,
 			// Byte 3
@@ -114,7 +114,7 @@ mod sealed {
 			// Byte 0
 			,
 			// Byte 1
-			StaticRemoteKey,
+			StaticRemoteKey | PaymentSecret,
 			// Byte 2
 			,
 			// Byte 3
@@ -124,7 +124,7 @@ mod sealed {
 			// Byte 0
 			DataLossProtect | UpfrontShutdownScript | GossipQueries,
 			// Byte 1
-			VariableLengthOnion | PaymentSecret,
+			VariableLengthOnion,
 			// Byte 2
 			BasicMPP,
 			// Byte 3
@@ -136,12 +136,19 @@ mod sealed {
 		optional_features: [],
 	});
 	define_context!(InvoiceContext {
-		required_features: [,,,],
+		required_features: [
+			// Byte 0
+			,
+			// Byte 1
+			PaymentSecret,
+			// Byte 2
+			,
+		],
 		optional_features: [
 			// Byte 0
 			,
 			// Byte 1
-			VariableLengthOnion | PaymentSecret,
+			VariableLengthOnion,
 			// Byte 2
 			BasicMPP,
 		],
@@ -665,8 +672,8 @@ mod tests {
 
 		assert!(InitFeatures::known().supports_payment_secret());
 		assert!(NodeFeatures::known().supports_payment_secret());
-		assert!(!InitFeatures::known().requires_payment_secret());
-		assert!(!NodeFeatures::known().requires_payment_secret());
+		assert!(InitFeatures::known().requires_payment_secret());
+		assert!(NodeFeatures::known().requires_payment_secret());
 
 		assert!(InitFeatures::known().supports_basic_mpp());
 		assert!(NodeFeatures::known().supports_basic_mpp());
@@ -712,12 +719,12 @@ mod tests {
 		{
 			// Check that the flags are as expected:
 			// - option_data_loss_protect
-			// - var_onion_optin | static_remote_key (req) | payment_secret
+			// - var_onion_optin | static_remote_key (req) | payment_secret(req)
 			// - basic_mpp
 			// - opt_shutdown_anysegwit
 			assert_eq!(node_features.flags.len(), 4);
 			assert_eq!(node_features.flags[0], 0b00000010);
-			assert_eq!(node_features.flags[1], 0b10010010);
+			assert_eq!(node_features.flags[1], 0b01010010);
 			assert_eq!(node_features.flags[2], 0b00000010);
 			assert_eq!(node_features.flags[3], 0b00001000);
 		}