@layerzerolabs/protocol-stellar-v2 0.2.8 → 0.2.10

package/contracts/message-libs/uln-302/src/{send.rs → send_uln.rs}

@@ -1,8 +1,10 @@
+use super::*;
+
 // ==============================================================================
 // ISendLib Contract Implementation
 // ==============================================================================
 
-#[contractimpl]
+#[contractimpl(contracttrait)]
 impl ISendLib for Uln302 {
     /// Quotes the total fee for sending a cross-chain message.
     ///
@@ -59,7 +61,7 @@ impl ISendLib for Uln302 {
         let treasury_fee =
             Self::get_treasury_client(env).get_fee(&packet.sender, &packet.dst_eid, &workers_fee, &pay_in_zro);
         if treasury_fee > 0 {
-            let treasury_fee_recipient = FeeRecipient { address: Self::treasury(env), amount: treasury_fee };
+            let treasury_fee_recipient = FeeRecipient { to: Self::treasury(env), amount: treasury_fee };
             if pay_in_zro {
                 zro_fee_recipients.push_back(treasury_fee_recipient);
             } else {
@@ -79,10 +81,8 @@ impl ISendLib for Uln302 {
 // ISendUln302 Contract Implementation
 // ==============================================================================
 
-#[contractimpl]
+#[contractimpl(contracttrait)]
 impl ISendUln302 for Uln302 {
-    // === Owner Set Config Functions ===
-
     /// Sets default executor configurations for multiple destination endpoints.
     #[only_owner]
     fn set_default_executor_configs(env: &Env, params: &Vec<SetDefaultExecutorConfigParam>) {
@@ -103,7 +103,9 @@ impl ISendUln302 for Uln302 {
         DefaultUlnSendConfigSet { params: params.clone() }.publish(env);
     }
 
-    // ===== View Functions =====
+    // ============================================================================================
+    // View Functions
+    // ============================================================================================
 
     /// Returns the treasury address for fee collection.
     fn treasury(env: &Env) -> Address {
@@ -155,15 +157,13 @@ impl ISendUln302 for Uln302 {
 // ==============================================================================
 
 impl Uln302 {
-    // === OApp Set Config Functions ===
-
     /// Sets OApp-specific executor configuration for a destination endpoint.
     ///
     /// # Arguments
     /// * `sender` - The sender OApp address
     /// * `dst_eid` - The destination endpoint ID
     /// * `config` - The OApp-specific executor configuration
-    fn set_executor_config(env: &Env, sender: &Address, dst_eid: u32, config: &OAppExecutorConfig) {
+    pub(super) fn set_executor_config(env: &Env, sender: &Address, dst_eid: u32, config: &OAppExecutorConfig) {
         UlnStorage::set_oapp_executor_configs(env, sender, dst_eid, config);
         ExecutorConfigSet { sender: sender.clone(), dst_eid, config: config.clone() }.publish(env);
     }
@@ -177,7 +177,7 @@ impl Uln302 {
     ///
     /// # Panics
     /// Panics if the final effective config is invalid.
-    fn set_send_uln_config(env: &Env, sender: &Address, dst_eid: u32, config: &OAppUlnConfig) {
+    pub(super) fn set_send_uln_config(env: &Env, sender: &Address, dst_eid: u32, config: &OAppUlnConfig) {
         config.validate_oapp_config(env);
 
         UlnStorage::set_oapp_send_uln_configs(env, sender, dst_eid, config);
@@ -187,7 +187,9 @@ impl Uln302 {
         UlnSendConfigSet { sender: sender.clone(), dst_eid, config: config.clone() }.publish(env);
     }
 
-    // === Quote Fee Functions ===
+    // ============================================================================================
+    // Quote Fee Functions
+    // ============================================================================================
 
     /// Quotes the executor fee for message execution.
     ///
@@ -241,7 +243,9 @@ impl Uln302 {
             .fold(0_i128, |total_fee, (idx, dvn_addr)| total_fee + get_dvn_fee(idx, dvn_addr))
     }
 
-    // === Assign Job Functions ===
+    // ============================================================================================
+    // Assign Job Functions
+    // ============================================================================================
 
     /// Assigns an executor job and returns the fee recipient.
     ///
@@ -310,7 +314,9 @@ impl Uln302 {
         fees
     }
 
-    // === Helper Functions ===
+    // ============================================================================================
+    // Helper Functions
+    // ============================================================================================
 
     /// Gets a validated executor client, ensuring message size is within limits.
     ///

package/contracts/message-libs/uln-302/src/storage.rs

@@ -1,10 +1,9 @@
 use crate::interfaces::{ExecutorConfig, OAppExecutorConfig, OAppUlnConfig, UlnConfig};
 use common_macros::storage;
 use soroban_sdk::{Address, BytesN};
-use utils::ttl::DefaultTtlConfigProvider;
 
 /// Storage for the Uln302 message library.
-#[storage(DefaultTtlConfigProvider)]
+#[storage]
 pub enum UlnStorage {
     /// The endpoint address
     #[instance(Address)]

package/contracts/message-libs/uln-302/src/tests/config/uln_config.rs

@@ -1,11 +1,12 @@
-use soroban_sdk::{contract, contractimpl, Env};
+use common_macros::contract_impl;
+use soroban_sdk::{contract, Env};
 
 use crate::{errors::Uln302Error, interfaces::UlnConfig};
 
 #[contract]
 struct DummyConfig;
 
-#[contractimpl]
+#[contract_impl]
 impl DummyConfig {
     pub fn validate_default_config(env: &Env, config: UlnConfig) {
         config.validate_default_config(env);

package/contracts/message-libs/uln-302/src/tests/send_uln302/send.rs

@@ -88,25 +88,25 @@ fn test_send_events_emittance() {
     assert_eq!(zro_fee_recipients.len(), 0);
     assert_eq!(
         native_fee_recipients.get(0).unwrap(),
-        FeeRecipient { amount: EXECUTOR_FEE, address: DummyExecutorClient::new(&setup.env, &executor).recipient() }
+        FeeRecipient { amount: EXECUTOR_FEE, to: DummyExecutorClient::new(&setup.env, &executor).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[0],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
         }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[1],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
         }
     );
     assert_eq!(
         native_fee_recipients.get(3).unwrap(),
-        FeeRecipient { amount: TREASURY_NATIVE_FEE, address: setup.treasury.address }
+        FeeRecipient { amount: TREASURY_NATIVE_FEE, to: setup.treasury.address }
     );
     assert_eq!(send_result.encoded_packet, packet_codec_v1::encode_packet(&setup.env, &packet));
 }
@@ -184,25 +184,25 @@ fn test_send_events_emittance_with_zro() {
     assert_eq!(native_fee_recipients.len(), 3);
     assert_eq!(
         native_fee_recipients.get(0).unwrap(),
-        FeeRecipient { amount: EXECUTOR_FEE, address: DummyExecutorClient::new(&setup.env, &executor).recipient() }
+        FeeRecipient { amount: EXECUTOR_FEE, to: DummyExecutorClient::new(&setup.env, &executor).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[0],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
         }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[1],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
         }
     );
     assert_eq!(
         zro_fee_recipients.get(0).unwrap(),
-        FeeRecipient { amount: TREASURY_ZRO_FEE, address: setup.treasury.address }
+        FeeRecipient { amount: TREASURY_ZRO_FEE, to: setup.treasury.address }
     );
     assert_eq!(send_result.encoded_packet, packet_codec_v1::encode_packet(&setup.env, &packet));
 }
@@ -260,18 +260,18 @@ fn test_send_single_dvn() {
     assert_eq!(zro_fee_recipients.len(), 0);
     assert_eq!(
         native_fee_recipients.get(0).unwrap(),
-        FeeRecipient { amount: EXECUTOR_FEE, address: DummyExecutorClient::new(&setup.env, &executor).recipient() }
+        FeeRecipient { amount: EXECUTOR_FEE, to: DummyExecutorClient::new(&setup.env, &executor).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[0],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
         }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
-        FeeRecipient { amount: TREASURY_NATIVE_FEE, address: setup.treasury.address }
+        FeeRecipient { amount: TREASURY_NATIVE_FEE, to: setup.treasury.address }
     );
     assert_eq!(send_result.encoded_packet, packet_codec_v1::encode_packet(&setup.env, &packet));
 }
@@ -374,25 +374,25 @@ fn test_send_multiple_dvns() {
     assert_eq!(zro_fee_recipients.len(), 0);
     assert_eq!(
         native_fee_recipients.get(0).unwrap(),
-        FeeRecipient { amount: EXECUTOR_FEE, address: DummyExecutorClient::new(&setup.env, &executor).recipient() }
+        FeeRecipient { amount: EXECUTOR_FEE, to: DummyExecutorClient::new(&setup.env, &executor).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[0],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
         }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[1],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
         }
     );
     assert_eq!(
         native_fee_recipients.get(3).unwrap(),
-        FeeRecipient { amount: TREASURY_NATIVE_FEE, address: setup.treasury.address }
+        FeeRecipient { amount: TREASURY_NATIVE_FEE, to: setup.treasury.address }
     );
     assert_eq!(send_result.encoded_packet, packet_codec_v1::encode_packet(&setup.env, &packet));
 }
@@ -450,18 +450,18 @@ fn test_send_with_only_optional_dvns() {
     assert_eq!(zro_fee_recipients.len(), 0);
     assert_eq!(
         native_fee_recipients.get(0).unwrap(),
-        FeeRecipient { amount: EXECUTOR_FEE, address: DummyExecutorClient::new(&setup.env, &executor).recipient() }
+        FeeRecipient { amount: EXECUTOR_FEE, to: DummyExecutorClient::new(&setup.env, &executor).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[0],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
         }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
-        FeeRecipient { amount: TREASURY_NATIVE_FEE, address: setup.treasury.address }
+        FeeRecipient { amount: TREASURY_NATIVE_FEE, to: setup.treasury.address }
     );
     assert_eq!(send_result.encoded_packet, packet_codec_v1::encode_packet(&setup.env, &packet));
 }
@@ -624,25 +624,25 @@ fn test_send_with_missing_dvn_options() {
     assert_eq!(zro_fee_recipients.len(), 0);
     assert_eq!(
         native_fee_recipients.get(0).unwrap(),
-        FeeRecipient { amount: EXECUTOR_FEE, address: DummyExecutorClient::new(&setup.env, &executor).recipient() }
+        FeeRecipient { amount: EXECUTOR_FEE, to: DummyExecutorClient::new(&setup.env, &executor).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[0],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
         }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[1],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
         }
     );
     assert_eq!(
         native_fee_recipients.get(3).unwrap(),
-        FeeRecipient { amount: TREASURY_NATIVE_FEE, address: setup.treasury.address }
+        FeeRecipient { amount: TREASURY_NATIVE_FEE, to: setup.treasury.address }
     );
     assert_eq!(send_result.encoded_packet, packet_codec_v1::encode_packet(&setup.env, &packet));
 }
@@ -699,18 +699,18 @@ fn test_send_with_missing_executor_options() {
     assert_eq!(zro_fee_recipients.len(), 0);
     assert_eq!(
         native_fee_recipients.get(0).unwrap(),
-        FeeRecipient { amount: EXECUTOR_FEE, address: DummyExecutorClient::new(&setup.env, &executor).recipient() }
+        FeeRecipient { amount: EXECUTOR_FEE, to: DummyExecutorClient::new(&setup.env, &executor).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[0],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
         }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
-        FeeRecipient { amount: TREASURY_NATIVE_FEE, address: setup.treasury.address }
+        FeeRecipient { amount: TREASURY_NATIVE_FEE, to: setup.treasury.address }
     );
     assert_eq!(send_result.encoded_packet, packet_codec_v1::encode_packet(&setup.env, &packet));
 }
@@ -797,7 +797,7 @@ fn test_send_derives_from_quote() {
     // Verify executor fee is first
     assert_eq!(
         native_fee_recipients.get(0).unwrap(),
-        FeeRecipient { amount: EXECUTOR_FEE, address: DummyExecutorClient::new(&setup.env, &executor).recipient() }
+        FeeRecipient { amount: EXECUTOR_FEE, to: DummyExecutorClient::new(&setup.env, &executor).recipient() }
     );
 
     // Verify DVN ordering is maintained (required first, then optional)
@@ -806,7 +806,7 @@ fn test_send_derives_from_quote() {
         native_fee_recipients.get(1).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[0],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
         }
     );
     // DVN 1 (second required)
@@ -814,7 +814,7 @@ fn test_send_derives_from_quote() {
         native_fee_recipients.get(2).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[1],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
         }
     );
     // DVN 2 (optional)
@@ -822,13 +822,13 @@ fn test_send_derives_from_quote() {
         native_fee_recipients.get(3).unwrap(),
         FeeRecipient {
             amount: DVN_FEE[2],
-            address: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(2)).recipient()
+            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(2)).recipient()
         }
     );
 
     // Treasury fee is last
     assert_eq!(
         native_fee_recipients.get(4).unwrap(),
-        FeeRecipient { amount: TREASURY_NATIVE_FEE, address: setup.treasury.address }
+        FeeRecipient { amount: TREASURY_NATIVE_FEE, to: setup.treasury.address }
     );
 }

package/contracts/message-libs/uln-302/src/tests/setup.rs

@@ -1,7 +1,8 @@
 use endpoint_v2::{FeeRecipient, MessageLibClient, MessageLibManagerClient, Origin, SetConfigParam};
-use message_lib_common::{ILayerZeroDVN, ILayerZeroExecutor, ILayerZeroTreasury};
+use message_lib_common::interfaces::{ILayerZeroDVN, ILayerZeroExecutor, ILayerZeroTreasury};
+use common_macros::contract_impl;
 use soroban_sdk::{
-    contract, contractimpl, log, symbol_short,
+    contract, log, symbol_short,
     testutils::{Address as _, MockAuth, MockAuthInvoke},
     vec, Address, Bytes, BytesN, Env, IntoVal, Vec,
 };
@@ -34,7 +35,7 @@ pub struct TestSetup<'a> {
 #[contract]
 struct DummyEndpoint;
 
-#[contractimpl]
+#[contract_impl]
 impl DummyEndpoint {
     pub fn eid(_env: &Env) -> u32 {
         LOCAL_EID
@@ -53,7 +54,7 @@ impl DummyEndpoint {
 #[contract]
 struct DummyDVN;
 
-#[contractimpl]
+#[contract_impl]
 impl DummyDVN {
     pub fn __constructor(env: &Env, fee: i128) {
         env.storage().persistent().set(&symbol_short!("fee"), &fee);
@@ -69,7 +70,7 @@ impl DummyDVN {
     }
 }
 
-#[contractimpl]
+#[contract_impl]
 impl ILayerZeroDVN for DummyDVN {
     fn get_fee(
         env: &Env,
@@ -95,7 +96,7 @@ impl ILayerZeroDVN for DummyDVN {
         _options: &Bytes,
     ) -> FeeRecipient {
         FeeRecipient {
-            address: env.storage().persistent().get(&symbol_short!("recipient")).unwrap(),
+            to: env.storage().persistent().get(&symbol_short!("recipient")).unwrap(),
             amount: env.storage().persistent().get(&symbol_short!("fee")).unwrap(),
         }
     }
@@ -104,7 +105,7 @@ impl ILayerZeroDVN for DummyDVN {
 #[contract]
 struct DummyExecutor;
 
-#[contractimpl]
+#[contract_impl]
 impl DummyExecutor {
     pub fn __constructor(env: &Env, fee: i128) {
         env.storage().persistent().set(&symbol_short!("fee"), &fee);
@@ -116,7 +117,7 @@ impl DummyExecutor {
     }
 }
 
-#[contractimpl]
+#[contract_impl]
 impl ILayerZeroExecutor for DummyExecutor {
     fn get_fee(
         env: &Env,
@@ -138,7 +139,7 @@ impl ILayerZeroExecutor for DummyExecutor {
         _options: &Bytes,
     ) -> FeeRecipient {
         FeeRecipient {
-            address: env.storage().persistent().get(&symbol_short!("recipient")).unwrap(),
+            to: env.storage().persistent().get(&symbol_short!("recipient")).unwrap(),
             amount: env.storage().persistent().get(&symbol_short!("fee")).unwrap(),
         }
     }
@@ -147,7 +148,7 @@ impl ILayerZeroExecutor for DummyExecutor {
 #[contract]
 struct DummyTreasury;
 
-#[contractimpl]
+#[contract_impl]
 impl DummyTreasury {
     pub fn __constructor(env: &Env, native_fee: i128, zro_fee: i128) {
         env.storage().persistent().set(&symbol_short!("nt_fee"), &native_fee);
@@ -171,7 +172,7 @@ impl DummyTreasury {
     }
 }
 
-#[contractimpl]
+#[contract_impl]
 impl ILayerZeroTreasury for DummyTreasury {
     fn get_fee(env: &Env, _sender: &Address, _dst_eid: u32, _total_native_fee: i128, pay_in_zro: bool) -> i128 {
         if pay_in_zro {

package/contracts/message-libs/uln-302/src/tests/uln302/set_config.rs

@@ -3,10 +3,10 @@ use endpoint_v2::{MessageLibVersion, SetConfigParam};
 use soroban_sdk::{testutils::Address as _, vec, xdr::ToXdr, Address};
 
 use crate::{
-    config_validation::MAX_DVNS,
     errors::Uln302Error,
     interfaces::{ExecutorConfig, OAppUlnConfig, UlnConfig},
     tests::setup::{setup, TestSetup},
+    types::MAX_DVNS,
     uln302::{CONFIG_TYPE_RECEIVE_ULN, CONFIG_TYPE_SEND_ULN},
     Uln302Client,
 };

package/contracts/message-libs/uln-302/src/{config_validation.rs → types.rs}

@@ -1,14 +1,26 @@
 use crate::errors::Uln302Error;
-use crate::interfaces::{ExecutorConfig, OAppUlnConfig, UlnConfig};
-use crate::OAppExecutorConfig;
-use soroban_sdk::{assert_with_error, map, vec, Env, IntoVal, TryFromVal, Val, Vec};
+use soroban_sdk::{assert_with_error, contracttype, map, vec, Address, Env, IntoVal, TryFromVal, Val, Vec};
 
 /// Maximum number of DVNs allowed in a configuration.
 pub const MAX_DVNS: u32 = 127;
 
-// ================================================
-// Uln Config Validation
-// ================================================
+// ============================================================================================
+// ULN Config Types
+// ============================================================================================
+
+/// Ultra Light Node configuration for message verification.
+#[contracttype]
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub struct UlnConfig {
+    /// Number of block confirmations required before message verification begins.
+    pub confirmations: u64,
+    /// List of DVN addresses that must ALL verify the message (no threshold).
+    pub required_dvns: Vec<Address>,
+    /// List of DVN addresses from which a threshold number must verify.
+    pub optional_dvns: Vec<Address>,
+    /// Minimum number of optional DVNs required to verify.
+    pub optional_dvn_threshold: u32,
+}
 
 impl UlnConfig {
     /// Validates the required DVNs configuration.
@@ -64,6 +76,20 @@ impl UlnConfig {
     }
 }
 
+/// OApp-specific ULN configuration with default override flags.
+#[contracttype]
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub struct OAppUlnConfig {
+    /// Whether to use default confirmations.
+    pub use_default_confirmations: bool,
+    /// Whether to use default required DVNs.
+    pub use_default_required_dvns: bool,
+    /// Whether to use default optional DVNs.
+    pub use_default_optional_dvns: bool,
+    /// OApp-specific ULN configuration (used when defaults are not applied).
+    pub uln_config: UlnConfig,
+}
+
 impl OAppUlnConfig {
     /// Creates a default OAppUlnConfig that uses all default values.
     pub fn default(env: &Env) -> Self {
@@ -128,9 +154,29 @@ impl OAppUlnConfig {
     }
 }
 
-// ================================================
-// Executor Config Validation
-// ================================================
+/// Parameter for setting default ULN configuration for a destination/source endpoint.
+#[contracttype]
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub struct SetDefaultUlnConfigParam {
+    /// The destination endpoint ID (for send) or source endpoint ID (for receive).
+    pub dst_eid: u32,
+    /// The ULN configuration to set as default.
+    pub config: UlnConfig,
+}
+
+// ============================================================================================
+// Executor Config Types
+// ============================================================================================
+
+/// Executor configuration for message delivery.
+#[contracttype]
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub struct ExecutorConfig {
+    /// Maximum size of messages that can be executed (in bytes).
+    pub max_message_size: u32,
+    /// Address of the executor contract responsible for message execution.
+    pub executor: Address,
+}
 
 impl ExecutorConfig {
     /// Validates the executor config for use as a default configuration.
@@ -139,6 +185,18 @@ impl ExecutorConfig {
     }
 }
 
+/// OApp-specific executor configuration.
+///
+/// If executor is `None`, the default executor is used.
+#[contracttype]
+#[derive(Clone, Default, Eq, PartialEq, Debug)]
+pub struct OAppExecutorConfig {
+    /// Maximum size of messages that can be executed (in bytes). 0 means use default configuration.
+    pub max_message_size: u32,
+    /// Address of the executor contract to be used for message execution. None means use default configuration.
+    pub executor: Option<Address>,
+}
+
 impl OAppExecutorConfig {
     /// Merges this OAppExecutorConfig with a default ExecutorConfig to produce the effective config.
     pub fn apply_default_config(&self, default_config: &ExecutorConfig) -> ExecutorConfig {
@@ -153,9 +211,19 @@ impl OAppExecutorConfig {
     }
 }
 
-// ================================================
+/// Parameter for setting default executor configuration for a destination endpoint.
+#[contracttype]
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub struct SetDefaultExecutorConfigParam {
+    /// The destination endpoint ID.
+    pub dst_eid: u32,
+    /// The executor configuration to set as default.
+    pub config: ExecutorConfig,
+}
+
+// ============================================================================================
 // Helper Functions
-// ================================================
+// ============================================================================================
 
 /// Checks if a vector contains duplicate elements.
 fn has_duplicates<T>(env: &Env, items: &Vec<T>) -> bool

package/contracts/message-libs/uln-302/src/uln302.rs

@@ -10,14 +10,15 @@ use crate::{
     },
     storage::UlnStorage,
 };
-use common_macros::{only_owner, ttl_configurable};
+use common_macros::{contract_impl, only_owner, ttl_configurable};
 use endpoint_v2::{
     util, FeeRecipient, FeesAndPacket, IMessageLib, ISendLib, LayerZeroEndpointV2Client, MessageLibType,
     MessageLibVersion, MessagingFee, Origin, OutboundPacket, SetConfigParam,
 };
 use message_lib_common::{
+    interfaces::{LayerZeroDVNClient, LayerZeroExecutorClient, LayerZeroTreasuryClient},
     packet_codec_v1::{self, PacketHeader},
-    worker_options, LayerZeroDVNClient, LayerZeroExecutorClient, LayerZeroTreasuryClient,
+    worker_options,
 };
 use soroban_sdk::{
     address_payload::AddressPayload,
@@ -35,15 +36,17 @@ pub const CONFIG_TYPE_RECEIVE_ULN: u32 = 3;
 #[ttl_configurable]
 pub struct Uln302;
 
-#[contractimpl]
+#[contract_impl]
 impl Uln302 {
     pub fn __constructor(env: &Env, owner: &Address, endpoint: &Address, treasury: &Address) {
-        Self::__init_owner(env, owner);
+        Self::init_owner(env, owner);
         UlnStorage::set_endpoint(env, endpoint);
         UlnStorage::set_treasury(env, treasury);
     }
 
-    // === View Functions ===
+    // ============================================================================================
+    // View Functions
+    // ============================================================================================
 
     /// Returns the LayerZero endpoint contract address.
     pub fn endpoint(env: &Env) -> Address {
@@ -51,7 +54,7 @@ impl Uln302 {
     }
 }
 
-#[contractimpl]
+#[contractimpl(contracttrait)]
 impl IMessageLib for Uln302 {
     /// Sets OApp-specific configuration parameters for the message library.
     ///
@@ -104,14 +107,16 @@ impl IMessageLib for Uln302 {
     }
 }
 
-// ================================================
+// ============================================================================================
 // Helper Functions
-// ================================================
+// ============================================================================================
 
 /// Parse a config from XDR bytes, panicking with InvalidConfig error if parsing fails
 fn parse_config<T: FromXdr>(env: &Env, config_bytes: &Bytes) -> T {
     T::from_xdr(env, config_bytes).ok().unwrap_or_panic(env, Uln302Error::InvalidConfig)
 }
 
-include!("send.rs");
-include!("receive.rs");
+#[path = "receive_uln.rs"]
+mod receive_uln;
+#[path = "send_uln.rs"]
+mod send_uln;

package/contracts/oapp-macros/Cargo.toml

@@ -9,13 +9,7 @@ publish = false
 proc-macro = true
 
 [dependencies]
+heck = "0.5"
 proc-macro2 = "1.0"
 quote = "1.0"
-syn = { version = "2.0", features = ["full", "extra-traits"] }
-
-[dev-dependencies]
-oapp = { workspace = true }
-soroban-sdk = { workspace = true, features = ["testutils"] }
-common-macros = { workspace = true }
-utils = { workspace = true }
-endpoint-v2 = { workspace = true , features = ["library"]}
+syn = { version = "2.0", features = ["full", "extra-traits"] }