@layerzerolabs/protocol-stellar-v2 0.2.19 → 0.2.20

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

@@ -8,10 +8,7 @@ use crate::{
 };
 use common_macros::contract_trait;
 use soroban_sdk::{assert_with_error, panic_with_error, Address, Bytes, Env, Vec};
-use utils::{
-    auth::{enforce_auth, require_auth, Auth},
-    option_ext::OptionExt,
-};
+use utils::auth::{self, Auth};
 
 /// Worker interface providing common functionality for LayerZero workers.
 ///
@@ -32,7 +29,7 @@ pub trait Worker: Auth {
     /// # Arguments
     /// * `paused` - `true` to pause, `false` to unpause
     fn set_paused(env: &Env, paused: bool) {
-        let authorizer = enforce_auth::<Self>(env);
+        let authorizer = auth::enforce_auth::<Self>(env);
         assert_with_error!(env, Self::paused(env) != paused, WorkerError::PauseStatusUnchanged);
 
         WorkerStorage::set_paused(env, &paused);
@@ -43,6 +40,19 @@ pub trait Worker: Auth {
         }
     }
 
+    /// Sets admin status for an address.
+    ///
+    /// Admins can configure worker settings like fee multipliers, deposit addresses,
+    /// and supported option types.
+    ///
+    /// # Arguments
+    /// * `admin` - The address to set admin status for
+    /// * `active` - `true` to add admin, `false` to remove
+    fn set_admin(env: &Env, admin: &Address, active: bool) {
+        auth::require_auth::<Self>(env);
+        set_admin_no_auth::<Self>(env, admin, active);
+    }
+
     /// Sets whether a message library is supported by this worker.
     ///
     /// Message libraries (e.g., ULN302) call workers to assign jobs. Only supported
@@ -52,7 +62,7 @@ pub trait Worker: Auth {
     /// * `message_lib` - The message library contract address
     /// * `supported` - `true` to add support, `false` to remove support
     fn set_supported_message_lib(env: &Env, message_lib: &Address, supported: bool) {
-        require_auth::<Self>(env);
+        auth::require_auth::<Self>(env);
         set_message_lib_no_auth::<Self>(env, message_lib, supported);
     }
 
@@ -66,7 +76,7 @@ pub trait Worker: Auth {
     /// * `oapp` - The OApp contract address
     /// * `allowed` - `true` to add to allowlist, `false` to remove
     fn set_allowlist(env: &Env, oapp: &Address, allowed: bool) {
-        require_auth::<Self>(env);
+        auth::require_auth::<Self>(env);
 
         let is_on_list = Self::is_on_allowlist(env, oapp);
         if allowed {
@@ -96,7 +106,7 @@ pub trait Worker: Auth {
     /// * `oapp` - The OApp contract address
     /// * `denied` - `true` to add to denylist, `false` to remove
     fn set_denylist(env: &Env, oapp: &Address, denied: bool) {
-        require_auth::<Self>(env);
+        auth::require_auth::<Self>(env);
         let is_on_list = Self::is_on_denylist(env, oapp);
 
         if denied {
@@ -146,11 +156,11 @@ pub trait Worker: Auth {
     /// # Arguments
     /// * `admin` - Admin address (must provide authorization)
     /// * `eid` - Destination endpoint ID (chain identifier)
-    /// * `option_types` - Encoded supported option types
-    fn set_supported_option_types(env: &Env, admin: &Address, eid: u32, option_types: Bytes) {
+    /// * `option_types` - Supported option types. Each byte represents an option type.
+    fn set_supported_option_types(env: &Env, admin: &Address, eid: u32, option_types: &Bytes) {
         require_admin_auth::<Self>(env, admin);
-        WorkerStorage::set_supported_option_types(env, eid, &option_types);
-        SetSupportedOptionTypes { dst_eid: eid, option_types }.publish(env);
+        WorkerStorage::set_supported_option_types(env, eid, option_types);
+        SetSupportedOptionTypes { dst_eid: eid, option_types: option_types.clone() }.publish(env);
     }
 
     /// Sets the worker fee library contract address.
@@ -184,6 +194,11 @@ pub trait Worker: Auth {
     // View Functions
     // ========================================================================
 
+    /// Returns whether the worker is paused.
+    fn paused(env: &Env) -> bool {
+        WorkerStorage::paused(env)
+    }
+
     /// Returns whether an address is an admin.
     ///
     /// # Arguments
@@ -194,12 +209,7 @@ pub trait Worker: Auth {
 
     /// Returns all admin addresses.
     fn admins(env: &Env) -> Vec<Address> {
-        WorkerStorage::admins(env).unwrap_or(Vec::new(env))
-    }
-
-    /// Returns whether the worker is paused.
-    fn paused(env: &Env) -> bool {
-        WorkerStorage::paused(env)
+        WorkerStorage::admins(env)
     }
 
     /// Returns whether a message library is supported.
@@ -215,7 +225,7 @@ pub trait Worker: Auth {
     /// # Returns
     /// Vector of supported message library contract addresses.
     fn message_libs(env: &Env) -> Vec<Address> {
-        WorkerStorage::message_libs(env).unwrap_or(Vec::new(env))
+        WorkerStorage::message_libs(env)
     }
 
     /// Returns whether an OApp is on the allowlist.
@@ -226,6 +236,11 @@ pub trait Worker: Auth {
         WorkerStorage::has_allowlist(env, oapp)
     }
 
+    /// Returns the number of addresses on the allowlist.
+    fn allowlist_size(env: &Env) -> u32 {
+        WorkerStorage::allowlist_size(env)
+    }
+
     /// Returns whether an OApp is on the denylist.
     ///
     /// # Arguments
@@ -242,29 +257,19 @@ pub trait Worker: Auth {
     /// 3. Otherwise → denied
     ///
     /// # Arguments
-    /// * `sender` - OApp contract address to check
-    fn has_acl(env: &Env, sender: &Address) -> bool {
-        !Self::is_on_denylist(env, sender) && (Self::allowlist_size(env) == 0 || Self::is_on_allowlist(env, sender))
-    }
-
-    /// Returns the number of addresses on the allowlist.
-    fn allowlist_size(env: &Env) -> u32 {
-        WorkerStorage::allowlist_size(env)
+    /// * `oapp` - OApp contract address to check
+    fn has_acl(env: &Env, oapp: &Address) -> bool {
+        !Self::is_on_denylist(env, oapp) && (Self::allowlist_size(env) == 0 || Self::is_on_allowlist(env, oapp))
     }
 
     /// Returns the default fee multiplier in basis points.
     fn default_multiplier_bps(env: &Env) -> u32 {
-        WorkerStorage::default_multiplier_bps(env).unwrap_or(0)
+        WorkerStorage::default_multiplier_bps(env)
     }
 
     /// Returns the deposit address where fees are collected.
-    fn deposit_address(env: &Env) -> Address {
-        WorkerStorage::deposit_address(env).unwrap_or_panic(env, WorkerError::DepositAddressNotSet)
-    }
-
-    /// Returns the price feed contract address.
-    fn price_feed(env: &Env) -> Address {
-        WorkerStorage::price_feed(env).unwrap_or_panic(env, WorkerError::PriceFeedNotSet)
+    fn deposit_address(env: &Env) -> Option<Address> {
+        WorkerStorage::deposit_address(env)
     }
 
     /// Returns supported option types for a destination endpoint.
@@ -276,8 +281,13 @@ pub trait Worker: Auth {
     }
 
     /// Returns the worker fee library contract address.
-    fn worker_fee_lib(env: &Env) -> Address {
-        WorkerStorage::worker_fee_lib(env).unwrap_or_panic(env, WorkerError::WorkerFeeLibNotSet)
+    fn worker_fee_lib(env: &Env) -> Option<Address> {
+        WorkerStorage::worker_fee_lib(env)
+    }
+
+    /// Returns the price feed contract address.
+    fn price_feed(env: &Env) -> Option<Address> {
+        WorkerStorage::price_feed(env)
     }
 }
 
@@ -305,16 +315,8 @@ pub fn init_worker<T: Worker>(
     worker_fee_lib: &Address,
     deposit_address: &Address,
 ) {
-    assert_with_error!(env, T::admins(env).is_empty(), WorkerError::ReInitialize);
-    assert_with_error!(env, !admins.is_empty(), WorkerError::NoAdminsProvided);
-
-    for admin in admins {
-        set_admin_no_auth::<T>(env, &admin, true);
-    }
-
-    for lib in message_libs {
-        set_message_lib_no_auth::<T>(env, &lib, true);
-    }
+    admins.iter().for_each(|admin| set_admin_no_auth::<T>(env, &admin, true));
+    message_libs.iter().for_each(|lib| set_message_lib_no_auth::<T>(env, &lib, true));
 
     set_price_feed_no_auth(env, price_feed);
     set_default_multiplier_bps_no_auth(env, default_multiplier_bps);
@@ -373,16 +375,6 @@ pub fn assert_supported_message_lib<T: Worker>(env: &Env, message_lib: &Address)
 // Admin Setter Functions with authentication
 // ============================================================================================
 
-/// Sets admin status for an address by authorizer (owner/multisig).
-///
-/// # Arguments
-/// * `admin` - The address to set admin status for
-/// * `active` - `true` to add admin, `false` to remove
-pub fn set_admin_by_owner<T: Worker>(env: &Env, admin: &Address, active: bool) {
-    require_auth::<T>(env);
-    set_admin_no_auth::<T>(env, admin, active);
-}
-
 /// Sets admin status for an address by admin.
 ///
 /// # Arguments
@@ -414,7 +406,6 @@ fn set_admin_no_auth<T: Worker>(env: &Env, admin: &Address, active: bool) {
         admins.push_back(admin.clone());
     } else {
         // Remove admin - ensure present
-        assert_with_error!(env, admins.len() > 1, WorkerError::AttemptingToRemoveOnlyAdmin);
         let Some(index) = admins.first_index_of(admin) else {
             panic_with_error!(env, WorkerError::AdminNotFound);
         };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@layerzerolabs/protocol-stellar-v2",
-  "version": "0.2.19",
+  "version": "0.2.20",
   "private": false,
   "devDependencies": {
     "@types/node": "^22.18.6",
     "tsx": "^4.19.3",
     "typescript": "^5.8.2",
-    "@layerzerolabs/common-node-utils": "0.2.19",
-    "@layerzerolabs/vm-tooling-stellar": "0.2.19"
+    "@layerzerolabs/common-node-utils": "0.2.20",
+    "@layerzerolabs/vm-tooling-stellar": "0.2.20"
   },
   "publishConfig": {
     "access": "restricted",