@layerzerolabs/lz-evm-messagelib-v2 2.0.13 → 2.0.15

package/contracts/uln/uln301/ReceiveLibBaseE1.sol

@@ -49,15 +49,15 @@ abstract contract ReceiveLibBaseE1 is MessageLibBase, AddressSizeConfig, ILayerZ
     event DefaultExecutorsSet(SetDefaultExecutorParam[] params);
     event ExecutorSet(address oapp, uint32 eid, address executor);
 
-    error InvalidExecutor();
-    error OnlyExecutor();
+    error LZ_MessageLib_InvalidExecutor();
+    error LZ_MessageLib_OnlyExecutor();
 
     constructor(address _endpoint, uint32 _localEid) MessageLibBase(_endpoint, _localEid) {}
 
     function setDefaultExecutors(SetDefaultExecutorParam[] calldata _params) external onlyOwner {
         for (uint256 i = 0; i < _params.length; ++i) {
             SetDefaultExecutorParam calldata param = _params[i];
-            if (param.executor == address(0x0)) revert InvalidExecutor();
+            if (param.executor == address(0x0)) revert LZ_MessageLib_InvalidExecutor();
             defaultExecutors[param.eid] = param.executor;
         }
         emit DefaultExecutorsSet(_params);
@@ -85,7 +85,7 @@ abstract contract ReceiveLibBaseE1 is MessageLibBase, AddressSizeConfig, ILayerZ
         // if the executor is malicious, it can make the msg as a storedPayload or fail in the nonBlockingApp
         // which might result in unintended behaviour and risks, like grieving.
         // to err on the safe side, we should assert the executor here.
-        if (msg.sender != getExecutor(_receiver, _srcEid)) revert OnlyExecutor();
+        if (msg.sender != getExecutor(_receiver, _srcEid)) revert LZ_MessageLib_OnlyExecutor();
 
         if (_receiver.code.length == 0) {
             /// on chains where EOA has no codes, it will early return and emit InvalidDst event

package/contracts/uln/uln301/ReceiveUln301.sol

@@ -3,29 +3,24 @@
 pragma solidity ^0.8.20;
 
 import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";
-
-import { ILayerZeroEndpoint } from "@layerzerolabs/lz-evm-v1-0.7/contracts/interfaces/ILayerZeroEndpoint.sol";
-import { AddressCast } from "@layerzerolabs/lz-evm-protocol-v2/contracts/libs/AddressCast.sol";
-import { ExecutionState } from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroEndpointV2.sol";
 import { PacketV1Codec } from "@layerzerolabs/lz-evm-protocol-v2/contracts/messagelib/libs/PacketV1Codec.sol";
 
 import { IUltraLightNode301 } from "./interfaces/IUltraLightNode301.sol";
 import { ReceiveLibBaseE1 } from "./ReceiveLibBaseE1.sol";
-import { VerificationState, ReceiveUlnBase } from "../ReceiveUlnBase.sol";
+import { ReceiveUlnBase } from "../ReceiveUlnBase.sol";
 import { UlnConfig } from "../UlnBase.sol";
 
 /// @dev ULN301 will be deployed on EndpointV1 and is for backward compatibility with ULN302 on EndpointV2. 301 can talk to both 301 and 302
 /// @dev This is a gluing contract. It simply parses the requests and forward to the super.impl() accordingly.
 /// @dev In this case, it combines the logic of ReceiveUlnBase and ReceiveLibBaseE1
 contract ReceiveUln301 is IUltraLightNode301, ReceiveUlnBase, ReceiveLibBaseE1 {
-    using AddressCast for bytes32;
     using PacketV1Codec for bytes;
     using SafeCast for uint32; // for chain ID uint32 to uint16 conversion
 
     uint256 internal constant CONFIG_TYPE_EXECUTOR = 1;
     uint256 internal constant CONFIG_TYPE_ULN = 2;
 
-    error InvalidConfigType(uint256 configType);
+    error LZ_ULN_InvalidConfigType(uint256 configType);
 
     constructor(address _endpoint, uint32 _localEid) ReceiveLibBaseE1(_endpoint, _localEid) {}
 
@@ -43,7 +38,7 @@ contract ReceiveUln301 is IUltraLightNode301, ReceiveUlnBase, ReceiveLibBaseE1 {
         } else if (_configType == CONFIG_TYPE_ULN) {
             _setUlnConfig(_eid, _oapp, abi.decode(_config, (UlnConfig)));
         } else {
-            revert InvalidConfigType(_configType);
+            revert LZ_ULN_InvalidConfigType(_configType);
         }
     }
 
@@ -78,43 +73,11 @@ contract ReceiveUln301 is IUltraLightNode301, ReceiveUlnBase, ReceiveLibBaseE1 {
         } else if (_configType == CONFIG_TYPE_ULN) {
             return abi.encode(getUlnConfig(_oapp, _eid));
         } else {
-            revert InvalidConfigType(_configType);
+            revert LZ_ULN_InvalidConfigType(_configType);
         }
     }
 
     function version() external pure returns (uint64 major, uint8 minor, uint8 endpointVersion) {
         return (3, 0, 1);
     }
-
-    // ========================= VIEW FUNCTIONS FOR OFFCHAIN ONLY =========================
-    // Not involved in any state transition function.
-    // ====================================================================================
-
-    function executable(bytes calldata _packetHeader, bytes32 _payloadHash) public view returns (ExecutionState) {
-        _assertHeader(_packetHeader, localEid);
-
-        address receiver = _packetHeader.receiverB20();
-        uint16 srcEid = _packetHeader.srcEid().toUint16();
-        uint64 nonce = _packetHeader.nonce();
-
-        // executed if nonce less than or equal to inboundNonce
-        bytes memory path = abi.encodePacked(_packetHeader.sender().toBytes(addressSizes[srcEid]), receiver);
-        if (nonce <= ILayerZeroEndpoint(endpoint).getInboundNonce(srcEid, path)) return ExecutionState.Executed;
-
-        // executable if not executed and _verified
-        if (_checkVerifiable(getUlnConfig(receiver, srcEid), keccak256(_packetHeader), _payloadHash)) {
-            return ExecutionState.Executable;
-        }
-
-        return ExecutionState.NotExecutable;
-    }
-
-    /// @dev keeping the same interface as 302
-    /// @dev a verifiable message requires it to be ULN verifiable only, excluding the endpoint verifiable check
-    function verifiable(bytes calldata _packetHeader, bytes32 _payloadHash) external view returns (VerificationState) {
-        if (executable(_packetHeader, _payloadHash) == ExecutionState.NotExecutable) {
-            return VerificationState.Verifying;
-        }
-        return VerificationState.Verified;
-    }
 }

