@layerzerolabs/protocol-stellar-v2 0.2.8 → 0.2.9

package/contracts/message-libs/simple-message-lib/src/simple_message_lib.rs

@@ -1,21 +1,18 @@
 use crate::{errors::SimpleMessageLibError, storage::SmlStorage};
-use common_macros::ttl_configurable;
+use common_macros::{contract_impl, only_owner, ttl_configurable};
 use endpoint_v2::{
     FeeRecipient, FeesAndPacket, IMessageLib, ISendLib, LayerZeroEndpointV2Client, MessageLibType, MessageLibVersion,
     MessagingFee, Origin, OutboundPacket, SetConfigParam,
 };
 use message_lib_common::packet_codec_v1;
-use soroban_sdk::{
-    address_payload::AddressPayload, assert_with_error, contract, contractimpl, panic_with_error, vec, Address, Bytes,
-    BytesN, Env, Vec,
-};
+use soroban_sdk::{address_payload::AddressPayload, contract, panic_with_error, vec, Address, Bytes, BytesN, Env, Vec};
 use utils::ownable::Ownable;
 
 #[contract]
 #[ttl_configurable]
 pub struct SimpleMessageLib;
 
-#[contractimpl]
+#[contract_impl]
 impl SimpleMessageLib {
     pub fn __constructor(env: &Env, owner: &Address, endpoint: &Address, fee_recipient: &Address) {
         let endpoint_client = LayerZeroEndpointV2Client::new(env, endpoint);
@@ -27,52 +24,71 @@ impl SimpleMessageLib {
         SmlStorage::set_native_fee(env, &100_i128);
         SmlStorage::set_fee_recipient(env, fee_recipient);
         SmlStorage::set_whitelisted_caller(env, owner);
-        Self::__init_owner(env, owner);
+
+        Self::init_owner(env, owner);
     }
 
-    pub fn validate_packet(env: Env, caller: Address, header_bytes: Bytes, payload_hash: BytesN<32>) {
-        caller.require_auth();
-        assert_with_error!(
-            env,
-            Some(caller) == SmlStorage::whitelisted_caller(&env),
-            SimpleMessageLibError::OnlyWhitelistedCaller
-        );
+    pub fn validate_packet(env: &Env, header_bytes: Bytes, payload_hash: BytesN<32>) {
+        Self::whitelisted_caller(env).require_auth();
 
-        let header = packet_codec_v1::decode_packet_header(&env, &header_bytes);
+        let header = packet_codec_v1::decode_packet_header(env, &header_bytes);
         let origin = Origin { src_eid: header.src_eid, sender: header.sender, nonce: header.nonce };
 
-        let receiver = Address::from_payload(&env, AddressPayload::ContractIdHash(header.receiver)); // Enforce receiver is a contract address
-        Self::endpoint_client(&env).verify(&env.current_contract_address(), &origin, &receiver, &payload_hash);
+        // Enforce receiver is a contract address
+        let receiver = Address::from_payload(env, AddressPayload::ContractIdHash(header.receiver));
+        Self::endpoint_client(env).verify(&env.current_contract_address(), &origin, &receiver, &payload_hash);
     }
 
-    // === View Functions ===
+    // ============================================================================================
+    // Admin Manager
+    // ============================================================================================
 
-    pub fn fee_recipient(env: &Env) -> Address {
-        SmlStorage::fee_recipient(env).unwrap()
+    #[only_owner]
+    pub fn set_fee_recipient(env: &Env, fee_recipient: &Address) {
+        SmlStorage::set_fee_recipient(env, fee_recipient);
     }
 
-    pub fn native_fee(env: &Env) -> i128 {
-        SmlStorage::native_fee(env).unwrap()
+    #[only_owner]
+    pub fn set_native_fee(env: &Env, native_fee: &i128) {
+        SmlStorage::set_native_fee(env, native_fee);
     }
 
-    pub fn zro_fee(env: &Env) -> i128 {
-        SmlStorage::zro_fee(env).unwrap()
+    #[only_owner]
+    pub fn set_zro_fee(env: &Env, zro_fee: &i128) {
+        SmlStorage::set_zro_fee(env, zro_fee);
     }
 
-    pub fn whitelisted_caller(env: &Env) -> Address {
-        SmlStorage::whitelisted_caller(env).unwrap()
+    #[only_owner]
+    pub fn set_whitelisted_caller(env: &Env, whitelisted_caller: &Address) {
+        SmlStorage::set_whitelisted_caller(env, whitelisted_caller);
     }
 
+    // ============================================================================================
+    // View Functions
+    // ============================================================================================
+
     pub fn endpoint(env: &Env) -> Address {
         SmlStorage::endpoint(env).unwrap()
     }
 
-    pub fn eid(env: &Env) -> u32 {
+    pub fn local_eid(env: &Env) -> u32 {
         SmlStorage::local_eid(env).unwrap()
     }
 
-    pub fn treasury(env: &Env) -> Address {
-        SmlStorage::treasury(env).unwrap()
+    pub fn native_fee(env: &Env) -> i128 {
+        SmlStorage::native_fee(env).unwrap()
+    }
+
+    pub fn zro_fee(env: &Env) -> i128 {
+        SmlStorage::zro_fee(env).unwrap()
+    }
+
+    pub fn fee_recipient(env: &Env) -> Address {
+        SmlStorage::fee_recipient(env).unwrap()
+    }
+
+    pub fn whitelisted_caller(env: &Env) -> Address {
+        SmlStorage::whitelisted_caller(env).unwrap()
     }
 
     // ==== Internal helpers ====
@@ -86,7 +102,7 @@ impl SimpleMessageLib {
     }
 }
 
-#[contractimpl]
+#[contract_impl]
 impl IMessageLib for SimpleMessageLib {
     fn get_config(env: &Env, _eid: u32, _oapp: &Address, _config_type: u32) -> Bytes {
         panic_with_error!(env, SimpleMessageLibError::NotImplemented);
@@ -109,7 +125,7 @@ impl IMessageLib for SimpleMessageLib {
     }
 }
 
-#[contractimpl]
+#[contract_impl]
 impl ISendLib for SimpleMessageLib {
     fn quote(env: &Env, _packet: &OutboundPacket, _options: &Bytes, pay_in_zro: bool) -> MessagingFee {
         MessagingFee { native_fee: Self::native_fee(env), zro_fee: if pay_in_zro { Self::zro_fee(env) } else { 0 } }
@@ -119,12 +135,11 @@ impl ISendLib for SimpleMessageLib {
         Self::require_endpoint_auth(env);
 
         let native_fee_recipients =
-            vec![env, FeeRecipient { address: Self::fee_recipient(env), amount: Self::native_fee(env) }];
+            vec![env, FeeRecipient { to: Self::fee_recipient(env), amount: Self::native_fee(env) }];
 
         let mut zro_fee_recipients = vec![env];
         if pay_in_zro {
-            zro_fee_recipients
-                .push_back(FeeRecipient { address: Self::fee_recipient(env), amount: Self::zro_fee(env) });
+            zro_fee_recipients.push_back(FeeRecipient { to: Self::fee_recipient(env), amount: Self::zro_fee(env) });
         }
 
         FeesAndPacket {

package/contracts/message-libs/simple-message-lib/src/storage.rs

@@ -1,23 +1,19 @@
 use common_macros::storage;
 use soroban_sdk::Address;
-use utils::ttl::DefaultTtlConfigProvider;
 
-#[storage(DefaultTtlConfigProvider)]
+#[storage]
 pub enum SmlStorage {
     #[instance(Address)]
     Endpoint,
 
-    #[instance(Address)]
-    Treasury,
-
     #[instance(u32)]
-    LocalEID,
+    LocalEid,
 
     #[instance(i128)]
     NativeFee,
 
     #[instance(i128)]
-    ZROFee,
+    ZroFee,
 
     #[instance(Address)]
     FeeRecipient,

package/contracts/message-libs/simple-message-lib/src/test.rs

@@ -166,7 +166,7 @@ fn test_send_returns_native_fee_recipient() {
     assert_eq!(send_result.zro_fee_recipients.len(), 0);
 
     let native_recipient = send_result.native_fee_recipients.get(0).unwrap();
-    assert_eq!(native_recipient.address, fee_recipient);
+    assert_eq!(native_recipient.to, fee_recipient);
     assert_eq!(native_recipient.amount, 100); // native_fee from setup
 }
 
@@ -209,11 +209,11 @@ fn test_send_returns_both_fee_recipients_with_zro() {
     assert_eq!(send_result.zro_fee_recipients.len(), 1);
 
     let native_recipient = send_result.native_fee_recipients.get(0).unwrap();
-    assert_eq!(native_recipient.address, fee_recipient);
+    assert_eq!(native_recipient.to, fee_recipient);
     assert_eq!(native_recipient.amount, 100); // native_fee
 
     let zro_recipient = send_result.zro_fee_recipients.get(0).unwrap();
-    assert_eq!(zro_recipient.address, fee_recipient);
+    assert_eq!(zro_recipient.to, fee_recipient);
     assert_eq!(zro_recipient.amount, 99); // zro_fee from setup
 }
 

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

@@ -1,8 +1,7 @@
 use common_macros::storage;
 use soroban_sdk::Address;
-use utils::ttl::DefaultTtlConfigProvider;
 
-#[storage(DefaultTtlConfigProvider)]
+#[storage]
 pub enum TreasuryStorage {
     /// Native fee in basis points (0-10000, where 10000 = 100%)
     #[instance(u32)]

package/contracts/message-libs/treasury/src/tests/setup.rs

@@ -1,5 +1,6 @@
+use common_macros::contract_impl;
 use soroban_sdk::{
-    contract, contractimpl,
+    contract,
     testutils::{Address as _, MockAuth, MockAuthInvoke},
     token, Address, Env, IntoVal, Val, Vec,
 };
@@ -18,7 +19,7 @@ pub const BPS_DENOMINATOR: u32 = 10000;
 #[contract]
 pub struct DummyContract;
 
-#[contractimpl]
+#[contract_impl]
 impl DummyContract {
     pub fn __constructor(_env: &Env) {}
 }

package/contracts/message-libs/treasury/src/tests/treasury_tests.rs

@@ -145,19 +145,6 @@ fn test_set_zro_fee_lib() {
     assert!(setup.treasury.zro_fee_lib().is_none());
 }
 
-#[test]
-fn test_set_zro_fee_lib_invalid_address() {
-    let setup = setup();
-
-    // Generate an address that doesn't exist (won't pass .exists() check)
-    let non_existent_lib = soroban_sdk::Address::generate(&setup.env);
-
-    // Try to set non-existent fee lib
-    setup.mock_owner_auth("set_zro_fee_lib", (&Some(non_existent_lib.clone()),));
-    let result = setup.treasury.try_set_zro_fee_lib(&Some(non_existent_lib));
-    assert_eq!(result.err().unwrap().ok().unwrap(), TreasuryError::InvalidZROFeeLib.into());
-}
-
 // ============================================================================
 // Edge Cases & Boundary Tests
 // ============================================================================

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

@@ -4,9 +4,9 @@ use crate::{
     interfaces::ZROFeeLibClient,
     storage::TreasuryStorage,
 };
-use common_macros::{only_owner, ttl_configurable};
-use message_lib_common::ILayerZeroTreasury;
-use soroban_sdk::{assert_with_error, contract, contractimpl, token::Client, Address, Env, Executable};
+use common_macros::{contract_impl, only_owner, ttl_configurable};
+use message_lib_common::interfaces::ILayerZeroTreasury;
+use soroban_sdk::{assert_with_error, contract, token::Client, Address, Env};
 use utils::option_ext::OptionExt;
 
 /// Denominator for basis point calculations (10000 = 100%).
@@ -16,13 +16,15 @@ const BPS_DENOMINATOR: u32 = 10000;
 #[ttl_configurable]
 pub struct Treasury;
 
-#[contractimpl]
+#[contract_impl]
 impl Treasury {
     pub fn __constructor(env: &Env, owner: &Address) {
-        Self::__init_owner(env, owner);
+        Self::init_owner(env, owner);
     }
 
-    // ===== Admin Functions =====
+    // ============================================================================================
+    // Owner Management Functions
+    // ============================================================================================
 
     /// Sets the native fee percentage in basis points.
     ///
@@ -51,16 +53,7 @@ impl Treasury {
     /// * `zro_fee_lib` - The ZRO fee library contract address, or `None` to remove
     #[only_owner]
     pub fn set_zro_fee_lib(env: &Env, zro_fee_lib: &Option<Address>) {
-        if let Some(ref lib) = zro_fee_lib {
-            assert_with_error!(
-                env,
-                matches!(lib.executable(), Some(Executable::Wasm(_))),
-                TreasuryError::InvalidZROFeeLib
-            );
-            TreasuryStorage::set_zro_fee_lib(env, lib);
-        } else {
-            TreasuryStorage::remove_zro_fee_lib(env);
-        }
+        TreasuryStorage::set_or_remove_zro_fee_lib(env, zro_fee_lib);
         ZROFeeLibSet { zro_fee_lib: zro_fee_lib.clone() }.publish(env);
     }
 
@@ -80,7 +73,9 @@ impl Treasury {
         TokenWithdrawn { token: token.clone(), to: to.clone(), amount }.publish(env);
     }
 
-    // ===== View Functions =====
+    // ============================================================================================
+    // View Functions
+    // ============================================================================================
 
     /// Returns the native fee percentage in basis points.
     pub fn native_fee_bp(env: &Env) -> u32 {
@@ -97,7 +92,9 @@ impl Treasury {
         TreasuryStorage::zro_fee_lib(env)
     }
 
-    // ===== Internal Functions =====
+    // ============================================================================================
+    // Internal Functions
+    // ============================================================================================
 
     /// Calculates the treasury fee based on the total native fee and configured basis points.
     fn calculate_native_fee(env: &Env, total_native_fee: i128) -> i128 {
@@ -105,7 +102,7 @@ impl Treasury {
     }
 
     /// Returns the ZRO fee library client, panics if not set.
-    fn get_zro_fee_lib_client(env: &Env) -> ZROFeeLibClient<'static> {
+    fn expect_zro_fee_lib_client(env: &Env) -> ZROFeeLibClient<'static> {
         let fee_lib = Self::zro_fee_lib(env).unwrap_or_panic(env, TreasuryError::ZROFeeLibNotSet);
         ZROFeeLibClient::new(env, &fee_lib)
     }
@@ -115,7 +112,7 @@ impl Treasury {
 // ILayerZeroTreasury Implementation
 // ============================================================================
 
-#[contractimpl]
+#[contract_impl]
 impl ILayerZeroTreasury for Treasury {
     /// Get the treasury fee for a cross-chain message.
     ///
@@ -130,7 +127,7 @@ impl ILayerZeroTreasury for Treasury {
         let native_treasury_fee = Self::calculate_native_fee(env, total_native_fee);
         if pay_in_zro {
             let zro_fee =
-                Self::get_zro_fee_lib_client(env).get_fee(sender, &dst_eid, &total_native_fee, &native_treasury_fee);
+                Self::expect_zro_fee_lib_client(env).get_fee(sender, &dst_eid, &total_native_fee, &native_treasury_fee);
             assert_with_error!(env, zro_fee >= 0, TreasuryError::InvalidZROFee);
             zro_fee
         } else {

package/contracts/message-libs/uln-302/Cargo.toml

@@ -24,5 +24,6 @@ message-lib-common = { workspace = true }
 
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
+endpoint-v2 = { workspace = true, features = ["testutils"] }
 message-lib-common = { workspace = true, features = ["testutils"] }
 utils = { workspace = true, features = ["testutils"] }

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

@@ -1,5 +1,5 @@
-pub mod receive;
-pub mod send;
+mod receive_uln;
+mod send_uln;
 
-pub use receive::*;
-pub use send::*;
+pub use receive_uln::*;
+pub use send_uln::*;

package/contracts/message-libs/uln-302/src/interfaces/{receive.rs → receive_uln.rs}

@@ -1,10 +1,10 @@
-use crate::interfaces::{OAppUlnConfig, SetDefaultUlnConfigParam, UlnConfig};
-use soroban_sdk::{contractclient, Address, Bytes, BytesN, Env, Vec};
+use crate::types::{OAppUlnConfig, SetDefaultUlnConfigParam, UlnConfig};
+use soroban_sdk::{contracttrait, Address, Bytes, BytesN, Env, Vec};
 
 /// Interface for ULN302 receive library functions.
 ///
 /// Handles DVN verification and message commitment on the receiving chain.
-#[contractclient(name = "ReceiveUln302Client")]
+#[contracttrait(client_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.rs → send_uln.rs}

@@ -1,90 +1,18 @@
+pub use crate::types::{
+    ExecutorConfig, OAppExecutorConfig, OAppUlnConfig, SetDefaultExecutorConfigParam, SetDefaultUlnConfigParam,
+    UlnConfig,
+};
 use endpoint_v2::ISendLib;
-use soroban_sdk::{contractclient, contracttype, Address, Env, Vec};
+use soroban_sdk::{contracttrait, Address, Env, Vec};
 
-// ================================================
-// 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,
-}
-
-/// 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,
-}
-
-/// 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,
-}
-
-/// 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>,
-}
-
-/// 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,
-}
-
-// ================================================
+// ============================================================================================
 // ISendUln302 Trait
-// ================================================
+// ============================================================================================
 
 /// Interface for ULN302 send library functions.
 ///
 /// Extends `ISendLib` with ULN-specific configuration management for executors and DVNs.
-#[contractclient(name = "SendUln302Client")]
+#[contracttrait(client_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/lib.rs

@@ -1,17 +1,18 @@
 #![no_std]
 
+mod errors;
+pub mod events;
 mod interfaces;
+mod types;
 
+pub use errors::*;
 pub use interfaces::*;
+pub use types::*;
 
 cfg_if::cfg_if! {
     if #[cfg(any(not(feature = "library"), feature = "testutils"))] {
-        mod config_validation;
-        mod errors;
-        mod events;
         mod storage;
         mod uln302;
-
         pub use uln302::{Uln302, Uln302Client};
     }
 }

package/contracts/message-libs/uln-302/src/{receive.rs → receive_uln.rs}

@@ -1,8 +1,10 @@
-// ================================================
+use super::*;
+
+// ============================================================================================
 // IReceiveUln302 Contract Implementation
-// ================================================
+// ============================================================================================
 
-#[contractimpl]
+#[contractimpl(contracttrait)]
 impl IReceiveUln302 for Uln302 {
     /// Called by a DVN to verify a message with a specific number of block confirmations.
     ///
@@ -49,7 +51,9 @@ impl IReceiveUln302 for Uln302 {
         LayerZeroEndpointV2Client::new(env, &Self::endpoint(env)).verify(&send_lib, &origin, &receiver, payload_hash);
     }
 
-    // === Owner Set Config Functions ===
+    // ============================================================================================
+    // Owner Set Config Functions
+    // ============================================================================================
 
     /// Sets default receive ULN configurations for multiple source endpoints.
     ///
@@ -64,7 +68,9 @@ impl IReceiveUln302 for Uln302 {
         DefaultUlnReceiveConfigSet { params: params.clone() }.publish(env);
     }
 
-    // === View Functions ===
+    // ============================================================================================
+    // View Functions
+    // ============================================================================================
 
     /// Returns the number of block confirmations a DVN has submitted for a specific message.
     fn confirmations(env: &Env, dvn: &Address, header_hash: &BytesN<32>, payload_hash: &BytesN<32>) -> Option<u64> {
@@ -99,13 +105,11 @@ impl IReceiveUln302 for Uln302 {
     }
 }
 
-// ================================================
+// ============================================================================================
 // Internal Functions
-// ================================================
+// ============================================================================================
 
 impl Uln302 {
-    // === OApp Set Config Functions ===
-
     /// Sets OApp-specific receive ULN config.
     ///
     /// # Arguments
@@ -115,7 +119,7 @@ impl Uln302 {
     ///
     /// # Panics
     /// Panics if the final effective config is invalid.
-    fn set_receive_uln_config(env: &Env, receiver: &Address, src_eid: u32, config: &OAppUlnConfig) {
+    pub(super) fn set_receive_uln_config(env: &Env, receiver: &Address, src_eid: u32, config: &OAppUlnConfig) {
         config.validate_oapp_config(env);
 
         UlnStorage::set_oapp_receive_uln_configs(env, receiver, src_eid, config);
@@ -125,7 +129,9 @@ impl Uln302 {
         UlnReceiveConfigSet { receiver: receiver.clone(), src_eid, config: config.clone() }.publish(env);
     }
 
-    // === Verification Helpers Functions ===
+    // ============================================================================================
+    // Verification Helpers Functions
+    // ============================================================================================
 
     /// Validates packet header and extracts header, header hash, and effective ULN config.
     fn validate_and_extract_param(env: &Env, packet_header: &Bytes) -> (PacketHeader, BytesN<32>, UlnConfig) {
@@ -189,7 +195,9 @@ impl Uln302 {
         Self::confirmations(env, dvn, header_hash, payload_hash).map(|c| c >= confirmations).unwrap_or(false)
     }
 
-    // === Helper Functions ===
+    // ============================================================================================
+    // Helper Functions
+    // ============================================================================================
 
     /// Returns default receive ULN config or panics if not found.
     fn expect_default_receive_uln_config(env: &Env, src_eid: u32) -> UlnConfig {