@layerzerolabs/protocol-stellar-v2 0.2.11 → 0.2.13

package/Cargo.lock

@@ -223,7 +223,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "block-message-lib"
+name = "blocked-message-lib"
 version = "0.0.1"
 dependencies = [
  "common-macros",

package/contracts/common-macros/src/lib.rs

@@ -2,23 +2,22 @@
 //!
 //! This crate provides foundational macros for Stellar contract development:
 //! - **Storage macros** - Strongly-typed contract storage API generation
-//! - **Event macros** - Contract event generation with proper derives
 //! - **Error macros** - Contract error enum generation
 //! - **Ownable macros** - Owner-based access control implementation
+//! - **TTL macros** - Time-to-live configuration and automatic extension
 //!
 //! # Quick Links
 //! - [`storage`] - Storage enum to API macro
-//! - [`event`] - Event struct generation macro
 //! - [`contract_error`] - Error enum generation macro
 //! - [`ownable`] - Ownable trait implementation macro
 //! - [`only_owner`] - Owner-only access control attribute macro
-//!
+//! - [`ttl_configurable`] - TTL configuration with freeze support
+//! - [`contract_impl`] - Contract impl with automatic instance TTL extension
 //!
 use proc_macro::TokenStream;
 
 mod contract_impl;
 mod error;
-mod event;
 mod ownable;
 mod storage;
 mod ttl_configurable;
@@ -86,38 +85,6 @@ pub fn storage(attr: TokenStream, item: TokenStream) -> TokenStream {
     storage::generate_storage(attr.into(), item.into()).into()
 }
 
-// ============================================================================
-// Event Macro
-// ============================================================================
-
-/// Generates a contract event struct with necessary derives.
-///
-/// Combines `#[contractevent]` from soroban-sdk with standard derives
-/// required for events (Clone, Debug, Eq, PartialEq).
-///
-/// Automatically uses the struct name as the topic.
-///
-/// # Example
-/// ```ignore
-/// #[event]
-/// pub struct MyEvent {
-///     pub data: u32,
-/// }
-/// ```
-///
-/// Generated code:
-/// ```ignore
-/// #[contractevent(topics = ["MyEvent"])]
-/// #[derive(Clone, Debug, Eq, PartialEq)]
-/// pub struct MyEvent {
-///     pub data: u32,
-/// }
-/// ```
-#[proc_macro_attribute]
-pub fn event(attr: TokenStream, item: TokenStream) -> TokenStream {
-    event::generate_event(attr.into(), item.into()).into()
-}
-
 // ============================================================================
 // Error Macro
 // ============================================================================

package/contracts/endpoint-v2/src/endpoint_v2.rs

@@ -5,10 +5,10 @@ use crate::{
     },
     errors::EndpointError,
     events::{
-        ComposeDelivered, ComposeSent, DefaultReceiveLibrarySet, DefaultReceiveLibraryTimeoutSet,
-        DefaultSendLibrarySet, DelegateSet, InboundNonceSkipped, LibraryRegistered, LzComposeAlert, LzReceiveAlert,
-        PacketBurnt, PacketDelivered, PacketNilified, PacketSent, PacketVerified, ReceiveLibrarySet,
-        ReceiveLibraryTimeoutSet, SendLibrarySet, ZROSet,
+        ComposeDelivered, ComposeSent, DefaultReceiveLibTimeoutSet, DefaultReceiveLibrarySet, DefaultSendLibrarySet,
+        DelegateSet, InboundNonceSkipped, LibraryRegistered, LzComposeAlert, LzReceiveAlert, PacketBurnt,
+        PacketDelivered, PacketNilified, PacketSent, PacketVerified, ReceiveLibrarySet, ReceiveLibraryTimeoutSet,
+        SendLibrarySet, ZROSet,
     },
     interfaces::{ILayerZeroEndpointV2, IMessageLibManager, IMessagingChannel, MessagingFee, MessagingReceipt, Origin},
     storage::EndpointStorage,

package/contracts/endpoint-v2/src/events.rs

@@ -1,19 +1,20 @@
 use crate::{Origin, Timeout};
-use common_macros::event;
-use soroban_sdk::{Address, Bytes, BytesN};
+use soroban_sdk::{contractevent, Address, Bytes, BytesN};
 
 // ============================================================================
 // EndpointV2 Events
 // ============================================================================
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct PacketSent {
     pub encoded_packet: Bytes,
     pub options: Bytes,
     pub send_library: Address,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct PacketVerified {
     #[topic]
     pub origin: Origin,
@@ -22,7 +23,8 @@ pub struct PacketVerified {
     pub payload_hash: BytesN<32>,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct PacketDelivered {
     #[topic]
     pub origin: Origin,
@@ -30,7 +32,8 @@ pub struct PacketDelivered {
     pub receiver: Address,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct LzReceiveAlert {
     #[topic]
     pub receiver: Address,
@@ -47,12 +50,14 @@ pub struct LzReceiveAlert {
     pub reason: Bytes,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ZROSet {
     pub zro: Address,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct DelegateSet {
     #[topic]
     pub oapp: Address,
@@ -63,7 +68,8 @@ pub struct DelegateSet {
 // Messaging Channel Events
 // ============================================================================
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct InboundNonceSkipped {
     #[topic]
     pub src_eid: u32,
@@ -75,7 +81,8 @@ pub struct InboundNonceSkipped {
     pub nonce: u64,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct PacketNilified {
     #[topic]
     pub src_eid: u32,
@@ -88,7 +95,8 @@ pub struct PacketNilified {
     pub payload_hash: Option<BytesN<32>>,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct PacketBurnt {
     #[topic]
     pub src_eid: u32,
@@ -105,33 +113,38 @@ pub struct PacketBurnt {
 // Message Lib Manager Events
 // ============================================================================
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct LibraryRegistered {
     pub new_lib: Address,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct DefaultSendLibrarySet {
     #[topic]
     pub dst_eid: u32,
     pub new_lib: Address,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct DefaultReceiveLibrarySet {
     #[topic]
     pub src_eid: u32,
     pub new_lib: Address,
 }
 
-#[event]
-pub struct DefaultReceiveLibraryTimeoutSet {
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct DefaultReceiveLibTimeoutSet {
     #[topic]
     pub src_eid: u32,
     pub timeout: Option<Timeout>,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct SendLibrarySet {
     #[topic]
     pub sender: Address,
@@ -140,7 +153,8 @@ pub struct SendLibrarySet {
     pub new_lib: Option<Address>,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ReceiveLibrarySet {
     #[topic]
     pub receiver: Address,
@@ -149,7 +163,8 @@ pub struct ReceiveLibrarySet {
     pub new_lib: Option<Address>,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ReceiveLibraryTimeoutSet {
     #[topic]
     pub receiver: Address,
@@ -162,7 +177,8 @@ pub struct ReceiveLibraryTimeoutSet {
 // Message Composer Events
 // ============================================================================
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ComposeSent {
     #[topic]
     pub from: Address,
@@ -175,7 +191,8 @@ pub struct ComposeSent {
     pub message: Bytes,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ComposeDelivered {
     #[topic]
     pub from: Address,
@@ -187,7 +204,8 @@ pub struct ComposeDelivered {
     pub index: u32,
 }
 
-#[event]
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct LzComposeAlert {
     #[topic]
     pub from: Address,

package/contracts/endpoint-v2/src/interfaces/message_lib.rs

@@ -1,5 +1,5 @@
 use crate::SetConfigParam;
-use soroban_sdk::{contracttrait, contracttype, Address, Bytes, Env, Vec};
+use soroban_sdk::{contractclient, contracttype, Address, Bytes, Env, Vec};
 
 /// Type of message library indicating supported operations.
 #[contracttype]
@@ -30,7 +30,7 @@ pub struct MessageLibVersion {
 }
 
 /// Interface for message libraries that handle cross-chain message verification and delivery.
-#[contracttrait(client_name = "MessageLibClient")]
+#[contractclient(name = "MessageLibClient")]
 pub trait IMessageLib {
     /// Sets the configuration for an OApp by the Endpoint.
     ///

package/contracts/endpoint-v2/src/interfaces/message_lib_manager.rs

@@ -1,4 +1,4 @@
-use soroban_sdk::{contracttrait, contracttype, Address, Bytes, Env, Vec};
+use soroban_sdk::{contractclient, contracttype, Address, Bytes, Env, Vec};
 
 /// Timeout configuration for receive library transitions.
 #[contracttype]
@@ -45,7 +45,7 @@ pub struct ResolvedLibrary {
 }
 
 /// EndpointV2's Interface for managing message libraries.
-#[contracttrait(client_name = "MessageLibManagerClient")]
+#[contractclient(name = "MessageLibManagerClient")]
 pub trait IMessageLibManager {
     /// Registers a new message library with the endpoint.
     ///

package/contracts/endpoint-v2/src/interfaces/messaging_channel.rs

@@ -1,7 +1,7 @@
-use soroban_sdk::{contracttrait, Address, BytesN, Env};
+use soroban_sdk::{contractclient, Address, BytesN, Env};
 
 /// EndpointV2's Interface for managing messaging channels, nonces, and payload hashes.
-#[contracttrait(client_name = "MessagingChannelClient")]
+#[contractclient(name = "MessagingChannelClient")]
 pub trait IMessagingChannel {
     /// Skips the next expected inbound nonce without verifying.
     ///

package/contracts/endpoint-v2/src/interfaces/messaging_composer.rs

@@ -1,7 +1,7 @@
-use soroban_sdk::{contracttrait, Address, Bytes, BytesN, Env};
+use soroban_sdk::{contractclient, Address, Bytes, BytesN, Env};
 
 /// EndpointV2's Interface for managing composed messages between OApps and composers.
-#[contracttrait(client_name = "MessagingComposerClient")]
+#[contractclient(name = "MessagingComposerClient")]
 pub trait IMessagingComposer {
     /// Sends a composed message from an OApp to a composer.
     /// The OApp can send compose to multiple composers with the same GUID.

package/contracts/endpoint-v2/src/interfaces/send_lib.rs

@@ -1,5 +1,5 @@
 use super::{IMessageLib, MessagingFee};
-use soroban_sdk::{contracttrait, contracttype, Address, Bytes, BytesN, Env, Vec};
+use soroban_sdk::{contractclient, contracttype, Address, Bytes, BytesN, Env, Vec};
 
 /// Outbound packet containing all information for cross-chain transmission.
 #[contracttype]
@@ -44,7 +44,7 @@ pub struct FeesAndPacket {
 }
 
 /// Interface for send libraries that handle outbound message encoding and fee calculation.
-#[contracttrait(client_name = "SendLibClient")]
+#[contractclient(name = "SendLibClient")]
 pub trait ISendLib: IMessageLib {
     /// Quotes the fee for sending a packet without actually sending.
     ///

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

@@ -1,6 +1,6 @@
 use super::*;
 
-#[contract_impl(contracttrait)]
+#[contract_impl]
 impl IMessageLibManager for EndpointV2 {
     /// Registers a new message library with the endpoint.
     #[only_owner]
@@ -56,7 +56,7 @@ impl IMessageLibManager for EndpointV2 {
             None
         };
         EndpointStorage::set_or_remove_default_receive_library_timeout(env, src_eid, &timeout);
-        DefaultReceiveLibraryTimeoutSet { src_eid, timeout: timeout.clone() }.publish(env);
+        DefaultReceiveLibTimeoutSet { src_eid, timeout: timeout.clone() }.publish(env);
     }
 
     /// Sets or removes the default receive library timeout for a source endpoint.
@@ -70,7 +70,7 @@ impl IMessageLibManager for EndpointV2 {
             assert_with_error!(env, !t.is_expired(env), EndpointError::InvalidExpiry);
         }
         EndpointStorage::set_or_remove_default_receive_library_timeout(env, src_eid, timeout);
-        DefaultReceiveLibraryTimeoutSet { src_eid, timeout: timeout.clone() }.publish(env);
+        DefaultReceiveLibTimeoutSet { src_eid, timeout: timeout.clone() }.publish(env);
     }
 
     // ============================================================================================

package/contracts/endpoint-v2/src/messaging_channel.rs

@@ -1,6 +1,6 @@
 use super::*;
 
-#[contract_impl(contracttrait)]
+#[contract_impl]
 impl IMessagingChannel for EndpointV2 {
     /// Skips the next expected inbound nonce without verifying.
     ///

package/contracts/endpoint-v2/src/messaging_composer.rs

@@ -1,6 +1,6 @@
 use super::*;
 
-#[contract_impl(contracttrait)]
+#[contract_impl]
 impl IMessagingComposer for EndpointV2 {
     /// Sends a composed message from an OApp to a composer.
     ///

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
 // ============================================================================================
 
-#[contract_impl(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
 // ==============================================================================
 
-#[contract_impl(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
 // ==============================================================================
 
-#[contract_impl(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);
     }