package/contracts/uln/uln301/ReceiveUln301View.sol

@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: LZBL-1.2
+
+pragma solidity ^0.8.20;
+
+import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";
+import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import { Proxied } from "hardhat-deploy/solc_0.8/proxy/Proxied.sol";
+
+import { ILayerZeroEndpoint } from "@layerzerolabs/lz-evm-v1-0.7/contracts/interfaces/ILayerZeroEndpoint.sol";
+import { AddressCast } from "@layerzerolabs/lz-evm-protocol-v2/contracts/libs/AddressCast.sol";
+import { PacketV1Codec } from "@layerzerolabs/lz-evm-protocol-v2/contracts/messagelib/libs/PacketV1Codec.sol";
+import { ExecutionState, EndpointV2View } from "@layerzerolabs/lz-evm-protocol-v2/contracts/EndpointV2View.sol";
+
+import { UlnConfig } from "../UlnBase.sol";
+
+enum VerificationState {
+    Verifying,
+    Verifiable,
+    Verified
+}
+
+interface IReceiveUln301 {
+    function assertHeader(bytes calldata _packetHeader, uint32 _localEid) external pure;
+
+    function addressSizes(uint32 _dstEid) external view returns (uint256);
+
+    function endpoint() external view returns (address);
+
+    function verifiable(
+        UlnConfig memory _config,
+        bytes32 _headerHash,
+        bytes32 _payloadHash
+    ) external view returns (bool);
+
+    function getUlnConfig(address _oapp, uint32 _remoteEid) external view returns (UlnConfig memory rtnConfig);
+}
+
+contract ReceiveUln301View is Initializable, Proxied {
+    using PacketV1Codec for bytes;
+    using AddressCast for bytes32;
+    using SafeCast for uint32;
+
+    ILayerZeroEndpoint public endpoint;
+    IReceiveUln301 public receiveUln301;
+    uint32 internal localEid;
+
+    function initialize(address _endpoint, uint32 _localEid, address _receiveUln301) external proxied initializer {
+        receiveUln301 = IReceiveUln301(_receiveUln301);
+        endpoint = ILayerZeroEndpoint(_endpoint);
+        localEid = _localEid;
+    }
+
+    function executable(bytes calldata _packetHeader, bytes32 _payloadHash) public view returns (ExecutionState) {
+        receiveUln301.assertHeader(_packetHeader, localEid);
+
+        address receiver = _packetHeader.receiverB20();
+        uint16 srcEid = _packetHeader.srcEid().toUint16();
+        uint64 nonce = _packetHeader.nonce();
+
+        // executed if nonce less than or equal to inboundNonce
+        bytes memory path = abi.encodePacked(
+            _packetHeader.sender().toBytes(receiveUln301.addressSizes(srcEid)),
+            receiver
+        );
+        if (nonce <= endpoint.getInboundNonce(srcEid, path)) return ExecutionState.Executed;
+
+        // executable if not executed and _verified
+        if (
+            receiveUln301.verifiable(
+                receiveUln301.getUlnConfig(receiver, srcEid),
+                keccak256(_packetHeader),
+                _payloadHash
+            )
+        ) {
+            return ExecutionState.Executable;
+        }
+
+        return ExecutionState.NotExecutable;
+    }
+
+    /// @dev keeping the same interface as 302
+    /// @dev a verifiable message requires it to be ULN verifiable only, excluding the endpoint verifiable check
+    function verifiable(bytes calldata _packetHeader, bytes32 _payloadHash) external view returns (VerificationState) {
+        if (executable(_packetHeader, _payloadHash) == ExecutionState.NotExecutable) {
+            return VerificationState.Verifying;
+        }
+        return VerificationState.Verified;
+    }
+}

