@layerzerolabs/protocol-stellar-v2 0.2.20 → 0.2.21

package/contracts/oapps/oapp/src/macro_tests/test_macros.rs

@@ -149,10 +149,10 @@ mod test_full_manual_options {
     extern crate self as oapp;
 
     use endpoint_v2::Origin;
-    use oapp::oapp_options_type3::{EnforcedOptionParam, OAppOptionsType3};
+    use oapp::oapp_options_type3::OAppOptionsType3;
     use oapp::oapp_receiver::LzReceiveInternal;
     use oapp_macros::oapp;
-    use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env, Vec};
+    use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
 
     #[oapp(custom = [options_type3])]
     struct TestFullManualOptions;
@@ -354,12 +354,12 @@ mod test_full_manual_all {
     use endpoint_v2::Origin;
     use oapp::{
         oapp_core::OAppCore,
-        oapp_options_type3::{EnforcedOptionParam, OAppOptionsType3},
+        oapp_options_type3::OAppOptionsType3,
         oapp_receiver::{LzReceiveInternal, OAppReceiver},
         oapp_sender::OAppSenderInternal,
     };
     use oapp_macros::oapp;
-    use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env, Vec};
+    use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
 
     #[oapp(custom = [core, sender, receiver, options_type3])]
     struct TestFullManualAll;

package/contracts/oapps/oapp/src/oapp_core.rs

