@layerzerolabs/protocol-stellar-v2 0.2.19 → 0.2.21

package/contracts/workers/price-feed/src/tests/setup.rs

@@ -0,0 +1,70 @@
+use soroban_sdk::{
+    testutils::{Address as _, MockAuth, MockAuthInvoke},
+    vec, Address, Env, IntoVal, Val, Vec,
+};
+
+use crate::{LzPriceFeed, LzPriceFeedClient};
+use fee_lib_interfaces::Price;
+
+// =============================================================================
+// Test Setup
+// =============================================================================
+
+pub struct TestSetup<'a> {
+    pub env: Env,
+    pub contract_id: Address,
+    pub client: LzPriceFeedClient<'a>,
+    pub owner: Address,
+    pub price_updater: Address,
+}
+
+impl<'a> TestSetup<'a> {
+    pub fn new() -> Self {
+        let env = Env::default();
+        let owner = Address::generate(&env);
+        let price_updater = Address::generate(&env);
+
+        let contract_id = env.register(LzPriceFeed, (&owner, &price_updater));
+        let client = LzPriceFeedClient::new(&env, &contract_id);
+
+        Self { env, contract_id, client, owner, price_updater }
+    }
+
+    pub fn mock_auth<T: IntoVal<Env, Vec<Val>>>(&self, address: &Address, fn_name: &str, args: T) {
+        self.env.mock_auths(&[MockAuth {
+            address,
+            invoke: &MockAuthInvoke {
+                contract: &self.contract_id,
+                fn_name,
+                args: args.into_val(&self.env),
+                sub_invokes: &[],
+            },
+        }]);
+    }
+
+    pub fn mock_owner_auth<T: IntoVal<Env, Vec<Val>>>(&self, fn_name: &str, args: T) {
+        self.mock_auth(&self.owner, fn_name, args)
+    }
+
+    pub fn mock_price_updater_auth<T: IntoVal<Env, Vec<Val>>>(&self, fn_name: &str, args: T) {
+        self.mock_auth(&self.price_updater, fn_name, args)
+    }
+
+    /// Creates a default Price for testing
+    pub fn new_price(&self, price_ratio: u128, gas_price_in_unit: u64, gas_per_byte: u32) -> Price {
+        Price { price_ratio, gas_price_in_unit, gas_per_byte }
+    }
+
+    /// Creates a standard test price
+    pub fn default_test_price(&self) -> Price {
+        // price_ratio = 1e20 means 1:1 ratio
+        Price { price_ratio: 10u128.pow(20), gas_price_in_unit: 1_000_000, gas_per_byte: 16 }
+    }
+
+    /// Sets up a default model price for a destination EID
+    pub fn setup_default_price(&self, dst_eid: u32, price: &Price) {
+        let prices = vec![&self.env, crate::types::UpdatePrice { eid: dst_eid, price: price.clone() }];
+        self.mock_price_updater_auth("set_price", (&self.price_updater, &prices));
+        self.client.set_price(&self.price_updater, &prices);
+    }
+}

package/contracts/workers/price-feed/src/types.rs

@@ -1,5 +1,5 @@
+use fee_lib_interfaces::Price;
 use soroban_sdk::contracttype;
-use worker::Price;
 
 /// Arbitrum-specific price extension
 #[contracttype]

package/contracts/workers/worker/src/errors.rs

@@ -1,7 +1,7 @@
 use common_macros::contract_error;
 
 // Worker library error codes: 1200-1299
-// See ERROR_SPEC.md for allocation rules
+// See docs/error-spec.md for allocation rules
 
 /// WorkerError: 1200-1299
 #[contract_error]
