@layerzerolabs/protocol-stellar-v2 0.2.29 → 0.2.30

package/contracts/oapps/oft-core/src/codec/oft_msg_codec.rs

@@ -1,62 +1,58 @@
 use soroban_sdk::{Bytes, BytesN, Env};
 use utils::{buffer_reader::BufferReader, buffer_writer::BufferWriter};
 
-/// Decoded OFT message containing transfer details and optional compose data
+/// Decoded OFT message containing transfer details and optional compose data.
+///
+/// Wire format:
+/// ```text
+/// [send_to: 32 bytes][amount_sd: 8 bytes][compose_from: 32 bytes (optional)][compose_msg: variable (optional)]
+/// ```
 #[derive(Clone, Debug)]
 pub struct OFTMessage {
     /// Recipient address on the destination chain
     pub send_to: BytesN<32>,
-    /// Amount to transfer in shared decimals (normalized cross-chain format)
+    /// Amount to transfer in shared decimals
     pub amount_sd: u64,
-    /// Address that initiated the compose call (optional)
-    pub compose_from: Option<BytesN<32>>,
-    /// Compose message payload for additional logic (optional)
-    pub compose_msg: Option<Bytes>,
+    /// Optional compose data for cross-chain composed calls
+    pub compose: Option<ComposeData>,
 }
 
-impl OFTMessage {
-    /// Returns true if this message includes compose functionality
-    pub fn is_composed(&self) -> bool {
-        self.compose_from.is_some() && self.compose_msg.as_ref().is_some_and(|msg| !msg.is_empty())
-    }
-
-    /// Encodes the OFTMessage struct into Bytes.
-    ///
-    /// # Returns
-    /// A tuple containing:
-    /// - Encoded bytes representation of the message
-    /// - Boolean indicating if compose functionality is included
-    pub fn encode(&self, env: &Env) -> (Bytes, bool) {
-        let has_compose = self.is_composed();
+/// Initiator address and payload for a cross-chain composed call.
+#[derive(Clone, Debug)]
+pub struct ComposeData {
+    /// Address that initiated the compose call
+    pub from: BytesN<32>,
+    /// Compose message payload
+    pub msg: Bytes,
+}
 
+impl OFTMessage {
+    /// Encodes the OFTMessage into Bytes.
+    pub fn encode(&self, env: &Env) -> Bytes {
         let mut writer = BufferWriter::new(env);
         writer.write_bytes_n(&self.send_to).write_u64(self.amount_sd);
-        if has_compose {
-            // compose_from should already be set when compose is enabled
-            writer.write_bytes_n(self.compose_from.as_ref().unwrap()).write_bytes(self.compose_msg.as_ref().unwrap());
+
+        if let Some(ref compose_data) = self.compose {
+            writer.write_bytes_n(&compose_data.from).write_bytes(&compose_data.msg);
         }
 
-        (writer.to_bytes(), has_compose)
+        writer.to_bytes()
     }
 
-    /// Decodes Bytes into an OFTMessage struct.
-    ///
-    /// # Arguments
-    /// * `message` - The encoded bytes to decode
-    ///
-    /// # Returns
-    /// Decoded OFTMessage struct
+    /// Decodes Bytes into an OFTMessage.
     pub fn decode(message: &Bytes) -> Self {
         let mut reader = BufferReader::new(message);
         let send_to = reader.read_bytes_n::<32>();
         let amount_sd = reader.read_u64();
 
-        if reader.remaining_len() > 0 {
-            let compose_from = reader.read_bytes_n::<32>();
-            let compose_msg = reader.read_bytes_until_end();
-            OFTMessage { send_to, amount_sd, compose_from: Some(compose_from), compose_msg: Some(compose_msg) }
+        let compose = if reader.remaining_len() > 0 {
+            let from = reader.read_bytes_n::<32>();
+            let msg = reader.read_bytes_until_end();
+            Some(ComposeData { from, msg })
         } else {
-            OFTMessage { send_to, amount_sd, compose_from: None, compose_msg: None }
-        }
+            None
+        };
+
+        OFTMessage { send_to, amount_sd, compose }
     }
 }

package/contracts/oapps/oft-core/src/errors.rs

@@ -6,7 +6,8 @@ use common_macros::contract_error;
 /// OFTError: 3000-3099
 #[contract_error]
 pub enum OFTError {
-    InvalidAmount = 3000,
+    InvalidAddress = 3000,
+    InvalidAmount,
     InvalidLocalDecimals,
     NotInitialized,
     Overflow,

package/contracts/oapps/oft-core/src/events.rs

@@ -3,8 +3,11 @@ use soroban_sdk::{contractevent, Address, BytesN};
 #[contractevent]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct OFTSent {
+    #[topic]
     pub guid: BytesN<32>,
+    #[topic]
     pub dst_eid: u32,
+    #[topic]
     pub from: Address,
     pub amount_sent_ld: i128,
     pub amount_received_ld: i128,
@@ -13,8 +16,11 @@ pub struct OFTSent {
 #[contractevent]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct OFTReceived {
+    #[topic]
     pub guid: BytesN<32>,
+    #[topic]
     pub src_eid: u32,
+    #[topic]
     pub to: Address,
     pub amount_received_ld: i128,
 }

package/contracts/oapps/oft-core/src/lib.rs

@@ -1,14 +1,18 @@
 #![no_std]
 
-pub mod codec;
-pub mod errors;
 pub mod events;
-mod oft_core;
 pub mod storage;
-pub mod types;
 pub mod utils;
 
+mod codec;
+mod errors;
+mod oft_core;
+mod types;
+
+pub use codec::*;
+pub use errors::*;
 pub use oft_core::*;
+pub use types::*;
 
 #[cfg(test)]
 #[path = "../integration-tests/mod.rs"]