package/contracts/uln/uln301/SendLibBaseE1.sol

@@ -68,7 +68,7 @@ abstract contract SendLibBaseE1 is SendLibBase, AddressSizeConfig, IMessageLibE1
 
         // pay native fee
         // assert the user has attached enough native token for this address
-        if (msg.value < totalNativeFee) revert InsufficientMsgValue();
+        if (msg.value < totalNativeFee) revert LZ_MessageLib_InsufficientMsgValue();
         // refund if they send too much
         uint256 refundAmt = msg.value - totalNativeFee;
         if (refundAmt > 0) {
@@ -79,7 +79,7 @@ abstract contract SendLibBaseE1 is SendLibBase, AddressSizeConfig, IMessageLibE1
         if (lzTokenFee > 0) {
             // in v2, we let user pass a payInLzToken boolean but always charging the sender
             // likewise in v1, if _lzTokenPaymentAddress is passed, it must be the sender
-            if (_lzTokenPaymentAddress != sender) revert LzTokenPaymentAddressMustBeSender();
+            if (_lzTokenPaymentAddress != sender) revert LZ_MessageLib_LzTokenPaymentAddressMustBeSender();
             _payLzTokenFee(sender, lzTokenFee);
         }
 
@@ -117,9 +117,9 @@ abstract contract SendLibBaseE1 is SendLibBase, AddressSizeConfig, IMessageLibE1
     // ======================= Internal =======================
     /// @dev path = remoteAddress + localAddress.
     function _assertPath(address _sender, bytes calldata _path, uint256 remoteAddressSize) internal pure {
-        if (_path.length != 20 + remoteAddressSize) revert InvalidPath();
+        if (_path.length != 20 + remoteAddressSize) revert LZ_MessageLib_InvalidPath();
         address srcInPath = AddressCast.toAddress(_path[remoteAddressSize:]);
-        if (_sender != srcInPath) revert InvalidSender();
+        if (_sender != srcInPath) revert LZ_MessageLib_InvalidSender();
     }
 
     function _payLzTokenFee(address _sender, uint256 _lzTokenFee) internal {
@@ -145,7 +145,7 @@ abstract contract SendLibBaseE1 is SendLibBase, AddressSizeConfig, IMessageLibE1
     ) internal returns (Packet memory packet) {
         // assert toAddress size
         uint256 remoteAddressSize = addressSizes[_dstEid];
-        if (remoteAddressSize == 0) revert InvalidPath();
+        if (remoteAddressSize == 0) revert LZ_MessageLib_InvalidPath();
         _assertPath(_sender, _path, remoteAddressSize);
 
         // increment nonce

package/contracts/uln/uln301/SendUln301.sol

@@ -16,7 +16,7 @@ contract SendUln301 is SendUlnBase, SendLibBaseE1 {
     uint256 internal constant CONFIG_TYPE_EXECUTOR = 1;
     uint256 internal constant CONFIG_TYPE_ULN = 2;
 
-    error InvalidConfigType(uint256 configType);
+    error LZ_ULN_InvalidConfigType(uint256 configType);
 
     constructor(
         address _endpoint,
@@ -50,7 +50,7 @@ contract SendUln301 is SendUlnBase, SendLibBaseE1 {
         } else if (_configType == CONFIG_TYPE_ULN) {
             _setUlnConfig(_eid, _oapp, abi.decode(_config, (UlnConfig)));
         } else {
-            revert InvalidConfigType(_configType);
+            revert LZ_ULN_InvalidConfigType(_configType);
         }
     }
 
@@ -62,7 +62,7 @@ contract SendUln301 is SendUlnBase, SendLibBaseE1 {
         } else if (_configType == CONFIG_TYPE_ULN) {
             return abi.encode(getUlnConfig(_oapp, _eid));
         } else {
-            revert InvalidConfigType(_configType);
+            revert LZ_ULN_InvalidConfigType(_configType);
         }
     }
 

package/contracts/uln/uln301/TreasuryFeeHandler.sol

@@ -14,9 +14,9 @@ contract TreasuryFeeHandler is ITreasuryFeeHandler {
 
     ILayerZeroEndpoint public immutable endpoint;
 
-    error OnlySendLibrary();
-    error OnlyOnSending();
-    error InvalidAmount(uint256 required, uint256 supplied);
+    error LZ_TreasuryFeeHandler_OnlySendLibrary();
+    error LZ_TreasuryFeeHandler_OnlyOnSending();
+    error LZ_TreasuryFeeHandler_InvalidAmount(uint256 required, uint256 supplied);
 
     constructor(address _endpoint) {
         endpoint = ILayerZeroEndpoint(_endpoint);
@@ -31,9 +31,9 @@ contract TreasuryFeeHandler is ITreasuryFeeHandler {
         address _treasury
     ) external {
         // only sender's message library can call this function and only when sending a payload
-        if (endpoint.getSendLibraryAddress(_sender) != msg.sender) revert OnlySendLibrary();
-        if (!endpoint.isSendingPayload()) revert OnlyOnSending();
-        if (_required > _supplied) revert InvalidAmount(_required, _supplied);
+        if (endpoint.getSendLibraryAddress(_sender) != msg.sender) revert LZ_TreasuryFeeHandler_OnlySendLibrary();
+        if (!endpoint.isSendingPayload()) revert LZ_TreasuryFeeHandler_OnlyOnSending();
+        if (_required > _supplied) revert LZ_TreasuryFeeHandler_InvalidAmount(_required, _supplied);
 
         // send lz token fee to the treasury directly
         IERC20(_lzToken).safeTransferFrom(_sender, _treasury, _required);

package/contracts/uln/uln301/interfaces/IMessageLibE1.sol

@@ -6,10 +6,10 @@ import { ILayerZeroMessagingLibrary } from "@layerzerolabs/lz-evm-v1-0.7/contrac
 
 /// extends ILayerZeroMessagingLibrary instead of ILayerZeroMessagingLibraryV2 for reducing the contract size
 interface IMessageLibE1 is ILayerZeroMessagingLibrary {
-    error InvalidPath();
-    error InvalidSender();
-    error InsufficientMsgValue();
-    error LzTokenPaymentAddressMustBeSender();
+    error LZ_MessageLib_InvalidPath();
+    error LZ_MessageLib_InvalidSender();
+    error LZ_MessageLib_InsufficientMsgValue();
+    error LZ_MessageLib_LzTokenPaymentAddressMustBeSender();
 
     function setLzToken(address _lzToken) external;
 

package/contracts/uln/uln302/ReceiveUln302.sol

@@ -7,7 +7,7 @@ import { SetConfigParam } from "@layerzerolabs/lz-evm-protocol-v2/contracts/inte
 import { ILayerZeroEndpointV2, Origin } from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroEndpointV2.sol";
 
 import { IReceiveUlnE2 } from "../interfaces/IReceiveUlnE2.sol";
-import { VerificationState, ReceiveUlnBase } from "../ReceiveUlnBase.sol";
+import { ReceiveUlnBase } from "../ReceiveUlnBase.sol";
 import { ReceiveLibBaseE2 } from "../../ReceiveLibBaseE2.sol";
 import { UlnConfig } from "../UlnBase.sol";
 
@@ -19,7 +19,7 @@ contract ReceiveUln302 is IReceiveUlnE2, ReceiveUlnBase, ReceiveLibBaseE2 {
     /// @dev CONFIG_TYPE_ULN=2 here to align with SendUln302/ReceiveUln302/ReceiveUln301
     uint32 internal constant CONFIG_TYPE_ULN = 2;
 
-    error InvalidConfigType(uint32 configType);
+    error LZ_ULN_InvalidConfigType(uint32 configType);
 
     constructor(address _endpoint) ReceiveLibBaseE2(_endpoint) {}
 
@@ -37,7 +37,7 @@ contract ReceiveUln302 is IReceiveUlnE2, ReceiveUlnBase, ReceiveLibBaseE2 {
             if (param.configType == CONFIG_TYPE_ULN) {
                 _setUlnConfig(param.eid, _oapp, abi.decode(param.config, (UlnConfig)));
             } else {
-                revert InvalidConfigType(param.configType);
+                revert LZ_ULN_InvalidConfigType(param.configType);
             }
         }
     }
@@ -71,7 +71,7 @@ contract ReceiveUln302 is IReceiveUlnE2, ReceiveUlnBase, ReceiveLibBaseE2 {
         if (_configType == CONFIG_TYPE_ULN) {
             return abi.encode(getUlnConfig(_oapp, _eid));
         } else {
-            revert InvalidConfigType(_configType);
+            revert LZ_ULN_InvalidConfigType(_configType);
         }
     }
 
@@ -82,27 +82,4 @@ contract ReceiveUln302 is IReceiveUlnE2, ReceiveUlnBase, ReceiveLibBaseE2 {
     function version() external pure override returns (uint64 major, uint8 minor, uint8 endpointVersion) {
         return (3, 0, 2);
     }
-
-    // ========================= VIEW FUNCTIONS FOR OFFCHAIN ONLY =========================
-    // Not involved in any state transition function.
-    // ====================================================================================
-
-    /// @dev a ULN verifiable requires it to be endpoint verifiable and committable
-    function verifiable(bytes calldata _packetHeader, bytes32 _payloadHash) external view returns (VerificationState) {
-        _assertHeader(_packetHeader, localEid);
-
-        address receiver = _packetHeader.receiverB20();
-        uint32 srcEid = _packetHeader.srcEid();
-
-        // check endpoint verifiable
-        if (!_verifiable(srcEid, receiver, _packetHeader, _payloadHash)) {
-            return VerificationState.Verified;
-        }
-
-        // check uln verifiable
-        if (_checkVerifiable(getUlnConfig(receiver, srcEid), keccak256(_packetHeader), _payloadHash)) {
-            return VerificationState.Verifiable;
-        }
-        return VerificationState.Verifying;
-    }
 }

package/contracts/uln/uln302/ReceiveUln302View.sol

@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: LZBL-1.2
+
+pragma solidity ^0.8.20;
+
+import { Proxied } from "hardhat-deploy/solc_0.8/proxy/Proxied.sol";
+import { PacketV1Codec } from "@layerzerolabs/lz-evm-protocol-v2/contracts/messagelib/libs/PacketV1Codec.sol";
+import { Origin } from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroEndpointV2.sol";
+import { EndpointV2ViewUpgradeable } from "@layerzerolabs/lz-evm-protocol-v2/contracts/EndpointV2ViewUpgradeable.sol";
+import { UlnConfig } from "../UlnBase.sol";
+
+enum VerificationState {
+    Verifying,
+    Verifiable,
+    Verified,
+    NotInitializable
+}
+
+interface IReceiveUln302 {
+    function assertHeader(bytes calldata _packetHeader, uint32 _localEid) external pure;
+
+    function verifiable(
+        UlnConfig memory _config,
+        bytes32 _headerHash,
+        bytes32 _payloadHash
+    ) external view returns (bool);
+
+    function getUlnConfig(address _oapp, uint32 _remoteEid) external view returns (UlnConfig memory rtnConfig);
+}
+
+contract ReceiveUln302View is EndpointV2ViewUpgradeable, Proxied {
+    using PacketV1Codec for bytes;
+
+    IReceiveUln302 public receiveUln302;
+    uint32 internal localEid;
+
+    function initialize(address _endpoint, address _receiveUln302) external proxied initializer {
+        __EndpointV2View_init(_endpoint);
+        receiveUln302 = IReceiveUln302(_receiveUln302);
+        localEid = endpoint.eid();
+    }
+
+    /// @dev a ULN verifiable requires it to be endpoint verifiable and committable
+    function verifiable(bytes calldata _packetHeader, bytes32 _payloadHash) external view returns (VerificationState) {
+        receiveUln302.assertHeader(_packetHeader, localEid);
+
+        address receiver = _packetHeader.receiverB20();
+
+        Origin memory origin = Origin(_packetHeader.srcEid(), _packetHeader.sender(), _packetHeader.nonce());
+
+        // check endpoint initializable
+        if (!initializable(origin, receiver)) {
+            return VerificationState.NotInitializable;
+        }
+
+        // check endpoint verifiable
+        if (!_endpointVerifiable(origin, receiver, _payloadHash)) {
+            return VerificationState.Verified;
+        }
+
+        // check uln verifiable
+        if (
+            receiveUln302.verifiable(
+                receiveUln302.getUlnConfig(receiver, origin.srcEid),
+                keccak256(_packetHeader),
+                _payloadHash
+            )
+        ) {
+            return VerificationState.Verifiable;
+        }
+        return VerificationState.Verifying;
+    }
+
+    /// @dev checks for endpoint verifiable and endpoint has payload hash
+    function _endpointVerifiable(
+        Origin memory origin,
+        address _receiver,
+        bytes32 _payloadHash
+    ) internal view returns (bool) {
+        // check endpoint verifiable
+        if (!verifiable(origin, _receiver, address(receiveUln302), _payloadHash)) return false;
+
+        // if endpoint.verifiable, also check if the payload hash matches
+        // endpoint allows re-verify, check if this payload has already been verified
+        if (endpoint.inboundPayloadHash(_receiver, origin.srcEid, origin.sender, origin.nonce) == _payloadHash)
+            return false;
+
+        return true;
+    }
+}

package/contracts/uln/uln302/SendUln302.sol

@@ -16,7 +16,7 @@ contract SendUln302 is SendUlnBase, SendLibBaseE2 {
     uint32 internal constant CONFIG_TYPE_EXECUTOR = 1;
     uint32 internal constant CONFIG_TYPE_ULN = 2;
 
-    error InvalidConfigType(uint32 configType);
+    error LZ_ULN_InvalidConfigType(uint32 configType);
 
     constructor(
         address _endpoint,
@@ -36,7 +36,7 @@ contract SendUln302 is SendUlnBase, SendLibBaseE2 {
             } else if (param.configType == CONFIG_TYPE_ULN) {
                 _setUlnConfig(param.eid, _oapp, abi.decode(param.config, (UlnConfig)));
             } else {
-                revert InvalidConfigType(param.configType);
+                revert LZ_ULN_InvalidConfigType(param.configType);
             }
         }
     }
@@ -49,7 +49,7 @@ contract SendUln302 is SendUlnBase, SendLibBaseE2 {
         } else if (_configType == CONFIG_TYPE_ULN) {
             return abi.encode(getUlnConfig(_oapp, _eid));
         } else {
-            revert InvalidConfigType(_configType);
+            revert LZ_ULN_InvalidConfigType(_configType);
         }
     }
 

package/contracts/upgradeable/WorkerUpgradeable.sol

@@ -70,7 +70,7 @@ abstract contract WorkerUpgradeable is Initializable, AccessControlUpgradeable,
 
     modifier onlyAcl(address _sender) {
         if (!hasAcl(_sender)) {
-            revert NotAllowed();
+            revert Worker_NotAllowed();
         }
         _;
     }
@@ -127,7 +127,7 @@ abstract contract WorkerUpgradeable is Initializable, AccessControlUpgradeable,
     /// @param _to address to withdraw fee to
     /// @param _amount amount to withdraw
     function withdrawFee(address _lib, address _to, uint256 _amount) external onlyRole(ADMIN_ROLE) {
-        if (!hasRole(MESSAGE_LIB_ROLE, _lib)) revert OnlyMessageLib();
+        if (!hasRole(MESSAGE_LIB_ROLE, _lib)) revert Worker_OnlyMessageLib();
         ISendLib(_lib).withdrawFee(_to, _amount);
         emit Withdraw(_lib, _to, _amount);
     }
@@ -174,7 +174,7 @@ abstract contract WorkerUpgradeable is Initializable, AccessControlUpgradeable,
 
     /// @dev overrides AccessControl to disable renouncing of roles
     function renounceRole(bytes32 /*role*/, address /*account*/) public pure override {
-        revert RoleRenouncingDisabled();
+        revert Worker_RoleRenouncingDisabled();
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/lz-evm-messagelib-v2",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "license": "LZBL-1.2",
   "files": [
     "artifacts/contracts/**/!(*.dbg).json",
@@ -11,8 +11,8 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@layerzerolabs/lz-evm-protocol-v2": "^2.0.13",
-    "@layerzerolabs/lz-evm-v1-0.7": "^2.0.13",
+    "@layerzerolabs/lz-evm-protocol-v2": "^2.0.15",
+    "@layerzerolabs/lz-evm-v1-0.7": "^2.0.15",
     "@openzeppelin/contracts": "^4.8.1",
     "@openzeppelin/contracts-upgradeable": "^4.8.1",
     "hardhat-deploy": "^0.11.44",
@@ -20,10 +20,12 @@
     "solidity-bytes-utils": "^0.8.0"
   },
   "peerDependencies": {
+    "@arbitrum/nitro-contracts": "^1.1.0",
     "@axelar-network/axelar-gmp-sdk-solidity": "^5.6.3",
     "@chainlink/contracts-ccip": "^0.7.6",
-    "@layerzerolabs/lz-evm-protocol-v2": "^2.0.13",
-    "@layerzerolabs/lz-evm-v1-0.7": "^2.0.13",
+    "@eth-optimism/contracts": "^0.6.0",
+    "@layerzerolabs/lz-evm-protocol-v2": "^2.0.15",
+    "@layerzerolabs/lz-evm-v1-0.7": "^2.0.15",
     "@openzeppelin/contracts": "^4.8.1",
     "@openzeppelin/contracts-upgradeable": "^4.8.1",
     "hardhat-deploy": "^0.11.44",

package/artifacts/contracts/uln/dvn/adapters/DVNAdapterFeeLibBase.sol/DVNAdapterFeeLibBase.json

@@ -1,50 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "DVNAdapterFeeLibBase",
-  "sourceName": "contracts/uln/dvn/adapters/DVNAdapterFeeLibBase.sol",
-  "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "uint32",
-          "name": "",
-          "type": "uint32"
-        },
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        },
-        {
-          "internalType": "uint16",
-          "name": "_defaultMultiplierBps",
-          "type": "uint16"
-        },
-        {
-          "internalType": "uint16",
-          "name": "_multiplierBps",
-          "type": "uint16"
-        },
-        {
-          "internalType": "uint256",
-          "name": "_executionFee",
-          "type": "uint256"
-        }
-      ],
-      "name": "getFee",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "fee",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506101e0806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063212cf54f14610030575b600080fd5b61004361003e3660046100a9565b610055565b60405190815260200160405180910390f35b60008061ffff841615610068578361006a565b845b61ffff16905061271061007d828561012b565b610087919061016f565b979650505050505050565b803561ffff811681146100a457600080fd5b919050565b600080600080600060a086880312156100c157600080fd5b853563ffffffff811681146100d557600080fd5b9450602086013573ffffffffffffffffffffffffffffffffffffffff811681146100fe57600080fd5b935061010c60408701610092565b925061011a60608701610092565b949793965091946080013592915050565b8082028115828204841417610169577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b92915050565b6000826101a5577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b50049056fea26469706673582212205079d7cb809d22313be9d4cdefde1befec031a875d3ae02d842d9221be0c353264736f6c63430008160033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061002b5760003560e01c8063212cf54f14610030575b600080fd5b61004361003e3660046100a9565b610055565b60405190815260200160405180910390f35b60008061ffff841615610068578361006a565b845b61ffff16905061271061007d828561012b565b610087919061016f565b979650505050505050565b803561ffff811681146100a457600080fd5b919050565b600080600080600060a086880312156100c157600080fd5b853563ffffffff811681146100d557600080fd5b9450602086013573ffffffffffffffffffffffffffffffffffffffff811681146100fe57600080fd5b935061010c60408701610092565b925061011a60608701610092565b949793965091946080013592915050565b8082028115828204841417610169577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b92915050565b6000826101a5577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b50049056fea26469706673582212205079d7cb809d22313be9d4cdefde1befec031a875d3ae02d842d9221be0c353264736f6c63430008160033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/artifacts/contracts/uln/interfaces/IDVNAdapterFeeLib.sol/IDVNAdapterFeeLib.json

@@ -1,50 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "IDVNAdapterFeeLib",
-  "sourceName": "contracts/uln/interfaces/IDVNAdapterFeeLib.sol",
-  "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "uint32",
-          "name": "_dstEid",
-          "type": "uint32"
-        },
-        {
-          "internalType": "address",
-          "name": "_sender",
-          "type": "address"
-        },
-        {
-          "internalType": "uint16",
-          "name": "_defaultMultiplierBps",
-          "type": "uint16"
-        },
-        {
-          "internalType": "uint16",
-          "name": "_multiplierBps",
-          "type": "uint16"
-        },
-        {
-          "internalType": "uint256",
-          "name": "_executionFee",
-          "type": "uint256"
-        }
-      ],
-      "name": "getFee",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "fee",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x",
-  "deployedBytecode": "0x",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}