@@ -10,17 +10,14 @@ pub enum WorkerError {
     AdminNotFound,
     AlreadyOnAllowlist,
     AlreadyOnDenylist,
-    AttemptingToRemoveOnlyAdmin,
     DepositAddressNotSet,
     MessageLibAlreadySupported,
     MessageLibNotSupported,
-    NoAdminsProvided,
     NotAllowed,
     NotOnAllowlist,
     NotOnDenylist,
     PauseStatusUnchanged,
     PriceFeedNotSet,
-    ReInitialize,
     Unauthorized,
     UnsupportedMessageLib,
     WorkerFeeLibNotSet,

package/contracts/workers/worker/src/lib.rs

@@ -2,12 +2,10 @@
 
 pub mod errors;
 pub mod events;
-pub mod interfaces;
 pub mod storage;
 
 mod worker;
 
-pub use interfaces::*;
 pub use worker::*;
 
 #[cfg(test)]

package/contracts/workers/worker/src/storage.rs

@@ -9,31 +9,16 @@ pub enum WorkerStorage {
     #[default(false)]
     Paused,
 
-    /// Address where worker fees are collected.
-    #[instance(Address)]
-    DepositAddress,
-
-    /// Price feed contract address for cross-chain fee calculations.
-    #[instance(Address)]
-    PriceFeed,
-
-    /// Worker fee library contract address for fee calculation logic.
-    #[instance(Address)]
-    WorkerFeeLib,
-
-    /// Default fee multiplier in basis points (10000 = 1x).
-    #[instance(u32)]
-    DefaultMultiplierBps,
-
-    /// Supported executor option types for a destination endpoint.
+    /// Admin addresses with configuration permissions.
     ///
-    /// Encoded bytes defining which option types (lzReceive, lzCompose, nativeDrop, etc.)
-    /// are supported for a specific destination chain.
-    #[persistent(Bytes)]
-    SupportedOptionTypes { eid: u32 },
+    /// Admins can modify worker settings but cannot change ownership.
+    #[persistent(Vec<Address>)]
+    #[default(Vec::new(env))]
+    Admins,
 
     /// List of supported message library addresses (e.g., ULN302).
     #[persistent(Vec<Address>)]
+    #[default(Vec::new(env))]
     MessageLibs,
 
     /// Allowlist status for an OApp address.
@@ -42,22 +27,40 @@ pub enum WorkerStorage {
     #[persistent(bool)]
     Allowlist { oapp: Address },
 
+    /// Counter for the number of addresses on the allowlist.
+    ///
+    /// Used to efficiently check if allowlist is empty (empty = allow all non-denylisted).
+    #[instance(u32)]
+    #[default(0)]
+    AllowlistSize,
+
     /// Denylist status for an OApp address.
     ///
     /// Denylisted OApps are blocked regardless of allowlist status.
     #[persistent(bool)]
     Denylist { oapp: Address },
 
-    /// Counter for the number of addresses on the allowlist.
-    ///
-    /// Used to efficiently check if allowlist is empty (empty = allow all non-denylisted).
+    /// Default fee multiplier in basis points (10000 = 1x).
     #[instance(u32)]
     #[default(0)]
-    AllowlistSize,
+    DefaultMultiplierBps,
 
-    /// Admin addresses with configuration permissions.
+    /// Address where worker fees are collected.
+    #[instance(Address)]
+    DepositAddress,
+
+    /// Supported executor option types for a destination endpoint.
     ///
-    /// Admins can modify worker settings but cannot change ownership.
-    #[persistent(Vec<Address>)]
-    Admins,
+    /// Since Stellar does not support Vec<u8>, we use Bytes instead where each byte
+    /// represents an option type (lzReceive, lzCompose, nativeDrop, etc.).
+    #[persistent(Bytes)]
+    SupportedOptionTypes { eid: u32 },
+
+    /// Worker fee library contract address for fee calculation logic.
+    #[instance(Address)]
+    WorkerFeeLib,
+
+    /// Price feed contract address for cross-chain fee calculations.
+    #[instance(Address)]
+    PriceFeed,
 }

package/contracts/workers/worker/src/tests/setup.rs

@@ -1,9 +1,9 @@
 use soroban_sdk::{
     testutils::{Address as _, MockAuth, MockAuthInvoke},
-    Address, Bytes, Env, IntoVal, Val, Vec,
+    Address, Env, IntoVal, Val, Vec,
 };
 
-use crate::{init_worker, set_admin_by_admin, set_admin_by_owner, Worker};
+use crate::{init_worker, set_admin_by_admin, Worker};
 
 use common_macros::{contract_impl, ownable};
 use soroban_sdk::contract;
@@ -37,12 +37,6 @@ impl WorkerTester {
         );
     }
 
-    /// Test-only wrapper exposing `set_admin_by_owner` as a contract function
-    /// so we can exercise auth + storage updates in unit tests.
-    pub fn set_admin_by_owner_for_test(env: &Env, admin: &Address, active: bool) {
-        set_admin_by_owner::<Self>(env, admin, active);
-    }
-
     /// Test-only wrapper exposing `set_admin_by_admin` as a contract function
     /// so we can exercise auth + storage updates in unit tests.
     pub fn set_admin_by_admin_for_test(env: &Env, caller: &Address, admin: &Address, active: bool) {