@layerzerolabs/protocol-stellar-v2 0.2.8 → 0.2.10

package/contracts/oapps/counter/src/storage.rs

@@ -1,8 +1,7 @@
 use common_macros::storage;
 use soroban_sdk::BytesN;
-use utils::ttl::DefaultTtlConfigProvider;
 
-#[storage(DefaultTtlConfigProvider)]
+#[storage]
 pub enum CounterStorage {
     #[instance(u32)]
     EID,

package/contracts/oapps/counter/src/tests/test_codec.rs

@@ -1,5 +1,5 @@
 use crate::codec::*;
-use soroban_sdk::{Bytes, Env, U256};
+use soroban_sdk::{Bytes, Env};
 
 #[test]
 fn test_encode_and_decode() {
@@ -16,11 +16,11 @@ fn test_encode_and_decode_with_value() {
     let env = Env::default();
     let _msg_type = 1;
     let _src_eid = 1;
-    let _value = U256::from_u32(&env, 100);
-    let data = encode_with_value(&env, _msg_type.into(), _src_eid, _value.clone());
+    let _value = 100u32;
+    let data = encode_with_value(&env, _msg_type.into(), _src_eid, _value);
     assert_eq!(msg_type(&data), MsgType::from(_msg_type));
     assert_eq!(src_eid(&data), _src_eid);
-    assert_eq!(_value.eq(&value(&env, &data)), true);
+    assert_eq!(value(&env, &data), _value as i128);
 }
 
 #[test]
@@ -35,7 +35,7 @@ fn test_msg_type() {
 fn test_zero_value_when_not_provided() {
     let env = Env::default();
     let data = encode(&env, 1.into(), 1);
-    assert_eq!(value(&env, &data), U256::from_u32(&env, 0));
+    assert_eq!(value(&env, &data), 0i128);
 }
 
 #[test]

package/contracts/oapps/counter/src/tests/test_counter.rs

@@ -4,7 +4,7 @@ use endpoint_v2::{MessagingFee, MessagingParams, MessagingReceipt, Origin};
 use soroban_sdk::{
     contract, contractimpl, log, symbol_short,
     testutils::{Address as _, MockAuth, MockAuthInvoke},
-    Address, Bytes, BytesN, Env, IntoVal, U256,
+    Address, Bytes, BytesN, Env, IntoVal,
 };
 
 use crate::{
@@ -156,19 +156,18 @@ fn test_lz_receive_vanilla() {
     let origin = Origin { src_eid: 101, sender: BytesN::from_array(&env, &[1u8; 32]), nonce: 1 };
     let guid = BytesN::from_array(&env, &[2u8; 32]);
     let value = 100;
-    let message = codec::encode_with_value(&env, MsgType::Vanilla, origin.src_eid, U256::from_u32(&env, value));
+    let message = codec::encode_with_value(&env, MsgType::Vanilla, origin.src_eid, value);
     let executor = Address::generate(&env);
     let extra_data = Bytes::new(&env);
 
     setup_mock_peer(&env, &owner, &counter, origin.src_eid);
 
     mint_to(&env, &owner, &native_token, &executor, value as i128);
-    approve(&env, &executor, &native_token, value as i128);
 
     let sub_invokes_with_transfer = MockAuthInvoke {
         contract: &native_token,
-        fn_name: "transfer_from",
-        args: (&executor, &executor, &counter.address, &(value as i128)).into_val(&env),
+        fn_name: "transfer",
+        args: (&executor, &counter.address, &(value as i128)).into_val(&env),
         sub_invokes: &[],
     };
     env.mock_auths(&[MockAuth {
@@ -195,7 +194,7 @@ fn test_lz_receive_not_from_executor() {
     let origin = Origin { src_eid: 101, sender: BytesN::from_array(&env, &[1u8; 32]), nonce: 1 };
     let guid = BytesN::from_array(&env, &[2u8; 32]);
     let value = 100;
-    let message = codec::encode_with_value(&env, MsgType::Vanilla, origin.src_eid, U256::from_u32(&env, value));
+    let message = codec::encode_with_value(&env, MsgType::Vanilla, origin.src_eid, value);
     let executor = Address::generate(&env);
     let extra_data = Bytes::new(&env);
 
@@ -211,18 +210,17 @@ fn test_lz_receive_vanilla_ordered_nonce_wrong_nonce() {
     let origin = Origin { src_eid: 101, sender: BytesN::from_array(&env, &[1u8; 32]), nonce: 999 };
     let guid = BytesN::from_array(&env, &[2u8; 32]);
     let value = 100;
-    let message = codec::encode_with_value(&env, MsgType::Vanilla, origin.src_eid, U256::from_u32(&env, value));
+    let message = codec::encode_with_value(&env, MsgType::Vanilla, origin.src_eid, value);
     let executor = Address::generate(&env);
     let extra_data = Bytes::new(&env);
 
     setup_mock_peer(&env, &owner, &counter, origin.src_eid);
     mint_to(&env, &owner, &native_token, &executor, value as i128);
-    approve(&env, &executor, &native_token, value as i128);
 
     let sub_invokes_with_transfer = MockAuthInvoke {
         contract: &native_token,
-        fn_name: "transfer_from",
-        args: (&executor, &executor, &counter.address, &(value as i128)).into_val(&env),
+        fn_name: "transfer",
+        args: (&executor, &counter.address, &(value as i128)).into_val(&env),
         sub_invokes: &[],
     };
     set_ordered_nonce(&env, &owner, &counter, true);
@@ -249,7 +247,7 @@ fn test_lz_compose() {
     let origin = Origin { src_eid: 101, sender: BytesN::from_array(&env, &[1u8; 32]), nonce: 1 };
     let guid = BytesN::from_array(&env, &[2u8; 32]);
     let value = 100;
-    let message = codec::encode_with_value(&env, MsgType::Composed, origin.src_eid, U256::from_u32(&env, value));
+    let message = codec::encode_with_value(&env, MsgType::Composed, origin.src_eid, value);
     let executor = Address::generate(&env);
     let extra_data = Bytes::new(&env);
 
@@ -285,7 +283,7 @@ fn test_lz_compose_not_from_executor() {
     let origin = Origin { src_eid: 101, sender: BytesN::from_array(&env, &[1u8; 32]), nonce: 1 };
     let guid = BytesN::from_array(&env, &[2u8; 32]);
     let value = 100;
-    let message = codec::encode_with_value(&env, MsgType::Composed, origin.src_eid, U256::from_u32(&env, value));
+    let message = codec::encode_with_value(&env, MsgType::Composed, origin.src_eid, value);
     let executor = Address::generate(&env);
     let extra_data = Bytes::new(&env);
 
@@ -300,7 +298,7 @@ fn test_lz_compose_aba() {
     let origin = Origin { src_eid: 101, sender: BytesN::from_array(&env, &[1u8; 32]), nonce: 1 };
     let guid = BytesN::from_array(&env, &[2u8; 32]);
     let value = 100;
-    let message = codec::encode_with_value(&env, MsgType::ComposedABA, origin.src_eid, U256::from_u32(&env, value));
+    let message = codec::encode_with_value(&env, MsgType::ComposedABA, origin.src_eid, value);
     let executor = Address::generate(&env);
     let extra_data = Bytes::new(&env);
 

package/contracts/oapps/oapp/Cargo.toml

@@ -19,3 +19,4 @@ oapp-macros = { workspace = true }
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 utils = { workspace = true, features = ["testutils"] }
+endpoint-v2 = { workspace = true, features = ["testutils"] }

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

@@ -2,7 +2,7 @@ use common_macros::contract_error;
 
 #[contract_error]
 pub enum OAppError {
-    InvalidOptions = 20000,
+    InvalidOptions = 2000,
     NoPeer,
     OnlyPeer,
     ZROTokenUnavailable,

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

@@ -6,5 +6,8 @@ pub mod oapp_options_type3;
 pub mod oapp_receiver;
 pub mod oapp_sender;
 
+#[cfg(test)]
+mod macro_tests;
+
 #[cfg(test)]
 mod tests;

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

@@ -0,0 +1 @@
+pub mod test_macros;

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

@@ -0,0 +1,312 @@
+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
+    }
+}
+
+// ============================================================================
+// 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)
+    }
+}
+
+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;
+
+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
+    }
+}
+
+// ============================================================================
+// 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
+    }
+}
+
+#[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)
+    }
+}
+
+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
+    }
+}
+
+// ============================================================================
+// 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)
+    }
+}
+
+#[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;
+
+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)
+    }
+}
+
+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
+    }
+}
+
+// ============================================================================
+// 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)
+    }
+}
+
+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 OAppOptionsType3 for TestFullManualAll {
+    // Custom options implementation
+}
+
+// ============================================================================
+// Tests
+// ============================================================================
+
+#[test]
+fn test_macros_compile() {
+    // This test verifies that all macro combinations compile successfully
+    assert!(true);
+}

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

