Merge branch 'main' into feature/deploy-ci

Author: Le-Caignec

docs/soldoc/src/src/bridges/layerZero/IexecLayerZeroBridge.sol/contract.IexecLayerZeroBridge.md

@@ -148,7 +148,7 @@ function unpause() external onlyRole(PAUSER_ROLE);
 LEVEL 2: Pauses only outbound transfers.
 
 *Can only be called by accounts with PAUSER_ROLE
-When outbount transfers are paused:
+When outbound transfers are paused:
 - All _debit operations (outbound transfers) are blocked
 - All _credit operations (inbound transfers) still work
 - Users can still receive funds and "exit" their positions

docs/soldoc/src/src/bridges/utils/DualPausableUpgradeable.sol/abstract.DualPausableUpgradeable.md

@@ -38,24 +38,24 @@ function _getDualPausableStorage() private pure returns (DualPausableStorage sto
 
 ### whenOutboundTransfersNotPaused
 
-Use this modifier for functions that should be blocked during outbount transfer pause
+Use this modifier for functions that should be blocked during outbound transfer pause
 
-*Modifier for send operations - blocks when outbount transfer is paused*
+*Modifier for send operations - blocks when outbound transfer is paused*
 
 
 ```solidity
 modifier whenOutboundTransfersNotPaused();
 ```
 
-### whenOutbountTransfersPaused
+### whenOutboundTransfersPaused
 
-Use this modifier for administrative functions that should only work during outbount transfer pause
+Use this modifier for administrative functions that should only work during outbound transfer pause
 
 *Modifier to make a function callable only when send operations are paused*
 
 
 ```solidity
-modifier whenOutbountTransfersPaused();
+modifier whenOutboundTransfersPaused();
 ```
 
 ### __DualPausable_init
@@ -72,13 +72,13 @@ function __DualPausable_init() internal onlyInitializing;
 function __DualPausable_init_unchained() internal onlyInitializing;
 ```
 
-### outbountTransfersPaused
+### outboundTransfersPaused
 
 *Returns true if send operations are paused, false otherwise*
 
 
 ```solidity
-function outbountTransfersPaused() public view virtual returns (bool);
+function outboundTransfersPaused() public view virtual returns (bool);
 ```
 
 ### pauseStatus
@@ -94,30 +94,30 @@ function pauseStatus() public view virtual returns (bool fullyPaused, bool onlyO
 |Name|Type|Description|
 |----|----|-----------|
 |`fullyPaused`|`bool`|True if complete pause is active (blocks all operations)|
-|`onlyOutboundTransfersPaused`|`bool`|True if outbount transfer pause is active (blocks only send operations)|
+|`onlyOutboundTransfersPaused`|`bool`|True if outbound transfer pause is active (blocks only send operations)|
 
 
-### _requireOutbountTransfersNotPaused
+### _requireOutboundTransfersNotPaused
 
 *Throws if send operations are paused*
 
 
 ```solidity
-function _requireOutbountTransfersNotPaused() internal view virtual;
+function _requireOutboundTransfersNotPaused() internal view virtual;
 ```
 
-### _requireOutbountTransfersPaused
+### _requireOutboundTransfersPaused
 
 *Throws if send operations are not paused*
 
 
 ```solidity
-function _requireOutbountTransfersPaused() internal view virtual;
+function _requireOutboundTransfersPaused() internal view virtual;
 ```
 
 ### _pauseOutboundTransfers
 
-*Triggers outbount transfers pause.
+*Triggers outbound transfers pause.
 Requirements:
 - Send operations must not already be paused*
 
@@ -128,26 +128,26 @@ function _pauseOutboundTransfers() internal virtual whenOutboundTransfersNotPaus
 
 ### _unpauseOutboundTransfers
 
-*Unpauses outbount transfers.
+*Unpauses outbound transfers.
 Requirements:
 - Send operations must already be paused*
 
 
 ```solidity
-function _unpauseOutboundTransfers() internal virtual whenOutbountTransfersPaused;
+function _unpauseOutboundTransfers() internal virtual whenOutboundTransfersPaused;
 ```
 
 ## Events
 ### OutboundTransfersPaused
-*Emitted when outbount transfer pause is triggered by `account`*
+*Emitted when outbound transfer pause is triggered by `account`*
 
 
 ```solidity
 event OutboundTransfersPaused(address account);
 ```
 
 ### OutboundTransfersUnpaused
-*Emitted when outbount transfer pause is lifted by `account`*
+*Emitted when outbound transfer pause is lifted by `account`*
 
 
 ```solidity

src/bridges/layerZero/IexecLayerZeroBridge.sol

@@ -146,7 +146,7 @@ contract IexecLayerZeroBridge is
      * @notice LEVEL 2: Pauses only outbound transfers.
      * @dev Can only be called by accounts with PAUSER_ROLE
      *
-     * When outbount transfers are paused:
+     * When outbound transfers are paused:
      * - All _debit operations (outbound transfers) are blocked
      * - All _credit operations (inbound transfers) still work
      * - Users can still receive funds and "exit" their positions
@@ -189,20 +189,43 @@ contract IexecLayerZeroBridge is
     // ============ ACCESS CONTROL OVERRIDES ============
 
     /**
-     * @notice Returns the owner of the contract
-     * @return The address of the current owner
-     *
-     * @dev This override resolves the conflict between OwnableUpgradeable and
-     * AccessControlDefaultAdminRulesUpgradeable, both of which define owner().
-     * We use the OwnableUpgradeable version for consistency.
+     * @dev Overridden to prevent ownership renouncement.
+     * AccessControlDefaultAdminRulesUpgradeable is used to manage ownership.
+     */
+    function renounceOwnership() public pure override {
+        revert OperationNotAllowed("Use AccessControlDefaultAdminRulesUpgradeable instead");
+    }
+
+    /**
+     * @dev Overridden to prevent ownership transfer.
+     * AccessControlDefaultAdminRulesUpgradeable is used to manage ownership.
+     */
+    function transferOwnership(address) public pure override {
+        revert OperationNotAllowed("Use AccessControlDefaultAdminRulesUpgradeable instead");
+    }
+
+    /**
+     * Returns the owner of the contract which is also the default admin.
+     * @return The address of the current owner and default admin
      */
     function owner()
         public
         view
         override(OwnableUpgradeable, AccessControlDefaultAdminRulesUpgradeable)
         returns (address)
     {
-        return OwnableUpgradeable.owner();
+        return AccessControlDefaultAdminRulesUpgradeable.owner();
+    }
+
+    /**
+     * Accepts the default admin transfer and sets the owner to the new admin.
+     * @dev This ensures the state variable `OwnableUpgradeable._owner` is set correctly after the default
+     * admin transfer. Even though `OwnableUpgradeable._owner` is not used in `owner()` accessor, we chose
+     * to update it for consistency purposes.
+     */
+    function _acceptDefaultAdminTransfer() internal override {
+        super._acceptDefaultAdminTransfer();
+        _transferOwnership(defaultAdmin());
     }
 
     // ============ CORE BRIDGE FUNCTIONS ============

src/bridges/utils/DualPausableUpgradeable.sol

@@ -42,12 +42,12 @@ abstract contract DualPausableUpgradeable is PausableUpgradeable {
     // ============ EVENTS ============
 
     /**
-     * @dev Emitted when outbount transfer pause is triggered by `account`
+     * @dev Emitted when outbound transfer pause is triggered by `account`
      */
     event OutboundTransfersPaused(address account);
 
     /**
-     * @dev Emitted when outbount transfer pause is lifted by `account`
+     * @dev Emitted when outbound transfer pause is lifted by `account`
      */
     event OutboundTransfersUnpaused(address account);
 
@@ -66,20 +66,20 @@ abstract contract DualPausableUpgradeable is PausableUpgradeable {
     // ============ MODIFIERS ============
 
     /**
-     * @dev Modifier for send operations - blocks when outbount transfer is paused
-     * @notice Use this modifier for functions that should be blocked during outbount transfer pause
+     * @dev Modifier for send operations - blocks when outbound transfer is paused
+     * @notice Use this modifier for functions that should be blocked during outbound transfer pause
      */
     modifier whenOutboundTransfersNotPaused() {
-        _requireOutbountTransfersNotPaused();
+        _requireOutboundTransfersNotPaused();
         _;
     }
 
     /**
      * @dev Modifier to make a function callable only when send operations are paused
-     * @notice Use this modifier for administrative functions that should only work during outbount transfer pause
+     * @notice Use this modifier for administrative functions that should only work during outbound transfer pause
      */
-    modifier whenOutbountTransfersPaused() {
-        _requireOutbountTransfersPaused();
+    modifier whenOutboundTransfersPaused() {
+        _requireOutboundTransfersPaused();
         _;
     }
 
@@ -101,43 +101,43 @@ abstract contract DualPausableUpgradeable is PausableUpgradeable {
     /**
      * @dev Returns true if send operations are paused, false otherwise
      */
-    function outbountTransfersPaused() public view virtual returns (bool) {
+    function outboundTransfersPaused() public view virtual returns (bool) {
         DualPausableStorage storage $ = _getDualPausableStorage();
         return $._outboundTransfersPaused;
     }
 
     /**
      * @dev Returns the overall operational state of the contract
      * @return fullyPaused True if complete pause is active (blocks all operations)
-     * @return onlyOutboundTransfersPaused True if outbount transfer pause is active (blocks only send operations)
+     * @return onlyOutboundTransfersPaused True if outbound transfer pause is active (blocks only send operations)
      */
     function pauseStatus() public view virtual returns (bool fullyPaused, bool onlyOutboundTransfersPaused) {
         fullyPaused = paused();
-        onlyOutboundTransfersPaused = outbountTransfersPaused();
+        onlyOutboundTransfersPaused = outboundTransfersPaused();
     }
 
     // ============ INTERNAL FUNCTIONS ============
 
     /**
      * @dev Throws if send operations are paused
      */
-    function _requireOutbountTransfersNotPaused() internal view virtual {
-        if (outbountTransfersPaused()) {
+    function _requireOutboundTransfersNotPaused() internal view virtual {
+        if (outboundTransfersPaused()) {
             revert EnforcedOutboundTransfersPause();
         }
     }
 
     /**
      * @dev Throws if send operations are not paused
      */
-    function _requireOutbountTransfersPaused() internal view virtual {
-        if (!outbountTransfersPaused()) {
+    function _requireOutboundTransfersPaused() internal view virtual {
+        if (!outboundTransfersPaused()) {
             revert ExpectedOutboundTransfersPause();
         }
     }
 
     /**
-     * @dev Triggers outbount transfers pause.
+     * @dev Triggers outbound transfers pause.
      * Requirements:
      * - Send operations must not already be paused
      */
@@ -148,11 +148,11 @@ abstract contract DualPausableUpgradeable is PausableUpgradeable {
     }
 
     /**
-     * @dev Unpauses outbount transfers.
+     * @dev Unpauses outbound transfers.
      * Requirements:
      * - Send operations must already be paused
      */
-    function _unpauseOutboundTransfers() internal virtual whenOutbountTransfersPaused {
+    function _unpauseOutboundTransfers() internal virtual whenOutboundTransfersPaused {
         DualPausableStorage storage $ = _getDualPausableStorage();
         $._outboundTransfersPaused = false;
         emit OutboundTransfersUnpaused(_msgSender());

src/interfaces/IIexecLayerZeroBridge.sol

@@ -2,6 +2,8 @@
 pragma solidity ^0.8.22;
 
 interface IIexecLayerZeroBridge {
+    error OperationNotAllowed(string message);
+
     /**
      * @notice Pauses the contract, disabling `_credit` & `_debit` functions.
      * @dev Should only be callable by authorized accounts: PAUSER_ROLE.