@layerzerolabs/protocol-stellar-v2 0.2.12 → 0.2.15

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

@@ -1,304 +1,386 @@
-extern crate self as oapp;
-
-use endpoint_v2::Origin;
-use oapp::{
-    oapp_core::OAppCore,
-    oapp_options_type3::{EnforcedOptionParam, OAppOptionsType3},
-    oapp_receiver::OAppReceiver,
-    oapp_sender::OAppSender,
-};
-use oapp_macros::{oapp, oapp_manual_impl};
-use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env, Vec};
-
 // ============================================================================
 // Test 1: Full OApp with all defaults
 // ============================================================================
-#[oapp]
-struct TestFullDefault;
-
-impl TestFullDefault {
-    fn __lz_receive(
-        _env: &Env,
-        _executor: &Address,
-        _origin: &Origin,
-        _guid: &BytesN<32>,
-        _message: &Bytes,
-        _extra_data: &Bytes,
-        _value: i128,
-    ) {
-        // Default behavior
+mod test_full_default {
+    extern crate self as oapp;
+
+    use endpoint_v2::Origin;
+    use oapp_macros::oapp;
+    use soroban_sdk::{Address, Bytes, BytesN, Env};
+
+    #[oapp]
+    struct TestFullDefault;
+
+    impl TestFullDefault {
+        fn __lz_receive(
+            _env: &Env,
+            _executor: &Address,
+            _origin: &Origin,
+            _guid: &BytesN<32>,
+            _message: &Bytes,
+            _extra_data: &Bytes,
+            _value: i128,
+        ) {
+            // Default behavior
+        }
     }
 }
 
 // ============================================================================
 // Test 2: Full OApp with manual core implementation
 // ============================================================================
-#[oapp]
-#[oapp_manual_impl(core)]
-struct TestFullManualCore;
-
-#[contractimpl(contracttrait)]
-impl OAppCore for TestFullManualCore {
-    fn oapp_version(_env: &Env) -> (u64, u64) {
-        (2, 0)
+mod test_full_manual_core {
+    extern crate self as oapp;
+
+    use endpoint_v2::Origin;
+    use oapp::oapp_core::OAppCore;
+    use oapp_macros::{oapp, oapp_manual_impl};
+    use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
+
+    #[oapp]
+    #[oapp_manual_impl(core)]
+    struct TestFullManualCore;
+
+    #[contractimpl(contracttrait)]
+    impl OAppCore for TestFullManualCore {
+        fn oapp_version(_env: &Env) -> (u64, u64) {
+            (2, 0)
+        }
     }
-}
 
-impl TestFullManualCore {
-    fn __lz_receive(
-        _env: &Env,
-        _executor: &Address,
-        _origin: &Origin,
-        _guid: &BytesN<32>,
-        _message: &Bytes,
-        _extra_data: &Bytes,
-        _value: i128,
-    ) {
-        // Custom logic
+    impl TestFullManualCore {
+        fn __lz_receive(
+            _env: &Env,
+            _executor: &Address,
+            _origin: &Origin,
+            _guid: &BytesN<32>,
+            _message: &Bytes,
+            _extra_data: &Bytes,
+            _value: i128,
+        ) {
+            // Custom logic
+        }
     }
 }
 
 // ============================================================================
 // Test 3: Full OApp with manual sender implementation
 // ============================================================================
-#[oapp]
-#[oapp_manual_impl(sender)]
-struct TestFullManualSender;
+mod test_full_manual_sender {
+    extern crate self as oapp;
 
-impl OAppSender for TestFullManualSender {
-    // Custom sender implementation
-}
+    use endpoint_v2::Origin;
+    use oapp::oapp_sender::OAppSender;
+    use oapp_macros::{oapp, oapp_manual_impl};
+    use soroban_sdk::{Address, Bytes, BytesN, Env};
+
+    #[oapp]
+    #[oapp_manual_impl(sender)]
+    struct TestFullManualSender;
 
-impl TestFullManualSender {
-    fn __lz_receive(
-        _env: &Env,
-        _executor: &Address,
-        _origin: &Origin,
-        _guid: &BytesN<32>,
-        _message: &Bytes,
-        _extra_data: &Bytes,
-        _value: i128,
-    ) {
-        // Implementation
+    impl OAppSender for TestFullManualSender {
+        // Custom sender implementation
+    }
+
+    impl TestFullManualSender {
+        fn __lz_receive(
+            _env: &Env,
+            _executor: &Address,
+            _origin: &Origin,
+            _guid: &BytesN<32>,
+            _message: &Bytes,
+            _extra_data: &Bytes,
+            _value: i128,
+        ) {
+            // Implementation
+        }
     }
 }
 
 // ============================================================================
 // Test 4: Full OApp with manual receiver implementation
 // ============================================================================
-#[oapp]
-#[oapp_manual_impl(receiver)]
-struct TestFullManualReceiver;
-
-#[contractimpl(contracttrait)]
-impl OAppReceiver for TestFullManualReceiver {
-    fn is_compose_msg_sender(_env: &Env, _origin: &Origin, _message: &Bytes, _sender: &Address) -> bool {
-        true
-    }
-
-    fn allow_initialize_path(_env: &Env, _origin: &Origin) -> bool {
-        true
-    }
-
-    fn next_nonce(_env: &Env, _src_eid: u32, _sender: &BytesN<32>) -> u64 {
-        1 // Ordered delivery
-    }
-
-    fn lz_receive(
-        _env: &Env,
-        _executor: &Address,
-        _origin: &Origin,
-        _guid: &BytesN<32>,
-        _message: &Bytes,
-        _extra_data: &Bytes,
-        _value: i128,
-    ) {
-        // Custom implementation - verify_and_clear_payload must be called manually
+mod test_full_manual_receiver {
+    extern crate self as oapp;
+
+    use endpoint_v2::Origin;
+    use oapp::oapp_receiver::OAppReceiver;
+    use oapp_macros::{oapp, oapp_manual_impl};
+    use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
+
+    #[oapp]
+    #[oapp_manual_impl(receiver)]
+    struct TestFullManualReceiver;
+
+    #[contractimpl(contracttrait)]
+    impl OAppReceiver for TestFullManualReceiver {
+        fn is_compose_msg_sender(_env: &Env, _origin: &Origin, _message: &Bytes, _sender: &Address) -> bool {
+            true
+        }
+
+        fn allow_initialize_path(_env: &Env, _origin: &Origin) -> bool {
+            true
+        }
+
+        fn next_nonce(_env: &Env, _src_eid: u32, _sender: &BytesN<32>) -> u64 {
+            1 // Ordered delivery
+        }
+
+        fn lz_receive(
+            _env: &Env,
+            _executor: &Address,
+            _origin: &Origin,
+            _guid: &BytesN<32>,
+            _message: &Bytes,
+            _extra_data: &Bytes,
+            _value: i128,
+        ) {
+            // Custom implementation - verify_and_clear_payload must be called manually
+        }
     }
 }
 
 // ============================================================================
 // Test 5: Full OApp with manual options_type3 implementation
 // ============================================================================
-#[oapp]
-#[oapp_manual_impl(options_type3)]
-struct TestFullManualOptions;
-
-impl TestFullManualOptions {
-    fn __lz_receive(
-        _env: &Env,
-        _executor: &Address,
-        _origin: &Origin,
-        _guid: &BytesN<32>,
-        _message: &Bytes,
-        _extra_data: &Bytes,
-        _value: i128,
-    ) {
-        // Implementation
+mod test_full_manual_options {
+    extern crate self as oapp;
+
+    use endpoint_v2::Origin;
+    use oapp::oapp_options_type3::{EnforcedOptionParam, OAppOptionsType3};
+    use oapp_macros::{oapp, oapp_manual_impl};
+    use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env, Vec};
+
+    #[oapp]
+    #[oapp_manual_impl(options_type3)]
+    struct TestFullManualOptions;
+
+    impl TestFullManualOptions {
+        fn __lz_receive(
+            _env: &Env,
+            _executor: &Address,
+            _origin: &Origin,
+            _guid: &BytesN<32>,
+            _message: &Bytes,
+            _extra_data: &Bytes,
+            _value: i128,
+        ) {
+            // Implementation
+        }
     }
-}
 
-#[contractimpl(contracttrait)]
-impl OAppOptionsType3 for TestFullManualOptions {
-    // Custom options implementation
+    #[contractimpl(contracttrait)]
+    impl OAppOptionsType3 for TestFullManualOptions {
+        // Custom options implementation
+    }
 }
 
 // ============================================================================
 // Test 6: Full OApp with manual core + sender
 // ============================================================================
-#[oapp]
-#[oapp_manual_impl(core, sender)]
-struct TestFullManualCoreSender;
-
-#[contractimpl(contracttrait)]
-impl OAppCore for TestFullManualCoreSender {
-    fn oapp_version(_env: &Env) -> (u64, u64) {
-        (3, 0)
+mod test_full_manual_core_sender {
+    extern crate self as oapp;
+
+    use endpoint_v2::Origin;
+    use oapp::{oapp_core::OAppCore, oapp_sender::OAppSender};
+    use oapp_macros::{oapp, oapp_manual_impl};
+    use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
+
+    #[oapp]
+    #[oapp_manual_impl(core, sender)]
+    struct TestFullManualCoreSender;
+
+    #[contractimpl(contracttrait)]
+    impl OAppCore for TestFullManualCoreSender {
+        fn oapp_version(_env: &Env) -> (u64, u64) {
+            (3, 0)
+        }
     }
-}
 
-impl OAppSender for TestFullManualCoreSender {
-    // Custom sender implementation
-}
+    impl OAppSender for TestFullManualCoreSender {
+        // Custom sender implementation
+    }
 
-impl TestFullManualCoreSender {
-    fn __lz_receive(
-        _env: &Env,
-        _executor: &Address,
-        _origin: &Origin,
-        _guid: &BytesN<32>,
-        _message: &Bytes,
-        _extra_data: &Bytes,
-        _value: i128,
-    ) {
-        // Implementation
+    impl TestFullManualCoreSender {
+        fn __lz_receive(
+            _env: &Env,
+            _executor: &Address,
+            _origin: &Origin,
+            _guid: &BytesN<32>,
+            _message: &Bytes,
+            _extra_data: &Bytes,
+            _value: i128,
+        ) {
+            // Implementation
+        }
     }
 }
 
 // ============================================================================
 // Test 7: Full OApp with manual core + receiver
 // ============================================================================
-#[oapp]
-#[oapp_manual_impl(core, receiver)]
-struct TestFullManualCoreReceiver;
-
-#[contractimpl(contracttrait)]
-impl OAppCore for TestFullManualCoreReceiver {
-    fn oapp_version(_env: &Env) -> (u64, u64) {
-        (4, 0)
+mod test_full_manual_core_receiver {
+    extern crate self as oapp;
+
+    use endpoint_v2::Origin;
+    use oapp::{oapp_core::OAppCore, oapp_receiver::OAppReceiver};
+    use oapp_macros::{oapp, oapp_manual_impl};
+    use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
+
+    #[oapp]
+    #[oapp_manual_impl(core, receiver)]
+    struct TestFullManualCoreReceiver;
+
+    #[contractimpl(contracttrait)]
+    impl OAppCore for TestFullManualCoreReceiver {
+        fn oapp_version(_env: &Env) -> (u64, u64) {
+            (4, 0)
+        }
     }
-}
 
-#[contractimpl(contracttrait)]
-impl OAppReceiver for TestFullManualCoreReceiver {
-    fn lz_receive(
-        _env: &Env,
-        _executor: &Address,
-        _origin: &Origin,
-        _guid: &BytesN<32>,
-        _message: &Bytes,
-        _extra_data: &Bytes,
-        _value: i128,
-    ) {
-        // Custom receiver implementation
+    #[contractimpl(contracttrait)]
+    impl OAppReceiver for TestFullManualCoreReceiver {
+        fn lz_receive(
+            _env: &Env,
+            _executor: &Address,
+            _origin: &Origin,
+            _guid: &BytesN<32>,
+            _message: &Bytes,
+            _extra_data: &Bytes,
+            _value: i128,
+        ) {
+            // Custom receiver implementation
+        }
     }
 }
 
 // ============================================================================
 // Test 8: Full OApp with manual sender + receiver
 // ============================================================================
-#[oapp]
-#[oapp_manual_impl(sender, receiver)]
-struct TestFullManualSenderReceiver;
+mod test_full_manual_sender_receiver {
+    extern crate self as oapp;
 
-impl OAppSender for TestFullManualSenderReceiver {
-    // Custom sender implementation
-}
+    use endpoint_v2::Origin;
+    use oapp::{oapp_receiver::OAppReceiver, oapp_sender::OAppSender};
+    use oapp_macros::{oapp, oapp_manual_impl};
+    use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
 
-#[contractimpl(contracttrait)]
-impl OAppReceiver for TestFullManualSenderReceiver {
-    fn lz_receive(
-        _env: &Env,
-        _executor: &Address,
-        _origin: &Origin,
-        _guid: &BytesN<32>,
-        _message: &Bytes,
-        _extra_data: &Bytes,
-        _value: i128,
-    ) {
-        // Custom receiver implementation
+    #[oapp]
+    #[oapp_manual_impl(sender, receiver)]
+    struct TestFullManualSenderReceiver;
+
+    impl OAppSender for TestFullManualSenderReceiver {
+        // Custom sender implementation
+    }
+
+    #[contractimpl(contracttrait)]
+    impl OAppReceiver for TestFullManualSenderReceiver {
+        fn lz_receive(
+            _env: &Env,
+            _executor: &Address,
+            _origin: &Origin,
+            _guid: &BytesN<32>,
+            _message: &Bytes,
+            _extra_data: &Bytes,
+            _value: i128,
+        ) {
+            // Custom receiver implementation
+        }
     }
 }
 
 // ============================================================================
 // Test 9: Full OApp with manual core + sender + receiver (all except options)
 // ============================================================================
-#[oapp]
-#[oapp_manual_impl(core, sender, receiver)]
-struct TestFullManualAllExceptOptions;
-
-#[contractimpl(contracttrait)]
-impl OAppCore for TestFullManualAllExceptOptions {
-    fn oapp_version(_env: &Env) -> (u64, u64) {
-        (5, 0)
+mod test_full_manual_all_except_options {
+    extern crate self as oapp;
+
+    use endpoint_v2::Origin;
+    use oapp::{oapp_core::OAppCore, oapp_receiver::OAppReceiver, oapp_sender::OAppSender};
+    use oapp_macros::{oapp, oapp_manual_impl};
+    use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
+
+    #[oapp]
+    #[oapp_manual_impl(core, sender, receiver)]
+    struct TestFullManualAllExceptOptions;
+
+    #[contractimpl(contracttrait)]
+    impl OAppCore for TestFullManualAllExceptOptions {
+        fn oapp_version(_env: &Env) -> (u64, u64) {
+            (5, 0)
+        }
     }
-}
 
-impl OAppSender for TestFullManualAllExceptOptions {
-    // Custom sender implementation
-}
+    impl OAppSender for TestFullManualAllExceptOptions {
+        // Custom sender implementation
+    }
 
-#[contractimpl(contracttrait)]
-impl OAppReceiver for TestFullManualAllExceptOptions {
-    fn lz_receive(
-        _env: &Env,
-        _executor: &Address,
-        _origin: &Origin,
-        _guid: &BytesN<32>,
-        _message: &Bytes,
-        _extra_data: &Bytes,
-        _value: i128,
-    ) {
-        // Custom receiver implementation
+    #[contractimpl(contracttrait)]
+    impl OAppReceiver for TestFullManualAllExceptOptions {
+        fn lz_receive(
+            _env: &Env,
+            _executor: &Address,
+            _origin: &Origin,
+            _guid: &BytesN<32>,
+            _message: &Bytes,
+            _extra_data: &Bytes,
+            _value: i128,
+        ) {
+            // Custom receiver implementation
+        }
     }
 }
 
 // ============================================================================
 // Test 10: Full OApp with all manual implementations
 // ============================================================================
-#[oapp]
-#[oapp_manual_impl(core, sender, receiver, options_type3)]
-struct TestFullManualAll;
-
-#[contractimpl(contracttrait)]
-impl OAppCore for TestFullManualAll {
-    fn oapp_version(_env: &Env) -> (u64, u64) {
-        (6, 0)
+mod test_full_manual_all {
+    extern crate self as oapp;
+
+    use endpoint_v2::Origin;
+    use oapp::{
+        oapp_core::OAppCore,
+        oapp_options_type3::{EnforcedOptionParam, OAppOptionsType3},
+        oapp_receiver::OAppReceiver,
+        oapp_sender::OAppSender,
+    };
+    use oapp_macros::{oapp, oapp_manual_impl};
+    use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env, Vec};
+
+    #[oapp]
+    #[oapp_manual_impl(core, sender, receiver, options_type3)]
+    struct TestFullManualAll;
+
+    #[contractimpl(contracttrait)]
+    impl OAppCore for TestFullManualAll {
+        fn oapp_version(_env: &Env) -> (u64, u64) {
+            (6, 0)
+        }
     }
-}
 
-impl OAppSender for TestFullManualAll {
-    // Custom sender implementation
-}
+    impl OAppSender for TestFullManualAll {
+        // Custom sender implementation
+    }
 
-#[contractimpl(contracttrait)]
-impl OAppReceiver for TestFullManualAll {
-    fn lz_receive(
-        _env: &Env,
-        _executor: &Address,
-        _origin: &Origin,
-        _guid: &BytesN<32>,
-        _message: &Bytes,
-        _extra_data: &Bytes,
-        _value: i128,
-    ) {
-        // Custom receiver implementation
+    #[contractimpl(contracttrait)]
+    impl OAppReceiver for TestFullManualAll {
+        fn lz_receive(
+            _env: &Env,
+            _executor: &Address,
+            _origin: &Origin,
+            _guid: &BytesN<32>,
+            _message: &Bytes,
+            _extra_data: &Bytes,
+            _value: i128,
+        ) {
+            // Custom receiver implementation
+        }
     }
-}
 
-#[contractimpl(contracttrait)]
-impl OAppOptionsType3 for TestFullManualAll {
-    // Custom options implementation
+    #[contractimpl(contracttrait)]
+    impl OAppOptionsType3 for TestFullManualAll {
+        // Custom options implementation
+    }
 }
 
 // ============================================================================

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

@@ -4,7 +4,6 @@ use soroban_sdk::{
     testutils::{Address as _, MockAuth, MockAuthInvoke},
     Address, BytesN, Env, IntoVal,
 };
-use utils::ownable::Ownable;
 use utils::testing_utils::assert_event;
 
 #[contract]

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

@@ -8,7 +8,6 @@ use soroban_sdk::{
     testutils::{Address as _, MockAuth, MockAuthInvoke},
     vec, Address, Bytes, Env, IntoVal,
 };
-use utils::ownable::Ownable;
 use utils::testing_utils::assert_event;
 
 const OPTION_TYPE_3: u32 = 3;

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

@@ -5,7 +5,6 @@ use crate::tests::test_oapp_core::DummyEndpoint;
 use endpoint_v2::Origin;
 use soroban_sdk::{assert_with_error, contractimpl, testutils::Address as _, Address, Bytes, BytesN, Env};
 use utils::option_ext::OptionExt;
-use utils::ownable::Ownable;
 
 #[oapp_macros::oapp]
 pub struct DummyOAppReceiver;

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

@@ -7,7 +7,6 @@ use soroban_sdk::{
     token::{StellarAssetClient, TokenClient},
     Address, Bytes, BytesN, Env, IntoVal,
 };
-use utils::ownable::Ownable;
 
 // Mock Endpoint contract
 #[contract]

package/contracts/{oapp-macros → oapps/oapp-macros}/src/oapp_core.rs

@@ -33,6 +33,7 @@ pub fn generate_impl(name: &Ident, item_struct: ItemStruct, manual_impl_core: bo
     quote! {
         #[soroban_sdk::contract]
         #[common_macros::ttl_configurable]
+        #[common_macros::ownable]
         #item_struct
 
         #manual_impl