f: discriminate blinding errors in error codes

Author: arik-so

lightning/src/ln/onion_utils.rs

@@ -1832,15 +1832,36 @@ where
 							trampoline_shared_secret,
 						),
 					}),
-					Ok((_, None)) => Err(OnionDecodeErr::Malformed {
+					Ok((msgs::InboundTrampolinePayload::BlindedForward(_), None)) => {
+						Err(OnionDecodeErr::Malformed {
+							err_msg: "Non-final Trampoline onion data provided to us as last hop",
+							err_code: INVALID_ONION_BLINDING,
+							trampoline_onion_blinding: true,
+						})
+					},
+					Ok((msgs::InboundTrampolinePayload::BlindedReceive(_), Some(_))) => {
+						Err(OnionDecodeErr::Malformed {
+							err_msg:
+								"Final Trampoline onion data provided to us as intermediate hop",
+							err_code: INVALID_ONION_BLINDING,
+							trampoline_onion_blinding: true,
+						})
+					},
+					Ok((_, None)) => Err(OnionDecodeErr::Relay {
 						err_msg: "Non-final Trampoline onion data provided to us as last hop",
-						err_code: INVALID_ONION_BLINDING,
-						trampoline_onion_blinding: true,
+						err_code: 0x4000 | 22,
+						shared_secret,
+						trampoline_shared_secret: Some(SharedSecret::from_bytes(
+							trampoline_shared_secret,
+						)),
 					}),
-					Ok((_, Some(_))) => Err(OnionDecodeErr::Malformed {
+					Ok((_, Some(_))) => Err(OnionDecodeErr::Relay {
 						err_msg: "Final Trampoline onion data provided to us as intermediate hop",
-						err_code: INVALID_ONION_BLINDING,
-						trampoline_onion_blinding: true,
+						err_code: 0x4000 | 22,
+						shared_secret,
+						trampoline_shared_secret: Some(SharedSecret::from_bytes(
+							trampoline_shared_secret,
+						)),
 					}),
 					Err(e) => Err(e),
 				}