Onion message payload for BOLT 12 Offers

[rust-lightning] / lightning / src / onion_message / packet.rs

diff --git a/lightning/src/onion_message/packet.rs b/lightning/src/onion_message/packet.rs
index d4f08109cd9858e0b62c88fbaffe59249b07efee..9322f9489bcd42d80f5dfc6161650dedd1f0f15b 100644 (file)
--- a/lightning/src/onion_message/packet.rs
+++ b/lightning/src/onion_message/packet.rs
@@ -16,6 +16,7 @@ use crate::blinded_path::{BlindedPath, ForwardTlvs, ReceiveTlvs};
 use crate::ln::msgs::DecodeError;
 use crate::ln::onion_utils;
 use super::messenger::CustomOnionMessageHandler;
+use super::offers::OffersMessage;
 use crate::util::chacha20poly1305rfc::{ChaChaPolyReadAdapter, ChaChaPolyWriteAdapter};
 use crate::util::logger::Logger;
 use crate::util::ser::{BigSize, FixedLengthReader, LengthRead, LengthReadable, LengthReadableArgs, Readable, ReadableArgs, Writeable, Writer};
@@ -109,10 +110,8 @@ pub(super) enum Payload<T: CustomOnionMessageContents> {
 /// The contents of an onion message. In the context of offers, this would be the invoice, invoice
 /// request, or invoice error.
 pub enum OnionMessageContents<T: CustomOnionMessageContents> {
-       // Coming soon:
-       // Invoice,
-       // InvoiceRequest,
-       // InvoiceError,
+       /// A message related to BOLT 12 Offers.
+       Offers(OffersMessage),
        /// A custom onion message specified by the user.
        Custom(T),
 }
@@ -123,6 +122,7 @@ impl<T: CustomOnionMessageContents> OnionMessageContents<T> {
        /// This is not exported to bindings users as methods on non-cloneable enums are not currently exportable
        pub fn tlv_type(&self) -> u64 {
                match self {
+                       &OnionMessageContents::Offers(ref msg) => msg.tlv_type(),
                        &OnionMessageContents::Custom(ref msg) => msg.tlv_type(),
                }
        }
@@ -132,6 +132,7 @@ impl<T: CustomOnionMessageContents> OnionMessageContents<T> {
 impl<T: CustomOnionMessageContents> Writeable for OnionMessageContents<T> {
        fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
                match self {
+                       OnionMessageContents::Offers(msg) => Ok(msg.write(w)?),
                        OnionMessageContents::Custom(msg) => Ok(msg.write(w)?),
                }
        }
@@ -205,7 +206,7 @@ impl<T: CustomOnionMessageContents> Writeable for (Payload<T>, [u8; 32]) {
 impl<H: CustomOnionMessageHandler, L: Logger>
 ReadableArgs<(SharedSecret, &H, &L)> for Payload<<H as CustomOnionMessageHandler>::CustomMessage> {
        fn read<R: Read>(r: &mut R, args: (SharedSecret, &H, &L)) -> Result<Self, DecodeError> {
-               let (encrypted_tlvs_ss, handler, _logger) = args;
+               let (encrypted_tlvs_ss, handler, logger) = args;
 
                let v: BigSize = Readable::read(r)?;
                let mut rd = FixedLengthReader::new(r, v.0);
@@ -223,13 +224,19 @@ ReadableArgs<(SharedSecret, &H, &L)> for Payload<<H as CustomOnionMessageHandler
                        if message_type.is_some() { return Err(DecodeError::InvalidValue) }
 
                        message_type = Some(msg_type);
-                       match handler.read_custom_message(msg_type, msg_reader) {
-                               Ok(Some(msg)) => {
-                                       message = Some(msg);
+                       match msg_type {
+                               tlv_type if OffersMessage::is_known_type(tlv_type) => {
+                                       let msg = OffersMessage::read(msg_reader, (tlv_type, logger))?;
+                                       message = Some(OnionMessageContents::Offers(msg));
                                        Ok(true)
                                },
-                               Ok(None) => Ok(false),
-                               Err(e) => Err(e),
+                               _ => match handler.read_custom_message(msg_type, msg_reader)? {
+                                       Some(msg) => {
+                                               message = Some(OnionMessageContents::Custom(msg));
+                                               Ok(true)
+                                       },
+                                       None => Ok(false),
+                               },
                        }
                });
                rd.eat_remaining().map_err(|_| DecodeError::ShortRead)?;
@@ -247,7 +254,7 @@ ReadableArgs<(SharedSecret, &H, &L)> for Payload<<H as CustomOnionMessageHandler
                                Ok(Payload::Receive {
                                        control_tlvs: ReceiveControlTlvs::Unblinded(tlvs),
                                        reply_path,
-                                       message: OnionMessageContents::Custom(message.unwrap()),
+                                       message: message.unwrap(),
                                })
                        }
                }