@layerzerolabs/protocol-stellar-v2 0.2.13 → 0.2.15

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

@@ -55,8 +55,7 @@ fn test_set_config_invalid_type_should_fail() {
     let eid = 100;
 
     // Set up configs for the EID to make it supported
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -91,8 +90,7 @@ fn test_set_send_config_invalid_confirmations_use_default_but_nonzero() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -122,8 +120,7 @@ fn test_set_receive_config_invalid_confirmations_use_default_but_nonzero() {
     let default_config = UlnConfig::generate(&setup.env, 15, 1, 2, 1);
     let eid = 101;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -153,8 +150,7 @@ fn test_set_send_config_valid_confirmations_use_default_with_zero() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -187,8 +183,7 @@ fn test_set_send_config_valid_confirmations_custom_with_any_value() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -223,8 +218,7 @@ fn test_set_send_config_invalid_required_dvns_use_default_but_not_empty() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -254,8 +248,7 @@ fn test_set_receive_config_invalid_required_dvns_use_default_but_not_empty() {
     let default_config = UlnConfig::generate(&setup.env, 15, 1, 2, 1);
     let eid = 101;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -285,8 +278,7 @@ fn test_set_send_config_valid_required_dvns_use_default_with_empty() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -319,8 +311,7 @@ fn test_set_send_config_invalid_required_dvns_duplicates() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -352,8 +343,7 @@ fn test_set_send_config_invalid_required_dvns_too_many() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -389,8 +379,7 @@ fn test_set_send_config_valid_required_dvns_custom() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -425,8 +414,7 @@ fn test_set_send_config_invalid_optional_dvns_use_default_but_threshold_nonzero(
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -456,8 +444,7 @@ fn test_set_send_config_invalid_optional_dvns_use_default_but_dvns_not_empty() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -487,8 +474,7 @@ fn test_set_receive_config_invalid_optional_dvns_use_default_but_threshold_nonze
     let default_config = UlnConfig::generate(&setup.env, 15, 1, 2, 1);
     let eid = 101;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -518,8 +504,7 @@ fn test_set_send_config_valid_optional_dvns_use_default() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -552,8 +537,7 @@ fn test_set_send_config_invalid_optional_dvns_duplicates() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -585,8 +569,7 @@ fn test_set_send_config_invalid_optional_dvns_too_many() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -622,8 +605,7 @@ fn test_set_send_config_invalid_optional_dvns_threshold_zero_with_dvns() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -653,8 +635,7 @@ fn test_set_send_config_invalid_optional_dvns_threshold_greater_than_dvns() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -684,8 +665,7 @@ fn test_set_send_config_valid_optional_dvns_custom() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -718,8 +698,7 @@ fn test_set_send_config_valid_optional_dvns_custom_empty() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -754,8 +733,7 @@ fn test_set_send_config_valid_all_custom() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -788,8 +766,7 @@ fn test_set_receive_config_valid_all_custom() {
     let default_config = UlnConfig::generate(&setup.env, 15, 1, 2, 1);
     let eid = 101;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -822,8 +799,7 @@ fn test_set_send_config_invalid_multiple_errors_confirmations_first() {
     let default_config = UlnConfig::generate(&setup.env, 10, 2, 3, 2);
     let eid = 100;
 
-    setup.set_default_send_uln_config(eid, default_config.clone());
-    setup.set_default_receive_uln_config(eid, default_config.clone());
+    setup.set_default_configs(eid, default_config.clone());
 
     let TestSetup { env, uln302, endpoint, .. } = setup;
     let oapp = Address::generate(&env);
@@ -883,14 +859,13 @@ fn test_is_supported_eid_initially_false() {
 #[test]
 fn test_is_supported_eid_true_after_configs() {
     // Sui equivalent: test_version_and_utility (is_supported_eid after configs)
-    // Tests that is_supported_eid returns true after both send and receive configs are set
+    // Tests that is_supported_eid returns true after all default configs are set
     let setup = setup();
     let eid = 100u32;
 
-    // Set both send and receive configs
+    // Set all default configs (executor, send, and receive)
     let config = UlnConfig::generate(&setup.env, 15, 2, 3, 2);
-    setup.set_default_send_uln_config(eid, config.clone());
-    setup.set_default_receive_uln_config(eid, config);
+    setup.set_default_configs(eid, config);
 
     let TestSetup { env, uln302, .. } = setup;
     let uln302_client = Uln302Client::new(&env, &uln302.address);
@@ -939,9 +914,9 @@ fn test_supported_eid_combinations_only_receive_config() {
 }
 
 #[test]
-fn test_supported_eid_combinations_both_configs() {
+fn test_supported_eid_combinations_all_configs() {
     // Sui equivalent: test_supported_eid_combinations
-    // Tests that EID is supported only when both send AND receive configs are set
+    // Tests that EID is supported only when all configs (executor, send, receive) are set
     let setup = setup();
     let eid = 100u32;
 
@@ -950,12 +925,19 @@ fn test_supported_eid_combinations_both_configs() {
     // First set only send config
     setup.set_default_send_uln_config(eid, config.clone());
 
-    // Still not supported
+    // Still not supported (missing executor and receive)
     assert!(!setup.uln302.is_supported_eid(&eid));
 
     // Now set receive config too
     setup.set_default_receive_uln_config(eid, config);
 
+    // Still not supported (missing executor)
+    assert!(!setup.uln302.is_supported_eid(&eid));
+
+    // Now set executor config
+    let executor_config = ExecutorConfig::generate(&setup.env, 10000);
+    setup.set_default_executor_config(eid, executor_config);
+
     // Now fully supported
     assert!(setup.uln302.is_supported_eid(&eid));
 }

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

@@ -1,8 +1,8 @@
 use crate::{
     errors::Uln302Error,
     events::{
-        DVNFeePaid, DefaultExecutorConfigSet, DefaultUlnReceiveConfigSet, DefaultUlnSendConfigSet, ExecutorConfigSet,
-        ExecutorFeePaid, PayloadVerified, UlnReceiveConfigSet, UlnSendConfigSet,
+        DVNFeePaid, DefaultExecutorConfigsSet, DefaultReceiveUlnConfigsSet, DefaultSendUlnConfigsSet,
+        ExecutorConfigSet, ExecutorFeePaid, PayloadVerified, ReceiveUlnConfigSet, SendUlnConfigSet,
     },
     interfaces::{
         ExecutorConfig, IReceiveUln302, ISendUln302, OAppExecutorConfig, OAppUlnConfig, SetDefaultExecutorConfigParam,
@@ -10,7 +10,7 @@ use crate::{
     },
     storage::UlnStorage,
 };
-use common_macros::{contract_impl, only_owner, ttl_configurable};
+use common_macros::{contract_impl, only_owner, ownable, ttl_configurable};
 use endpoint_v2::{
     util, FeeRecipient, FeesAndPacket, IMessageLib, ISendLib, LayerZeroEndpointV2Client, MessageLibType,
     MessageLibVersion, MessagingFee, Origin, OutboundPacket, SetConfigParam,
@@ -34,6 +34,7 @@ pub const CONFIG_TYPE_RECEIVE_ULN: u32 = 3;
 
 #[contract]
 #[ttl_configurable]
+#[ownable]
 pub struct Uln302;
 
 #[contract_impl]
@@ -91,9 +92,11 @@ impl IMessageLib for Uln302 {
         }
     }
 
-    /// Returns true if the message library has default send and receive ULN configurations for the endpoint ID.
+    /// Returns true if the message library has full default configurations for the endpoint ID.
     fn is_supported_eid(env: &Env, eid: u32) -> bool {
-        UlnStorage::has_default_send_uln_configs(env, eid) && UlnStorage::has_default_receive_uln_configs(env, eid)
+        UlnStorage::has_default_executor_configs(env, eid)
+            && UlnStorage::has_default_send_uln_configs(env, eid)
+            && UlnStorage::has_default_receive_uln_configs(env, eid)
     }
 
     /// Returns the version of the message library.

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

@@ -16,7 +16,6 @@ use oapp::{
 };
 use oapp_macros::{oapp, oapp_manual_impl};
 use soroban_sdk::{assert_with_error, panic_with_error, token::TokenClient, Address, Bytes, BytesN, Env};
-use utils::ownable::Ownable;
 
 #[oapp]
 #[oapp_manual_impl(receiver)]