@layerzerolabs/protocol-stellar-v2 0.2.10 → 0.2.12

package/contracts/endpoint-v2/src/tests/message_lib_manager/set_default_receive_lib_timeout.rs

@@ -1,8 +1,8 @@
 use soroban_sdk::{testutils::Address as _, testutils::Ledger, vec, Address};
 
 use crate::{
-    errors::EndpointError, events::DefaultReceiveLibraryTimeoutSet, storage, tests::endpoint_setup::setup,
-    MessageLibType, Timeout,
+    errors::EndpointError, events::DefaultReceiveLibTimeoutSet, storage, tests::endpoint_setup::setup, MessageLibType,
+    Timeout,
 };
 use utils::testing_utils::assert_event;
 
@@ -203,7 +203,7 @@ fn test_set_default_receive_lib_timeout_success() {
     assert_event(
         env,
         &endpoint_client.address,
-        DefaultReceiveLibraryTimeoutSet { src_eid: context.eid, timeout: timeout.clone() },
+        DefaultReceiveLibTimeoutSet { src_eid: context.eid, timeout: timeout.clone() },
     );
 
     // Verify it was set correctly via public interface
@@ -229,11 +229,7 @@ fn test_set_default_receive_lib_timeout_success_with_none() {
     endpoint_client.set_default_receive_lib_timeout(&context.eid, &None);
 
     // Verify the event was published
-    assert_event(
-        env,
-        &endpoint_client.address,
-        DefaultReceiveLibraryTimeoutSet { src_eid: context.eid, timeout: None },
-    );
+    assert_event(env, &endpoint_client.address, DefaultReceiveLibTimeoutSet { src_eid: context.eid, timeout: None });
 
     // Verify it was cleared via public interface
     assert_eq!(endpoint_client.default_receive_library_timeout(&context.eid), None);

package/contracts/endpoint-v2/src/tests/message_lib_manager/set_default_receive_library.rs

@@ -5,7 +5,7 @@ use soroban_sdk::{
 
 use crate::{
     errors::EndpointError,
-    events::{DefaultReceiveLibrarySet, DefaultReceiveLibraryTimeoutSet},
+    events::{DefaultReceiveLibTimeoutSet, DefaultReceiveLibrarySet},
     storage,
     tests::endpoint_setup::setup,
     MessageLibType, Timeout,
@@ -131,11 +131,7 @@ fn test_set_default_receive_library_success() {
         &endpoint_client.address,
         DefaultReceiveLibrarySet { src_eid: context.eid, new_lib: receive_lib.clone() },
     );
-    assert_event(
-        env,
-        &endpoint_client.address,
-        DefaultReceiveLibraryTimeoutSet { src_eid: context.eid, timeout: None },
-    );
+    assert_event(env, &endpoint_client.address, DefaultReceiveLibTimeoutSet { src_eid: context.eid, timeout: None });
 
     // Verify it was set correctly via public interface
     assert_eq!(endpoint_client.default_receive_library(&context.eid), Some(receive_lib.clone()));
@@ -193,7 +189,7 @@ fn test_set_default_receive_library_success_with_grace_period() {
     assert_event(
         env,
         &endpoint_client.address,
-        DefaultReceiveLibraryTimeoutSet { src_eid: context.eid, timeout: expected_timeout.clone() },
+        DefaultReceiveLibTimeoutSet { src_eid: context.eid, timeout: expected_timeout.clone() },
     );
 
     // Verify it was set correctly via public interface

package/contracts/message-libs/{block-message-lib → blocked-message-lib}/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "block-message-lib"
+name = "blocked-message-lib"
 version.workspace = true
 edition.workspace = true
 license.workspace = true

package/contracts/message-libs/treasury/src/events.rs

@@ -1,26 +1,29 @@
-use common_macros::event;
-use soroban_sdk::Address;
+use soroban_sdk::{contractevent, Address};
 
 /// Emitted when the native fee basis points is updated.
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct NativeFeeBpSet {
     pub native_fee_bp: u32,
 }
 
 /// Emitted when fee collection is enabled or disabled.
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct FeeEnabledSet {
     pub fee_enabled: bool,
 }
 
 /// Emitted when the ZRO fee library is set or removed.
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ZROFeeLibSet {
     pub zro_fee_lib: Option<Address>,
 }
 
 /// Emitted when a token (including native XLM) is withdrawn from the contract.
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct TokenWithdrawn {
     pub token: Address,
     pub to: Address,

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

@@ -2,11 +2,11 @@ use crate::{
     interfaces::{OAppExecutorConfig, OAppUlnConfig, SetDefaultUlnConfigParam},
     SetDefaultExecutorConfigParam,
 };
-use common_macros::event;
 use endpoint_v2::FeeRecipient;
-use soroban_sdk::{Address, Bytes, BytesN, Vec};
+use soroban_sdk::{contractevent, Address, Bytes, BytesN, Vec};
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ExecutorConfigSet {
     #[topic]
     pub sender: Address,
@@ -15,7 +15,8 @@ pub struct ExecutorConfigSet {
     pub config: OAppExecutorConfig,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct UlnSendConfigSet {
     #[topic]
     pub sender: Address,
@@ -24,7 +25,8 @@ pub struct UlnSendConfigSet {
     pub config: OAppUlnConfig,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct UlnReceiveConfigSet {
     #[topic]
     pub receiver: Address,
@@ -33,36 +35,42 @@ pub struct UlnReceiveConfigSet {
     pub config: OAppUlnConfig,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct DefaultExecutorConfigSet {
     pub params: Vec<SetDefaultExecutorConfigParam>,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct DefaultUlnSendConfigSet {
     pub params: Vec<SetDefaultUlnConfigParam>,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct DefaultUlnReceiveConfigSet {
     pub params: Vec<SetDefaultUlnConfigParam>,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ExecutorFeePaid {
     #[topic]
     pub executor: Address,
     pub fee: FeeRecipient,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct DVNFeePaid {
     #[topic]
     pub dvns: Vec<Address>,
     pub fees: Vec<FeeRecipient>,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct PayloadVerified {
     #[topic]
     pub dvn: Address,

package/contracts/message-libs/uln-302/src/interfaces/receive_uln.rs

@@ -1,10 +1,10 @@
 use crate::types::{OAppUlnConfig, SetDefaultUlnConfigParam, UlnConfig};
-use soroban_sdk::{contracttrait, Address, Bytes, BytesN, Env, Vec};
+use soroban_sdk::{contractclient, Address, Bytes, BytesN, Env, Vec};
 
 /// Interface for ULN302 receive library functions.
 ///
 /// Handles DVN verification and message commitment on the receiving chain.
-#[contracttrait(client_name = "ReceiveUln302Client")]
+#[contractclient(name = "ReceiveUln302Client")]
 pub trait IReceiveUln302 {
     /// Called by a DVN to verify a message with a specific number of confirmations.
     ///

package/contracts/message-libs/uln-302/src/interfaces/send_uln.rs

@@ -3,7 +3,7 @@ pub use crate::types::{
     UlnConfig,
 };
 use endpoint_v2::ISendLib;
-use soroban_sdk::{contracttrait, Address, Env, Vec};
+use soroban_sdk::{contractclient, Address, Env, Vec};
 
 // ============================================================================================
 // ISendUln302 Trait
@@ -12,7 +12,7 @@ use soroban_sdk::{contracttrait, Address, Env, Vec};
 /// Interface for ULN302 send library functions.
 ///
 /// Extends `ISendLib` with ULN-specific configuration management for executors and DVNs.
-#[contracttrait(client_name = "SendUln302Client")]
+#[contractclient(name = "SendUln302Client")]
 pub trait ISendUln302: ISendLib {
     /// Returns the treasury address for fee collection.
     fn treasury(env: &Env) -> Address;

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

@@ -4,7 +4,7 @@ use super::*;
 // IReceiveUln302 Contract Implementation
 // ============================================================================================
 
-#[contractimpl(contracttrait)]
+#[contract_impl]
 impl IReceiveUln302 for Uln302 {
     /// Called by a DVN to verify a message with a specific number of block confirmations.
     ///
@@ -62,7 +62,7 @@ impl IReceiveUln302 for Uln302 {
     fn set_default_receive_uln_configs(env: &Env, params: &Vec<SetDefaultUlnConfigParam>) {
         for param in params {
             param.config.validate_default_config(env);
-            UlnStorage::set_default_receive_uln_configs(env, param.dst_eid, &param.config);
+            UlnStorage::set_default_receive_uln_configs(env, param.eid, &param.config);
         }
 
         DefaultUlnReceiveConfigSet { params: params.clone() }.publish(env);

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

@@ -4,7 +4,7 @@ use super::*;
 // ISendLib Contract Implementation
 // ==============================================================================
 
-#[contractimpl(contracttrait)]
+#[contract_impl]
 impl ISendLib for Uln302 {
     /// Quotes the total fee for sending a cross-chain message.
     ///
@@ -81,7 +81,7 @@ impl ISendLib for Uln302 {
 // ISendUln302 Contract Implementation
 // ==============================================================================
 
-#[contractimpl(contracttrait)]
+#[contract_impl]
 impl ISendUln302 for Uln302 {
     /// Sets default executor configurations for multiple destination endpoints.
     #[only_owner]
@@ -98,7 +98,7 @@ impl ISendUln302 for Uln302 {
     fn set_default_send_uln_configs(env: &Env, params: &Vec<SetDefaultUlnConfigParam>) {
         for param in params {
             param.config.validate_default_config(env);
-            UlnStorage::set_default_send_uln_configs(env, param.dst_eid, &param.config);
+            UlnStorage::set_default_send_uln_configs(env, param.eid, &param.config);
         }
         DefaultUlnSendConfigSet { params: params.clone() }.publish(env);
     }

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

@@ -17,8 +17,8 @@ fn test_set_default_receive_uln_configs() {
 
     let oapp_receive_uln_configs = vec![
         &env,
-        SetDefaultUlnConfigParam { dst_eid: 100, config: UlnConfig::generate(&env, 1, 1, 3, 1) },
-        SetDefaultUlnConfigParam { dst_eid: 101, config: UlnConfig::generate(&env, 2, 1, 3, 1) },
+        SetDefaultUlnConfigParam { eid: 100, config: UlnConfig::generate(&env, 1, 1, 3, 1) },
+        SetDefaultUlnConfigParam { eid: 101, config: UlnConfig::generate(&env, 2, 1, 3, 1) },
     ];
 
     env.mock_auths(&[MockAuth {
@@ -37,7 +37,7 @@ fn test_set_default_receive_uln_configs() {
 
     let uln302_receive_client = ReceiveUln302Client::new(&env, &uln302.address);
     for config in oapp_receive_uln_configs.clone() {
-        assert_eq!(uln302_receive_client.default_receive_uln_config(&config.dst_eid), Some(config.config));
+        assert_eq!(uln302_receive_client.default_receive_uln_config(&config.eid), Some(config.config));
     }
 }
 
@@ -47,7 +47,7 @@ fn test_set_default_receive_uln_configs_authorization() {
     let TestSetup { env, uln302, .. } = setup();
 
     let oapp_receive_uln_configs =
-        vec![&env, SetDefaultUlnConfigParam { dst_eid: 100, config: UlnConfig::generate(&env, 1, 1, 3, 1) }];
+        vec![&env, SetDefaultUlnConfigParam { eid: 100, config: UlnConfig::generate(&env, 1, 1, 3, 1) }];
 
     uln302.set_default_receive_uln_configs(&oapp_receive_uln_configs);
 }
@@ -58,7 +58,7 @@ fn test_set_default_receive_uln_configs_assert_default_config() {
 
     let mut config = UlnConfig::generate(&env, 1, 1, 3, 1);
     config.required_dvns.push_back(config.required_dvns.get(0).unwrap().clone());
-    let oapp_receive_uln_configs = vec![&env, SetDefaultUlnConfigParam { dst_eid: 100, config }];
+    let oapp_receive_uln_configs = vec![&env, SetDefaultUlnConfigParam { eid: 100, config }];
 
     env.mock_all_auths();
     let result = uln302.try_set_default_receive_uln_configs(&oapp_receive_uln_configs);

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

@@ -18,8 +18,8 @@ fn test_set_default_send_uln_configs() {
 
     let oapp_send_uln_configs = vec![
         &env,
-        SetDefaultUlnConfigParam { dst_eid: 100, config: UlnConfig::generate(&env, 1, 1, 3, 1) },
-        SetDefaultUlnConfigParam { dst_eid: 101, config: UlnConfig::generate(&env, 2, 1, 3, 1) },
+        SetDefaultUlnConfigParam { eid: 100, config: UlnConfig::generate(&env, 1, 1, 3, 1) },
+        SetDefaultUlnConfigParam { eid: 101, config: UlnConfig::generate(&env, 2, 1, 3, 1) },
     ];
 
     env.mock_auths(&[MockAuth {
@@ -38,7 +38,7 @@ fn test_set_default_send_uln_configs() {
 
     let uln302_send_client = SendUln302Client::new(&env, &uln302.address);
     for config in oapp_send_uln_configs.clone() {
-        assert_eq!(uln302_send_client.default_send_uln_config(&config.dst_eid), Some(config.config));
+        assert_eq!(uln302_send_client.default_send_uln_config(&config.eid), Some(config.config));
     }
 }
 
@@ -48,7 +48,7 @@ fn test_set_default_send_uln_configs_authorization() {
     let TestSetup { env, uln302, .. } = setup();
 
     let oapp_send_uln_configs =
-        vec![&env, SetDefaultUlnConfigParam { dst_eid: 100, config: UlnConfig::generate(&env, 1, 1, 3, 1) }];
+        vec![&env, SetDefaultUlnConfigParam { eid: 100, config: UlnConfig::generate(&env, 1, 1, 3, 1) }];
 
     uln302.set_default_send_uln_configs(&oapp_send_uln_configs);
 }
@@ -59,7 +59,7 @@ fn test_set_default_send_uln_configs_assert_default_config() {
 
     let mut config = UlnConfig::generate(&env, 1, 1, 3, 1);
     config.required_dvns.push_back(config.required_dvns.get(0).unwrap().clone());
-    let oapp_send_uln_configs = vec![&env, SetDefaultUlnConfigParam { dst_eid: 100, config }];
+    let oapp_send_uln_configs = vec![&env, SetDefaultUlnConfigParam { eid: 100, config }];
 
     env.mock_all_auths();
     let result = uln302.try_set_default_send_uln_configs(&oapp_send_uln_configs);

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

@@ -1,6 +1,6 @@
+use common_macros::contract_impl;
 use endpoint_v2::{FeeRecipient, MessageLibClient, MessageLibManagerClient, Origin, SetConfigParam};
 use message_lib_common::interfaces::{ILayerZeroDVN, ILayerZeroExecutor, ILayerZeroTreasury};
-use common_macros::contract_impl;
 use soroban_sdk::{
     contract, log, symbol_short,
     testutils::{Address as _, MockAuth, MockAuthInvoke},
@@ -212,7 +212,7 @@ impl<'a> TestSetup<'a> {
     }
 
     pub fn set_default_send_uln_config(&self, eid: u32, config: UlnConfig) {
-        let params = vec![&self.env, SetDefaultUlnConfigParam { dst_eid: eid, config }];
+        let params = vec![&self.env, SetDefaultUlnConfigParam { eid, config }];
         self.env.mock_auths(&[MockAuth {
             address: &self.owner,
             invoke: &MockAuthInvoke {
@@ -226,7 +226,7 @@ impl<'a> TestSetup<'a> {
     }
 
     pub fn set_default_receive_uln_config(&self, eid: u32, config: UlnConfig) {
-        let params = vec![&self.env, SetDefaultUlnConfigParam { dst_eid: eid, config }];
+        let params = vec![&self.env, SetDefaultUlnConfigParam { eid, config }];
         self.env.mock_auths(&[MockAuth {
             address: &self.owner,
             invoke: &MockAuthInvoke {

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

@@ -23,6 +23,23 @@ pub struct UlnConfig {
 }
 
 impl UlnConfig {
+    /// Creates a new UlnConfig with default values.
+    pub fn default(env: &Env) -> Self {
+        UlnConfig { confirmations: 0, required_dvns: vec![&env], optional_dvns: vec![&env], optional_dvn_threshold: 0 }
+    }
+
+    /// Validates a UlnConfig for using as a default config.
+    ///
+    /// Performs comprehensive validation including:
+    /// - Required DVNs validation (no duplicates, within limits)
+    /// - Optional DVNs validation (no duplicates, within limits, valid threshold)
+    /// - At least one DVN requirement (either required or optional with threshold > 0)
+    pub fn validate_default_config(&self, env: &Env) {
+        self.validate_required_dvns(env);
+        self.validate_optional_dvns(env);
+        self.validate_at_least_one_dvn(env);
+    }
+
     /// Validates the required DVNs configuration.
     ///
     /// Checks:
@@ -50,18 +67,6 @@ impl UlnConfig {
         );
     }
 
-    /// Validates a UlnConfig for using as a default config.
-    ///
-    /// Performs comprehensive validation including:
-    /// - Required DVNs validation (no duplicates, within limits)
-    /// - Optional DVNs validation (no duplicates, within limits, valid threshold)
-    /// - At least one DVN requirement (either required or optional with threshold > 0)
-    pub fn validate_default_config(&self, env: &Env) {
-        self.validate_required_dvns(env);
-        self.validate_optional_dvns(env);
-        self.validate_at_least_one_dvn(env);
-    }
-
     /// Validates that the configuration has at least one DVN for verification.
     ///
     /// A valid configuration must have either:
@@ -97,12 +102,7 @@ impl OAppUlnConfig {
             use_default_confirmations: true,
             use_default_required_dvns: true,
             use_default_optional_dvns: true,
-            uln_config: UlnConfig {
-                confirmations: 0,
-                required_dvns: vec![&env],
-                optional_dvns: vec![&env],
-                optional_dvn_threshold: 0,
-            },
+            uln_config: UlnConfig::default(env),
         }
     }
 
@@ -112,11 +112,9 @@ impl OAppUlnConfig {
     /// - When using defaults, corresponding config values must be empty/zero
     /// - When not using defaults, the provided values must be valid
     pub fn validate_oapp_config(&self, env: &Env) {
-        assert_with_error!(
-            env,
-            !self.use_default_confirmations || self.uln_config.confirmations == 0,
-            Uln302Error::InvalidConfirmations
-        );
+        if self.use_default_confirmations {
+            assert_with_error!(env, self.uln_config.confirmations == 0, Uln302Error::InvalidConfirmations);
+        }
 
         if self.use_default_required_dvns {
             assert_with_error!(env, self.uln_config.required_dvns.is_empty(), Uln302Error::InvalidRequiredDVNs);
@@ -139,11 +137,13 @@ impl OAppUlnConfig {
     pub fn apply_default_config(&self, default_config: &UlnConfig) -> UlnConfig {
         let confirmations =
             if self.use_default_confirmations { default_config.confirmations } else { self.uln_config.confirmations };
+
         let required_dvns = if self.use_default_required_dvns {
             default_config.required_dvns.clone()
         } else {
             self.uln_config.required_dvns.clone()
         };
+
         let (optional_dvns, optional_dvn_threshold) = if self.use_default_optional_dvns {
             (default_config.optional_dvns.clone(), default_config.optional_dvn_threshold)
         } else {
@@ -159,7 +159,7 @@ impl OAppUlnConfig {
 #[derive(Clone, Eq, PartialEq, Debug)]
 pub struct SetDefaultUlnConfigParam {
     /// The destination endpoint ID (for send) or source endpoint ID (for receive).
-    pub dst_eid: u32,
+    pub eid: u32,
     /// The ULN configuration to set as default.
     pub config: UlnConfig,
 }

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

@@ -22,7 +22,7 @@ use message_lib_common::{
 };
 use soroban_sdk::{
     address_payload::AddressPayload,
-    assert_with_error, bytes, contract, contractimpl, panic_with_error, vec,
+    assert_with_error, bytes, contract, panic_with_error, vec,
     xdr::{FromXdr, ToXdr},
     Address, Bytes, BytesN, Env, Map, Vec,
 };
@@ -54,7 +54,7 @@ impl Uln302 {
     }
 }
 
-#[contractimpl(contracttrait)]
+#[contract_impl]
 impl IMessageLib for Uln302 {
     /// Sets OApp-specific configuration parameters for the message library.
     ///

package/contracts/oapp-macros/src/oapp_core.rs

@@ -31,8 +31,8 @@ pub fn generate_impl(name: &Ident, item_struct: ItemStruct, manual_impl_core: bo
     });
 
     quote! {
-        #[common_macros::ownable]
         #[soroban_sdk::contract]
+        #[common_macros::ttl_configurable]
         #item_struct
 
         #manual_impl

package/contracts/oapps/counter/integration_tests/utils.rs

@@ -128,7 +128,7 @@ pub fn lz_compose(env: &Env, chain: &ChainSetup<'_>, executor: &Address, packet:
 pub fn scan_packet_sent_event(env: &Env, endpoint: &Address) -> Option<(Bytes, Bytes, Address)> {
     let mut packet = None;
     for (emitter, topics, data) in env.events().all() {
-        let packet_sent_symbol = Symbol::new(env, "PacketSent").to_val();
+        let packet_sent_symbol = Symbol::new(env, "packet_sent").to_val();
         if emitter == *endpoint && topics.contains(packet_sent_symbol) {
             let map: Map<Symbol, Val> = data.into_val(env);
 

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

@@ -1,6 +1,6 @@
-use common_macros::{event, only_owner, storage};
+use common_macros::{only_owner, storage};
 use endpoint_v2::LayerZeroEndpointV2Client;
-use soroban_sdk::{contracttrait, Address, BytesN, Env};
+use soroban_sdk::{contractevent, contracttrait, Address, BytesN, Env};
 use utils::ownable::Ownable;
 use utils::ownable::OwnableInitializer;
 
@@ -30,7 +30,8 @@ pub enum OAppCoreStorage {
     Peer { eid: u32 },
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct PeerSet {
     pub eid: u32,
     pub peer: Option<BytesN<32>>,

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

@@ -1,6 +1,6 @@
 use crate::errors::OAppError;
-use common_macros::{event, only_owner, storage};
-use soroban_sdk::{assert_with_error, contracttrait, contracttype, panic_with_error, Bytes, Env, Vec};
+use common_macros::{only_owner, storage};
+use soroban_sdk::{assert_with_error, contractevent, contracttrait, contracttype, panic_with_error, Bytes, Env, Vec};
 use utils::ownable::Ownable;
 
 pub const OPTION_TYPE3: u32 = 3;
@@ -20,7 +20,8 @@ pub enum OAppOptionsType3Storage {
     EnforcedOptions { eid: u32, msg_type: u32 },
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct EnforcedOptionSet {
     pub enforced_option_params: Vec<EnforcedOptionParam>,
 }

package/contracts/oapps/oft/integration-tests/setup.rs

@@ -29,8 +29,8 @@ pub struct TestOFT;
 
 #[contract_impl]
 impl TestOFT {
-    pub fn __constructor(env: &Env, token: &Address, owner: &Address, endpoint: &Address, delegate: &Option<Address>) {
-        oft_initialize::<Self>(env, owner, token, endpoint, delegate)
+    pub fn __constructor(env: &Env, token: &Address, owner: &Address, endpoint: &Address, delegate: &Option<Address>, shared_decimals: u32) {
+        oft_initialize::<Self>(env, owner, token, endpoint, delegate, shared_decimals)
     }
 }
 
@@ -153,7 +153,8 @@ fn setup_chain<'a>(env: &Env) -> ChainSetup<'a> {
     let fee_recipient = Address::generate(env);
     let sml_address = env.register(SimpleMessageLib, (&owner, &endpoint_address, &fee_recipient));
     let delegate: Option<Address> = Some(owner.clone());
-    let oft_address = env.register(TestOFT, (&oft_token, &owner, &endpoint_address, &delegate));
+    let shared_decimals: u32 = 6; // Default shared decimals
+    let oft_address = env.register(TestOFT, (&oft_token, &owner, &endpoint_address, &delegate, &shared_decimals));
     let composer_address = env.register(DummyComposer, (&endpoint_address,));
 
     let endpoint = EndpointV2Client::new(env, &endpoint_address);

package/contracts/oapps/oft/integration-tests/utils.rs

@@ -157,7 +157,7 @@ pub fn lz_compose(
 pub fn scan_packet_sent_event(env: &Env, endpoint: &Address) -> Option<(Bytes, Bytes, Address)> {
     let mut packet = None;
     for (emitter, topics, data) in env.events().all() {
-        let packet_sent_symbol = Symbol::new(env, "PacketSent").to_val();
+        let packet_sent_symbol = Symbol::new(env, "packet_sent").to_val();
         if emitter == *endpoint && topics.contains(packet_sent_symbol) {
             let map: Map<Symbol, Val> = data.into_val(env);