@layerzerolabs/protocol-stellar-v2 0.2.19 → 0.2.21

package/contracts/workers/executor-fee-lib/src/executor_fee_lib.rs

@@ -1,8 +1,7 @@
 use crate::{errors::ExecutorFeeLibError, executor_option};
 use common_macros::{contract_impl, lz_contract};
+use fee_lib_interfaces::{FeeParams, IExecutorFeeLib, LayerZeroPriceFeedClient};
 use soroban_sdk::{assert_with_error, Address, Bytes, Env};
-use utils::upgradeable::UpgradeableInternal;
-use worker::{FeeParams, IExecutorFeeLib, LayerZeroPriceFeedClient};
 
 // ============================================================================
 // Constants
@@ -25,7 +24,7 @@ const NATIVE_DECIMALS_RATE: u128 = 10_000_000;
 /// Provides fee calculation logic based on executor options, destination configuration,
 /// and current gas prices from the price feed. Handles fee multipliers, margins, and
 /// native token value conversions.
-#[lz_contract(upgradeable)]
+#[lz_contract(upgradeable(no_migration))]
 pub struct ExecutorFeeLib;
 
 #[contract_impl]
@@ -106,18 +105,6 @@ impl IExecutorFeeLib for ExecutorFeeLib {
     }
 }
 
-// ============================================================================
-// Upgradeable Implementation
-// ============================================================================
-
-impl UpgradeableInternal for ExecutorFeeLib {
-    type MigrationData = ();
-
-    fn __migrate(_env: &Env, _migration_data: &Self::MigrationData) {
-        // No migration logic needed for initial upgrade capability
-    }
-}
-
 // ========================================================================
 // Helper Functions
 // ========================================================================
@@ -245,3 +232,63 @@ fn safe_u128_to_i128(env: &Env, value: u128) -> i128 {
     assert_with_error!(env, value <= i128::MAX as u128, ExecutorFeeLibError::Overflow);
     value as i128
 }
+
+// ============================================================================
+// Test-only Functions
+// ============================================================================
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    impl ExecutorFeeLib {
+        /// Test-only wrapper for `decode_executor_options` to enable unit testing.
+        pub fn decode_executor_options_for_test(
+            env: &Env,
+            options: &Bytes,
+            dst_eid: u32,
+            lz_receive_base_gas: u64,
+            lz_compose_base_gas: u64,
+            native_cap: u128,
+        ) -> (u128, u128) {
+            super::decode_executor_options(env, options, dst_eid, lz_receive_base_gas, lz_compose_base_gas, native_cap)
+        }
+
+        /// Test-only wrapper for `get_effective_multiplier_bps`.
+        pub fn get_effective_multiplier_bps_for_test(_env: &Env, params: &FeeParams) -> u32 {
+            super::get_effective_multiplier_bps(params)
+        }
+
+        /// Test-only wrapper for `apply_premium_to_gas`.
+        pub fn apply_premium_to_gas_for_test(
+            env: &Env,
+            fee: i128,
+            multiplier_bps: u32,
+            margin_usd: u128,
+            native_price_usd: u128,
+        ) -> i128 {
+            super::apply_premium_to_gas(env, fee, multiplier_bps, margin_usd, native_price_usd)
+        }
+
+        /// Test-only wrapper for `convert_and_apply_premium_to_value`.
+        pub fn convert_and_apply_premium_to_value_for_test(
+            env: &Env,
+            value: u128,
+            ratio: u128,
+            denom: u128,
+            multiplier_bps: u32,
+        ) -> i128 {
+            super::convert_and_apply_premium_to_value(env, value, ratio, denom, multiplier_bps)
+        }
+
+        /// Test-only wrapper for `is_v1_eid`.
+        pub fn is_v1_eid_for_test(_env: &Env, eid: u32) -> bool {
+            super::is_v1_eid(eid)
+        }
+
+        /// Test-only wrapper for `safe_u128_to_i128`.
+        pub fn safe_u128_to_i128_for_test(env: &Env, value: u128) -> i128 {
+            super::safe_u128_to_i128(env, value)
+        }
+    }
+}

package/contracts/workers/executor-fee-lib/src/executor_option.rs

@@ -80,7 +80,6 @@ pub fn parse_executor_options(env: &Env, options: &Bytes, is_v1_eid: bool, nativ
                 agg_options.num_lz_compose += 1;
             }
             EXECUTOR_OPTION_TYPE_ORDERED_EXECUTION => {
-                assert_with_error!(env, option_data.is_empty(), ExecutorFeeLibError::InvalidExecutorOptions);
                 agg_options.ordered = true;
             }
             _ => {
@@ -201,3 +200,31 @@ fn decode_lz_compose_option(env: &Env, option: &Bytes) -> (u16, u128, u128) {
 
     (index, gas, value)
 }
+
+// ========================================================
+// Test-only wrappers for internal helper functions
+// ========================================================
+//
+// These allow unit tests under `src/tests/...` (a sibling module of `executor_option`)
+// to exercise internal helpers without changing their visibility in production builds.
+#[cfg(test)]
+#[allow(dead_code)]
+pub(crate) mod test {
+    use super::*;
+
+    pub fn next_executor_option_for_test(reader: &mut BufferReader) -> (u8, Bytes) {
+        super::next_executor_option(reader)
+    }
+
+    pub fn decode_lz_receive_option_for_test(env: &Env, option: &Bytes) -> (u128, u128) {
+        super::decode_lz_receive_option(env, option)
+    }
+
+    pub fn decode_native_drop_option_for_test(env: &Env, option: &Bytes) -> (u128, BytesN<32>) {
+        super::decode_native_drop_option(env, option)
+    }
+
+    pub fn decode_lz_compose_option_for_test(env: &Env, option: &Bytes) -> (u16, u128, u128) {
+        super::decode_lz_compose_option(env, option)
+    }
+}

package/contracts/workers/executor-fee-lib/src/lib.rs

@@ -1,7 +1,16 @@
 #![no_std]
 
 pub mod errors;
-pub mod executor_fee_lib;
 pub mod executor_option;
 
-pub use executor_fee_lib::{ExecutorFeeLib, ExecutorFeeLibClient};
+cfg_if::cfg_if! {
+    // Include implementation when NOT in library mode, OR when testutils is enabled (for tests)
+    if #[cfg(any(not(feature = "library"), feature = "testutils"))] {
+        mod executor_fee_lib;
+        // Export the contract and client for testing purposes
+        pub use executor_fee_lib::{ExecutorFeeLib, ExecutorFeeLibClient};
+    }
+}
+
+#[cfg(test)]
+mod tests;