@@ -57,7 +57,7 @@ pub trait OAppCore: Ownable {
     /// A tuple containing:
     /// - `sender_version`: The version of the OAppSender
     /// - `receiver_version`: The version of the OAppReceiver
-    fn oapp_version(_env: &Env) -> (u64, u64) {
+    fn oapp_version(_env: &soroban_sdk::Env) -> (u64, u64) {
         (1, 1)
     }
 
@@ -65,7 +65,7 @@ pub trait OAppCore: Ownable {
     ///
     /// # Returns
     /// The LayerZero endpoint address
-    fn endpoint(env: &Env) -> Address {
+    fn endpoint(env: &soroban_sdk::Env) -> soroban_sdk::Address {
         OAppCoreStorage::endpoint(env).unwrap()
     }
 
@@ -76,7 +76,7 @@ pub trait OAppCore: Ownable {
     ///
     /// # Returns
     /// The peer address (OApp instance) associated with the corresponding endpoint
-    fn peer(env: &Env, eid: u32) -> Option<BytesN<32>> {
+    fn peer(env: &soroban_sdk::Env, eid: u32) -> Option<soroban_sdk::BytesN<32>> {
         OAppCoreStorage::peer(env, eid)
     }
 
@@ -86,7 +86,7 @@ pub trait OAppCore: Ownable {
     /// * `eid` - The endpoint ID
     /// * `peer` - The address of the peer to be associated with the corresponding endpoint, or None to remove the peer
     #[only_auth]
-    fn set_peer(env: &Env, eid: u32, peer: &Option<BytesN<32>>) {
+    fn set_peer(env: &soroban_sdk::Env, eid: u32, peer: &Option<soroban_sdk::BytesN<32>>) {
         OAppCoreStorage::set_or_remove_peer(env, eid, peer);
         PeerSet { eid, peer: peer.clone() }.publish(env);
     }
@@ -96,7 +96,7 @@ pub trait OAppCore: Ownable {
     /// # Arguments
     /// * `delegate` - The address of the delegate to be set, or None to remove the delegate
     #[only_auth]
-    fn set_delegate(env: &Env, delegate: &Option<Address>) {
+    fn set_delegate(env: &soroban_sdk::Env, delegate: &Option<soroban_sdk::Address>) {
         endpoint_client::<Self>(env).set_delegate(&env.current_contract_address(), delegate);
     }
 }

package/contracts/oapps/oapp/src/oapp_options_type3.rs

@@ -1,4 +1,4 @@
-use crate::errors::OAppError;
+use crate::{self as oapp, errors::OAppError};
 use common_macros::{contract_trait, only_auth, storage};
 use soroban_sdk::{assert_with_error, contractevent, contracttype, panic_with_error, Bytes, Env, Vec};
 use utils::{buffer_reader::BufferReader, ownable::Ownable};
@@ -40,7 +40,7 @@ pub trait OAppOptionsType3: Ownable {
     ///
     /// # Returns
     /// The enforced options for the given endpoint and message type
-    fn enforced_options(env: &Env, eid: u32, msg_type: u32) -> Bytes {
+    fn enforced_options(env: &soroban_sdk::Env, eid: u32, msg_type: u32) -> soroban_sdk::Bytes {
         OAppOptionsType3Storage::enforced_options(env, eid, msg_type)
     }
 
@@ -55,7 +55,10 @@ pub trait OAppOptionsType3: Ownable {
     /// # Arguments
     /// * `options` - A vector of EnforcedOptionParam structures specifying enforced options
     #[only_auth]
-    fn set_enforced_options(env: &Env, options: Vec<EnforcedOptionParam>) {
+    fn set_enforced_options(
+        env: &soroban_sdk::Env,
+        options: soroban_sdk::Vec<oapp::oapp_options_type3::EnforcedOptionParam>,
+    ) {
         for option in &options {
             assert_option_type3(env, &option.options);
             OAppOptionsType3Storage::set_enforced_options(env, option.eid, option.msg_type, &option.options);
@@ -77,7 +80,12 @@ pub trait OAppOptionsType3: Ownable {
     ///
     /// # Returns
     /// The combination of caller specified options AND enforced options
-    fn combine_options(env: &Env, eid: u32, msg_type: u32, extra_options: &Bytes) -> Bytes {
+    fn combine_options(
+        env: &soroban_sdk::Env,
+        eid: u32,
+        msg_type: u32,
+        extra_options: &soroban_sdk::Bytes,
+    ) -> soroban_sdk::Bytes {
         let mut enforced_options = Self::enforced_options(env, eid, msg_type);
 
         if enforced_options.is_empty() {

package/contracts/oapps/oapp/src/oapp_receiver.rs

@@ -78,7 +78,7 @@ pub trait OAppReceiver: OAppCore + LzReceiveInternal {
     ///
     /// # Returns
     /// True if the path can be initialized, false otherwise
-    fn allow_initialize_path(env: &Env, origin: &Origin) -> bool {
+    fn allow_initialize_path(env: &soroban_sdk::Env, origin: &endpoint_v2::Origin) -> bool {
         let peer = Self::peer(env, origin.src_eid);
         peer.is_some_and(|peer| peer == origin.sender)
     }
@@ -96,7 +96,7 @@ pub trait OAppReceiver: OAppCore + LzReceiveInternal {
     ///
     /// # Returns
     /// The next nonce
-    fn next_nonce(_env: &Env, _src_eid: u32, _sender: &BytesN<32>) -> u64 {
+    fn next_nonce(_env: &soroban_sdk::Env, _src_eid: u32, _sender: &soroban_sdk::BytesN<32>) -> u64 {
         0
     }
 
@@ -116,12 +116,12 @@ pub trait OAppReceiver: OAppCore + LzReceiveInternal {
     /// * `extra_data` - Additional arbitrary data provided by the corresponding executor
     /// * `value` - The native token value sent with the message
     fn lz_receive(
-        env: &Env,
-        executor: &Address,
-        origin: &Origin,
-        guid: &BytesN<32>,
-        message: &Bytes,
-        extra_data: &Bytes,
+        env: &soroban_sdk::Env,
+        executor: &soroban_sdk::Address,
+        origin: &endpoint_v2::Origin,
+        guid: &soroban_sdk::BytesN<32>,
+        message: &soroban_sdk::Bytes,
+        extra_data: &soroban_sdk::Bytes,
         value: i128,
     ) {
         clear_payload_and_transfer::<Self>(env, executor, origin, guid, message, value);
@@ -140,7 +140,12 @@ pub trait OAppReceiver: OAppCore + LzReceiveInternal {
     ///
     /// # Returns
     /// True if the sender is a valid composeMsg sender, false otherwise
-    fn is_compose_msg_sender(env: &Env, _origin: &Origin, _message: &Bytes, sender: &Address) -> bool {
+    fn is_compose_msg_sender(
+        env: &soroban_sdk::Env,
+        _origin: &endpoint_v2::Origin,
+        _message: &soroban_sdk::Bytes,
+        sender: &soroban_sdk::Address,
+    ) -> bool {
         env.current_contract_address() == *sender
     }
 }

package/contracts/oapps/oapp/src/tests/mod.rs

@@ -1,4 +1,4 @@
-mod test_oapp_core;
-mod test_oapp_options_type3;
-mod test_oapp_receiver;
-mod test_oapp_sender;
+mod oapp_core;
+mod oapp_options_type3;
+mod oapp_receiver;
+mod oapp_sender;

package/contracts/oapps/oapp/src/tests/{test_oapp_core.rs → oapp_core.rs}

@@ -5,7 +5,7 @@ use soroban_sdk::{
     testutils::{Address as _, MockAuth, MockAuthInvoke},
     Address, Bytes, BytesN, Env, IntoVal,
 };
-use utils::testing_utils::assert_event;
+use utils::testing_utils::assert_eq_event;
 
 #[contract]
 pub struct DummyEndpoint;
@@ -144,7 +144,7 @@ fn test_peer_lifecycle_set_get_update_remove_and_events() {
     let peer_v1_option = Some(peer_v1.clone());
     set_peer_with_auth(&env, &owner, &oapp_client, REMOTE_EID, &peer_v1_option);
 
-    assert_event(&env, &oapp_client.address, PeerSet { eid: REMOTE_EID, peer: Some(peer_v1.clone()) });
+    assert_eq_event(&env, &oapp_client.address, PeerSet { eid: REMOTE_EID, peer: Some(peer_v1.clone()) });
     assert_eq!(Some(peer_v1), oapp_client.peer(&REMOTE_EID));
     assert_eq!(None, oapp_client.peer(&UNSET_EID));
 
@@ -153,13 +153,13 @@ fn test_peer_lifecycle_set_get_update_remove_and_events() {
     let peer_v2_option = Some(peer_v2.clone());
     set_peer_with_auth(&env, &owner, &oapp_client, REMOTE_EID, &peer_v2_option);
 
-    assert_event(&env, &oapp_client.address, PeerSet { eid: REMOTE_EID, peer: Some(peer_v2.clone()) });
+    assert_eq_event(&env, &oapp_client.address, PeerSet { eid: REMOTE_EID, peer: Some(peer_v2.clone()) });
     assert_eq!(Some(peer_v2), oapp_client.peer(&REMOTE_EID));
 
     // Remove peer
     let none_peer: Option<BytesN<32>> = None;
     set_peer_with_auth(&env, &owner, &oapp_client, REMOTE_EID, &none_peer);
-    assert_event(&env, &oapp_client.address, PeerSet { eid: REMOTE_EID, peer: None });
+    assert_eq_event(&env, &oapp_client.address, PeerSet { eid: REMOTE_EID, peer: None });
     assert_eq!(None, oapp_client.peer(&REMOTE_EID));
 }
 

package/contracts/oapps/oapp/src/tests/{test_oapp_options_type3.rs → oapp_options_type3.rs}

@@ -6,13 +6,12 @@ use crate::{
     oapp_receiver::{LzReceiveInternal, OAppReceiver},
 };
 use common_macros::contract_impl;
-use endpoint_v2::Origin;
 use soroban_sdk::{
     contract, contractimpl,
     testutils::{Address as _, MockAuth, MockAuthInvoke},
     vec, Address, Bytes, BytesN, Env, IntoVal,
 };
-use utils::testing_utils::assert_event;
+use utils::testing_utils::assert_eq_event;
 
 const OPTION_TYPE_3: u32 = 3;
 const REMOTE_EID_1: u32 = 100;
@@ -120,7 +119,7 @@ fn test_enforced_options_lifecycle() {
     set_enforced_options_with_auth(&env, &owner, &oapp_client, &enforced_params);
 
     // assert events
-    assert_event(&env, &oapp_client.address, EnforcedOptionSet { enforced_option_params: enforced_params.clone() });
+    assert_eq_event(&env, &oapp_client.address, EnforcedOptionSet { enforced_option_params: enforced_params.clone() });
 
     // Verify options were set correctly
     assert_eq!(oapp_client.enforced_options(&REMOTE_EID_1, &MSG_TYPE_SEND), enforced1.clone());
@@ -131,7 +130,7 @@ fn test_enforced_options_lifecycle() {
     let update_params =
         vec![&env, EnforcedOptionParam { eid: REMOTE_EID_1, msg_type: MSG_TYPE_SEND, options: updated.clone() }];
     set_enforced_options_with_auth(&env, &owner, &oapp_client, &update_params);
-    assert_event(&env, &oapp_client.address, EnforcedOptionSet { enforced_option_params: update_params.clone() });
+    assert_eq_event(&env, &oapp_client.address, EnforcedOptionSet { enforced_option_params: update_params.clone() });
     assert_eq!(oapp_client.enforced_options(&REMOTE_EID_1, &MSG_TYPE_SEND), updated);
 }
 

package/contracts/oapps/oapp-macros/Cargo.toml

@@ -9,7 +9,11 @@ publish = false
 proc-macro = true
 
 [dependencies]
-heck = "0.5"
-proc-macro2 = "1.0"
-quote = "1.0"
-syn = { version = "2.0", features = ["full", "extra-traits"] }
+heck = { workspace = true }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { workspace = true }
+
+[dev-dependencies]
+insta = { workspace = true }
+prettyplease = { workspace = true }

package/contracts/oapps/oapp-macros/src/generators.rs

@@ -1,7 +1,6 @@
 //! Code generators for OApp trait implementations.
 
 use crate::CustomImpls;
-use heck::ToSnakeCase;
 use proc_macro2::TokenStream;
 use quote::quote;
 use syn::{Ident, ItemStruct};
@@ -43,17 +42,11 @@ fn generate_oapp_core(name: &Ident, custom: bool) -> TokenStream {
         return TokenStream::new();
     }
 
-    let impl_mod = impl_mod_ident(name, "core");
-
     quote! {
-        #[doc(hidden)]
-        mod #impl_mod {
-            use super::*;
-            use oapp::oapp_core::OAppCore;
+        use oapp::oapp_core::OAppCore as _;
 
-            #[soroban_sdk::contractimpl(contracttrait)]
-            impl OAppCore for #name {}
-        }
+        #[soroban_sdk::contractimpl(contracttrait)]
+        impl oapp::oapp_core::OAppCore for #name {}
     }
 }
 
@@ -84,17 +77,11 @@ fn generate_oapp_receiver(name: &Ident, custom: bool) -> TokenStream {
         return TokenStream::new();
     }
 
-    let impl_mod = impl_mod_ident(name, "receiver");
-
     quote! {
-        #[doc(hidden)]
-        mod #impl_mod {
-            use super::*;
-            use oapp::oapp_receiver::OAppReceiver;
+        use oapp::oapp_receiver::OAppReceiver as _;
 
-            #[soroban_sdk::contractimpl(contracttrait)]
-            impl OAppReceiver for #name {}
-        }
+        #[soroban_sdk::contractimpl(contracttrait)]
+        impl oapp::oapp_receiver::OAppReceiver for #name {}
     }
 }
 
@@ -107,22 +94,10 @@ fn generate_oapp_options_type3(name: &Ident, custom: bool) -> TokenStream {
         return TokenStream::new();
     }
 
-    let impl_mod = impl_mod_ident(name, "options_type3");
-
     quote! {
-        #[doc(hidden)]
-        mod #impl_mod {
-            use super::*;
-            use soroban_sdk::Vec;
-            use oapp::oapp_options_type3::{EnforcedOptionParam, OAppOptionsType3};
+        use oapp::oapp_options_type3::OAppOptionsType3 as _;
 
-            #[soroban_sdk::contractimpl(contracttrait)]
-            impl OAppOptionsType3 for #name {}
-        }
+        #[soroban_sdk::contractimpl(contracttrait)]
+        impl oapp::oapp_options_type3::OAppOptionsType3 for #name {}
     }
 }
-
-/// Creates a unique hidden module identifier for trait implementations.
-fn impl_mod_ident(struct_name: &Ident, trait_name: &str) -> Ident {
-    Ident::new(&format!("__oapp_{}_impl_{}", trait_name, struct_name.to_string().to_snake_case()), struct_name.span())
-}

package/contracts/oapps/oapp-macros/src/lib.rs

@@ -132,6 +132,9 @@ use syn::{
     Error, Ident, ItemStruct, Token,
 };
 
+#[cfg(test)]
+mod tests;
+
 /// Derives a complete OApp: `#[contract]` + `#[ownable]` + Core + Sender + Receiver + OptionsType3.
 ///
 /// ## Usage

package/contracts/oapps/oapp-macros/src/tests/mod.rs

@@ -0,0 +1,2 @@
+mod oapp;
+mod parse_custom_impls;

package/contracts/oapps/oapp-macros/src/tests/oapp.rs

@@ -0,0 +1,88 @@
+use quote::quote;
+
+// ============================================
+// Snapshot Tests: OApp Code Generation
+// ============================================
+
+#[test]
+fn snapshot_generate_oapp() {
+    let input = quote! {
+        pub struct MyOApp;
+    };
+    let item_struct: syn::ItemStruct = syn::parse2(input).expect("failed to parse struct");
+
+    let all_defaults = {
+        let result = crate::generators::generate_oapp(item_struct.clone(), crate::CustomImpls::default());
+        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
+    };
+
+    let custom_core_only = {
+        let result = crate::generators::generate_oapp(
+            item_struct.clone(),
+            crate::CustomImpls { core: true, sender: false, receiver: false, options_type3: false },
+        );
+        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
+    };
+
+    let custom_sender_only = {
+        let result = crate::generators::generate_oapp(
+            item_struct.clone(),
+            crate::CustomImpls { core: false, sender: true, receiver: false, options_type3: false },
+        );
+        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
+    };
+
+    let custom_receiver_only = {
+        let result = crate::generators::generate_oapp(
+            item_struct.clone(),
+            crate::CustomImpls { core: false, sender: false, receiver: true, options_type3: false },
+        );
+        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
+    };
+
+    let custom_options_type3_only = {
+        let result = crate::generators::generate_oapp(
+            item_struct.clone(),
+            crate::CustomImpls { core: false, sender: false, receiver: false, options_type3: true },
+        );
+        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
+    };
+
+    let custom_all = {
+        let result = crate::generators::generate_oapp(
+            item_struct.clone(),
+            crate::CustomImpls { core: true, sender: true, receiver: true, options_type3: true },
+        );
+        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
+    };
+
+    let preserves_struct_attributes_and_fields = {
+        let fancy_input = quote! {
+            #[derive(Clone, Debug)]
+            pub struct FancyOApp {
+                pub x: u32,
+            }
+        };
+        let fancy_struct: syn::ItemStruct = syn::parse2(fancy_input).expect("failed to parse struct");
+        let result = crate::generators::generate_oapp(fancy_struct, crate::CustomImpls::default());
+        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
+    };
+
+    let combined = format!(
+        "// === Default (no custom impls) ===\n\n{}\n\n\
+// === custom = [core] ===\n\n{}\n\n\
+// === custom = [sender] ===\n\n{}\n\n\
+// === custom = [receiver] ===\n\n{}\n\n\
+// === custom = [options_type3] ===\n\n{}\n\n\
+// === custom = [core, sender, receiver, options_type3] ===\n\n{}\n\n\
+// === Struct attributes + fields are preserved ===\n\n{}",
+        all_defaults,
+        custom_core_only,
+        custom_sender_only,
+        custom_receiver_only,
+        custom_options_type3_only,
+        custom_all,
+        preserves_struct_attributes_and_fields
+    );
+    insta::assert_snapshot!(combined);
+}

package/contracts/oapps/oapp-macros/src/tests/parse_custom_impls.rs

@@ -0,0 +1,86 @@
+use quote::quote;
+
+// ============================================
+// Unit Tests: #[oapp(custom = [...])] parsing
+// ============================================
+
+#[test]
+fn test_custom_impls_parse_empty_is_default() {
+    let parsed: crate::CustomImpls = syn::parse2(quote! {}).expect("failed to parse empty attrs");
+    assert!(!parsed.core);
+    assert!(!parsed.sender);
+    assert!(!parsed.receiver);
+    assert!(!parsed.options_type3);
+}
+
+#[test]
+fn test_custom_impls_parse_valid_all_list() {
+    let parsed: crate::CustomImpls =
+        syn::parse2(quote! { custom = [core, sender, receiver, options_type3] }).expect("failed to parse attrs");
+    assert!(parsed.core);
+    assert!(parsed.sender);
+    assert!(parsed.receiver);
+    assert!(parsed.options_type3);
+}
+
+#[test]
+fn test_custom_impls_parse_empty_custom_list_is_default() {
+    let parsed: crate::CustomImpls = syn::parse2(quote! { custom = [] }).expect("failed to parse attrs");
+    assert!(!parsed.core);
+    assert!(!parsed.sender);
+    assert!(!parsed.receiver);
+    assert!(!parsed.options_type3);
+}
+
+#[test]
+fn test_custom_impls_allows_trailing_comma() {
+    let parsed: crate::CustomImpls = syn::parse2(quote! { custom = [core,] }).expect("failed to parse attrs");
+    assert!(parsed.core);
+    assert!(!parsed.sender);
+    assert!(!parsed.receiver);
+    assert!(!parsed.options_type3);
+}
+
+#[test]
+fn test_custom_impls_allows_duplicates() {
+    // Duplicates are harmless and should not cause parsing to fail.
+    let parsed: crate::CustomImpls =
+        syn::parse2(quote! { custom = [core, core, receiver, receiver] }).expect("failed to parse attrs");
+    assert!(parsed.core);
+    assert!(!parsed.sender);
+    assert!(parsed.receiver);
+    assert!(!parsed.options_type3);
+}
+
+#[test]
+fn test_custom_impls_rejects_wrong_key() {
+    let err = syn::parse2::<crate::CustomImpls>(quote! { nope = [core] }).expect_err("expected parse failure");
+    assert!(err.to_string().contains("expected `custom`"), "unexpected error: {err}");
+}
+
+#[test]
+fn test_custom_impls_rejects_unknown_ident() {
+    let err =
+        syn::parse2::<crate::CustomImpls>(quote! { custom = [core, not_a_real_option] }).expect_err("expected failure");
+    assert!(
+        err.to_string().contains("expected one of `core`, `sender`, `receiver`, `options_type3`"),
+        "unexpected error: {err}"
+    );
+}
+
+#[test]
+fn test_custom_impls_rejects_trailing_tokens_after_list() {
+    // `syn::parse2` expects the parser to consume the full stream.
+    syn::parse2::<crate::CustomImpls>(quote! { custom = [core] extra })
+        .expect_err("expected parse failure due to trailing tokens");
+}
+
+#[test]
+fn test_custom_impls_rejects_missing_equals() {
+    syn::parse2::<crate::CustomImpls>(quote! { custom [core] }).expect_err("expected parse failure (missing `=`)");
+}
+
+#[test]
+fn test_custom_impls_rejects_non_bracketed_list() {
+    syn::parse2::<crate::CustomImpls>(quote! { custom = (core) }).expect_err("expected parse failure (not `[...]`)");
+}

package/contracts/oapps/oapp-macros/src/tests/snapshots/oapp_macros__tests__oapp__snapshot_generate_oapp.snap

@@ -0,0 +1,103 @@
+---
+source: contracts/oapps/oapp-macros/src/tests/oapp.rs
+assertion_line: 87
+expression: combined
+---
+// === Default (no custom impls) ===
+
+#[common_macros::lz_contract]
+pub struct MyOApp;
+use oapp::oapp_core::OAppCore as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_core::OAppCore for MyOApp {}
+use oapp::oapp_sender::OAppSenderInternal as _;
+impl oapp::oapp_sender::OAppSenderInternal for MyOApp {}
+use oapp::oapp_receiver::OAppReceiver as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_receiver::OAppReceiver for MyOApp {}
+use oapp::oapp_options_type3::OAppOptionsType3 as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_options_type3::OAppOptionsType3 for MyOApp {}
+
+
+// === custom = [core] ===
+
+#[common_macros::lz_contract]
+pub struct MyOApp;
+use oapp::oapp_sender::OAppSenderInternal as _;
+impl oapp::oapp_sender::OAppSenderInternal for MyOApp {}
+use oapp::oapp_receiver::OAppReceiver as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_receiver::OAppReceiver for MyOApp {}
+use oapp::oapp_options_type3::OAppOptionsType3 as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_options_type3::OAppOptionsType3 for MyOApp {}
+
+
+// === custom = [sender] ===
+
+#[common_macros::lz_contract]
+pub struct MyOApp;
+use oapp::oapp_core::OAppCore as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_core::OAppCore for MyOApp {}
+use oapp::oapp_receiver::OAppReceiver as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_receiver::OAppReceiver for MyOApp {}
+use oapp::oapp_options_type3::OAppOptionsType3 as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_options_type3::OAppOptionsType3 for MyOApp {}
+
+
+// === custom = [receiver] ===
+
+#[common_macros::lz_contract]
+pub struct MyOApp;
+use oapp::oapp_core::OAppCore as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_core::OAppCore for MyOApp {}
+use oapp::oapp_sender::OAppSenderInternal as _;
+impl oapp::oapp_sender::OAppSenderInternal for MyOApp {}
+use oapp::oapp_options_type3::OAppOptionsType3 as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_options_type3::OAppOptionsType3 for MyOApp {}
+
+
+// === custom = [options_type3] ===
+
+#[common_macros::lz_contract]
+pub struct MyOApp;
+use oapp::oapp_core::OAppCore as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_core::OAppCore for MyOApp {}
+use oapp::oapp_sender::OAppSenderInternal as _;
+impl oapp::oapp_sender::OAppSenderInternal for MyOApp {}
+use oapp::oapp_receiver::OAppReceiver as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_receiver::OAppReceiver for MyOApp {}
+
+
+// === custom = [core, sender, receiver, options_type3] ===
+
+#[common_macros::lz_contract]
+pub struct MyOApp;
+
+
+// === Struct attributes + fields are preserved ===
+
+#[common_macros::lz_contract]
+#[derive(Clone, Debug)]
+pub struct FancyOApp {
+    pub x: u32,
+}
+use oapp::oapp_core::OAppCore as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_core::OAppCore for FancyOApp {}
+use oapp::oapp_sender::OAppSenderInternal as _;
+impl oapp::oapp_sender::OAppSenderInternal for FancyOApp {}
+use oapp::oapp_receiver::OAppReceiver as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_receiver::OAppReceiver for FancyOApp {}
+use oapp::oapp_options_type3::OAppOptionsType3 as _;
+#[soroban_sdk::contractimpl(contracttrait)]
+impl oapp::oapp_options_type3::OAppOptionsType3 for FancyOApp {}