@@ -1,51 +1,27 @@
-use common_macros::{event, storage};
+use common_macros::{event, only_owner, storage};
 use endpoint_v2::LayerZeroEndpointV2Client;
-use soroban_sdk::{Address, BytesN, Env};
-use utils::{ownable::Ownable, ttl::DefaultTtlConfigProvider};
+use soroban_sdk::{contracttrait, Address, BytesN, Env};
+use utils::ownable::Ownable;
+use utils::ownable::OwnableInitializer;
 
-pub trait OAppCore: Ownable {
-    /// Retrieves the OApp version information.
-    ///
-    /// # Returns
-    /// A tuple containing:
-    /// - `sender_version`: The version of the OAppSender implementation
-    /// - `receiver_version`: The version of the OAppReceiver implementation
-    fn oapp_version(env: &Env) -> (u64, u64);
+pub fn oapp_initialize<T: OAppCore + OwnableInitializer>(
+    env: &Env,
+    owner: &Address,
+    endpoint: &Address,
+    delegate: &Option<Address>,
+) {
+    T::init_owner(env, owner);
+    OAppCoreStorage::set_endpoint(env, endpoint);
 
-    /// Retrieves the LayerZero endpoint associated with the OApp.
-    ///
-    /// # Returns
-    /// The LayerZero endpoint client
-    fn endpoint(env: &Env) -> Address;
-
-    /// Retrieves the peer (OApp) associated with a corresponding endpoint.
-    ///
-    /// # Arguments
-    /// * `eid` - The endpoint ID
-    ///
-    /// # Returns
-    /// The peer address (OApp instance) associated with the corresponding endpoint
-    fn peer(env: &Env, eid: u32) -> Option<BytesN<32>>;
-
-    /// Sets or removes the peer address (OApp instance) for a corresponding endpoint.
-    ///
-    /// # Arguments
-    /// * `eid` - The endpoint ID
-    /// * `peer` - The address of the peer to be associated with the corresponding endpoint, or None to remove the peer
-    fn set_peer(env: &Env, eid: u32, peer: &Option<BytesN<32>>);
-
-    /// Sets the delegate address for the OApp Core.
-    ///
-    /// # Arguments
-    /// * `delegate` - The address of the delegate to be set, or None to remove the delegate
-    fn set_delegate(env: &Env, delegate: &Option<Address>);
+    let endpoint_client = endpoint_v2::LayerZeroEndpointV2Client::new(env, endpoint);
+    endpoint_client.set_delegate(&env.current_contract_address(), delegate);
 }
 
 // =====================================================
-// Implement overrides for the OAppCore trait
+// OAppCore Storage, Events, and Interface
 // =====================================================
 
-#[storage(DefaultTtlConfigProvider)]
+#[storage]
 pub enum OAppCoreStorage {
     #[instance(Address)]
     Endpoint,
@@ -60,32 +36,55 @@ pub struct PeerSet {
     pub peer: Option<BytesN<32>>,
 }
 
-pub trait OAppCoreOverrides {
-    fn __oapp_initialize(env: &Env, endpoint: &Address, delegate: &Option<Address>) {
-        OAppCoreStorage::set_endpoint(env, endpoint);
-        let endpoint_client = endpoint_v2::LayerZeroEndpointV2Client::new(env, endpoint);
-        endpoint_client.set_delegate(&env.current_contract_address(), delegate);
-    }
-
-    fn __oapp_version(_env: &Env) -> (u64, u64) {
+#[contracttrait(client_name = "OAppCoreClient")]
+pub trait OAppCore: Ownable + Sized {
+    /// Retrieves the OApp version information.
+    ///
+    /// # Returns
+    /// A tuple containing:
+    /// - `sender_version`: The version of the OAppSender implementation
+    /// - `receiver_version`: The version of the OAppReceiver implementation
+    fn oapp_version(_env: &Env) -> (u64, u64) {
         (0, 0)
     }
 
-    fn __endpoint(env: &Env) -> Address {
+    /// Retrieves the LayerZero endpoint associated with the OApp.
+    ///
+    /// # Returns
+    /// The LayerZero endpoint client
+    fn endpoint(env: &Env) -> Address {
         OAppCoreStorage::endpoint(env).unwrap()
     }
 
-    fn __peer(env: &Env, eid: u32) -> Option<BytesN<32>> {
+    /// Retrieves the peer (OApp) associated with a corresponding endpoint.
+    ///
+    /// # Arguments
+    /// * `eid` - The endpoint ID
+    ///
+    /// # Returns
+    /// The peer address (OApp instance) associated with the corresponding endpoint
+    fn peer(env: &Env, eid: u32) -> Option<BytesN<32>> {
         OAppCoreStorage::peer(env, eid)
     }
 
-    fn __set_peer(env: &Env, eid: u32, peer: &Option<BytesN<32>>) {
+    /// Sets or removes the peer address (OApp instance) for a corresponding endpoint.
+    ///
+    /// # Arguments
+    /// * `eid` - The endpoint ID
+    /// * `peer` - The address of the peer to be associated with the corresponding endpoint, or None to remove the peer
+    #[only_owner]
+    fn set_peer(env: &Env, eid: u32, peer: &Option<BytesN<32>>) {
         OAppCoreStorage::set_or_remove_peer(env, eid, peer);
         PeerSet { eid, peer: peer.clone() }.publish(env);
     }
 
-    fn __set_delegate(env: &Env, delegate: &Option<Address>) {
-        let endpoint = Self::__endpoint(env);
+    /// Sets the delegate address for the OApp Core.
+    ///
+    /// # Arguments
+    /// * `delegate` - The address of the delegate to be set, or None to remove the delegate
+    #[only_owner]
+    fn set_delegate(env: &Env, delegate: &Option<Address>) {
+        let endpoint = Self::endpoint(env);
         let endpoint_client = LayerZeroEndpointV2Client::new(env, &endpoint);
         endpoint_client.set_delegate(&env.current_contract_address(), delegate);
     }